--- loncom/homework/structuretags.pm	2019/08/11 12:27:11	1.563
+++ loncom/homework/structuretags.pm	2023/06/02 01:20:27	1.575
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.563 2019/08/11 12:27:11 raeburn Exp $
+# $Id: structuretags.pm,v 1.575 2023/06/02 01:20:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,7 +62,9 @@ use Apache::lonxml;
 use Apache::londefdef;
 use Apache::lonenc();
 use Apache::loncommon();
+use Apache::lonnavmaps;
 use Time::HiRes qw( gettimeofday tv_interval );
+use HTML::Entities();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
@@ -624,7 +626,9 @@ sub page_start {
         my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
         my ($path,$multiresp) = 
             &Apache::loncommon::get_turnedin_filepath($symb,$uname,$udom);
-        if (($is_task) || ($needs_upload)) {
+        if ($env{'request.user_in_effect'}) {
+            $form_tag_start .= ' onsubmit="preventDefault();"';
+        } elsif (($is_task) || ($needs_upload)) {
             $form_tag_start .= ' onsubmit="return file_submission_check(this,'."'$path','$multiresp'".');"';
         }
 	$form_tag_start.='>'."\n";
@@ -667,15 +671,40 @@ sub get_resource_name {
 }
 
 sub setup_rndseed {
-    my ($safeeval,$target,$probpartlist)=@_;
+    my ($safeeval,$target,$probpartlist,$prevparttype)=@_;
     my ($symb)=&Apache::lonnet::whichuser();
-    my ($questiontype,$set_safespace,$rndseed);
+    my ($questiontype,$set_safespace,$rndseed,$numtries,$reqtries);
     if ($target eq 'analyze') {
         $questiontype = $env{'form.grade_questiontype'};
     }
     unless (defined($questiontype)) {
         $questiontype = $Apache::lonhomework::type;
     }
+    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 $partfortries)) {
+                if (&Apache::lonnet::EXT('resource.'.$probpartlist->[0].'.type') eq 'randomizetry') {
+                    $partfortries = $probpartlist->[0];
+                } else {
+                    $partfortries = '';
+                }
+            }
+        }
+        if ($partfortries ne '') {
+            $numtries = $Apache::lonhomework::history{"resource.$partfortries.tries"};
+            $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
+        }
+    }
     if (($env{'request.state'} eq "construct")
         || ($symb eq '')
         || ($Apache::lonhomework::type eq 'practice')
@@ -693,11 +722,15 @@ sub setup_rndseed {
                 $env{'form.rndseed'}=$rndseed;
             }
 	}
-        if (($env{'request.state'} eq "construct") && 
+        if ((($env{'request.state'} eq "construct") || ($symb eq '')) && 
             ($Apache::lonhomework::type eq 'randomizetry')) {
-            my $tries = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
-            if ($tries) {
-                $rndseed += $tries;
+            if ($numtries) {
+                if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
+                    my $inc = int($numtries/$reqtries);
+                    $rndseed += $inc;
+                } else {
+                    $rndseed += $numtries;
+                }
             }
             $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
         }
@@ -735,13 +768,7 @@ sub setup_rndseed {
         }
         unless (($target eq 'analyze') && (defined($rndseed))) {
             $rndseed=&Apache::lonnet::rndseed();
-            my $partfortries = $Apache::inputtags::part;
-            if (ref($probpartlist) eq 'ARRAY') {
-                if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) {
-                    $partfortries = $probpartlist->[0];
-                }
-            }
-            my $curr_try = $Apache::lonhomework::history{"resource.$partfortries.tries"};
+            my $curr_try = $numtries;
             if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
                 $curr_try ++;
             }
