--- loncom/homework/radiobuttonresponse.pm	2002/08/05 18:24:05	1.46
+++ 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.46 2002/08/05 18:24:05 sakharuk Exp $
+# $Id: radiobuttonresponse.pm,v 1.47 2002/09/23 17:20:41 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);
       }
     }
   }
@@ -211,7 +216,7 @@ sub displayallfoils {
 }
 
 sub whichfoils {
-  my ($max,$answer)=@_;
+  my ($max,$answer,$randomize)=@_;
 
   my @truelist;
   my @falselist;
@@ -223,6 +228,22 @@ sub whichfoils {
   }
   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>";
@@ -252,10 +273,10 @@ sub whichfoils {
 }
 
 sub displayfoils {
-  my ($target,$max,$answer)=@_;
+  my ($target,$max,$answer,$randomize)=@_;
   my $result;
 
-  my @whichfoils=&whichfoils($max,$answer);
+  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') {
@@ -299,8 +320,8 @@ sub displayfoils {
 }
 
 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',