Diff for /loncom/interface/lonprintout.pm between versions 1.429 and 1.433

version 1.429, 2006/03/14 23:24:46 version 1.433, 2006/03/23 22:32:10
Line 1022  sub output_data { Line 1022  sub output_data {
     my ($r,$helper,$rparmhash) = @_;      my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;      my %parmhash = %$rparmhash;
     my $resources_printed = '';      my $resources_printed = '';
     my $html=&Apache::lonxml::xmlbegin();      my $js = <<ENDPART;
     my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');  <script type="text/javascript">
     $r->print(<<ENDPART);  
 $html  
 <head>  
 <script type="text/javascript" language="Javascript">  
     var editbrowser;      var editbrowser;
     function openbrowser(formname,elementname,only,omit) {      function openbrowser(formname,elementname,only,omit) {
         var url = '/res/?';          var url = '/res/?';
Line 1051  $html Line 1047  $html
         editbrowser.focus();          editbrowser.focus();
     }      }
 </script>  </script>
 <title>LON-CAPA output for printing</title>  
 </head>  
 $bodytag  
 <p>  
 Please stand by while processing your print request, this may take some time ...  
 </p>  
 ENDPART  ENDPART
   
       my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);
       my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
   
       $r->print($start_page."\n<p>\n$msg\n</p>\n");
   
     # fetch the pagebreaks and store them in the course environment      # fetch the pagebreaks and store them in the course environment
     # The page breaks will be pulled into the hash %page_breaks which is      # The page breaks will be pulled into the hash %page_breaks which is
Line 1471  ENDPART Line 1464  ENDPART
  my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');   my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
  my $student_counter=-1;   my $student_counter=-1;
  my $i = 0;   my $i = 0;
  my ($junku, $junkd, $last_section) = split /:/,$students[0];   my $last_section = (split(/:/,$students[0]))[2];
  foreach my $person (@students) {   foreach my $person (@students) {
   
              my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";               my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
Line 1481  ENDPART Line 1474  ENDPART
      }       }
      $student_counter++;       $student_counter++;
      if ($split_on_sections) {       if ($split_on_sections) {
  my $this_section;   my $this_section = (split(/:/,$person))[2];
  ($junku, $junkd, $this_section) = split /:/,$person;  
  if ($this_section ne $last_section) {   if ($this_section ne $last_section) {
      $i++;       $i++;
      $last_section = $this_section;       $last_section = $this_section;
Line 1771  ENDPART Line 1763  ENDPART
     "cgi.$identifier.coursedom" => $cdom,       "cgi.$identifier.coursedom" => $cdom, 
     "cgi.$identifier.resources" => $resources_printed);      "cgi.$identifier.resources" => $resources_printed);
   
 $r->print(<<FINALEND);      my $end_page = &Apache::loncommon::end_page();
       $r->print(<<FINALEND);
 <br />  <br />
 <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />  <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />
 <a href="/cgi-bin/printout.pl?$identifier">Continue</a>  <a href="/cgi-bin/printout.pl?$identifier">Continue</a>
 </body>  $end_page
 </html>  
 FINALEND  FINALEND
 }  }
   
Line 2302  CHOOSE_STUDENTS Line 2294  CHOOSE_STUDENTS
     if ($code =~ /^[A-Z]+$/) { # Alpha code      if ($code =~ /^[A-Z]+$/) { # Alpha code
  $choice = &letters_to_num($code);   $choice = &letters_to_num($code);
     }      }
     $code_selection .= '   <choice computer="'.$choice.'">'.$code."</choice>\n";      push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
  }   }
    $code_selection .=
   '   
         <exec>
           push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
         </exec>
       '.$/;
   
   
  open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');   open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
  my $codechoice='';   my $codechoice='';
  foreach my $line (<FH>) {   foreach my $line (<FH>) {
Line 2358  CHOOSE_STUDENTS Line 2358  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 colspan="2"><hr width='33%' /></td></tr><tr><td></message>
       <message><b>Choose single code from list</b></message>
       <message></td><td></message>
       <choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
           $code_selection
       </choices>
       <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
     <message><b>Reprint a set of saved CODEs:</b></message>      <message><b>Reprint a set of saved CODEs:</b></message>
     <message></td><td></message>      <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">      <dropdown variable="REUSE_OLD_CODES">
Line 2464  CHOOSE_STUDENTS1 Line 2470  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 colspan="2"><hr width='33%' /></td></tr><tr><td></message>
       <message><b>Choose single code from list</b></message>
       <message></td><td></message>
       <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
           $code_selection
       </dropdown>
       <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
     <message><b>Reprint a set of saved CODEs:</b></message>      <message><b>Reprint a set of saved CODEs:</b></message>
     <message></td><td></message>      <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">      <dropdown variable="REUSE_OLD_CODES">

Removed from v.1.429  
changed lines
  Added in v.1.433


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