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

Diff for /loncom/interface/lonprintout.pm between versions 1.538 and 1.543

version 1.538, 2008/09/05 09:09:38 version 1.543, 2008/10/02 17:12:18
Line 392  sub is_valid_alpha_code { Line 392  sub is_valid_alpha_code {
 sub is_code_valid {  sub is_code_valid {
     my ($code_value, $code_option) = @_;      my ($code_value, $code_option) = @_;
     my ($code_type, $code_length) = ('letter', 6); # defaults.      my ($code_type, $code_length) = ('letter', 6); # defaults.
     open(FG, $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');      my @lines = &Apache::grades::get_scantronformat_file();
     foreach my $line (<FG>) {      foreach my $line (@lines) {
  my ($name, $type, $length) = (split(/:/, $line))[0,2,4];   my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
  if($name eq $code_option) {   if($name eq $code_option) {
     $code_length = $length;      $code_length = $length;
Line 1160  sub print_latex_header { Line 1160  sub print_latex_header {
      '\usepackage{wrapfig}'.       '\usepackage{wrapfig}'.
      '\usepackage{picins}\usepackage{calc}'."\n".       '\usepackage{picins}\usepackage{calc}'."\n".
      '\usepackage[T1]{fontenc}'."\n".       '\usepackage[T1]{fontenc}'."\n".
                '\usepackage{lmodern}'."\n".
      '\usepackage[postscript]{ucs}'."\n".       '\usepackage[postscript]{ucs}'."\n".
      '\usepackage[utf8x]{inputenc}'."\n".       '\usepackage[utf8x]{inputenc}'."\n".
      '\usepackage{pifont}'  . "\n".       '\usepackage{pifont}'  . "\n".
Line 1481  ENDPART Line 1482  ENDPART
     my ($result,$selectionmade) = ('','');      my ($result,$selectionmade) = ('','');
     my $number_of_columns = 1; #used only for pages to determine the width of the cell      my $number_of_columns = 1; #used only for pages to determine the width of the cell
     my @temporary_array=split /\|/,$format_from_helper;      my @temporary_array=split /\|/,$format_from_helper;
     my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;      my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
     if ($laystyle eq 'L') {      if ($laystyle eq 'L') {
  $laystyle='album';   $laystyle='album';
     } else {      } else {
Line 1502  ENDPART Line 1503  ENDPART
     my %form;      my %form;
     $form{'grade_target'} = 'tex';      $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);      $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
       $form{'pdfFormFields'} = $pdfFormFields;
   
     # If form.showallfoils is set, then request all foils be shown:      # If form.showallfoils is set, then request all foils be shown:
     # privilege will be enforced both by not allowing the       # privilege will be enforced both by not allowing the 
Line 1941  ENDPART Line 1943  ENDPART
  my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};   my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
   
  my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};   my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
  open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');           my @lines = &Apache::grades::get_scantronformat_file();
  my ($code_type,$code_length)=('letter',6);   my ($code_type,$code_length)=('letter',6);
  foreach my $line (<FH>) {   foreach my $line (@lines) {
      my ($name,$type,$length) = (split(/:/,$line))[0,2,4];       my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
      if ($name eq $code_option) {       if ($name eq $code_option) {
  $code_length=$length;   $code_length=$length;
Line 2646  sub printHelper { Line 2648  sub printHelper {
     }      }
   
     # Useful filter strings      # Useful filter strings
     my $isProblem = '($res->is_problem()||$res->contains_problem) ';      my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;      $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';      my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
     my $isNotMap = '!$res->is_sequence()';      my $isNotMap = '!$res->is_sequence()';
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;      $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map()';      my $isMap = '$res->is_map()';
Line 2859  CHOOSE_STUDENTS Line 2861  CHOOSE_STUDENTS
   
  }   }
   
           my @lines = &Apache::grades::get_scantronformat_file();
  open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');  
  my $codechoice='';   my $codechoice='';
  foreach my $line (<FH>) {   foreach my $line (@lines) {
     my ($name,$description,$code_type,$code_length)=      my ($name,$description,$code_type,$code_length)=
  (split(/:/,$line))[0,1,2,4];   (split(/:/,$line))[0,1,2,4];
     if ($code_length > 0 &&       if ($code_length > 0 && 
Line 3393  sub render { Line 3394  sub render {
     my $PaperType=&mt('Paper type');      my $PaperType=&mt('Paper type');
     my $landscape=&mt('Landscape');      my $landscape=&mt('Landscape');
     my $portrait=&mt('Portrait');      my $portrait=&mt('Portrait');
       my $pdfFormLabel=&mt('PDF-Formfields');
       my $with=&mt('with Formfields');
       my $without=&mt('without Formfields');
     $result .= <<STATEHTML;      $result .= <<STATEHTML;
   
 <hr width="33%" />  <hr width="33%" />
Line 3401  sub render { Line 3405  sub render {
     <td align="center"><b>$PageLayout</b></td>      <td align="center"><b>$PageLayout</b></td>
     <td align="center"><b>$NumberOfColumns</b></td>      <td align="center"><b>$NumberOfColumns</b></td>
     <td align="center"><b>$PaperType</b></td>      <td align="center"><b>$PaperType</b></td>
       <td align="center"><b>$pdfFormLabel</b></td>
   </tr>    </tr>
   <tr>    <tr>
     <td>      <td>
Line 3438  STATEHTML Line 3443  STATEHTML
         }          }
         $i++;          $i++;
     }      }
     $result .= "</select></td></tr></table>";      $result .= <<HTML;
           </select>
       </td>
       <td align='center'>
           <select name='${var}.pdfFormFields'>
               <option selected value='no'>$without</option>
               <option value='yes'>$with</option>
           </select>
       </td>
     </tr></table>
   HTML
   
     return $result;      return $result;
 }  }
   
Line 3449  sub postprocess { Line 3465  sub postprocess {
     my $helper = Apache::lonhelper->getHelper();      my $helper = Apache::lonhelper->getHelper();
     $helper->{VARS}->{$var} =       $helper->{VARS}->{$var} = 
         $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .          $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
         $env{"form.$var.paper"};          $env{"form.$var.paper"} . '|' . $env{"form.$var.pdfFormFields"};
     return 1;      return 1;
 }  }
   
Removed from v.1.538  
changed lines
  Added in v.1.543

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