--- loncom/homework/optionresponse.pm	2002/01/11 16:32:29	1.30
+++ loncom/homework/optionresponse.pm	2002/08/05 15:55:39	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.30 2002/01/11 16:32:29 matthew Exp $
+# $Id: optionresponse.pm,v 1.45 2002/08/05 15:55:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,11 +26,12 @@
 # http://www.lon-capa.org/
 #
 # 2/21 Guy
+# 01/18 Alex
 package Apache::optionresponse;
 use strict;
 use Apache::response;
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
 }
 
@@ -49,17 +50,18 @@ sub start_optionresponse {
         &Apache::edit::end_row().
         &Apache::edit::start_spanning_row().
         "\n";
-    $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').
+    $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
         &Apache::edit::end_row().
 	&Apache::edit::start_spanning_row();
-  }
-  if ($target eq 'modified') {
+  } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						 $safeeval,'max');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
-  }
-  if ($target eq 'meta') {
+  } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('optionresponse');
+  } elsif ($target eq 'analyze') {
+    my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+    push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
   }
   return $result;
 }
@@ -74,12 +76,12 @@ sub end_optionresponse {
   return $result;
 }
 
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
 sub start_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
   my $result='';
-  %Apache::response::foilgroup={};
+  %Apache::response::foilgroup=();
   $Apache::optionresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();
   if ($target eq 'edit') {
@@ -128,7 +130,7 @@ ENDTABLE
     if ($optchanged) {
       $result = "<foilgroup options=\"(";
       foreach my $option (@options) {
-	$option=~s/\'/\\\'/;
+	$option=~s/\'/\\\'/g;
 	&Apache::lonxml::debug("adding option :$option:");
 	$result .="'".$option."',";
       }
@@ -136,6 +138,9 @@ ENDTABLE
       $result.=')">';
     } # else nothing changed so just use the default mechanism
   }
+  if ($target eq 'tex') {
+      $result .= ' \begin{enumerate} ';
+  }
   return $result;
 }
 
@@ -143,7 +148,7 @@ sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
   my $result;
