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

Diff for /loncom/interface/lonprintout.pm between versions 1.465 and 1.471

version 1.465, 2006/07/20 03:38:52 version 1.471, 2006/07/31 22:53:07
Line 1 Line 1
   #
 # The LearningOnline Network  # The LearningOnline Network
 # Printout  # Printout
 #  #
Line 2412  CHOOSE_STUDENTS Line 2413  CHOOSE_STUDENTS
                      push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});                       push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
                   </exec>                    </exec>
  </dropdown>   </dropdown>
     <message></td></tr><tr><td colspan="2"><hr width=\'33%\' /></td></tr><tr><td></message>      <message></td></tr><tr><td></message>
             '.$/;              '.$/;
   
  }   }
Line 2432  CHOOSE_STUDENTS Line 2433  CHOOSE_STUDENTS
     $codechoice='<choice computer="default">Default</choice>';      $codechoice='<choice computer="default">Default</choice>';
  }   }
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);          &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
   <state name="CHOOSE_ANON1" title="Select Students and Resources">    <state name="CHOOSE_ANON1" title="Specify CODEd Assignments">
     <nextstate>SELECT_PROBLEMS</nextstate>      <nextstate>SELECT_PROBLEMS</nextstate>
     <message><table><tr><td><b>Number of anonymous assignments to print:</b></td><td></message>      <message><h4>Fill out one of the forms below</h4></message>
       <message><br /><hr /> <br /></message>
       <message><h3>Generate new CODEd Assignments</h3></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">
        <validator>         <validator>
  if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&   if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
Line 2456  CHOOSE_STUDENTS Line 2460  CHOOSE_STUDENTS
     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">      <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
     $codechoice      $codechoice
     </dropdown>      </dropdown>
     <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>      <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
     <message></td></tr><tr><td></message>      <message></td></tr><tr><td></table></message>
     <message><b>Enter a CODE to print:</b></td><td></message>      <message><br /><hr /><h3>Print a Specific Code </h3><br /><table></message>
       <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
     <string variable="SINGLE_CODE" size="10">      <string variable="SINGLE_CODE" size="10">
         <validator>          <validator>
    if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&     if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
Line 2471  CHOOSE_STUDENTS Line 2476  CHOOSE_STUDENTS
    }     }
         </validator>          </validator>
     </string>      </string>
     <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>      <message></td</tr><tr><td></message>
         $code_selection          $code_selection
       <message></td></tr></table></message>
           <message><hr /><h3>Reprint a Set of Saved Codes</h3><table><tr><td></message>
     <message><b>Reprint a set of saved CODEs:</b></message>      <message><b>Select saved CODEs:</b></message>
     <message></td><td></message>      <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">      <dropdown variable="REUSE_OLD_CODES">
         $namechoice          $namechoice
     </dropdown>      </dropdown>
     <message></td></tr></table></message>      <message></td></tr></table></message>
     <message><hr width='33%' /></message>  
   </state>    </state>
   $resource_selector    $resource_selector
 CHOOSE_ANON1  CHOOSE_ANON1
Line 2643  CHOOSE_FROM_SUBDIR Line 2647  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>
       $start_new_option        $start_new_option
Line 2975  sub new { Line 2979  sub new {
   
     $self->{NEXTSTATE} = shift;      $self->{NEXTSTATE} = shift;
     bless($self);      bless($self);
   
     return $self;      return $self;
 }  }
   
Line 2984  sub render { Line 2989  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 3023  sub render { Line 3030  sub render {
  }   }
     }      }
   
     $result .= <<ELEMENTHTML;      # Adjust margin for LaTeX margin: .. requires units == cm or in.
   
       if ($size{'margin_unit'} eq 'in') {
    $size{'margin'} += 1;
       }  else {
    $size{'margin'} += 2.54;
       }
       $result .= <<ELEMENTHTML;
   
     
   
 <p>How should each column be formatted?</p>  <p>How should each column be formatted?</p>
   
Line 3067  ELEMENTHTML Line 3081  ELEMENTHTML
     return $result;      return $result;
 }  }
   
 # If the user didn't select 1 column, skip this state.  
 sub preprocess {  sub preprocess {
     my $self = shift;      my $self = shift;
     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});
           
       $helper->{VARS}->{"$var.".$dim}      = $value;
       $helper->{VARS}->{"$var.".$dim.'unit'} = $units;
       
    }
   
   
    # Transition to the next state
   
    $helper->changeState($self->{NEXTSTATE});
       }
         
     return 1;      return 1;
 }  }
Line 3102  sub postprocess { Line 3154  sub postprocess {
     }      }
     if ($lmargin !~  /^-?[0-9]*(\.[0-9]*)?$/) {      if ($lmargin !~  /^-?[0-9]*(\.[0-9]*)?$/) {
         $error .= "Invalid left margin; please type only a number.<br />\n";          $error .= "Invalid left margin; please type only a number.<br />\n";
       } else {
    # Adjust for LaTeX 1.0 inch margin:
   
    if ($env{"form.${var}.lmarginunit"} eq "in") {
       $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 1;
    } else {
       $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 2.54;
    }
     }      }
   
     if (!$error) {      if (!$error) {
Removed from v.1.465  
changed lines
  Added in v.1.471

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