--- loncom/homework/optionresponse.pm	2005/12/06 10:03:57	1.130
+++ 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.130 2005/12/06 10:03:57 albertel Exp $
+# $Id: optionresponse.pm,v 1.140 2007/04/05 10:29:58 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -114,6 +114,9 @@ sub start_foilgroup {
         <td>Delete an Option:
 	  <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
 ENDTABLE
+    $result.= &Apache::edit::checked_arg('Print options:','texoptions',
+					 [ ['nochoice','Don\'t show option list'] ]
+					 ,$token);
     $result.= &Apache::edit::end_row();
     $result.= &Apache::edit::start_spanning_row();
     $result.= $insertlist.'<br />';
@@ -137,7 +140,9 @@ ENDTABLE
       }
       $optchanged=1;
     }
-    if ($optchanged) {
+    my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
+						 ('texoptions'));
+    if ($optchanged || $rebuildtag ) {
       $result = "<foilgroup options=\"(";
       foreach my $option (@options) {
 	$option=~s/\'/\\\'/g;
@@ -145,7 +150,9 @@ ENDTABLE
 	$result .="'".$option."',";
       }
       chop $result;
-      $result.=')">';
+      $result.=')" ';
+      $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
+      $result .= '>';
     } # else nothing changed so just use the default mechanism
   }
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
@@ -176,8 +183,10 @@ 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);
+      
     } elsif ( $target eq 'analyze') {
 	my @shown = &whichfoils($max,$randomize);
 	&Apache::response::analyze_store_foilgroup(\@shown,
@@ -346,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;}
@@ -407,14 +437,15 @@ sub displayfoils {
       foreach my $option (@opt) {
 	  my $escopt=&HTML::Entities::encode($option,'\'"&<>');
 	  if ($option eq $lastopt) {
-	      $optionlist.="<option value='".$escopt."' selected=\"on\">$option</option>\n";
+	      $optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n";
 	  } else {
 	      $optionlist.="<option value='".$escopt."'>$option</option>\n";
 	  }
       }
       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 {
@@ -441,7 +472,7 @@ sub displayfoils {
 	      $texoptionlist = &optionlist_correction($TeXlayout,@opt);
 	  }
 	  if ($text=~/<drawoptionlist\s*\/>/) {
-	      $text=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
+	      $text=~s|<drawoptionlist\s*\/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |g;
 	  }
 
 	  if ($text=~m/\\item /) {
@@ -466,6 +497,11 @@ sub displayfoils {
       }
     }
   }
+
+  if ($target eq 'web') {
+      &setup_prior_tries_hash(\@whichopt);
+  }
+
   if ($target ne 'tex') {
       return $result.$break;
   } else {
@@ -524,32 +560,40 @@ 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].'} & ';
 	    $head.='lr';
 	} else {
 	    $line=~s/\&\s*$//;
-	    $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
+	    $result.='\vskip -2 mm\noindent\setlength{\tabcolsep}{2 mm}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
 	    $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
 	    $head ='lr';
 	    $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
@@ -681,14 +725,14 @@ sub end_foil {
 
 sub start_drawoptionlist {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    if ($target ne 'meta') {
+    if (($target ne 'meta')  && ($target ne 'answer')) {
 	return $token->[4];
     }
 }
 
 sub end_drawoptionlist {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    if ($target ne 'meta') {
+    if (($target ne 'meta') && ($target ne 'answer')) {
 	return $token->[2];
     }
 }