--- loncom/homework/radiobuttonresponse.pm	2002/10/14 20:33:57	1.55
+++ loncom/homework/radiobuttonresponse.pm	2002/11/07 15:34:14	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.55 2002/10/14 20:33:57 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.60 2002/11/07 15:34:14 sakharuk 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 {
@@ -343,10 +350,10 @@ sub displayfoils {
       if ($target ne 'tex') {
 	  $result.="<br />";
       } else {
-	  $result.='\vskip 0 mm \item ';
+	  $result.='\vskip 0 mm  ';
       }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
-	  if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: ';}
+	  if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: \textbf{';}
       } else {
 	$result.='Incorrect:';
       }
@@ -356,10 +363,12 @@ sub displayfoils {
 	  $result.=$Apache::response::foilgroup{$name.'.text'};
       }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
-	  if ($target ne 'tex') { $result.='</b>';}
+	  if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}
       }
     }
   } 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;
@@ -374,11 +383,11 @@ sub displayfoils {
 	      $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 .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
 	  }
       }
       $temp++;
@@ -433,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();