--- loncom/interface/lonprintout.pm	2012/04/10 09:49:36	1.615
+++ loncom/interface/lonprintout.pm	2016/08/06 20:52:43	1.627.2.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.615 2012/04/10 09:49:36 foxr Exp $
+# $Id: lonprintout.pm,v 1.627.2.16 2016/08/06 20:52:43 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(strftime);
 use Apache::lonlocal;
 use Carp;
 use LONCAPA;
@@ -77,6 +75,58 @@ my $font_size = 'normalsize';	# Default
 
 #----------------------------  Helper helpers. -------------------------
 
+## 
+# Filter function to determine if a resource is a printable sequence.
+#
+# @param $res -Resource to check.
+#
+# @return 1 - printable and a resource
+#         0 - either notm a sequence or not printable.
+#
+sub printable_sequence {
+    my $res = shift;
+
+    # Non-sequences are not listed:
+
+    if (!$res->is_sequence()) {
+	return 0;
+    }
+
+    # Person with pav or pfo can always print:
+
+    if ($perm{'pav'} || $perm{'pfo'}) {
+	return 1;
+    }
+
+    if ($res->is_sequence()) {
+	my $symb = $res->symb();
+	my $navmap   = $res->{NAV_MAP};
+
+	# Find the first resource in the map:
+
+	my $iterator = $navmap->getIterator($res, undef, undef, 1, 1);
+	my $first    = $iterator->next();
+
+	while (1) {
+	    if ($first == $iterator->END_ITERATOR) { last; }
+	    if (ref($first) && ! $first->is_sequence()) {last; }
+	    $first = $iterator->next();
+	}
+
+
+	# Might be an empty map:
+
+	if (!ref($first)) {
+	    return 0;
+	}
+	my $partsref = $first->parts();
+	my @parts    = @$partsref;
+	my ($open, $close) = $navmap->map_printdates($first, $parts[0]);
+	return &printable($open, $close);
+    }
+    return 0;
+}
+
 # BZ5209:
 #    Create the states needed to run the helper for incomplete problems from
 #    the current folder for selected students.
@@ -97,8 +147,7 @@ my $font_size = 'normalsize';	# Default
 # Return:
 #     XML that can be parsed by the helper to drive the state machine.
 #
