--- modules/gci/londocsgci.pm	2009/12/20 04:32:03	1.5
+++ modules/gci/londocsgci.pm	2010/11/29 04:33:35	1.16
@@ -2,7 +2,7 @@
 # Custom Edit Course Routines for Assembly of Valid Concept Tests from
 # Geoscience Concept Inventory. 
 #
-# $Id: londocsgci.pm,v 1.5 2009/12/20 04:32:03 gci Exp $
+# $Id: londocsgci.pm,v 1.16 2010/11/29 04:33:35 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,10 +44,13 @@ use LONCAPA qw(:DEFAULT :match);
 my $path;
 my $version;
 my $reqnum;
+my @mandcats;
+my @bincats;
 my @categories;
 my @allprobs;
 my %probcat;
 my %prereqs;
+my %revreqs;
 my @defchosen;
 my @chosen;
 my @mandprobs;
@@ -55,7 +58,6 @@ my @bins;
 my @optional;
 my %mandatory;
 my @development;
-my %developmentitems;
 
 sub setdefaults {
    $path='/res/gci/gci';
@@ -90,10 +92,10 @@ sub setdefaults {
               ['63','64','65'],
               ['66','67','68','69','70','71']);
     @optional = ('05','11','29','31');
-
-   @categories=('M1','M2','M3','M4',
-                'A','B','C','D','E','F','G','H','I','J','K');
-   %probcat =('01' => 'M1' ,'02' => 'M2' ,'37' => 'M3' ,'2004_73' => 'M4' ,
+    @mandcats = ('M1','M2','M3','M4');
+    @bincats = ('A','B','C','D','E','F','G','H','I','J','K');
+    @categories=(@mandcats,@bincats);
+    %probcat =('01' => 'M1' ,'02' => 'M2' ,'37' => 'M3' ,'2004_73' => 'M4' ,
               '03' => 'A' ,'04' => 'A','05' => ''  ,'06' => 'A' ,'07' => 'B' ,
               '08' => 'B' ,'09' => 'B' ,'10' => 'C' ,'11' => ''  ,'12' => 'C' ,
               '13' => 'C' ,'14' => 'C' ,'15' => 'C' ,'16' => 'C' ,'17' => 'C' ,'18' => 'D' ,'19' => 'D' ,'20' => 'D' ,
@@ -106,12 +108,14 @@ sub setdefaults {
               '60' => 'I' ,
               '61' => 'I' ,'62' => 'I' ,'63' => 'J' ,'64' => 'J' ,'65' => 'J' ,'66' => 'K' ,'67' => 'K' ,'68' => 'K' ,'69' => 'K' ,'70' => 'K' ,
               '71' => 'K');
-   %mandatory=('01' => 1 ,'02' => 1,'37' => 1, '2004_73' => 1);
-   @mandprobs = ('01','02','37','2004_73');
-   %prereqs=('10' => '08', '57' => '52', '69' => '18');
-   @defchosen=('01','02','03','07','12','18','26','32','37','38','47','54','63','66','2004_73');
-   @development = ('100','101','102');
-   %developmentitems = ('100' => 1, '101' => '1', '102' => '1');
+    %mandatory=('01' => 1 ,'02' => 1,'37' => 1, '2004_73' => 1);
+    @mandprobs = ('01','02','37','2004_73');
+    %prereqs=('10' => '08', '57' => '52', '69' => '18');
+    foreach my $item (keys(%prereqs)) {
+        $revreqs{$prereqs{$item}} = $item;
+    }
+    @defchosen=('01','02','03','07','12','18','26','32','37','38','47','54','63','66','2004_73');
+    @development = ('001','002','003','004','005','006','007','008','009','010','011','012','013','014','015','016','017','018','019','020','021','022','023','024','025','026','027');
 }
 
 sub checkvalid {
@@ -134,7 +138,11 @@ sub checkvalid {
    foreach my $item (@chosen) {
        if ($prereqs{$item}) {
           unless ($chosenproblems{$prereqs{$item}}) {
-             push(@errors,&mt('Problem [_1] requires problem [_2].',$item,$prereqs{$item}));
+              my $url = &fullurl($item);
+              my $title = &Apache::lonnet::metadata($url,'title');
+              my $prerequrl = &fullurl($prereqs{$item});
+              my $prereqtitle = &Apache::lonnet::metadata($prerequrl,'title');
+              push(@errors,&mt('[_1] requires [_2].',"'$title'","'$prereqtitle'"));
           }
        }
    }
@@ -142,11 +150,21 @@ sub checkvalid {
 }
 
 sub fullurl {
-   my ($item)=@_;
+   my ($item,$catname)=@_;
    unless ($item=~/\_/) { $item='_'.$item; }
+   if ($catname eq 'development') {
+       return $path.'/pilot/pilot'.$item.'.problem';
+   }
    return $path.'/'.$version.'/GCI'.$item.'.problem';
 }
 
+sub item_from_url {
+    my ($url)=@_;
+    if ($url =~ m{\Q$path\E/\Q$version\E/GCI_?([^.]+)\.problem$}) {
+        return $1;
+    }
+}
+
 sub validcheck {
    my ($r)=@_;
    my @errors=&checkvalid();
@@ -164,6 +182,21 @@ sub validcheck {
 sub listresources {
    my ($r,$context,$cdom,$cnum)=@_;
    my $numchosen = scalar(@chosen);
+   my $multipart = 0;
+   my $composites;
+   if ($numchosen > 0) {
+       foreach my $key (keys(%prereqs)) {
+           if (grep(/^\Q$key\E/,@chosen)) {
+               $multipart ++;
+               $numchosen --;
+           }
+       }
+       if ($multipart) {
+           $composites = &mt(' (of which [quant,_1,is a combination question,are combination questions] in which students select both an answer, and the reasoning used).',$multipart).'<br />';
+       } else {
+           $composites = '.&nbsp;';
+       }
+   }
    unless ($numchosen > 0) {
       $r->print('<h3>'.&mt('Create a Concept Test').'</h3>'.
                 '<p>'.&mt('Choose how the test should be built:').'<br />'.
@@ -179,38 +212,49 @@ sub listresources {
    } else {
       my $numsub = &get_submissions_count($cdom,$cnum);
       unless ($env{'form.phase'} eq 'storemap') {
-          $r->print('<p>'.&mt('This course contains a valid concept test which includes [quant,_1,question].',$numchosen).'&nbsp;<a href="/adm/navmaps" target="_coursecontents">'.&mt('Display Contents').'</a><br />');
+          $r->print('<p>'.&mt('This course contains a valid concept test which includes [quant,_1,question]',$numchosen).$composites.'<a href="/adm/navmaps" target="_coursecontents">'.&mt('Display Contents').'</a><br />');
       }
       if ($numsub > 0) {
           $r->print(&mt('As there are existing student submissions, modification of the [_1]contents[_2] of the Concept Test will result in loss of student performance data, and is [_3]not[_4] permitted.','<i>','</i>','<b>','</b>').'<br />'.&mt('Modification of open and close dates [_1]is[_2] permitted.','<b>','</b>').'</p>');
       } else {
           $r->print('<fieldset><legend>'.&mt('Modify Test').'</legend>'.
                     &mt('Currently no student submissions have been recorded, so you may modify the contents of the Concept Test.').
-                    '<br /><form name="changetest" method="post" action="/adm/coursedocs">'.
+                    '<br /><br /><form name="changetest" method="post" action="/adm/coursedocs">'.
                     '<input type="hidden" name="concepttest" value="editmyown" />'.
                     '<input type="submit" name="modifytest" value="'.&mt('Edit Concept Test').'" /></form></fieldset></p>');
       }
       my ($crsparms,$ineffect,$parmlev) = &current_parms($cdom,$cnum);
       my $formname = 'datesform';
       my $datebutton = &mt('Save');
+      my $hide_timezone = 1;
       my $startform =
           &Apache::lonhtmlcommon::date_setter($formname,'opendate',
-                                              $crsparms->{'opendate'});
+                                              $crsparms->{'opendate'},'','','',
+                                              '','','','','',$hide_timezone);
       my $endform =
           &Apache::lonhtmlcommon::date_setter($formname,'duedate',
-                                                           $crsparms->{'duedate'});
+                                              $crsparms->{'duedate'},'','','',
+                                              '','','','','',$hide_timezone);
+      my $includeempty = 1;
+      my $timezone = &Apache::lonlocal::gettimezone();
+      my $tzform = &Apache::loncommon::select_timezone('timezone',$timezone,
+                                                       undef,$includeempty);
       $r->print('<p><fieldset><legend>'.&mt('Test Availability').'</legend>'.
                 &mt('Open and close dates for test items for the concept test are currently set as follows:').
-                '<br />'.
+                '<br /><br />'.
                 '<form name="'.$formname.'" method="post" '.
                 'action="/adm/coursedocs">'.
                 &Apache::lonhtmlcommon::start_pick_box().
+                &Apache::lonhtmlcommon::row_title(&mt('Time zone')).
+                $tzform.
+                &Apache::lonhtmlcommon::row_closure(1).         
                 &Apache::lonhtmlcommon::row_title(&mt('Open date')).
                 $startform.
-                &Apache::lonhtmlcommon::row_closure().
+                &Apache::lonhtmlcommon::row_closure(1).
                 &Apache::lonhtmlcommon::row_title(&mt('Close date')).
                 $endform.
-                 &Apache::lonhtmlcommon::end_pick_box().'<br />'. 
+                &Apache::lonhtmlcommon::row_closure(1).
+                &Apache::lonhtmlcommon::end_pick_box().'<br />'. 
                 '<input type="hidden" name="phase" value="storeparms" />'.
                 '<input type="submit" value="'.$datebutton.'" />'.
                 '</form></fieldset></p>');
@@ -248,6 +292,7 @@ sub editor {
     $r->print(&display_questions(\@devitems,'development',$devleg,\%chosenitems));
     $r->print('<input type="hidden" name="phase" value="storemap" />'.
               '<input type="hidden" name="context" value="'.$context.'" />'.
+              '<input type="hidden" name="concepttest" value="'.$env{'form.concepttest'}.'" />'.
               '<input type="submit" value="'.&mt('Store Problem Selection').'" />'.
               '</form>');
     &Apache::lonnet::delenv('request.gcicontext');
@@ -276,13 +321,13 @@ sub display_questions {
                    'value="'.$fixed{$catname}.'" readonly="readonly" />').'</legend>';
     } else {
         $output .= '<legend>'.&mt('[_1]: currently [_2] selected',$catlegend,
-                   '<input type="text" name="'.$countid.'" size="1" value="'.
+                   '<input type="text" name="'.$countid.'" id="'.$countid.'" size="1" value="'.
                    $total.'" readonly="readonly" />').'</legend>';
     }
     $output .= '<span id="'.$titleid.'">'.
               '<a href="javascript:showQuestions('."'$fieldid','$titleid'".')">'.
               &mt('Show').'</a> ...</span><br />'.
-              '<div id="'.$fieldid.'">'.
+              '<div id="'.$fieldid.'" style="display: none">'.
               &Apache::loncommon::start_data_table().
               &Apache::loncommon::start_data_table_header_row();
     unless (($catname eq 'development') || ($catname eq 'mandatory')) {
@@ -292,20 +337,45 @@ sub display_questions {
                '</th><th>'.&mt('Preview').'</th>'.
                &Apache::loncommon::end_data_table_header_row();
     foreach my $item (@{$questions}) {
-        my $url = &fullurl($item);
+        my $url = &fullurl($item,$catname);
         my $title = &Apache::lonnet::metadata($url,'title');
         $output .= &Apache::loncommon::start_data_table_row().'<td>';
-        if (($catname eq 'mandatory') || ($catname eq 'development')) {
+        if ($catname eq 'mandatory') {
             $output .= '<input type="hidden" name="item'.$item.'" value="checked" />';
+        } elsif ($catname eq 'development') {
+            $output .= '<input type="hidden" name="pilot'.$item.'" value="checked" />';
         } else {
-            $output .= '<input type="checkbox" name="item'.$item.'"';
+            $output .= '<input type="checkbox" name="item'.$item.'" id="item'.$item.'"';
             if ($chosenitems->{$item}) { $output .= ' checked="checked"'; }
-            $output .= 'onclick="javascript:countChecked('."'$catname'".');" />'.
+            $output .= ' onclick="countChecked('."'$catname'".');';
+            my $binname;
+            if ($prereqs{$item}) {
+                for (my $i=0; $i<@bincats; $i++) {
+                    if ($bincats[$i] eq $probcat{$prereqs{$item}}) {
+                        $binname = 'bin'.$i; 
+                        last;
+                    }
+                }
+                $output .= 'checkPrereqs('."'dep','$item','$prereqs{$item}','$binname'".');';
+            } elsif ($revreqs{$item}) {
+                for (my $i=0; $i<@bincats; $i++) {
+                    if ($bincats[$i] eq $probcat{$item}) {
+                        $binname = 'bin'.$i;
+                        last;
+                    }
+                }
+                $output .= 'checkPrereqs('."'pre','$revreqs{$item}','$item','$binname'".');';
+            }
+            $output .= '" />'.
                        '<input type="hidden" name="container'.$item.'" value="'.
                        $catname.'"></td><td>';
         }
         $output .= '<b>'.$title.'</b></td>';
         my $content=&Apache::lonindexer::showpreview($url);
+        my $startformtag = '<form name="lonhomework" enctype="multipart/form-data" method="post" action="'.$url.'?inhibitmenu=yes" >';
+        my $endtag = '<table><tr><td><input onmouseup="javascript:setSubmittedPart';
+        $content =~ s/^\Q$startformtag\E//;
+        $content =~ s/\Q$endtag\E.+$//s;
         $output .= '<td> '.($content eq '' ? '&nbsp;':$content).' </td>'."\n".
                    &Apache::loncommon::end_data_table_row();
     }
@@ -366,24 +436,48 @@ sub chosen_to_map {
    @LONCAPA::map::order=();
    @LONCAPA::map::resources=();
    my $counter = 0;
+   my $residx;
    for (my $idx=0;$idx<=$#allprobs;$idx++) {
-       my $residx=$idx+1;
+       $residx=$idx+1;
        if ($chosenproblems{$allprobs[$idx]}) {
+          my $url  = &LONCAPA::map::qtunescape(&fullurl($allprobs[$idx]));
+          if (($revreqs{$allprobs[$idx]}) && 
+              ($chosenproblems{$revreqs{$allprobs[$idx]}})) {
+              my $probnum = '_'.$allprobs[$idx].'_'.$revreqs{$allprobs[$idx]};
+              $url = &LONCAPA::map::qtunescape(&fullurl($probnum));
+          } elsif ($prereqs{$allprobs[$idx]}) {
+              next;
+          }
           push(@LONCAPA::map::order,$residx);
           $counter ++;
-          my $url  = &LONCAPA::map::qtunescape(&fullurl($allprobs[$idx]));
 	  my $name = &LONCAPA::map::qtunescape('Problem '.$counter);
 	  $LONCAPA::map::resources[$residx]=join(':', ($name, $url, 'false', 'normal', 'res'));
        }
     }
+    foreach my $devitem (@development) {
+        if ($env{'form.pilot'.$devitem}) {
+            my $url = &LONCAPA::map::qtunescape(&fullurl($devitem,'development'));
+            $residx ++;
+            push(@LONCAPA::map::order,$residx);
+            $counter ++;
+            my $name = &LONCAPA::map::qtunescape('Problem '.$counter);
+            $LONCAPA::map::resources[$residx]=join(':', ($name, $url, 'false', 'normal', 'res'));
+        }
+    }
 }
 
 sub map_to_chosen {
     @chosen=();
     foreach my $idx (@LONCAPA::map::order) {
-       my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
+       my ($title,$url)=split(':',$LONCAPA::map::resources[$idx]);
+       my $item;
        unless ($url eq '') {
-           push(@chosen,$allprobs[$idx-1]);
+           $item = &item_from_url($url);
+           if (($item =~ /^(\d+)_(\d+)$/) && ($prereqs{$2} eq $1)) {
+               push(@chosen,($1,$2));
+           } else {
+               push(@chosen,$item);
+           }
        }
     }
     if (($env{'form.concepttest'} eq 'defchosen') || 
@@ -400,9 +494,16 @@ sub store {
    my @errors=&checkvalid();
    if (@errors > 0) {
        if (($caller eq 'requestcrs') && ($env{'form.concepttest'} eq 'defchosen')) {
-           return 'Invalid concept test.';
+           return &mt('Invalid concept test.');
        } else {
-           return;
+           my $errormsg = '<span class="LC_warning">'.&mt('Invalid concept test:');
+           if (@errors > 1) {
+               $errormsg .= '<ul><li>'.join('</li><li>',@errors).'</li></ul>';
+           } else {
+               $errormsg .= '<br />'.$errors[0];
+           }
+           $errormsg .= '</span>';
+           return $errormsg;
        }
    }
    &chosen_to_map();
@@ -456,8 +557,18 @@ sub current_parms {
 sub store_dates_parms {
     my ($cdom,$cnum) = @_;
     my $topsymb = '___0___uploaded/'.$cdom.'/'.$cnum.'/default.sequence';
+    my $tz_change; 
+    my $timezone =  &Apache::lonlocal::gettimezone();
+    if ($env{'form.timezone'} ne '') {
+        if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
+            if ($timezone ne $env{'form.timezone'}) {
+                $tz_change = 1;
+                $timezone = $env{'form.timezone'};
+            }
+        }
+    }
     my ($opendate,$duedate) = 
-        &Apache::lonuserutils::get_dates_from_form('opendate','duedate');
+        &Apache::lonuserutils::get_dates_from_form('opendate','duedate',$timezone);
     my %dates = (
                   opendate => {
                                value => $opendate,
@@ -475,11 +586,14 @@ sub store_dates_parms {
                                    '0_'.$date,14,$dates{$date}{'value'},
                                    $dates{$date}{'type'},undef,$cdom);
     }
+    if ($tz_change) {
+        &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.timezone' => $timezone});
+    }
     my $output = &mt('Open and Close dates set for test items').'<ul>'.
                  '<li>'.&mt('Concept Test Questions open:').' '.
-                        &Apache::lonlocal::locallocaltime($opendate).'</li>'.
+                        &Apache::lonlocal::locallocaltime($opendate,$timezone).'</li>'.
                  '<li>'.&mt('Concept Test Questions close:').' '.
-                        &Apache::lonlocal::locallocaltime($duedate).'</li>'.
+                        &Apache::lonlocal::locallocaltime($duedate,$timezone).'</li>'.
                  '</ul>';
     return $output;
 }
@@ -518,6 +632,60 @@ sub builder_javascript {
                                           show => 'Show',
                                           hide => 'Hide',
                                         );
+    my $prereqjs = "
+function checkPrereqs(caller,item,prereq,binname) {
+    var changedPrereq = 0;
+    element = document.getElementById('item'+item);
+    if (element.checked == false) {
+        return;
+    } else {
+        prereqelement = document.getElementById('item'+prereq);
+        if (!prereqelement.checked) {
+            prereqelement.checked = true;
+            changedPrereq = 1;
+            countChecked(binname);
+        }
+    }
+";
+    
+    my ($hasdep,$prereq,$hasdeptitle,$prereqtitle) = ('','','','');
+    foreach my $item (sort(keys(%prereqs))) {
+        $hasdep .= "'$item',";
+        $prereq .= "'$prereqs{$item}',";
+        my $url = &fullurl($item);
+        $hasdeptitle .= "'".&Apache::lonnet::metadata($url,'title')."',";
+        my $purl = &fullurl($prereqs{$item});
+        $prereqtitle .= "'".&Apache::lonnet::metadata($purl,'title')."',";
+    }
+    $hasdep =~ s/,$//;
+    $prereq =~ s/,$//;
+    $hasdeptitle =~ s/,$//;
+    $prereqtitle =~ s/,$//;
+
+    $prereqjs .= <<"ENDFN";
+
+    var hasDeps = Array($hasdep);
+    var preReqs = Array($prereq);
+    var hasDepTitles = Array($hasdeptitle);
+    var preReqTitles = Array($prereqtitle);
+    for (var i=0; i<hasDeps.length; i++) {
+        if (hasDeps[i] == item) {
+            var msg = hasDepTitles[i]+' question has a prerequisite: '+preReqTitles[i]+'.\\nThe two questions will appear together in a composite question.';
+            if (changedPrereq == 1) {
+                msg = msg+'\\n\\nAs the prerequisite was not checked, inclusion of '+hasDepTitles[i]+' has now caused '+preReqTitles[i]+' to also be checked automatically.';
+            }
+            if (caller == 'pre') {
+                msg = msg +'\\n\\nIf you do not wish to include '+preReqTitles[i]+' you will first need to uncheck '+hasDepTitles[i]+', then uncheck '+preReqTitles[i]+' again.'
+            }
+            alert(msg);
+            break;
+        }
+    }
+    return;
+}
+
+ENDFN
+
     return <<ENDJS;
 function showQuestions(content,title) {
     document.getElementById(content).style.display = "";
@@ -531,26 +699,6 @@ function hideQuestions(content,title) {
     return;
 }
 
-function setInitialVisibility() {
-    if (document.getElementById('GCI_mandatory_q') == null) {
-        return;
-    }
-    document.getElementById('GCI_mandatory_q').style.display = "none";
-    document.getElementById('GCI_bin0_q').style.display = "none";
-    document.getElementById('GCI_bin1_q').style.display = "none";
-    document.getElementById('GCI_bin2_q').style.display = "none";
-    document.getElementById('GCI_bin3_q').style.display = "none";
-    document.getElementById('GCI_bin4_q').style.display = "none";
-    document.getElementById('GCI_bin5_q').style.display = "none";
-    document.getElementById('GCI_bin6_q').style.display = "none";
-    document.getElementById('GCI_bin7_q').style.display = "none";
-    document.getElementById('GCI_bin8_q').style.display = "none";
-    document.getElementById('GCI_bin9_q').style.display = "none";
-    document.getElementById('GCI_bin10_q').style.display = "none";
-    document.getElementById('GCI_optional_q').style.display = "none";
-    document.getElementById('GCI_development_q').style.display = "none";
-}
-
 function countChecked(binname) {
     var count = 0;
     for (var i=0; i<document.selecteditems.elements.length; i++) {
@@ -558,13 +706,15 @@ function countChecked(binname) {
             if (document.selecteditems.elements[i].value == binname) {
                 var itemname = document.selecteditems.elements[i].name;
                 var itemnum = itemname.substr(9);
-                if (document.selecteditems.elements['item'+itemnum].checked) {
+                element = document.getElementById('item'+itemnum);
+                if (element.checked) {
                     count ++;
                 }
             }
         }
     }
-    document.selecteditems.elements['GCI_'+binname+'_count'].value = count;
+    countelement = document.getElementById('GCI_'+binname+'_count');
+    countelement.value = count;
 }
 
 function validTestCheck() {
@@ -572,7 +722,8 @@ function validTestCheck() {
     for (var i=0; i<11; i++) {
         var binname = 'GCI_bin'+i+'_count';
         var j = i+1;
-        if (document.selecteditems.elements[binname].value < 1) {
+        countelement = document.getElementById(binname);        
+        if (countelement.value < 1) {
             empty = empty +' '+j;
         }
     }
@@ -589,8 +740,6 @@ function setDocsPhase() {
             if (document.choices.concepttest[i].checked) {
                 if (document.choices.concepttest[i].value == 'defchosen') {
                     document.choices.phase.value = 'storemap';
-                    alert("Setting value for phase to "+document.choices.phase.value);
-
                 }
             }
         }
@@ -598,6 +747,8 @@ function setDocsPhase() {
     return;
 }
 
+$prereqjs
+
 ENDJS
 
 }