Diff for /loncom/interface/lonprintout.pm between versions 1.117 and 1.125

version 1.117, 2003/02/17 16:43:54 version 1.125, 2003/03/03 20:26:08
Line 157  sub sequence_content_menu { Line 157  sub sequence_content_menu {
     my $primary_sequence;      my $primary_sequence;
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});      my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
     my @sequence = split('___',$symbolic);      my @sequence = split('___',$symbolic);
     if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];}       $primary_sequence=&Apache::lonnet::clutter($sequence[0]);
       else {$primary_sequence = '/res/'.$sequence[0];}   
     my @master_seq = &coming_from_hash($primary_sequence);      my @master_seq = &coming_from_hash($primary_sequence);
     my @titles_master_seq = ();       my @titles_master_seq = (); 
     for (my $i=0;$i<=$#master_seq;$i++) {      for (my $i=0;$i<=$#master_seq;$i++) {
Line 202  sub sequence_content_menu { Line 201  sub sequence_content_menu {
         }          }
     }      }
 </script>  </script>
 <b>DDD=$#titles_master_seq</b> $titles_master_seq[0]<br />  <b>
 <input type=button onClick="checkall()" value="Check All">&nbsp;  <input type=button onClick="checkall()" value="Check All">&nbsp;
 <input type=button onClick="uncheckall()" value="Uncheck">&nbsp;  <input type=button onClick="uncheckall()" value="Uncheck">&nbsp;
 <input type="submit" value="Submit">  <input type="submit" value="Submit">
Line 238  sub problem_choice_menu { Line 237  sub problem_choice_menu {
     $subdirtoprint =~ s/\/[^\/]+$//;      $subdirtoprint =~ s/\/[^\/]+$//;
     my @list_of_files = ();      my @list_of_files = ();
     my @content_directory = ();      my @content_directory = ();
       $r->print("Subdir: " . $subdirtoprint . "<br />");
     if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) {      if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) {
  #localmachine CSTR space   #localmachine CSTR space
  my $user=$1;   my $user=$1;
Line 549  ENDPART Line 549  ENDPART
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {      }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
         # where is the main sequence of the course?          # where is the main sequence of the course?
  $selectionmade = 4;   $selectionmade = 4;
  my $main_seq;   my $main_seq=&Apache::lonnet::clutter($ENV{'request.course.uri'});
  if ($ENV{'request.course.uri'}=~/\/?uploaded\//) {  
     $main_seq = $ENV{'request.course.uri'};  
  } else {  
     $main_seq = '/res/'.$ENV{'request.course.uri'};  
  }  
  my @file_seq = &coming_from_hash($main_seq);   my @file_seq = &coming_from_hash($main_seq);
  for (my $i=0;$i<=$#file_seq;$i++) {   for (my $i=0;$i<=$#file_seq;$i++) {
     my ($path,$title,$symb) = split /&&/,$file_seq[$i];      my ($path,$title,$symb) = split /&&/,$file_seq[$i];
Line 597  ENDPART Line 592  ENDPART
  my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});   my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
  my @sequence = split('___',$symbolic);   my @sequence = split('___',$symbolic);
  my $primary_sequence;   my $primary_sequence;
  if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];}   
           else {$primary_sequence = '/res/'.$sequence[0];}     $primary_sequence=&Apache::lonnet::clutter($sequence[0]);
  my @master_seq = &coming_from_hash($primary_sequence);    my @master_seq = &coming_from_hash($primary_sequence); 
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#master_seq;$i++) {
     my ($path,$title,$symb) = split /&&/,$master_seq[$i];      my ($path,$title,$symb) = split /&&/,$master_seq[$i];
Line 612  ENDPART Line 607  ENDPART
  foreach my $person (@students) {   foreach my $person (@students) {
     my $current_output = '';       my $current_output = ''; 
     my ($usersection,$username,$userdomain) = split /:/,$person;      my ($usersection,$username,$userdomain) = split /:/,$person;
     my $fullname = &Apache::grades::get_fullname($username,$userdomain);      my $fullname = &Apache::grades::get_fullname($username,$userdomain);    
             #goes through all resources, checks if they are available for current student, and produces output                 #goes through all resources, checks if they are available for current student, and produces output   
     foreach my $curresline (@master_seq)  {      foreach my $curresline (@master_seq)  {
  my ($curres,$symb) = split /&&/, $curresline;   my ($curres,$symb) = split /&&/, $curresline;
Line 637  ENDPART Line 632  ENDPART
     } else {      } else {
  my $blanspages = '';   my $blanspages = '';
  for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}   for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
  $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License } \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;   $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
     }      }
     $result .= $current_output;      $result .= $current_output;
     &Apache::lonnet::delenv('form.counter');      &Apache::lonnet::delenv('form.counter');    
       &Apache::lonxml::init_counter(); 
  }   }
  $result .= '\end{document}';   $result .= '\end{document}';
  &Apache::lonnet::delenv('form.textwidth');   &Apache::lonnet::delenv('form.textwidth');
