--- loncom/homework/bridgetask.pm 2005/09/29 19:15:47 1.54
+++ loncom/homework/bridgetask.pm 2005/10/01 04:01:14 1.61
@@ -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.61 2005/10/01 04:01:14 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 = '<select multiple name="chosensections" size="'.$size.'">'."\n";
+ $sec_select .= "<option value='all' selected='selected'>all</option>\n";
+ foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
+ $sec_select .= "<option name=\"$sec\">$sec</option>\n";
+ }
+ $sec_select .= "<option value='none'>none</option></select>\n";
+
my $result=' <input type="submit" name="gradeasubmission" value="'.
&mt("Get a submission to grade").'" />';
$result.='<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.='<p>Specify a section: '.$sec_select.'</p>';
$result.='<p>'.&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.=' <input type="submit" name="reviewagrading" value="'.
@@ -285,6 +302,38 @@ sub internal_location {
return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';
}
+sub submission_time_stamp {
+ my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+ my $submissiontime;
+ my $version=$Apache::lonhomework::history{'resource.version'};
+ for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
+ if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {
+ $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
+ }
+ }
+ my $result;
+ if ($submissiontime) {
+ my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'};
+ my %slot=&Apache::lonnet::get_slot($slot_name);
+ my $diff = $slot{'endtime'} - $submissiontime;
+ my ($color,$when)=('red','after');
+ if ($diff > 0) { ($color,$when)=('green','before'); }
+ my $info;
+ if ($diff%60) { $info=($diff%60).' seconds'; }
+ $diff=int($diff/60);
+ if ($diff%60) { $info=($diff%60).' minutes '.$info; }
+ $diff=int($diff/60);
+ if ($diff) { $info=$diff.' hours '.$info; }
+ $result='<p><font color="'.$color.'">'.
+ &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'}))).
+ '</font></p>';
+ }
+ return $result;
+}
+
sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@@ -367,10 +416,10 @@ sub start_Task {
$result.="$head_tag_start<title>$name</title></head>
$body_tag_start \n".&style();
- $result.=$form_tag_start.
- '<input type="hidden" name="submitted" value="yes" />';
$result.=&preserve_grade_info();
$result.=&internal_location();
+ $result.=$form_tag_start.
+ '<input type="hidden" name="submitted" value="yes" />';
&Apache::lonxml::startredirection();
}
} elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
@@ -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.='<input type="hidden" name="webgrade" value="'.
$webgrade.'" />';
@@ -482,12 +534,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'})
@@ -564,22 +616,24 @@ sub end_Task {
"</table>";
$result.=&Apache::inputtags::gradestatus('0');
}
- if (&show_task($status,$previous)) {
+ if (&show_task($status,$previous) &&
+ $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
my $title=&Apache::lonnet::gettitle();
my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name);
- my $description=&Apache::slotrequest::get_description($Apache::inputtags::slot_name,\%slot);
+ my $start_time=
+ &Apache::lonlocal::locallocaltime($slot{'starttime'});
my $status;
$status.="\n<div class='$bt_status'>\n";
if ($bt_status eq 'pass') {
$status.='<h2>You passed the '.$title.' given on '.
- $description.'.</h2>';
+ $start_time.'.</h2>';
}
if ($bt_status eq 'fail') {
$status.='<h2>You did not pass the '.$title.' given on '.
- $description.'.</h2>';
+ $start_time.'.</h2>';
if (!$previous) {
$status.=&add_request_another_attempt_button();
}
@@ -833,6 +887,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;
@@ -855,6 +914,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;
@@ -865,8 +931,9 @@ sub show_queue {
if ($with_selects) { $result.="<th></th>"; }
$result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
foreach my $key (sort(keys(%queue))) {
+ my ($symb,$uname,$udom) = &decode_queue_key($key);
+ if (!defined($classlist->{$uname.':'.$udom})) { next; }
if ($key=~/locked$/ && !$with_selects) {
- my ($symb,$uname,$udom) = &decode_queue_key($key);
my $title=&Apache::lonnet::gettitle($symb);
$result.="<tr><td>$title</td><td>$uname</td>";
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
@@ -877,7 +944,6 @@ sub show_queue {
$result.='<td>last queue modification time</td><td>'.
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
} elsif ($key!~/(timestamp|locked)$/) {
- my ($symb,$uname,$udom) = &decode_queue_key($key);
my $title=&Apache::lonnet::gettitle($symb);
$result.="<tr>";
my $slot=$queue{$key}->[0];
@@ -1109,22 +1175,36 @@ sub select_user {
my ($symb,$cid)=&Apache::lonxml::whichuser();
my $result.='<table border="1">';
+ my @chosen_sections=
+ &Apache::loncommon::get_env_multiple('form.chosensections');
&Apache::grades::init_perm();
- my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',);
+ my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
&Apache::grades::reset_perm();
foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
my ($uname,$udom) = split(/:/,$student);
+
my %status = &get_student_status($symb,$cid,$udom,$uname);
my $queue = 'none';
- if ($status{'reviewqueue'} eq 'enqueued') {
+ my $cannot_grade;
+ if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {
$queue = 'reviewqueue';
- } elsif ($status{'gradingqueue'} eq 'enqueued') {
+ if ($status{'reviewqueue'} eq 'in_progress') {
+ $cannot_grade=1;
+ }
+ } elsif ($status{'gradingqueue'} =~ /^(in_progress|enqueue)$/) {
$queue = 'gradingqueue';
+ if ($status{'gradingqueue'} eq 'in_progress') {
+ $cannot_grade=1;
+ }
}
my $todo =
&Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
- $result.=<<RESULT;
+ if ($cannot_grade) {
+ $result.='<tr><td> </td><td>'.$fullname->{$student}.
+ '</td><td>';
+ } else {
+ $result.=<<RESULT;
<tr>
<td>
<form method="POST">
@@ -1137,7 +1217,7 @@ sub select_user {
<td>$fullname->{$student}</td>
<td>
RESULT
-
+ }
if ($status{'status'} eq 'pass') {
$result .= '<font color="green">'.&mt('Passed').'</font>';
} elsif ($status{'status'} eq 'fail') {
@@ -1159,10 +1239,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.=" ";
}