--- loncom/interface/lonprintout.pm 2011/09/15 16:33:57 1.583.2.5
+++ loncom/interface/lonprintout.pm 2011/05/23 09:31:21 1.589
@@ -2,7 +2,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.583.2.5 2011/09/15 16:33:57 raeburn Exp $
+# $Id: lonprintout.pm,v 1.589 2011/05/23 09:31:21 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,6 +52,7 @@ use Apache::lonlocal;
use Carp;
use LONCAPA;
+
my %perm;
my %parmhash;
my $resources_printed;
@@ -256,17 +257,8 @@ CHOOSE_ANON1
return $result;
}
-# Returns the XML for choosing how assignments are to be formatted
-# that text must still be parsed by the helper xml parser.
-# Parameters: 3 (required)
-
-# helper - The helper; $helper->{'VARS'}->{'PRINT_TYPE'} used
-# to check if splitting PDFs by section can be offered.
-# title - Title for the current state.
-# this_state - State name of the chooser.
-
sub generate_format_selector {
- my ($helper,$title,$this_state) = @_;
+ my ($helper,$title,$nextstate) = @_;
my $secpdfoption;
unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon') ||
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
@@ -274,7 +266,8 @@ sub generate_format_selector {
$secpdfoption = 'Each PDF contains exactly one section';
}
return <
+
+ $nextstate
How should the results be printed? Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)
@@ -295,7 +288,6 @@ sub generate_format_selector {
RESOURCE_SELECTOR
}
-
#-----------------------------------------------------------------------
@@ -551,12 +543,12 @@ sub printf_style_subst {
# %s - The section if it is supplied.
#
sub format_page_header {
- my ($width, $format, $assignment, $course, $student) = @_;
+ my ($width, $format, $assignment, $course, $student, $section) = @_;
$width = &recalcto_mm($width); # Get width in mm.
- my $chars_per_line = int($width/2); # Character/textline.
+ my $chars_per_line = int($width/1.6); # Character/textline.
# Default format?
@@ -572,37 +564,58 @@ sub format_page_header {
# - Allow the assignment to be 2 lines (wrapped).
#
- my $firstline = "$student $course";
- if (length($firstline) > $chars_per_line) {
- my $lastchar = $chars_per_line - length($student) - 1;
- if ($lastchar > 0) {
- $course = substr($course, 0, $lastchar);
- } else { # Nothing left of course:
- $course = '';
- }
- }
- if (length($assignment) > $chars_per_line) {
- $assignment = substr($assignment, 0, $chars_per_line);
- }
+
- $format = "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
+ my $name_length = int($chars_per_line *3 /4);
+ my $sec_length = int($chars_per_line / 5);
- } else {
- # An open question is how to handle long user formatted page headers...
- # A possible future is to support e.g. %na so that the user can control
- # the truncation of the elements that can appear in the header.
- #
- $format = &printf_style_subst("a", $format, $assignment);
- $format = &printf_style_subst("c", $format, $course);
- $format = &printf_style_subst("n", $format, $student);
-
- # If the user put %'s in the format string, they must be escaped
- # to \% else LaTeX will think they are comments and terminate
- # the line.. which is bad!!!
+ $format = "%$name_length".'n';
+
+ if ($section) {
+ $format .= ' - Sec: '."%$sec_length".'s';
+ }
+
+ $format .= '\\\\%c \\\\ %a';
+
}
+ # An open question is how to handle long user formatted page headers...
+ # A possible future is to support e.g. %na so that the user can control
+ # the truncation of the elements that can appear in the header.
+ #
+ $format = &printf_style_subst("a", $format, $assignment);
+ $format = &printf_style_subst("c", $format, $course);
+ $format = &printf_style_subst("n", $format, $student);
+ $format = &printf_style_subst("s", $format, $section);
+
+
+ # If the user put %'s in the format string, they must be escaped
+ # to \% else LaTeX will think they are comments and terminate
+ # the line.. which is bad!!!
+ # If the user has role author, $course and $assignment are empty so
+ # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
+ if($format =~ /\\\\\s\\\\\s/) {
+ #TODO find sensible caption for page header
+ my $testPrintout = '\\\\'.&mt('Construction Space').' \\\\'.&mt('Test-Printout ');
+ $format =~ s/\\\\\s\\\\\s/$testPrintout/;
+ }
+ #
+ # We're going to trust LaTeX to break lines appropriately, but
+ # we'll truncate anything that's more than 3 lines worth of
+ # text. This is also assuming (which will probably end badly)
+ # nobody's going to embed LaTeX control sequences in the title
+ # header or rather that those control sequences won't get broken
+ # by the stuff below.
+ #
+ my $total_length = 3*$chars_per_line;
+ if (length($format) > $total_length) {
+ $format = substr($format, 0, $total_length);
+ }
+
+
return $format;
+
}
#
@@ -1298,6 +1311,8 @@ sub get_course {
my $courseidinfo;
if (defined($env{'request.course.id'})) {
$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
+ my $sec = $env{'request.course.sec'};
+
}
return $courseidinfo;
}
@@ -1320,7 +1335,6 @@ sub page_format_transformation {
my $name = &get_name();
my $courseidinfo = &get_course();
- if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
my $header_text = $parmhash{'print_header_format'};
$header_text = &format_page_header($textwidth, $header_text, $assignment,
$courseidinfo, $name);
@@ -1621,7 +1635,7 @@ sub print_page_in_course {
$form{'grade_target'} = 'tex';
$form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);
- $form{'pdfFormFields'} = 'no';
+ $form{'pdfFormFields'} = $pdfFormFields; #
$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -2129,7 +2143,7 @@ ENDPART
my %form;
$form{'grade_target'} = 'tex';
$form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);
- $form{'pdfFormFields'} = 'no';
+ $form{'pdfFormFields'} = $pdfFormFields;
# If form.showallfoils is set, then request all foils be shown:
# privilege will be enforced both by not allowing the
@@ -2454,7 +2468,6 @@ ENDPART
if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
my $name = &get_name();
my $courseidinfo = &get_course();
- if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
$prevassignment=$assignment;
my $header_text = $parmhash{'print_header_format'};
$header_text = &format_page_header($textwidth, $header_text,
@@ -2694,8 +2707,8 @@ ENDPART
&adjust_number_to_print($helper);
my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
if ($number_per_page eq '0' || $number_per_page eq 'all'
- || $number_per_page eq 'section') {
- $number_per_page=$num_todo;
+ || $number_per_page eq 'section') {
+ $number_per_page=$num_todo > 0 ? $num_todo : 1;
}
my $flag_latex_header_remove = 'NO';
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');
@@ -3100,12 +3113,10 @@ sub print_resources {
$current_output =~ s/\\\\ Last updated:/Last updated:/
}
my $courseidinfo = &get_course();
- if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
- if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
my $header_line =
&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
- $currentassignment, $courseidinfo, $fullname);
+ $currentassignment, $courseidinfo, $fullname, $usersection);
my $header_start = ($columns_in_format == 1) ? '\lhead'
: '\fancyhead[LO]';
$header_line = $header_start.'{'.$header_line.'}';
@@ -3335,6 +3346,8 @@ sub printHelper {
my ($map, $id, $url);
my $subdir;
my $is_published=0; # True when printing from resource space.
+ my $res_printable = 1; # By default the current resource is printable.
+ my $userCanPrint = ($perm{'pav'} || $perm{'pfo'});
# Get the resource name from construction space
if ($helper->{VARS}->{'construction'}) {
@@ -3349,7 +3362,12 @@ sub printHelper {
($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
$helper->{VARS}->{'postdata'} =
&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ my $res = $navmap->getBySymb($symb);
+ $res_printable = $res->resprintable() || $userCanPrint; #printability in course context
} else {
+ # Resource space.
+
$url = $helper->{VARS}->{'postdata'};
$is_published=1; # From resource space.
}
@@ -3359,6 +3377,8 @@ sub printHelper {
$resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
}
$subdir = &Apache::lonnet::filelocation("", $url);
+
+
}
if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
@@ -3388,18 +3408,29 @@ sub printHelper {
my $printChoices = [];
my $paramHash;
- if ($resourceTitle) {
+ # If there is a current resource and it is printable
+ # Give that as a choice.
+
+ if ($resourceTitle && $res_printable) {
push @{$printChoices}, ["$resourceTitle (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];
}
# Useful filter strings
- my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
+
+ my $isPrintable = ' && $res->resprintable()';
+
+ my $isProblem = '(($res->is_problem()||$res->contains_problem||$res->is_practice()))';
+ $isProblem .= $isPrintable unless $userCanPrint;
$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
- my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
- my $isNotMap = '!$res->is_sequence()';
+ my $isProblemOrMap = '($res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice())';
+ $isProblemOrMap .= $isPrintable unless $userCanPrint;
+ my $isNotMap = '(!$res->is_sequence())';
+ $isNotMap .= $isPrintable unless $userCanPrint;
$isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
my $isMap = '$res->is_map()';
- my $symbFilter = '$res->shown_symb()';
+ $isMap .= $isPrintable unless $userCanPrint;
+ my $symbFilter = '$res->shown_symb() ';
+ $symbFilter .= $isPrintable unless $userCanPrint;
my $urlValue = '$res->link()';
$helper->declareVar('SEQUENCE');
@@ -3600,9 +3631,14 @@ ALL_PROBLEMS
$map,
$isProblem, '', $symbFilter,
$start_new_option);
- $resource_selector .= &generate_format_selector($helper,
- 'How should results be printed?',
- 'PRINT_FORMATTING').
+ my $secpdfoption;
+ unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon') ||
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon') ) {
+ $secpdfoption = 'Each PDF contains exactly one section';
+ }
+ $resource_selector .= &generate_format_selector($helper,
+ 'How should results be printed?').
&generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
'Select Problem(s) to print',
"multichoice='1' addstatus='1' closeallpages ='1'",
@@ -3733,9 +3769,10 @@ ALL_PROBLEMS
RESOURCE_SELECTOR
+ my $nextstate = 'NUMBER_PER_PDF';
$resource_selector .= &generate_format_selector($helper,
'Format of the print job',
- 'PRINT_FORMATTING');
+ $nextstate);
&Apache::lonxml::xmlparse($r, 'helper', <
@@ -4142,8 +4179,8 @@ PROBTYPE
my $footer;
if ($helper->{STATE} eq 'START') {
- my $prtspool=$r->dir_config('lonPrtDir');
- $footer = &recently_generated($prtspool);
+ my $prtspool=$r->dir_config('lonPrtDir');
+ $footer = &recently_generated($prtspool);
}
$r->print($helper->display($footer));
&Apache::lonhelper::unregisterHelperTags();
@@ -4221,6 +4258,9 @@ sub render {
my $PaperType=&mt('Paper type');
my $landscape=&mt('Landscape');
my $portrait=&mt('Portrait');
+ my $pdfFormLabel=&mt('PDF-Formfields');
+ my $with=&mt('with Formfields');
+ my $without=&mt('without Formfields');
$result.='