Line 740  sub coming_from_hash { Line 736  sub coming_from_hash {
  if ($hash{'src_'.$current_resource}=~/\.sequence$/) {   if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
     push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});      push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
  } else {   } else {
     my $presymb;       my $presymb=&Apache::lonnet::declutter($mainsequence);
     if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;}   
               elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;}   
     my $rid = $current_resource;      my $rid = $current_resource;
     if ($rid=~/,/) {      if ($rid=~/,/) {
  my @rid = split /,/, $rid;   my @rid = split /,/, $rid;
Line 756  sub coming_from_hash { Line 750  sub coming_from_hash {
         $rid =~ m/^$mapid\.(\d*)/;          $rid =~ m/^$mapid\.(\d*)/;
                 $rid = $1;                    $rid = $1;  
     }      }
     $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;      my $symb = $presymb.'___'.$rid.'___'.
     my $symb = $presymb.'___'.$rid.'___'.$1;       &Apache::lonnet::declutter($hash{'src_'.$current_resource});
     push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;      push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
  }   }
  $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};   $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
Line 766  sub coming_from_hash { Line 760  sub coming_from_hash {
  if ($hash{'src_'.$current_resource}=~/\.sequence$/) {   if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
     push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});      push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
  } else {   } else {
     my $presymb;       my $presymb=&Apache::lonnet::declutter($mainsequence);
     if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;}   
               elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;}   
     my $rid = $current_resource;      my $rid = $current_resource;
     if ($rid=~/,/) {      if ($rid=~/,/) {
  my @rid = split /,/, $rid;   my @rid = split /,/, $rid;
Line 782  sub coming_from_hash { Line 774  sub coming_from_hash {
         $rid =~ m/^$mapid\.(\d*)/;          $rid =~ m/^$mapid\.(\d*)/;
                 $rid = $1;                    $rid = $1;  
     }      }
     $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;      my $symb = $presymb.'___'.$rid.'___'.
     my $symb = $presymb.'___'.$rid.'___'.$1;       &Apache::lonnet::declutter($hash{'src_'.$current_resource});
     push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;      push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
  }   }
  $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};   $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
Line 1157  sub details_for_menu { Line 1149  sub details_for_menu {
     my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};      my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});      my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
     my ($map,$id,$resource)=split(/___/,$symbolic);      my ($map,$id,$resource)=split(/___/,$symbolic);
       $map=&Apache::lonnet::clutter($map);
     my $name_of_sequence;      my $name_of_sequence;
     if ($map=~/^uploaded/) {      $name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}};
  $name_of_sequence = $hash{'title_'.$hash{'ids_/'.$map}};  
     } else {  
  $name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$map}};  
     }  
     if ($name_of_sequence =~ /^\s*$/) {      if ($name_of_sequence =~ /^\s*$/) {
      $map =~ m|([^/]+)$|;   $map =~ m|([^/]+)$|;
       $name_of_sequence = $1;   $name_of_sequence = $1;
     }      }
     my $name_of_map = $hash{'title_'.$hash{'ids_/res/'.$ENV{'request.course.uri'}}};      my $name_of_map = $hash{'title_'.$hash{'ids_'.&Apache::lonnet::clutter($ENV{'request.course.uri'})}};
     if ($name_of_map =~ /^\s*$/) {      if ($name_of_map =~ /^\s*$/) {
       $ENV{'request.course.uri'} =~ m|([^/]+)$|;   $ENV{'request.course.uri'} =~ m|([^/]+)$|;
       $name_of_map = $1;   $name_of_map = $1;
     }        }
     return ($name_of_resourse,$name_of_sequence,$name_of_map);      return ($name_of_resourse,$name_of_sequence,$name_of_map);
   
 }  }
