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

Diff for /loncom/interface/lonprintout.pm between versions 1.627.2.32.2.3 and 1.627.2.36

version 1.627.2.32.2.3, 2023/01/17 18:09:25 version 1.627.2.36, 2024/07/03 12:59:50
Line 1345  sub latex_header_footer_remove { Line 1345  sub latex_header_footer_remove {
 #  #
 sub encapsulate_minipage {  sub encapsulate_minipage {
     my ($text,$problem_split) = @_;      my ($text,$problem_split) = @_;
     if (!($problem.split =~ /yes/i)) {      if (!($problem_split =~ /yes/i)) {
  $text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';   $text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';
     }      }
     return $text;      return $text;
Line 3170  ENDPART Line 3170  ENDPART
   
          my $map;           my $map;
          if ($helper->{VARS}->{'symb'}) {           if ($helper->{VARS}->{'symb'}) {
              ($map, my $id, my $resource) =               unless ((($print_type eq 'all_problems_students') ||
                  &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});                        ($print_type eq 'incomplete_problems_selpeople_course')) &&
                         $perm{'pfo'}) {
                    ($map, my $id, my $resource) =
                        &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
                }
          }           }
   
  #loop over students   #loop over students
Line 3765  sub print_resources { Line 3769  sub print_resources {
  $rendered =~ s/\\end\{document}//;   $rendered =~ s/\\end\{document}//;
     }      }
     $current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';      $current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
  } elsif($res_url = ~/\.pdf$/) {   } elsif($res_url =~ /\.pdf$/) {
     my $url = &Apache::lonnet::clutter($res_url);      my $url = &Apache::lonnet::clutter($res_url);
     my $rendered  = &include_pdf($url);      my $rendered  = &include_pdf($url);
     if ($remove_latex_header ne 'NO') {      if ($remove_latex_header ne 'NO') {
Line 4072  sub printHelper { Line 4076  sub printHelper {
             $helper->{VARS}->{'symb'} = $env{'form.symb'};              $helper->{VARS}->{'symb'} = $env{'form.symb'};
         }          }
         if ($env{'form.url'}) {          if ($env{'form.url'}) {
             unless ($env{'form.url'} eq '/adm/navmaps') {              $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
                 $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});  
             }  
         }          }
   
     }      }
   
       if ($env{'form.symb'}) {
           $helper->{VARS}->{'symb'} = $env{'form.symb'};
       }
       if ($env{'form.url'}) {
           $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
   
       }
     if ($helper->{VARS}->{'symb'} ne '') {      if ($helper->{VARS}->{'symb'} ne '') {
         $helper->{VARS}->{'symb'}=          $helper->{VARS}->{'symb'}=
     &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});      &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
Line 4255  sub printHelper { Line 4265  sub printHelper {
   
       $helperFragment .= &generate_resource_chooser('CHOOSE_RESOURCES_PAGE',        $helperFragment .= &generate_resource_chooser('CHOOSE_RESOURCES_PAGE',
     'Select Resource(s) to print',      'Select Resource(s) to print',
     'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',      'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
     'RESOURCES',      'RESOURCES',
     'PAGESIZE',      'PAGESIZE',
     $url,      $url,
Line 4302  sub printHelper { Line 4312  sub printHelper {
   
  if ($userCanPrint || &printable($map_open, $map_close)) {   if ($userCanPrint || &printable($map_open, $map_close)) {
     push(@{$printChoices},      push(@{$printChoices},
  [&mt('Selected [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,   [&mt('Selected  [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
       '<b>', '</b>',        '<b>', '</b>',
       '<b><i>'. $sequenceTitle . '</b></i>'),        '<b><i>'. $sequenceTitle . '</b></i>'),
   $printSelector,    $printSelector,
Line 4329  sub printHelper { Line 4339  sub printHelper {
     $start_new_option);      $start_new_option);
     $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',      $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
   'Select Resource(s) to print',    'Select Resource(s) to print',
   'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',    'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
   'RESOURCES',    'RESOURCES',
   'PAGESIZE',    'PAGESIZE',
   $map,    $map,
Line 4352  sub printHelper { Line 4362  sub printHelper {
  # BZ 5209 - incomplete problems from entire course:   # BZ 5209 - incomplete problems from entire course:
   
  push(@{$printChoices},   push(@{$printChoices},
      [&mt('Selected [_1]Incomplete Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]',       [&mtn('Selected <b>Incomplete Problems</b> from <b>entire course</b> for selected people'),
               '<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 4361  sub printHelper { Line 4370  sub printHelper {
   
  #  Selected problems/resources from entire course:   #  Selected problems/resources from entire course:
   
         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>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
  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>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
  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'];   push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</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 4387  ALL_PROBLEMS Line 4396  ALL_PROBLEMS
       $start_new_option) .        $start_new_option) .
    &generate_resource_chooser('ALL_RESOURCES',     &generate_resource_chooser('ALL_RESOURCES',
       'Select Resource(s) to print',        'Select Resource(s) to print',
       " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1' modallink='1'",        'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
       'RESOURCES',        'RESOURCES',
       'PAGESIZE',        'PAGESIZE',
       '',        '',
Line 4439  ALL_PROBLEMS Line 4448  ALL_PROBLEMS
  #   #
  my $resource_selector= &generate_resource_chooser('SELECT_PROBLEMS',   my $resource_selector= &generate_resource_chooser('SELECT_PROBLEMS',
   'Select resources to print',    'Select resources to print',
   'multichoice="1" addstatus="1" closeallpages="1" modallink="1"',    'multichoice="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
   'RESOURCES',     'RESOURCES', 
   'PRINT_FORMATTING',    'PRINT_FORMATTING',
   $map,    $map,
Line 4698  CHOOSE_FROM_SUBDIR Line 4707  CHOOSE_FROM_SUBDIR
     # Allow the user to select any sequence in the course, feed it to      # Allow the user to select any sequence in the course, feed it to
     # another resource selector for that sequence      # another resource selector for that sequence
     if (!$helper->{VARS}->{'construction'} && !$is_published) {      if (!$helper->{VARS}->{'construction'} && !$is_published) {
  push(@$printChoices, [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course',   push @$printChoices, [&mtn("Selected <b>Resources</b> from <b>selected folder</b> in course"),
                                   '<b>','</b>','<b>','</b>'),        'select_sequences', 'CHOOSE_SEQUENCE'];
       'select_sequences', 'CHOOSE_SEQUENCE']);  
  my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};   my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
  #Escape apostrophes and backslashes for Perl   #Escape apostrophes and backslashes for Perl
  $escapedSequenceName =~ s/\\/\\\\/g;   $escapedSequenceName =~ s/\\/\\\\/g;
Removed from v.1.627.2.32.2.3  
changed lines
  Added in v.1.627.2.36

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