--- loncom/interface/lonprintout.pm 2024/07/03 12:59:50 1.627.2.36
+++ 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.627.2.36 2024/07/03 12:59:50 raeburn Exp $
+# $Id: lonprintout.pm,v 1.650 2016/08/10 16:06:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -157,7 +157,7 @@ sub create_incomplete_folder_selstud_hel
my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_PEOPLE_SEQ',
'Select problem(s) to print',
- 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
'RESOURCES',
'CHOOSE_STUDENTS_INCOMPLETE',
$map,
@@ -206,7 +206,7 @@ sub create_incomplete_course_helper {
my $resource_chooser = &generate_resource_chooser('INCOMPLETE_PROBLEMS_COURSE_RESOURCES',
'Select problem(s) to print',
- 'multichoice = "1" suppressEmptySequences="0" addstatus="1" closeallpagtes="1" modallink="1"',
+ 'multichoice = "1" suppressEmptySequences="0" addstatus="1" closeallpagtes="1"',
'RESOURCES',
'INCOMPLETE_PROBLEMS_COURSE_STUDENTS',
'',
@@ -252,7 +252,7 @@ sub create_incomplete_folder_helper {
my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_SEQ',
'Select problem(s) to print',
- 'multichoice="1", toponly ="1", addstatus="1", closeallpages="1" modallink="1"',
+ 'multichoice="1", toponly ="1", addstatus="1", closeallpages="1"',
'RESOURCES',
'PAGESIZE',
$map,
@@ -306,8 +306,7 @@ CHOOSE_STUDENTS
# this_state - State name of the chooser.
# prompt_text - Text to use to prompt user.
# resource_options - Resource tag options e.g.
-# "multichoice='1', toponly='1', addstatus='1',
-# modallink='1'"
+# "multichoice='1', toponly='1', addstatus='1'"
# that control the selection and appearance of the
# resource selector.
# variable - Name of the variable to hold the choice
@@ -579,7 +578,6 @@ sub printable {
# 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;
my $partsref = $res->parts();
@@ -747,7 +745,7 @@ sub master_seq_to_person_seq {
}
my $navmap = Apache::lonnavmaps::navmap->new($username, $userdomain,
- $code,$unhidden);
+ $code, $unhidden);
my ($start,$finish);
if ($map) {
@@ -767,13 +765,13 @@ sub master_seq_to_person_seq {
# Iterate on the resource..select the items that are randomly selected
# and that are in the seq_has. Presumably the iterator will take care
# of the random ordering part of the deal.
+ #
my $curres;
while ($curres = $iterator->next()) {
#
# Only process resources..that are not removed by randomout...
# and are selected for printint as well.
#
-
if (ref($curres) && ! $curres->randomout()) {
my $currsymb = $curres->symb();
if (exists($seq_hash{$currsymb})) {
@@ -848,8 +846,8 @@ sub set_font_size {
if ($font_size ne '') {
$text =~ s/\\begin\{document}/\\begin{document}{\\$font_size/;
- $text =~ s/\\end\{document}/}\\end{document}/;
}
+ $text =~ s/\\end\{document}/}\\end{document}/;
return $text;
@@ -891,7 +889,7 @@ sub include_pdf {
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
$file =~ s{(.*)/res/}{$londocroot/res/};
- open(FILE,">>","$Apache::lonnet::perlvar{'lonPrtDir'}/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+ open(FILE,">>$Apache::lonnet::perlvar{'lonPrtDir'}/$env{'user.name'}_$env{'user.domain'}_printout.dat");
print FILE ("$file\n");
close (FILE);
@@ -1060,12 +1058,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?
@@ -1081,38 +1079,34 @@ 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';
+ }
- return $format;
+ $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
@@ -1238,9 +1232,8 @@ sub is_valid_alpha_code {
sub is_code_valid {
my ($code_value, $code_option) = @_;
my ($code_type, $code_length) = ('letter', 6); # defaults.
- my @lines = &Apache::lonnet::get_scantronformat_file();
+ my @lines = &Apache::grades::get_scantronformat_file();
foreach my $line (@lines) {
- next if (($line =~ /^\#/) || ($line eq ''));
my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
if($name eq $code_option) {
$code_length = $length;
@@ -1344,8 +1337,8 @@ sub latex_header_footer_remove {
# necessity is determined by the problem_split param.
#
sub encapsulate_minipage {
- my ($text,$problem_split) = @_;
- if (!($problem_split =~ /yes/i)) {
+ my ($text) = @_;
+ if (!($env{'form.problem.split'} =~ /yes/i)) {
$text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';
}
return $text;
@@ -1849,6 +1842,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;
}
@@ -1871,7 +1866,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);
@@ -1962,7 +1956,7 @@ sub latex_corrections {
$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\\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);
@@ -2076,28 +2070,16 @@ sub get_textwidth {
sub unsupported {
my ($currentURL,$mode,$symb)=@_;
- my $cleanURL=&Apache::lonenc::check_decrypt($currentURL);
- my $shown = $currentURL;
- if (($cleanURL ne $currentURL) || ($symb =~ m{/^enc/})) {
- $shown = &mt('URL not shown (encrypted)');
- }
if ($mode ne '') {$mode='\\'.$mode}
- my $result = &print_latex_header($mode);
- if ($cleanURL=~m|^(/adm/wrapper/)?ext/|) {
- $cleanURL=~s|^(/adm/wrapper/)?ext/|http://|;
- $cleanURL=~s|^http://https://|https://|;
- if ($shown eq $currentURL) {
- $shown = &Apache::lonxml::latex_special_symbols($cleanURL);
- }
- my $title=&Apache::lonnet::gettitle($symb);
- $title = &Apache::lonxml::latex_special_symbols($title);
- $result.=' \strut \\\\ \textit{'.$title.'} \strut \\\\ '.$shown.' ';
+ my $result.= &print_latex_header($mode);
+ if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
+ $currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
+ $currentURL=~s|^http://https://|https://|;
+ my $title=&Apache::lonnet::gettitle($symb);
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ $result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';
} else {
- if ($shown eq $currentURL) {
- $result.=&Apache::lonxml::latex_special_symbols($currentURL);
- } else {
- $result.=$shown;
- }
+ $result.=$currentURL;
}
$result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
return $result;
@@ -2135,12 +2117,19 @@ sub print_page_in_course {
$numberofcolumns);
my $LaTeXwidth=&recalcto_mm($textwidth);
+
if ($mode ne '') {$mode='\\'.$mode}
my $result = &print_latex_header($mode);
-
- my $title=&Apache::lonnet::gettitle($currentURL);
- $title = &Apache::lonxml::latex_special_symbols($title);
- $result .= '\noindent\textit{'.$title.'}\\\\';
+ if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
+ $currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
+ my $title=&Apache::lonnet::gettitle($symb);
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ } else {
+ my $esc_currentURL= $currentURL;
+ $esc_currentURL =~ s/_/\\_/g;
+ $result.=$esc_currentURL;
+ }
+ $result .= '\\\\';
if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
&Apache::lonnet::appenv({'construct.style' =>
@@ -2156,7 +2145,7 @@ sub print_page_in_course {
foreach my $resource (@page_resources) {
my $resource_src = $resource->src(); # Essentially the URL of the resource.
- my $current_url = $resource->link();
+ $result .= $resource->title() . '\\\\';
# Recurse if a .page:
@@ -2166,10 +2155,11 @@ sub print_page_in_course {
$result .= &print_page_in_course($helper, $rparmhash,
$resource_src, \@page_resources);
} elsif ($resource->ext()) {
- $result.=&latex_header_footer_remove(&unsupported($current_url,$mode,$resource->symb));
- } elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
- # these resources go through the XML transformer:
- $result .= &Apache::lonxml::latex_special_symbols($resource->title()) . '\\\\';
+ $result .= &unsupported($currentURL,$mode,$symb);
+ }
+ # these resources go through the XML transformer:
+
+ elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
my $urlp = &Apache::lonnet::clutter($resource_src);
@@ -2182,7 +2172,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'};
@@ -2553,7 +2543,7 @@ sub print_construction_sequence {
my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$body.=&path_to_problem($urlp,$LaTeXwidth);
$body.='\vskip 1 mm '.$answer.'\end{document}';
- $body = &encapsulate_minipage($body,$answerform{'problem_split'});
+ $body = &encapsulate_minipage($body);
$texversion.=$body;
}
}
@@ -2718,7 +2708,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
@@ -2753,7 +2743,7 @@ ENDPART
$cleanURL=$currentURL;
}
$selectionmade = 1;
-
+
if ($cleanURL!~m|^/adm/|
&& $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
my $rndseed=time;
@@ -2945,6 +2935,7 @@ ENDPART
&Apache::lonenc::reset_enc();
+
# Note due to document structure, not allowed to put \newpage
# prior to the first resource
@@ -2965,7 +2956,6 @@ ENDPART
my $texversion='';
if ($urlp!~m|^/adm/|
&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
- my $extension = $1;
$resources_printed .= $urlp.':';
&Apache::lonxml::remember_problem_counter();
if ($flag_latex_header_remove eq 'NO') {
@@ -2974,7 +2964,7 @@ ENDPART
(($i==0) &&
(($urlp=~/\.page$/) ||
($print_type eq 'map_problems_in_page') ||
- (($print_type eq 'map_resources_in_page') && ($extension !~ /^x?html?$/))))) {
+ ($print_type eq 'map_resources_in_page')))) {
$flag_latex_header_remove = 'YES';
}
}
@@ -3017,7 +3007,7 @@ ENDPART
my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$body .= &path_to_problem ($urlp,$LaTeXwidth);
$body .='\vskip 1 mm '.$answer;
- $body = &encapsulate_minipage($body,$answerform{'problem_split'});
+ $body = &encapsulate_minipage($body);
$texversion .= $body;
} else {
$texversion='';
@@ -3041,7 +3031,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,
@@ -3170,12 +3159,8 @@ ENDPART
my $map;
if ($helper->{VARS}->{'symb'}) {
- unless ((($print_type eq 'all_problems_students') ||
- ($print_type eq 'incomplete_problems_selpeople_course')) &&
- $perm{'pfo'}) {
- ($map, my $id, my $resource) =
- &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
- }
+ ($map, my $id, my $resource) =
+ &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
}
#loop over students
@@ -3235,7 +3220,7 @@ ENDPART
$result .= $print_array[0].' \end{document}';
} elsif (($print_type eq 'problems_for_anon') ||
($print_type eq 'problems_for_anon_page') ||
- ($print_type eq 'resources_for_anon') ) {
+ ($print_type eq 'resources_for_anon') ) {
my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
@@ -3244,10 +3229,10 @@ ENDPART
my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
- my @lines = &Apache::lonnet::get_scantronformat_file();
+ my @lines = &Apache::grades::get_scantronformat_file();
my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
foreach my $line (@lines) {
- next if (($line =~ /^\#/) || ($line eq ''));
+ chomp($line);
my ($name,$type,$length,$bubbles_per_item) =
(split(/:/,$line))[0,2,4,17];
if ($name eq $code_option) {
@@ -3259,10 +3244,18 @@ ENDPART
}
}
}
- my $map;
+ my ($randomorder,$randompick,$map);
if ($helper->{VARS}{'symb'}) {
($map, my $id, my $resource) =
&Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ if (defined($navmap)) {
+ if ($map) {
+ my $mapres = $navmap->getResourceByUrl($map);
+ $randomorder = $mapres->randomorder();
+ $randompick = $mapres->randompick();
+ }
+ }
}
my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
$moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};
@@ -3322,7 +3315,7 @@ ENDPART
my $count=0;
my $nohidemap;
if ($perm{'pav'} && $perm{'vgr'}) {
- $nohidemap = 1;
+ $nohidemap = 1;
}
foreach my $code (sort(@allcodes)) {
my $file_num=int($count/$number_per_page);
@@ -3331,11 +3324,14 @@ ENDPART
} else {
$moreenv{'CODE'}=&num_to_letters($code);
}
- $env{'form.CODE'} = $moreenv{'CODE'};
- my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
- undef,
- $moreenv{'CODE'}, $nohidemap);
- delete($env{'form.CODE'});
+ my $actual_seq = \@master_seq;
+ if ($randomorder || $randompick) {
+ $env{'form.CODE'} = $moreenv{'CODE'};
+ $actual_seq = master_seq_to_person_seq($map, \@master_seq,
+ undef,
+ $moreenv{'CODE'}, $nohidemap);
+ delete($env{'form.CODE'});
+ }
my ($output,$fullname, $printed)=
&print_resources($r,$helper,'anonymous',$type,\%moreenv,
$actual_seq,$flag_latex_header_remove,
@@ -3350,7 +3346,7 @@ ENDPART
}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$result .= $print_array[0].' \end{document}';
- } elsif ($print_type eq 'problems_from_directory') {
+ } elsif ($print_type eq 'problems_from_directory') {
#prints selected problems from the subdirectory
$selectionmade = 6;
my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
@@ -3451,39 +3447,7 @@ ENDPART
$URLback=$helper->{'VARS'}->{'filename'};
} elsif ($helper->{VARS}{'symb'}) {
my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
- my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
- my ($anchor,$usehttp,$plainurl);
- $url = &Apache::lonnet::clutter($url);
- $plainurl = $url;
- if (($ENV{'SERVER_PORT'} == 443) && ($env{'request.course.id'}) &&
- (($url =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) ||
- ($url =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}))) {
- unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl())) {
- $usehttp = 1;
- }
- }
- if ($env{'request.enc'}) {
- $url = &Apache::lonenc::encrypted($url);
- }
- if ($url ne '') {
- my $symb = $helper->{VARS}{'symb'};
- if ($url =~ m{^\Q/adm/wrapper/ext/\E}) {
- my $link = $url;
- ($link,$anchor) = ($url =~ /^([^\#]+)(?:|(\#[^\#]+))$/);
- if ($anchor) {
- ($symb) = ($helper->{VARS}{'symb'} =~ /^([^\#]+)/);
- }
- $url = $link;
- }
- $URLback = $url;
- if ($usehttp) {
- $URLback .= (($URLback =~ /\?/) ? '&':'?').'usehttp=1';
- }
- unless ($plainurl =~ /\.page$/) {
- $URLback .= (($URLback =~ /\?/) ? '&':'?').'symb='.&escape($symb.$anchor);
- }
- }
+ $URLback = &Apache::lonnet::clutter($url);
}
#
# Final adjustment of the font size:
@@ -3567,7 +3531,7 @@ ENDPART
'cgi.'.$identifier.'.role' => $perm{'pav'},
'cgi.'.$identifier.'.numberoffiles' => $#print_array,
'cgi.'.$identifier.'.studentnames' => $student_names,
- 'cgi.'.$identifier.'.backref' => &escape($URLback),});
+ 'cgi.'.$identifier.'.backref' => $URLback,});
&Apache::lonnet::appenv({"cgi.$identifier.user" => $env{'user.name'},
"cgi.$identifier.domain" => $env{'user.domain'},
"cgi.$identifier.courseid" => $cnum,
@@ -3667,8 +3631,6 @@ sub print_resources {
my $assignment;
my $courseidinfo = &get_course();
my $possprint = scalar(@{$master_seq});
- if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
- if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
foreach my $curresline (@{$master_seq}) {
if (defined $page_breaks{$curresline}) {
@@ -3736,7 +3698,7 @@ sub print_resources {
my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$body .=&path_to_problem($res_url,$LaTeXwidth);
$body .='\vskip 1 mm '.$ansrendered;
- $body = &encapsulate_minipage($body,$answerenv{'problem_split'});
+ $body = &encapsulate_minipage($body);
$rendered = $header.$body;
}
}
@@ -3769,7 +3731,7 @@ sub print_resources {
$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$/) {
+ } elsif($res_url = ~/\.pdf$/) {
my $url = &Apache::lonnet::clutter($res_url);
my $rendered = &include_pdf($url);
if ($remove_latex_header ne 'NO') {
@@ -3793,7 +3755,7 @@ sub print_resources {
if (($assignment ne $current_assignment) && ($assignment ne "")) {
my $header_line = &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
$assignment, $courseidinfo,
- $fullname);
+ $fullname, $usersection);
my $header_start = ($columns_in_format == 1) ? '\lhead'
: '\fancyhead[LO]';
$header_line = $header_start.'{'.$header_line.'}';
@@ -3825,8 +3787,8 @@ sub print_resources {
} elsif ($print_incomplete) {
$message = &mt('No incomplete resources');
}
- if ($message) {
- $current_output = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n",$moreenv->{'problem_split'});
+ 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;
@@ -3840,13 +3802,13 @@ sub print_resources {
}
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);
+ &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$newheader$namepostfix}\\vskip 5 mm /;
+
} else {
my $blankpages =
'\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
@@ -3855,6 +3817,7 @@ sub print_resources {
©right_line().' \newpage '.$blankpages.$end_of_student.
'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
$newheader.$namepostfix. '} \vskip 5 mm '.$current_output;
+
}
#
# Close the student bracketing.
@@ -3887,9 +3850,8 @@ sub handler {
if ($env{'request.course.id'}) {
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $clientip = &Apache::lonnet::get_requestor_ip($r);
my ($blocked,$blocktext) =
- &Apache::loncommon::blocking_status('printout',$clientip,$cnum,$cdom);
+ &Apache::loncommon::blocking_status('printout',$cnum,$cdom);
if ($blocked) {
my $checkrole = "cm./$cdom/$cnum";
if ($env{'request.course.sec'} ne '') {
@@ -4088,10 +4050,8 @@ sub printHelper {
$helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
}
- if ($helper->{VARS}->{'symb'} ne '') {
- $helper->{VARS}->{'symb'}=
- &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
- }
+ $helper->{VARS}->{'symb'}=
+ &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
@@ -4102,7 +4062,6 @@ sub printHelper {
my $subdir;
my $is_published=0; # True when printing from resource space.
my $res_printable = 1; # By default the current resource is printable.
- my $res_error;
my $userCanPrint = ($perm{'pav'} || $perm{'pfo'});
my $res_printstartdate;
my $res_printenddate;
@@ -4124,22 +4083,13 @@ sub printHelper {
($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
$helper->{VARS}->{'postdata'} =
&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
- if (!$userCanPrint) {
- my $navmap = Apache::lonnavmaps::navmap->new();
- if (ref($navmap)) {
- my $res = $navmap->getBySymb($symb);
- if (ref($res)) {
- $res_printable = $res->resprintable(); #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);
- } else {
- $res_error = 1;
- }
- } else {
- $res_error = 1;
- }
- }
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ my $res = $navmap->getBySymb($symb);
+ $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);
+
} else {
# Resource space.
@@ -4255,7 +4205,7 @@ sub printHelper {
}
my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS_PAGE',
'Select Problem(s) to print',
- "multichoice='1' toponly='1' addstatus='1' closeallpages='1' modallink='1'",
+ "multichoice='1' toponly='1' addstatus='1' closeallpages='1'",
'RESOURCES',
'PAGESIZE',
$url,
@@ -4265,7 +4215,7 @@ sub printHelper {
$helperFragment .= &generate_resource_chooser('CHOOSE_RESOURCES_PAGE',
'Select Resource(s) to print',
- 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
'RESOURCES',
'PAGESIZE',
$url,
@@ -4330,7 +4280,7 @@ sub printHelper {
'CHOOSE_PROBLEMS_HTML'];
my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
'Select Problem(s) to print',
- 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
'RESOURCES',
'PAGESIZE',
$map,
@@ -4339,7 +4289,7 @@ sub printHelper {
$start_new_option);
$helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
'Select Resource(s) to print',
- 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
'RESOURCES',
'PAGESIZE',
$map,
@@ -4387,7 +4337,7 @@ ALL_PROBLEMS
&Apache::lonxml::xmlparse($r, 'helper',
&generate_resource_chooser('ALL_PROBLEMS',
'Select Problem(s) to print',
- 'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1" modallink="1"',
+ 'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
'RESOURCES',
'PAGESIZE',
'',
@@ -4396,7 +4346,7 @@ ALL_PROBLEMS
$start_new_option) .
&generate_resource_chooser('ALL_RESOURCES',
'Select Resource(s) to print',
- 'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
+ " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1'",
'RESOURCES',
'PAGESIZE',
'',
@@ -4404,7 +4354,7 @@ ALL_PROBLEMS
$start_new_option) .
&generate_resource_chooser('ALL_PROBLEMS_STUDENTS',
'Select Problem(s) to print',
- 'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1" modallink="1"',
+ 'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
'RESOURCES',
'STUDENTS1',
'',
@@ -4448,7 +4398,7 @@ ALL_PROBLEMS
#
my $resource_selector= &generate_resource_chooser('SELECT_PROBLEMS',
'Select resources to print',
- 'multichoice="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
+ 'multichoice="1" addstatus="1" closeallpages="1"',
'RESOURCES',
'PRINT_FORMATTING',
$map,
@@ -4459,7 +4409,7 @@ ALL_PROBLEMS
'PRINT_FORMATTING').
&generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
'Select Problem(s) to print',
- "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",
+ "multichoice='1' addstatus='1' closeallpages ='1'",
'RESOURCES',
'PRINT_FORMATTING',
$url,
@@ -4526,7 +4476,7 @@ ALL_PROBLEMS
}
- my @lines = &Apache::lonnet::get_scantronformat_file();
+ my @lines = &Apache::grades::get_scantronformat_file();
my $codechoice='';
foreach my $line (@lines) {
next if (($line =~ /^\#/) || ($line eq ''));
@@ -4558,7 +4508,7 @@ ALL_PROBLEMS
$namechoice) .
&generate_resource_chooser('SELECT_PROBLEMS_PAGE',
'Select Problem(s) to print',
- "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",
+ "multichoice='1' addstatus='1' closeallpages ='1'",
'RESOURCES',
'PRINT_FORMATTING',
$url,
@@ -4582,7 +4532,7 @@ ALL_PROBLEMS
<nextstate>PRINT_FORMATTING</nextstate>
<message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
<resource variable="RESOURCES" multichoice="1" addstatus="1"
- closeallpages="1" modallink="1">
+ closeallpages="1">
<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
@@ -4727,7 +4677,7 @@ CHOOSE_FROM_SUBDIR
<state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
<message>(mark desired resources then click "next" button) <br /></message>
<resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
- closeallpages="1" modallink="1" suppressNavmap="1">
+ closeallpages="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isNotMap</filterfunc>
<mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
@@ -4738,54 +4688,35 @@ CHOOSE_FROM_SUBDIR
CHOOSE_FROM_ANY_SEQUENCE
}
- my $numchoices = 0;
- if (ref($printChoices) eq 'ARRAY') {
- $numchoices = @{$printChoices};
- }
- # Early out if nothing to print
- if (!$numchoices) {
- $r->print(&Apache::loncommon::start_page('Printing Helper').
- '<h2>'.&mt('Unable to determine print context').'</h2>'.
- '<p>'.&mt('Please display a resource, and then click the "Print" button/icon').'</p>');
- my $prtspool=$r->dir_config('lonPrtDir');
- my $footer = &recently_generated($prtspool);
- $r->print($footer.&Apache::loncommon::end_page());
- return OK;
- }
-
# Generate the first state, to select which resources get printed.
Apache::lonhelper::state->new("START", "Select Printing Options:");
if (!$res_printable) {
+ my $now = time;
+ my $shownprintstart = &Apache::lonlocal::locallocaltime($res_printstartdate);
+ my $shownprintend = &Apache::lonlocal::locallocaltime($res_printenddate);
my $noprintmsg;
- if ($res_error) {
- $noprintmsg = &mt('Print availability for current resource could not be determined');
- } else {
- my $now = time;
- my $shownprintstart = &Apache::lonlocal::locallocaltime($res_printstartdate);
- my $shownprintend = &Apache::lonlocal::locallocaltime($res_printenddate);
- if (($res_printenddate) && ($res_printenddate < $now)) {
+ 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');
- }
+ } 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} =
+ $paramHash->{MESSAGE_TEXT} =
'<p class="LC_info">'.$noprintmsg.'</p>';
- Apache::lonhelper::message->new();
+ Apache::lonhelper::message->new();
}
}
$paramHash = Apache::lonhelper::getParamHash();
@@ -4832,7 +4763,7 @@ CHOOSE_FROM_ANY_SEQUENCE
my $xmlfrag = << "FONT_SELECTION";
- <dropdown variable='fontsize' multichoice='0' allowempty='0'>
+ <dropdown variable='fontsize' multichoice='0', allowempty='0'>
<defaultvalue>
return 'normalsize';
</defaultvalue>
@@ -5010,7 +4941,7 @@ FONT_SELECTION
return "$helper->{VARS}->{'probstatus'}";
</defaultvalue>
<choice computer="problem">Homework Problem</choice>
- <choice computer="exam">Exam Problem</choice>
+ <choice computer="exam">Bubblesheet Exam Problem</choice>
<choice computer="survey">Survey question</choice>
,choice computer="anonsurvey"Anonymous survey question</choice>
</dropdown>
@@ -5128,6 +5059,9 @@ sub render {
my $PaperType=&mt('Paper type');
my $landscape=&mt('Landscape');
my $portrait=&mt('Portrait');
+ my $pdfFormLabel=&mt('PDF Form Fields');
+ my $with=&mt('with Form Fields');
+ my $without=&mt('without Form Fields');
$result.='<h3>'.&mt('Layout Options').'</h3>'
@@ -5136,6 +5070,7 @@ sub render {
.'<th>'.$PageLayout.'</th>'
.'<th>'.$NumberOfColumns.'</th>'
.'<th>'.$PaperType.'</th>'
+ .'<th>'.$pdfFormLabel.'</th>'
.&Apache::loncommon::end_data_table_header_row()
.&Apache::loncommon::start_data_table_row()
.'<td>'
@@ -5176,6 +5111,12 @@ sub render {
$result .= <<HTML;
</select>
</td>
+ <td align='center'>
+ <select name='${var}.pdfFormFields'>
+ <option selected="selected" value="no">$without</option>
+ <option value="yes">$with</option>
+ </select>
+ </td>
HTML
$result.=&Apache::loncommon::end_data_table_row()
.&Apache::loncommon::end_data_table();