--- loncom/homework/bridgetask.pm 2005/05/24 22:06:39 1.31 +++ loncom/homework/bridgetask.pm 2005/05/27 17:08:03 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.31 2005/05/24 22:06:39 albertel Exp $ +# $Id: bridgetask.pm,v 1.32 2005/05/27 17:08:03 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -144,6 +144,12 @@ sub add_grading_button { my $result=' '; $result.=''; + if ( 1) { + #need a permissions for limitng this to 'powerful users' + #check if review queue has items + $result.=' '; + } return $result; } @@ -266,42 +272,56 @@ sub start_Task { } } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) || $target eq 'webgrade') { + my $webgrade='yes'; if ($target eq 'webgrade') { - $result.=$head_tag_start.$body_tag_start.$form_tag_start; - $result.=''; + #FIXME FORM conflcit with the 'show queue',1 + $result.=$head_tag_start.$body_tag_start; $result.='
Review'.&show_queue('reviewqueue'); $result.='
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'); - } - if ($todo) { - &setup_env_for_other_user($todo,$safeeval); - my ($symb,$uname,$udom)=&decode_queue_key($todo); - $result.="\n".'
Found '. - &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'
'; - $result.=''; - $Apache::bridgetask::queue_key=$todo; - &Apache::structuretags::initialize_storage(); - &Apache::lonhomework::showhash(%Apache::lonhomework::history); - if ($target eq 'webgrade') { - $result.='
After'.&show_queue('gradingqueue'); - $result.="\n".''; - } + if (defined($env{'form.reviewasubmission'})) { + $result.=&show_queue('reviewqueue',1); + my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); } else { - if ($target eq 'webgrade') { - $result.="\n".'
'; - if ($env{'form.stop'}) { - $result.=&mt("Stopped grading."); - } else { - $result.=&mt("No user to be graded."); + my ($todo,$status_code)=&get_key_todo($target); + if ($todo) { + &setup_env_for_other_user($todo,$safeeval); + my ($symb,$uname,$udom)=&decode_queue_key($todo); + $result.="\n".'
Found '. + &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'
'; + $result.=''; + $Apache::bridgetask::queue_key=$todo; + &Apache::structuretags::initialize_storage(); + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + if ($target eq 'webgrade') { + $result.='
After'.&show_queue('gradingqueue'); + $result.="\n".''; } - $result.='
'; + } else { + if ($target eq 'webgrade') { + $result.="\n".'
'; + if ($status_code eq 'stop') { + $result.=&mt("Stopped grading."); + } elsif ($status_code eq 'lock_failed') { + $result.=&mt("Failed to lock the request record."); + } elsif ($status_code eq 'unlock') { + $result.=&mt("Unlocked the requested user."); + } else { + $result.=&mt("No user to be graded."); + } + $result.='
'; + } + $webgrade='no'; + my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); } - my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); + } + if ($target eq 'webgrade' && defined($env{'form.queue'})) { + $result.=$form_tag_start; + $result.=''; + $result.=''; } } else { # page_start returned a starting result, delete it if we don't need it @@ -310,6 +330,41 @@ sub start_Task { return $result; } +sub get_key_todo { + my ($target)=@_; + my $todo; + my $queue=$env{'form.queue'}; + if (!defined($queue)) { + $env{'form.queue'}=$queue='gradingqueue'; + } + my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'}); + if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'}) + && !defined($env{'form.action'})) { + #FIXME probably need to do some cheking here for more validity + &Apache::lonnet::logthis("Found a key was given to me"); + return ($gradingkey); + } + if ($env{'form.action'} eq 'resume') { + &Apache::lonnet::logthis("Resuming a key"); + return ($gradingkey); + } elsif ($env{'form.action'} eq 'unlock') { + &Apache::lonnet::logthis("Unlocking a key ". + &check_queue_unlock($queue,$gradingkey,1)); + return (undef,'unlock'); + } elsif ($env{'form.action'} eq 'select') { + if (&lock_key($queue,$gradingkey)) { + return ($gradingkey); + } + return (undef,'lock_failed'); + } + # don't get something new from the queue if they hit the stop button + if (!($env{'form.stop'} && $target eq 'webgrade')) { + return (&get_from_queue($queue)); + } else { + return (undef,'stop'); + } +} + sub end_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; @@ -355,7 +410,7 @@ sub end_Task { &add_to_queue('gradingqueue',$Apache::inputtags::slot_name); } } - if ($target eq 'grade' && $env{'form.webgrade'}) { + if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') { my $optional_required= &Apache::lonxml::get_param('OptionalRequired',$parstack, $safeeval); @@ -387,22 +442,24 @@ sub end_Task { $env{'user.name'}.'@'.$env{'user.domain'}; if ($review) { $Apache::lonhomework::results{"resource.$version.status"}='review'; + # FIXME won't work well when already in review queues &move_between_queues('gradingqueue','reviewqueue'); } elsif ($ungraded) { $Apache::lonhomework::results{"resource.$version.status"}='ungraded'; - &check_queue_unlock('gradingqueue'); + # FIXME if in review queue need to move back to grading queue + &check_queue_unlock($env{'form.queue'}); } elsif ($mandatory_failed) { $Apache::lonhomework::results{"resource.$version.status"}='fail'; $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override'; $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; - &remove_from_queue('gradingqueue'); + &remove_from_queue($env{'form.queue'}); } else { $Apache::lonhomework::results{"resource.$version.status"}='pass'; $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='1'; - &remove_from_queue('grading_queue'); + &remove_from_queue($env{'form.queue'}); } $Apache::lonhomework::results{"resource.status"}= $Apache::lonhomework::results{"resource.$version.status"}; @@ -449,16 +506,22 @@ sub move_between_queues { } sub check_queue_unlock { - my ($queue)=@_; + my ($queue,$key,$allow_not_me)=@_; my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + if (!defined($key)) { + $key="$symb\0queue\0$uname\@$udom"; + } 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); + return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); + } elsif ($allow_not_me) { + &Apache::lonnet::logthis("unlocking $who by $me"); + return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); } + return 'not_owner'; } sub remove_from_queue { @@ -506,7 +569,7 @@ sub add_to_queue { } sub show_queue { - my ($queue)=@_; + my ($queue,$with_selects)=@_; my $result; my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; @@ -517,24 +580,49 @@ sub show_queue { if ($tmp=~/^error: 2 /) { return "\n

Current Queue

Empty
"; } - $result.="\n

Current Queue

". - ""; + $result.="\n

Current Queue

resourceusertypedata
"; + if ($with_selects) { $result.=""; } + $result.=""; foreach my $key (sort(keys(%queue))) { - if ($key=~/locked$/) { + if ($key=~/locked$/ && !$with_selects) { my ($symb,$uname,$udom) = &decode_queue_key($key); my $title=&Apache::lonnet::gettitle($symb); $result.=""; $result.=''; - } elsif ($key=~/timestamp$/) { + } elsif ($key=~/timestamp$/ && !$with_selects) { my ($symb,undef) = split("\0",$key); my $title=&Apache::lonnet::gettitle($symb); $result.=""; $result.='"; - } else { + } elsif ($key!~/(timestamp|locked)$/) { my ($symb,$uname,$udom) = &decode_queue_key($key); my $title=&Apache::lonnet::gettitle($symb); - $result.=""; + $result.=""; + if ($with_selects) { + my $ekey=&Apache::lonnet::escape($key); + my ($action,$description)=('select',&mt('Select')); + if (exists($queue{"$key\0locked"})) { + my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + if ($me eq $queue{"$key\0locked"}) { + ($action,$description)=('resume',&mt('Resume')); + } else { + ($action,$description)=('unlock',&mt('Unlock')); + } + } + $result.=(< +
+ + + + + + + +FORM + } + $result.=""; my $slot=$queue{$key}->[0]; my %slot_data=&Apache::lonnet::get_slot($slot); $result.='
resourceusertypedata
$title$unamelock'.$queue{$key}.'
$titlelast queue modification time'. &Apache::lonlocal::locallocaltime($queue{$key})."
$title$uname
$title$unamequeue entrySlot: '.$slot.' End time: '. @@ -610,15 +698,28 @@ sub find_mid_grade { return undef; } +sub lock_key { + my ($queue,$todo)=@_; + my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + my (undef,$cid)=&Apache::lonxml::whichuser(); + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me}, + $cdom,$cnum); + &Apache::lonnet::logthis("success $success $todo"); + if ($success eq 'ok') { + return 1; + } + return 0; +} + sub get_from_queue { my ($queue)=@_; my $result; my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my $todo; - # FIXME need to find if I am 'mid grading' - $todo=&find_mid_grade($queue,$symb,$cdom,$cnum); + my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum); &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo))); if ($todo) { return $todo; } while (1) { @@ -646,13 +747,8 @@ sub get_from_queue { if (!$todo) { last; } &Apache::lonnet::logthis("got $todo"); # otherwise found someone so lets try to lock them - my $success=&Apache::lonnet::newput($queue, - {"$todo\0locked"=> - $env{'user.name'}.'@'.$env{'user.domain'}}, - $cdom,$cnum); - # someone else already picked them - &Apache::lonnet::logthis("success $todo"); - if ($success ne 'ok') { next; } + # unless someone else already picked them + if (!&lock_key($queue,$todo)) { next; } my (undef,$endtime)= &Apache::lonnet::get($queue,["$symb\0timestamp"], $cdom,$cnum); @@ -721,9 +817,6 @@ sub start_Dimension { } sub get_instance { - #FIXME just grabbing the first one for now, need - #to randomly pick one until all have been seen - #then start repicking &Apache::response::pushrandomnumber(); my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); my $num=@order;