@@ -749,7 +776,6 @@ sub setup_rndseed {
                 $rndseed = $1;
             }
             if ($curr_try) {
-                my $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
                 if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
                     my $inc = int(($curr_try-1)/$reqtries);
                     $rndseed += $inc;
@@ -762,11 +788,20 @@ sub setup_rndseed {
         if ($target eq 'grade') {
             $Apache::lonhomework::rawrndseed = $rndseed;
         }
+    } elsif ($prevparttype eq 'randomizetry') {
+        if ($env{'form.0.rndseed'} ne '') {
+            $set_safespace = 1;
+            $rndseed = $env{'form.0.rndseed'};
+        }
     }
     if ($set_safespace) {
         if ($safeeval) {
             &Apache::lonxml::debug("Setting rndseed to $rndseed");
             &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
+            if (($Apache::lonhomework::type eq 'randomizetry') || ($prevparttype eq 'randomizetry')) {
+                &Apache::lonxml::debug("Setting randomizetrypart to $Apache::inputtags::part");
+                &Apache::run::run('$external::randomizetrypart="'.$Apache::inputtags::part.'";',$safeeval);
+            }
         }
     }
     unless (($env{'request.state'} eq "construct") || ($symb eq '')) {
@@ -1115,7 +1150,8 @@ sub finalize_storage {
 	delete(@Apache::lonhomework::results{@remove});
 	my ($symb,$courseid,$domain,$name) = 
 	    &Apache::lonnet::whichuser($given_symb);
-        my ($passback,$ltiscope,$ltimap,$ltisymb,$ltiref,$total,$possible,$dopassback);
+        my ($passback,$pbscope,$pbmap,$pbsymb,$pbtype,$crsdef,$ltinum,
+            $ltiref,$total,$possible,$dopassback);
 	if ($env{'request.state'} eq 'construct' 
 	    || $symb eq ''
 	    || $Apache::lonhomework::type eq 'practice') {
@@ -1129,11 +1165,16 @@ sub finalize_storage {
             if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain) &&
                 (!$Apache::lonhomework::scantronmode) && (!defined($env{'form.grade_symb'})) &&
                 (!defined($env{'form.grade_courseid'}))) {
-                if ($env{'request.lti.login'}) {
+                if (($env{'request.lti.login'}) || ($env{'request.deeplink.login'})) {
                     my ($map)=&Apache::lonnet::decode_symb($symb);
                     $map = &Apache::lonnet::clutter($map);
-                    ($passback,$ltiscope,$ltimap,$ltisymb,$ltiref) = 
-                        &needs_lti_passback($courseid,$symb,$map);
+                    if ($env{'request.lti.login'}) {
+                        ($passback,$pbscope,$pbmap,$pbsymb,$ltinum,$ltiref) = 
+                            &needs_lti_passback($courseid,$symb,$map);
+                    } elsif ($env{'request.deeplink.login'}) {
+                        ($passback,$pbscope,$pbmap,$pbsymb,$crsdef,$ltinum,$ltiref) =
+                            &needs_linkprot_passback($courseid,$symb,$map);
+                    }
                 }
                 if ($Apache::lonhomework::history{'version'}) {
                     $laststore = $Apache::lonhomework::history{'version'}.'='.
@@ -1230,7 +1271,7 @@ sub finalize_storage {
                     }
                 }
             }
-            if (($dopassback) && ($ltiscope eq 'resource') && ($ltisymb eq $symb)) {
+            if (($dopassback) && ($pbscope eq 'resource') && ($pbsymb eq $symb)) {
                 $total = 0;
                 $possible = 0;
                 my $navmap = Apache::lonnavmaps::navmap->new();
@@ -1271,24 +1312,39 @@ sub finalize_storage {
             &store_aggregates($symb,$courseid);
             if ($dopassback) {
                 my $scoreformat = 'decimal';
-                if (ref($ltiref) eq 'HASH') {
-                    if ($ltiref->{'scoreformat'} =~ /^(decimal|ratio|percentage)$/) {
-                        $scoreformat = $1;
+                if (($env{'request.lti.login'}) || ($env{'request.deeplink.login'})) {
+                    if (ref($ltiref) eq 'HASH') {
+                        if ($ltiref->{'scoreformat'} =~ /^(decimal|ratio|percentage)$/) {
+                            $scoreformat = $1;
+                        }
                     }
                 }
+                my ($pbid,$pburl,$pbtype);
+                if ($env{'request.lti.login'}) {
+                    $pbid = $env{'request.lti.passbackid'};
+                    $pburl = $env{'request.lti.passbackurl'};
+                    $pbtype = 'lti';
+                } elsif ($env{'request.deeplink.login'}) {
+                    $pbid = $env{'request.linkprotpbid'};
+                    $pburl = $env{'request.linkprotpburl'};
+                    $pbtype = 'linkprot';
+                }
                 my $ltigrade = {
+                                 'ltinum'   => $ltinum,
                                  'lti'      => $ltiref,
+                                 'crsdef'   => $crsdef,
                                  'cid'      => $courseid,
                                  'uname'    => $env{'user.name'},
                                  'udom'     => $env{'user.domain'},
-                                 'pbid'     => $env{'request.lti.passbackid'},
-                                 'pburl'    => $env{'request.lti.passbackurl'},
-                                 'scope'    => $ltiscope,
-                                 'ltimap'   => $ltimap,
-                                 'ltisymb'  => $ltisymb,
+                                 'pbid'     => $pbid,
+                                 'pburl'    => $pburl,
+                                 'pbtype'   => $pbtype,
+                                 'scope'    => $pbscope,
+                                 'pbmap'    => $pbmap,
+                                 'pbsymb'   => $pbsymb,
                                  'format'   => $scoreformat,
                                };
-                if ($ltiscope eq 'resource') {
+                if ($pbscope eq 'resource') {
                     $ltigrade->{'total'} = $total;
                     $ltigrade->{'possible'} = $possible;
                 }
@@ -1309,6 +1365,7 @@ sub needs_lti_passback {
             my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
             if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
                 if ($lti{$env{'request.lti.login'}}{'passback'}) {
+                    my $itemnum = $env{'request.lti.login'};
                     my ($ltiscope,$ltiuri,$ltisymb) =
                         &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},
                                                                $cdom,$cnum,1);
@@ -1327,7 +1384,7 @@ sub needs_lti_passback {
                             $passback = 1;
                         }
                     }
-                    return ($passback,$ltiscope,$ltimap,$ltisymb,$lti{$env{'request.lti.login'}});
+                    return ($passback,$ltiscope,$ltimap,$ltisymb,$itemnum,$lti{$itemnum});
                 }
             }
         }
@@ -1335,6 +1392,59 @@ sub needs_lti_passback {
     return;
 }
 
+sub needs_linkprot_passback {
+    my ($courseid,$symb,$map) = @_;
+    if (($env{'request.linkprotpbid'}) && ($env{'request.linkprotpburl'})) {
+        if ($courseid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/) {
+            my ($cdom,$cnum) = ($1,$2);
+            my ($deeplink_symb,$deeplink_map,$deeplink,$passback);
+            $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom);
+            if ($deeplink_symb) {
+                if ($deeplink_symb =~ /\.(page|sequence)$/) {
+                    $deeplink_map = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[2]);
+                    my $navmap = Apache::lonnavmaps::navmap->new();
+                    if (ref($navmap)) {
+                        $deeplink = $navmap->get_mapparam(undef,$deeplink_map,'0.deeplink');
+                    }
+                } else {
+                    $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$deeplink_symb);
+                    $deeplink_map = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[0]);
+                }
+                if (($deeplink ne '') && ($env{'request.linkprot'} ne '')) {
+                    my ($itemid,$tinyurl) = split(/:/,$env{'request.linkprot'});
+                    if ($itemid =~ /^(\d+)(c|d)$/) {
+                        my ($itemnum,$itemtype) = ($1,$2);
+                        my ($crsdef,$lti_in_use);
+                        if ($itemtype eq 'c') {
+                            $crsdef = 1;
+                            my %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
+                            $lti_in_use = $crslti{$itemnum};
+                        } else {
+                            my %domlti = &Apache::lonnet::get_domain_lti($cdom,'linkprot');
+                            $lti_in_use = $domlti{$itemnum};
+                        }
+                        my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink);
+                        my $passback;
+                        if ($scope eq 'resource') {
+                            if ($deeplink_symb eq $symb) {
+                                $passback = 1;
+                            }
+                        } elsif ($scope eq 'map') {
+                            if (&Apache::lonnet::clutter($deeplink_map) eq $map) {
+                                $passback = 1;
+                            }
+                        } elsif ($scope eq 'recurse') {
+#FIXME check if $deeplink_map contains $map
+                            $passback = 1;
+                        }
+                        return ($passback,$scope,$deeplink_map,$deeplink_symb,$crsdef,$itemnum,$lti_in_use);
+                    }
+                }
+            }
+        }
+    }
+}
+
 =pod
 
 =item check_correctness_changes()
@@ -1615,9 +1725,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
@@ -1659,6 +1771,7 @@ sub init_problem_globals {
     @Apache::structuretags::whilebody=();
     @Apache::structuretags::whileline=();
     $Apache::lonhomework::scantronmode=0;
+    $Apache::lonhomework::randomizetrypart=0;
     undef($Apache::lonhomework::name);
     undef($Apache::lonhomework::default_type);
     undef($Apache::lonhomework::type);
@@ -1682,6 +1795,7 @@ sub reset_problem_globals {
     undef($Apache::lonhomework::default_type);
     undef($Apache::lonhomework::type);
     undef($Apache::lonhomework::scantronmode);
+    undef($Apache::inputtags::randomizetrypart);
     undef($Apache::lonhomework::ignore_response_errors);
     undef(@Apache::functionplotresponse::callscripts);
     &Apache::lonhomework::reset_show_problem_status();
@@ -1798,15 +1912,22 @@ sub start_problem {
     } elsif ((($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) ||
              ($target eq 'answer')) {
         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();
+                }
             }
         }
     }
 
+    if (($target eq 'web') && ($env{'request.user_in_effect'})) {
+        &Apache::lonxml::get_all_text("/problem",$parser,$style);
+        return $result;
+    }
+
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
         $target eq 'tex') {
 
@@ -1822,7 +1943,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') {
@@ -1837,12 +1965,15 @@ sub start_problem {
                 }
             }
         }
