--- loncom/interface/lonprintout.pm 2006/03/14 23:24:46 1.429 +++ loncom/interface/lonprintout.pm 2006/04/18 10:03:45 1.437 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.429 2006/03/14 23:24:46 foxr Exp $ +# $Id: lonprintout.pm,v 1.437 2006/04/18 10:03:45 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1022,12 +1022,8 @@ sub output_data { my ($r,$helper,$rparmhash) = @_; my %parmhash = %$rparmhash; my $resources_printed = ''; - my $html=&Apache::lonxml::xmlbegin(); - my $bodytag=&Apache::loncommon::bodytag('Preparing Printout'); - $r->print(< - -LON-CAPA output for printing - -$bodytag -

-Please stand by while processing your print request, this may take some time ... -

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

\n$msg\n

\n"); # fetch the pagebreaks and store them in the course environment # The page breaks will be pulled into the hash %page_breaks which is @@ -1126,6 +1119,8 @@ ENDPART $selectionmade = 1; if ($cleanURL!~m|^/adm/| && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { + if ($cleanURL =~/\.page/) { + } my $rndseed=time; my $texversion=''; if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') { @@ -1326,6 +1321,8 @@ ENDPART my $texversion=''; if ($urlp!~m|^/adm/| && $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { + if ($urlp =!/\.page/) { + } $resources_printed .= $urlp.':'; &Apache::lonxml::remember_problem_counter(); @@ -1471,7 +1468,7 @@ ENDPART my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75'); my $student_counter=-1; my $i = 0; - my ($junku, $junkd, $last_section) = split /:/,$students[0]; + my $last_section = (split(/:/,$students[0]))[2]; foreach my $person (@students) { my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due"; @@ -1481,8 +1478,7 @@ ENDPART } $student_counter++; if ($split_on_sections) { - my $this_section; - ($junku, $junkd, $this_section) = split /:/,$person; + my $this_section = (split(/:/,$person))[2]; if ($this_section ne $last_section) { $i++; $last_section = $this_section; @@ -1771,12 +1767,12 @@ ENDPART "cgi.$identifier.coursedom" => $cdom, "cgi.$identifier.resources" => $resources_printed); -$r->print(<print(< Continue - - +$end_page FINALEND } @@ -1832,6 +1828,8 @@ sub print_resources { if (&Apache::lonnet::allowed('bre',$res_url)) { if ($res_url!~m|^ext/| && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { + if ($res_url =~ /\.page/) { + } $printed .= $curresline.':'; &Apache::lonxml::remember_problem_counter(); @@ -2242,7 +2240,6 @@ ALL_PROBLEMS - NUMBER_PER_PDF
How should the results be printed?
 Start each student\'s assignment on a new page/column (add a pagefeed after each assignment) @@ -2250,17 +2247,15 @@ ALL_PROBLEMS Add two empty pages/column after each student\'s assignment Add three empty pages/column after each student\'s assignment - - PAGESIZE
How do you want assignments split into PDF files? All assignments in a single PDF file Each PDF contains exactly one section Each PDF contains exactly one assignment - Specify Number: + + Specify Number: - "all" RESOURCE_SELECTOR @@ -2271,6 +2266,7 @@ RESOURCE_SELECTOR Sort by section then student Sort by students across sections. +

$resource_selector @@ -2302,8 +2298,17 @@ CHOOSE_STUDENTS if ($code =~ /^[A-Z]+$/) { # Alpha code $choice = &letters_to_num($code); } - $code_selection .= ' '.$code."\n"; + push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]); + } + if (%codes_to_print) { + $code_selection .=' + + push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}}); + + '.$/; } + + open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); my $codechoice=''; foreach my $line () { @@ -2358,6 +2363,12 @@ CHOOSE_STUDENTS
+ Choose single code from list + + + $code_selection + +
Reprint a set of saved CODEs: @@ -2397,17 +2408,15 @@ CHOOSE_ANON1 Add two empty pages/column after each student\'s assignment Add three empty pages/column after each student\'s assignment - - PAGESIZE
How do you want assignments split into PDF files? All assignments in a single PDF file Each PDF contains exactly one section Each PDF contains exactly one assignment - Specify Number: + + Specify Number: - "all" RESOURCE_SELECTOR @@ -2417,6 +2426,7 @@ RESOURCE_SELECTOR Sort by section then student Sort by students across sections. +

@@ -2464,6 +2474,12 @@ CHOOSE_STUDENTS1
+ Choose single code from list + + + $code_selection + +
Reprint a set of saved CODEs: