--- loncom/homework/structuretags.pm	2024/03/01 17:05:45	1.512.2.24.2.14
+++ loncom/homework/structuretags.pm	2024/02/27 22:09:40	1.585
@@ -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.24.2.14 2024/03/01 17:05:45 raeburn Exp $
+# $Id: structuretags.pm,v 1.585 2024/02/27 22:09:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,7 +69,7 @@ use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 BEGIN {
-    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag'));
+    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','print','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag'));
 }
 
 
@@ -194,6 +194,28 @@ sub end_web {
     return '';
 }
 
+sub start_print {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if ($target ne 'edit' && $target ne 'modified') {
+        if ($target ne 'tex') {
+            my $skip = &Apache::lonxml::get_all_text("/print",$parser,$style);
+            &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
+        }
+    } elsif ($target eq "edit") {
+        my $bodytext = &Apache::lonxml::get_all_text_unbalanced("/print",$parser);
+        my $result = &Apache::edit::tag_start($target,$token);
+        $result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
+        return $result;
+    } elsif ($target eq "modified") {
+        return $token->[4].&Apache::edit::modifiedfield("/print",$parser);
+    }
+    return '';
+}
+
+sub end_print {
+    return '';
+}
+
 sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
@@ -228,9 +250,11 @@ sub end_tex {
 sub homework_js {
     my ($postsubmit,$timeout);
     if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
-        my $crstype;
-        if (&Apache::loncommon::course_type() eq 'Community') {
+        my $crstype = &Apache::loncommon::course_type();
+        if ($crstype eq 'Community') {
             $crstype = 'community';
+        } elsif ($crstype eq 'Placement') {
+            $crstype = 'placement'; 
         } else {
             if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) {
                 $crstype = 'official';
@@ -272,7 +296,7 @@ sub homework_js {
         $jstimeout = 1000 * $timeout;
     }
     return &Apache::loncommon::resize_textarea_js().
-           &Apache::loncommon::colorfuleditor_js().
+                &Apache::loncommon::colorfuleditor_js().
            &Apache::lonxml::setmode_javascript().
 	<<"JS";
 <script type="text/javascript">
@@ -481,9 +505,9 @@ sub page_start {
             }
         }
         if ($needs_upload) {
-            $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js().
-                           '<script type="text/javascript" '.
-                           'src="/res/adm/includes/file_upload.js"></script>';
+            $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js()
+                            .'<script type="text/javascript" 
+                                src="/res/adm/includes/file_upload.js"></script>';
         }
     }
 
@@ -515,11 +539,20 @@ sub page_start {
 	     && $env{'request.state'} eq 'construct') {
 	if ($target eq 'web' || $target eq 'edit') {
             unless ($env{'form.inhibitmenu'} eq 'yes') {
+                my $text = 'Authoring Space';
+                my $href = &Apache::loncommon::authorspace($env{'request.uri'});
+                if ($env{'request.course.id'}) {
+                    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                    if ($href eq "/priv/$cdom/$cnum/") {
+                        $text = &mt('Course Authoring Space');
+                    }
+                }
                 # Breadcrumbs for Authoring Space
                 &Apache::lonhtmlcommon::clear_breadcrumbs();
                 &Apache::lonhtmlcommon::add_breadcrumb({
-                    'text'  => 'Authoring Space',
-                    'href'  => &Apache::loncommon::authorspace($env{'request.uri'}),
+                    'text'  => $text,
+                    'href'  => $href,
                 });
                 # breadcrumbs (and tools) will be created 
                 # in start_page->bodytag->innerregister
@@ -632,7 +665,7 @@ 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,$numtries,$reqtries);
     if ($target eq 'analyze') {
@@ -749,11 +782,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 '')) {
@@ -857,7 +899,6 @@ sub problem_edit_header {
     return $return;
 }
 
-
 sub problem_edit_footer {
     my $resource = $env{'request.ambiguous'};
     return '</td></tr></table><br />
@@ -934,7 +975,7 @@ sub problem_web_to_edit_header {
 ".&mt("Problem Type:")."
 <select name='problemtype'>
   <option value=''></option>
-  ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
+  ".&option('exam'   ,'problemtype').&mt("Bubblesheet Exam Problem")."</option>
   ".&option('problem','problemtype').&mt("Homework Problem")."</option>
   ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
   ".&option('surveycred' ,'problemtype').&mt("Survey Question (with credit)")."</option>
@@ -1057,8 +1098,8 @@ sub initialize_storage {
 	|| $Apache::lonhomework::type eq 'practice') {
 	
 	my $namespace = $symb || $env{'request.uri'};
-        if ($env{'form.resetdata'} eq 'reset_submissions' ||
-            ($env{'form.resetdata'} eq 'new_problem_variation'
+	if ($env{'form.resetdata'} eq 'reset_submissions' ||
+	    ($env{'form.resetdata'} eq 'new_problem_variation'
 	     && $env{'form.submitted'} eq 'yes') ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
@@ -1111,7 +1152,7 @@ sub initialize_storage {
         where awarded >= 1 when correct).
 
 	Will call &store_aggregates() to increment totals for attempts,
-	students, and corrects, if running user has student role.
+        students, and corrects, if running user has student role.
 
 =cut
 
@@ -1534,8 +1575,8 @@ sub store_aggregates {
             } else {
                 $anoncounter{$symb."\0".$part} = 1;
             }
-            my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};
-            if ($needsrelease) {   
+            my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.'::'};
+            if ($needsrelease) {
                 my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
                 if ($curr_required eq '') {
                     &Apache::lonnet::update_released_required($needsrelease);
@@ -1595,6 +1636,13 @@ sub access_status_msg {
                       &Apache::lonnavmaps::timeToHumanString($accessmsg,'start'));
         } elsif ($status eq 'NOTRESERVABLE') {
             $msg.=&mt('Not available to make a reservation.');
+        } elsif ($status eq 'NEED_DIFFERENT_IP') {
+            if ($ipused) {
+                $msg.=&mt('You must use the same computer ([_1]) you used when you first accessed this resource using your time/place-based reservation.',"IP: $ipused");
+            } else {
+                $msg.=&mt('Each student must use a different computer to access this resource at this time and/or place.').'<br />'.
+                      &mt('Somebody else has already used this particular computer for that purpose.');
+            }
         }
         $msg.='<br />';
     } elsif ($target eq 'tex') {
@@ -1617,7 +1665,7 @@ sub access_status_msg {
 
 sub checkin_prompt {
     my ($target,$slot_name,$slot,$type) = @_;
-    my $result;
+    my $result; 
     if ($target eq 'web') {
         $result = &Apache::bridgetask::proctor_validation_screen($slot);
     } elsif ($target eq 'grade') {
@@ -1635,8 +1683,12 @@ sub selfcheckin_resource {
             $Apache::lonhomework::history{'resource.0.checkedin'};
         if ($checked_in eq '') {
             # unproctored slot access, self checkin
+            my $needsiptied;
+            if (ref($slot)) {
+                $needsiptied = $slot->{'iptied'};
+            }
             my $check = &Apache::bridgetask::check_in('problem',undef,undef,
-                                                      $slot_name);
+                                                      $slot_name,$needsiptied);
             if ($check =~ /^error: /) {
                 &Apache::lonnet::logthis("Error during self-checkin of problem (symb: $symb) using slot: $slot_name");
             } else {
@@ -1661,8 +1713,8 @@ sub checkout_msg {
 		'resource'=>'The resource needs to be checked out',
 		'id_expln'=>'As a resource gets checked out, a unique timestamped ID is given to it, and a permanent record is left in the system.',
                 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
-                'checkout'=>'Check out Exam for Viewing',
-		'checkout?'=>'Check out Exam?');
+                'checkout'=>'Check out Bubblesheet Exam for Viewing',
+		'checkout?'=>'Check out Bubblesheet Exam?');
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
@@ -1863,6 +1915,7 @@ sub start_problem {
     my $status;
     my $accessmsg;
     my $resource_due;
+    my $ipused;
 
     my $name= &get_resource_name($parstack,$safeeval);
     my ($result,$form_tag_start,$slot_name,$slot,$probpartlist,$firstaccres);
@@ -1871,7 +1924,7 @@ sub start_problem {
         $target eq 'tex') {
         if ($env{'form.markaccess'}) {
             my @interval=&Apache::lonnet::EXT("resource.0.interval");
-            my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+            my ($timelimit) = split(/_/,$interval[0]);
             my $is_set = &Apache::lonnet::set_first_access($interval[1],$timelimit);
             unless (($is_set eq 'ok') || ($is_set eq 'already_set')) {
                 $firstaccres = $is_set;
@@ -1907,10 +1960,10 @@ sub start_problem {
         $target eq 'tex') {
 
         my ($symb)= &Apache::lonnet::whichuser();
-        ($status,$accessmsg,$slot_name,$slot) =
+        ($status,$accessmsg,$slot_name,$slot,$ipused) =
             &Apache::lonhomework::check_slot_access('0','problem',$symb,$probpartlist);
         push (@Apache::inputtags::status,$status);
-    } 
+    }
 
     if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
 
@@ -1973,7 +2026,10 @@ sub start_problem {
         }
         if (($env{'request.state'} ne "construct") &&
             ($Apache::lonhomework::type eq 'randomizetry') &&
-            ($status eq 'CAN_ANSWER')) {
+            ($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 @parts;
             if (ref($probpartlist) eq 'ARRAY') {
                 @parts = @{$probpartlist};
@@ -1999,14 +2055,15 @@ sub start_problem {
             ( $status eq 'NOTRESERVABLE') ||
             ( $status eq 'RESERVABLE') ||
             ( $status eq 'RESERVABLE_LATER') ||
-	    ( $status eq 'INVALID_ACCESS')) {
+	    ( $status eq 'INVALID_ACCESS') ||
+            ( $status eq 'NEED_DIFFERENT_IP')) {
 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
 						       $style);
             if (($status eq 'NOT_YET_VIEWED') && ($firstaccres)) {
                 $result .= '<p class="LC_error">'.
                            &mt('A problem occurred when trying to start the timer.').'</p>';
             }
-            $result .= &access_status_msg('problem',$status,$symb,$target,'',$accessmsg);
+            $result .= &access_status_msg('problem',$status,$symb,$target,$ipused,$accessmsg);
 	} elsif ($status eq 'NEEDS_CHECKIN') {
 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
 						       $style);
@@ -2037,8 +2094,8 @@ sub start_problem {
                 }
                 if ($Apache::lonhomework::type eq 'practice') {
                     $result.= '<button type="submit" name="resetdata" '.
-                              'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
-                              &practice_problem_header().'<hr />';
+                        '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);
@@ -2228,7 +2285,39 @@ sub end_problem {
                 # Added separately at end of this routine, after added
                 # <script></script> so document will be valid xhtml.
                 #
-		$result.= &Apache::loncommon::end_page({'discussion' => 1,
+                my $showdisc = 1;
+                if (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
+                    (!$env{'request.role.adv'})) { 
+# For Placement Tests footer with "Post Discussion" and "Send Feedback" links is suppressed.
+                    $showdisc = 0;
+                    my ($symb)= &Apache::lonnet::whichuser();
+                    if ($symb) {
+                        my $navmap = Apache::lonnavmaps::navmap->new();
+                        if (ref($navmap)) {
+                            my $hastries = &Apache::lonplacementtest::has_tries($symb,$navmap);  
+# For Placement Tests test status is displayed if this is the last resource in the course
+# and there are no tries left
+                            unless ($hastries) {
+                                if (&Apache::lonplacementtest::is_lastres($symb,$navmap)) {
+                                    my ($score,$incomplete) = 
+                                        &Apache::lonplacementtest::check_completion(undef,undef,1);
+                                    if (!$incomplete) {
+                                        $result .= &Apache::lonplacementtest::showresult(1,1);
+                                    } elsif ($incomplete < 100) { 
+                                        $result.= &Apache::lonplacementtest::showincomplete($incomplete,1);
+                                    }
+                                } else {
+# For Placement Tests score is displayed if test has just been completed
+                                    my ($score,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1);
+                                    if (!$incomplete) {
+                                        $result.= &Apache::lonplacementtest::showresult(1,1);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+		$result.= &Apache::loncommon::end_page({'discussion' => $showdisc,
 							'notbody'    => 1});
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
@@ -2282,7 +2371,7 @@ ENDJS
 	    @Apache::inputtags::response=();
 	    $result=&Apache::response::mandatory_part_meta;
 	}
-	$result.=&Apache::response::meta_part_order();
+	$result.=&Apache::response::meta_part_order('problem');
 	$result.=&Apache::response::meta_response_order();
     } elsif ($target eq 'edit') {
 	&Apache::lonxml::debug("in end_problem with $target, edit");
@@ -2344,8 +2433,8 @@ sub start_library {
 	$result.=&problem_web_to_edit_header($rndseed);
         if ($Apache::lonhomework::type eq 'practice') {
             $result.= '<button type="submit" name="resetdata" '.
-                      'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
-                      &practice_problem_header().'<hr />';
+                'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
+                &practice_problem_header().'<hr />';
         }
     }
     return $result;
@@ -2361,6 +2450,7 @@ sub end_library {
 	     && $env{'request.state'} eq "construct") {
 	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
     } elsif ($target eq 'meta') {
+        $result.=&Apache::response::meta_part_order('library');
         $result.=&Apache::response::meta_response_order();
     }
     if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
@@ -2990,6 +3080,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;
     }
@@ -3066,8 +3164,8 @@ sub start_part {
                     if ($status eq 'CAN_ANSWER') {
                         my $problemstatus = &get_problem_status($Apache::inputtags::part); 
                         my $num = scalar(@Apache::inputtags::partlist)-1;
-                        if ((($Apache::lonhomework::default_type eq 'randomizetry') ||
-                             ($Apache::lonhomework::randomizetrypart)) &&
+                        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') {
@@ -3127,7 +3225,7 @@ sub end_part {
 	    $gradestatus='';
 	}
 	$result.=$gradestatus;
-        if ($$tagstack[-2] eq 'td' and $target eq 'tex') {
+	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {
             if (not $env{'form.problem_split'}=~/yes/) {
                 $result.='\end{minipage}';
             }
@@ -3247,7 +3345,7 @@ sub start_problemtype {
 					    ['hide','Hide']]
 					   ,$token);
 	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
-					     [ ['exam','Exam/Quiz Problem'],
+					     [ ['exam','Bubblesheet Exam/Quiz Problem'],
 					       ['survey','Survey'],
                                                ['surveycred','Survey (with credit)'],
                                                ['anonsurvey','Anonymous Survey'],
@@ -3390,7 +3488,7 @@ sub end_simpleeditbutton {
 }
 
 sub practice_problem_header {
-    return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.
+    return '<h3 class="LC_info">'.&mt('Practice Problem').'</h3>'.
            '<span class="LC_info">'.&mt('Submissions are not permanently recorded').
            '</span>';
 }
@@ -3452,7 +3550,7 @@ sub randomizetry_part_header {
     if ($num > 1) {
         $output .= '<hr />';
     }
-    $output .=  '<span class="LC_info"><h4>'.$header.'</h4></span>'.
+    $output .=  '<h4 class="LC_info">'.$header.'</h4>'.
                   '<span class="LC_info">'.$text.'</span><br /><br />';
     return $output;
 }