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

Diff for /loncom/interface/lonprintout.pm between versions 1.701 and 1.705

version 1.701, 2024/11/09 16:08:15 version 1.705, 2024/12/10 04:52:30
Line 812  sub map_print_dates { Line 812  sub map_print_dates {
 # Parameters:  # Parameters:
 #   $username - Name of user for whom we are checking.  #   $username - Name of user for whom we are checking.
 #   $domain   - Domain of user we are checking.  #   $domain   - Domain of user we are checking.
   #   $section  - Section for user for whom we are checking.
 #   $map - map name.  #   $map - map name.
 # Returns:  # Returns:
 #     0 - map is not incomplete.  #     0 - map is not incomplete.
 #     1 - map is incomplete.  #     1 - map is incomplete.
 #  #
 sub incomplete {  sub incomplete {
     my ($username, $domain, $map) = @_;      my ($username, $domain, $section, $map) = @_;
   
   
     my $navmap = Apache::lonnavmaps::navmap->new($username, $domain);      my $navmap = Apache::lonnavmaps::navmap->new($username, $domain, $section);
   
   
     if (defined($navmap)) {      if (defined($navmap)) {
Line 878  sub master_seq_to_person_seq { Line 879  sub master_seq_to_person_seq {
     }      }
   
     my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,      my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,
                                                            $code, $unhidden);                                                             $usersection, $code, $unhidden);
     my ($start,$finish);      my ($start,$finish);
   
     if ($map) {      if ($map) {
Line 1861  sub old_character_chart { Line 1862  sub old_character_chart {
 my %page_formats=  my %page_formats=
     ('letter' => {      ('letter' => {
  'book' => {   'book' => {
      '1' => [ '7.1 in','9.7 in', '-0.57 in','-0.57 in','0.1 in'],       '1' => [ '7.1 in','9.7 in', '-0.57 in','-0.57 in','-0.5 in'],
      '2' => ['3.66 in','9.7 in', '-0.57 in','-0.57 in','0.1 in']       '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','-0.5 in']
  },   },
  'album' => {   'album' => {
      '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','-0.5 in'],       '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','-0.5 in'],
Line 1925  my %page_formats= Line 1926  my %page_formats=
      '2' => [ '9.1 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm']       '2' => [ '9.1 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm']
  },   },
  'album' => {   'album' => {
      '1' => ['24.0 cm','18.0 cm','-1.0cm','-1.5 cm','-1.25 cm'],       '1' => ['24.0 cm','18.0 cm','-1.0 cm','-1.0 cm','-1.25 cm'],
      '2' => ['9.91 cm','18.0 cm','-0.7 cm','-1.7 cm','-1.25 cm']       '2' => ['11.5 cm','18.0 cm','-0.7 cm','-1.7 cm','-1.25 cm']
  },   },
      },       },
      'a5' => {       'a5' => {
Line 1985  sub get_course { Line 1986  sub get_course {
 }  }
   
 sub page_format_transformation {  sub page_format_transformation {
     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist,$selectionmade) = @_;      my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,
           $indexlist,$selectionmade,$mostrecent) = @_;
     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);      my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
   
     if ($selectionmade eq '4') {      if ($selectionmade eq '4') {
Line 1999  sub page_format_transformation { Line 2001  sub page_format_transformation {
     }      }
     ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);      ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
   
       my $name;
     my $name = &get_name();      if ($mostrecent ne '') {
           $name = $mostrecent;
       } else {
           $name = &get_name();
       }
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     my $header_text  = $parmhash{'print_header_format'};      my $header_text  = $parmhash{'print_header_format'};
     $header_text     = &format_page_header($textwidth, $header_text, $assignment,      $header_text     = &format_page_header($textwidth, $header_text, $assignment,
Line 2022  sub page_format_transformation { Line 2028  sub page_format_transformation {
     $text =~ s/\\begin\{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;      $text =~ s/\\begin\{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
         if ($papersize eq 'a4') {          if ($papersize eq 'a4') {
             $paperwidth = '29.7cm';              $paperwidth = '29.7cm';
             $paperheight = '21cm';              $paperheight = '21.0cm';
         } elsif ($numberofcolumns eq '1') {          } elsif ($numberofcolumns eq '1') {
             if ($papersize eq 'letter') {              if ($papersize eq 'letter') {
                 $paperwidth = '11in';                  $paperwidth = '11.0in';
                 $paperheight = '8.5in';                  $paperheight = '8.5in';
             } elsif ($papersize eq 'legal') {              } elsif ($papersize eq 'legal') {
                 $paperwidth = '14in';                  $paperwidth = '14.0in';
                 $paperheight = '8.5in';                  $paperheight = '8.5in';
             }              }
         }          }
Line 2039  sub page_format_transformation { Line 2045  sub page_format_transformation {
     $text =~ s/\\pagestyle\{fancy}\\rhead\{}\\chead\{}\s*\\begin\{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;      $text =~ s/\\pagestyle\{fancy}\\rhead\{}\\chead\{}\s*\\begin\{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
  }   }
         if ($papersize eq 'a4') {          if ($papersize eq 'a4') {
             $paperwidth = '21cm';              $paperwidth = '21.0cm';
             $paperheight = '29.7cm';              $paperheight = '29.7cm';
         } elsif ($papersize eq 'letter') {          } elsif ($papersize eq 'letter') {
             $paperwidth = '8.5in';              $paperwidth = '8.5in';
             $paperheight = '11.5in';              $paperheight = '11.0in';
          } elsif ($papersize eq 'legal') {           } elsif ($papersize eq 'legal') {
             $paperwidth = '8.5in';              $paperwidth = '8.5in';
             $paperheight = '14.0in';              $paperheight = '14.0in';
Line 2768  sub print_construction_sequence { Line 2774  sub print_construction_sequence {
 #   6        Print selected problems from a folder.  #   6        Print selected problems from a folder.
 #   7        Print print selected resources from some scope.  #   7        Print print selected resources from some scope.
 #   8        Print resources for selected students.  #   8        Print resources for selected students.
   #   9        Print for anonymous CODEs
 #  #
 #BZ 5209  #BZ 5209
 #   2        map_incomplete_problems_seq Print incomplete problems from the current  #   2        map_incomplete_problems_seq Print incomplete problems from the current
Line 2860  ENDPART Line 2867  ENDPART
     my $LaTeXwidth=&recalcto_mm($textwidth);      my $LaTeXwidth=&recalcto_mm($textwidth);
     my @print_array=();      my @print_array=();
     my @student_names=();      my @student_names=();
       my $lastprinted;
   
     #  Common settings for the %form hash:      #  Common settings for the %form hash:
     # In some cases these settings get overridden by specific cases, but the      # In some cases these settings get overridden by specific cases, but the
Line 3388  ENDPART Line 3395  ENDPART
 #     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);  #     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
      &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');       &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
      $flag_latex_header_remove = 'YES';       $flag_latex_header_remove = 'YES';
                if ($printed) {
                    $lastprinted = $fullname;
                }
      if (&Apache::loncommon::connection_aborted($r)) { last; }       if (&Apache::loncommon::connection_aborted($r)) { last; }
  }   }
  &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);   &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
Line 3397  ENDPART Line 3407  ENDPART
       ($print_type eq 'resources_for_anon')     ||        ($print_type eq 'resources_for_anon')     ||
               ($print_type eq 'select_sequences_problems_for_anon') ||                ($print_type eq 'select_sequences_problems_for_anon') ||
               ($print_type eq 'select_sequences_resources_for_anon')) {                ($print_type eq 'select_sequences_resources_for_anon')) {
            $selectionmade = 9;
  my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};   my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
  my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};   my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
  my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};   my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
Line 3510  ENDPART Line 3521  ENDPART
        &mt('last assignment').' '.$fullname);         &mt('last assignment').' '.$fullname);
      $flag_latex_header_remove = 'YES';       $flag_latex_header_remove = 'YES';
      $count++;       $count++;
                if ($printed) {
                    $lastprinted = $fullname;
                }
      if (&Apache::loncommon::connection_aborted($r)) { last; }       if (&Apache::loncommon::connection_aborted($r)) { last; }
  }   }
  &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);   &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
Line 3589  ENDPART Line 3603  ENDPART
     # Only post process if that has not been turned off e.g. by a raw latex resource.      # Only post process if that has not been turned off e.g. by a raw latex resource.
   
     if ($do_postprocessing) {      if ($do_postprocessing) {
           my $mostrecent;
           if ((($selectionmade == 5) || ($selectionmade == 8) || ($selectionmade == 9)) &&
               (($numberofcolumns == 1) || ($laystyle eq 'album' && $papersize eq 'a4'))) {
               $mostrecent = $lastprinted;
           }
  $result = &page_format_transformation($papersize,   $result = &page_format_transformation($papersize,
       $laystyle,$numberofcolumns,        $laystyle,$numberofcolumns,
       $print_type,$result,        $print_type,$result,
       $helper->{VARS}->{'assignment'},        $helper->{VARS}->{'assignment'},
       $helper->{'VARS'}->{'TABLE_CONTENTS'},        $helper->{'VARS'}->{'TABLE_CONTENTS'},
       $helper->{'VARS'}->{'TABLE_INDEX'},        $helper->{'VARS'}->{'TABLE_INDEX'},
       $selectionmade);        $selectionmade,$mostrecent);
  $result = &latex_corrections($number_of_columns,$result,$selectionmade,   $result = &latex_corrections($number_of_columns,$result,$selectionmade,
      $helper->{'VARS'}->{'ANSWER_TYPE'});       $helper->{'VARS'}->{'ANSWER_TYPE'});
  #if ($numberofcolumns == 1) {   #if ($numberofcolumns == 1) {
Line 3849  sub print_resources { Line 3868  sub print_resources {
   
  if ( !($type eq 'problems' &&   if ( !($type eq 'problems' &&
        ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {         ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
     if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {      if ($print_incomplete && !&incomplete($username, $userdomain, $usersection, $res_url)) {
  next;   next;
     }      }
     $actually_printed++; # we're going to print one.      $actually_printed++; # we're going to print one.
Line 4218  sub printHelper { Line 4237  sub printHelper {
   
     }      }
  }   }
   
     }      }
   
     # Detect whether we're coming from construction space      # Detect whether we're coming from construction space
Removed from v.1.701  
changed lines
  Added in v.1.705

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