version 1.201, 2006/11/09 21:39:34
|
version 1.202, 2006/11/13 21:23:19
|
Line 2193 sub end_Dimension {
|
Line 2193 sub end_Dimension {
|
my $instance=&get_instance($dim); |
my $instance=&get_instance($dim); |
my $version=&get_version(); |
my $version=&get_version(); |
if ($target eq 'web') { |
if ($target eq 'web') { |
|
$result .= "\n".'<div class="LC_question">'."\n"; |
$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); |
$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); |
my @instances = $instance; |
my @instances = $instance; |
if (&Apache::response::showallfoils()) { |
if (&Apache::response::showallfoils()) { |
Line 2229 sub end_Dimension {
|
Line 2230 sub end_Dimension {
|
my $question = ('sub' x $dimension{$dim}{'depth'}).'question'; |
my $question = ('sub' x $dimension{$dim}{'depth'}).'question'; |
$question =~ s/^(.)/uc($1)/e; |
$question =~ s/^(.)/uc($1)/e; |
if ($dim_status eq 'pass') { |
if ($dim_status eq 'pass') { |
$dim_info.='<h3>'.$question.' : you passed this '.$mandatory.' question</h3>'; |
$dim_info.='<h3>'.$question.' : you passed the above'.$mandatory.' question</h3>'; |
} |
} |
if ($dim_status eq 'fail') { |
if ($dim_status eq 'fail') { |
$dim_info.='<h3>'.$question.' : you did not pass this '.$mandatory.' question</h3>'; |
$dim_info.='<h3>'.$question.' : you did not pass the above '.$mandatory.' question</h3>'; |
} |
} |
my %counts = &get_counts($dim,$instance,$parstack, |
my %counts = &get_counts($dim,$instance,$parstack, |
$safeeval); |
$safeeval); |
Line 2254 sub end_Dimension {
|
Line 2255 sub end_Dimension {
|
[@_]); |
[@_]); |
$dim_info .= &layout_web_Criteria($dim,$id,$criteria); |
$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); |
# puts the results at the beginning of the dimension |
$result=~s/\Q$internal_location\E/$dim_info/; |
# my $internal_location=&internal_location($dim); |
|
# $result=~s/\Q$internal_location\E/$dim_info/; |
} |
} |
} |
} |
|
$result .= "\n</div>\n"; |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
# in case of any side effects that we need |
# in case of any side effects that we need |
&nested_parse(\$dimension{$dim}{'intro'},[@_]); |
&nested_parse(\$dimension{$dim}{'intro'},[@_]); |
Line 2633 sub layout_web_Criteria {
|
Line 2638 sub layout_web_Criteria {
|
$status_display=~s/^([a-z])/uc($1)/e; |
$status_display=~s/^([a-z])/uc($1)/e; |
my $criteria_info.= |
my $criteria_info.= |
'<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>' |
'<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>' |
.$mandatory.' Criteria</h4>'."\n\t".'<p>'."\n"; |
.$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text>'."\n"; |
|
$criteria =~ s/^\s*//s; |
|
$criteria =~ s/\s*$//s; |
$criteria_info.= $criteria; |
$criteria_info.= $criteria; |
$criteria_info.="\n\t".'</p>'. |
$criteria_info.="\n\t".'</p>'. |
"\n\t".'<p class="LC_grade">'.$status_display.'</p>'; |
"\n\t".'<p class="LC_grade">'.$status_display.'</p>'; |
Line 2675 sub layout_webgrade_Criteria {
|
Line 2682 sub layout_webgrade_Criteria {
|
</label> |
</label> |
END_BUTTON |
END_BUTTON |
} |
} |
|
$criteria =~ s/^\s*//s; |
|
$criteria =~ s/\s*$//s; |
my $result = <<END_CRITERIA; |
my $result = <<END_CRITERIA; |
<div class="LC_GRADING_criteria"> |
<div class="LC_GRADING_criteria"> |
<div class="LC_GRADING_criteriatext"> |
<div class="LC_GRADING_criteriatext"> |