--- loncom/homework/structuretags.pm 2000/12/12 22:35:52 1.21 +++ loncom/homework/structuretags.pm 2001/02/19 20:39:00 1.32 @@ -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 { @@ -43,30 +43,47 @@ 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); + 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. 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
"; - } + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + $Apache::lonhomework::name=$name; + if ($status eq 'CAN_ANSWER') { + # create a page header and exit + return "$name\n\n".''; + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') { + return "$name\n\n"; + } + } return ''; } sub end_problem { my ($target,$token,$parstack,$parser,$safeeval)=@_; 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 s existed, so we need to the grading &Apache::inputtags::grade; } elsif ($Apache::inputtags::part eq '0') { @@ -74,7 +91,13 @@ sub end_problem { # grading status $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); } - if ($target eq 'web') { $result.="\n"; } + if ($target eq 'web') { + if ($status eq 'CAN_ANSWER') { + $result.="\n"; + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { + $result.="\n"; + } + } } else { if ($Apache::inputtags::part eq '0') { $result=&Apache::response::mandatory_part_meta; @@ -89,12 +112,12 @@ sub start_block { my $code = @$parstack[$#$parstack]; $code =~ s/\"//g; $code .=';return $condition;'; -# print "
$code
"; +# 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 ""; } @@ -152,14 +175,14 @@ sub start_randomlist { $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser); $list_item = "$b_tok->[4]"."$list_item"."[1]>"; push(@randomlist,$list_item); - # print "
START-TAG $b_tok->[1], $b_tok->[4], $list_item"; + # print "
START-TAG $b_tok->[1], $b_tok->[4], $list_item"; } if($b_tok->[0] eq 'T') { # text # what to do with text in between tags? - # print "TEXT $b_tok->[1]
"; + # print "TEXT $b_tok->[1]
"; } # if($b_tok->[0] eq 'E') { # end tag, should not happen - # print "END-TAG $b_tok->[1]
"; + # print "END-TAG $b_tok->[1]
"; # } } my @idx_arr = (0 .. $#randomlist); @@ -196,11 +219,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,10 +237,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__