--- loncom/homework/structuretags.pm 2002/03/28 22:53:55 1.86 +++ loncom/homework/structuretags.pm 2002/05/03 19:32:57 1.93 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.86 2002/03/28 22:53:55 albertel Exp $ +# $Id: structuretags.pm,v 1.93 2002/05/03 19:32:57 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -150,11 +150,10 @@ permanent record is left in the system.< Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.

- -

- + + + +
ENDCHECKOUT } @@ -174,12 +173,14 @@ sub start_problem { $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); @Apache::inputtags::previous=(); - &initialize_storage(); - if ($target eq 'web') { - &Apache::lonhomework::showhash(%Apache::lonhomework::history); + if ($target ne 'analyze') { + &initialize_storage(); + if ($target eq 'web') { + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + } + $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); + &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); } - $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); - &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); if ($Apache::lonhomework::type eq '') { my $uri=$ENV{'request.uri'}; if ($uri=~/\.(\w+)$/) { @@ -265,6 +266,9 @@ sub start_problem { $rndseed.'" /> + s existed, so we need to the grading &Apache::inputtags::grade; - } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') { + } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0' && + $status ne 'UNCHECKEDOUT') { # if part is zero, no s existed, so we need show the current # grading status $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); @@ -324,7 +329,8 @@ sub end_problem { ) { if ($status eq 'CAN_ANSWER') { $result.="\n"; - } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || + $status eq 'UNCHECKEDOUT' ) { $result.="\n"; } $result.=&Apache::lonxml::xmlend(); @@ -341,7 +347,7 @@ sub end_problem { &Apache::lonxml::debug("in end_problem with $target, edit"); $result='
'; } elsif ($target eq 'tex') { - $result .= '\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}'; + $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}'; } return $result; } @@ -529,7 +535,11 @@ sub start_part { } } } - return ''; + if ($target eq 'tex') { + return '\\\\'; + } else { + return ''; + } } sub end_part {