--- loncom/homework/structuretags.pm	2004/08/13 15:54:06	1.264
+++ loncom/homework/structuretags.pm	2004/09/20 15:57:11	1.269
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.264 2004/08/13 15:54:06 sakharuk Exp $
+# $Id: structuretags.pm,v 1.269 2004/09/20 15:57:11 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,7 +36,7 @@ use Apache::File();
 use Apache::lonmenu;
 use Apache::lonlocal;
 use Apache::lonxml;
-
+use Time::HiRes qw( gettimeofday tv_interval );
 BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
 }
@@ -184,8 +184,16 @@ sub setup_rndseed {
     return $rndseed;
 }
 
+sub remember_problem_state {
+    return '
+       <input type="hidden" name="problemstate" value="'.$ENV{'form.problemstate'}.'" />
+       <input type="hidden" name="problemtype" value="'.$ENV{'form.problemtype'}.'" />
+       <input type="hidden" name="problemstatus" value="'.$ENV{'form.problemstatus'}.'" />';
+}
+
 sub problem_edit_header {
-    return '<input type="hidden" name="submitted" value="edit" />
+    return '<input type="hidden" name="submitted" value="edit" />'.
+	&Apache::structuretags::remember_problem_state().'
        <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
        <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
        <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
@@ -354,12 +362,13 @@ sub init_problem_globals {
     if ($type eq 'problem') {
 	$Apache::inputtags::part='0';
 	@Apache::inputtags::partlist=('0');
-
-	$Apache::lonhomework::problemstatus=&get_problem_status('0')
-    } else {
+	$Apache::lonhomework::problemstatus=&get_problem_status('0');
+	$Apache::lonhomework::ignore_response_errors=0;
+    } elsif ($type eq 'library') {
 	$Apache::inputtags::part='';
 	@Apache::inputtags::partlist=();
 	$Apache::lonhomework::problemstatus='';	
+	$Apache::lonhomework::ignore_response_errors=1;
     }
     @Apache::inputtags::responselist = ();
     @Apache::inputtags::importlist = ();
@@ -395,12 +404,14 @@ sub set_problem_state {
 
 sub get_problem_status {
     my ($part)=@_;
-    my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
-    &Apache::lonxml::debug("problem status for $part is $problem_status");
-    &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+    my $problem_status;
     if ($ENV{'request.state'} eq 'construct' &&
 	defined($ENV{'form.problemstatus'})) {
 	$problem_status=$ENV{'form.problemstatus'};
+    } else {
+	$problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
+	&Apache::lonxml::debug("problem status for $part is $problem_status");
+	&Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
     }
     return $problem_status;
 }
@@ -484,7 +495,16 @@ sub start_problem {
 		    '<input type="submit" name="resetdata"
                              value="'.&mt('New Problem Variation').'" />'.
 		    '<input type="hidden" name="username"
-                             value="'.$ENV{'form.username'}.'" /> <br />';
+                             value="'.$ENV{'form.username'}.'" />';
+	    if ($ENV{'user.adv'}) {
+		$form_tag_start.=
+		    ' <input type="checkbox" name="showallfoils" ';
+		if (defined($ENV{'form.showallfoils'})) {
+		    $form_tag_start.='checked="on"';
+		}
+		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils');
+	    }
+	    $form_tag_start.='<hr />';
 	}
 	($status,$accessmsg) = &Apache::lonhomework::check_access('0');
 	push (@Apache::inputtags::status,$status);
@@ -862,7 +882,7 @@ sub start_instructorcomment {
     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]");
@@ -1149,7 +1169,7 @@ sub end_part {
 	    $gradestatus='';
 	}
 	$result=$gradestatus;
-	if ($$tagstack[-2] eq 'td') {$result.='\end{minipage}';} 
+	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} 
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }