version 1.26, 2005/05/19 21:28:06
|
version 1.30, 2005/05/24 19:33:28
|
Line 71 sub proctor_check_auth {
|
Line 71 sub proctor_check_auth {
|
if ($authhost ne 'no_host') { |
if ($authhost ne 'no_host') { |
my $version= |
my $version= |
$Apache::lonhomework::results{'resource.version'}= |
$Apache::lonhomework::results{'resource.version'}= |
$Apache::lonhomework::history{'resource.version'}++; |
++$Apache::lonhomework::history{'resource.version'}; |
$Apache::lonhomework::results{"resource.$version.checkedin"}= |
$Apache::lonhomework::results{"resource.$version.checkedin"}= |
$user.'@'.$domain; |
$user.'@'.$domain; |
$Apache::lonhomework::results{"resource.$version.checkedin.slot"}= |
$Apache::lonhomework::results{"resource.$version.checkedin.slot"}= |
$slot_name; |
$slot_name; |
|
foreach my $key (keys(%Apache::lonhomework::history)) { |
|
if ($key=~/^resource\.0\./) { |
|
$Apache::lonhomework::results{$key}=''; |
|
} |
|
} |
return 1; |
return 1; |
} |
} |
} |
} |
Line 84 sub proctor_check_auth {
|
Line 89 sub proctor_check_auth {
|
} |
} |
|
|
sub get_version { |
sub get_version { |
|
my ($version,$previous); |
if ($env{'form.previousversion'} && |
if ($env{'form.previousversion'} && |
defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) { |
defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) { |
return $env{'form.previousversion'}; |
$version=$env{'form.previousversion'}; |
|
$previous=1; |
|
} else { |
|
$version=$Apache::lonhomework::history{'resource.version'}; |
|
$previous=0; |
} |
} |
return $Apache::lonhomework::history{'resource.version'}; |
if (wantarray) { |
|
return ($version,$previous); |
|
} |
|
return $version; |
} |
} |
|
|
sub add_previous_version_button { |
sub add_previous_version_button { |
my ($status)=@_; |
my ($status)=@_; |
my $result; |
my $result; |
if ($Apache::lonhomework::history{'resource.version'} eq '0') { |
if ($Apache::lonhomework::history{'resource.version'} eq '') { |
return ''; |
return ''; |
} |
} |
my $version=&get_version(); |
if ($Apache::lonhomework::history{'resource.version'} < 2 && |
if ($version ne $Apache::lonhomework::history{'resource.version'}) { |
$status ne 'NEEDS_CHECKIN') { |
return ''; |
return ''; |
} |
} |
|
my $version=&get_version(); |
$result.=&mt(' Show a previously done version: [_1]','<select name="previousversion"> |
if ($env{'form.previousversion'} ne '' && |
<option>Pick one</option> |
$env{'form.previousversion'} eq $version) { |
</select>'); |
$result.="<h3>".&mt("Showing previous version [_1]",$version). |
|
"</h3>\n"; |
|
} |
|
my @to_show; |
|
foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) { |
|
if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) { |
|
push(@to_show,$test_version); |
|
} |
|
} |
|
my $list='<option>'. |
|
join("</option>\n<option>",@to_show). |
|
"</option>\n"; |
|
$result.='<form name="getprevious" method="POST" action="'; |
|
my $uri=$env{'request.uri'}; |
|
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
|
$result.=$uri.'">'. |
|
&mt(' Show a previously done version: [_1]','<select onchange="this.form.submit()" name="previousversion"> |
|
<option>'.&mt('Pick one').'</option> |
|
'.$list.' |
|
</select>')."</form>"; |
return $result; |
return $result; |
} |
} |
|
|
sub add_grading_button { |
sub add_grading_button { |
my $result; |
my $result=' <input type="submit" name="gradeasubmission" value="'. |
$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" />'; |
return $result; |
return $result; |
Line 123 sub add_request_another_attempt_button {
|
Line 154 sub add_request_another_attempt_button {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub preserve_grade_info { |
|
my $result; |
|
# if we are viewing someone else preserve that info |
|
if (defined $env{'form.grade_symb'}) { |
|
foreach my $field ('symb','courseid','domain','username') { |
|
$result .= '<input type="hidden" name="grade_'.$field. |
|
'" value="'.$env{"form.grade_$field"}.'" />'."\n"; |
|
} |
|
} |
|
return $result; |
|
} |
|
|
sub start_Task { |
sub start_Task { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
Line 147 sub start_Task {
|
Line 190 sub start_Task {
|
} |
} |
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' || |
$target eq 'tex') { |
$target eq 'tex') { |
my $version=&get_version(); |
my ($version,$previous)=&get_version(); |
($status,$accessmsg,my $slot_name,$slot) = |
($status,$accessmsg,my $slot_name,$slot) = |
&Apache::lonhomework::check_task_access('0'); |
&Apache::lonhomework::check_task_access('0'); |
push(@Apache::inputtags::status,$status); |
push(@Apache::inputtags::status,$status); |
Line 157 sub start_Task {
|
Line 200 sub start_Task {
|
&Apache::run::run($expression,$safeeval); |
&Apache::run::run($expression,$safeeval); |
&Apache::lonxml::debug("Got $status"); |
&Apache::lonxml::debug("Got $status"); |
$body_tag_start.=&add_previous_version_button($status); |
$body_tag_start.=&add_previous_version_button($status); |
if (( $status eq 'CLOSED' ) || |
if (!$previous && ( |
( $status eq 'BANNED') || |
( $status eq 'CLOSED' ) || |
( $status eq 'UNAVAILABLE') || |
( $status eq 'BANNED') || |
( $status eq 'NOT_IN_A_SLOT') || |
( $status eq 'UNAVAILABLE') || |
( $status eq 'NEEDS_CHECKIN') || |
( $status eq 'NOT_IN_A_SLOT') || |
( $status eq 'WAITING_FOR_GRADE') || |
( $status eq 'NEEDS_CHECKIN') || |
( $status eq 'INVALID_ACCESS')) { |
( $status eq 'WAITING_FOR_GRADE') || |
|
( $status eq 'INVALID_ACCESS') )) { |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
if ( $target eq "web" ) { |
if ( $target eq "web" ) { |
$result.= $head_tag_start.'</head>'.$body_tag_start; |
$result.= $head_tag_start.'</head>'.$body_tag_start; |
Line 208 sub start_Task {
|
Line 252 sub start_Task {
|
$result.="$head_tag_start<title>$name</title></head> |
$result.="$head_tag_start<title>$name</title></head> |
$body_tag_start \n $form_tag_start". |
$body_tag_start \n $form_tag_start". |
'<input type="hidden" name="submitted" value="yes" />'; |
'<input type="hidden" name="submitted" value="yes" />'; |
# if we are viewing someone else preserve that info |
$result.=&preserve_grade_info(); |
if (defined $env{'form.grade_symb'}) { |
my ($version,$previous)=&get_version(); |
foreach my $field ('symb','courseid','domain','username') { |
|
$result .= '<input type="hidden" name="grade_'.$field. |
|
'" value="'.$env{"form.grade_$field"}.'" />'."\n"; |
|
} |
|
} |
|
my $version=&get_version(); |
|
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { |
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { |
$result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>'; |
$result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>'; |
$result.=&add_request_another_attempt_button(); |
if (!$previous) { |
|
$result.=&add_request_another_attempt_button(); |
|
} |
} |
} |
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { |
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { |
$result.='<h1><font color="green">'.&mt('Passed').'</font></h1>'; |
$result.='<h1><font color="green">'.&mt('Passed').'</font></h1>'; |
Line 229 sub start_Task {
|
Line 269 sub start_Task {
|
if ($target eq 'webgrade') { |
if ($target eq 'webgrade') { |
$result.=$head_tag_start.$body_tag_start.$form_tag_start; |
$result.=$head_tag_start.$body_tag_start.$form_tag_start; |
$result.='<input type="hidden" name="webgrade" value="yes" />'; |
$result.='<input type="hidden" name="webgrade" value="yes" />'; |
$result.=&show_queue(); |
$result.='<br />Before'.&show_queue('gradingqueue'); |
|
} |
|
my $todo; |
|
# don't get something new from the queue if they hit the stop button |
|
if (!($env{'form.stop'} && $target eq 'webgrade')) { |
|
$todo=&get_from_queue('gradingqueue'); |
} |
} |
my $todo=&get_from_queue(); |
|
if ($todo) { |
if ($todo) { |
&setup_env_for_other_user($todo,$safeeval); |
&setup_env_for_other_user($todo,$safeeval); |
my ($symb,$uname,$udom)=&decode_queue_key($todo); |
my ($symb,$uname,$udom)=&decode_queue_key($todo); |
Line 242 sub start_Task {
|
Line 286 sub start_Task {
|
$Apache::bridgetask::queue_key=$todo; |
$Apache::bridgetask::queue_key=$todo; |
&Apache::structuretags::initialize_storage(); |
&Apache::structuretags::initialize_storage(); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
$result.="\n".'<table width="100%" style="width:100%" border="1">'; |
if ($target eq 'webgrade') { |
|
$result.='<br />After'.&show_queue('gradingqueue'); |
|
$result.="\n".'<table width="100%" style="width:100%" border="1">'; |
|
} |
} else { |
} else { |
if ($target eq 'webgrade') { |
if ($target eq 'webgrade') { |
$result.="\n". |
$result.="\n".'<table><tr><td><b>'; |
'<table><tr><td>No user to be graded.</td></tr></table>'; |
if ($env{'form.stop'}) { |
|
$result.=&mt("Stopped grading."); |
|
} else { |
|
$result.=&mt("No user to be graded."); |
|
} |
|
$result.='</b></td></tr></table>'; |
} |
} |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
} |
} |
Line 261 sub end_Task {
|
Line 313 sub end_Task {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=''; |
my $result=''; |
my $status=$Apache::inputtags::status['-1']; |
my $status=$Apache::inputtags::status['-1']; |
my $version=&get_version(); |
my ($version,$previous)=&get_version(); |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex') { |
$target eq 'tex') { |
if ( |
if ( |
Line 269 sub end_Task {
|
Line 321 sub end_Task {
|
($target eq 'answer') || ($target eq 'tex') |
($target eq 'answer') || ($target eq 'tex') |
) { |
) { |
if ($target eq 'web') { |
if ($target eq 'web') { |
if ($status eq 'CAN_ANSWER') { |
if ($status eq 'CAN_ANSWER' && !$previous) { |
$result.="\n".'<table border="1">'. |
$result.="\n".'<table border="1">'. |
&Apache::inputtags::file_selector($version, |
&Apache::inputtags::file_selector("$version.0", |
"bridgetask","*", |
"bridgetask","*", |
'portfolioonly'). |
'portfolioonly'). |
"</table>"; |
"</table>"; |
Line 282 sub end_Task {
|
Line 334 sub end_Task {
|
$result.=&Apache::lonxml::xmlend().'</html>'; |
$result.=&Apache::lonxml::xmlend().'</html>'; |
} |
} |
} |
} |
if ($target eq 'grade' && !$env{'form.webgrade'}) { |
if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { |
my $award='SUBMITTED'; |
my $award='SUBMITTED'; |
&Apache::essayresponse::file_submission('0','bridgetask', |
&Apache::essayresponse::file_submission("$version.0",'bridgetask', |
'portfiles',\$award); |
'portfiles',\$award); |
if ($award eq 'SUBMITTED' && |
if ($award eq 'SUBMITTED' && |
$Apache::lonhomework::results{"resource.$version.bridgetask.portfiles"}) { |
$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) { |
$Apache::lonhomework::results{"resource.$version.tries"}= |
$Apache::lonhomework::results{"resource.0.tries"}= |
1+$Apache::lonhomework::history{"resource.$version.tries"}; |
$Apache::lonhomework::results{"resource.$version.0.tries"}= |
|
1+$Apache::lonhomework::history{"resource.$version.0.tries"}; |
|
|
|
$Apache::lonhomework::results{"resource.0.award"}= |
|
$Apache::lonhomework::results{"resource.$version.0.award"}= |
|
$award; |
} |
} |
$Apache::lonhomework::results{"resource.$version.award"}=$award; |
|
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
&add_to_queue(); |
&add_to_queue('gradingqueue'); |
} |
} |
} |
} |
if ($target eq 'grade' && $env{'form.webgrade'}) { |
if ($target eq 'grade' && $env{'form.webgrade'}) { |
Line 333 sub end_Task {
|
Line 389 sub end_Task {
|
&move_to_review_queue(); |
&move_to_review_queue(); |
} elsif ($ungraded) { |
} elsif ($ungraded) { |
$Apache::lonhomework::results{"resource.$version.status"}='ungraded'; |
$Apache::lonhomework::results{"resource.$version.status"}='ungraded'; |
&check_queue_unlock(); |
&check_queue_unlock('gradingqueue'); |
} elsif ($mandatory_failed) { |
} elsif ($mandatory_failed) { |
$Apache::lonhomework::results{"resource.$version.status"}='fail'; |
$Apache::lonhomework::results{"resource.$version.status"}='fail'; |
$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override'; |
$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override'; |
$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT'; |
$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT'; |
$Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; |
$Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; |
&remove_from_queue(); |
&remove_from_queue('gradingqueue'); |
} else { |
} else { |
$Apache::lonhomework::results{"resource.$version.status"}='pass'; |
$Apache::lonhomework::results{"resource.$version.status"}='pass'; |
$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; |
$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; |
Line 349 sub end_Task {
|
Line 405 sub end_Task {
|
} |
} |
$Apache::lonhomework::results{"resource.status"}= |
$Apache::lonhomework::results{"resource.status"}= |
$Apache::lonhomework::results{"resource.$version.status"}; |
$Apache::lonhomework::results{"resource.$version.status"}; |
if (defined($Apache::lonhomework::results{"resource.$version.awarded"})) { |
if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) { |
$Apache::lonhomework::results{"resource.0.award"}= |
$Apache::lonhomework::results{"resource.0.award"}= |
$Apache::lonhomework::results{"resource.$version.award"}; |
$Apache::lonhomework::results{"resource.$version.award"}; |
$Apache::lonhomework::results{"resource.0.awarded"}= |
$Apache::lonhomework::results{"resource.0.awarded"}= |
Line 380 sub end_Task {
|
Line 436 sub end_Task {
|
} |
} |
|
|
sub move_to_review_queue { |
sub move_to_review_queue { |
|
|
&Apache::lonxml::debug("Want to move"); |
&Apache::lonxml::debug("Want to move"); |
} |
} |
|
|
sub check_queue_unlock { |
sub check_queue_unlock { |
&Apache::lonxml::debug("Want to unlock?"); |
my ($queue)=@_; |
|
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
my $cnum=$env{'course.'.$cid.'.num'}; |
|
my $cdom=$env{'course.'.$cid.'.domain'}; |
|
my $key="$symb\0queue\0$uname\@$udom"; |
|
my $me=$env{'user.name'}.'@'.$env{'user.domain'}; |
|
my $who=&queue_key_locked($queue,$key,$cdom,$cnum); |
|
if ($who eq $me) { |
|
&Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); |
|
} |
} |
} |
|
|
sub remove_from_queue { |
sub remove_from_queue { |
&Apache::lonxml::debug("Want to remove. Done?"); |
my ($queue)=@_; |
|
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
my $cnum=$env{'course.'.$cid.'.num'}; |
|
my $cdom=$env{'course.'.$cid.'.domain'}; |
|
my $key="$symb\0queue\0$uname\@$udom"; |
|
my @keys=($key,"$key\0locked"); |
|
&Apache::lonnet::del($queue,\@keys,$cdom,$cnum); |
} |
} |
|
|
sub setup_env_for_other_user { |
sub setup_env_for_other_user { |
my ($queue_key,$safeeval)=@_; |
my ($queue_key,$safeeval)=@_; |
my ($symb,$uname,$udom)=&decode_queue_key($queue_key); |
my ($symb,$uname,$udom)=&decode_queue_key($queue_key); |
|
&Apache::lonxml::debug("setup_env for $queue_key"); |
$env{'form.grade_symb'}=$symb; |
$env{'form.grade_symb'}=$symb; |
$env{'form.grade_domain'}=$udom; |
$env{'form.grade_domain'}=$udom; |
$env{'form.grade_username'}=$uname; |
$env{'form.grade_username'}=$uname; |
Line 402 sub setup_env_for_other_user {
|
Line 475 sub setup_env_for_other_user {
|
} |
} |
|
|
sub add_to_queue { |
sub add_to_queue { |
|
my ($queue)=@_; |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my %data; |
my %data; |
$data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name]; |
$data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name]; |
&Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum); |
&Apache::lonnet::put($queue,\%data,$cdom,$cnum); |
} |
} |
|
|
sub show_queue { |
sub show_queue { |
|
my ($queue)=@_; |
my $result; |
my $result; |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $regexp="^$symb\0"; |
my $regexp="^$symb\0"; |
my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); |
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
$result.="\n<h3>Current Queue</h3><table><tr><th>resource</th>". |
$result.="\n<h3>Current Queue</h3><table border='1'><tr><th>resource</th>". |
"<th>user</th><th>type</th><th>data</th></tr>"; |
"<th>user</th><th>type</th><th>data</th></tr>"; |
foreach my $key (sort(keys(%queue))) { |
foreach my $key (sort(keys(%queue))) { |
if ($key=~/locked$/) { |
if ($key=~/locked$/) { |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
my $title=&Apache::lonnet::gettitle($symb); |
my $title=&Apache::lonnet::gettitle($symb); |
$result.="<tr><td>$title</td><td>$uname</td><td>"; |
$result.="<tr><td>$title</td><td>$uname</td>"; |
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>'; |
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>'; |
} elsif ($key=~/timestamp$/) { |
} elsif ($key=~/timestamp$/) { |
my ($symb,undef) = split("\0",$key); |
my ($symb,undef) = split("\0",$key); |
my $title=&Apache::lonnet::gettitle($symb); |
my $title=&Apache::lonnet::gettitle($symb); |
$result.="<tr><td>$title</td><td></td><td>"; |
$result.="<tr><td>$title</td><td></td>"; |
$result.='<td>last queue modification time</td><td>'. |
$result.='<td>last queue modification time</td><td>'. |
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>"; |
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>"; |
} else { |
} else { |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
my $title=&Apache::lonnet::gettitle($symb); |
my $title=&Apache::lonnet::gettitle($symb); |
$result.="<tr><td>$title</td><td>$uname</td><td>"; |
$result.="<tr><td>$title</td><td>$uname</td>"; |
my $slot=$queue{$key}->[0]; |
my $slot=$queue{$key}->[0]; |
my %slot_data=&Apache::lonnet::get_slot($slot); |
my %slot_data=&Apache::lonnet::get_slot($slot); |
$result.='<td>queue entry</td><td>End time: '. |
$result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '. |
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}). |
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}). |
"</td></tr>"; |
"</td></tr>"; |
} |
} |
Line 454 sub decode_queue_key {
|
Line 529 sub decode_queue_key {
|
} |
} |
|
|
sub queue_key_locked { |
sub queue_key_locked { |
my ($key,$cdom,$cnum)=@_; |
my ($queue,$key,$cdom,$cnum)=@_; |
my ($key_locked,$value)= |
my ($key_locked,$value)= |
&Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum); |
&Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum); |
if ($key_locked eq "$key\0locked") { |
if ($key_locked eq "$key\0locked") { |
return $value; |
return $value; |
} |
} |
Line 464 sub queue_key_locked {
|
Line 539 sub queue_key_locked {
|
} |
} |
|
|
sub pick_from_queue_data { |
sub pick_from_queue_data { |
my ($check_section,$queue,$cdom,$cnum)=@_; |
my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_; |
foreach my $key (keys(%$queue)) { |
foreach my $key (keys(%$queuedata)) { |
my ($symb,$uname,$udom)=&decode_queue_key($key); |
my ($symb,$uname,$udom)=&decode_queue_key($key); |
if ($check_section) { |
if ($check_section) { |
my $section=&Apache::lonnet::getsection($uname,$udom); |
my $section=&Apache::lonnet::getsection($uname,$udom); |
Line 474 sub pick_from_queue_data {
|
Line 549 sub pick_from_queue_data {
|
next; |
next; |
} |
} |
} |
} |
my $slot=$queue->{$key}[0]; |
my $slot=$queuedata->{$key}[0]; |
my %slot_data=&Apache::lonnet::get_slot($slot); |
my %slot_data=&Apache::lonnet::get_slot($slot); |
if ($slot_data{'endtime'} > time) { |
if ($slot_data{'endtime'} > time) { |
&Apache::lonnet::logthis("not time"); |
&Apache::lonnet::logthis("not time"); |
next; |
next; |
} |
} |
if (&queue_key_locked($key,$cdom,$cnum)) { |
if (&queue_key_locked($queue,$key,$cdom,$cnum)) { |
&Apache::lonnet::logthis("someone already has um."); |
&Apache::lonnet::logthis("someone already has um."); |
next; |
next; |
} |
} |
Line 490 sub pick_from_queue_data {
|
Line 565 sub pick_from_queue_data {
|
} |
} |
|
|
sub find_mid_grade { |
sub find_mid_grade { |
my ($symb,$cdom,$cnum)=@_; |
my ($queue,$symb,$cdom,$cnum)=@_; |
my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'}); |
my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'}); |
my $me=$env{'user.name'}.'@'.$env{'user.domain'}; |
my $me=$env{'user.name'}.'@'.$env{'user.domain'}; |
if ($todo) { |
if ($todo) { |
my $who=&queue_key_locked($todo,$cdom,$cnum); |
my $who=&queue_key_locked($queue,$todo,$cdom,$cnum); |
if ($who eq $me) { return $todo; } |
if ($who eq $me) { return $todo; } |
} |
} |
my $regexp="^$symb\0.*\0locked\$"; |
my $regexp="^$symb\0.*\0locked\$"; |
my %locks=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); |
my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
foreach my $key (keys(%locks)) { |
foreach my $key (keys(%locks)) { |
my $who=$locks{$key}; |
my $who=$locks{$key}; |
if ($who eq $me) { |
if ($who eq $me) { |
Line 511 sub find_mid_grade {
|
Line 586 sub find_mid_grade {
|
} |
} |
|
|
sub get_from_queue { |
sub get_from_queue { |
|
my ($queue)=@_; |
my $result; |
my $result; |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $todo; |
my $todo; |
# FIXME need to find if I am 'mid grading' |
# FIXME need to find if I am 'mid grading' |
$todo=&find_mid_grade($symb,$cdom,$cnum); |
$todo=&find_mid_grade($queue,$symb,$cdom,$cnum); |
&Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo))); |
&Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo))); |
if ($todo) { return $todo; } |
if ($todo) { return $todo; } |
while (1) { |
while (1) { |
my $starttime=time; |
my $starttime=time; |
&Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime}, |
&Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime}, |
$cdom,$cnum); |
$cdom,$cnum); |
&Apache::lonnet::logthis("$starttime"); |
&Apache::lonnet::logthis("$starttime"); |
my $regexp="^$symb\0queue\0"; |
my $regexp="^$symb\0queue\0"; |
my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); |
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
#make a pass looking for a user in my section |
#make a pass looking for a user in my section |
if ($env{'request.course.sec'}) { |
if ($env{'request.course.sec'}) { |
&Apache::lonnet::logthis("sce"); |
&Apache::lonnet::logthis("sce"); |
$todo=&pick_from_queue_data($env{'request.course.sec'},\%queue, |
$todo=&pick_from_queue_data($queue,$env{'request.course.sec'}, |
$cdom,$cnum); |
\%queue,$cdom,$cnum); |
&Apache::lonnet::logthis("sce $todo"); |
&Apache::lonnet::logthis("sce $todo"); |
} |
} |
# no one in our section so look for any user that is ready for grading |
# no one in our section so look for any user that is ready for grading |
Line 545 sub get_from_queue {
|
Line 621 sub get_from_queue {
|
if (!$todo) { last; } |
if (!$todo) { last; } |
&Apache::lonnet::logthis("got $todo"); |
&Apache::lonnet::logthis("got $todo"); |
# otherwise found someone so lets try to lock them |
# otherwise found someone so lets try to lock them |
my $success=&Apache::lonnet::newput('gradingqueue', |
my $success=&Apache::lonnet::newput($queue, |
{"$todo\0locked"=> |
{"$todo\0locked"=> |
$env{'user.name'}.'@'.$env{'user.domain'}}, |
$env{'user.name'}.'@'.$env{'user.domain'}}, |
$cdom,$cnum); |
$cdom,$cnum); |
Line 553 sub get_from_queue {
|
Line 629 sub get_from_queue {
|
&Apache::lonnet::logthis("success $todo"); |
&Apache::lonnet::logthis("success $todo"); |
if ($success ne 'ok') { next; } |
if ($success ne 'ok') { next; } |
my (undef,$endtime)= |
my (undef,$endtime)= |
&Apache::lonnet::get('gradingqueue',["$symb\0timestamp"], |
&Apache::lonnet::get($queue,["$symb\0timestamp"], |
$cdom,$cnum); |
$cdom,$cnum); |
&Apache::lonnet::logthis("emd $endtime"); |
&Apache::lonnet::logthis("emd $endtime"); |
# someone else already modified the queue, |
# someone else already modified the queue, |
Line 562 sub get_from_queue {
|
Line 638 sub get_from_queue {
|
# double check. |
# double check. |
if ($endtime != $starttime) { |
if ($endtime != $starttime) { |
my ($key,$value)= |
my ($key,$value)= |
&Apache::lonnet::get('gradingqueue',["$todo"], |
&Apache::lonnet::get($queue,["$todo"], |
$cdom,$cnum); |
$cdom,$cnum); |
&Apache::lonnet::logthis("check $key .. $value"); |
&Apache::lonnet::logthis("check $key .. $value"); |
if ($key eq $todo && ref($value)) { |
if ($key eq $todo && ref($value)) { |
} else { |
} else { |
&Apache::lonnet::del('gradingqueue',["$todo\0locked"], |
&Apache::lonnet::del($queue,["$todo\0locked"], |
$cdom,$cnum); |
$cdom,$cnum); |
&Apache::lonnet::logthis("del"); |
&Apache::lonnet::logthis("del"); |
next; |
next; |
Line 625 sub get_instance {
|
Line 701 sub get_instance {
|
#then start repicking |
#then start repicking |
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(); |
my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); |
my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); |
return $order[0]; |
my $num=@order; |
|
my $version=&get_version(); |
|
my $which=($version-1)%$num; |
|
return $order[$which]; |
} |
} |
|
|
{ |
{ |
Line 673 sub get_instance {
|
Line 752 sub get_instance {
|
'<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'. |
'<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'. |
'</td>'. |
'</td>'. |
'<td>'. |
'<td>'. |
'<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'. |
'<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>'.&mt('Ungraded').'</label></nobr><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />Pass</label><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />Fail</label><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />Review</label><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'. |
'</td>'. |
'</td>'. |
'<td>'. |
'<td>'. |
'<a href="#'.$last_link.'">Prev</a><br />'. |
'<a href="#'.$last_link.'">Prev</a><br />'. |
'<a href="#next_'.$link.'">Next</a><br /><br /><br />'. |
'<a href="#next_'.$link.'">Next</a><br /><br /><br />'. |
'<input type="submit" name="next" value="'. |
'<input type="submit" name="next" value="'. |
&mt('Done').'" /> '. |
&mt('Done').'" /> '. |
|
'<input type="submit" name="stop" value="'. |
|
&mt('Stop').'" /> '. |
'</td></tr>'; |
'</td></tr>'; |
$result.='<tr><td colspan="4">'; |
$result.='<tr><td colspan="4">'; |
my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); |
my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); |