--- loncom/homework/bridgetask.pm 2006/11/09 21:31:11 1.200
+++ loncom/homework/bridgetask.pm 2006/11/27 23:24:36 1.209
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.200 2006/11/09 21:31:11 albertel Exp $
+# $Id: bridgetask.pm,v 1.209 2006/11/27 23:24:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -380,6 +380,13 @@ sub nest {
}
}
+sub start_delay {
+ push(@delay,1);
+}
+sub end_delay {
+ pop(@delay);
+}
+
sub nested_parse {
my ($str,$env,$args) = @_;
my @old_env = @Apache::scripttag::parser_env;
@@ -791,6 +798,9 @@ sub start_Task {
if ($target eq 'webgrade') {
$result.="\n".'<div id="LC_GRADING_criterialist">';
&Apache::lonxml::startredirection();
+ &start_delay();
+ $dimension{$top}{'result'}=$result;
+ undef($result);
}
} elsif ($target eq 'edit') {
$result.=$form_tag_start.
@@ -1257,7 +1267,13 @@ DONEBUTTON
&Apache::structuretags::finalize_storage();
}
} elsif ($target eq 'webgrade') {
- $result.=&Apache::lonxml::endredirection();
+ if (&nest()) {
+ &Apache::lonxml::endredirection();
+ &end_delay();
+ $result.=$dimension{$top}{'result'};
+ } else {
+ $result.=&Apache::lonxml::endredirection();
+ }
my $dim = $top;
foreach my $id (@{$dimension{$dim}{'criterias'}} ) {
my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
@@ -1269,7 +1285,12 @@ DONEBUTTON
[@_]);
$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
my $internal_location=&internal_location($id);
- $result=~s/\Q$internal_location\E/$criteria/;
+ if ($result =~ m/\Q$internal_location\E/) {
+ $result=~s/\Q$internal_location\E/$criteria/;
+ } else {
+ $result.=$criteria;
+ }
+
}
}
$result.="</div>";
@@ -2049,7 +2070,7 @@ sub start_Setup {
my $dim = &get_id($parstack,$safeeval);
push(@Apache::bridgetask::dimension,$dim);
&Apache::lonxml::startredirection();
- return &internal_location($dim);
+ return;# &internal_location($dim);
}
{
@@ -2101,11 +2122,14 @@ sub start_Dimension {
$dimension{$top}{'criteria.'.$dim.'.mandatory'}=
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
push(@{$dimension{$top}{'criterias'}},$dim);
+ $dimension{$dim}{'nested'}=$top;
}
push(@Apache::bridgetask::dimension,$dim);
&Apache::lonxml::startredirection();
- &enable_dimension_parsing($dim);
- return &internal_location($dim);
+ if (!&skip_dimension_parsing($dim)) {
+ &enable_dimension_parsing($dim);
+ }
+ return;# &internal_location($dim);
}
sub start_QuestionText {
@@ -2229,10 +2253,10 @@ sub end_Dimension {
my $question = ('sub' x $dimension{$dim}{'depth'}).'question';
$question =~ s/^(.)/uc($1)/e;
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') {
- $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,
$safeeval);
@@ -2246,18 +2270,44 @@ 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;
- 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/;
+ }
+ }
+ if ($result !~ /^\s*$/s) {
+ # FIXME? this maybe unneccssary in the future, (CSE101 BT
+ # from Fall 2006 geenrate a div that attempts to hide some
+ # of the output in an odd way, this is a workaround so
+ # those old ones will continue to work. # It puts the
+ # LC_question div to come after any starting closie div
+ # that the dimension produces
+ if ($result =~ m{\s*</div>}) {
+ $result =~ s{(\s*</div>)}
+ {$1\n<div class="LC_question">};
+ } else {
+ $result = "\n".'<div class="LC_question">'.
+ "\n".$result;
}
+ $result .= "\n</div>\n";
}
} elsif ($target eq 'webgrade') {
# in case of any side effects that we need
@@ -2281,7 +2331,11 @@ sub end_Dimension {
[@_]);
$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
my $internal_location=&internal_location($id);
- $result=~s/\Q$internal_location\E/$criteria/;
+ if ($result =~ m/\Q$internal_location\E/) {
+ $result =~ s/\Q$internal_location\E/$criteria/;
+ } else {
+ $result.=$criteria ;
+ }
}
}
if (&nest()) {
@@ -2590,12 +2644,12 @@ sub start_Criteria {
my $dim = &get_dim_id();
my $id=&get_id($parstack,$safeeval);
if ($target eq 'web' || $target eq 'webgrade') {
- if ($target eq 'webgrade' && $dim ne 'top') {
+ if ($target eq 'webgrade') {
&Apache::lonxml::debug(" for $dim $id stashing results into $dim ");
$dimension{$dim}{'result'} .= &internal_location($id);
} else {
&Apache::lonxml::debug(" not stashing $dim $id");
- $result .= &internal_location($id);
+ #$result .= &internal_location($id);
}
}
&Apache::lonxml::debug("Criteria $id with $dim");
@@ -2633,7 +2687,10 @@ sub layout_web_Criteria {
$status_display=~s/^([a-z])/uc($1)/e;
my $criteria_info.=
'<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.="\n\t".'</p>'.
"\n\t".'<p class="LC_grade">'.$status_display.'</p>';
@@ -2666,35 +2723,30 @@ sub layout_webgrade_Criteria {
if ($status eq $which) { $checked{$which} = 'checked="checked"'; }
}
if (!%checked) { $checked{'ungraded'} = 'checked="checked"'; }
-
+ my $buttons;
+ foreach my $which ('ungraded','fail','pass','review') {
+ $buttons .= <<END_BUTTON;
+ <label class="LC_GRADING_$which">
+ <input type="radio" name="HWVAL_$link" value="$which" $checked{$which} />
+ $lt{$which}
+ </label>
+END_BUTTON
+ }
+ $criteria =~ s/^\s*//s;
+ $criteria =~ s/\s*$//s;
my $result = <<END_CRITERIA;
- <div class="LC_GRADING_criteria">
- <div class="LC_GRADING_criteriatext">
- $criteria
- </div>
- <div class="LC_GRADING_grade">
- <label class="LC_GRADING_ungraded">
- <input type="radio" name="HWVAL_$link" value="ungraded" $checked{'ungraded'} />
- $lt{'ungraded'}
- </label>
- <label class="LC_GRADING_fail">
- <input type="radio" name="HWVAL_$link" value="fail" $checked{'fail'} />
- $lt{'fail'}
- </label>
- <label class="LC_GRADING_pass">
- <input type="radio" name="HWVAL_$link" value="pass" $checked{'pass'} />
- $lt{'pass'}
- </label>
- <label class="LC_GRADING_review">
- <input type="radio" name="HWVAL_$link" value="review" $checked{'review'} />
- $lt{'review'}
- </label>
- </div>
- <label class="LC_GRADING_comment">
- $lt{'comment'}
- <textarea class="LC_GRADING_comment_area" name="HWVAL_comment_$link">$comment</textarea>
- </label>
- </div>
+<div class="LC_GRADING_criteria">
+ <div class="LC_GRADING_criteriatext">
+ $criteria
+ </div>
+ <div class="LC_GRADING_grade">
+$buttons
+ </div>
+ <label class="LC_GRADING_comment">
+ $lt{'comment'}
+ <textarea class="LC_GRADING_comment_area" name="HWVAL_comment_$link">$comment</textarea>
+ </label>
+</div>
END_CRITERIA
$result .= &grading_history($version,$dim,$id);
return $result;