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

Diff for /loncom/interface/lonprintout.pm between versions 1.568.2.10 and 1.583.2.5

version 1.568.2.10, 2010/11/13 01:57:14 version 1.583.2.5, 2011/09/15 16:33:57
Line 196  sub generate_code_selector { Line 196  sub generate_code_selector {
     <message><br /><hr /> <br /></message>      <message><br /><hr /> <br /></message>
     <message><h3>Generate new CODEd Assignments</h3></message>      <message><h3>Generate new CODEd Assignments</h3></message>
     <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>      <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">      <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
        <validator>         <validator>
  if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&   if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
     !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
             !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&              !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
     !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'} ) {
   
     return "You need to specify the number of assignments to print";      return "You need to specify the number of assignments to print";
  }   }
           if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
                (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
               return 'Specifying number of codes to print and a specific code is not compatible';
           }
  return undef;   return undef;
        </validator>         </validator>
     </string>      </string>
Line 228  sub generate_code_selector { Line 233  sub generate_code_selector {
       !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {        !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
       return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},        return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
       \$helper->{'VARS'}{'CODE_OPTION'});        \$helper->{'VARS'}{'CODE_OPTION'});
     } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
         return 'Specifying a code name is incompatible with specifying number of codes.';
    } else {     } else {
        return undef; # Other forces control us.         return undef; # Other forces control us.
    }     }
Line 249  CHOOSE_ANON1 Line 256  CHOOSE_ANON1
    return $result;     return $result;
 }  }
   
   #  Returns the XML for choosing how assignments are to be formatted
   #  that text must still be parsed by the helper xml parser.
   # Parameters: 3 (required)
   
   #   helper       - The helper; $helper->{'VARS'}->{'PRINT_TYPE'} used
   #                  to check if splitting PDFs by section can be offered.
   #   title        - Title for the current state.
   #   this_state   - State name of the chooser.
   
   sub generate_format_selector {
       my ($helper,$title,$this_state) = @_;
       my $secpdfoption;
       unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {
           $secpdfoption =  '<choice computer="sections">Each PDF contains exactly one section</choice>';
       }
       return <<RESOURCE_SELECTOR;
       <state name="$this_state" title="$title">
       <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
       <choices variable="EMPTY_PAGES">
         <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
         <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
         <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
         <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
       </choices>
       <nextstate>PAGESIZE</nextstate>
       <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
       <choices variable="SPLIT_PDFS">
          <choice computer="all">All assignments in a single PDF file</choice>
          $secpdfoption
          <choice computer="oneper">Each PDF contains exactly one assignment</choice>
          <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
               Specify the number of assignments per PDF:</choice>
       </choices>
       </state>
   RESOURCE_SELECTOR
   }
   
   
 #-----------------------------------------------------------------------  #-----------------------------------------------------------------------
   
   
Line 312  sub set_font_size { Line 359  sub set_font_size {
   
     if ($font_size ne '') {      if ($font_size ne '') {
   
         $text =~ s/\\begin{document}/\\begin{document}{\\$font_size/;   $text =~ s/\\begin{document}/\\begin{document}{\\$font_size/;
     }      }
     $text =~ s/\\end{document}/}\\end{document}/;      $text =~ s/\\end{document}/}\\end{document}/;
     return $text;      return $text;
   
   
 }  }
   
 # include_pdf - PDF files are included into the   # include_pdf - PDF files are included into the 
