--- loncom/homework/structuretags.pm 2001/01/05 20:05:26 1.27
+++ loncom/homework/structuretags.pm 2001/01/08 13:55:08 1.29
@@ -65,7 +65,7 @@ sub start_problem {
if ($status eq 'CAN_ANSWER') {
# create a page header and exit
return "
$name\n\n\n";
- } elsif ($status eq 'SHOW_ANSWER') {
+ } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
$result.="\n";
}
}
@@ -231,16 +232,20 @@ 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') {
+ if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+ $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
&Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
}
}