-sub create_incomplete_folder_selstud_helper($helper)
-{
+sub create_incomplete_folder_selstud_helper {
     my ($helper, $map)  = @_;
 
 
@@ -435,6 +484,83 @@ RESOURCE_SELECTOR
 
 #-----------------------------------------------------------------------
 
+# Computes an open and close date from a list of open/close dates for a resource's
+# parts.
+#
+# @param \@opens - reference to an array of open dates.
+# @param \@closes - reference to an array of close dates.
+#
+# @return ($open, $close) 
+#
+# @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.
+#
+sub compute_open_window {
+    my ($opensref, $closesref) = @_;
+
+    my @opens   = @$opensref;
+    my @closes  = @$closesref;
+
+    # latest open date:
+    my $latest_open;
+
+    foreach my $open (@opens) {
+	if (!defined($latest_open) || ($open > $latest_open)) {
+	    $latest_open = $open;
+	}
+    }
+    # Earliest close:
+
+    my $earliest_close;
+    foreach my $close (@closes) {
+	if (!defined($earliest_close) || ($close < $earliest_close)) {
+	    $earliest_close = $close;
+	}
+    }
+
+    # If no overlap...both are -1 as promised.
+
+    if (($earliest_close ne '') && ($latest_open ne '')
+	 && ($earliest_close < $latest_open)) {
+	$latest_open  = -1;
+	$earliest_close = -1;
+    }
+    
+    return ($latest_open, $earliest_close);
+  
+}
+
+##
+#  Determines if 'now' is within the set of printable dates.
+#
+#  @param $open_date - Starting date/timestamp.
+#  @param $close_date - Ending date/timestamp.
+#
+#  @return 0 - Not open.
+#  @return 1 - open.
+#
+sub printable {
+    my ($open_date, $close_date) = @_;
+
+
+    my $now = time();
+
+    # Have to do a bit of fancy footwork around undefined open/close dates:
+
+    if ($open_date && ($open_date > $now)) {
+	return 0;
+    }
+
+    if ($close_date && ($close_date < $now)) {
+	return 0;
+    }
+    
+    return 1;
+
+}
+
 ##
 # Returns the innermost print start/print end dates for a resource.
 # This is done by looking at the start/end dates for its parts and choosing
@@ -444,34 +570,109 @@ RESOURCE_SELECTOR
 #
 # @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;
     my $partsref = $res->parts();
-    my @parts   = @$partsref;
+    my @parts;
+    if (ref($partsref) eq 'ARRAY') {
+        @parts   = @{$partsref};
+    }
     my $open_date;
     my $close_date;
+    my @open_dates;
+    my @close_dates;
+
 
-    if (defined(@parts) && (scalar(@parts) > 0)) {
+    if (@parts) {
 	foreach my $part (@parts) {
 	    my $partopen  = $res->parmval('printstartdate', $part);
 	    my $partclose = $res->parmval('printenddate',  $part);
-	    
-	    $open_date  = POSIX::strftime('%D', localtime($partopen));
-	    $close_date = POSIX::strftime('%D', localtime($partclose));
-	    
-	    # TODO: Complete this function and use it to tailor the
-	    #       can't print current resource message.
-	    #
-	    
+            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);
 	}
     }
 
+    ($open_date, $close_date)  = &compute_open_window(\@open_dates, \@close_dates);
+
+    return ($open_date, $close_date);
+}
+
+##
+# Get the dates for which a course says a resource can be printed.  This is like
+# get_print_dates but namvaps::course_print_dates are gotten...and not converted
+# to times either.
+#
+# @param $res - Reference to a resource has from lonnvampas::resource.
+#
+# @return (opendate, closedate)
+#
+sub course_print_dates {
+    my $res = shift;
+    my $partsref = $res->parts();
+    my @parts    = @$partsref;
+    my $open_date;
+    my $close_date;
+    my @open_dates;
+    my @close_dates;
+    my $navmap = $res->{NAV_MAP}; # Slightly OO dirty.
+
+    # Don't bother looping over undefined or empty parts arraY;
+
+    if (@parts) {
+	foreach my $part (@parts) {
+	    my ($partopen, $partclose) = $navmap->course_printdates($res, $part);
+	    push(@open_dates, $partopen);
+	    push(@close_dates, $partclose);
+	}
+	($open_date, $close_date) = &compute_open_window(\@open_dates, \@close_dates);
+    }
+    return ($open_date, $close_date);
+}
+##
+# Same as above but for the enclosing map:
+#
+sub map_print_dates {
+    my $res = shift;
+    my $partsref = $res->parts();
+    my @parts    = @$partsref;
+    my $open_date;
+    my $close_date;
+    my @open_dates;
+    my @close_dates;
+    my $navmap = $res->{NAV_MAP}; # slightly OO dirty.
+
+
+    # Don't bother looping over undefined or empty parts arraY;
+
+    if (@parts) {
+	foreach my $part (@parts) {
+	    my ($partopen, $partclose) = $navmap->map_printdates($res, $part);
+	    push(@open_dates, $partopen);
+	    push(@close_dates, $partclose);
+	}
+	($open_date, $close_date) = &compute_open_window(\@open_dates, \@close_dates);
+    }
     return ($open_date, $close_date);
 }
 
@@ -500,19 +701,25 @@ 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:
-#   $helper - The helper we need $helper->{'VARS'}->{'symb'}
-#            to construct the navmap and the iteration.
-#   $seq   - The original set of resources to print 
+#   $map - The URL of the folder being printed.
+#          Used to determine which startResource and finishResource
+#          to use when using the navmap's getIterator method.
+#   $seq   - The original set of resources to print.
 #            (really an array of resource names (array of symb's).
 #   $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:
 #   $
@@ -521,53 +728,58 @@ sub incomplete {
 #   print_resources.
 # 
 sub master_seq_to_person_seq {
-    my ($helper, $seq, $who) = @_;
+    my ($map, $seq, $who, $code, $nohidemap) = @_;
 
 
     my ($username, $userdomain, $usersection) = split(/:/, $who);
 
-
     # Toss the sequence up into a hash so that we have O(1) lookup time.
     # on the items that come out of the user's list of resources.
     #
-    
+
     my %seq_hash = map {$_  => 1} @$seq;
     my @output_seq;
+
+    my $unhidden;
+    if ($nohidemap) {
+        $unhidden = &Apache::lonnet::clutter($map);
+    }
     
-    my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
-    my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain);
-    my $iterator         = $navmap->getIterator($navmap->firstResource(),
-						$navmap->finishResource(),
-						{}, 1);
-    my %nonResourceItems = (
-	$iterator->BEGIN_MAP    => 1,
-	$iterator->BEGIN_BRANCH => 1,
-	$iterator->END_BRANCH   => 1,
-	$iterator->END_MAP      => 1,
-	$iterator->FORWARD      => 1,
-	$iterator->BACKWARD     => 1
+    my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,
+                                                           $code,$unhidden);
+    my ($start,$finish);
+
+    if ($map) {
+        my $mapres = $navmap->getResourceByUrl($map);
+        if ($mapres->is_map()) {
+            $start = $mapres->map_start();
+            $finish = $mapres->map_finish();
+        }
+    }
+    unless ($start && $finish) {
+        $start = $navmap->firstResource();
+        $finish = $navmap->finishResource();
+    }
 
-    );		# These items are not resources but appear in the midst of iteration.
+    my $iterator         = $navmap->getIterator($start,$finish,{},1);
 
     #  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 (! exists $nonResourceItems{$curres} && ! $curres->randomout()) {
-	    my $symb = $curres->symb();
-	    if (exists $seq_hash{$symb}) {
-		push(@output_seq, $symb);
+
+        if (ref($curres) && ! $curres->randomout()) {
+            my $currsymb = $curres->symb();
+            if (exists($seq_hash{$currsymb})) {
+                push(@output_seq, $currsymb);
 	    }
 	}
     }
-   				
 
     return \@output_seq;		# for now.
     
@@ -847,12 +1059,12 @@ sub printf_style_subst {
 #     %s    - The section if it is supplied.
 #
 sub format_page_header {
-    my ($width, $format, $assignment, $course, $student, $section) = @_;
+    my ($width, $format, $assignment, $course, $student) = @_;
 
 
 
     $width = &recalcto_mm($width); # Get width in mm.
-    my $chars_per_line = int($width/1.6);   # Character/textline.
+    my $chars_per_line = int($width/2);   # Character/textline.
 
     #  Default format?
 
@@ -868,40 +1080,44 @@ 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);
+        }
 
-	my $name_length    = int($chars_per_line *3 /4);
-	my $sec_length     = int($chars_per_line / 5);
+        $format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
 
-	$format  = "%$name_length".'n';
+    } 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!!!
 
