[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[raeburn]

raeburn		Thu Mar 12 12:56:02 2026 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - Bug 6454
    &get_randomly_ordered_warning() no longer needed following changes in 
    rev. 1.610, and other changes which addressed bug 6454 and added support
    for random selection and random ordering when printing for others. 
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.714 loncom/interface/lonprintout.pm:1.715
--- loncom/interface/lonprintout.pm:1.714	Thu Mar 12 04:21:40 2026
+++ loncom/interface/lonprintout.pm	Thu Mar 12 12:56:02 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.714 2026/03/12 04:21:40 raeburn Exp $
+# $Id: lonprintout.pm,v 1.715 2026/03/12 12:56:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -449,9 +449,6 @@
 sub generate_common_choosers {
     my ($r,$helper,$map,$url,$isProblem,$symbFilter,$start_new_option) = @_;
 
-    my $randomly_ordered_warning =
-        &get_randomly_ordered_warning($helper, $map);
-
     # code for a few states used for printout launched from both
     # /adm/navmaps and from a resource by a privileged user:
     #   - To allow resources to be selected for printing.
@@ -571,7 +568,7 @@
                                                $isProblem, '',  $symbFilter,
                                                $start_new_option);
     &Apache::lonxml::xmlparse($r, 'helper', $anon_page);
-    return ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice);
+    return ($codechoice,$code_selection,$namechoice);
 }
 
 #  Returns the XML for choosing how assignments are to be formatted
@@ -4155,28 +4152,6 @@
     }
 }
 
-sub get_randomly_ordered_warning {
-    my ($helper,$map) = @_;
-
-    my $message;
-
-    my $postdata = $env{'form.postdata'} || $helper->{VARS}{'postdata'};
-    my $navmap = Apache::lonnavmaps::navmap->new();
-    if (defined($navmap)) {
-        my $res = $navmap->getResourceByUrl($map);
-        if ($res) {
-	    my $func =
-	        sub { return ($_[0]->is_map() && $_[0]->randomorder); };
-	    my @matches = $navmap->retrieveResources($res, $func,1,1,1);
-
-        }
-    } else {
-        $message = "Retrieval of information about ordering of resources failed.";
-        return '<message type="warning">'.$message.'</message>';
-    }
-    return;
-}
-
 sub printHelper {
     my $r = shift;
 
@@ -4686,7 +4661,7 @@
 				    'problems_for_anon', 'CHOOSE_ANON1']);
 	}
 
-        my ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice) =
+        my ($codechoice,$code_selection,$namechoice) =
             &generate_common_choosers($r,$helper,$map,$url,$isProblem,$symbFilter,$start_new_option);
 
 	if ($helper->{VARS}->{'assignment'}) {
@@ -4709,7 +4684,6 @@
 
 	my $resource_selector=<<RESOURCE_SELECTOR;
     <state name="SELECT_RESOURCES" title="Select Resources">
-    $randomly_ordered_warning
     <nextstate>PRINT_FORMATTING</nextstate>
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1" addstatus="1"
@@ -4875,7 +4849,7 @@
                          '<b>','</b>','<b>','</b>','<b>','</b>'),
                          'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']);
                 if ($escapedSequenceName) {
-                    my ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice) =
+                    my ($codechoice,$code_selection,$namechoice) =
                         &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,
                                                   $isProblem,$symbFilter,$start_new_option);
 
@@ -4890,7 +4864,6 @@
 
     </state>
     <state name="SELECT_RESOURCES" title="Select Resources">
-    $randomly_ordered_warning
     <nextstate>PRINT_FORMATTING</nextstate>
     <message>(mark desired resources then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" addstatus="1"