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

Diff for /loncom/interface/lonprintout.pm between versions 1.585 and 1.586

version 1.585, 2010/09/15 16:37:36 version 1.586, 2011/03/11 05:01:36
Line 256  CHOOSE_ANON1 Line 256  CHOOSE_ANON1
    return $result;     return $result;
 }  }
   
   sub generate_format_selector {
       my ($helper,$title,$nextstate) = @_;
       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="PRINT_FORMATTING" title="$title">
       $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>
          $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 3578  ALL_PROBLEMS Line 3609  ALL_PROBLEMS
   $map,    $map,
   $isProblem, '', $symbFilter,    $isProblem, '', $symbFilter,
   $start_new_option);    $start_new_option);
  $resource_selector .=  <<RESOURCE_SELECTOR;          my $secpdfoption;
     <state name="PRINT_FORMATTING" title="How should results be printed?">          unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>                  ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
     <choices variable="EMPTY_PAGES">                  ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {
       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>              $secpdfoption =  '<choice computer="sections">Each PDF contains exactly one section</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>   $resource_selector .=  &generate_format_selector($helper,
       <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>                                                           'How should results be printed?').
     </choices>                                 &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
     <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 3726  RESOURCE_SELECTOR Line 3745  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
   
           my $nextstate = '<nextstate>NUMBER_PER_PDF</nextstate>'; 
           $resource_selector .= &generate_format_selector($helper,
                                                           'Format of the print job',
                                                           $nextstate);
  &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'>
Removed from v.1.585  
changed lines
  Added in v.1.586

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