--- loncom/homework/structuretags.pm 2004/02/02 17:28:53 1.231 +++ loncom/homework/structuretags.pm 2004/02/12 19:07:12 1.234 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.231 2004/02/02 17:28:53 sakharuk Exp $ +# $Id: structuretags.pm,v 1.234 2004/02/12 19:07:12 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -523,7 +523,7 @@ sub end_problem { if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && - $status eq 'CAN_ANSWER' ) { + ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode)) { # if part is zero, no s existed, so we need to the grading &Apache::inputtags::grade; } elsif ( ($target eq 'web' || $target eq 'tex') && @@ -984,6 +984,8 @@ sub start_part { } } if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} + } elsif ($target eq 'web') { + $result.=''; } } } @@ -1015,7 +1017,9 @@ sub end_part { my $result=''; if ( $target eq 'meta' ) { $result=''; - } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) { + } elsif ($target eq 'grade' && + ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) && + !$hidden) { $result=&Apache::inputtags::grade; } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) { my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, @@ -1050,12 +1054,12 @@ sub end_preduedate { sub start_postanswerdate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'grade') { if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { &Apache::lonxml::get_all_text("/postanswerdate",$parser); } } elsif ($target eq 'tex') { - return '\vskip 0 mm \noindent'; + &Apache::lonxml::get_all_text("/postanswerdate",$parser); } return ''; }