-  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
+  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
     my $name;
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max } 
@@ -151,10 +156,22 @@ sub end_foilgroup {
     my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
     &Apache::lonxml::debug("Options are $#opt");
-    if ($target eq 'web') {
-      $result.=&displayfoils($count,@opt);
+    if ($target eq 'web' || $target eq 'tex') {
+      $result.=&displayfoils($target,$count,@opt);
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($count,@opt);
+    } elsif ( $target eq 'analyze') {
+      my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+      foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
+	if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; }
+	push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name);
+	$Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
+	  $Apache::response::foilgroup{"$name.value"};
+	$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
+	  $Apache::response::foilgroup{"$name.text"};
+      }
+      push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
+      push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($count));
     } elsif ( $target eq 'grade') {
       if ( defined $ENV{'form.submitted'}) {
 	my @whichopt = &whichfoils($count);
@@ -167,8 +184,8 @@ sub end_foilgroup {
 	  my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
 	  $responsehash{$name}=$response;
 	  if ( $response =~ /[^\s]/) {
-	    &Apache::lonxml::debug("submitted a $response<br />\n");
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
+	    &Apache::lonxml::debug("submitted a $response for $value<br />\n");
 	    if ($value eq $response) {$right++;} else {$wrong++;}
 	  } else {
 	    $ignored++;
@@ -187,7 +204,11 @@ sub end_foilgroup {
 	} elsif ($wrong==0 && $right==0) {
 	  #nothing submitted
 	} else {
-	  $ad='INCORRECT';
+	  if ($ignored==0) {
+	    $ad='INCORRECT';
+	  } else {
+	    $ad='MISSING_ANSWER';
+	  }
 	}
 	$Apache::lonhomework::results{"resource.$part.$id.submission"}=
 	  $responsestr;
@@ -198,7 +219,8 @@ sub end_foilgroup {
     }
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();
-  }
+  }  
+  if ($target eq 'tex') {$result .= '\end{enumerate}';}
   return $result;
 }
 
@@ -207,6 +229,7 @@ sub getfoilcounts {
   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   # +1 since instructors will count from 1
   my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
+  if (&Apache::response::showallfoils()) { $max=$count; }
   return ($count,$max);
 }
 
@@ -216,7 +239,12 @@ sub whichfoils {
   my @whichopt =();
   while ((($#whichopt+1) < $max) && ($#names > -1)) {
     &Apache::lonxml::debug("Have $#whichopt max is $max");
-    my $aopt=int(rand($#names+1));
+    my $aopt;
+    if (&Apache::response::showallfoils()) {
+      $aopt=0;
+    } else {
+      $aopt=int(rand($#names+1));
+    }
     &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");
@@ -239,19 +267,23 @@ sub displayanswers {
 }
 
 sub displayfoils {
-  my ($max,@opt)=@_;
+  my ($target,$max,@opt)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;
   my @falselist;
   my $result;
   my $name;
+  my $displayoptionintex=0;
   my @whichopt = &whichfoils($max);
   my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];
   if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     foreach $name (@whichopt) {
-      $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.
-	":".$Apache::response::foilgroup{$name.'.text'}."\n";
+      if ($target eq 'web') {
+	  $result.="<br />";
+      }
+      $result .=$Apache::response::foilgroup{$name.'.value'}.
+	  ":".$Apache::response::foilgroup{$name.'.text'}."\n";
     }
   } else {
     my $temp=1;
@@ -267,20 +299,42 @@ sub displayfoils {
 	  $optionlist.="<option>$option</option>\n";
 	}
       }
-      $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
-	.$optionlist
-	  ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
-      $temp++;
+      if ($target ne 'tex') {
+	  $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
+	      .$optionlist
+		  ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
+	  $temp++;
+      } else {
+	  if ($displayoptionintex == 0) {
+              my $texoptionlist = $optionlist;
+	      $texoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
+	      $texoptionlist =~ s/<option>/{\\bf /g;
+	      $texoptionlist =~ s/<\/option>/},/g;
+	      $texoptionlist =~ s/,$/\./g;
+	      $texoptionlist =~ s/>/\$>\$/g;
+	      $texoptionlist =~ s/</\$<\$/g;
+	      $texoptionlist =~ s/=/\$=\$/g;
+	      $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
+	      $displayoptionintex=1;
+	  } else {
+	      $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
+	  }
+      } 
     }
+  } 
+  if ($target ne 'tex') {
+      return $result."<br />";
+  }
+  else {
+      return $result;
   }
-  return $result."<br />";
 }
 
 
 sub start_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::optionresponse::conceptgroup=1;
-  %Apache::response::conceptgroup={};
+  %Apache::response::conceptgroup=();
   my $result;
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
@@ -298,21 +352,38 @@ sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::optionresponse::conceptgroup=0;
   my $result='';
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
+      || $target eq 'tex' || $target eq 'analyze') {
     #if not there aren't any foils to display and thus no question
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int rand $#names+1;
       my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;
-      $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};
-      $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
+      $Apache::response::foilgroup{"$name.value"} =
+	$Apache::response::conceptgroup{"$name.value"};
+      $Apache::response::foilgroup{"$name.text"} =
+	$Apache::response::conceptgroup{"$name.text"};
       my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
       $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");
+      if ($target eq 'analyze') {
+	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+        push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} },
+	      $concept);
+	$Apache::lonhomework::analyze{"$part_id.concept.$concept"}=
+	  $Apache::response::conceptgroup{'names'};
+	foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) {
+	  push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },
+		$name);
+	  $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
+	    $Apache::response::conceptgroup{"$name.value"};
+	  $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
+	    $Apache::response::conceptgroup{"$name.text"};
+	}
+      }
     }
-  }
-  if ($target eq 'edit') {
+  } elsif ($target eq 'edit') {
     $result=&Apache::edit::end_table();
   }
   return $result;
@@ -326,7 +397,7 @@ sub insert_conceptgroup {
 sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web') {
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) {
     &Apache::lonxml::startredirection;
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,"Foil");
@@ -340,7 +411,7 @@ sub start_foil {
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
-  }
+  } 
   return $result;
 }
 
@@ -348,21 +419,29 @@ sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text ='';
   my $result = '';
-  if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+  if ($target eq 'web' || $target eq 'tex') { 
+      $text=&Apache::lonxml::endredirection; 
+  }
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
+      || $target eq 'tex' || $target eq 'analyze') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
       &Apache::lonxml::debug("Got a name of :$name:");
       if (!$name) { $name=$Apache::lonxml::curdepth; }
       &Apache::lonxml::debug("Using a name of :$name:");
-      if ( $Apache::optionresponse::conceptgroup ) {
+      if ( $Apache::optionresponse::conceptgroup
+	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
 	$Apache::response::conceptgroup{"$name.text"} = $text;	
       } else {
 	push @{ $Apache::response::foilgroup{'names'} }, $name;
-	$Apache::response::foilgroup{"$name.value"} = $value;
+        if ($target eq 'tex') {
+	    $Apache::response::foilgroup{"$name.value"} = '\item '.$value;
+	} else {
+	    $Apache::response::foilgroup{"$name.value"} = $value;
+	}
 	$Apache::response::foilgroup{"$name.text"} = $text;
       }
     }