-	my ($symb)=&Apache::lonnet::whichuser();
 
 	if ($env{'request.state'} ne "construct" && 
 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
+            my $rndseedval = $rndseed;
+            if (($symb eq '') && ($Apache::lonhomework::type eq 'randomizetry')) {
+                $rndseedval = $env{'form.rndseed'};
+            }
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
-		$rndseed.'" />'.
+		$rndseedval.'" />'.
 		    '<button type="submit" name="resetdata"
                         value="new_problem_variation">'.&mt('New Problem Variation').'</button>';
 	    if (exists($env{'form.username'})) {
@@ -1864,15 +1995,22 @@ sub start_problem {
                 $form_tag_start.=&practice_problem_header();
             }
 	    $form_tag_start.='<hr />';
-        } elsif (($env{'request.state'} ne "construct") &&
-                 ($Apache::lonhomework::type eq 'randomizetry') &&
-                 ($status eq 'CAN_ANSWER') &&
-                 ($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') &&
-                 (!$env{'request.role.adv'})) {
+        }
+        if (($env{'request.state'} ne "construct") &&
+            ($Apache::lonhomework::type eq 'randomizetry') &&
+            ($status eq 'CAN_ANSWER') &&
+            ($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') &&
+            (!$env{'request.role.adv'})) {
 # "New Problem Variation Each Try" header suppressed for Placement Tests, unless course personnel. 
-            my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
-            my $problemstatus = &get_problem_status($Apache::inputtags::part);
-            $form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries);
+            my @parts;
+            if (ref($probpartlist) eq 'ARRAY') {
+                @parts = @{$probpartlist};
+            }
+            unless (@parts) {
+                my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                my $problemstatus = &get_problem_status($Apache::inputtags::part);
+                $form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries,$symb);
+            }
         }
 
 	my $expression='$external::datestatus="'.$status.'";';
@@ -1930,6 +2068,10 @@ sub start_problem {
                     $result.= '<button type="submit" name="resetdata" '.
                         'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
                         &practice_problem_header().'<hr />';
+                } elsif ($Apache::lonhomework::type eq 'randomizetry') {
+                    my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                    my $problemstatus = &get_problem_status($Apache::inputtags::part);
+                    $result.=&randomizetry_problem_header($problemstatus,$reqtries);
                 }
 	    }
 	    # if we are viewing someone else preserve that info
