version 1.29, 2005/05/20 21:23:42
|
version 1.30, 2005/05/24 19:33:28
|
Line 154 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 240 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'}) { |
|
foreach my $field ('symb','courseid','domain','username') { |
|
$result .= '<input type="hidden" name="grade_'.$field. |
|
'" value="'.$env{"form.grade_$field"}.'" />'."\n"; |
|
} |
|
} |
|
my ($version,$previous)=&get_version(); |
my ($version,$previous)=&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>'; |
Line 263 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 276 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 333 sub end_Task {
|
Line 351 sub end_Task {
|
&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 371 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 418 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 { |
|
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 $key="$symb\0queue\0$uname\@$udom"; |
my $key="$symb\0queue\0$uname\@$udom"; |
my @keys=($key,"$key\0locked"); |
my @keys=($key,"$key\0locked"); |
&Apache::lonnet::del('gradingqueue',\@keys,$cdom,$cnum); |
&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 445 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 border='1'><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))) { |
Line 497 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 507 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 517 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 533 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 554 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 588 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 596 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 605 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 719 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(); |