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

sakharuk lon-capa-cvs@mail.lon-capa.org
Wed, 23 Jun 2004 17:42:22 -0000


sakharuk		Wed Jun 23 13:42:22 2004 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Bug 2838 (print attached discussions too) is fixed.       
                                                                        
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.308 loncom/interface/lonprintout.pm:1.309
--- loncom/interface/lonprintout.pm:1.308	Mon Jun 14 16:48:26 2004
+++ loncom/interface/lonprintout.pm	Wed Jun 23 13:42:21 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.308 2004/06/14 20:48:26 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.309 2004/06/23 17:42:21 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -770,6 +770,8 @@
 		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+		$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+		if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}
 		if ($helper->{'VARS'}->{'curseed'}) {
 		    $rndseed=$helper->{'VARS'}->{'curseed'};
 		}
@@ -905,6 +907,8 @@
 	$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+	$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+	if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}
 	my $flag_latex_header_remove = 'NO';
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
@@ -1021,6 +1025,8 @@
 	 my $flag_latex_header_remove = 'NO'; 
 	 my %moreenv;
 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
+	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
 	 my $student_counter=-1;
 	 foreach my $person (@students) {
@@ -1847,6 +1853,15 @@
 				     ['Yes', 'yes'] ];
 	    Apache::lonhelper::dropdown->new();
 	    addMessage("</td></tr>");
+	    addMessage("<tr><td align='right'>Print Discussions: </td><td>");
+	    $paramHash = Apache::lonhelper::getParamHash();
+	    $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';   
+	    $helper->declareVar('PRINT_DISCUSSIONS');         
+	    $paramHash->{CHOICES} = [
+				     ['No', 'no'],
+				     ['Yes', 'yes'] ];
+	    Apache::lonhelper::dropdown->new();
+	    addMessage("</td></tr>");
 	}
 
 	if ($helper->{'VARS'}->{'construction'}) {