--- loncom/interface/lonprintout.pm 2006/03/21 18:43:49 1.432
+++ loncom/interface/lonprintout.pm 2006/05/24 10:49:04 1.438
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.432 2006/03/21 18:43:49 albertel Exp $
+# $Id: lonprintout.pm,v 1.438 2006/05/24 10:49:04 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1022,14 +1022,8 @@ sub output_data {
my ($r,$helper,$rparmhash) = @_;
my %parmhash = %$rparmhash;
my $resources_printed = '';
- my $html=&Apache::lonxml::xmlbegin();
- my $headtag = &Apache::loncommon::headtag('Preparing Printout');
- my $end_headtag = &Apache::loncommon::endheadtag();
- my $bodytag = &Apache::loncommon::bodytag('Preparing Printout');
- $r->print(<
+ my $js = <
var editbrowser;
function openbrowser(formname,elementname,only,omit) {
var url = '/res/?';
@@ -1053,14 +1047,12 @@ $headtag
editbrowser.focus();
}
-$end_headtag
-$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
@@ -1330,7 +1322,6 @@ ENDPART
$resources_printed .= $urlp.':';
&Apache::lonxml::remember_problem_counter();
-
$texversion.=&Apache::lonnet::ssi($urlp,%form);
if ($urlp=~/\.page$/) {
($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
@@ -1679,13 +1670,14 @@ ENDPART
$selectionmade,
$helper->{'VARS'}->{'ANSWER_TYPE'});
}
- #changes page's parameters for the one column output
- if ($numberofcolumns == 1) {
- $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
- $result =~ s/\\textheight\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
- $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
- $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
- }
+ &Apache::lonnet::logthis("Resetting page e.g. height -> $helper->{'VARS'}->{'pagesize.height'}");
+ &Apache::lonnet::logthis("Before: $result \n--------------------------\n");
+ $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
+ $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
+ $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+ $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+
+ &Apache::lonnet::logthis("After: $result \n----------------------------------\n");
#-- writing .tex file in prtspool
my $temp_file;
@@ -2242,7 +2234,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 +2241,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 +2260,7 @@ RESOURCE_SELECTOR
Sort by section then student
Sort by students across sections.
+
$resource_selector
@@ -2304,12 +2294,13 @@ CHOOSE_STUDENTS
}
push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
}
- $code_selection .=
-'
-
- push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
-
- '.$/;
+ if (%codes_to_print) {
+ $code_selection .='
+
+ push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
+
+ '.$/;
+ }
open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
@@ -2411,17 +2402,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
@@ -2431,6 +2420,7 @@ RESOURCE_SELECTOR
Sort by section then student
Sort by students across sections.
+
@@ -2892,6 +2882,12 @@ sub render {
$result .= '
' . $self->{ERROR_MSG} . '
';
}
+ my $width = 18;
+ my $format = $helper->{VARS}->{$self->{'formatvar'}};
+ if (substr($format, 2, 1) ne '1') {
+ $width = 9;
+ }
+
$result .= <How should the column be formatted?
@@ -2899,7 +2895,7 @@ sub render {