Line 499  sub printf_style_subst { Line 548  sub printf_style_subst {
 #     %a    - Assignment name.  #     %a    - Assignment name.
 #     %c    - Course name.  #     %c    - Course name.
 #     %n    - Student name.  #     %n    - Student name.
   #     %s    - The section if it is supplied.
 #  #
 sub format_page_header {  sub format_page_header {
     my ($width, $format, $assignment, $course, $student) = @_;      my ($width, $format, $assignment, $course, $student) = @_;
   
   
   
     $width = &recalcto_mm($width); # Get width in mm.      $width = &recalcto_mm($width); # Get width in mm.
     my $chars_per_line = int($width/2);   # Character/textline.      my $chars_per_line = int($width/2);   # Character/textline.
   
Line 543  sub format_page_header { Line 595  sub format_page_header {
         $format =  &printf_style_subst("a", $format, $assignment);          $format =  &printf_style_subst("a", $format, $assignment);
         $format =  &printf_style_subst("c", $format, $course);          $format =  &printf_style_subst("c", $format, $course);
         $format =  &printf_style_subst("n", $format, $student);          $format =  &printf_style_subst("n", $format, $student);
       
         # If the user put %'s in the format string, they  must be escaped          # If the user put %'s in the format string, they must be escaped
         # to \% else LaTeX will think they are comments and terminate          # to \% else LaTeX will think they are comments and terminate
         # the line.. which is bad!!!          # the line.. which is bad!!!
   
     }      }
           
     return $format;      return $format;
Line 1288  sub page_format_transformation { Line 1341  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') {
             my $papersize_text;      my $papersize_text;
             if ($perm{'pav'}) {      if ($perm{'pav'}) {
                 $papersize_text = '\\special{papersize=210mm,297mm}';   $papersize_text = '\\special{papersize=210mm,297mm}';
             } else {      } else {
                 $papersize_text = '\special{papersize=210mm,297mm}';   $papersize_text = '\special{papersize=210mm,297mm}';
             }      }
             $text =~ s/(\\begin{document})/$1$papersize_text/;      $text =~ s/(\\begin{document})/$1$papersize_text/;
  }   }
     }      }
     if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}      if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}
Line 1527  sub print_page_in_course { Line 1580  sub print_page_in_course {
     } else {      } else {
         my $esc_currentURL= $currentURL;          my $esc_currentURL= $currentURL;
         $esc_currentURL =~ s/_/\\_/g;          $esc_currentURL =~ s/_/\\_/g;
         $result.=$esc_currentURL;   $result.=$esc_currentURL;
     }      }
     $result .= '\\\\';      $result .= '\\\\';
   
Line 1568  sub print_page_in_course { Line 1621  sub print_page_in_course {
   
     $form{'grade_target'}  = 'tex';      $form{'grade_target'}  = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);      $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
     $form{'pdfFormFields'} = 'no';              $form{'pdfFormFields'} = 'no';
     $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};          $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};    
           
     $form{'problem_split'}=$parmhash{'problem_stream_switch'};      $form{'problem_split'}=$parmhash{'problem_stream_switch'};
Line 1674  sub print_page_in_course { Line 1727  sub print_page_in_course {
 sub recently_generated {  sub recently_generated {
     my ($prtspool) = @_;      my ($prtspool) = @_;
     my $output;      my $output;
   
     my $zip_result;      my $zip_result;
     my $pdf_result;      my $pdf_result;
     opendir(DIR,$prtspool);      opendir(DIR,$prtspool);
Line 1707  sub recently_generated { Line 1759  sub recently_generated {
  if ($ext eq 'zip') { $zip_result .= $result; }   if ($ext eq 'zip') { $zip_result .= $result; }
     }      }
     if ($zip_result || $pdf_result) {      if ($zip_result || $pdf_result) {
         $output = '<hr />';          $output ='<hr />';
     }      }
     if ($zip_result) {      if ($zip_result) {
  $output .='<h3>'.&mt('Recently generated printout zip files')."</h3>\n"   $output .='<h3>'.&mt('Recently generated printout zip files')."</h3>\n"
Line 1744  sub recently_generated { Line 1796  sub recently_generated {
 #  #
 #  #
 # use Data::Dumper;  # use Data::Dumper;
 #sub dump_helper_vars {  # sub dump_helper_vars {
 #    my ($helper) = @_;  #    my ($helper) = @_;
 #    my $helpervars = Dumper($helper->{'VARS'});  #    my $helpervars = Dumper($helper->{'VARS'});
 #    &Apache::lonnet::logthis("Dump of helper vars:\n $helpervars");  #    &Apache::lonnet::logthis("Dump of helper vars:\n $helpervars");
Line 1759  sub get_page_breaks  { Line 1811  sub get_page_breaks  {
     }      }
     return %page_breaks;      return %page_breaks;
 }  }
   # 
   #   Returns text to insert for any extra vskip prior to the resource.
   #   Parameters:
   #     helper   - Reference to the helper object driving the printout.
   #     resource - Identifies the resource about to be printed.
   #
   #   This is done as follows:
   #    POSSIBLE_RESOURCES has the list of possible resources.
   #    EXTRASPACE         has the list of extra space values.
   #    EXTRASPACE_UNITS   is the set of resources for which the units are
   #                       mm. All others are 'in'.
   #    
   #    The resource is found in the POSSIBLE_RESOURCES to get the index
   #    of the EXTRASPACE value.
   #
   #   In order to speed this up for lengthy printouts, the first time,
   #   POSSIBLE_RESOURCES is turned into a look up hash and
   #   EXTRASPACE is turned into an array.
   #
   
   
   my %possible_resources;
   my %extraspace_mm;
   my @extraspace;
   my $skips_loaded       = 0;
   
   #  Function to load the skips hash and array
   
   sub load_skips {
   
       my ($helper)  = @_;
   
       #  If this is the first time, unrap the resources and extra spaces:
   
       if (!$skips_loaded) {
    @extraspace = (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE'}));
    my @resource_list = (split(/\|\|\|/, $helper->{'VARS'}->{'POSSIBLE_RESOURCES'}));
    my $i = 0;
    foreach my $resource (@resource_list) {
       $possible_resources{$resource} = $i;
       $i++;
    }
    foreach my $mm_resource (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE_UNITS'})) {
       $extraspace_mm{$mm_resource} = 1;
    }
    $skips_loaded = 1;
       }
   }
   
   sub get_extra_vspaces {
       my ($helper, $resource) = @_;
   
       &load_skips($helper);
   
       #  Lookup the resource in the possible resources hash.. that is the index
       # into the extraspace array that gives us either an empty string or
       # the number of mm to skip:
   
       my $index = $possible_resources{$resource};
       my $skip  = $extraspace[$index];
   
       my $result = '';
       if ($skip ne '') {
    my $units = 'in';
    if (defined($extraspace_mm{$resource})) {
       $units = 'mm';
    }
    $result = '\vskip '.$skip.' '.$units;
       }
   
   
       return $result;
   
   
   }
   
   #
   #  The resource chooser part of the helper needs more than just
   #  the value of the extraspaces var to recover the value into a text
   #  field option.  This sub produces the required format for the saved var:
   #  specifically 
   #    ||| separated fields of the form resourcename=value
   #
   #  Parameters:
   #    $helper     - Refers to the helper we are configuring
   #  Implicit input:
   #     $helper->{'VARS'}->{'EXTRASPACE'}  - the spaces helper var has the text field
   #                                          value.
   #     $helper->{'VARS'}->{'EXTRASPACE_UNITS'} - units for the skips (checkboxes).
   #     $helper->{'VARS'}->{'POSSIBLE_RESOURCES'}  - has the list of resources. |||
   #                                          separated of course.
   #  Implicit outputs:
   #     $env{'form.extraspace'}
   #     $env{'form.extraspace_units'}
   #
   sub set_form_extraspace {
       my ($helper) = @_;
   
       # the most convenient way to do this is to drive from the skips arrays/hash.
       # may not be the fastest, but this is once per print request so it's not so
       # speed critical:
   
       &load_skips($helper);
   
       my $result = '';
   
       foreach my $resource (keys(%possible_resources)) {
    my $vskip = $extraspace[$possible_resources{$resource}];
    $result  .= $resource .'=' . $vskip . '|||';
       }
   
       $env{'form.extraspace'}  = $result;
       $env{'form.extraspace_units'} = $helper->{'VARS'}->{'EXTRASPACE_UNITS'};
       return $result;
       
   }
   
 #  Output a sequence (recursively if neeed)  #  Output a sequence (recursively if neeed)
 #  from construction space.  #  from construction space.
Line 1930  ENDPART Line 2098  ENDPART
     # indexed by symb and contains 1's for each break.      # indexed by symb and contains 1's for each break.
   
     $env{'form.pagebreaks'}  = $helper->{'VARS'}->{'FINISHPAGE'};      $env{'form.pagebreaks'}  = $helper->{'VARS'}->{'FINISHPAGE'};
       &set_form_extraspace($helper);
     $env{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'};       $env{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'}; 
     &Apache::loncommon::store_course_settings('print',      &Apache::loncommon::store_course_settings('print',
       {'pagebreaks'    => 'scalar',        {'pagebreaks'    => 'scalar',
          'extraspace'    => 'scalar',
          'extraspace_units' => 'scalar',
        'lastprinttype' => 'scalar'});         'lastprinttype' => 'scalar'});
   
     my %page_breaks  = &get_page_breaks($helper);      my %page_breaks  = &get_page_breaks($helper);
   
     my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};      my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
Line 1979  ENDPART Line 2149  ENDPART
  &Apache::lonnet::delenv('construct.style');   &Apache::lonnet::delenv('construct.style');
     }      }
   
   
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {      if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...        #-- single document - problem, page, html, xml, ...
  my ($currentURL,$cleanURL);   my ($currentURL,$cleanURL);
Line 2149  ENDPART Line 2318  ENDPART
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG       ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') 
      ) {        ) {
   
   
    
         #-- produce an output string          #-- produce an output string
  if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')  or   if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')  or
     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ) {      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ) {
Line 2198  ENDPART Line 2367  ENDPART
     $result.="\\newpage\n";      $result.="\\newpage\n";
  }   }
     }      }
       $result .= &get_extra_vspaces($helper, $master_seq[$i]);
     my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);      my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
     $urlp=&Apache::lonnet::clutter($urlp);      $urlp=&Apache::lonnet::clutter($urlp);
     $form{'symb'}=$master_seq[$i];      $form{'symb'}=$master_seq[$i];
