--- loncom/homework/radiobuttonresponse.pm	2002/09/23 22:32:41	1.49
+++ loncom/homework/radiobuttonresponse.pm	2003/04/04 23:35:17	1.65
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.49 2002/09/23 22:32:41 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.65 2003/04/04 23:35:17 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,15 @@ 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.'}.]';
+  }
+  return $result;
 }
 
 sub storesurvey {
@@ -102,12 +108,23 @@ 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']};
+  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'];
-  my ($answer,@whichfoils)=&whichfoils($max,$randomize);
   my %responsehash;
   $responsehash{$whichfoils[$response]}=$response;
   my $responsestr=&Apache::lonnet::hash2str(%responsehash);
@@ -152,11 +169,13 @@ sub end_foilgroup {
       }
     }
   }
+  if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+      &Apache::lonxml::increment_counter();
+  }
   return $result;
 }
 
 sub getfoilcounts {
-  my ($max)=@_;
   my @names;
   my $truecnt=0;
   my $falsecnt=0;
@@ -171,7 +190,7 @@ sub getfoilcounts {
       $falsecnt++;
     }
   }
-  return ($truecnt,$falsecnt,$max);
+  return ($truecnt,$falsecnt);
 }
 
 sub displayallfoils {
@@ -215,11 +234,11 @@ sub whichfoils {
   my @truelist;
   my @falselist;
   my @whichfalse =();
-  my ($truecnt,$falsecnt,$max) = &getfoilcounts($max);
+  my ($truecnt,$falsecnt) = &getfoilcounts();
   my $count=0;
   # we will add in 1 of the true statements
   if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
-  my $answer=int(rand($count));
+  my $answer=int(&Math::Random::random_uniform() * ($count));
   &Apache::lonxml::debug("Count is $count, $answer is $answer");
   my @names;
   if ( $Apache::response::foilgroup{'names'} ) {
@@ -269,16 +288,15 @@ sub whichfoils {
 	}
     }
     #pick a true statement
-    my $whichtrue = int(rand($#truelist+1));
+    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(rand($#falselist+1));
+	my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1));
 	&Apache::lonxml::debug("From $#falselist elms, picking $afalse");
 	$afalse=splice(@falselist,$afalse,1);
 	&Apache::lonxml::debug("Picked $afalse");
@@ -314,7 +332,10 @@ sub whichfoils {
 	$answer+=$topcount+$#whichfalse+1;
 	$dosplice=0;
     } else {
-	if ($topcount>0) { $answer = int(rand($#whichfalse+1))+$topcount; }
+	if ($topcount>0) { 
+	  $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1))
+	    + $topcount;
+	}
     }
     #add the top items to the top, bottom items to the bottom
     for (my $i=0;$i<=$#toplist;$i++) {
@@ -335,15 +356,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:';
       }
@@ -353,22 +378,31 @@ 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 $temp=0;
+    my @alphabet = ('A'..'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"};
     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\" ";
+          my $ValueForInput;
+	  if ($Apache::lonhomework::type ne 'exam') {$ValueForInput=$temp;} else {$ValueForInput=$alphabet[$temp];}
+	  $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$ValueForInput\" ";
 	  if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
 	  $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       } 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'}.'\\\\';  #' stupid emacs
+	      $i++;
+	  } else {
+	      $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
+	  }
       }
       $temp++;
     }
@@ -413,7 +447,7 @@ sub end_conceptgroup {
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex') {
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };
-      my $pick=int(rand($#names+1));
+      my $pick=int(&Math::Random::random_uniform() * ($#names+1));
       my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
@@ -422,6 +456,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();
@@ -444,8 +482,12 @@ sub start_foil {
     $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',
 				       ['unused','true','false'],$token);
-    $result.=&Apache::edit::select_arg('Location:','location',
-				       ['random','bottom','top'],$token);
+    my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
+					     $safeeval,'-3');
+    if ($randomize ne 'no') {
+      $result.=&Apache::edit::select_arg('Location:','location',
+					 ['random','top','bottom'],$token);
+    }
     $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,