--- loncom/homework/bridgetask.pm 2006/11/09 21:39:34 1.201
+++ loncom/homework/bridgetask.pm 2006/11/13 21:25:21 1.203
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.201 2006/11/09 21:39:34 albertel Exp $
+# $Id: bridgetask.pm,v 1.203 2006/11/13 21:25:21 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2193,6 +2193,7 @@ sub end_Dimension {
my $instance=&get_instance($dim);
my $version=&get_version();
if ($target eq 'web') {
+ $result .= "\n".'
'."\n";
$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
my @instances = $instance;
if (&Apache::response::showallfoils()) {
@@ -2229,10 +2230,10 @@ sub end_Dimension {
my $question = ('sub' x $dimension{$dim}{'depth'}).'question';
$question =~ s/^(.)/uc($1)/e;
if ($dim_status eq 'pass') {
- $dim_info.='
'.$question.' : you passed this '.$mandatory.' question
';
+ $dim_info.=''.$question.' : you passed the above '.$mandatory.' question
';
}
if ($dim_status eq 'fail') {
- $dim_info.=''.$question.' : you did not pass this '.$mandatory.' question
';
+ $dim_info.=''.$question.' : you did not pass the above '.$mandatory.' question
';
}
my %counts = &get_counts($dim,$instance,$parstack,
$safeeval);
@@ -2254,11 +2255,15 @@ sub end_Dimension {
[@_]);
$dim_info .= &layout_web_Criteria($dim,$id,$criteria);
}
+ # puts the results at the end of the dimension
+ $result .= $dim_info;
- my $internal_location=&internal_location($dim);
- $result=~s/\Q$internal_location\E/$dim_info/;
+ # puts the results at the beginning of the dimension
+ # my $internal_location=&internal_location($dim);
+ # $result=~s/\Q$internal_location\E/$dim_info/;
}
}
+ $result .= "\n\n";
} elsif ($target eq 'webgrade') {
# in case of any side effects that we need
&nested_parse(\$dimension{$dim}{'intro'},[@_]);
@@ -2633,7 +2638,9 @@ sub layout_web_Criteria {
$status_display=~s/^([a-z])/uc($1)/e;
my $criteria_info.=
''."\n\t".'
'
- .$mandatory.' Criteria
'."\n\t".'
'."\n";
+ .$mandatory.' Criteria'."\n\t".'
'.
"\n\t".'
'.$status_display.'
';
@@ -2675,6 +2682,8 @@ sub layout_webgrade_Criteria {
END_BUTTON
}
+ $criteria =~ s/^\s*//s;
+ $criteria =~ s/\s*$//s;
my $result = <