--- loncom/homework/bridgetask.pm 2007/01/10 22:46:22 1.217
+++ loncom/homework/bridgetask.pm 2007/01/19 23:43:50 1.221
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.217 2007/01/10 22:46:22 albertel Exp $
+# $Id: bridgetask.pm,v 1.221 2007/01/19 23:43:50 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -591,7 +591,6 @@ sub start_Task {
&Apache::structuretags::page_start($target,$token,$tagstack,
$parstack,$parser,$safeeval,
$name,&style($target));
- $result .= '
'."\n";
}
if ($target eq 'web' && $env{'request.state'} ne 'construct') {
@@ -640,6 +639,11 @@ sub start_Task {
'slot' => $slot_name});
($version,$previous)=&get_version();
}
+
+ my $status_id =
+ ($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback'
+ : 'LC_task_take';
+ $result .= '
'."\n";
push(@Apache::inputtags::status,$status);
$Apache::inputtags::slot_name=$slot_name;
@@ -707,6 +711,7 @@ sub start_Task {
$target eq 'webgrade') {
my $webgrade='yes';
if ($target eq 'webgrade') {
+ $result .= '
'."\n";
$result.= "\n".'
'."\n".
'';
@@ -2240,7 +2245,6 @@ sub end_Dimension {
my $result=&Apache::lonxml::endredirection();
my $dim=&get_id($parstack,$safeeval);
if (&skip_dimension_parsing($dim)) {
- &disable_dimension_parsing($dim);
pop(@Apache::bridgetask::dimension);
return;
}
@@ -2481,7 +2485,15 @@ sub question_status_message {
$status .= '.';
if ($counts->{'opt'}) {
$status .= ' You were required to pass '.$counts->{'opt_req'}.
- ' optional component'.($counts->{'opt_req'} == 1?'':'s');
+ ' optional ';
+ if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
+ $status .=
+ ($counts->{'opt_req'} == 1?'criterion':'criteria');
+ } else {
+ $status .=
+ 'component'.($counts->{'opt_req'} == 1?'':'s');
+ }
+ $status .= '.';
}
return $status;
}