--- loncom/homework/bridgetask.pm 2006/11/09 17:50:51 1.197
+++ loncom/homework/bridgetask.pm 2006/11/28 16:36:04 1.211
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.197 2006/11/09 17:50:51 albertel Exp $
+# $Id: bridgetask.pm,v 1.211 2006/11/28 16:36:04 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -234,36 +234,43 @@ sub add_grading_button {
if (scalar(keys(%sections)) < 3) {
$size=scalar(keys(%sections))+2;
}
- my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
- $sec_select .= "<option value='all' selected='selected'>all</option>\n";
+ my $sec_select = "\n".'<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
+ $sec_select .= "\t<option value='all' selected='selected'>all</option>\n";
foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
- $sec_select .= "<option value=\"$sec\">$sec</option>\n";
+ $sec_select .= "\t<option value=\"$sec\">$sec</option>\n";
}
- $sec_select .= "<option value='none'>none</option></select>\n";
+ $sec_select .= "\t<option value='none'>none</option>\n</select>\n";
- my $result=' <input type="submit" name="gradeasubmission" value="'.
+ my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'.
&mt("Get a submission to grade").'" />';
- $result.='<input type="hidden" name="grade_target" value="webgrade" />';
+ $result.="\n\t".'<input type="hidden" name="grade_target" value="webgrade" />';
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
- $result.='<table><tr>';
- $result.='<td rowspan="4">Specify a section: </td><td rowspan="4">'.$sec_select.'</td>';
- $result.='<td>'.' <input type="submit" name="reviewagrading" value="'.
+ $result.="\n\t".'<table>'."\n\t\t".'<tr>';
+ $result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'.
+ "\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>';
+ $result.="\n\t\t\t".'<td>'.'<input type="submit" name="reviewagrading" value="'.
&mt("Select an entry from the grading queue:").'" /> ';
- $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' </td></tr>'."\n";
+ $result.= "\n\t\t\t\t".&mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
- $result.='<tr><td>'.
- ' <input type="submit" name="reviewasubmission" value="'.
+ $result.="\n\t\t".'<tr>'.
+ "\n\t\t\t".'<td>'.
+ "\n\t\t\t\t".'<input type="submit" name="reviewasubmission" value="'.
&mt("Select an entry from the review queue:").'" /> ';
$result.=&mt("[_1] entries, [_2] ready, [_3] being graded",
- $entries,$ready,$locks).'</td></tr>'."\n";
- $result.='<tr><td> <input type="submit" name="regradeasubmission" value="'.
- &mt("List of user's grade status").'" /> </td></tr></table>'."\n";
- $result.='<p> <input type="submit" name="regradeaspecificsubmission" value="'.
- &mt("Regrade specific user:").'" />'."\n";
- $result.='<input type="text" size="12" name="gradinguser" />';
+ $entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
+ $result.="\n\t\t".'<tr>'.
+ "\n\t\t\t".'<td>'.
+ "\n\t\t\t\t".'<input type="submit" name="regradeasubmission" value="'.
+ &mt("List of user's grade status").'" /> </td>'
+ ."\n\t\t".'</tr>'
+ ."\n\t".'</table>'."\n";
+ $result.="\n\t".'<p>'.
+ "\n\t\t".'<input type="submit" name="regradeaspecificsubmission" value="'.
+ &mt("Regrade specific user:").'" />';
+ $result.= "\n\t\t".'<input type="text" size="12" name="gradinguser" />';
$result.=&Apache::loncommon::select_dom_form($env{'user.domain'},
'gradingdomain');
$result.=' '.
@@ -271,7 +278,7 @@ sub add_grading_button {
'gradinguser',
'gradingdomain');
$result.=&Apache::loncommon::studentbrowser_javascript();
- $result.= '</p>';
+ $result.= '</p>'."\n";
}
return $result;
}
@@ -295,18 +302,19 @@ sub add_request_another_attempt_button {
my $description=&Apache::slotrequest::get_description($slot_name,
$slot);
$result.=(<<STUFF);
-<p> Will be next available: $description </p>
+ <p> Will be next available: $description </p>
STUFF
}
if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
$symb=&escape($symb);
- $result.='<form method="post" action="/adm/slotrequest">'.
- '<input type="hidden" name="symb" value="'.$symb.'" />'.
- '<input type="hidden" name="command" value="'.$action.'" />'.
+ $result.=
+ "\n\t".'<form method="post" action="/adm/slotrequest">'."\n\t\t".
+ '<input type="hidden" name="symb" value="'.$symb.'" />'."\n\t\t".
+ '<input type="hidden" name="command" value="'.$action.'" />'."\n\t\t".
'<input type="submit" name="requestattempt" value="'.
- &mt($text).'" />'.
- '</form>';
+ &mt($text).'" />'."\n\t".
+ '</form>'."\n";
return $result;
}
@@ -372,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;
@@ -584,7 +599,7 @@ sub start_Task {
$result.='<form name="gradesubmission" method="post" action="';
my $uri=$env{'request.uri'};
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
- $result.=$uri.'">'.&add_grading_button()."</form>";
+ $result.=$uri.'">'.&add_grading_button()."</form>\n";
my $symb=&Apache::lonnet::symbread();
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
$result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
@@ -683,7 +698,7 @@ sub start_Task {
$result.=&preserve_grade_info();
$result.=&internal_location();
- $result.=$form_tag_start.
+ $result.=$form_tag_start."\t".
'<input type="hidden" name="submitted" value="yes" />';
&Apache::lonxml::startredirection();
}
@@ -783,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.
@@ -1009,7 +1027,12 @@ sub end_Task {
if (!$previous && $status ne 'SHOW_ANSWER' &&
&show_task($status,$previous)) {
$result.=&Apache::inputtags::gradestatus('0');
- $result.='</form>';
+ }
+
+ $result.='</form>';
+
+ if (!$previous && $status ne 'SHOW_ANSWER' &&
+ &show_task($status,$previous)) {
my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
$result.=<<DONEBUTTON;
<form name="done" method="post" action="$action">
@@ -1037,7 +1060,8 @@ DONEBUTTON
}
$start_time=&Apache::lonlocal::locallocaltime($start_time);
- my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";
+ my $status =
+ "\n<div class='LC_$bt_status LC_criteria'>\n\t";
if ($bt_status eq 'pass') {
$status.='<h2>You passed the '.$title.' given on '.
@@ -1050,15 +1074,13 @@ DONEBUTTON
$status.=&add_request_another_attempt_button();
}
}
- $status.='</div>';
+ $status.="\n".'</div>'."\n";
my $dim = $top;
my %counts = &get_counts($dim,undef,$parstack,
$safeeval);
- $status.="\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'><p>".
- &mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',
- $counts{'man'},$counts{'opt_req'},
- $counts{'opt'},$counts{'opt_passed'}).
- "</p></div>\n";
+ $status.="\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t<p>".
+ &question_status_message(\%counts,-1).
+ "</p>\n</div>\n";
foreach my $id (@{$dimension{$dim}{'criterias'}}) {
@@ -1245,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'};
@@ -1257,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>";
@@ -2037,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);
}
{
@@ -2089,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 {
@@ -2212,39 +2248,66 @@ sub end_Dimension {
if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {
$mandatory='Optional';
}
- my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";
+ my $dim_info=
+ "\n<div class='LC_$dim_status LC_question_grade'>\n\t";
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);
- $dim_info.="\n<p>"
+ $dim_info.="\n\t<p>"
.&question_status_message(\%counts,
$dimension{$dim}{'depth'})
- ."</p>\n</div>";
+ ."</p>\n</div>\n";
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
@{$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 id="$dim" class="LC_question">};
+ } else {
+ $result = "\n".'<div id="'.$dim.'" class="LC_question">'.
+ "\n".$result;
}
+ $result .= "\n</div>\n";
}
} elsif ($target eq 'webgrade') {
# in case of any side effects that we need
@@ -2268,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()) {
@@ -2351,7 +2418,7 @@ sub end_Dimension {
return $result;
}
-sub status_message {
+sub question_status_message {
my ($counts,$depth) = @_;
my %req = ('man' => 'mandatory',
'opt' => 'optional',);
@@ -2501,11 +2568,12 @@ sub grading_history {
$entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
}
if ($entry) {
- $result.= "<li>$grader : $entry </li>";
+ $result.= "\n\t\t<li>\n\t\t\t$grader :\n\t\t\t $entry \n\t\t</li>";
}
}
if ($result) {
- return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';
+ return "\n\t".'<ul class="LC_GRADING_pastgrading">'.$result.
+ "\n\t".'</ul>'."\n";
}
return '';
}
@@ -2576,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");
@@ -2618,15 +2686,21 @@ sub layout_web_Criteria {
my $status_display=$status;
$status_display=~s/^([a-z])/uc($1)/e;
my $criteria_info.=
- '<div class="LC_'.$status.' LC_criteria"><h4>'
- .$mandatory.' Criteria</h4><p>';
+ '<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>'
+ .$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text">'
+ ."\n";
+ $criteria =~ s/^\s*//s;
+ $criteria =~ s/\s*$//s;
$criteria_info.= $criteria;
- $criteria_info.='</p><p class="LC_grade">'.$status_display.'</p>';
+ $criteria_info.="\n\t".'</p>'.
+ "\n\t".'<p class="LC_grade">'.$status_display.'</p>';
if ($comment =~ /\w/) {
- $criteria_info.='<p class="LC_comment">'.
- &mt('Comment: [_1]',$comment).'</p>';
+ $criteria_info.=
+ "\n\t".
+ '<p class="LC_comment">'.&mt('Comment: [_1]',$comment).'</p>';
}
- $criteria_info.='</div>';
+ $criteria_info.="\n".'</div>'."\n";
+
return $criteria_info;
}
@@ -2635,34 +2709,46 @@ sub layout_webgrade_Criteria {
my $link=&link($id);
my $version = &get_version();
my $status = &get_criteria('status',$version,$dim,$id);
- my $result =
- '<div class="LC_GRADING_criteria">'."\n".
- '<div class="LC_GRADING_criteriatext">'."\n".
- $criteria.
- '</div>'."\n".
- '<div class="LC_GRADING_grade">'."\n".
- '<label class="LC_GRADING_ungraded">
- <input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.
- &mt('Ungraded').
- '</label>'."\n".
- '<label class="LC_GRADING_fail">
- <input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.
- &mt('Fail').
- '</label>'."\n".
- '<label class="LC_GRADING_pass">
- <input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.
- &mt('Pass').
- '</label>'."\n".
- '<label class="LC_GRADING_review">
- <input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.
- &mt('Review').
- '</label>'."\n".
- '</div>'."\n".
- '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
- '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode(&get_criteria('comment',$version,$dim,$id),'<>"&').'</textarea>'."\n".
- '</label>'."\n".
- '</div>'."\n".
- &grading_history($version,$dim,$id);
+ my %lt = ( 'ungraded' => 'Ungraded',
+ 'fail' => 'Fail',
+ 'pass' => 'Pass',
+ 'review' => 'Review',
+ 'comment' => 'Additional Comment for Student',
+ );
+ %lt = &Apache::lonlocal::texthash(%lt);
+ my $comment = &get_criteria('comment',$version,$dim,$id);
+ $comment = &HTML::Entities::encode($comment,'<>"&');
+ my %checked;
+ foreach my $which ('ungraded','fail','pass','review') {
+ 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">
+$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;
}