--- loncom/homework/structuretags.pm	2019/11/04 20:50:57	1.512.2.21
+++ loncom/homework/structuretags.pm	2020/09/29 18:03:03	1.512.2.23.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.512.2.21 2019/11/04 20:50:57 raeburn Exp $
+# $Id: structuretags.pm,v 1.512.2.23.2.2 2020/09/29 18:03:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,6 +63,7 @@ use Apache::londefdef;
 use Apache::lonenc();
 use Apache::loncommon();
 use Time::HiRes qw( gettimeofday tv_interval );
+use HTML::Entities();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
@@ -652,10 +653,18 @@ sub setup_rndseed {
     }
     if ($Apache::lonhomework::type eq 'randomizetry') {
         my $partfortries = $Apache::inputtags::part;
+#
+# Where question type is "randomizetry" for a problem containing
+# a single part (and unless type is explicitly set to not be
+# "randomizetry" for that part), the number of tries used to
+# determine randomization will be for that part, and randomization
+# from calls to &random() in a perl script block before the part tag,
+# will change based on the number of tries, and value of the
+# "randomizeontries" parameter in effect for the single part.
+#
         if (ref($probpartlist) eq 'ARRAY') {
-            if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) {
-                $partfortries = $probpartlist->[0];
-                if (&Apache::lonnet::EXT("resource.$partfortries.questiontype") eq 'randomizetry') {
+            if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $partfortries)) {
+                if (&Apache::lonnet::EXT('resource.'.$probpartlist->[0].'.type') eq 'randomizetry') {
                     $partfortries = $probpartlist->[0];
                 } else {
                     $partfortries = '';
@@ -1380,9 +1389,11 @@ sub firstaccess_msg {
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     my $buttontext = &mt('Show Resource');
     my $timertext = &mt('Start Timer?');
+    my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'\'"<>&');
     $result .= (<<ENDCHECKOUT);
 <form name="markaccess" method="post" action="$uri">
 <input type="hidden" name="markaccess" value="yes" />
+<input type="hidden" name="symb" value="$shownsymb" />
 <input type="button" name="accessbutton" value="$buttontext" onclick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
 </form>
 ENDCHECKOUT
@@ -1548,7 +1559,8 @@ sub start_problem {
         $target eq 'tex') {
         if ($env{'form.markaccess'}) {
             my @interval=&Apache::lonnet::EXT("resource.0.interval");
-            my $is_set = &Apache::lonnet::set_first_access($interval[1],$interval[0]);
+            my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+            my $is_set = &Apache::lonnet::set_first_access($interval[1],$timelimit);
             unless (($is_set eq 'ok') || ($is_set eq 'already_set')) {
                 $firstaccres = $is_set;
             }
@@ -1566,11 +1578,13 @@ sub start_problem {
 			$name);
     } elsif (($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) {
         my ($symb)= &Apache::lonnet::whichuser();
-        my $navmap = Apache::lonnavmaps::navmap->new();
-        if (ref($navmap)) {
-            my $res = $navmap->getBySymb($symb);
-            if (ref($res)) {
-                $probpartlist = $res->parts();
+        if ($symb ne '') {
+            my $navmap = Apache::lonnavmaps::navmap->new();
+            if (ref($navmap)) {
+                my $res = $navmap->getBySymb($symb);
+                if (ref($res)) {
+                    $probpartlist = $res->parts();
+                }
             }
         }
     }
@@ -1581,7 +1595,14 @@ sub start_problem {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex') {
 
+        my ($symb) = &Apache::lonnet::whichuser();
 	#handle rand seed in construction space
+        if (($env{'request.state'} eq 'construct') || ($symb eq '')) {
+            my $partorder=&Apache::lonnet::metadata($env{'request.uri'},'partorder');
+            if ($partorder ne '') {
+                @{$probpartlist} = split(/,/,$partorder);
+            }
+        }
 	my $rndseed=&setup_rndseed($safeeval,$target,$probpartlist);
         if (($target eq 'grade') && &Apache::response::submitted()) {
             if ($Apache::lonhomework::type eq 'randomizetry') {
@@ -1596,7 +1617,6 @@ sub start_problem {
                 }
             }
         }
-	my ($symb)=&Apache::lonnet::whichuser();
 
 	if ($env{'request.state'} ne "construct" && 
 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
@@ -3137,7 +3157,7 @@ sub randomizetry_part_header {
     my ($header,$text);
     if ($reqtries eq 'none') {
         $header = &mt('No Question Variation');
-        $text = &mt('For this question there will no new variation after a try.');
+        $text = &mt('For this question there will be no new variation after a try.');
     } elsif ($reqtries > 1) {
         $header = &mt('New Question Variation After Every [quant,_1,Try,Tries]',$reqtries);
         if (($problemstatus eq 'no') ||