Line 2218  ENDPART Line 2388  ENDPART
                              (($urlp=~/\.page$/) ||                               (($urlp=~/\.page$/) ||
                               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ||                                ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ||
                               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page')))) {                                ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page')))) {
                           $flag_latex_header_remove = 'YES';
         $flag_latex_header_remove = 'YES';  
                     }                      }
  }   }
  $texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);   $texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
Line 2228  ENDPART Line 2397  ENDPART
     if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}       if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
     $texversion =~ s/\\end{document}\d*/\\end{document}/;      $texversion =~ s/\\end{document}\d*/\\end{document}/;
     $flag_page_in_sequence = 'YES';      $flag_page_in_sequence = 'YES';
  }    }
   
  if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||   if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
    ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {     ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
Line 2240  ENDPART Line 2409  ENDPART
   
     &Apache::lonxml::restore_problem_counter();      &Apache::lonxml::restore_problem_counter();
     my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);      my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
   
                     if ($urlp =~ /\.page$/) {                      if ($urlp =~ /\.page$/) {
                         $answer =~ s/\\end{document}(\d*)$//;                          $answer =~ s/\\end{document}(\d*)$//;
                     }                      }
Line 2256  ENDPART Line 2424  ENDPART
     } else {      } else {
  if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/) {   if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/) {
     $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});      $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
 #    $texversion =~ s/\\begin{document}//;  #    $texversion =~ s/\\begin{document}//; # FIXME
     my $title = &Apache::lonnet::gettitle($master_seq[$i]);      my $title = &Apache::lonnet::gettitle($master_seq[$i]);
     $title = &Apache::lonxml::latex_special_symbols($title);      $title = &Apache::lonxml::latex_special_symbols($title);
     my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';      my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
Line 2286  ENDPART Line 2454  ENDPART
  if (($selectionmade == 4) and ($assignment ne $prevassignment)) {   if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
     my $name = &get_name();      my $name = &get_name();
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }                      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     $prevassignment=$assignment;      $prevassignment=$assignment;
     my $header_text = $parmhash{'print_header_format'};      my $header_text = $parmhash{'print_header_format'};
     $header_text    = &format_page_header($textwidth, $header_text,      $header_text    = &format_page_header($textwidth, $header_text,
Line 2350  ENDPART Line 2518  ENDPART
  }   }
  $result .= $texversion;   $result .= $texversion;
  $flag_latex_header_remove = 'YES';      $flag_latex_header_remove = 'YES';   
     }          }
     if (&Apache::loncommon::connection_aborted($r)) {       if (&Apache::loncommon::connection_aborted($r)) { 
  last;    last; 
     }      }
