--- loncom/homework/radiobuttonresponse.pm	2002/07/29 20:43:47	1.43
+++ loncom/homework/radiobuttonresponse.pm	2002/09/23 19:09:52	1.48
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.43 2002/07/29 20:43:47 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.48 2002/09/23 19:09:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,11 +51,14 @@ sub start_radiobuttonresponse {
 	."</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::end_row().&Apache::edit::start_spanning_row()."\n";
+    $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}';
@@ -98,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);
@@ -143,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");
+      my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
+						 $safeeval,'-2');
       if ($target eq 'web' || $target eq 'tex') {
-	$result=&displayfoils($target,$max,$answer);
+	$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);
       }
     }
   }
@@ -184,20 +189,34 @@ 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;
@@ -209,6 +228,19 @@ sub whichfoils {
   }
   if (&Apache::response::showallfoils()) {
     @whichfalse=@names;
+  } elsif ($randomize eq '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>";
@@ -238,21 +270,30 @@ sub whichfoils {
 }
 
 sub displayfoils {
-  my ($target,$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) {
       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:';
+      }
+      if ($target ne 'tex') {
+	  $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       } else {
-	$result.='Incorrect';
+	  $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;
@@ -266,18 +307,18 @@ sub displayfoils {
 	  if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
 	  $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       } else {
-	  $result .= $Apache::response::foilgroup{$name.'.text'};
+	  $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
       }
       $temp++;
     }
   }
-  if ($target ne 'tex') { $result.="<br />"; }
+  if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; }
   return $result;
 }
 
 sub displayanswers {
-  my ($max,$answer)=@_;
-  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',
@@ -336,18 +377,17 @@ sub start_foil {
   my $result='';
   if ($target eq 'web' || $target eq 'tex') {
     &Apache::lonxml::startredirection;
-    if ($target eq 'tex') {
-	$result .= '\item ';
-    }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',
 				       ['unused','true','false'],$token);
+    $result.=&Apache::edit::select_or_text_arg('Location:','location',
+				       ['random','bottom','top'],$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');
+						  'value','name','location');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } 
   return $result;
@@ -361,16 +401,19 @@ sub end_foil {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
       if (!$name) { $name=$Apache::lonxml::curdepth; }
       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;	
+	$Apache::response::conceptgroup{"$name.location"} = $location;	
       } else {
 	push @{ $Apache::response::foilgroup{'names'} }, $name;
 	$Apache::response::foilgroup{"$name.value"} = $value;
 	$Apache::response::foilgroup{"$name.text"} = $text;
+	$Apache::response::foilgroup{"$name.location"} = $location;
       }
     }
   }