[BACK]Return to lonprintout.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.679 and 1.683

version 1.679, 2022/06/11 14:51:49 version 1.683, 2023/01/15 01:19:50
Line 4562  sub printHelper { Line 4562  sub printHelper {
  # BZ 5209 - incomplete problems from entire course:   # BZ 5209 - incomplete problems from entire course:
   
  push(@{$printChoices},   push(@{$printChoices},
      [&mtn('Selected <b>Incomplete Problems</b> from <b>entire course</b> for selected people'),       [&mt('Selected [_1]Incomplete Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]',
                 '<b>','</b>','<b>','</b>','<b>','</b>'),
       'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);        'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
  my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.   my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.
   
Line 4570  sub printHelper { Line 4571  sub printHelper {
   
  #  Selected problems/resources from entire course:   #  Selected problems/resources from entire course:
   
         push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];          push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from [_3]entire course[_4]','<b>','</b>','<b>','</b>'), 'all_problems', 'ALL_PROBLEMS'];
  push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];   push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from [_3]entire course[_4]','<b>','</b>','<b>','</b>'), 'all_resources', 'ALL_RESOURCES'];
  push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];   push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]','<b>','</b>','<b>','</b>','<b>','</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
 my $suffixXml = <<ALL_PROBLEMS;  my $suffixXml = <<ALL_PROBLEMS;
   <state name="STUDENTS1" title="Select People">    <state name="STUDENTS1" title="Select People">
       <message><b>Select sorting order of printout</b> </message>        <message><b>Select sorting order of printout</b> </message>
Line 4788  CHOOSE_FROM_SUBDIR Line 4789  CHOOSE_FROM_SUBDIR
     # another resource selector for that sequence      # another resource selector for that sequence
     if ((!$helper->{VARS}->{'construction'}) &&      if ((!$helper->{VARS}->{'construction'}) &&
         (!$is_published || (($subdir eq '') && ($url eq '/adm/navmaps')))) {          (!$is_published || (($subdir eq '') && ($url eq '/adm/navmaps')))) {
         push @$printChoices, [&mtn("Selected <b>Resources</b> from <b>selected folder</b> in course"),          push(@$printChoices,[&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course',
                               'select_sequences', 'CHOOSE_SEQUENCE'];                                   '<b>','</b>','<b>','</b>'),
                                'select_sequences','CHOOSE_SEQUENCE']);
         my $escapedSequenceName;          my $escapedSequenceName;
         if ($helper->{VARS}->{'SEQUENCE'} ne '') {          if ($helper->{VARS}->{'SEQUENCE'} ne '') {
             $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};              $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
Line 4804  CHOOSE_FROM_SUBDIR Line 4806  CHOOSE_FROM_SUBDIR
         #Escape apostrophes and backslashes for Perl          #Escape apostrophes and backslashes for Perl
         $escapedSequenceName =~ s/\\/\\\\/g;          $escapedSequenceName =~ s/\\/\\\\/g;
         $escapedSequenceName =~ s/'/\\'/g;          $escapedSequenceName =~ s/'/\\'/g;
           my $nocurrloc;
         if (($subdir eq '') && ($url eq '/adm/navmaps')) {          if (($subdir eq '') && ($url eq '/adm/navmaps')) {
             if ($perm{'pfo'})) {              $nocurrloc = 'nocurrloc="1"';
               if ($perm{'pfo'}) {
                 push(@{$printChoices},                  push(@{$printChoices},
                     [&mt('Selected [_1]Problems[_2] from [_3]selected folder[_4] in course for [_5]selected people[_6]',                      [&mt('Selected [_1]Problems[_2] from [_3]selected folder[_4] in course for [_5]selected people[_6]',
                          '<b>','</b>','<b>','</b>','<b>','</b>'),                           '<b>','</b>','<b>','</b>','<b>','</b>'),
Line 4818  CHOOSE_FROM_SUBDIR Line 4822  CHOOSE_FROM_SUBDIR
                          'select_sequences_resources_for_students','CHOOSE_SEQUENCE_STUDENTS1'],                           'select_sequences_resources_for_students','CHOOSE_SEQUENCE_STUDENTS1'],
                     [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course for [_5]CODEd assignments[_6]',                      [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course for [_5]CODEd assignments[_6]',
                          '<b>','</b>','<b>','</b>','<b>','</b>'),                           '<b>','</b>','<b>','</b>','<b>','</b>'),
                          'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2'],                           'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']);
                     [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course',  
                          '<b>','</b>','<b>','</b>'),  
                          'select_sequences','CHOOSE_SEQUENCE']);  
                 if ($escapedSequenceName) {                  if ($escapedSequenceName) {
                     &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,$isProblem,$symbFilter,$start_new_option);                      &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,$isProblem,$symbFilter,$start_new_option);
                 }                  }
             } else {  
                 push(@{$printChoices},  
                 [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course',  
                      '<b>','</b>','<b>','</b>'),  
                      'select_sequences','CHOOSE_SEQUENCE']);  
             }              }
         }          }
         if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) {          if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) {
Line 4887  CHOOSE_FROM_SUBDIR Line 4883  CHOOSE_FROM_SUBDIR
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">    <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
     <message>(mark desired resources then click "next" button) <br /></message>      <message>(mark desired resources then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1" modallink="1">                closeallpages="1" modallink="1" $nocurrloc>
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap</filterfunc>        <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>        <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
Line 4911  CHOOSE_FROM_ANY_SEQUENCE Line 4907  CHOOSE_FROM_ANY_SEQUENCE
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">    <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
     <message>(mark desired resources then click "next" button) <br /></message>      <message>(mark desired resources then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1" modallink="1">                closeallpages="1" modallink="1" $nocurrloc>
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap</filterfunc>        <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>        <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
Removed from v.1.679  
changed lines
  Added in v.1.683

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>