version 1.39, 2005/08/09 16:48:15
|
version 1.40, 2005/08/15 19:36:21
|
Line 147 sub add_grading_button {
|
Line 147 sub add_grading_button {
|
my $result=' <input type="submit" name="gradeasubmission" value="'. |
my $result=' <input type="submit" name="gradeasubmission" value="'. |
&mt("Get a submission to grade").'" />'; |
&mt("Get a submission to grade").'" />'; |
$result.='<input type="hidden" name="grade_target" value="webgrade" />'; |
$result.='<input type="hidden" name="grade_target" value="webgrade" />'; |
if ( 1) { |
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { |
#need a permissions for limitng this to 'powerful users' |
# FIXME need a permission for limiting this to 'powerful users' |
|
|
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); |
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); |
$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.='<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); |
Line 225 sub start_Task {
|
Line 225 sub start_Task {
|
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
$body_tag_start.=$uri.'">'.&add_grading_button()."</form>"; |
$body_tag_start.=$uri.'">'.&add_grading_button()."</form>"; |
my $symb=&Apache::lonnet::symbread(); |
my $symb=&Apache::lonnet::symbread(); |
$body_tag_start.='<form method="POST" action="/adm/slotrequest">'. |
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { |
'<input type="hidden" name="symb" value="'.$symb.'" />'. |
$body_tag_start.='<form method="POST" action="/adm/slotrequest">'. |
'<input type="hidden" name="command" value="showslots" />'. |
'<input type="hidden" name="symb" value="'.$symb.'" />'. |
'<input type="submit" name="requestattempt" value="'. |
'<input type="hidden" name="command" value="showslots" />'. |
&mt('Show Slot list').'" />'. |
'<input type="submit" name="requestattempt" value="'. |
'</form>'; |
&mt('Show Slot list').'" />'. |
|
'</form>'; |
|
} |
} |
} |
} |
} |
if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || |
if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || |
Line 285 sub start_Task {
|
Line 286 sub start_Task {
|
} elsif ($target eq 'grade' && !$env{'form.webgrade'}) { |
} elsif ($target eq 'grade' && !$env{'form.webgrade'}) { |
if ($status eq 'NEEDS_CHECKIN') { |
if ($status eq 'NEEDS_CHECKIN') { |
if (&proctor_check_auth($slot_name,$slot)) { |
if (&proctor_check_auth($slot_name,$slot)) { |
#FIXME immeadiatly add this to the grading queue |
# FIXME immeadiatly add this to the grading queue |
# with slot->{'endtime'} for when grading can |
# with slot->{'endtime'} for when grading can |
# begin on this resource |
# begin on this resource |
# FIXME I think the above is done by default, |
# FIXME I think the above is done by default, |
Line 539 sub end_Task {
|
Line 540 sub end_Task {
|
} |
} |
} elsif ($ungraded) { |
} elsif ($ungraded) { |
$Apache::lonhomework::results{"resource.$version.status"}='ungraded'; |
$Apache::lonhomework::results{"resource.$version.status"}='ungraded'; |
# FIXME if in review queue need to move back to grading queue |
|
if ($env{'form.queue'} eq 'reviewqueue') { |
if ($env{'form.queue'} eq 'reviewqueue') { |
&Apache::lonxml::debug("moving back."); |
&Apache::lonxml::debug("moving back."); |
&move_between_queues('reviewqueue','gradingqueue'); |
&move_between_queues('reviewqueue','gradingqueue'); |