--- loncom/homework/optionresponse.pm	2007/01/17 10:46:13	1.136
+++ loncom/homework/optionresponse.pm	2007/04/05 10:29:58	1.140
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.136 2007/01/17 10:46:13 foxr Exp $
+# $Id: optionresponse.pm,v 1.140 2007/04/05 10:29:58 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -183,6 +183,7 @@ sub end_foilgroup {
 					       $safeeval,'-2');
     if ($target eq 'web' || $target eq 'tex') {
       $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);
+      $Apache::lonxml::post_evaluate=0;
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);
       
@@ -354,6 +355,27 @@ sub check_for_invalid {
     }
 }
 
+sub setup_prior_tries_hash {
+    my ($whichopt) = @_;
+    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 %lastresponse=
+	    &Apache::lonnet::str2hash($Apache::lonhomework::history{$key});
+	my $output;
+	foreach my $name (@$whichopt) {
+	    next if (!defined($lastresponse{$name}));
+	    $output .= '<td>'.$lastresponse{$name}.'</td>';
+	}
+	next if (!defined($output));
+	$output =
+	    '<table class="LC_optres_prior"><tr>'.$output.'</tr></table>';
+	$Apache::inputtags::submission_display{$key} = $output;
+    }
+}
+
 sub displayfoils {
   my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
@@ -422,7 +444,8 @@ sub displayfoils {
       }
       if ($target ne 'tex') {
 	  if ($Apache::lonhomework::type ne 'exam') {
-	      $optionlist='<select name="HWVAL_'.
+	      $optionlist='<select onchange="javascript:setSubmittedPart(\''.
+		  $part.'\');" name="HWVAL_'.
 		  $Apache::inputtags::response['-1'].':'.$temp.'">'.
 		  $optionlist."</select>\n";
 	  } else {
@@ -474,6 +497,11 @@ sub displayfoils {
       }
     }
   }
+
+  if ($target eq 'web') {
+      &setup_prior_tries_hash(\@whichopt);
+  }
+
   if ($target ne 'tex') {
       return $result.$break;
   } else {
@@ -532,25 +560,33 @@ sub webbubbles {
 
 
 sub bubbles {
-    my ($ralphabet,$ropt,$response) = @_;
+    my ($ralphabet,$ropt,$response, $max_width) = @_;
     my @alphabet = @$ralphabet;
     my @opt = @$ropt;
     my ($result,$head,$line) =('','','');
     my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;
     my $textwidth;
-    if ($env{'form.textwidth'} ne '') {
+    if ($max_width) {
+	$textwidth=$max_width;
+	&Apache::lonnet::logthis("Max width passed in: $max_width");
+    }
+    elsif ($env{'form.textwidth'} ne '') {
 	$env{'form.textwidth'}=~/(\d+)/;
 	$textwidth=$1;
+	&Apache::lonnet::logthis("Max width from form: $textwidth");
     } else {
 	$env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
 	$textwidth=$1.'.'.$2;
+	&Apache::lonnet::logthis("Max width defaults? $textwidth");
     }
+    &Apache::lonnet::logthis("Final maxwidth: $textwidth");
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
 	my $leftmargin;
 	$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
 	if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
 	if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
+
 	$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
 	if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
 	    $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';