--- loncom/homework/bridgetask.pm 2005/09/29 19:15:47 1.54 +++ loncom/homework/bridgetask.pm 2005/10/05 20:24:59 1.68 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.54 2005/09/29 19:15:47 albertel Exp $ +# $Id: bridgetask.pm,v 1.68 2005/10/05 20:24:59 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -144,11 +144,28 @@ sub add_previous_version_button { } sub add_grading_button { + my (undef,$cid)=&Apache::lonxml::whichuser(); + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my %sections; + my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections); + my $size=5; + if (scalar(keys(%sections)) < 3) { + $size=scalar(keys(%sections))+2; + } + my $sec_select = '\n"; + my $result=' '; $result.=''; if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); + $result.='
Specify a section: '.$sec_select.'
'; $result.=''.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks); $result.=' '. + &mt('Student submitted [_1] [_2] the deadline. + (Submission was at [_3], end of period was [_4].)', + $info,$when,scalar(localtime($submissiontime)), + scalar(localtime($slot{'endtime'}))). + '
'; + } + return $result; +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -343,6 +393,18 @@ sub start_Task { ''.&proctor_validation_screen($slot); } elsif ($status eq 'WAITING_FOR_GRADE') { $msg.='Files submitted: $files
+You are now done with this Bridge Task
+Showing only sections '.join(', ',@chosen_sections). + '.
'."\n"; + } + my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); my ($tmp)=%queue; @@ -865,8 +966,9 @@ sub show_queue { if ($with_selects) { $result.="'.$fullname->{$student}. + ' | ';
+ } else {
+ my $seclist;
+ foreach my $sec (@chosen_sections) {
+ $seclist.='';
+ }
+ $result.=<
| $fullname->{$student} |
RESULT
-
+ }
if ($status{'status'} eq 'pass') {
$result .= ''.&mt('Passed').'';
} elsif ($status{'status'} eq 'fail') {
@@ -1159,10 +1294,14 @@ RESULT
$result .= &mt('Awaiting Review');
} elsif ($status{'reviewqueue'} eq 'locked') {
$result .= &mt('Under Review');
+ } elsif ($status{'reviewqueue'} eq 'in_progress') {
+ $result .= &mt('Still being worked on.');
} elsif ($status{'gradingqueue'} eq 'enqueued') {
$result .= &mt('Awaiting Grading');
} elsif ($status{'gradingqueue'} eq 'locked') {
$result .= &mt('Being Graded');
+ } elsif ($status{'gradingqueue'} eq 'in_progress') {
+ $result .= &mt('Still being worked on.');
} else {
$result.=" ";
}
@@ -1266,6 +1405,7 @@ sub get_instance {
$dim_info.=' | Question : you did not pass this '.$mandatory.' question'; } my $man_count=0; + my $man_passed=0; my $opt_count=0; my $opt_passed=0; foreach my $id (@{$dimension{$instance.'.criterias'}}) { @@ -1277,12 +1417,15 @@ sub get_instance { } } else { $man_count++; + if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') { + $man_passed++; + } } } - my $opt_req=&Apache::lonxml::get_param('OptionalRequired', - $parstack,$safeeval); + if ($man_passed eq $man_count) { $man_passed='all'; } + my $opt_req=$dimension{$instance.'.optionalrequired'}; if ($opt_req !~ /\S/) { $opt_req='0'; } - $dim_info.="\n".&mt('You passed all of the mandatory components and [_1] of the [_2] optional components, of which you were required to pass [_3].',$opt_passed,$opt_count,$opt_req)." \n"; + $dim_info.="\n".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)." \n"; my $internal_location=&internal_location($dim); $result=~s/\Q$internal_location\E/$dim_info/; |