--- loncom/homework/bridgetask.pm 2005/09/30 20:34:53 1.57 +++ loncom/homework/bridgetask.pm 2005/10/01 04:06:29 1.62 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.57 2005/09/30 20:34:53 albertel Exp $ +# $Id: bridgetask.pm,v 1.62 2005/10/01 04:06:29 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)=@_; @@ -429,6 +478,9 @@ sub start_Task { my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); } if ($target eq 'webgrade' && defined($env{'form.queue'})) { + if ($webgrade eq 'yes') { + $result.=&submission_time_stamp(); + } $result.=$form_tag_start; $result.=''; @@ -438,6 +490,14 @@ sub start_Task { $result.=''; } + if ($env{'form.chosensections'}) { + my @chosen_sections= + &Apache::loncommon::get_env_multiple('form.chosensections'); + foreach my $sec (@chosen_sections) { + $result.=''; + } + } } } else { # page_start returned a starting result, delete it if we don't need it @@ -482,12 +542,12 @@ sub get_key_todo { if ($env{'form.stop'}) { return (undef,'stop'); } elsif ($env{'form.next'}) { - return (undef,'show_list'); + return (undef,'select_user'); } } return ($gradingkey,'selected'); } else { - return (undef,'show_list'); + return (undef,'select_user'); } } if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'}) @@ -835,6 +895,11 @@ sub check_queue_for_key { if (defined($results{"$todo\0locked"})) { return 'locked'; } + my $slot=$results{$todo}->[0]; + my %slot_data=&Apache::lonnet::get_slot($slot); + if ($slot_data{'endtime'} > time) { + return 'in_progress'; + } return 'enqueued'; } return undef; @@ -857,6 +922,13 @@ sub show_queue { my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; + + my @chosen_sections= + &Apache::loncommon::get_env_multiple('form.chosensections'); + &Apache::grades::init_perm(); + my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); + &Apache::grades::reset_perm(); + my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); my ($tmp)=%queue; @@ -867,8 +939,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') {
@@ -1161,10 +1259,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.=" ";
}
| |