--- loncom/homework/radiobuttonresponse.pm	2006/12/07 23:10:42	1.108
+++ loncom/homework/radiobuttonresponse.pm	2007/03/27 19:20:49	1.113
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.108 2006/12/07 23:10:42 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.113 2007/03/27 19:20:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,8 +32,6 @@ use HTML::Entities();
 use Apache::lonlocal;
 use Apache::lonnet;
 
-my $exam_max_bubbles = 10;
-
 BEGIN {
     &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
 }
@@ -181,7 +179,10 @@ sub end_foilgroup {
 						   $safeeval,'-2');
 	if ( $style eq 'survey'  && $target ne 'analyze') {
 	    if ($target eq 'web' || $target eq 'tex') {
-		$result=&displayallfoils($direction);
+		$result=&displayallfoils($direction, $target);
+		if ($target eq 'web') {
+		    &setup_prior_tries_hash();
+		}
 	    } elsif ( $target eq 'answer' ) {
 		$result=&displayallanswers();
 	    } elsif ( $target eq 'grade' ) {
@@ -195,6 +196,9 @@ sub end_foilgroup {
 						       $safeeval,'-2');
 	    if ($target eq 'web' || $target eq 'tex') {
 		$result=&displayfoils($target,$max,$randomize,$direction);
+		if ($target eq 'web') {
+		    &setup_prior_tries_hash();
+		}
 	    } elsif ($target eq 'answer' ) {
 		$result=&displayanswers($max,$randomize);
 	    } elsif ( $target eq 'grade') {
@@ -208,6 +212,7 @@ sub end_foilgroup {
 		      ('true','false'));
 	    }
 	}
+	$Apache::lonxml::post_evaluate=0;
     }
     &Apache::response::poprandomnumber();
     &Apache::lonxml::increment_counter();
@@ -232,8 +237,22 @@ sub getfoilcounts {
     return ($truecnt,$falsecnt);
 }
 
+sub setup_prior_tries_hash {
+    my $part=$Apache::inputtags::part;
+    my $id=$Apache::inputtags::response[-1];	
+    foreach my $i (1..$Apache::lonhomework::history{'version'}) {
+	my $key = "$i:resource.$part.$id.submission";
+	next if (!exists($Apache::lonhomework::history{"$key"}));
+	my %response = 
+	    &Apache::lonnet::str2hash($Apache::lonhomework::history{$key});
+	my ($name) = keys(%response);
+	$Apache::inputtags::submission_display{$key} = 
+	    $Apache::response::foilgroup{$name.'.text'}
+    }
+}
+
 sub displayallfoils {
-    my ($direction)=@_;
+    my ($direction, $target)=@_;
     my $result;
     &Apache::lonxml::debug("survey style display");
     my @names;
@@ -241,6 +260,7 @@ sub displayallfoils {
 	@names= @{ $Apache::response::foilgroup{'names'} };
     }
     my $temp=0;
+    my $i   =0;
     my $id=$Apache::inputtags::response['-1'];
     my $part=$Apache::inputtags::part;
     my $lastresponse=
@@ -250,19 +270,27 @@ sub displayallfoils {
     if (&Apache::response::show_answer() ) {
 	foreach my $name (@names) {
 	    if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-		if ($direction eq 'horizontal') {
+		if (($direction eq 'horizontal') && ($target ne 'tex')) {
 		    $result.="<td>";
 		} else {
-		    $result.="<br />";
+		    if ($target eq 'tex') {
+			$result .= '\item \vskip -2mm ';
+		    } else {
+			$result.="<br />";
+		    }
 		}
 		if (defined($lastresponse{$name})) {
-		    $result.='<b>';
+		    if ($target eq 'tex') {
+			$result .= '}';
+		    } else {
+			$result.='<b>';
+		    }
 		}
 		$result .= $Apache::response::foilgroup{$name.'.text'};
-		if (defined($lastresponse{$name})) {
+		if (defined($lastresponse{$name}) && ($target ne 'tex')) {
 		    $result.='</b>';
 		}
-		if ($direction eq 'horizontal') { $result.="</td>"; }
+		if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="</td>"; }
 	    }
 	}
     } else {
@@ -271,19 +299,36 @@ sub displayallfoils {
 		if ($direction eq 'horizontal') {
 		    $result.="<td>";
 		} else {
-		    $result.="<br />";
+		    if ($target eq 'tex') {
+			$result .= '\item \vskip -2mm ';
+		    } else {
+			$result.="<br />";
+		    }
+		}
+		if ($target eq 'tex') {
+		    $result .= '$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
+		    $i++;
+		} else {
+		    $result .= '<label>';
+		    $result.="<input
+                       onchange=\"javascript:setSubmittedPart('$part');\"
+                       type=\"radio\"
+                       name=\"HWVAL_$Apache::inputtags::response['-1']\"
+                       value=\"$temp\" ";
+		    if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
+		    $result .= ' />'.$Apache::response::foilgroup{$name.'.text'}.
+			'</label>';
 		}
-                $result .= '<label>';
-		$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
-		if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
-		$result .= ' />'.$Apache::response::foilgroup{$name.'.text'}.
-                    '</label>';
 		$temp++;
-		if ($direction eq 'horizontal') { $result.="</td>"; }
+		if ($target ne 'tex') {
+		    if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="</td>"; }
+		} else {
+		    $result.='\vskip 0 mm ';
+		}
 	    }
 	}
     }
-    if ($direction eq 'horizontal') { $result.='</tr></table>'; }
+    if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='</tr></table>'; }
     return $result;
 }
 
@@ -487,24 +532,17 @@ sub displayfoils {
 	    }
 	    if ($target ne 'tex') { 
                 $result.= '<label>';
-		$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+		$result.=
+		    "<input type=\"radio\"
+                            onchange=\"javascript:setSubmittedPart('$part');\"
+                            name=\"HWVAL_$Apache::inputtags::response['-1']\"
+                            value=\"$temp\" ";
 		if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
 		$result .= ' />'.$Apache::response::foilgroup{$name.'.text'}."</label>";
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
-		    
-		    # If necessary, start a new group of bubbles
-		    # in the next row on the scantron sheet:
-		    #
-		    if ($i >= $exam_max_bubbles) {
-			$i = 0;	# Back to A.
-			$Apache::lonxml::counter++; # Next row of bubbles...
-			$result .= '\item[\textbf{'.$Apache::lonxml::counter.'}.]';
-		    }
-
 		    $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'};
 		}