--- loncom/homework/structuretags.pm 2000/12/19 23:22:22 1.23 +++ loncom/homework/structuretags.pm 2001/01/08 13:55:08 1.29 @@ -6,7 +6,7 @@ use strict; use Apache::lonnet; sub BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part')); + &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved')); } sub start_web { @@ -48,10 +48,13 @@ sub start_problem { if ($target ne 'meta') { ($status,$datemsg) = &Apache::lonhomework::check_date('0'); push (@Apache::inputtags::status,$status); + my $expression='$external::datestatus="'.$status.'";'; + $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; + &Apache::run::run($expression,$safeeval); 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. The problem $datemsg

"; + return "

Problem is not open to be viewed. The problem $datemsg

"; } } } @@ -62,7 +65,7 @@ sub start_problem { if ($status eq 'CAN_ANSWER') { # create a page header and exit return "$name\n\n
"; - } elsif ($status eq 'SHOW_ANSWER') { + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') { return "$name\n\n"; } } @@ -72,9 +75,10 @@ sub start_problem { sub end_problem { my ($target,$token,$parstack,$parser,$safeeval)=@_; my $result=''; - my $status=@Apache::inputtags::status['-1']; + 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 s existed, so we need to the grading &Apache::inputtags::grade; } elsif ($Apache::inputtags::part eq '0') { @@ -85,7 +89,7 @@ sub end_problem { if ($target eq 'web') { if ($status eq 'CAN_ANSWER') { $result.="\n"; - } elsif ($status eq 'SHOW_ANSWER') { + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { $result.="\n"; } } @@ -105,10 +109,10 @@ sub start_block { $code .=';return $condition;'; # print "
$code
"; my $result = &Apache::run::run($code,$safeeval); + &Apache::lonxml::debug("block :$code: returned :$result:"); if ( ! $result ) { -# my $skip=$$parser[$#$parser]->get_text("/block"); my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]); -# print "skipped $skip"; + &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]"); } return ""; } @@ -228,11 +232,74 @@ 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 &Apaceh::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::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { + &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); + } + } + return ''; +} + +sub end_preduedate { + return ''; +} + +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("/postanswerdate",$$parser[$#$parser]); + } + } + return ''; +} + +sub end_postanswerdate { + return ''; +} + +sub start_notsolved { + my ($target,$token,$parstack,$parser,$safeeval)=@_; + if ($target ne 'meta') { + my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; + &Apache::lonxml::debug("not solved has :$gradestatus:"); + if ($gradestatus =~ /^correct/) { + &Apache::lonxml::debug("skipping"); + &Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]); + } + } + return ''; +} + +sub end_notsolved { + return ''; +} + +sub start_solved { + my ($target,$token,$parstack,$parser,$safeeval)=@_; + if ($target ne 'meta') { + my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; + if ($gradestatus !~ /^correct/) { + &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]); + } + } + return ''; +} + +sub end_solved { + return ''; +} 1; __END__