--- loncom/homework/structuretags.pm	2000/12/29 21:54:06	1.25
+++ loncom/homework/structuretags.pm	2001/01/08 13:55:08	1.29
@@ -54,7 +54,7 @@ sub start_problem {
     if ( $status eq 'CLOSED' ) {
       my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
       if ( $target eq "web" ) {
-	return "<br></br>Problem is not open to be viewed. The problem $datemsg<br></br>";
+	return "<body bgcolor=#FFFFFF> <br></br>Problem is not open to be viewed. The problem $datemsg<br></br>";
       }
     } 
   }
@@ -65,7 +65,7 @@ sub start_problem {
     if ($status eq 'CAN_ANSWER') {
       # create a page header and exit
       return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";
-    } elsif ($status eq 'SHOW_ANSWER') {
+    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {
       return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n";
     }
   }
@@ -77,7 +77,8 @@ sub end_problem {
   my $result='';
   my $status=$Apache::inputtags::status['-1'];
   unless ($target eq 'meta') {
-    if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
+    if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
+       $status eq 'CAN_ANSWER') {
       # if part is zero, no <part>s existed, so we need to the grading
       &Apache::inputtags::grade;
     } elsif ($Apache::inputtags::part eq '0') {
@@ -88,7 +89,7 @@ sub end_problem {
     if ($target eq 'web') { 
       if ($status eq 'CAN_ANSWER') {
 	$result.="</form></body>\n"; 
-      } elsif ($status eq 'SHOW_ANSWER') {
+      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
 	$result.="</body>\n"; 
       } 
     }
@@ -231,17 +232,21 @@ sub start_part {
 sub end_part {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   &Apache::lonxml::debug("in end_part $target ");
+  my $status=$Apache::inputtags::status['-1'];
   pop @Apache::inputtags::status;
   if ( $target eq 'meta' ) { return ''; }
-  if ( $target eq 'grade' ) { return &Apache::inputtags::grade; }
+  if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { 
+    return &Apache::inputtags::grade; 
+  }
   return &Apache::inputtags::gradestatus($Apache::inputtags::part);
 }
 
 sub start_preduedate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ($target ne 'meta') {
-    if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') {
-      &Apache::lonxml::get_all_text("/pre_duedate",$$parser[$#$parser]);
+    if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
+      &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
     }
   }
   return '';
@@ -255,7 +260,7 @@ sub start_postanswerdate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ($target ne 'meta') {
     if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
-      &Apache::lonxml::get_all_text("/post_answerdate",$$parser[$#$parser]);
+      &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
     }
   }
   return '';
@@ -272,7 +277,7 @@ sub start_notsolved {
     &Apache::lonxml::debug("not solved has :$gradestatus:");
     if ($gradestatus =~ /^correct/) {
       &Apache::lonxml::debug("skipping");
-      &Apache::lonxml::get_all_text("/not_solved",$$parser[$#$parser]);
+      &Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]);
     }
   }
   return '';
