--- loncom/homework/radiobuttonresponse.pm	2002/09/26 20:45:00	1.51
+++ loncom/homework/radiobuttonresponse.pm	2002/10/17 17:13:44	1.57
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.51 2002/09/26 20:45:00 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.57 2002/10/17 17:13:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,10 +79,16 @@ sub end_radiobuttonresponse {
 
 %Apache::response::foilgroup=();
 sub start_foilgroup {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
   %Apache::response::foilgroup=();
   $Apache::radiobuttonresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();
-  return '';
+  if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+      $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+      &Apache::lonxml::increment_counter();
+  }
+  return $result;
 }
 
 sub storesurvey {
@@ -102,12 +108,13 @@ sub storesurvey {
 
 sub grade_response {
   my ($max,$randomize)=@_;
+  #keep the random numbers the same must always call this
+  my ($answer,@whichfoils)=&whichfoils($max,$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 ($answer,@whichfoils)=&whichfoils($max,$randomize);
   my %responsehash;
   $responsehash{$whichfoils[$response]}=$response;
   my $responsestr=&Apache::lonnet::hash2str(%responsehash);
@@ -359,7 +366,9 @@ sub displayfoils {
       }
     }
   } else {
-    my $temp=0;
+    my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z');
+    my $i = 0;
+    my $temp=0;  
     my $id=$Apache::inputtags::response['-1'];
     my $part=$Apache::inputtags::part;
     my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
@@ -369,8 +378,16 @@ sub displayfoils {
 	  $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 ($Apache::lonhomework::type eq 'exam') {
+	      $result .= '<table border="1"><tr><td>A: &nbsp;&nbsp;Correct</td><td>B: &nbsp;&nbsp;Incorrect</td></tr></table>';
+	  }
       } else {
-	  $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
+	  if ($Apache::lonhomework::type eq 'exam') {
+	      $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';
+	      $i++;
+	  } else {
+	      $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
+	  }
       }
       $temp++;
     }
@@ -448,9 +465,9 @@ sub start_foil {
 				       ['unused','true','false'],$token);
     my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
 					     $safeeval,'-3');
-    if ($randomize eq 'yes') {
+    if ($randomize ne 'no') {
       $result.=&Apache::edit::select_arg('Location:','location',
-					 ['random','bottom','top'],$token);
+					 ['random','top','bottom'],$token);
     }
     $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {