[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[raeburn]

raeburn		Thu Apr 24 15:31:40 2014 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - Modify changes to rev. 1.619 (for bug 6499).
    - Generalize more specific cchanges made in rev. 1.639 and rev. 1.640.
    - Explictly insert header line, so new CODE or Name is shown on first page
      each student's assignment.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.641 loncom/interface/lonprintout.pm:1.642
--- loncom/interface/lonprintout.pm:1.641	Fri Feb 28 19:20:06 2014
+++ loncom/interface/lonprintout.pm	Thu Apr 24 15:31:39 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.641 2014/02/28 19:20:06 bisitz Exp $
+# $Id: lonprintout.pm,v 1.642 2014/04/24 15:31:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3612,7 +3612,6 @@
     #
 
     my $syllabus_first = 0;
-    my $assessment_first = 0;
     my $current_assignment = "";
     my $assignment;
     my $courseidinfo = &get_course();
@@ -3634,9 +3633,6 @@
 	    if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
 		next;
 	    }
-            if ((!$actually_printed) && ($curresline =~ m/$LONCAPA::assess_re/)) {
-                $assessment_first = 1;
-            }
 	    $actually_printed++; # we're going to print one.
 
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
@@ -3771,16 +3767,12 @@
     if ($syllabus_first) {
         $current_output =~ s/\\\\ Last updated:/Last updated:/
     }
-    my $newheader;
-    unless (($assessment_first) && ($actually_printed > 1)) {
-	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]';
-	$newheader = $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$newheader$namepostfix}\\vskip 5 mm /;