--- loncom/homework/rankresponse.pm	2005/12/06 10:13:46	1.49
+++ loncom/homework/rankresponse.pm	2008/08/08 16:37:13	1.57
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.49 2005/12/06 10:13:46 albertel Exp $
+# $Id: rankresponse.pm,v 1.57 2008/08/08 16:37:13 bisitz Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -66,7 +66,10 @@ sub start_rankresponse {
 	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"} = 'rankresponse';
 	push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+	push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1);
+
     }
     return $result;
 }
@@ -105,6 +108,7 @@ sub end_foilgroup {
 	if (!defined($tol)) { $tol=0; }
 	if ($target eq 'web' || $target eq 'tex') {
 	    $result=&displayfoils($target,$max,$randomize,$tol);
+	    $Apache::lonxml::post_evaluate=0;
 	} elsif ($target eq 'answer' ) {
 	    $result=&displayanswers($max,$randomize,$tol);
 	} elsif ( $target eq 'grade') {
@@ -117,7 +121,13 @@ sub end_foilgroup {
 		"$Apache::inputtags::part.$Apache::inputtags::response[-1]";
 	    $Apache::lonhomework::analyze{"$part_id.tol"}=$tol;
 	}
-	&Apache::lonxml::increment_counter(&getfoilcounts($max));
+	my $part = $Apache::inputtags::part;
+	my $id   = $Apache::inputtags::response[-1];
+	&Apache::lonxml::increment_counter(&getfoilcounts($max),
+					   "$part.$id");
+	if ($target eq 'analyze') {
+	    &Apache::lonhomework::set_bubble_lines();
+	}
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
@@ -263,6 +273,22 @@ sub grade_response {
     &Apache::response::handle_previous(\%previous,$ad);
 }
 
+sub format_prior_answer {
+    my ($mode,$answer,$other_data) = @_;
+    my %lastresponse=&Apache::lonnet::str2hash($answer);
+    my $foil_order  =$other_data->[0];
+    my %grading     =&Apache::lonnet::str2hash($other_data->[1]);
+    my $output;
+    foreach my $name (@{ $foil_order }) {
+	next if (!defined($lastresponse{$name}));
+	$output .= '<tr><td>'.$lastresponse{$name}.'</td></tr>';
+    }
+    return if (!defined($output));
+    $output =
+	'<table class="LC_prior_rank">'.$output.'</table>';
+    return $output;
+}
+
 sub displayfoils {
     my ($target,$max,$randomize,$tol)=@_;
     my $result;
@@ -304,7 +330,8 @@ sub displayfoils {
 		}
 	    }
 	    if ($target ne 'tex' && $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 {
@@ -333,6 +360,11 @@ sub displayfoils {
 	    $temp++;
 	}
     }
+    if ($target eq 'web') {
+	&Apache::response::setup_prior_tries_hash(\&format_prior_answer,
+						  [\@whichfoils,
+						   'submissiongrading']);
+    }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \vskip 0 mm ';}
     return $result;
 }
@@ -442,12 +474,12 @@ sub end_foil {
 	    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	    &Apache::lonxml::debug("Got a name of :$name:");
 	    if ($name eq "") {
-		&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,