--- modules/gci/londocsgci.pm	2009/12/21 15:51:29	1.6
+++ modules/gci/londocsgci.pm	2010/11/09 01:19:04	1.14
@@ -2,7 +2,7 @@
 # Custom Edit Course Routines for Assembly of Valid Concept Tests from
 # Geoscience Concept Inventory. 
 #
-# $Id: londocsgci.pm,v 1.6 2009/12/21 15:51:29 gci Exp $
+# $Id: londocsgci.pm,v 1.14 2010/11/09 01:19:04 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,7 +58,6 @@ my @bins;
 my @optional;
 my %mandatory;
 my @development;
-my %developmentitems;
 
 sub setdefaults {
    $path='/res/gci/gci';
@@ -116,8 +115,7 @@ sub setdefaults {
         $revreqs{$prereqs{$item}} = $item;
     }
     @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');
+    @development = ('001','002','003','004','005','006','007','008','009','010','011','012','013','014','015','016','017','018','019','020','021','022');
 }
 
 sub checkvalid {
@@ -152,14 +150,17 @@ sub checkvalid {
 }
 
 sub fullurl {
-   my ($item)=@_;
-   unless ($item=~/^\_/) { $item='_'.$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$}) {
+    if ($url =~ m{\Q$path\E/\Q$version\E/GCI_?([^.]+)\.problem$}) {
         return $1;
     }
 }
@@ -181,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 />'.
@@ -196,7 +212,7 @@ 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>');
@@ -227,7 +243,8 @@ sub listresources {
                 &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>');
@@ -265,6 +282,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');
@@ -293,13 +311,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')) {
@@ -309,13 +327,15 @@ 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="countChecked('."'$catname'".');';
             my $binname;
@@ -342,6 +362,10 @@ sub display_questions {
         }
         $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();
     }
@@ -402,13 +426,14 @@ 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]};
+              my $probnum = '_'.$allprobs[$idx].'_'.$revreqs{$allprobs[$idx]};
               $url = &LONCAPA::map::qtunescape(&fullurl($probnum));
           } elsif ($prereqs{$allprobs[$idx]}) {
               next;
@@ -419,6 +444,16 @@ sub chosen_to_map {
 	  $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 {
@@ -577,11 +612,13 @@ sub builder_javascript {
     my $prereqjs = "
 function checkPrereqs(caller,item,prereq,binname) {
     var changedPrereq = 0;
-    if (document.selecteditems.elements['item'+item].checked == false) {
+    element = document.getElementById('item'+item);
+    if (element.checked == false) {
         return;
     } else {
-        if (!document.selecteditems.elements['item'+prereq].checked) {
-            document.selecteditems.elements['item'+prereq].checked = true;
+        prereqelement = document.getElementById('item'+prereq);
+        if (!prereqelement.checked) {
+            prereqelement.checked = true;
             changedPrereq = 1;
             countChecked(binname);
         }
@@ -639,26 +676,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++) {
@@ -666,13 +683,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() {
@@ -680,7 +699,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;
         }
     }
@@ -697,8 +717,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);
-
                 }
             }
         }