--- loncom/homework/structuretags.pm 2000/12/12 22:35:52 1.21
+++ loncom/homework/structuretags.pm 2000/12/19 23:22:22 1.23
@@ -43,28 +43,36 @@ sub start_problem {
#adeed vars to the scripting enviroment
my $expression='$external::part='.$Apache::inputtags::part.';';
&Apache::run::run($expression,$safeeval);
+ my $status;
+ my $datemsg;
if ($target ne 'meta') {
- my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",'0');
- if ( !$passed ) {
+ ($status,$datemsg) = &Apache::lonhomework::check_date('0');
+ push (@Apache::inputtags::status,$status);
+ if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
if ( $target eq "web" ) {
- return "Problem is not open to be viewed. It opens on $date";
+ return "
Problem is not open to be viewed. The problem $datemsg
";
}
- }
+ }
}
if ($target eq 'web') {
- # create a page header and exit
my $args ='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
- return "
$name\n\n\n"; }
+ if ($target eq 'web') {
+ if ($status eq 'CAN_ANSWER') {
+ $result.="\n";
+ } elsif ($status eq 'SHOW_ANSWER') {
+ $result.="\n";
+ }
+ }
} else {
if ($Apache::inputtags::part eq '0') {
$result=&Apache::response::mandatory_part_meta;
@@ -196,11 +210,15 @@ sub start_part {
if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;
} else {
- my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
- if ( !$passed ) {
+ my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
+ push (@Apache::inputtags::status,$status);
+ my $expression='$external::datestatus="'.$status.'";';
+ $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
+ &Apache::run::run($expression,$safeeval);
+ if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
if ( $target eq "web" ) {
- return "Part is not open to be viewed. It opens on $date";
+ return "
Part is not open to be viewed. It $datemsg
";
}
}
}
@@ -210,6 +228,7 @@ sub start_part {
sub end_part {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
&Apache::lonxml::debug("in end_part $target ");
+ pop @Apache::inputtags::status;
if ( $target eq 'meta' ) { return ''; }
if ( $target eq 'grade' ) { return &Apaceh::inputtags::grade; }
return &Apache::inputtags::gradestatus($Apache::inputtags::part);