--- loncom/homework/optionresponse.pm	2004/04/23 17:57:18	1.107
+++ loncom/homework/optionresponse.pm	2007/04/16 22:50:41	1.142
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.107 2004/04/23 17:57:18 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.142 2007/04/16 22:50:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,7 @@ package Apache::optionresponse;
 use strict;
 use Apache::response();
 use Apache::lonlocal;
+use Apache::lonnet;
 
 BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
@@ -38,7 +39,7 @@ sub start_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   #when in a option response use these
-  &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
+  &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist'));
   push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
   %Apache::hint::option=();
@@ -56,10 +57,14 @@ sub start_optionresponse {
 				     $token,'4').
         &Apache::edit::select_arg('Randomize Foil Order','randomize',
 				  ['yes','no'],$token).
+        &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',
+				  [['horizontal',&mt('Normal list')],
+				   ['vertical',&mt('Listed in a vertical column')]],$token).
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						 $safeeval,'max','randomize');
+						 $safeeval,'max','randomize',
+						 'TeXlayout');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('optionresponse');
@@ -74,7 +79,7 @@ sub end_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;
   pop @Apache::lonxml::namespace;
-  &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
+  &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist'));
   my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
   undef(%Apache::response::foilnames);
@@ -88,7 +93,7 @@ sub start_foilgroup {
   my $result='';
   %Apache::response::foilgroup=();
   $Apache::optionresponse::conceptgroup=0;
-  &Apache::response::setrandomnumber();
+  &Apache::response::pushrandomnumber();
   if ($target eq 'edit') {
     my $optionlist="<option></option>\n";
     my $option;
@@ -109,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 />';
@@ -117,14 +125,14 @@ ENDTABLE
     my @options;
     my $optchanged=0;
     eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
-    if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
-      my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
+    if ($env{"form.$Apache::lonxml::curdepth.deleteopt"}) {
+      my $delopt=$env{"form.$Apache::lonxml::curdepth.deleteopt"};
       &Apache::lonxml::debug("Deleting :$delopt:");
       splice(@options,$delopt-1,1);
       $optchanged=1;
     }
-    if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
-      my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"};
+    if ($env{"form.$Apache::lonxml::curdepth.options"}) {
+      my $newopt = $env{"form.$Apache::lonxml::curdepth.options"};
       if ($options[0]) {
 	push(@options,$newopt);
       } else {
@@ -132,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;
@@ -140,11 +150,14 @@ 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') {
-      $result .= ' \begin{enumerate} ';
+      $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
+                   \begin{enumerate} ';
   }
   return $result;
 }
@@ -159,8 +172,10 @@ sub end_foilgroup {
     my $name;
     my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
-    my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,undef,0);
-    &Apache::lonnet::logthis("PARAMETER U>$TeXlayout<U");
+    &Apache::lonxml::debug("options:".join(':',@opt));
+
+    my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,
+					     -2,0);
     if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
     &Apache::lonxml::debug("Options are $#opt");
     my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
@@ -168,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,
@@ -177,7 +194,7 @@ sub end_foilgroup {
 	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
 	push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
     } elsif ( $target eq 'grade') {
-      if ( defined $ENV{'form.submitted'}) {
+      if ( &Apache::response::submitted()) {
 	my @whichopt = &whichfoils($max,$randomize);
 	my $temp=1;my $name;
 	my %responsehash;
@@ -187,7 +204,7 @@ sub end_foilgroup {
 	my $ignored=0;
 	foreach $name (@whichopt) {
 	  my $response=&Apache::response::getresponse($temp);
-	  if ($ENV{'form.submitted'} eq 'scantron') {
+	  if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) {
 	      $response = $opt[$response];
 	  }
 	  if ( $response =~ /[^\s]/) {
@@ -215,7 +232,16 @@ sub end_foilgroup {
 	    $responsestr;
 	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
 	
-	if (!$Apache::lonhomework::scantronmode) {
+	if ($Apache::lonhomework::type eq 'survey') {
+	    if ($ignored == 0) {
+		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+		&Apache::response::handle_previous(\%previous,$ad);
+	    } elsif ($wrong==0 && $right==0) {
+	    } else {
+		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
+		&Apache::response::handle_previous(\%previous,$ad);
+	    }
+	} elsif (!$Apache::lonhomework::scantronmode) {
 	    my $ad;
 	    if ($wrong==0 && $ignored==0) {
 		$ad='EXACT_ANS';
@@ -233,7 +259,11 @@ sub end_foilgroup {
 	} else {
 	    my $ad;
 	    if ($wrong==0 && $right==0) {
-		#nothing submitted
+		#nothing submitted only assign a score if we 
+		#need to override a previous grade
+		if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) {
+		    $ad='ASSIGNED_SCORE';
+		}
 	    } else {
 		$ad='ASSIGNED_SCORE';
 	    }
@@ -252,6 +282,7 @@ sub end_foilgroup {
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       $result .= '\end{enumerate}';
   }
+  &Apache::response::poprandomnumber();
   return $result;
 }
 
@@ -273,17 +304,34 @@ sub whichfoils {
 }
 
 sub displayanswers {
-  my ($max,$randomize,@opt)=@_;
-  if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
-  my @names = @{ $Apache::response::foilgroup{'names'} };
-  my @whichopt = &whichfoils($max,$randomize);
-  my $result=&Apache::response::answer_header('optionresponse');
-  foreach my $name (@whichopt) {
-    $result.=&Apache::response::answer_part('optionresponse',
-		     $Apache::response::foilgroup{$name.'.value'})
-  }
-  $result.=&Apache::response::answer_footer('optionresponse');
-  return $result;
+    my ($max,$randomize,@opt)=@_;
+    if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
+    my @names = @{ $Apache::response::foilgroup{'names'} };
+    my @whichopt = &whichfoils($max,$randomize);
+    my $result;
+    if ($Apache::lonhomework::type eq 'exam') {
+	my $i = 0;
+	my %opt = map { ($_,$i++) } @opt;
+	
+	$i = 0;
+	my @alphabet = ('A'..'Z');
+	foreach my $name (@whichopt) {
+	    $result.=&Apache::response::answer_header('optionresponse',$i++);
+	    $result.=&Apache::response::answer_part('optionresponse',
+						    $alphabet[$opt{$Apache::response::foilgroup{$name.'.value'}}]);
+	    $result.=&Apache::response::answer_part('optionresponse',
+						    $Apache::response::foilgroup{$name.'.value'});
+	    $result.=&Apache::response::answer_footer('optionresponse');
+	}
+    } else {
+	$result=&Apache::response::answer_header('optionresponse');
+	foreach my $name (@whichopt) {
+	    $result.=&Apache::response::answer_part('optionresponse',
+						    $Apache::response::foilgroup{$name.'.value'});
+	}
+	$result.=&Apache::response::answer_footer('optionresponse');
+    }
+    return $result;
 }
 
 sub check_for_invalid {
@@ -307,9 +355,29 @@ 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 .= '<tr><td>'.$lastresponse{$name}.'</td></tr>';
+	}
+	next if (!defined($output));
+	$output =
+	    '<table class="LC_prior_option">'.$output.'</table>';
+	$Apache::inputtags::submission_display{$key} = $output;
+    }
+}
+
 sub displayfoils {
   my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
-  &Apache::lonnet::logthis("PARAMETER >>$TeXlayout<<");
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;
@@ -339,13 +407,13 @@ sub displayfoils {
 		if ($text=~/^\s*$/) {
 		    $text=$value.$text;
 		} else {
-		    $text=$value.': '.$text;
+		    $text='<b>'.$value.':</b> '.$text;
 		}
 	    } else {
 		$text='&#149;'.$text;
 	    }
 	    $result.=$text."\n";
-      }
+	}
       if ($Apache::lonhomework::type eq 'exam') {
 	  $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
       }
@@ -366,17 +434,18 @@ sub displayfoils {
       }
       my $lastopt=$lastresponse{$name};
       my $optionlist="<option></option>\n";
-      my $option;
-      foreach $option (@opt) {
-	if ($option eq $lastopt) {
-	  $optionlist.="<option selected=\"on\">$option</option>\n";
-	} else {
-	  $optionlist.="<option>$option</option>\n";
-	}
+      foreach my $option (@opt) {
+	  my $escopt=&HTML::Entities::encode($option,'\'"&<>');
+	  if ($option eq $lastopt) {
+	      $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 {
@@ -403,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 /) {
@@ -428,6 +497,11 @@ sub displayfoils {
       }
     }
   }
+
+  if ($target eq 'web') {
+      &setup_prior_tries_hash(\@whichopt);
+  }
+
   if ($target ne 'tex') {
       return $result.$break;
   } else {
@@ -438,7 +512,6 @@ sub displayfoils {
 
 sub optionlist_correction {
     my ($TeXlayout,@options) = @_;
-    &Apache::lonnet::logthis("PARAMETER >$TeXlayout<");
     my $texoptionlist='\\item [] Choices: ';
     if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';}
     if (scalar(@options) > 0) {
@@ -449,10 +522,10 @@ sub optionlist_correction {
 	    if ($TeXlayout eq 'vertical') {
 		$texoptionlist.=' \vskip 0 mm ',
 	    } else {
-		$texoptionlist.=',';
+		$texoptionlist.=', ';
 	    }
 	}
-	chop($texoptionlist);
+	$texoptionlist=~s/, $//;
 	if ($TeXlayout ne 'vertical') {$texoptionlist.='.';}
     } else {
 	if ($TeXlayout ne 'vertical') {$texoptionlist='\\item [] \\vskip -5 mm';}
@@ -475,8 +548,11 @@ sub webbubbles {
 	}
 	$result.='<td><input type="radio" name="HWVAL_'.
 	    $Apache::inputtags::response['-1'].':'.$temp.
-	    '" value="'.$opt[$ind].'" '.$checked.' />'.$alphabet[$ind].': '.
-	    $opt[$ind].'</td>';
+	    '" value="'.$opt[$ind].'" '.$checked.' />';
+	if ($alphabet[$ind]) {
+	    $result.=$alphabet[$ind].': ';
+	}
+	$result.=$opt[$ind].'</td>';
     }
     $result.='</tr></table>';
     return $result;
@@ -484,31 +560,39 @@ sub webbubbles {
 
 
 sub bubbles {
-    my ($ralphabit,$ropt) = @_;
-    my @alphabet = @$ralphabit;
+    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 '') {
-	$ENV{'form.textwidth'}=~/(\d+)/;
+    if (defined($max_width)) {
+	$textwidth=$max_width;
+	&Apache::lonxml::debug("Max width passed in: $max_width");
+    } elsif ($env{'form.textwidth'} ne '') {
+	$env{'form.textwidth'}=~/(\d+)/;
 	$textwidth=$1;
+	&Apache::lonxml::debug("Max width from form: $textwidth");
     } else {
-	$ENV{'textwidth'}=~/(\d*)\.?(\d*)/;
+	$env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
 	$textwidth=$1.'.'.$2;
+	&Apache::lonxml::debug("Max width defaults? $textwidth");
     }
+    &Apache::lonxml::debug("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;
@@ -596,17 +680,22 @@ sub end_foil {
   my $result = '';
   if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
       $text=&Apache::lonxml::endredirection;
-      $text=~/(\w)/;
-      &Apache::lonnet::logthis("TTTEXT IS HERE NOW >>$text<< >>>$1<<<");
+      if ($target eq 'tex') {$text=~s/\\strut\s*\\\\\s*\\strut/\\vskip 0 mm/;}
       if (($target eq 'tex') and ($Apache::lonhomework::type ne 'exam') and ($text=~/\S/)) {$text = '\vspace*{-2 mm}\item '.$text;} 
   }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
       || $target eq 'tex' || $target eq 'analyze') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+    if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+	$text='\vskip 5mm $\triangleright$ '.$text;
+    }
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
       &Apache::lonxml::debug("Got a name of :$name:");
-      if (!$name) { $name=$Apache::lonxml::curdepth; }
+      if ($name eq "") {
+	  &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+	  $name=$Apache::lonxml::curdepth;
+      }
       &Apache::lonxml::debug("Using a name of :$name:");
       if (defined($Apache::response::foilnames{$name})) {
 	  &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
@@ -617,20 +706,12 @@ sub end_foil {
 	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
-	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-	    $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
-	} else {
-	    $Apache::response::conceptgroup{"$name.text"} = $text;
-	}
+	$Apache::response::conceptgroup{"$name.text"} = $text;
 	$Apache::response::conceptgroup{"$name.location"} = $location;
       } else {
 	push @{ $Apache::response::foilgroup{'names'} }, $name;
 	$Apache::response::foilgroup{"$name.value"} = $value;
-	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-	    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
-	} else {
-	    $Apache::response::foilgroup{"$name.text"} = $text;
-	}
+	$Apache::response::foilgroup{"$name.text"} = $text;
 	$Apache::response::foilgroup{"$name.location"} = $location;
       }
     }
@@ -641,6 +722,20 @@ sub end_foil {
   return $result;
 }
 
+sub start_drawoptionlist {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    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') && ($target ne 'answer')) {
+	return $token->[2];
+    }
+}
+
 sub insert_foil {
   return '
 <foil name="" value="unused">