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

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

version 1.467, 2006/07/24 22:13:58 version 1.472, 2006/08/01 18:46:07
Line 1 Line 1
   #
 # The LearningOnline Network  # The LearningOnline Network
 # Printout  # Printout
 #  #
Line 2317  ALL_PROBLEMS Line 2318  ALL_PROBLEMS
   
  if ($helper->{VARS}->{'assignment'}) {   if ($helper->{VARS}->{'assignment'}) {
     push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];      push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
     push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>anonymous students</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];      push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assinments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
  }   }
   
  # resource_selector will hold a few states that:   # resource_selector will hold a few states that:
Line 2404  CHOOSE_STUDENTS Line 2405  CHOOSE_STUDENTS
  }   }
  if (%codes_to_print) {   if (%codes_to_print) {
     $code_selection .='         $code_selection .='   
     <message><b>Choose single code from list</b></message>      <message><b>Choose single CODE from list:</b></message>
  <message></td><td></message>   <message></td><td></message>
  <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">   <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
                   <choice></choice>                    <choice></choice>
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 2489  CHOOSE_ANON1 Line 2493  CHOOSE_ANON1
   
  if ($helper->{VARS}->{'assignment'}) {   if ($helper->{VARS}->{'assignment'}) {
     push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];      push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
     push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>anonymous students</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];      push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
  }   }
           
   
Line 2540  RESOURCE_SELECTOR Line 2544  RESOURCE_SELECTOR
 CHOOSE_STUDENTS1  CHOOSE_STUDENTS1
   
  &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);   &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);
   <state name="CHOOSE_ANON2" title="Select Students and Resources">    <state name="CHOOSE_ANON2" title="Select CODEd Assignments">
     <nextstate>SELECT_RESOURCES</nextstate>      <nextstate>SELECT_RESOURCES</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 2564  CHOOSE_STUDENTS1 Line 2571  CHOOSE_STUDENTS1
     <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></table></message>
     <message></td></tr><tr><td></message>      <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
     <message><b>Enter a CODE to print:</b></td><td></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 2579  CHOOSE_STUDENTS1 Line 2586  CHOOSE_STUDENTS1
    }     }
         </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><b>Reprint a set of saved CODEs:</b></message>      <message></td></tr></table></message>
       <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></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_ANON2  CHOOSE_ANON2
Line 3026  sub render { Line 3034  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 3070  ELEMENTHTML Line 3085  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();
Line 3103  sub preprocess { Line 3118  sub preprocess {
   
  foreach my $dim ('width', 'height', 'lmargin') {   foreach my $dim ('width', 'height', 'lmargin') {
     my ($value, $units) = split(/ /, $size{$dim});      my ($value, $units) = split(/ /, $size{$dim});
               
     &Apache::lonnet::logthis("$dim : $value : $units");  
       
     $helper->{VARS}->{"$var.".$dim}      = $value;      $helper->{VARS}->{"$var.".$dim}      = $value;
     $helper->{VARS}->{"$var.".$dim.'unit'} = $units;      $helper->{VARS}->{"$var.".$dim.'unit'} = $units;
           
Line 3145  sub postprocess { Line 3158  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.467  
changed lines
  Added in v.1.472

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