--- loncom/interface/lonprintout.pm	2003/06/19 15:04:30	1.190
+++ loncom/interface/lonprintout.pm	2003/06/23 19:22:00	1.193
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.190 2003/06/19 15:04:30 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.193 2003/06/23 19:22:00 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -583,9 +583,14 @@ ENDPART
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { 
         #-- produce an output string
+	my %form=();	   
+	$form{'grade_target'}='tex';
+	$form{'textwidth'}=$LaTeXwidth;
+	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 	my $flag_latex_header_remove = 'NO';
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+	my $prevassignment='';
 	for (my $i=0;$i<=$#master_seq;$i++) {
 	    $master_seq[$i]=~/___\d+___(.*)$/;
 	    my $urlp='/res/'.$1;
@@ -596,11 +601,9 @@ ENDPART
 	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
 		$selectionmade = 4;
 	    }
-	    my %form;	   
-	    $form{'grade_target'}='tex';
-	    $form{'textwidth'}=$LaTeXwidth;
 	    $form{'symb'}=$master_seq[$i];
-            $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+	    $master_seq[$i]=~/\/([^\/]+)\.sequence_/;
+	    my $assignment=' '.$1.' ';
 	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
 	    my $texversion=&Apache::lonnet::ssi($urlp,%form);
 	    if ($urlp=~/\.page$/) {
@@ -621,7 +624,18 @@ ENDPART
 		my $answer=&Apache::lonnet::ssi($urlp,%form);
 		$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 	    }
-	    $result .= $texversion;         
+#	    $result .= $texversion;
+	    if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>1)) {
+		my $name = &get_name();
+		if ($name =~ /^\s*$/) {
+		    $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
+								 undef,'header');
+		}
+		my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
+		$prevassignment=$assignment;
+		$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
+	    }
+	    $result .= $texversion;
 	    $flag_latex_header_remove = 'YES';   
 	}
 	&Apache::lonnet::delenv('form.counter');
@@ -658,8 +672,7 @@ ENDPART
 			if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			    my %form;
 			    $form{'answer_output_mode'}='tex';
-			    my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,
-										      $ENV{'request.course.id'},%form);
+			    my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
 			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
 			}
 			$current_output .= $rendered;
@@ -899,6 +912,8 @@ sub printHelper {
         $subdir = &Apache::lonnet::filelocation("", $url);
     }
 
+    my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
+
     Apache::lonhelper::registerHelperTags();
 
     # "Delete everything after the last slash."
@@ -936,18 +951,20 @@ sub printHelper {
         # Allow all resources from sequence
         push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
 
-        my $isProblem = '$res->is_problem();';
+        my $isProblem = '$res->is_problem()';
+	$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
         my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
-        my $isNotMap = '!$res->is_map();';
-        my $symb = '$res->symb();';
+        my $isNotMap = '!$res->is_map()';
+	$isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
+        my $symb = '$res->symb()';
         my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1'>
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isProblem</filterfunc>
+      <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
-      <valuefunc>return $symb</valuefunc>
+      <valuefunc>return $symb;</valuefunc>
       </resource>
     </state>
 
@@ -957,7 +974,7 @@ sub printHelper {
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
-      <valuefunc>return $symb</valuefunc>
+      <valuefunc>return $symb;</valuefunc>
       </resource>
     </state>
 HELPERFRAGMENT
@@ -971,22 +988,23 @@ HELPERFRAGMENT
         push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];
         push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
 
-        my $isProblem = '$res->is_problem();';
-        my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
-        my $symb = '$res->symb();';
+        my $isProblem = '$res->is_problem()';
+	$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
+        my $isProblemOrMap = '($res->is_problem() || $res->is_map())';
+	$isProblemOrMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
+        my $symb = '$res->symb()';
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" suppressEmptySequences='1'>
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isProblemOrMap</filterfunc>
-      <choicefunc>return $isProblem</choicefunc>
-      <valuefunc>return $symb</valuefunc>
+      <filterfunc>return $isProblemOrMap;</filterfunc>
+      <choicefunc>return $isProblem;</choicefunc>
+      <valuefunc>return $symb;</valuefunc>
       </resource>
     </state>
 
   <state name="CHOOSE_STUDENTS" title="Choose Students whose assignments you want to print">
-    <message>(do not forget to select assignment itself - make another selection below) <br /></message>
     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1">
@@ -996,9 +1014,9 @@ HELPERFRAGMENT
       </resource>
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
-      <choice computer='0'>Start each student's assignment on a new page (add a pagefeed after each assignment)</choice>
-      <choice computer='1'>Add one empty page after each student's assignment</choice>
-      <choice computer='2'>Add two empty pages after each student's assignment</choice>
+      <choice computer='0'>Start each student\'s assignment on a new page (add a pagefeed after each assignment)</choice>
+      <choice computer='1'>Add one empty page after each student\'s assignment</choice>
+      <choice computer='2'>Add two empty pages after each student\'s assignment</choice>
       </choices>
     </state>
 CHOOSE_STUDENTS