@@ -2070,6 +2212,12 @@ sub end_problem {
 	    }
 	}
 	$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
+    } elsif ($target eq 'web') {
+        if ($env{'request.user_in_effect'}) {
+            &reset_problem_globals('problem');
+            $result .= &Apache::lonhtmlcommon::set_compute_end_time();
+            return $result;
+        }
     }
 
     my $status=$Apache::inputtags::status['-1'];
@@ -2161,7 +2309,24 @@ sub end_problem {
 	    }
 	}
         if ($target eq 'web') {
-           $result.=&Apache::functionplotresponse::init_script();
+            $result.=&Apache::functionplotresponse::init_script();
+            if ($Apache::lonhomework::default_type eq 'randomizetry') {
+                my ($symb) = &Apache::lonnet::whichuser();
+                if ((($env{'request.state'} eq 'construct') || ($symb eq '')) &&
+                    ($status eq 'CAN_ANSWER')) {
+                    unless (@Apache::inputtags::partlist > 1) {
+                        $result.= <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+    \$(document).ready(function() {
+         \$('#LC_randomizetry_header').css('display','block');
+    });
+// ]]>
+</script>
+ENDJS
+                    }
+                }
+            }
         }
 	if ($target eq 'grade') {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
@@ -2886,6 +3051,14 @@ sub start_part {
         if (($target eq 'grade') && &Apache::response::submitted()) {
             $Apache::lonhomework::results{"resource.$id.rndseed"}=$rndseed;
         }
+    } elsif (@Apache::inputtags::partlist > 1) {
+        my $prevparttype = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[-2].type");
+        if ($prevparttype eq 'randomizetry') {
+            my $rndseed=&setup_rndseed($safeeval,$target,'',$prevparttype);
+            if (($target eq 'grade') && &Apache::response::submitted()) {
+                $Apache::lonhomework::results{"resource.$id.rndseed"}=$rndseed;
+            }
+        }
     } elsif (($target eq 'grade') && &Apache::response::submitted()) {
         $Apache::lonhomework::results{"resource.$id.rndseed"}=$Apache::lonhomework::rawrndseed;
     }
@@ -2961,20 +3134,14 @@ sub start_part {
 		} elsif ($target eq 'web') {
                     if ($status eq 'CAN_ANSWER') {
                         my $problemstatus = &get_problem_status($Apache::inputtags::part); 
-                        my $probrandomize = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].type");
-                        my $probrandtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].randomizeontries");
                         my $num = scalar(@Apache::inputtags::partlist)-1;
-                        if ($probrandomize eq 'randomizetry') {
-                            if (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") ne 'randomizetry') {
-                                $result .= &randomizetry_part_header($problemstatus,'none',$num);
-                            } else {
-                                my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
-                                if ($probrandtries ne $reqtries) {
-                                    $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
-                                }
-                            }
-                        } elsif (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") eq 'randomizetry') {
-                            my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                        if ((($Apache::lonhomework::default_type eq 'randomizetry') || 
+                            ($Apache::lonhomework::randomizetrypart)) &&
+                            ($Apache::lonhomework::type ne 'randomizetry')) {
+                            $result .= &randomizetry_part_header($problemstatus,'none',$num);
+                        } elsif ($Apache::lonhomework::type eq 'randomizetry') {
+                            $Apache::lonhomework::randomizetrypart = 1;
+                            my $reqtries = &Apache::lonnet::EXT("resource.$id.randomizeontries");
                             $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
                         }
                     }
@@ -3029,7 +3196,11 @@ sub end_part {
 	    $gradestatus='';
 	}
 	$result.=$gradestatus;
-	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} 
+	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {
+            if (not $env{'form.problem_split'}=~/yes/) {
+                $result.='\end{minipage}';
+            }
+        }
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::end_table();
     } elsif ($target eq 'modified') {
@@ -3294,7 +3465,7 @@ sub practice_problem_header {
 }
 
 sub randomizetry_problem_header {
-    my ($problemstatus,$reqtries) = @_;
+    my ($problemstatus,$reqtries,$symb) = @_;
     my ($header,$text);
     if ($reqtries > 1) {
         $header = &mt('New Problem Variation After Every [quant,_1,Try,Tries]',$reqtries);
@@ -3314,8 +3485,13 @@ sub randomizetry_problem_header {
             $text = &mt('A new variation will be generated after each try until correct or tries limit is reached.');
         }
     }
-    return '<h3 class="LC_info">'.$header.'</h3>'.
-           '<span class="LC_info">'.$text.'</span><hr />';
+    if (($env{'request.state'} eq "construct") || ($symb eq '')) {
+        return '<div class="LC_info" id="LC_randomizetry_header" style="display:none">'.
+               '<h3>'.$header.'</h3><span class="LC_info">'.$text.'</span><hr /></div>';
+    } else {
+        return '<h3 class="LC_info">'.$header.'</h3>'.
+               '<span class="LC_info">'.$text.'</span><hr />';
+    }
 }
 
 sub randomizetry_part_header {
@@ -3323,7 +3499,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') ||