Line 1215  sub handler { Line 1204  sub handler {
   
     my $r = shift;      my $r = shift;
   
     # not sure where the form.* was getting processed.  
     Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});  
   
     # A hook for me to work without disturbing Alex.      # A hook for me to work without disturbing Alex.
     if ($ENV{'form.jeremy'}) {      if ($ENV{'form.jeremy'}) {
         printWizard($r);          printWizard($r);
Line 1309  sub printWizard { Line 1295  sub printWizard {
   
     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;      my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
   
     my $wizard = Apache::lonwizard->new("Printing Wizard");      my $wizard = Apache::lonwizard->new("Printing Wizard", $ENV{QUERY_STRING});
     # PRINT_TYPE: What the user wants to print (current docs,      # PRINT_TYPE: What the user wants to print (current docs,
     #  whole sequence, etc.      #  whole sequence, etc.
     $wizard->declareVars(['PRINT_TYPE']);      $wizard->declareVars(['PRINT_TYPE', 'FORMAT', 'postdata', 'url',
                             'symb', 'RESOURCES', 'FILES', 'STUDENTS']);
   
       # Extract map
       my $symb = $wizard->{VARS}->{'symb'};
       my ($map, $id, $url) = split(/__/, $symb);
   
       my $subdir = &Apache::lonnet::filelocation("", $ENV{'form.url'});
   
       # "Delete everything after the last slash."
       $subdir =~ s|/[^/]+$||;
   
       # This really ought to be in some repository in loncommon or
       # something where it can just be grabbed.
       my $problemFilter = sub { 
           my $name = shift;
           return $name =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
       };
   
       # What can be printed is a very dynamic decision based on
       # lots of factors. So we need to dynamically build this list.
       # To prevent security leaks, states are only added to the wizard
       # if they can be reached, which ensures manipulating the querystring
       # won't allow anyone to reach states they shouldn't have permission
       # to reach.
       my $printChoices = []; 
       # We can always print the current screen.
       push @{$printChoices}, ['current_document', "<b>$resourceTitle</b> (exactly what was on the screen)", 'CHOOSE_FORMAT'];
   
       if ($ENV{'form.postdata'}=~ /\/res\//) {
           # Allow problems from sequence
           push @{$printChoices}, ['map_problems', "Problems from <b>$sequenceTitle</b>", 'CHOOSE_PROBLEMS'];
           Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS", 'Select Problems', "Select problems to print from <b>$sequenceTitle</b>:", 'CHOOSE_FORMAT', 'RESOURCES', sub {my $res = shift; return $res->is_problem()}, undef, $map);
   
           # Allow all resources from sequence
           push @{$printChoices}, ['map_problems_pages', "Problems and pages from <b>$sequenceTitle</b>", 'CHOOSE_PROBLEMS_HTML'];
           Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS_HTML", 'Select Resources', "Select resources to print from <b>$sequenceTitle</b>:", "CHOOSE_FORMAT", 'RESOURCES', sub {my $res = shift; return !$res->is_map()}, undef, $map);
       }
   
       # If the user is priviledged, allow them to print all 
       # problems in the course, optionally for selected students
       if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) { 
           push @{$printChoices}, ['all_problems', '<b>All problems</b> in course (may take a lot of time)', 'CHOOSE_FORMAT'];
           push @{$printChoices}, ['problems_for_students', "Problems from <b>$sequenceTitle</b> for selected students", 'CHOOSE_STUDENTS'];
           Apache::lonwizard::choose_student->new($wizard, "CHOOSE_STUDENTS", "Choose Students", "Select the students you wish to print the problems for:", 'CHOOSE_FORMAT', 'STUDENTS', 1);
       }
   
       # FIXME: That RE should come from a library somewhere.
       if ((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) {    
           push @{$printChoices}, ['problems_from_directory', "Problems from <b>$subdir</b>", 'CHOOSE_FROM_SUBDIR'];
           Apache::lonwizard::choose_files->new($wizard, "CHOOSE_FROM_SUBDIR", "Select Files","Select problems you wish to print from <b>$subdir</b>:", 'CHOOSE_FORMAT', 'FILES', $subdir, $problemFilter);
       }
   
       # Despite the appearance of states before here, this is the first state.
       Apache::lonwizard::switch_state->new($wizard, "START", "Selecting Resources to Print", "PRINT_TYPE", $printChoices, "What do you want to print?");
       Apache::lonprintout::page_format_state->new($wizard, "CHOOSE_FORMAT", "Page Format", "FORMAT");
   
     my $subdir = $ENV{'form.postdata'};  
     $subdir =~ s|http://[^/]+||;  
     $subdir =~ m/\/([^\/]+)$/;  
     $subdir =~ s/\Q$1\E//;  
   
     # This code also shows up above... which is prefered? Is one  
     # right for this context?  
     #my $subdir = &Apache::lonnet::filelocation("",$ENV{'form.url'});  
     #$subdir =~ s/\/[^\/]+$//;  
       
     Apache::lonwizard::switch_state->new($wizard, "START", "Selecting Resources to Print", "PRINT_TYPE", [  
            ['current_document', "<b>$resourceTitle</b> (exactly what was on the screen)", 'CHOOSE_FORMAT'],  
            ['map_problems', "Problems from <b>$sequenceTitle</b>", 'CHOOSE_FORMAT'],  
            ['map_problems_pages', "All of <b>$sequenceTitle</b>", 'CHOOSE_FORMAT'],  
            ['problems_for_students', "Problems from <b>$sequenceTitle</b> for selected students", 'CHOOSE_FORMAT'],  
            ['problems_from_directory', "Problems from <b>$subdir</b>", 'CHOOSE_FORMAT'] ],  
            "What do you want to print?");  
       
     $r->print($wizard->display());      $r->print($wizard->display());
   
     untie %hash;      untie %hash;
   
     return OK;      return OK;
   }
   
   
   1;
   
   package Apache::lonprintout::page_format_state;
   
   =pod
   
   =head1 Wizard state: page_format_state
   
   See lonwizard.pm documentation for discussion of the wizard framework.
   
   Apache::lonprintout::page_format_state is a state that gives the user an opportunity to select the page layout they wish to print with: Number of columns, portrait/landscape, and paper size. If you want to change the paper size choices, change the @paperSize array contents in this package.
   
   =over 4
   
   =item * B<new>(parentLonWizReference, stateName, stateTitle, varName, nextState): varName is where the print information will be stored in the format FIXME. nextState is the state that follows this one.
   
   =back
   
   =cut
   
   use Apache::lonwizard;
   
   no strict;
   @ISA = ("Apache::lonwizard::state");
   use strict;
   
   my $maxColumns = 2;
   my @paperSize = ("Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]", 
                    "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
                    "A2 [420x594 mm]", "A3 [297x420 mm]", "A4 [210x297 mm]", 
                    "A5 [148x210 mm]", "A6 [105x148 mm]" );
   
   # Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
   #                   Paper type
   
   sub new { 
       my $proto = shift;
       my $class = ref($proto) || $proto;
       my $self = bless $proto->SUPER::new(shift, shift, shift);
   
       $self->{VAR_NAME} = shift;
       $self->{NEXT_STATE} = shift;
       return $self;
 }  }
   
   sub render {
       my $self = shift;
       my $wizard = $self->{WIZARD};
       my $result = '';
       my $var = $self->{VAR_NAME};
       my $curVal = $self->{WIZARD}->{VARS}->{$var};
   
       my ($layout, $cols, $paper) = split(/\|/, $curVal);
   
       my $landscapeChecked = ($layout ne "L")? '' : 'checked ';
       my $portraitChecked = $landscapeChecked ? '' : 'checked ';
   
       $result .= <<STATEHTML;
   
   <p>How should the printing be formatted?</p>
   <table cellpadding="3">
     <tr>
       <td align="center"><b>Layout</b></td>
       <td align="center"><b>Columns</b></td>
       <td align="center"><b>Paper type</b></td>
     </tr>
     <tr>
       <td>
         <input type="radio" name="${var}.layout" value="L" $landscapeChecked> Landscape<br />
         <input type="radio" name="${var}.layout" value="P" $portraitChecked> Portrait
       </td>
       <td>
         <select name="${var}.cols">
   STATEHTML
   
       my $i;
       for ($i = 1; $i <= $maxColumns; $i++) {
           if ($i == $cols) {
               $result .= "<option value='$i' selected>$i</option>\n";
           } else {
               $result .= "<option value='$i'>$i</option>\n";
           }
       }
   
       $result .= "</select></td><td>\n";
       $result .= "<select name='${var}.paper'>\n";
   
       $i = 0;
       foreach (@paperSize) {
           if ($paper == $i) {
               $result .= "<option selected value='$i'>" . $paperSize[$i] . "</option>\n";
           } else {
               $result .= "<option value='$i'>" . $paperSize[$i] . "</option>\n";
           }
           $i++;
       }
   
       $result .= "</select></td></tr></table>";
       $result .= '<input type="hidden" name="printWizDone" value="1" />';
       return $result;
   }
   
 1;  1;
   
 __END__  __END__
   

Removed from v.1.117  
changed lines
  Added in v.1.125


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