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

Diff for /loncom/interface/lonprintout.pm between versions 1.690 and 1.695

version 1.690, 2023/04/15 21:50:34 version 1.695, 2024/10/16 17:48:08
Line 1861  my %page_formats= Line 1861  my %page_formats=
     ('letter' => {      ('letter' => {
  'book' => {   'book' => {
      '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.275 in'],       '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.275 in'],
      '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.275 in']       '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','-0.4 in']
  },   },
  'album' => {   'album' => {
      '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','0.394 in'],       '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','0.394 in'],
      '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']       '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.25 in']
  },   },
      },       },
      'legal' => {       'legal' => {
Line 3310  ENDPART Line 3310  ENDPART
                  ($map, my $id, my $resource) =                   ($map, my $id, my $resource) =
                      &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});                       &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
              }               }
            } elsif (($helper->{'VARS'}->{'postdata'} eq '/adm/navmaps') && ($perm{'pfo'})) {
                $map = $helper->{'VARS'}->{'SEQUENCE'};
          }           }
   
  #loop over students   #loop over students
Line 3399  ENDPART Line 3401  ENDPART
          if ($helper->{VARS}{'symb'}) {           if ($helper->{VARS}{'symb'}) {
              ($map, my $id, my $resource) =               ($map, my $id, my $resource) =
                  &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});                   &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
            } elsif (($helper->{'VARS'}->{'postdata'} eq '/adm/navmaps') && ($perm{'pfo'})) {
                $map = $helper->{'VARS'}->{'SEQUENCE'};
          }           }
  my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));   my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
  $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};   $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
Line 4821  CHOOSE_FROM_SUBDIR Line 4825  CHOOSE_FROM_SUBDIR
                          '<b>','</b>','<b>','</b>','<b>','</b>'),                           '<b>','</b>','<b>','</b>','<b>','</b>'),
                          'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']);                           'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']);
                 if ($escapedSequenceName) {                  if ($escapedSequenceName) {
                     &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,$isProblem,$symbFilter,$start_new_option);                      my ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice) =
                           &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,
                                                     $isProblem,$symbFilter,$start_new_option);
   
                       my $resource_selector = <<RESOURCE_SELECTOR;
     <state name="CHOOSE_STUDENTS2" title="Select Students and Resources">
       <choices variable='student_sort'>
         <choice computer='0'>Sort by section then student</choice>
         <choice computer='1'>Sort by students across sections.</choice>
       </choices>
       <message><br /><hr /><br /></message>
       <student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />
   
       </state>
       <state name="SELECT_RESOURCES" title="Select Resources">
       $randomly_ordered_warning
       <nextstate>PRINT_FORMATTING</nextstate>
       <message>(mark desired resources then click "next" button) <br /></message>
       <resource variable="RESOURCES" multichoice="1" addstatus="1"
                 closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
         <filterfunc>return $isNotMap;</filterfunc>
         <mapurl>$escapedSequenceName</mapurl>
         <valuefunc>return $symbFilter;</valuefunc>
         $start_new_option
         </resource>
       </state>
   RESOURCE_SELECTOR
   
                       my $anon3 = &generate_code_selector($helper,
                                                           'CHOOSE_ANON3',
                                                           'SELECT_RESOURCES',
                                                           $codechoice,
                                                           $code_selection,
                                                           $namechoice) . $resource_selector;
   
                       &Apache::lonxml::xmlparse($r, 'helper',$anon3);
                 }                  }
             }              }
         }          }
         if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) {          if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) {
            &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);              &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
   <state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">    <state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">
     <message>Select the sequence to print resources from:</message>      <message>Select the sequence to print resources from:</message>
     <resource variable="SEQUENCE">      <resource variable="SEQUENCE">
Line 4860  CHOOSE_FROM_SUBDIR Line 4899  CHOOSE_FROM_SUBDIR
   <state name="CHOOSE_SEQUENCE_STUDENTS1" title="Select Sequence To Print From">    <state name="CHOOSE_SEQUENCE_STUDENTS1" title="Select Sequence To Print From">
     <message>Select the sequence to print resources from:</message>      <message>Select the sequence to print resources from:</message>
     <resource variable="SEQUENCE">      <resource variable="SEQUENCE">
       <nextstate>CHOOSE_STUDENTS</nextstate>        <nextstate>CHOOSE_STUDENTS2</nextstate>
       <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>        <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>        <valuefunc>return $urlValue;</valuefunc>
       <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);        <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
Line 4870  CHOOSE_FROM_SUBDIR Line 4909  CHOOSE_FROM_SUBDIR
   <state name="CHOOSE_SEQUENCE_ANON2" title="Select Sequence To Print From">    <state name="CHOOSE_SEQUENCE_ANON2" title="Select Sequence To Print From">
     <message>Select the sequence to print resources from:</message>      <message>Select the sequence to print resources from:</message>
     <resource variable="SEQUENCE">      <resource variable="SEQUENCE">
       <nextstate>CHOOSE_ANON1</nextstate>        <nextstate>CHOOSE_ANON3</nextstate>
       <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>        <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>        <valuefunc>return $urlValue;</valuefunc>
       <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);        <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
Removed from v.1.690  
changed lines
  Added in v.1.695

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