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

[sakharuk]

sakharuk		Mon Sep 20 11:57:11 2004 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
    /loncom/homework	structuretags.pm 
  Log:
  Bug 3450 (Instrutor  comment gets printed! should only be seen by instructor) is fixed. You can print assignments for the selected students without instructor comments now.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.329 loncom/interface/lonprintout.pm:1.330
--- loncom/interface/lonprintout.pm:1.329	Tue Aug 31 09:41:54 2004
+++ loncom/interface/lonprintout.pm	Mon Sep 20 11:57:11 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.329 2004/08/31 13:41:54 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.330 2004/09/20 15:57:11 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1067,6 +1067,7 @@
 	 #loop over students
 	 my $flag_latex_header_remove = 'NO'; 
 	 my %moreenv;
+         $moreenv{'instructor_comments'}='hide';
 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
 	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.268 loncom/homework/structuretags.pm:1.269
--- loncom/homework/structuretags.pm:1.268	Sat Sep 18 13:29:29 2004
+++ loncom/homework/structuretags.pm	Mon Sep 20 11:57:11 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.268 2004/09/18 17:29:29 albertel Exp $
+# $Id: structuretags.pm,v 1.269 2004/09/20 15:57:11 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -882,7 +882,7 @@
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
         $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
-	if ( ! $result ) {
+	if ( (! $result) or ($ENV{'form.instructor_comments'} eq 'hide')) {
 	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
 						   $parser,$style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");