--- loncom/homework/radiobuttonresponse.pm	2001/12/14 23:00:52	1.33
+++ loncom/homework/radiobuttonresponse.pm	2002/09/23 17:20:41	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.33 2001/12/14 23:00:52 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.47 2002/09/23 17:20:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,8 +29,9 @@
 
 package Apache::radiobuttonresponse;
 use strict;
+use HTML::Entities();
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
 }
 
@@ -45,16 +46,22 @@ sub start_radiobuttonresponse {
     $result=&Apache::response::meta_package_write('radiobuttonresponse');
   } elsif ($target eq 'edit' ) {
     $result.=&Apache::edit::start_table($token).
-      '<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:".
+	'<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:".
 	&Apache::edit::deletelist($target,$token)
-	  ."</td><td>&nbsp</td></tr><tr><td colspan=\"3\">\n";
-    $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').
-      "</td></tr>";
-    $result.="<tr><td colspan=\"3\">\n";
+	."</td><td>&nbsp".&Apache::edit::end_row()
+        .&Apache::edit::start_spanning_row();
+
+    $result.=
+	&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
+	&Apache::edit::select_arg('Randomize Foil Order','randomize',
+				  ['yes','no'],$token).
+        &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						 $safeeval,'max');
+						 $safeeval,'max','randomize');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+  } elsif ($target eq 'tex') {
+      $result .= '\begin{enumerate}';
   }
   return $result;
 }
@@ -63,15 +70,16 @@ sub end_radiobuttonresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+  if ($target eq 'tex') { $result .= '\end{enumerate}'; }
   &Apache::response::end_response;
   pop @Apache::lonxml::namespace;
   &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
   return $result;
 }
 
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
 sub start_foilgroup {
-  %Apache::response::foilgroup={};
+  %Apache::response::foilgroup=();
   $Apache::radiobuttonresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();
   return '';
@@ -93,13 +101,13 @@ sub storesurvey {
 }
 
 sub grade_response {
-  my ($max,$answer)=@_;
+  my ($max,$answer,$randomize)=@_;
   if (!defined($ENV{'form.submitted'})) { return; }
   my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
   if ( $response !~ /[0-9]+/) { return; }
   my $part=$Apache::inputtags::part;
   my $id = $Apache::inputtags::response['-1'];
-  my @whichfoils=&whichfoils($max,$answer);
+  my @whichfoils=&whichfoils($max,$answer,$randomize);
   my %responsehash;
   $responsehash{$whichfoils[$response]}=$response;
   my $responsestr=&Apache::lonnet::hash2str(%responsehash);
@@ -122,10 +130,10 @@ 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') {
     my $style = $Apache::lonhomework::type;
     if ( $style eq 'survey' ) {
-      if ($target eq 'web' || $target eq 'answer') {
+      if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
 	$result=&displayallfoils();
       } elsif ( $target eq 'grade' ) {
 	$result=&storesurvey();
@@ -138,12 +146,14 @@ sub end_foilgroup {
       if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
       my $answer = int(rand ($count));
       &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");
-      if ($target eq 'web') {
-	$result=&displayfoils($max,$answer);
+      my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
+						 $safeeval,'-2');
+      if ($target eq 'web' || $target eq 'tex') {
+	$result=&displayfoils($target,$max,$answer,$randomize);
       } elsif ($target eq 'answer' ) {
-	$result=&displayanswers($max,$answer);
+	$result=&displayanswers($max,$answer,$randomize);
       } elsif ( $target eq 'grade') {
-	&grade_response($max,$answer);
+	&grade_response($max,$answer,$randomize);
       }
     }
   }
@@ -153,11 +163,13 @@ sub end_foilgroup {
 sub getfoilcounts {
   my ($parstack,$safeeval)=@_;
   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
-  my @names = @{ $Apache::response::foilgroup{'names'} };
+  my @names;
   my $truecnt=0;
   my $falsecnt=0;
   my $name;
-
+  if ( $Apache::response::foilgroup{'names'} ) {
+    @names= @{ $Apache::response::foilgroup{'names'} };
+  }
   foreach $name (@names) {
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
       $truecnt++;
@@ -177,66 +189,114 @@ sub displayallfoils {
   my $part=$Apache::inputtags::part;
   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
   my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
-  &Apache::lonhomework::showhash(%lastresponse);
-  foreach my $name (@names) {
-    if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-      $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
-      if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
-      $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
-      $temp++;
+  if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
+    foreach my $name (@names) {
+      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
+	$result.="<br />".$Apache::response::foilgroup{$name.'.value'};
+	if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	  $result.='<b>';
+	}
+	$result .= $Apache::response::foilgroup{$name.'.text'};
+	if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	  $result.='</b>';
+	}
+      }
+    }
+  } else {
+    foreach my $name (@names) {
+      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
+	$result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+	if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
+	$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+	$temp++;
+      }
     }
   }
   return $result;
 }
 
 sub whichfoils {
-  my ($max,$answer)=@_;
+  my ($max,$answer,$randomize)=@_;
 
   my @truelist;
   my @falselist;
+  my @whichfalse =();
 
-  my @names = @{ $Apache::response::foilgroup{'names'} };
-  foreach my $name (@names) {
-    #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
-    if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
-      push (@truelist,$name);
-    } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
-      push (@falselist,$name);
-    } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
-    } else {
-      &Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in <foilgroup>");
+  my @names;
+  if ( $Apache::response::foilgroup{'names'} ) {
+    @names= @{ $Apache::response::foilgroup{'names'} };
+  }
+  if (&Apache::response::showallfoils()) {
+    @whichfalse=@names;
+  } elsif ($randomize=='no') {
+      &Apache::lonxml::debug("No randomization");
+      my $havetrue=0;
+      foreach my $name (@names) {
+	  if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	      if (!$havetrue ) {
+		  push (@whichfalse,$name);
+		  $havetrue++;
+	      }
+	  } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
+	      push (@whichfalse,$name);
+	  } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
+	  } else {
+	      &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+	  }
+      }
+  } else {
+    foreach my $name (@names) {
+      #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
+      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	push (@truelist,$name);
+      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
+	push (@falselist,$name);
+      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
+      } else {
+	&Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+      }
     }