-	if ($section) {
-	    $format .=  ' - Sec: '."%$sec_length".'s';
-	}
+    }
 
-	$format .= '\\\\%c \\\\ %a';
-        
+    return $format;
 
-    }
-    # 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 ');
+        my $testPrintout = '\\\\'.&mt('Authoring Space').' \\\\'.&mt('Test-Printout ');
         $format =~ s/\\\\\s\\\\\s/$testPrintout/;
     }
     #
@@ -1023,6 +1239,7 @@ sub is_code_valid {
     my ($code_type, $code_length) = ('letter', 6);	# defaults.
     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;
@@ -1039,6 +1256,22 @@ sub is_code_valid {
     }
 
 }
+#
+# Compare two students by section (Used to sort by section).
+#
+#  Implicit inputs, 
+#    $a - The first one
+#    $b - The second one.
+#
+#  Returns:
+#     a-section cmp b-section
+#
+sub compare_sections {
+    my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a);
+    my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b);
+
+    return $s1 cmp $s2;
+}
 
 #   Compare two students by name.  The students are in the form
 #   returned by the helper:
@@ -1615,8 +1848,6 @@ 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;
 }
@@ -1639,6 +1870,7 @@ 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);
@@ -1847,6 +2079,7 @@ sub unsupported {
     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.' ';
@@ -1926,6 +2159,8 @@ sub print_page_in_course {
 	    my @page_resources = $navmap->retrieveResources($resource_src);
 	    $result           .= &print_page_in_course($helper, $rparmhash, 
 						       $resource_src, \@page_resources);
+        } elsif ($resource->ext()) {
+            $result .= &unsupported($currentURL,$mode,$symb);
 	}
 	# these resources go through the XML transformer:
 
@@ -1942,7 +2177,7 @@ sub print_page_in_course {
 
 	    $form{'grade_target'}  = 'tex';
 	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-	    $form{'pdfFormFields'} = $pdfFormFields; # 
+	    $form{'pdfFormFields'} = 'no'; # 
 	    $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};    
 	    
 	    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -1995,7 +2230,7 @@ sub print_page_in_course {
 			$texversion.=&path_to_problem($urlp,$LaTeXwidth);
 		    } else {
 			$texversion.='\vskip 0 mm \noindent\textbf{'.
-                        &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+                        &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
 			$texversion.=&path_to_problem($urlp,$LaTeXwidth);
 		    }
 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
@@ -2392,6 +2627,7 @@ sub print_construction_sequence {
 #  For item 100, filtering was done at the helper level.
 
 sub output_data {
+
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
     $ssi_error = 0;		# This will be set nonzero by failing ssi's.
@@ -2477,7 +2713,7 @@ ENDPART
     my %form;
     $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-    $form{'pdfFormFields'} = $pdfFormFields;
+    $form{'pdfFormFields'} = 'no';
 
     # If form.showallfoils is set, then request all foils be shown:
     # privilege will be enforced both by not allowing the 
@@ -2575,7 +2811,7 @@ ENDPART
 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    } else {
 			$texversion.='\vskip 0 mm \noindent\textbf{'.
-                        &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+                        &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
 
 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    }
@@ -2665,7 +2901,6 @@ ENDPART
 	     ($print_type eq 'select_sequences')      or
 	     ($print_type eq 'map_incomplete_problems_seq')
 	     ) {
-
  
         #-- produce an output string
 	if (($print_type eq 'map_problems')                or
@@ -2701,7 +2936,6 @@ ENDPART
 
 	&Apache::lonxml::clear_problem_counter();
 
-	my $pbreakresources = keys %page_breaks;
 	for (my $i=0;$i<=$#master_seq;$i++) {
 
 	    &Apache::lonenc::reset_enc();
@@ -2802,13 +3036,13 @@ 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,
 							  $assignment, 
 							  $courseidinfo, 
 							  $name);
-
 		    if ($numberofcolumns eq '1') {
 			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
 		    } else {
@@ -2909,6 +3143,8 @@ ENDPART
 	 if (($helper->{'VARS'}->{'student_sort'}    eq 1)  && 
 	     ($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) {
 	     @students = sort compare_names  @students;
+	 } else {
+	     @students = sort compare_sections @students; 
 	 }
 	 &adjust_number_to_print($helper);
 
@@ -2927,6 +3163,12 @@ ENDPART
 	 }
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 
+         my $map;
+         if ($helper->{VARS}->{'symb'}) {
+             ($map, my $id, my $resource) =
+                 &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
+         }
+
 	 #loop over students
 
  	 my $flag_latex_header_remove = 'NO';
@@ -2945,6 +3187,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) {
@@ -2961,7 +3207,8 @@ ENDPART
 	     } else {
 		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
 	     }
-	     my $actual_seq = master_seq_to_person_seq($helper, \@master_seq, $person);
+	     my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
+                                                       $person, undef, $nohidemap);
 	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
 						     $person,$type,
 						     \%moreenv,  $actual_seq,
@@ -2987,7 +3234,6 @@ ENDPART
 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
 	 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::grades::get_scantronformat_file();
 	 my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
@@ -3004,6 +3250,19 @@ ENDPART
                  }
 	     }
 	 }
