--- loncom/homework/rankresponse.pm	2008/12/12 09:19:34	1.61
+++ loncom/homework/rankresponse.pm	2010/12/19 00:48:50	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.61 2008/12/12 09:19:34 bisitz Exp $
+# $Id: rankresponse.pm,v 1.64 2010/12/19 00:48:50 raeburn Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -96,7 +96,7 @@ sub start_foilgroup {
     my $result;
     %Apache::response::foilgroup=();
     $Apache::rankresponse::conceptgroup=0;
-    &Apache::response::pushrandomnumber();
+    &Apache::response::pushrandomnumber(undef,$target);
     return $result;
 }
 
@@ -265,12 +265,26 @@ sub grade_response {
 	    $ad='MISSING_ANSWER';
 	}
     }
-    if ($Apache::lonhomework::type eq 'survey' &&
-	($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS') ) {
-	$ad='SUBMITTED';
+    if (($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS')) {
+        if ($Apache::lonhomework::type eq 'survey') {
+            $ad='SUBMITTED';
+        } elsif ($Apache::lonhomework::type eq 'surveycred') {
+	    $ad='SUBMITTED_CREDIT';
+        } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
+            $ad='ANONYMOUS';
+        } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
+            $ad='ANONYMOUS_CREDIT';
+        } else {
+            $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
+        }
     } else {
 	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
     }
+    if ($Apache::lonhomework::type eq 'randomizetry') {
+        if ($Apache::lonhomework::type eq 'randomizetry') {
+            $Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichfoils);
+        }
+    }
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=
 	$responsestr;
     $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
@@ -317,7 +331,18 @@ sub displayfoils {
 	my $temp=1;
 	my $id=$Apache::inputtags::response[-1];
 	my $part=$Apache::inputtags::part;
-	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+        my ($lastresponse,$newvariation);
+        if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') ||
+             ($Apache::lonhomework::type eq 'randomizetry')) &&
+        ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
+            if ($env{'form.'.$part.'.rndseed'} ne
+                $Apache::lonhomework::history{"resource.$part.rndseed"}) {
+                $newvariation = 1;
+            }
+        }
+        unless (((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) || $newvariation) {
+            $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+        }
 	my %lastresponse=&Apache::lonnet::str2hash($lastresponse); 
 	my @alp = splice @alphabet, 0, $#whichopt + 1;
 	my $internal_counter=$Apache::lonxml::counter;
@@ -338,7 +363,7 @@ sub displayfoils {
 	    foreach $option (@whichopt) {
 		if ($option eq $lastopt) {
 		    if ($target ne 'tex' ) {
-                        $optionlist.="<option selected=\"on\">$option</option>\n";
+                        $optionlist.="<option selected=\"selected\">$option</option>\n";
                     } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
                         $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); 
                     }
@@ -373,8 +398,11 @@ sub displayfoils {
 		}
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.='\vskip 0 mm   '.$text.' \vskip 0 mm '."\n";
-		    $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse').'\end{enumerate} \vskip -8 mm \strut ';
+		    $result .= '\vskip 0 mm '.$text.' \vskip 0 mm '."\n";
+		    $result .= '\vskip -1 mm';
+		    $result .= '\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]';
+		    $result .= &Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse');
+		    $result .= '\end{enumerate} \vskip -8 mm \strut ';
 		    $internal_counter++;
 		} else {
                     if($env{'form.pdfFormFields'} ne 'yes') {
@@ -388,9 +416,14 @@ sub displayfoils {
 	}
     }
     if ($target eq 'web') {
+        my $questiontype;
+        if ($Apache::lonhomework::type eq 'randomizetry') {
+            $questiontype = $Apache::lonhomework::type;
+        }
 	&Apache::response::setup_prior_tries_hash(\&format_prior_answer,
 						  [\@whichfoils,
-						   'submissiongrading']);
+						   'submissiongrading'],
+                                                  $questiontype);
     }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \vskip 0 mm ';}
     return $result;