+    my $whichtrue = int(rand($#truelist+1));
+    &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
+    while ((($#whichfalse+1) < $max-1) && ($#falselist > -1)) {
+      &Apache::lonxml::debug("Have $#whichfalse max is $max");
+      my $afalse=int(rand($#falselist+1));
+      &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
+      $afalse=splice(@falselist,$afalse,1);
+      &Apache::lonxml::debug("Picked $afalse");
+      push (@whichfalse,$afalse);
+    }
+    splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
+    &Apache::lonxml::debug("the true statement is $answer");
   }
-  my $whichtrue = int(rand($#truelist+1));
-  &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
-  my @whichfalse =();
-  while ((($#whichfalse+1) < $max) && ($#falselist > -1)) {
-    &Apache::lonxml::debug("Have $#whichfalse max is $max");
-    my $afalse=int(rand($#falselist+1));
-    &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
-    $afalse=splice(@falselist,$afalse,1);
-    &Apache::lonxml::debug("Picked $afalse");
-    push (@whichfalse,$afalse);
-  }
-  splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
-  &Apache::lonxml::debug("the true statement is $answer");
   return @whichfalse;
 }
 
 sub displayfoils {
-  my ($max,$answer)=@_;
+  my ($target,$max,$answer,$randomize)=@_;
   my $result;
 
-  my @whichfoils=&whichfoils($max,$answer);
-  if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+  my @whichfoils=&whichfoils($max,$answer,$randomize);
+  if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     foreach my $name (@whichfoils) {
-      $result.="<br />";
+      if ($target ne 'tex') {
+	  $result.="<br />";
+      } else {
+	  $result.='\vskip 0 mm \item ';
+      }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
-	$result.='Correct';
+	  if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: ';}
       } else {
-	$result.='Incorrect';
+	$result.='Incorrect:';
+      }
+      if ($target ne 'tex') {
+	  $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+      } else {
+	  $result.=$Apache::response::foilgroup{$name.'.text'};
+      }
+      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	  if ($target ne 'tex') { $result.='</b>';}
       }
-      $result.=":".$Apache::response::foilgroup{$name.'.text'}."</input>\n";
     }
   } else {
     my $temp=0;
@@ -245,19 +305,23 @@ sub displayfoils {
     my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     foreach my $name (@whichfoils) {
-       $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
-      if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
-      $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+      if ($target ne 'tex') {
+	  $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+	  if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
+	  $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+      } else {
+	  $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
+      }
       $temp++;
     }
   }
-  return $result."<br />";
+  if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; }
+  return $result;
 }
 
 sub displayanswers {
-  my ($max,$answer)=@_;
-  my @names = @{ $Apache::response::foilgroup{'names'} };
-  my @whichopt = &whichfoils($max,$answer);
+  my ($max,$answer,$randomize)=@_;
+  my @whichopt = &whichfoils($max,$answer,$randomize);
   my $result=&Apache::response::answer_header('radiobuttonresponse');
   foreach my $name (@whichopt) {
     $result.=&Apache::response::answer_part('radiobuttonresponse',
@@ -270,12 +334,12 @@ sub displayanswers {
 sub start_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::radiobuttonresponse::conceptgroup=1;
-  %Apache::response::conceptgroup={};
+  %Apache::response::conceptgroup=();
   my $result;
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').
-      "</td></tr><tr><td colspan=\"3\">\n";
+	&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						 $safeeval,'concept');
@@ -288,7 +352,7 @@ sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::radiobuttonresponse::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') {
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int(rand($#names+1));
@@ -314,31 +378,33 @@ 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') {
     &Apache::lonxml::startredirection;
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token);
-    $result.=&Apache::edit::select_arg('Correct Option:','value',
+    $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',
 				       ['unused','true','false'],$token);
+    $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } 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;
 }
 
 sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text='';
-  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') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
       if (!$name) { $name=$Apache::lonxml::curdepth; }
-      if ( $Apache::radiobuttonresponse::conceptgroup ) {
+      if ( $Apache::radiobuttonresponse::conceptgroup
+	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
 	$Apache::response::conceptgroup{"$name.text"} = $text;