--- loncom/homework/structuretags.pm	2002/03/29 18:32:46	1.87
+++ loncom/homework/structuretags.pm	2002/08/23 21:17:16	1.105
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.87 2002/03/29 18:32:46 albertel Exp $
+# $Id: structuretags.pm,v 1.105 2002/08/23 21:17:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ package Apache::structuretags;
 
 use strict;
 use Apache::lonnet;
+use Apache::File();
 
 BEGIN {
   &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
@@ -56,7 +57,7 @@ sub start_tex {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
   if ($target eq 'tex') {
-    return $bodytext
+      return $bodytext.' ';
   }
   return '';
 }
@@ -100,7 +101,68 @@ sub page_start {
     }
     $body_tag_start.='>';
   }
-  return ($result,$head_tag_start,$body_tag_start);
+  my $form_tag_start;
+  if (!defined($found{'form'})) {
+    $form_tag_start='<form name="lonhomework" method="POST" action="'.
+      $ENV{'request.uri'}.'">';
+  }
+  return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
+}
+
+sub get_resource_name {
+  my ($parstack,$safeeval)=@_;
+  my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
+  if ($name eq '') { 
+    $name=&Apache::lonnet::EXT('resource.title');
+    if ($name eq 'con_lost') { $name = ''; }
+  }
+  $Apache::lonhomework::name=$name;
+  return $name;
+}
+
+sub setup_rndseed {
+  my ($safeeval)=@_;
+  my $rndseed;
+  if ($ENV{'request.state'} eq "construct") {
+    $rndseed=$ENV{'form.rndseed'};
+    if (!$rndseed) {
+      $rndseed=time;
+      $ENV{'form.rndseed'}=$rndseed;
+    }
+    &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
+  }
+  return $rndseed;
+}
+
+sub problem_edit_header {
+  return '<input type="hidden" name="submitted" value="edit" />
+       <input type="hidden" name="problemmode" value="Edit" />
+       <input type="submit" name="problemmode" value="Discard Edits and View" />
+       <input type="submit" name="problemmode" value="EditXML" />
+       <input type="submit" name="Undo" value="undo" /> <hr />
+       <input type="submit" name="submit" value="Submit Changes" />
+       <input type="submit" name="submit" value="Submit Changes and View" /><br />
+      ';
+}
+
+sub problem_edit_footer {
+  return '<br /><input type="submit" name="submit" value="Submit Changes and Edit" />
+    <input type="submit" name="submit" value="Submit Changes and View" />';
+}
+
+sub problem_web_to_edit_header {
+  my ($rndseed)=@_;
+  my $result.='<input type="hidden" name="problemmode" value="View" />
+             <input type="submit" name="problemmode" value="Edit" />
+             <input type="submit" name="problemmode" value="EditXML" />
+             Random Seed:<input type="text" name="rndseed" width="10" value="'.
+	       $rndseed.'" />
+             <input type="submit" name="changerandseed" value="Change" />
+             <input type="submit" name="resetdata" value="Reset Submissions" />
+             <input type="checkbox" name="showallfoils" ';
+  if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
+  $result.= ' /> Show All Foils
+             <hr />';
 }
 
 sub initialize_storage {
@@ -150,11 +212,10 @@ permanent record is left in the system.<
 <font color=red>
 Checking out resources is subject to course policies, and may exclude future
 credit even if done erroneously.<p />
-</font>  
-<form method=post>
-<input type=button name="doescheckout" 
-value="Check out Exam for Viewing" 
-onClick="if (confirm('Check out Exam?')) { this.form.submit(); }" />
+</font>
+<form name="checkout" method="POST" action="$ENV{'request.uri'}">
+<input type="hidden" name="doescheckout" value="yes" />
+<input type="button" name="checkoutbutton" value="Check out Exam for Viewing" onClick="javascript:if (confirm('Check out Exam?')) { document.checkout.submit(); }" />
 </form>
 ENDCHECKOUT
 }