+         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'};
          $moreenv{'instructor_comments'}='hide';
@@ -3037,6 +3296,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',
 				      {
@@ -3058,6 +3319,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') { 
@@ -3065,9 +3330,17 @@ ENDPART
 	     } else {
 		 $moreenv{'CODE'}=&num_to_letters($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,
-				  \@master_seq,$flag_latex_header_remove,
+				  $actual_seq,$flag_latex_header_remove,
 				  $LaTeXwidth);
 	     $resources_printed .= ":";
 	     $print_array[$file_num].=$output;
@@ -3120,7 +3393,7 @@ ENDPART
 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
 			} else {
 			    $texversion.='\vskip 0 mm \noindent\textbf{'.
-                                         &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+                                         &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
 			}
 			$texversion.='\vskip 1 mm '.$answer.'\end{document}';
@@ -3171,13 +3444,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:
@@ -3318,6 +3594,7 @@ sub print_resources {
     my $fullname = &get_name($username,$userdomain);
     my $namepostfix = "\\\\";	# Both anon and not anon should get the same vspace.
 
+
     #
     # Figure out if we need to filter the output by
     # the incomplete problems for that person
@@ -3356,6 +3633,13 @@ sub print_resources {
     #
 
     my $syllabus_first = 0;
+    my $current_assignment = "";
+    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}) {
 	    if($i != 0) {
@@ -3364,13 +3648,17 @@ sub print_resources {
 	}
 	$current_output .= &get_extra_vspaces($helper, $curresline);
 	$i++;
+	my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
+
+	# See if we need to emit a new header:
+
 	if ( !($type eq 'problems' && 
 	       ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
-	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
 		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)$/) {
@@ -3470,6 +3758,19 @@ sub print_resources {
 	    }
 	    $remove_latex_header = 'YES';
 	}
+	$assignment = &Apache::lonxml::latex_special_symbols(
+	    &Apache::lonnet::gettitle($map), 'header');
+	if (($assignment ne $current_assignment) && ($assignment ne "")) {
+	    my $header_line = &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+						  $assignment, $courseidinfo, 
+						  $fullname);
+	    my $header_start = ($columns_in_format == 1) ? '\lhead'
+		: '\fancyhead[LO]';
+	    $header_line = $header_start.'{'.$header_line.'}';
+	    $current_output = $current_output . $header_line;
+	    $current_assignment = $assignment;
+	}
+
 	if (&Apache::loncommon::connection_aborted($r)) { last; }
     }
     # If we are printing incomplete it's possible we don't have
