--- loncom/homework/matchresponse.pm	2007/03/27 19:20:49	1.61
+++ loncom/homework/matchresponse.pm	2008/12/11 01:20:32	1.73.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.61 2007/03/27 19:20:49 albertel Exp $
+# $Id: matchresponse.pm,v 1.73.2.1 2008/12/11 01:20:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use Math::Random();
 use Apache::optionresponse();
 use Apache::lonlocal;
 use Apache::lonnet;
+use Apache::lonxml;
 
 BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -53,14 +54,16 @@ sub start_matchresponse {
 	$result=&Apache::response::meta_package_write('matchresponse');
     } elsif ($target eq 'edit' ) {
 	$result.=&Apache::edit::start_table($token).
-	    '<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:".
-	    &Apache::edit::deletelist($target,$token)
-	    ."</td><td>&nbsp".&Apache::edit::end_row()
-	    .&Apache::edit::start_spanning_row();
+	    '<tr><td>'.&Apache::lonxml::description($token).'</td>'
+           .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+	   .&Apache::edit::deletelist($target,$token)
+           .'</span></td>'
+           .'<td>&nbsp;'.&Apache::edit::end_row()
+	   .&Apache::edit::start_spanning_row();
 	
 	$result.=
 	    &Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
-	    &Apache::edit::select_arg('Randomize Foil Order','randomize',
+	    &Apache::edit::select_arg('Randomize Foil Order:','randomize',
 				      ['yes','no'],$token).
 	    &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";
     } elsif ($target eq 'modified') {
@@ -70,7 +73,10 @@ sub start_matchresponse {
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'analyze') {
 	my $part_id="$Apache::inputtags::part.$id";
+        $Apache::lonhomework::analyze{"$part_id.type"} = 'matchresponse';
 	push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+	push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
+	      1);
     }
     return $result;
 }
@@ -97,12 +103,12 @@ sub start_itemgroup {
     if ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::select_arg('Randomize Order:','randomize',
-					   ['yes','no'],$token);
+					   ['yes','no'],$token).'&nbsp;'x 3;
 	$result.=&Apache::edit::select_arg('Items Display Location:',
 					   'location',
 					   ['top','bottom','left','right'],
-					   $token);
-	$result.=&Apache::edit::select_arg('Items Display Directection:',
+					   $token).'&nbsp;'x 3;
+	$result.=&Apache::edit::select_arg('Items Display Direction:',
 					   'direction',
 					   ['vertical','horizontal'],
 					   $token);
