--- loncom/homework/radiobuttonresponse.pm	2002/10/25 19:02:38	1.58
+++ loncom/homework/radiobuttonresponse.pm	2003/04/08 02:40:56	1.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.58 2002/10/25 19:02:38 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.68 2003/04/08 02:40:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -87,14 +87,13 @@ sub start_foilgroup {
   &Apache::response::setrandomnumber();
   if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
       $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
-      &Apache::lonxml::increment_counter();
   }
   return $result;
 }
 
 sub storesurvey {
   if ( !defined($ENV{'form.submitted'})) { return ''; }
-  my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+  my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
   &Apache::lonxml::debug("Here I am!:$response:");
   if ( $response !~ /[0-9]+/) { return ''; }
   my $id = $Apache::inputtags::response['-1'];
@@ -112,7 +111,17 @@ sub grade_response {
   #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']};
+  my $response;
+  if ($ENV{'form.submitted'} eq 'scantron') {
+      my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,
+		      'H'=>7,'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,
+		      'O'=>14,'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,
+		      'V'=>21,'W'=>22,'X'=>23,'Y'=>24,'Z'=>25);
+      $response = $ENV{'scantron.'.$Apache::lonxml::counter.'.answer'};
+      $response = $let_to_num{$response};
+  } else {
+      $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
+  }
   if ( $response !~ /[0-9]+/) { return; }
   my $part=$Apache::inputtags::part;
   my $id = $Apache::inputtags::response['-1'];
@@ -160,6 +169,7 @@ sub end_foilgroup {
       }
     }
   }
+  &Apache::lonxml::increment_counter();
   return $result;
 }
 
@@ -206,7 +216,7 @@ sub displayallfoils {
   } 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\" ";
+	$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++;
@@ -278,12 +288,11 @@ sub whichfoils {
     #pick a true statement
     my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1));
     &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
-    my $numinserted;
     my (@toplist, @bottomlist);
     my $topcount=0;
     # assign everyone to either toplist/bottomlist or whichfalse
     # which false is randomized, toplist bottomlist are in order
-    while ((($numinserted) < $max-1) && ($#falselist > -1)) {
+    while ((($#whichfalse) < $max-2) && ($#falselist > -1)) {
 	&Apache::lonxml::debug("Have $#whichfalse max is $max");
 	my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1));
 	&Apache::lonxml::debug("From $#falselist elms, picking $afalse");
@@ -345,15 +354,19 @@ sub displayfoils {
   my $result;
 
   my ($answer,@whichfoils)=&whichfoils($max,$randomize);
-  if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
+  my $part=$Apache::inputtags::part;
+  my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
+  my $status=$Apache::inputtags::status[-1];
+  if ( ($target ne 'tex') &&
+       (($solved =~ /^correct/) || ($status eq  'SHOW_ANSWER')) ) {
     foreach my $name (@whichfoils) {
       if ($target ne 'tex') {
 	  $result.="<br />";
       } else {
-	  $result.='\vskip 0 mm \item ';
+	  $result.='\item \vskip -2 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:';
       }
@@ -363,11 +376,11 @@ 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 @alphabet = ('A'..'Z');
     my $i = 0;
     my $temp=0;  
     my $id=$Apache::inputtags::response['-1'];
@@ -376,18 +389,15 @@ sub displayfoils {
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     foreach my $name (@whichfoils) {
       if ($target ne 'tex') {
-	  $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+	  $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 {
 	  if ($Apache::lonhomework::type eq 'exam') {
 	      $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
 	      $i++;
 	  } else {
-	      $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
+	      $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
 	  }
       }
       $temp++;