@@ -3479,7 +3780,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 {
@@ -3490,24 +3808,23 @@ sub print_resources {
     if ($syllabus_first) {
         $current_output =~ s/\\\\ Last updated:/Last updated:/
     }
-    my $courseidinfo = &get_course();
     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.'}';
+        &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+                            $currentassignment, $courseidinfo, $fullname);
+    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$newheader$namepostfix}\\vskip 5 mm /;
     } else {
 	my $blankpages = 
 	    '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
-	    
+	
 	$current_output = '\strut\vspace*{-6 mm}\\newline'.
 	    &copyright_line().' \newpage '.$blankpages.$end_of_student.
 	    '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
-	    $header_line.$namepostfix.'} \vskip 5 mm '.$current_output;
+	    $newheader.$namepostfix. '} \vskip 5 mm '.$current_output;
     }
     #
     #  Close the student bracketing.
@@ -3556,7 +3873,6 @@ sub handler {
     }
     
     &init_perm();
-
     my $helper = printHelper($r);
     if (!ref($helper)) {
 	return $helper;
@@ -3756,6 +4072,10 @@ sub printHelper {
     my $userCanPrint = ($perm{'pav'} || $perm{'pfo'});
     my $res_printstartdate;
     my $res_printenddate;
+    my $map_open = 0;
+    my $map_close = 0xffffffff;
+    my $course_open = 0;
+    my $course_close = 0xffffffff;
 
     # Get the resource name from construction space
     if ($helper->{VARS}->{'construction'}) {
@@ -3772,8 +4092,11 @@ 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);
+
 	} else {
 	    # Resource space.
 
@@ -3792,6 +4115,7 @@ sub printHelper {
     if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
 	$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
     }
+
     if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
 	$helper->{VARS}->{'probstatus'}=$env{'form.problemstatus'};
     }
@@ -3848,13 +4172,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' />"
 	    ;
 	    
@@ -3927,7 +4251,7 @@ sub printHelper {
 	my $nextState     = 'CHOOSE_INCOMPLETE_SEQ';
 	my $textSuffix    = '';
 
-	if ($userCanPrint) {
+	if ($userCanPrint)  {
 	    $printSelector = 'map_incomplete_problems_people_seq';
 	    $nextState     = 'CHOOSE_INCOMPLETE_PEOPLE_SEQ';
 	    $textSuffix    = ' for selected students';
@@ -3935,51 +4259,59 @@ sub printHelper {
 		&create_incomplete_folder_selstud_helper($helper, $map); 
 	    &Apache::lonxml::xmlparse($r, 'helper', $helperStates);
 	} else {
-	    my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.
-	    &Apache::lonxml::xmlparse($r, 'helper', $helperStates);
+	    if (&printable($map_open, $map_close)) {
+		my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.
+		&Apache::lonxml::xmlparse($r, 'helper', $helperStates);
+	    } else {
+		# TODO: Figure out how to break the news...this folder is not printable.
+	    }
 	}
 
-	push(@{$printChoices},
-	     [&mt('Selected  [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
-		  '<b>', '</b>',
-		  '<b><i>'. $sequenceTitle . '</b></i>'),
-	      $printSelector,
-	      $nextState]);
-
+	if ($userCanPrint || &printable($map_open, $map_close)) {
+	    push(@{$printChoices},
+		 [&mt('Selected  [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
+		      '<b>', '</b>',
+		      '<b><i>'. $sequenceTitle . '</b></i>'),
+		  $printSelector,
+		  $nextState]);
+	}
         # Allow problems from sequence
-        push @{$printChoices}, 
+	if ($userCanPrint || &printable($map_open, $map_close)) {
+	    push @{$printChoices}, 
 	    [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 
 	     'map_problems', 
 	     'CHOOSE_PROBLEMS'];
-        # Allow all resources from sequence
-        push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 
-				'map_problems_pages', 
-				'CHOOSE_PROBLEMS_HTML'];
-        my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
-							'Select Problem(s) to print',
-							'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-							'RESOURCES',
-							'PAGESIZE',
-							$map,
-							$isProblem, '',
-							$symbFilter,
-							$start_new_option);
-	$helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
-						      'Select Resource(s) to print',
-						      	'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-						      'RESOURCES',
-						      'PAGESIZE',
-						      $map,
-						      $isNotMap, '',
-						      $symbFilter,
-						      $start_new_option);
-
-	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+	    # Allow all resources from sequence
+	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 
+				    'map_problems_pages', 
+				    'CHOOSE_PROBLEMS_HTML'];
+	    my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
+							    'Select Problem(s) to print',
+							    'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+							    'RESOURCES',
+							    'PAGESIZE',
+							    $map,
+							    $isProblem, '',
+							    $symbFilter,
+							    $start_new_option);
+	    $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
+							  'Select Resource(s) to print',
+							  'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+							  'RESOURCES',
+							  'PAGESIZE',
+							  $map,
+							  $isNotMap, '',
+							  $symbFilter,
+							  $start_new_option);
+	    
+	    &Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+	} else {
+	    # TODO: Figure out how to tell them the folder is not printable.
+	}
     }
-
-    # If the user has pfo (print for others) allow them to print all 
-    # problems and resources  in the entire course, optionally for selected students
-    my $post_data = $helper->{VARS}->{'postdata'};
+	# If the user has pfo (print for others) allow them to print all 
+	# problems and resources  in the entire course, optionally for selected students
+	my $post_data = $helper->{VARS}->{'postdata'};
     
     if ($perm{'pfo'} &&  !$is_published  &&
         ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
@@ -4011,7 +4343,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',
@@ -4342,7 +4674,7 @@ CHOOSE_FROM_SUBDIR
     <message>Select the sequence to print resources from:</message>
     <resource variable="SEQUENCE">
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
-      <filterfunc>return \$res->is_sequence;</filterfunc>
+      <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
       <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
 	</choicefunc>
@@ -4365,11 +4697,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} = 
-	    &mt('<p><b>Printing for current resource is only possible between [_1] and [_1]</b></p>',
-	    $res_printstartdate, $res_printenddate);
-	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();
@@ -4711,9 +5065,6 @@ 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.='<h3>'.&mt('Layout Options').'</h3>'
@@ -4722,7 +5073,6 @@ 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>'
@@ -4763,12 +5113,6 @@ 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();