[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.12 and 1.627.2.16

version 1.627.2.12, 2014/04/24 15:36:58 version 1.627.2.16, 2016/08/06 20:52:43
Line 701  sub incomplete { Line 701  sub incomplete {
     }      }
 }  }
 #  #
 #  When printing for students, the resoures and order of the  #  When printing for students, the resources and order of the
 #  resources may need to be altered if there are folders with  #  resources may need to be altered if there are folders with
 #  random selectiopn or random ordering (or both) enabled.  #  random selectiopn or random ordering (or both) enabled.
 #  This sub computes the set of resources to print for a student  #  This sub computes the set of resources to print for a student
 #  modified both by random ordering and selection and filtered  #  modified both by random ordering and selection and filtered
 #  to only those that are in the original set selcted to be printed.  #  to only those that are in the original set selected to be printed.
 #  #
 # Parameters:  # Parameters:
 #   $map - The URL of the folder being printed.  #   $map - The URL of the folder being printed.
Line 717  sub incomplete { Line 717  sub incomplete {
 #   $who   - Student/domain for whome the sequence will be generated.  #   $who   - Student/domain for whome the sequence will be generated.
 #   $code  - CODE being printed when printing Problems/Resources  #   $code  - CODE being printed when printing Problems/Resources
 #            from folder for CODEd assignments  #            from folder for CODEd assignments
   #   $nohidemap - If true, parameter in map for hiddenresource will be
   #                ignored.  The user calling the routine should have
   #                both the pav and vgr privileges if this is set to true).
 #  #
 # Implicit inputs:  # Implicit inputs:
 #   $  #   $
Line 738  sub master_seq_to_person_seq { Line 741  sub master_seq_to_person_seq {
     my @output_seq;      my @output_seq;
   
     my $unhidden;      my $unhidden;
     if ($perm{'pav'} && $perm{'vgr'} && $nohidemap) {      if ($nohidemap) {
         $unhidden = &Apache::lonnet::clutter($map);          $unhidden = &Apache::lonnet::clutter($map);
     }      }
           
Line 2933  ENDPART Line 2936  ENDPART
   
  &Apache::lonxml::clear_problem_counter();   &Apache::lonxml::clear_problem_counter();
   
  my $pbreakresources = keys %page_breaks;  
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#master_seq;$i++) {
   
     &Apache::lonenc::reset_enc();      &Apache::lonenc::reset_enc();
Line 3185  ENDPART Line 3187  ENDPART
  my $student_counter=-1;   my $student_counter=-1;
  my $i = 0;   my $i = 0;
  my $last_section = (split(/:/,$students[0]))[2];   my $last_section = (split(/:/,$students[0]))[2];
            my $nohidemap;
            if ($perm{'pav'} && $perm{'vgr'}) {
                $nohidemap = 1;
            }
  foreach my $person (@students) {   foreach my $person (@students) {
              my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";               my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
      if (-e $duefile) {       if (-e $duefile) {
Line 3202  ENDPART Line 3208  ENDPART
  $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});   $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
      }       }
      my $actual_seq = master_seq_to_person_seq($map, \@master_seq,       my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
                                                        $person, undef, 1);                                                         $person, undef, $nohidemap);
      my ($output,$fullname, $printed)=&print_resources($r,$helper,       my ($output,$fullname, $printed)=&print_resources($r,$helper,
      $person,$type,       $person,$type,
      \%moreenv,  $actual_seq,       \%moreenv,  $actual_seq,
Line 3290  ENDPART Line 3296  ENDPART
  $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,   $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,
     $code_type);      $code_type);
      }       }
                $code_name =~ s/^\s+//;
                $code_name =~ s/\s+$//;
      if ($code_name) {       if ($code_name) {
  &Apache::lonnet::put('CODEs',   &Apache::lonnet::put('CODEs',
       {        {
Line 3311  ENDPART Line 3319  ENDPART
  my $flag_latex_header_remove = 'NO';    my $flag_latex_header_remove = 'NO'; 
  my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$num_todo);   my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$num_todo);
  my $count=0;   my $count=0;
            my $nohidemap;
            if ($perm{'pav'} && $perm{'vgr'}) {
                $nohidemap = 1; 
            }
  foreach my $code (sort(@allcodes)) {   foreach my $code (sort(@allcodes)) {
      my $file_num=int($count/$number_per_page);       my $file_num=int($count/$number_per_page);
      if ($code_type eq 'number') {        if ($code_type eq 'number') { 
Line 3323  ENDPART Line 3335  ENDPART
                  $env{'form.CODE'} = $moreenv{'CODE'};                   $env{'form.CODE'} = $moreenv{'CODE'};
                  $actual_seq = master_seq_to_person_seq($map, \@master_seq,                   $actual_seq = master_seq_to_person_seq($map, \@master_seq,
                                                         undef,                                                          undef,
                                                         $moreenv{'CODE'}, 1);                                                          $moreenv{'CODE'}, $nohidemap);
                  delete($env{'form.CODE'});                   delete($env{'form.CODE'});
              }               }
      my ($output,$fullname, $printed)=       my ($output,$fullname, $printed)=
Line 3432  ENDPART Line 3444  ENDPART
  #}   #}
     }      }
   
     # Set URLback if this is a construction space print so we can provide      # Set URLback so we can provide a link back to the resource and to change options.
     # a link to the resource being edited.      # (Since the browser back button does not currently work with https,
     #      # the back link is useful even when there is an easy-to-miss LON-CAPA back button.)
   
     my $URLback=''; #link to original document      my $URLback=''; #link to original document
     if ($helper->{'VARS'}->{'construction'} eq '1') {      if ($helper->{'VARS'}->{'construction'} eq '1') {
  $URLback=$helper->{'VARS'}->{'filename'};   $URLback=$helper->{'VARS'}->{'filename'};
       } elsif ($helper->{VARS}{'symb'}) {
           my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
           $URLback = &Apache::lonnet::clutter($url);
     }      }
     #      #
     # Final adjustment of the font size:      # Final adjustment of the font size:
Line 3621  sub print_resources { Line 3636  sub print_resources {
     my $current_assignment = "";      my $current_assignment = "";
     my $assignment;      my $assignment;
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
       my $possprint = scalar(@{$master_seq});
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}      if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
   
Line 3764  sub print_resources { Line 3780  sub print_resources {
     #      #
   
     if ($actually_printed == 0) {      if ($actually_printed == 0) {
  $current_output  = &encapsulate_minipage("\\vskip -10mm \nNo incomplete resources\n \\vskip 100 mm { }\n");          my $message = &mt('No resources to print');
           if (!$possprint) {
               if ($perm{'pav'} || $perm{'pfo'}) {
                   $message = &mt('There are no unhidden resources to print.')."\n\n".
                              &mt('The most likely reason is one of the following: ')."\n".
                              '\begin{itemize}'."\n".
                              '\item '.&mt("The 'Resource hidden from students' parameter is set for the folder being printed.")."\n".
                              '\item '.&mt("'Hidden' is checked in the Course Editor individually for each resource in the folder being printed.")."\n".
                              '\end{itemize}'."\n\n".
                              &mt("Note: to print a bubblesheet exam which you want to hide from students, ".
                                  "use the Course Editor to check the 'Hidden' checkbox for the exam folder itself.")."\n";
               }
           } elsif ($print_incomplete) {
               $message = &mt('No incomplete resources');
           }
           if ($message) {
               $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n");
           }
  if ($remove_latex_header eq "NO") {   if ($remove_latex_header eq "NO") {
     $current_output = &print_latex_header() . $current_output;      $current_output = &print_latex_header() . $current_output;
  } else {   } else {
Removed from v.1.627.2.12  
changed lines
  Added in v.1.627.2.16

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