Line 2451  ENDPART Line 2619  ENDPART
      $resources_printed .= ":";       $resources_printed .= ":";
      $print_array[$i].=$output;       $print_array[$i].=$output;
      $student_names[$i].=$person.':'.$fullname.'_END_';       $student_names[$i].=$person.':'.$fullname.'_END_';
      &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');
      $flag_latex_header_remove = 'YES';       $flag_latex_header_remove = 'YES';
      if (&Apache::loncommon::connection_aborted($r)) { last; }       if (&Apache::loncommon::connection_aborted($r)) { last; }
  }   }
Line 2524  ENDPART Line 2693  ENDPART
  my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});   my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
  &adjust_number_to_print($helper);   &adjust_number_to_print($helper);
  my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};   my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
  if ($number_per_page eq '0' || $number_per_page eq 'all') {   if ($number_per_page eq '0' || $number_per_page eq 'all'
                || $number_per_page eq 'section') {
      $number_per_page=$num_todo;       $number_per_page=$num_todo;
  }   }
  my $flag_latex_header_remove = 'NO';    my $flag_latex_header_remove = 'NO'; 
Line 2821  sub print_resources { Line 2991  sub print_resources {
  $current_output.= "\\newpage\n";   $current_output.= "\\newpage\n";
     }      }
  }   }
    $current_output .= &get_extra_vspaces($helper, $curresline);
  $i++;   $i++;
   
  if ( !($type eq 'problems' &&    if ( !($type eq 'problems' && 
Line 2863  sub print_resources { Line 3034  sub print_resources {
           
     my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});      my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
                             unless ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') {                              unless ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') {
         $header =~ s/\\begin{document}//;     #<<<<<                                  $header =~ s/\\begin{document}//;     #<<<<<
                             }                              }
     my $title = &Apache::lonnet::gettitle($curresline);      my $title = &Apache::lonnet::gettitle($curresline);
     $title = &Apache::lonxml::latex_special_symbols($title);      $title = &Apache::lonxml::latex_special_symbols($title);
Line 3012  sub init_perm { Line 3183  sub init_perm {
  $perm{'pfo'}=&Apache::lonnet::allowed('pfo',   $perm{'pfo'}=&Apache::lonnet::allowed('pfo',
   $env{'request.course.id'}.'/'.$env{'request.course.sec'});    $env{'request.course.id'}.'/'.$env{'request.course.sec'});
     }      }
       $perm{'vgr'}=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
       if (!$perm{'vgr'}) {
           $perm{'vgr'}=&Apache::lonnet::allowed('vgr',
                      $env{'request.course.id'}.'/'.$env{'request.course.sec'});
       }
 }  }
   
 sub get_randomly_ordered_warning {  sub get_randomly_ordered_warning {
Line 3083  sub printHelper { Line 3259  sub printHelper {
     $helper->declareVar('PRINT_TYPE');      $helper->declareVar('PRINT_TYPE');
     $helper->declareVar("showallfoils");      $helper->declareVar("showallfoils");
     $helper->declareVar("STUDENTS");      $helper->declareVar("STUDENTS");
       $helper->declareVar("EXTRASPACE");
   
         
   
   
     #  The page breaks can get loaded initially from the course environment:      #  The page breaks and extra spaces
       #  can get loaded initially from the course environment:
     # But we only do this in the initial state so that they are allowed to change.      # But we only do this in the initial state so that they are allowed to change.
     #      #
   
     # $helper->{VARS}->{FINISHPAGE} = '';  
           
     &Apache::loncommon::restore_course_settings('print',      &Apache::loncommon::restore_course_settings('print',
  {'pagebreaks'  => 'scalar',   {'pagebreaks'  => 'scalar',
    'extraspace'  => 'scalar',
    'extraspace_units' => 'scalar',
          'lastprinttype' => 'scalar'});           'lastprinttype' => 'scalar'});
           
     # This will persistently load in the data we want from the      # This will persistently load in the data we want from the
Line 3105  sub printHelper { Line 3283  sub printHelper {
  if (!defined ($env{"form.CURRENT_STATE"})) {   if (!defined ($env{"form.CURRENT_STATE"})) {
           
     $helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};      $helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
       $helper->{VARS}->{EXTRASPACE} = $env{'form.extraspace'};
       $helper->{VARS}->{EXTRASPACE_UNITS} = $env{'form.extraspace_units'};
  } else {   } else {
     my $state = $env{"form.CURRENT_STATE"};      my $state = $env{"form.CURRENT_STATE"};
     if ($state eq "START") {      if ($state eq "START") {
  $helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};   $helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
    $helper->{VARS}->{EXTRASPACE} = $env{'form.extraspace'};
    $helper->{VARS}->{EXTRASPACE_UNITS} = $env{'form.extraspace_units'};
   
     }      }
  }   }
   
Line 3227  sub printHelper { Line 3410  sub printHelper {
     if ($perm{'pav'}) {      if ($perm{'pav'}) {
  $start_new_option =    $start_new_option = 
     "<option text='".&mt('Start new page<br />before selected').      "<option text='".&mt('Start new page<br />before selected').
     "' variable='FINISHPAGE' />";      "' variable='FINISHPAGE' />".
       "<option text='".&mt('Extra space<br />before selected').
       "' variable='EXTRASPACE' type='text' />" .
       "<option " .
       "' variable='POSSIBLE_RESOURCES' type='hidden' />".
       "<option text='".&mt('Space units<br />check for mm').
       "' variable='EXTRASPACE_UNITS' type='checkbox' />"
       ;
       
   
     }      }
   
     # If not construction space user can print the components of a page:      # If not construction space user can print the components of a page:
Line 3408  ALL_PROBLEMS Line 3600  ALL_PROBLEMS
   $map,    $map,
   $isProblem, '', $symbFilter,    $isProblem, '', $symbFilter,
   $start_new_option);    $start_new_option);
  $resource_selector .=  <<RESOURCE_SELECTOR;          $resource_selector .=  &generate_format_selector($helper,
     <state name="PRINT_FORMATTING" title="How should results be printed?">                                                           'How should results be printed?',
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>                                                           'PRINT_FORMATTING').
     <choices variable="EMPTY_PAGES">                                 &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>  
       <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>  
       <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>  
       <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>  
     </choices>  
     <nextstate>PAGESIZE</nextstate>  
     <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>  
     <choices variable="SPLIT_PDFS">  
        <choice computer="all">All assignments in a single PDF file</choice>  
        <choice computer="sections">Each PDF contains exactly one section</choice>  
        <choice computer="oneper">Each PDF contains exactly one assignment</choice>  
        <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">  
             Specify the number of assignments per PDF:</choice>  
     </choices>  
     </state>  
 RESOURCE_SELECTOR  
         $resource_selector .= &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',  
  'Select Problem(s) to print',   'Select Problem(s) to print',
  "multichoice='1' addstatus='1' closeallpages ='1'",   "multichoice='1' addstatus='1' closeallpages ='1'",
  'RESOURCES',   'RESOURCES',
Line 3556  RESOURCE_SELECTOR Line 3731  RESOURCE_SELECTOR
       $start_new_option        $start_new_option
       </resource>        </resource>
     </state>      </state>
   
     <state name="PRINT_FORMATTING" title="Format of the print job">  
     <nextstate>NUMBER_PER_PDF</nextstate>  
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>  
     <choices variable="EMPTY_PAGES">  
       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>  
       <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>  
       <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>  
       <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>  
     </choices>  
     <nextstate>PAGESIZE</nextstate>  
     <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>  
     <choices variable="SPLIT_PDFS">  
        <choice computer="all">All assignments in a single PDF file</choice>  
        <choice computer="sections">Each PDF contains exactly one section</choice>  
        <choice computer="oneper">Each PDF contains exactly one assignment</choice>  
        <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">  
            Specify the number of assignments per PDF:</choice>  
     </choices>  
     </state>  
 RESOURCE_SELECTOR  RESOURCE_SELECTOR
   
           $resource_selector .= &generate_format_selector($helper,
                                                           'Format of the print job',
                                                           'PRINT_FORMATTING');
  &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);   &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">    <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
     <choices variable='student_sort'>      <choices variable='student_sort'>
Line 3598  CHOOSE_STUDENTS1 Line 3756  CHOOSE_STUDENTS1
     <message><br /><hr /> <br /></message>      <message><br /><hr /> <br /></message>
     <message><h3>Generate new CODEd Assignments</h3></message>      <message><h3>Generate new CODEd Assignments</h3></message>
     <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>      <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">      <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
        <validator>         <validator>
  if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&   if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
     !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
Line 3606  CHOOSE_STUDENTS1 Line 3764  CHOOSE_STUDENTS1
     !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
     return "You need to specify the number of assignments to print";      return "You need to specify the number of assignments to print";
  }   }
           if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
                (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
               return 'Specifying number of codes to print and a specific code is not compatible';
           }
  return undef;   return undef;
        </validator>         </validator>
     </string>      </string>
Line 3629  CHOOSE_STUDENTS1 Line 3791  CHOOSE_STUDENTS1
       !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {        !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
       return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},        return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
       \$helper->{'VARS'}{'CODE_OPTION'});        \$helper->{'VARS'}{'CODE_OPTION'});
     } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
         return 'Specifying a code name is incompatible specifying number of codes.';
    } else {     } else {
        return undef; # Other forces control us.         return undef; # Other forces control us.
    }     }
