--- loncom/homework/bridgetask.pm 2006/11/13 21:23:19 1.202
+++ loncom/homework/bridgetask.pm 2006/11/14 22:12:58 1.205
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.202 2006/11/13 21:23:19 albertel Exp $
+# $Id: bridgetask.pm,v 1.205 2006/11/14 22:12:58 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2104,7 +2104,9 @@ sub start_Dimension {
}
push(@Apache::bridgetask::dimension,$dim);
&Apache::lonxml::startredirection();
- &enable_dimension_parsing($dim);
+ if (!&skip_dimension_parsing($dim)) {
+ &enable_dimension_parsing($dim);
+ }
return &internal_location($dim);
}
@@ -2230,7 +2232,7 @@ 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 the above'.$mandatory.' question
';
+ $dim_info.=''.$question.' : you passed the above '.$mandatory.' question
';
}
if ($dim_status eq 'fail') {
$dim_info.=''.$question.' : you did not pass the above '.$mandatory.' question
';
@@ -2247,13 +2249,20 @@ sub end_Dimension {
@{$dimension{$dim}{'criterias'}}) {
my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
if ($type eq 'dimension') {
- $result.=$dimension{$id}{'result'};
- next;
+ if (defined($dimension{$id}{'result'})) {
+ $result.=$dimension{$id}{'result'};
+ next;
+ } else {
+ $dim_info .=
+ &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+ [@_],{'set_dim_id' => $id});
+ }
+ } else {
+ my $criteria =
+ &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+ [@_]);
+ $dim_info .= &layout_web_Criteria($dim,$id,$criteria);
}
- my $criteria =
- &nested_parse(\$dimension{$dim}{'criteria.'.$id},
- [@_]);
- $dim_info .= &layout_web_Criteria($dim,$id,$criteria);
}
# puts the results at the end of the dimension
$result .= $dim_info;
@@ -2638,7 +2647,8 @@ sub layout_web_Criteria {
$status_display=~s/^([a-z])/uc($1)/e;
my $criteria_info.=
''."\n\t".'
'
- .$mandatory.' Criteria
'."\n\t".'
'."\n\t".'
'
+ ."\n";
$criteria =~ s/^\s*//s;
$criteria =~ s/\s*$//s;
$criteria_info.= $criteria;