@@ -192,7 +198,8 @@ sub start_item {
 	$result=&Apache::edit::tag_start($target,$token,"Item");
 	$result.=&Apache::edit::text_arg('Name:','name',$token);
 	if ($randomize ne 'no') {
-	    $result.=&Apache::edit::select_arg('Location:','location',
+	    $result.='&nbsp;'x 3 .
+                     &Apache::edit::select_arg('Location:','location',
 					       ['random','top','bottom'],
 					       $token);
 	}
@@ -248,9 +255,11 @@ sub start_foilgroup {
     &Apache::response::pushrandomnumber();
     if ($target eq 'edit') {
 	$result.=&Apache::edit::start_table($token)
-	    ."<tr><td>Collection Of Foils</td><td>Delete:"
+	    .'<tr><td>'.&mt('Collection Of Foils').'</td>'
+            .'<td><span class="LC_nobreak">'.&mt('Delete?')
 	    .&Apache::edit::deletelist($target,$token)
-	    ."</td><td>&nbsp;".&Apache::edit::end_row()
+	    .'</span></td>'
+            .'<td>&nbsp;'.&Apache::edit::end_row()
             .&Apache::edit::start_spanning_row()."\n";
     }
     return $result;
@@ -259,6 +268,9 @@ sub start_foilgroup {
 sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
+    my $part        = $Apache::inputtags::part;
+    my $response_id = $Apache::inputtags::response[-1];
+
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
 	my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
 	my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
@@ -276,7 +288,12 @@ sub end_foilgroup {
 						 ['text','value','location']);
 	    #FIXME need to store options in some way
 	}
-	&Apache::lonxml::increment_counter(&getfoilcounts($max));
+	&Apache::lonxml::increment_counter(&getfoilcounts($max), 
+					   "$part.$response_id");
+	if ($target eq 'analyze') {
+	    &Apache::lonhomework::set_bubble_lines();
+	}
+
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
@@ -415,6 +432,24 @@ sub grade_response {
     }
 }
 
+sub format_prior_answer {
+    my ($mode,$answer,$other_data) = @_;
+    my %answer      =&Apache::lonnet::str2hash($answer);
+    my $foil_order  =$other_data->[0];
+    my %grading     =&Apache::lonnet::str2hash($other_data->[1]);
+    my @items       =&Apache::lonnet::str2array($other_data->[2]);
+    my $output;
+    
+    foreach my $name (@{ $foil_order }) {
+	my $item=shift(@items);
+	$output .= '<tr><td>'.$item.'</td></tr>';
+    }
+    return if (!defined($output));
+
+    $output = '<table class="LC_prior_match">'.$output.'</table>';
+    return $output;
+}
+
 sub itemdisplay {
     my ($location)=@_;
     if ($location eq 'top' &&
@@ -426,8 +461,11 @@ sub itemdisplay {
     }
     return undef;
 }
+
 sub displayfoils {
     my ($target,$max,$randomize)=@_;
+    my ($tabsize, $lefttabsize, $righttabsize);
+
     my $result;
     my $question;
     my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
@@ -475,15 +513,19 @@ sub displayfoils {
 		$optionlist="<option></option>\n";
 	    } else {
 		if ($Apache::lonhomework::type ne 'exam') {
-		    $optionlist='\framebox[5 mm][s]{\tiny\strut}';
-		}
+                    $optionlist='\framebox[10 mm][s]{\tiny\strut}';
+                }
 	    }
 	    my $option;
 	    foreach $option (@used_letters) {
 		if ($option eq $last_letter) {
-		    if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
+		    if ($target ne 'tex') {
+                        $optionlist.="<option selected=\"on\">$option</option>\n";
+                    }
 		} else {
-		    if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
+		    if ($target ne 'tex') {
+                        $optionlist.="<option>$option</option>\n";
+                    }
 		}
 	    }
 	    if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
@@ -493,6 +535,25 @@ sub displayfoils {
 		        $optionlist."</select>\n";
 	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
+	    #
+            #  Factor out the tex computations of the left/right 1/2 minipage
+	    #  widths for left or right positioning.  This allows us
+	    #  to, if necessary constrain the bubble widths:
+	    #
+	    if ($target eq 'tex'   &&
+		(&itemdisplay('left') || &itemdisplay('right'))) {
+		$tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
+		($lefttabsize,$righttabsize)=(0,0);
+		if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
+		    $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
+		    $lefttabsize=$tabsize*$1/100;	
+		    $righttabsize=0.95*($tabsize-$lefttabsize);
+		} else {
+		    $tabsize=~/(\d+\.?\d*)/;
+		    $lefttabsize=$1/2.1;
+		    $righttabsize=0.95*($1-$lefttabsize);
+		}
+	    }
 	    if ($target ne 'tex') {
 		if ($Apache::lonhomework::type ne 'exam') {
 		    $question.="<br />\n".$optionlist.$text;
@@ -504,14 +565,25 @@ sub displayfoils {
 		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
 		}
 	    } else {		
+		# Note that if left or right positioned, we must
+		# confine the bubbles to righttabsize:
+		#
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
-		    $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
+		    $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}'
+			.'\item \hskip -3mm \textbf{'.$internal_counter.'}';
+		    if (&itemdisplay('left') || &itemdisplay('right')) {
+			$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
+		    }
+		    else {
+			$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
+		    }
+		    $question .= '\end{list} \vskip -8 mm \strut ';
 		    $internal_counter++;
 	        } else {
-		    $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
+                    $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
 		}
             } 
 	    $temp++;
@@ -528,17 +600,6 @@ sub displayfoils {
 	    $result='<table><tr><td valign="top">'.$question.
 		'</td><td valign="top">'.$result.'</td></tr></table>';
 	} else {
-	    my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
-	    my ($lefttabsize,$righttabsize)=(0,0);
-	    if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
-		$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
-		$lefttabsize=$tabsize*$1/100;	
-		$righttabsize=0.95*($tabsize-$lefttabsize);
-	    } else {
-		$tabsize=~/(\d+\.?\d*)/;
-		$lefttabsize=$1/2.1;
-		$righttabsize=0.95*($1-$lefttabsize);
-	    }
 	    $lefttabsize.=' mm ';
 	    $righttabsize.=' mm ';
 	    $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';
@@ -550,22 +611,17 @@ sub displayfoils {
 	    $result='<table><tr><td valign="top">'.$result.
 		'</td><td valign="top">'.$question.'</td></tr></table>';
 	} else {
-	    my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
-	    my ($lefttabsize,$righttabsize)=(0,0);
-	    if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
-		$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
-		$lefttabsize=$tabsize*$1/100;	
-		$righttabsize=0.95*($tabsize-$lefttabsize);
-	    } else {
-		$tabsize=~/(\d+\.?\d*)/;
-		$lefttabsize=$1/2.1;
-		$righttabsize=0.95*($1-$lefttabsize);
-	    }
 	    $lefttabsize.=' mm ';
 	    $righttabsize.=' mm ';
 	    $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';
 	}
     }
+    if ($target eq 'web') {
+	&Apache::response::setup_prior_tries_hash(\&format_prior_answer,
+						  [\@whichfoils,
+						   'submissiongrading',
+						   'submissionitems']);
+    }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
     return $result;
 }
@@ -673,12 +729,12 @@ sub end_foil {
 	    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	    &Apache::lonxml::debug("Got a name of :$name:");
 	    if (!$name) {
-		&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+		&Apache::lonxml::warning(&mt('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));
+		&Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",'<b><tt>'.$name.'</tt></b>'));
 	    }
 	    $Apache::response::foilnames{$name}++;
 	    my $location =&Apache::lonxml::get_param('location',$parstack,