--- loncom/interface/lonprintout.pm 2013/06/04 23:12:09 1.633
+++ loncom/interface/lonprintout.pm 2016/08/10 16:06:03 1.650
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.633 2013/06/04 23:12:09 raeburn Exp $
+# $Id: lonprintout.pm,v 1.650 2016/08/10 16:06:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -27,7 +27,6 @@
#
package Apache::lonprintout;
use strict;
-use POSIX;
use Apache::Constants qw(:common :http);
use Apache::lonxml;
use Apache::lonnet;
@@ -47,7 +46,6 @@ use File::Basename;
use HTTP::Response;
use LONCAPA::map();
-use POSIX qw(ctime);
use Apache::lonlocal;
use Carp;
use LONCAPA;
@@ -494,7 +492,7 @@ RESOURCE_SELECTOR
#
# @return ($open, $close)
#
-# @note If open/close dates are not defined they will be retunred as undef
+# @note If open/close dates are not defined they will be returned as undef
# @note It is possible for there to be no overlap in which case -1,-1
# will be returned.
# @note The algorithm used is to take the latest open date and the earliest end date.
@@ -524,7 +522,7 @@ sub compute_open_window {
# If no overlap...both are -1 as promised.
- if (defined($earliest_close) && defined($latest_open)
+ if (($earliest_close ne '') && ($latest_open ne '')
&& ($earliest_close < $latest_open)) {
$latest_open = -1;
$earliest_close = -1;
@@ -572,11 +570,13 @@ sub printable {
#
# @return (opendate, closedate)
#
-# @note If open/close dates are not defined they will be retunred as undef
+# @note If open/close dates are not defined they will be returned as undef
# @note It is possible for there to be no overlap in which case -1,-1
# will be returned.
# @note The algorithm used is to take the latest open date and the earliest end date.
-#
+# For consistency with &printable() in lonnavmaps.pm determination of start
+# date for printing checks printstartdate param first, then, if not set,
+# opendate param, then, if not set, contentopen param.
sub get_print_dates {
my $res = shift;
@@ -595,7 +595,18 @@ sub get_print_dates {
foreach my $part (@parts) {
my $partopen = $res->parmval('printstartdate', $part);
my $partclose = $res->parmval('printenddate', $part);
-
+ if (!$partopen) {
+ $partopen = $res->parmval('opendate',$part);
+ }
+ if (!$partopen) {
+ $partopen = $res->parmval('contentopen',$part);
+ }
+ if ($partopen) {
+ push(@open_dates, $partopen);
+ }
+ if ($partclose) {
+ push(@close_dates, $partclose);
+ }
push(@open_dates, $partopen);
push(@close_dates, $partclose);
}
@@ -603,13 +614,6 @@ sub get_print_dates {
($open_date, $close_date) = &compute_open_window(\@open_dates, \@close_dates);
- if ($open_date) {
- $open_date = POSIX::strftime('%D', localtime($open_date));
- }
- if ($close_date) {
- $close_date = POSIX::strftime('%D', localtime($close_date));
- }
-
return ($open_date, $close_date);
}
@@ -696,12 +700,12 @@ sub incomplete {
}
}
#
-# When printing for students, the resoures and order of the
+# When printing for students, the resources and order of the
# resources may need to be altered if there are folders with
# random selectiopn or random ordering (or both) enabled.
# This sub computes the set of resources to print for a student
# modified both by random ordering and selection and filtered
-# to only those that are in the original set selcted to be printed.
+# to only those that are in the original set selected to be printed.
#
# Parameters:
# $map - The URL of the folder being printed.
@@ -712,6 +716,9 @@ sub incomplete {
# $who - Student/domain for whome the sequence will be generated.
# $code - CODE being printed when printing Problems/Resources
# from folder for CODEd assignments
+# $nohidemap - If true, parameter in map for hiddenresource will be
+# ignored. The user calling the routine should have
+# both the pav and vgr privileges if this is set to true).
#
# Implicit inputs:
# $
@@ -733,7 +740,7 @@ sub master_seq_to_person_seq {
my @output_seq;
my $unhidden;
- if ($perm{'pav'} && $perm{'vgr'} && $nohidemap) {
+ if ($nohidemap) {
$unhidden = &Apache::lonnet::clutter($map);
}
@@ -838,9 +845,9 @@ sub set_font_size {
if ($font_size ne '') {
- $text =~ s/\\begin{document}/\\begin{document}{\\$font_size/;
+ $text =~ s/\\begin\{document}/\\begin{document}{\\$font_size/;
}
- $text =~ s/\\end{document}/}\\end{document}/;
+ $text =~ s/\\end\{document}/}\\end{document}/;
return $text;
@@ -917,13 +924,13 @@ sub include_pdf {
sub collect_languages {
my $doc = shift;
my %languages;
- while ($doc =~ /\\selectlanguage{(\w+)}/mg) {
+ while ($doc =~ /\\selectlanguage\{(\w+)}/mg) {
$languages{$1} = 1; # allows us to request each language exactly once.
}
my @lang_list = (keys(%languages)); # List of unique languages
if (scalar @lang_list) {
my $babel_header = '\usepackage[' . join(',', @lang_list) .']{babel}'. "\n";
- $doc =~ s/\\begin{document}/$babel_header\\begin{document}/;
+ $doc =~ s/\\begin\{document}/$babel_header\\begin{document}/;
}
return $doc;
}
@@ -1320,8 +1327,8 @@ sub compare_names {
sub latex_header_footer_remove {
my $text = shift;
- $text =~ s/\\end{document}//;
- $text =~ s/\\documentclass([^&]*)\\begin{document}//;
+ $text =~ s/\\end\{document}//;
+ $text =~ s/\\documentclass([^&]*)\\begin\{document}//;
return $text;
}
#
@@ -1871,12 +1878,12 @@ sub page_format_transformation {
$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
}
if ($layout eq 'album') {
- $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
+ $text =~ s/\\begin\{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
} elsif ($layout eq 'book') {
if ($choice ne 'All class print') {
- $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
+ $text =~ s/\\begin\{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
} else {
- $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1} \\vskip 5 mm\n /;
+ $text =~ s/\\pagestyle\{fancy}\\rhead\{}\\chead\{}\s*\\begin\{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1} \\vskip 5 mm\n /;
}
if ($papersize eq 'a4') {
my $papersize_text;
@@ -1885,13 +1892,13 @@ sub page_format_transformation {
} else {
$papersize_text = '\special{papersize=210mm,297mm}';
}
- $text =~ s/(\\begin{document})/$1$papersize_text/;
+ $text =~ s/(\\begin\{document})/$1$papersize_text/;
}
}
if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}
if ($indexlist eq 'yes') {
- $text=~s/(\\begin{document})/\\makeindex $1/;
- $text=~s/(\\end{document})/\\strut\\\\\\strut\\printindex $1/;
+ $text=~s/(\\begin\{document})/\\makeindex $1/;
+ $text=~s/(\\end\{document})/\\strut\\\\\\strut\\printindex $1/;
}
return $text;
}
@@ -1900,12 +1907,12 @@ sub page_format_transformation {
sub page_cleanup {
my $result = shift;
- $result =~ m/\\end{document}(\d*)$/;
+ $result =~ m/\\end\{document}(\d*)$/;
my $number_of_columns = $1;
my $insert = '{';
for (my $id=1;$id<=$number_of_columns;$id++) { $insert .='l'; }
$insert .= '}';
- $result =~ s/(\\begin{longtable})INSERTTHEHEADOFLONGTABLE\\endfirsthead\\endhead/$1$insert/g;
+ $result =~ s/(\\begin\{longtable})INSERTTHEHEADOFLONGTABLE\\endfirsthead\\endhead/$1$insert/g;
$result =~ s/&\s*REMOVETHEHEADOFLONGTABLE\\\\/\\\\/g;
return $result,$number_of_columns;
}
@@ -1941,16 +1948,16 @@ my $end_of_student = "\n".'\special{ps:E
sub latex_corrections {
my ($number_of_columns,$result,$selectionmade,$answer_mode) = @_;
-# $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
+# $result =~ s/\\includegraphics\{/\\includegraphics\[width=\\minipagewidth\]{/g;
my $copyright = ©right_line();
if ($selectionmade eq '1' || $answer_mode eq 'only') {
- $result =~ s/(\\end{document})/\\strut\\vskip 0 mm $copyright $end_of_student $1/;
+ $result =~ s/(\\end\{document})/\\strut\\vskip 0 mm $copyright $end_of_student $1/;
} else {
- $result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline $copyright $end_of_student $1/;
+ $result =~ s/(\\end\{document})/\\strut\\vspace\*{-4 mm}\\newline $copyright $end_of_student $1/;
}
$result =~ s/\$number_of_columns/$number_of_columns/g;
- $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
- $result =~ s/(\\end{longtable}\s*)\\strut\\newline/$1/g;
+ $result =~ s/(\\end\{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
+ $result =~ s/(\\end\{longtable}\s*)\\strut\\newline/$1/g;
#-- LaTeX corrections
my $first_comment = index($result,'<!--',0);
while ($first_comment != -1) {
@@ -1969,8 +1976,8 @@ sub latex_corrections {
if ($result =~ m/&(\w+|#\d+);/) {
$result = &character_chart($result);
}
- $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
- $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
+ $result =~ s/(\\end\{tabular})\s*\\vskip 0 mm/$1/g;
+ $result =~ s/(\\begin\{enumerate})\s*\\noindent/$1/g;
return $result;
}
@@ -2208,7 +2215,7 @@ sub print_page_in_course {
my $answer=&ssi_with_retries($urlp,$ssi_retry_count, %answerform);
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ $texversion=~s/(\\keephidden\{ENDOFPROBLEM})/$answer$1/;
} else {
$texversion= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
if ($helper->{'VARS'}->{'construction'} ne '1') {
@@ -2234,7 +2241,7 @@ sub print_page_in_course {
if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
my $annotation .= &annotate($currentURL);
- $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ $texversion =~ s/(\\keephidden\{ENDOFPROBLEM})/$annotation$1/;
}
if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
@@ -2526,7 +2533,7 @@ sub print_construction_sequence {
$resources_printed .= $urlp.':';
my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ $texversion=~s/(\\keephidden\{ENDOFPROBLEM})/$answer$1/;
} else {
# If necessary, encapsulate answer in minipage:
@@ -2579,7 +2586,7 @@ sub print_construction_sequence {
$result .= $texversion;
}
}
- if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
+ if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin\{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
return $result;
}
@@ -2789,7 +2796,7 @@ ENDPART
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ $texversion=~s/(\\keephidden\{ENDOFPROBLEM})/$answer$1/;
} else {
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
if ($helper->{'VARS'}->{'construction'} ne '1') {
@@ -2816,7 +2823,7 @@ ENDPART
if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
my $annotation .= &annotate($currentURL);
- $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ $texversion =~ s/(\\keephidden\{ENDOFPROBLEM})/$annotation$1/;
}
@@ -2847,7 +2854,7 @@ ENDPART
my $texversion = &ssi_with_retries($currentURL, $ssi_retry_count, %form);
if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
my $annotation = &annotate($currentURL);
- $texversion =~ s/(\\end{document})/$annotation$1/;
+ $texversion =~ s/(\\end\{document})/$annotation$1/;
}
$result .= $texversion;
} elsif ($cleanURL =~/\.tex$/) {
@@ -2858,7 +2865,7 @@ ENDPART
$result = &fetch_raw_resource($currentURL);
if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
my $annotation = &annotate($currentURL);
- $result =~ s/(\\end{document})/$annotation$1/;
+ $result =~ s/(\\end\{document})/$annotation$1/;
}
$do_postprocessing = 0; # Don't massage the result.
@@ -2924,7 +2931,6 @@ ENDPART
&Apache::lonxml::clear_problem_counter();
- my $pbreakresources = keys %page_breaks;
for (my $i=0;$i<=$#master_seq;$i++) {
&Apache::lonenc::reset_enc();
@@ -2966,7 +2972,7 @@ ENDPART
if ($urlp=~/\.page$/) {
($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}
- $texversion =~ s/\\end{document}\d*/\\end{document}/;
+ $texversion =~ s/\\end\{document}\d*/\\end{document}/;
$flag_page_in_sequence = 'YES';
}
@@ -2981,21 +2987,21 @@ ENDPART
&Apache::lonxml::restore_problem_counter();
my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
if ($urlp =~ /\.page$/) {
- $answer =~ s/\\end{document}(\d*)$//;
+ $answer =~ s/\\end\{document}(\d*)$//;
}
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
if ($urlp =~ /\.page$/) {
- my @probs = split(/\\keephidden{ENDOFPROBLEM}/,$texversion);
+ my @probs = split(/\\keephidden\{ENDOFPROBLEM}/,$texversion);
my $lastprob = pop(@probs);
$texversion = join('\keephidden{ENDOFPROBLEM}',@probs).
$answer.'\keephidden{ENDOFPROBLEM}'.$lastprob;
} else {
- $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ $texversion=~s/(\\keephidden\{ENDOFPROBLEM})/$answer$1/;
}
} else {
if ($urlp=~/$LONCAPA::assess_page_re/) {
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-# $texversion =~ s/\\begin{document}//; # FIXME
+# $texversion =~ s/\\begin\{document}//; # FIXME
my $title = &Apache::lonnet::gettitle($master_seq[$i]);
$title = &Apache::lonxml::latex_special_symbols($title);
my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
@@ -3011,13 +3017,13 @@ ENDPART
}
if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
my $annotation .= &annotate($urlp);
- $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ $texversion =~ s/(\\keephidden\{ENDOFPROBLEM})/$annotation$1/;
}
if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);
} else {
- $texversion =~ s/\\end{document}//;
+ $texversion =~ s/\\end\{document}//;
}
if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
$texversion=&IndexCreation($texversion,$urlp);
@@ -3046,13 +3052,13 @@ ENDPART
my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
my $annotation = &annotate($urlp);
- $texversion =~ s/(\\end{document)/$annotation$1/;
+ $texversion =~ s/(\\end\{document)/$annotation$1/;
}
if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);
} else {
- $texversion =~ s/\\end{document}/\\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/\$number_of_columns\]\[b\]\{\\hrulefill\}/;
+ $texversion =~ s/\\end\{document}/\\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/\$number_of_columns\]\[b\]\{\\hrulefill\}/;
}
$result .= $texversion;
$flag_latex_header_remove = 'YES';
@@ -3083,7 +3089,7 @@ ENDPART
if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);
} else {
- $texversion =~ s/\\end{document}//;
+ $texversion =~ s/\\end\{document}//;
}
$result .= $texversion;
$flag_latex_header_remove = 'YES';
@@ -3094,7 +3100,7 @@ ENDPART
}
&Apache::lonxml::clear_problem_counter();
if ($flag_page_in_sequence eq 'YES') {
- $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
+ $result =~ s/\\usepackage\{calc}/\\usepackage{calc}\\usepackage{longtable}/;
}
$result .= '\end{document}';
} elsif (($print_type eq 'problems_for_students') ||
@@ -3175,6 +3181,10 @@ ENDPART
my $student_counter=-1;
my $i = 0;
my $last_section = (split(/:/,$students[0]))[2];
+ my $nohidemap;
+ if ($perm{'pav'} && $perm{'vgr'}) {
+ $nohidemap = 1;
+ }
foreach my $person (@students) {
my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
if (-e $duefile) {
@@ -3192,7 +3202,7 @@ ENDPART
$i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
}
my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
- $person, undef, 1);
+ $person, undef, $nohidemap);
my ($output,$fullname, $printed)=&print_resources($r,$helper,
$person,$type,
\%moreenv, $actual_seq,
@@ -3280,6 +3290,8 @@ ENDPART
$moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,
$code_type);
}
+ $code_name =~ s/^\s+//;
+ $code_name =~ s/\s+$//;
if ($code_name) {
&Apache::lonnet::put('CODEs',
{
@@ -3301,6 +3313,10 @@ ENDPART
my $flag_latex_header_remove = 'NO';
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$num_todo);
my $count=0;
+ my $nohidemap;
+ if ($perm{'pav'} && $perm{'vgr'}) {
+ $nohidemap = 1;
+ }
foreach my $code (sort(@allcodes)) {
my $file_num=int($count/$number_per_page);
if ($code_type eq 'number') {
@@ -3313,7 +3329,7 @@ ENDPART
$env{'form.CODE'} = $moreenv{'CODE'};
$actual_seq = master_seq_to_person_seq($map, \@master_seq,
undef,
- $moreenv{'CODE'}, 1);
+ $moreenv{'CODE'}, $nohidemap);
delete($env{'form.CODE'});
}
my ($output,$fullname, $printed)=
@@ -3363,7 +3379,7 @@ ENDPART
$resources_printed .= $urlp.':';
my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ $texversion=~s/(\\keephidden\{ENDOFPROBLEM})/$answer$1/;
} else {
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
if ($helper->{'VARS'}->{'construction'} ne '1') {
@@ -3380,11 +3396,11 @@ ENDPART
#this chunk is responsible for printing the path to problem
my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
- $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
+ $texversion =~ s/(\\begin\{minipage}\{\\textwidth})/$1 $newurlp/;
if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);
} else {
- $texversion =~ s/\\end{document}//;
+ $texversion =~ s/\\end\{document}//;
}
if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
$texversion=&IndexCreation($texversion,$urlp);
@@ -3422,13 +3438,16 @@ ENDPART
#}
}
- # Set URLback if this is a construction space print so we can provide
- # a link to the resource being edited.
- #
+ # Set URLback so we can provide a link back to the resource and to change options.
+ # (Since the browser back button does not currently work with https,
+ # the back link is useful even when there is an easy-to-miss LON-CAPA back button.)
my $URLback=''; #link to original document
if ($helper->{'VARS'}->{'construction'} eq '1') {
$URLback=$helper->{'VARS'}->{'filename'};
+ } elsif ($helper->{VARS}{'symb'}) {
+ my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
+ $URLback = &Apache::lonnet::clutter($url);
}
#
# Final adjustment of the font size:
@@ -3611,6 +3630,7 @@ sub print_resources {
my $current_assignment = "";
my $assignment;
my $courseidinfo = &get_course();
+ my $possprint = scalar(@{$master_seq});
foreach my $curresline (@{$master_seq}) {
if (defined $page_breaks{$curresline}) {
@@ -3630,6 +3650,7 @@ sub print_resources {
next;
}
$actually_printed++; # we're going to print one.
+
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)$/) {
@@ -3647,7 +3668,7 @@ sub print_resources {
if ($remove_latex_header eq 'YES') {
$rendered = &latex_header_footer_remove($rendered);
} else {
- $rendered =~ s/\\end{document}\d*//;
+ $rendered =~ s/\\end\{document}\d*//;
}
}
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
@@ -3664,13 +3685,13 @@ sub print_resources {
my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%answerenv);
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+ $rendered=~s/(\\keephidden\{ENDOFPROBLEM})/$ansrendered$1/;
} else {
my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
unless ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') {
- $header =~ s/\\begin{document}//; #<<<<<
+ $header =~ s/\\begin\{document}//; #<<<<<
}
my $title = &Apache::lonnet::gettitle($curresline);
$title = &Apache::lonxml::latex_special_symbols($title);
@@ -3684,13 +3705,13 @@ sub print_resources {
if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
my $url = &Apache::lonnet::clutter($res_url);
my $annotation = &annotate($url);
- $rendered =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ $rendered =~ s/(\\keephidden\{ENDOFPROBLEM})/$annotation$1/;
}
my $junk;
if ($remove_latex_header eq 'YES') {
$rendered = &latex_header_footer_remove($rendered);
} else {
- $rendered =~ s/\\end{document}//;
+ $rendered =~ s/\\end\{document}//;
}
$current_output .= $rendered;
} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
@@ -3702,12 +3723,12 @@ sub print_resources {
if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
my $url = &Apache::lonnet::clutter($res_url);
my $annotation = &annotate($url);
- $annotation =~ s/(\\end{document})/$annotation$1/;
+ $annotation =~ s/(\\end\{document})/$annotation$1/;
}
if ($remove_latex_header eq 'YES') {
$rendered = &latex_header_footer_remove($rendered);
} else {
- $rendered =~ s/\\end{document}//;
+ $rendered =~ s/\\end\{document}//;
}
$current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
} elsif($res_url = ~/\.pdf$/) {
@@ -3722,7 +3743,7 @@ sub print_resources {
if ($remove_latex_header ne 'NO') {
$rendered = &latex_header_footer_remove($rendered);
} else {
- $rendered =~ s/\\end{document}//;
+ $rendered =~ s/\\end\{document}//;
}
$current_output .= $rendered;
}
@@ -3751,7 +3772,24 @@ sub print_resources {
#
if ($actually_printed == 0) {
- $current_output = &encapsulate_minipage("\\vskip -10mm \nNo incomplete resources\n \\vskip 100 mm { }\n");
+ my $message = &mt('No resources to print');
+ if (!$possprint) {
+ if ($perm{'pav'} || $perm{'pfo'}) {
+ $message = &mt('There are no unhidden resources to print.')."\n\n".
+ &mt('The most likely reason is one of the following: ')."\n".
+ '\begin{itemize}'."\n".
+ '\item '.&mt("The 'Resource hidden from students' parameter is set for the folder being printed.")."\n".
+ '\item '.&mt("'Hidden' is checked in the Course Editor individually for each resource in the folder being printed.")."\n".
+ '\end{itemize}'."\n\n".
+ &mt("Note: to print a bubblesheet exam which you want to hide from students, ".
+ "use the Course Editor to check the 'Hidden' checkbox for the exam folder itself.")."\n";
+ }
+ } elsif ($print_incomplete) {
+ $message = &mt('No incomplete resources');
+ }
+ if ($message) {
+ $current_output = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n");
+ }
if ($remove_latex_header eq "NO") {
$current_output = &print_latex_header() . $current_output;
} else {
@@ -3762,31 +3800,23 @@ sub print_resources {
if ($syllabus_first) {
$current_output =~ s/\\\\ Last updated:/Last updated:/
}
- if (0) {
- 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, $usersection);
- my $header_start = ($columns_in_format == 1) ? '\lhead'
- : '\fancyhead[LO]';
- $header_line = $header_start.'{'.$header_line.'}';
- }
+ 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, $usersection);
+ my $header_start = ($columns_in_format == 1) ? '\lhead' : '\fancyhead[LO]';
+ my $newheader = $header_start.'{'.$header_line.'}';
if ($current_output=~/\\documentclass/) {
-# $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
- $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$namepostfix}\\vskip 5 mm /;
+ $current_output =~ s/\\begin\{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$newheader$namepostfix}\\vskip 5 mm /;
} else {
my $blankpages =
'\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
-# $current_output = '\strut\vspace*{-6 mm}\\newline'.
-# ©right_line().' \newpage '.$blankpages.$end_of_student.
-# '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
-# $header_line.$namepostfix. '} \vskip 5 mm '.$current_output;
$current_output = '\strut\vspace*{-6 mm}\\newline'.
©right_line().' \newpage '.$blankpages.$end_of_student.
- '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'
- .$namepostfix. '} \vskip 5 mm '.$current_output;
+ '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
+ $newheader.$namepostfix. '} \vskip 5 mm '.$current_output;
}
#
@@ -4055,7 +4085,7 @@ sub printHelper {
&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
+ $res_printable = $res->resprintable() || $userCanPrint; #printability in course context
($res_printstartdate, $res_printenddate) = &get_print_dates($res);
($course_open, $course_close) = &course_print_dates($res);
($map_open, $map_close) = &map_print_dates($res);
@@ -4135,13 +4165,13 @@ sub printHelper {
my $start_new_option;
if ($perm{'pav'}) {
$start_new_option =
- "<option text='".&mt('Start new page<br />before selected').
+ "<option text='".&mt('Start new page[_1]before selected','<br />').
"' variable='FINISHPAGE' />".
- "<option text='".&mt('Extra space<br />before selected').
+ "<option text='".&mt('Extra space[_1]before selected','<br />').
"' variable='EXTRASPACE' type='text' />" .
"<option " .
"' variable='POSSIBLE_RESOURCES' type='hidden' />".
- "<option text='".&mt('Space units<br />check for mm').
+ "<option text='".&mt('Space units[_1]check for mm','<br />').
"' variable='EXTRASPACE_UNITS' type='checkbox' />"
;
@@ -4306,7 +4336,7 @@ my $suffixXml = <<ALL_PROBLEMS;
ALL_PROBLEMS
&Apache::lonxml::xmlparse($r, 'helper',
&generate_resource_chooser('ALL_PROBLEMS',
- 'SelectProblem(s) to print',
+ 'Select Problem(s) to print',
'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
'RESOURCES',
'PAGESIZE',
@@ -4449,6 +4479,7 @@ ALL_PROBLEMS
my @lines = &Apache::grades::get_scantronformat_file();
my $codechoice='';
foreach my $line (@lines) {
+ next if (($line =~ /^\#/) || ($line eq ''));
my ($name,$description,$code_type,$code_length)=
(split(/:/,$line))[0,1,2,4];
if ($code_length > 0 &&
@@ -4660,12 +4691,33 @@ CHOOSE_FROM_ANY_SEQUENCE
# Generate the first state, to select which resources get printed.
Apache::lonhelper::state->new("START", "Select Printing Options:");
if (!$res_printable) {
- $paramHash = Apache::lonhelper::getParamHash();
- $paramHash->{MESSAGE_TEXT} =
- '<p class="LC_info">'
- .&mt('Printing for current resource is only possible between [_1] and [_2]',
- $res_printstartdate, $res_printenddate).'</p>';
- Apache::lonhelper::message->new();
+ my $now = time;
+ my $shownprintstart = &Apache::lonlocal::locallocaltime($res_printstartdate);
+ my $shownprintend = &Apache::lonlocal::locallocaltime($res_printenddate);
+ my $noprintmsg;
+ if (($res_printenddate) && ($res_printenddate < $now)) {
+ $noprintmsg = &mt('Printing for current resource no longer available (ended: [_1])',
+ $shownprintend);
+ } else {
+ if (($res_printstartdate) && ($res_printstartdate > $now)) {
+ if (($res_printenddate) && ($res_printenddate > $now) && ($res_printenddate > $res_printstartdate)) {
+ $noprintmsg = &mt('Printing for current resource is only possible between [_1] and [_2]',
+ $shownprintstart,$shownprintend);
+ } elsif (!$res_printenddate) {
+ $noprintmsg = &mt('Printing for current resource will only be possible starting [_1]',
+ $shownprintstart);
+ } else {
+ $noprintmsg = &mt('Printing for current resource is unavailable');
+ }
+ }
+ }
+
+ if ($noprintmsg) {
+ $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{MESSAGE_TEXT} =
+ '<p class="LC_info">'.$noprintmsg.'</p>';
+ Apache::lonhelper::message->new();
+ }
}
$paramHash = Apache::lonhelper::getParamHash();
$paramHash = Apache::lonhelper::getParamHash();
@@ -5007,9 +5059,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');
+ my $pdfFormLabel=&mt('PDF Form Fields');
+ my $with=&mt('with Form Fields');
+ my $without=&mt('without Form Fields');
$result.='<h3>'.&mt('Layout Options').'</h3>'