--- loncom/homework/grades.pm	2015/02/22 01:34:48	1.732
+++ loncom/homework/grades.pm	2015/03/18 12:53:24	1.735
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.732 2015/02/22 01:34:48 raeburn Exp $
+# $Id: grades.pm,v 1.735 2015/03/18 12:53:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2231,11 +2231,7 @@ sub submission {
                 if ($hide eq 'rand') {
                     $type = 'randomizetry';
                     $trial = $record{"resource.$partid.tries"};
-                    if (exists($record{"resource.$partid.rawrndseed"})) {
-                        $rndseed = $record{"resource.$partid.rawrndseed"};
-                    } else {
-                        $rndseed = $record{"resource.$partid.rndseed"};
-                    }
+                    $rndseed = $record{"resource.$partid.rndseed"};
                 }
 	        if ($env{'form.checkPlag'}) {
     		    my ($oname,$odom,$ocrsid,$oessay,$osim)=
@@ -4810,7 +4806,7 @@ sub displaySubByDates {
 
     my $interaction;
     my $no_increment = 1;
-    my %lastrndseed;
+    my (%lastrndseed,%lasttype);
     for ($version=1;$version<=$$record{'version'};$version++) {
 	my $timestamp = 
 	    &Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
@@ -4861,23 +4857,21 @@ sub displaySubByDates {
                         my ($trial,$rndseed,$newvariation);
                         if ($type eq 'randomizetry') {
                             $trial = $$record{"$where.$partid.tries"};
-                            if (exists($$record{"$where.$partid.rawrndseed"})) {
-                                $rndseed = $$record{"$where.$partid.rawrndseed"};
-                            } else {
-                                $rndseed = $$record{"$where.$partid.rndseed"};
-                            }
+                            $rndseed = $$record{"$where.$partid.rndseed"};
                         }
 		        if ($$record{"$where.$partid.tries"} eq '') {
 			    $displaySub[0].=&mt('Trial not counted');
 		        } else {
 			    $displaySub[0].=&mt('Trial: [_1]',
 					    $$record{"$where.$partid.tries"});
-                            if ($rndseed || $lastrndseed{$partid}) {
-                                if ($rndseed ne $lastrndseed{$partid}) {
+                            if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) {
+                                if (($rndseed ne $lastrndseed{$partid}) &&
+                                    (($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) {
                                     $newvariation = '&nbsp;('.&mt('New variation this try').')';
                                 }
                             }
                             $lastrndseed{$partid} = $rndseed;
+                            $lasttype{$partid} = $type;
 		        }
 		        my $responseType=($isTask ? 'Task'
                                               : $responseType->{$partid}->{$responseId});