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

Diff for /loncom/interface/lonprintout.pm between versions 1.464 and 1.467

version 1.464, 2006/07/18 18:19:51 version 1.467, 2006/07/24 22:13:58
Line 2064  sub init_perm { Line 2064  sub init_perm {
  $perm{'pav'}=&Apache::lonnet::allowed('pav',   $perm{'pav'}=&Apache::lonnet::allowed('pav',
   $env{'request.course.id'}.'/'.$env{'request.course.sec'});    $env{'request.course.id'}.'/'.$env{'request.course.sec'});
     }      }
     $perm{'pfo'}=&Apache::lonnet::allowed('pav',$env{'request.course.id'});      $perm{'pfo'}=&Apache::lonnet::allowed('pfo',$env{'request.course.id'});
     if (!$perm{'pfo'}) {      if (!$perm{'pfo'}) {
  $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'});
Line 2241  sub printHelper { Line 2241  sub printHelper {
   
     $helper->declareVar('SEQUENCE');      $helper->declareVar('SEQUENCE');
   
       # If we're in a sequence...
   
       my $start_new_option;
       if ($perm{'pav'}) {
    $start_new_option = 
       "<option text='".&mt('Start new page<br />before selected').
       "' variable='FINISHPAGE' />";
       }
   
     # If we're in a sequence...  
     my $startnew=&mt('Start new page<br />before selected');  
     if (($helper->{'VARS'}->{'construction'} ne '1') &&      if (($helper->{'VARS'}->{'construction'} ne '1') &&
   
  $helper->{VARS}->{'postdata'} &&   $helper->{VARS}->{'postdata'} &&
Line 2253  sub printHelper { Line 2258  sub printHelper {
         push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];          push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence          # Allow all resources from sequence
         push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];          push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
   
         my $helperFragment = <<HELPERFRAGMENT;          my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">    <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
Line 2261  sub printHelper { Line 2267  sub printHelper {
       <filterfunc>return $isProblem;</filterfunc>        <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>        <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>        <valuefunc>return $symbFilter;</valuefunc>
       <option text='$startnew' variable='FINISHPAGE' />        $start_new_option
       </resource>        </resource>
     </state>      </state>
   
Line 2272  sub printHelper { Line 2278  sub printHelper {
       <filterfunc>return $isNotMap;</filterfunc>        <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>        <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>        <valuefunc>return $symbFilter;</valuefunc>
       <option text='$startnew' variable='FINISHPAGE' />        $start_new_option
       </resource>        </resource>
     </state>      </state>
 HELPERFRAGMENT  HELPERFRAGMENT
Line 2295  HELPERFRAGMENT Line 2301  HELPERFRAGMENT
       <filterfunc>return $isProblemOrMap;</filterfunc>        <filterfunc>return $isProblemOrMap;</filterfunc>
       <choicefunc>return $isNotMap;</choicefunc>        <choicefunc>return $isNotMap;</choicefunc>
       <valuefunc>return $symbFilter;</valuefunc>        <valuefunc>return $symbFilter;</valuefunc>
       <option text='$startnew' variable='FINISHPAGE' />        $start_new_option
     </resource>      </resource>
   </state>    </state>
   <state name="ALL_RESOURCES" title="Select Resource(s) to print">    <state name="ALL_RESOURCES" title="Select Resource(s) to print">
Line 2304  HELPERFRAGMENT Line 2310  HELPERFRAGMENT
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap; </filterfunc>        <filterfunc>return $isNotMap; </filterfunc>
       <valuefunc>return $symbFilter;</valuefunc>        <valuefunc>return $symbFilter;</valuefunc>
       <option text='$startnew' variable='FINISHPAGE' />        $start_new_option
     </resource>      </resource>
   </state>    </state>
 ALL_PROBLEMS  ALL_PROBLEMS
Line 2332  ALL_PROBLEMS Line 2338  ALL_PROBLEMS
       <filterfunc>return $isProblem;</filterfunc>        <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>        <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>        <valuefunc>return $symbFilter;</valuefunc>
       <option text='$startnew' variable='FINISHPAGE' />        $start_new_option
       </resource>        </resource>
     </state>      </state>
     <state name="PRINT_FORMATTING" title="How should results be printed?">      <state name="PRINT_FORMATTING" title="How should results be printed?">
Line 2496  CHOOSE_ANON1 Line 2502  CHOOSE_ANON1
       <filterfunc>return $isNotMap;</filterfunc>        <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>        <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>        <valuefunc>return $symbFilter;</valuefunc>
       <option text='$startnew' variable='FINISHPAGE' />        $start_new_option
       </resource>        </resource>
     </state>      </state>
     <state name="PRINT_FORMATTING" title="Format of the print job">      <state name="PRINT_FORMATTING" title="Format of the print job">
Line 2637  CHOOSE_FROM_SUBDIR Line 2643  CHOOSE_FROM_SUBDIR
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1">                closeallpages="1">
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblem</filterfunc>        <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>        <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>        <valuefunc>return $symbFilter;</valuefunc>
       <option text='$startnew' variable='FINISHPAGE' />        $start_new_option
       </resource>        </resource>
     </state>      </state>
 CHOOSE_FROM_ANY_SEQUENCE  CHOOSE_FROM_ANY_SEQUENCE
Line 2969  sub new { Line 2975  sub new {
   
     $self->{NEXTSTATE} = shift;      $self->{NEXTSTATE} = shift;
     bless($self);      bless($self);
   
     return $self;      return $self;
 }  }
   
Line 2978  sub render { Line 2985  sub render {
     my $result = '';      my $result = '';
     my $var = $self->{'variable'};      my $var = $self->{'variable'};
   
   
   
     if (defined $self->{ERROR_MSG}) {      if (defined $self->{ERROR_MSG}) {
         $result .= '<br /><span class="LC_error">' . $self->{ERROR_MSG} . '</span><br />';          $result .= '<br /><span class="LC_error">' . $self->{ERROR_MSG} . '</span><br />';
     }      }
Line 3067  sub preprocess { Line 3076  sub preprocess {
     my $helper = Apache::lonhelper::getHelper();      my $helper = Apache::lonhelper::getHelper();
   
     my $format = $helper->{VARS}->{$self->{'formatvar'}};      my $format = $helper->{VARS}->{$self->{'formatvar'}};
   
       #  If the user does not have 'pav' privilege, set default widths and
       #  on to the next state right away.
       #
       if (!$perm{'pav'}) {
    my $var = $self->{'variable'};
    my $format = $helper->{VARS}->{$self->{'formatvar'}};
   
    my ($laystyle, $cols, $papersize) = split(/\|/, $format);
    ($papersize)                      = split(/ /, $papersize);
   
   
    if ($laystyle eq 'L') {
       $laystyle = 'album';
    } else {
       $laystyle = 'book';
    }
    #  Figure out some good defaults for the print out and set them:
   
    my %size;
    ($size{'width'},
    $size{'height'},
    $size{'lmargin'})=
        &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
   
    foreach my $dim ('width', 'height', 'lmargin') {
       my ($value, $units) = split(/ /, $size{$dim});
       
       &Apache::lonnet::logthis("$dim : $value : $units");
       
       $helper->{VARS}->{"$var.".$dim}      = $value;
       $helper->{VARS}->{"$var.".$dim.'unit'} = $units;
       
    }
   
   
    # Transition to the next state
   
    $helper->changeState($self->{NEXTSTATE});
       }
         
     return 1;      return 1;
 }  }
Removed from v.1.464  
changed lines
  Added in v.1.467

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