--- loncom/homework/radiobuttonresponse.pm	2002/10/02 18:12:51	1.54
+++ loncom/homework/radiobuttonresponse.pm	2002/10/25 19:02:38	1.58
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.54 2002/10/02 18:12:51 sakharuk Exp $
+# $Id: radiobuttonresponse.pm,v 1.58 2002/10/25 19:02:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,7 @@ sub start_radiobuttonresponse {
   &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
   push (@Apache::lonxml::namespace,'radiobuttonresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
+  %Apache::hint::radiobutton=();
   if ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('radiobuttonresponse');
   } elsif ($target eq 'edit' ) {
@@ -79,10 +80,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 +109,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,6 +367,8 @@ sub displayfoils {
       }
     }
   } else {
+    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;
@@ -369,13 +379,15 @@ 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";
-	  $result .= '<table border="1"><tr><td>A: &nbsp;&nbsp;Correct</td><td>B: &nbsp;&nbsp;Incorrect</td></tr></table>';
+	  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.= '\vskip 2 mm \noindent \begin{tabular}{|lr|lr|}\hline ';
-	      $result.= 'A: &  Correct & B: & Incorrect';
-	      $result.='\\\\\hline\end{tabular}\vskip 0 mm ';
+	      $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
+	      $i++;
+	  } else {
+	      $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
 	  }
       }
       $temp++;
@@ -430,6 +442,10 @@ sub end_conceptgroup {
       my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
       $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");
+      my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+      push(@{ $Apache::hint::radiobutton{"$part_id.concepts"} },$concept);
+      $Apache::hint::radiobutton{"$part_id.concept.$concept"}=
+	  $Apache::response::conceptgroup{'names'};
     }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::end_table();