--- loncom/homework/bridgetask.pm 2005/05/20 21:23:42 1.29 +++ loncom/homework/bridgetask.pm 2005/05/31 16:27:43 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.29 2005/05/20 21:23:42 albertel Exp $ +# $Id: bridgetask.pm,v 1.34 2005/05/31 16:27:43 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -144,6 +144,20 @@ sub add_grading_button { my $result=' '; $result.=''; + if ( 1) { + #need a permissions for limitng this to 'powerful users' + + my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); + $result.='
'.&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.='
'."\n"; + + ($entries,$ready,$locks)=&get_queue_counts('reviewqueue'); + $result.=''.&mt("Review Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks); + $result.='
'."\n"; + } return $result; } @@ -154,6 +168,18 @@ sub add_request_another_attempt_button { 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 .= ''."\n"; + } + } + return $result; +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -240,13 +266,7 @@ sub start_Task { $result.="$head_tag_startFound '. &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.' |
No user to be graded. |
resource | ". - "user | type | data |
---|
Empty |
"; } + $result.=" | resource | user | type | data | |
---|---|---|---|---|---|
$title | $uname | "; $result.='lock | '.$queue{$key}.' | ||
$title | "; $result.=' | last queue modification time | '. &Apache::lonlocal::locallocaltime($queue{$key})." | ||
$title | $uname | "; + $result.="||||
$title | $uname | "; my $slot=$queue{$key}->[0]; my %slot_data=&Apache::lonnet::get_slot($slot); $result.='queue entry | Slot: '.$slot.' End time: '. @@ -489,6 +697,37 @@ sub show_queue { return $result; } +sub get_queue_counts { + 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 $regexp="^$symb\0"; + my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); + my ($tmp)=%queue; + if ($tmp=~/^error: 2 /) { + return (0,0,0); + } + my ($entries,$ready_to_grade,$locks)=(0,0,0); + foreach my $key (sort(keys(%queue))) { + if ($key=~/locked$/) { + $locks++; + } elsif ($key=~/timestamp$/) { + #ignore + } elsif ($key!~/(timestamp|locked)$/) { + my ($symb,$uname,$udom) = &decode_queue_key($key); + $entries++; + my $slot=$queue{$key}->[0]; + my %slot_data=&Apache::lonnet::get_slot($slot); + if (time > $slot_data{'endtime'}) { + $ready_to_grade++; + } + } + } + return ($entries,$ready_to_grade,$locks); +} + sub decode_queue_key { my ($key)=@_; my ($symb,undef,$user) = split("\0",$key); @@ -497,9 +736,14 @@ sub decode_queue_key { } sub queue_key_locked { - my ($key,$cdom,$cnum)=@_; + my ($queue,$key,$cdom,$cnum)=@_; + if (!defined($cdom) || !defined($cnum)) { + my (undef,$cid)=&Apache::lonxml::whichuser(); + $cnum=$env{'course.'.$cid.'.num'}; + $cdom=$env{'course.'.$cid.'.domain'}; + } 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") { return $value; } @@ -507,24 +751,24 @@ sub queue_key_locked { } sub pick_from_queue_data { - my ($check_section,$queue,$cdom,$cnum)=@_; - foreach my $key (keys(%$queue)) { + my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_; + foreach my $key (keys(%$queuedata)) { my ($symb,$uname,$udom)=&decode_queue_key($key); if ($check_section) { my $section=&Apache::lonnet::getsection($uname,$udom); if ($section eq $check_section) { - &Apache::lonnet::logthis("my sec"); + &Apache::lonxml::debug("my sec"); next; } } - my $slot=$queue->{$key}[0]; + my $slot=$queuedata->{$key}[0]; my %slot_data=&Apache::lonnet::get_slot($slot); if ($slot_data{'endtime'} > time) { - &Apache::lonnet::logthis("not time"); + &Apache::lonxml::debug("not time"); next; } - if (&queue_key_locked($key,$cdom,$cnum)) { - &Apache::lonnet::logthis("someone already has um."); + if (&queue_key_locked($queue,$key,$cdom,$cnum)) { + &Apache::lonxml::debug("someone already has um."); next; } return $key; @@ -533,15 +777,15 @@ sub pick_from_queue_data { } sub find_mid_grade { - my ($symb,$cdom,$cnum)=@_; + my ($queue,$symb,$cdom,$cnum)=@_; my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'}); my $me=$env{'user.name'}.'@'.$env{'user.domain'}; 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; } } 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)) { my $who=$locks{$key}; if ($who eq $me) { @@ -553,70 +797,80 @@ 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::lonxml::debug("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($symb,$cdom,$cnum); - &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo))); + my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum); + &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo))); if ($todo) { return $todo; } while (1) { my $starttime=time; - &Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime}, + &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime}, $cdom,$cnum); - &Apache::lonnet::logthis("$starttime"); + &Apache::lonxml::debug("$starttime"); my $regexp="^$symb\0queue\0"; - my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); - #make a pass looking for a user in my section + my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); + #make a pass looking for a user _not_ in my section if ($env{'request.course.sec'}) { - &Apache::lonnet::logthis("sce"); - $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue, - $cdom,$cnum); - &Apache::lonnet::logthis("sce $todo"); + &Apache::lonxml::debug("sce"); + $todo=&pick_from_queue_data($queue,$env{'request.course.sec'}, + \%queue,$cdom,$cnum); + &Apache::lonxml::debug("sce $todo"); } - # no one in our section so look for any user that is ready for grading + # no one _not_ in our section so look for any user that is + # ready for grading if (!$todo) { - &Apache::lonnet::logthis("no sce"); - $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue, - $cdom,$cnum); - &Apache::lonnet::logthis("no sce $todo"); + &Apache::lonxml::debug("no sce"); + $todo=&pick_from_queue_data($queue,$env{'request.course.sec'}, + \%queue,$cdom,$cnum); + &Apache::lonxml::debug("no sce $todo"); } # no user to grade if (!$todo) { last; } - &Apache::lonnet::logthis("got $todo"); + &Apache::lonxml::debug("got $todo"); # otherwise found someone so lets try to lock them - my $success=&Apache::lonnet::newput('gradingqueue', - {"$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('gradingqueue',["$symb\0timestamp"], + &Apache::lonnet::get($queue,["$symb\0timestamp"], $cdom,$cnum); - &Apache::lonnet::logthis("emd $endtime"); + &Apache::lonxml::debug("emd $endtime"); # someone else already modified the queue, # perhaps our picked user wass already fully graded between # when we picked him and when we locked his record? so lets # double check. if ($endtime != $starttime) { my ($key,$value)= - &Apache::lonnet::get('gradingqueue',["$todo"], + &Apache::lonnet::get($queue,["$todo"], $cdom,$cnum); - &Apache::lonnet::logthis("check $key .. $value"); + &Apache::lonxml::debug("check $key .. $value"); if ($key eq $todo && ref($value)) { } else { - &Apache::lonnet::del('gradingqueue',["$todo\0locked"], + &Apache::lonnet::del($queue,["$todo\0locked"], $cdom,$cnum); - &Apache::lonnet::logthis("del"); + &Apache::lonxml::debug("del"); next; } } - &Apache::lonnet::logthis("last $todo"); + &Apache::lonxml::debug("last $todo"); last; } return $todo; @@ -663,9 +917,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; @@ -719,16 +970,18 @@ sub get_instance { ''. ' | '. ''.
- ' '. - ' '. - ' '. - ' '. + ' '. + ' '. + ' '. + ' '. ' | '.
''.
'Prev '. 'Next '. ' '. + ' '. ' |
'; my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); |