@@ -200,11 +261,11 @@ sub start_problem {
   my $accessmsg;
 
   #should get back a <html> or the neccesary stuff to start XML/MathML
-  my ($result,$head_tag_start,$body_tag_start)=
+  my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+  if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
 
-
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     #handle exam checkout
     if ($Apache::lonhomework::type eq 'exam') {
       my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
@@ -216,15 +277,7 @@ sub start_problem {
     }
 
     #handle rand seed in construction space
-    my $rndseed;
-    if ($ENV{'request.state'} eq "construct") {
-      $rndseed=$ENV{'form.rndseed'};
-      if (!$rndseed) {
-	$rndseed=time;
-	$ENV{'form.rndseed'}=$rndseed;
-      }
-      &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
-    }
+    my $rndseed=&setup_rndseed($safeeval);
     ($status,$accessmsg) = &Apache::lonhomework::check_access('0');
     push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';
@@ -246,28 +299,14 @@ sub start_problem {
 	$result.=$msg.'<br />';
       }
     } elsif ($target eq 'web') {
-      my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
-      if ($name eq '') { 
-	$name=&Apache::lonnet::EXT('resource.title');
-	if ($name eq 'con_lost') { $name = ''; }
-      }
-      $Apache::lonhomework::name=$name;
+      my $name= &get_resource_name($parstack,$safeeval);
       if ($status eq 'CAN_ANSWER') {
 	# create a page header and exit
-	$result.="$head_tag_start<title>$name</title></head>\n
-              $body_tag_start\n
-              <form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".
+	$result.="$head_tag_start<title>$name</title></head>
+              $body_tag_start \n $form_tag_start".	
 		'<input type="hidden" name="submitted" value="yes" />';
 	if ($ENV{'request.state'} eq "construct") {
-	  $result.=
-	    '<input type="hidden" name="problemmode" value="View" />
-             <input type="submit" name="problemmode" value="Edit" />
-             <input type="submit" name="problemmode" value="EditXML" />
-             Random Seed:<input type="text" name="rndseed" width="10" value="'.
-	       $rndseed.'" />
-             <input type="submit" name="changerandseed" value="Change" />
-             <input type="submit" name="resetdata" value="Reset Submissions" />
-             <hr />';
+	  $result.= &problem_web_to_edit_header($rndseed);
 	}
 	# if we are viewing someone else preserve that info
 	if (defined $ENV{'form.grade_symb'}) {
@@ -281,25 +320,54 @@ sub start_problem {
 	$result.=$head_tag_start.
 	  "<title>$name</title></head>\n$body_tag_start\n";
       }
+    } elsif ($target eq 'tex') {
+	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+	if ($name eq '') { 
+	    $name=&Apache::lonnet::EXT('resource.title');
+	    if ($name eq 'con_lost') { $name = ''; }
+	}
+	$Apache::lonhomework::name=$name;
+	my $id = $Apache::inputtags::part;
+	my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
+	$duedate = POSIX::strftime("%c",localtime($duedate));
+	my $temp_file;
+	my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
+        if (-e $filename) {
+	    $temp_file = Apache::File->new($filename); 
+	} else {
+	    $temp_file = Apache::File->new('>>'.$filename); 
+	}
+	my @due_file_content = <$temp_file>;
+	my $due_file_content = $due_file_content[$#due_file_content];
+        chomp $due_file_content;
+        if ($due_file_content ne $duedate) {	    
+	$temp_file = Apache::File->new('>'.$filename); 
+	    print $temp_file "$duedate\n";	    
+	    if (not $ENV{'request.symb'} =~ m/\.page_/) {
+		if(not $duedate=~m/1969/) {
+		    $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm';	
+		} else {
+		    $result .= '\begin{document} \noindent \vskip 1 mm';
+		}
+	    } else {
+		$result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
+	    } 
+	} else {
+	    if (not $ENV{'request.symb'} =~ m/\.page_/) {
+		$result .= '\begin{document} \noindent \vskip 1 mm';	
+	    } else {
+		$result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\';
+	    } 
+	}
     }
   } elsif ($target eq 'edit') {
-    $result.=$head_tag_start."</head>".$body_tag_start.
-      '<form name="lonhomework" method="POST" action="'.
-	$ENV{'request.uri'}.'">
-       <input type="hidden" name="submitted" value="edit" />
-       <input type="hidden" name="problemmode" value="Edit" />
-       <input type="submit" name="problemmode" value="View" />
-       <input type="submit" name="problemmode" value="EditXML" />
-       <input type="submit" name="Undo" value="undo" /> <hr />
-       <input type="submit" name="submit" value="Submit Changes" /><br />
-      ';
+    $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
+      &problem_edit_header();
     my $temp=&Apache::edit::insertlist($target,$token);
     $result.=$temp;
   } elsif ($target eq 'modified') {
     $result=$token->[4];
     $result.=&Apache::edit::handle_insert();
-  } elsif ($target eq 'tex') {
-      $result .= '\begin{document} ';
   } else {
     # page_start returned a starting result, delete it if we don't need it
     $result = '';
@@ -315,7 +383,8 @@ sub end_problem {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
       # if part is zero, no <part>s existed, so we need to the grading
       &Apache::inputtags::grade;
-    } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') {
+    } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0' && 
+	      $status ne 'UNCHECKEDOUT') {
       # if part is zero, no <part>s existed, so we need show the current 
       # grading status
       $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);
@@ -326,7 +395,8 @@ sub end_problem {
        ) {
       if ($status eq 'CAN_ANSWER') {
 	$result.="</form></body>\n"; 
-      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
+      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
+	       $status eq 'UNCHECKEDOUT' ) {
 	$result.="</body>\n";
       }
       $result.=&Apache::lonxml::xmlend();
@@ -341,42 +411,48 @@ sub end_problem {
     }
   } elsif ($target eq 'edit') {
     &Apache::lonxml::debug("in end_problem with $target, edit");
-    $result='<br /><input type="submit" name="submit" value="Submit Changes" />';
+    $result = &problem_edit_footer();
   } elsif ($target eq 'tex') {
-      $result .= '\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}';
+      $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+      if (not $ENV{'request.symb'} =~ m/\.page_/) {
+	  $result .= '\end{document} ';
+      } else {
+	  $result .= '} ';
+      }
   }
   return $result;
 }
 
 sub start_library {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my ($result,$head_tag_start,$body_tag_start)=
+  my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
   if ($target eq 'edit') {
-    $result.=$head_tag_start."</head>".$body_tag_start.
-      '<form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">
-       <input type="hidden" name="submitted" value="edit" />
-       <input type="hidden" name="problemmode" value="Edit" />
-       <input type="submit" name="problemmode" value="View" />
-       <input type="submit" name="Undo" value="undo" /> <hr />
-      ';
+    $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
+      &problem_edit_header();
     my $temp=&Apache::edit::insertlist($target,$token);
     $result.=$temp;
-    return $result;
-  }
-  if ($target eq 'modified') {
+  } elsif ($target eq 'modified') {
     $result=$token->[4];
     $result.=&Apache::edit::handle_insert();
-    return $result;
+  } elsif ($target eq 'web' && $ENV{'request.state'} eq "construct" ) {
+    my $name=&get_resource_name($parstack,$safeeval);
+    my $rndseed=&setup_rndseed($safeeval);
+    $result.="$head_tag_start<title>$name</title></head>
+              $body_tag_start \n $form_tag_start".	
+		'<input type="hidden" name="submitted" value="yes" />';
+    $result.=&problem_web_to_edit_header($rndseed);
   }
-  return '';
+  return $result;
 }
 
 sub end_library {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';
   if ($target eq 'edit') {
-    $result='<br /><input type="submit" name="submit" value="Submit Changes" />';
+    $result=&problem_edit_footer();
+  } elsif ($target eq 'web' && $ENV{'request.state'} eq "construct") {
+    $result.='</form></body>'.&Apache::lonxml::xmlend();
   }
   return $result;
 }
@@ -511,6 +587,7 @@ sub end_randomlist {
 
 sub start_part {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  my $result='';
   my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
   if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   $Apache::inputtags::part=$id;
@@ -518,7 +595,7 @@ sub start_part {
   @Apache::inputtags::previous=();
   if ($target eq 'meta') {
     return &Apache::response::mandatory_part_meta;
-  } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+  } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
     push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';
@@ -527,11 +604,17 @@ sub start_part {
     if ( $status eq 'CLOSED' ) {
       my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
       if ( $target eq "web" ) {
-	return "<br />Part is not open to be viewed. It $accessmsg<br />";
+	$result="<br />Part is not open to be viewed. It $accessmsg<br />";
+      } elsif ( $target eq 'tex' ) {
+	$result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
+      }
+    } else {
+      if ($target eq 'tex') {
+	$result='\vskip 0 mm';
       }
     }
   }
-  return '';
+  return $result;
 }
 
 sub end_part {
@@ -570,6 +653,8 @@ sub start_postanswerdate {
     if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
       &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
     }
+  } elsif ($target eq 'tex') {
+      return '\vskip 0 mm \noindent';
   }
   return '';
 }