Line 3729  CHOOSE_FROM_ANY_SEQUENCE Line 3893  CHOOSE_FROM_ANY_SEQUENCE
     my $startedTable = 0; # have we started an HTML table yet? (need      my $startedTable = 0; # have we started an HTML table yet? (need
                           # to close it later)                            # to close it later)
   
     if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or       if (($perm{'pav'} and $perm{'vgr'}) or 
  ($helper->{VARS}->{'construction'} eq '1')) {   ($helper->{VARS}->{'construction'} eq '1')) {
  &addMessage('<br />'   &addMessage('<br />'
                    .'<h3>'.&mt('Print Options').'</h3>'                     .'<h3>'.&mt('Print Options').'</h3>'
Line 3941  FONT_SELECTION Line 4105  FONT_SELECTION
    <choice computer="problem">Homework Problem</choice>     <choice computer="problem">Homework Problem</choice>
    <choice computer="exam">Exam Problem</choice>     <choice computer="exam">Exam Problem</choice>
    <choice computer="survey">Survey question</choice>     <choice computer="survey">Survey question</choice>
                      ,choice computer="anonsurvey"Anonymous survey question</choice>
  </dropdown>   </dropdown>
 PROBTYPE  PROBTYPE
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);              &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
Line 3977  PROBTYPE Line 4142  PROBTYPE
   
     my $footer;      my $footer;
     if ($helper->{STATE} eq 'START') {      if ($helper->{STATE} eq 'START') {
  my $prtspool=$r->dir_config('lonPrtDir');          my $prtspool=$r->dir_config('lonPrtDir');
         $footer = &recently_generated($prtspool);          $footer = &recently_generated($prtspool);
     }      }
     $r->print($helper->display($footer));      $r->print($helper->display($footer));
Line 4103  sub render { Line 4268  sub render {
     }      }
     $result .= <<HTML;      $result .= <<HTML;
         </select>          </select>
         <hidden name="${var}.pdfFormFields" value="no" />  
     </td>      </td>
 HTML  HTML
     $result.=&Apache::loncommon::end_data_table_row()      $result.=&Apache::loncommon::end_data_table_row()
Removed from v.1.568.2.10  
changed lines
  Added in v.1.583.2.5

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