--- loncom/homework/bridgetask.pm 2005/04/05 15:39:41 1.10 +++ loncom/homework/bridgetask.pm 2005/05/03 05:31:51 1.15 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.10 2005/04/05 15:39:41 albertel Exp $ +# $Id: bridgetask.pm,v 1.15 2005/05/03 05:31:51 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,18 +52,20 @@ sub initialize_bridgetask { @Apache::bridgetask::instance=(); # list of all Instance ids seen in this problem @Apache::bridgetask::instancelist=(); + # key of queud user data that we are currently grading + $Apache::bridgetask::queue_key=''; } sub proctor_check_auth { my ($slot)=@_; - my $user=$ENV{'form.proctorname'}; - my $domain=$ENV{'form.proctordomain'}; + my $user=$env{'form.proctorname'}; + my $domain=$env{'form.proctordomain'}; my @allowed=split(",",$slot->{'proctor'}); foreach my $possible (@allowed) { my ($puser,$pdom)=(split('@',$possible)); if ($puser eq $user && $pdom eq $domain) { - my $authhost=&Apache::lonnet::authenticate($puser,$ENV{'form.proctorpassword'},$pdom); + my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom); if ($authhost ne 'no_host') { $Apache::lonhomework::results{'resource.checkedin'}= $user.'@'.$domain; @@ -82,12 +84,19 @@ sub add_previous_version_button { return $result; } +sub add_grading_button { + my $result; + $result.=' '; + $result.=''; + return $result; +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; &Apache::structuretags::initialize_storage(); &Apache::lonhomework::showhash(%Apache::lonhomework::history); - my ($status,$accessmsg,$slot); $Apache::lonhomework::parsing_a_task=1; #should get back a or the neccesary stuff to start XML/MathML @@ -96,12 +105,19 @@ sub start_Task { if ($target eq 'web') { $body_tag_start.=&add_previous_version_button(); + if ($Apache::lonhomework::modifygrades) { + $body_tag_start.='
'.&add_grading_button()."
"; + } } if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { - ($status,$accessmsg,$slot) = + ($status,$accessmsg,my $slot_name,$slot) = &Apache::lonhomework::check_task_access('0'); push(@Apache::inputtags::status,$status); + $Apache::inputtags::slot_name=$slot_name; my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; &Apache::run::run($expression,$safeeval); @@ -152,13 +168,30 @@ sub start_Task { $body_tag_start \n $form_tag_start". ''; # if we are viewing someone else preserve that info - if (defined $ENV{'form.grade_symb'}) { + if (defined $env{'form.grade_symb'}) { foreach my $field ('symb','courseid','domain','username') { $result .= ''."\n"; + '" value="'.$env{"form.grade_$field"}.'" />'."\n"; } } } + } elsif ($target eq 'webgrade') { + $result.=$head_tag_start.$body_tag_start.$form_tag_start; + $result.=&show_queue(); + my $todo=&get_from_queue(); + if ($todo) { + my ($symb,$uname,$udom)=&decode_queue_key($todo); + $result.="\n".'
Found'. + $symb.':'.$uname.':'.$udom.'
'; + $result.=''; + $Apache::bridgetask::queue_key=$todo; + } else { + $result.="\n". + '
No user to be graded.
'; + my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); + } + } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -173,29 +206,46 @@ sub end_Task { if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { if ( - (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) || + (($target eq 'web') && ($env{'request.state'} ne 'construct')) || ($target eq 'answer') || ($target eq 'tex') ) { if ($target eq 'web') { if ($status eq 'CAN_ANSWER') { - $result.=''. + $result.="\n".'
'. &Apache::inputtags::file_selector('0',"bridgetask","*", 'portfolioonly'). "
"; $result.=&Apache::inputtags::gradestatus('0'); } + } + if ($target eq 'web' || $target eq 'webgrade') { $result.=&Apache::lonxml::xmlend().''; } } if ($target eq 'grade') { - &Apache::essayresponse::file_submission('0','bridgetask','portfiles','SUBMITTED'); - if ($Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) { + my $award='SUBMITTED'; + &Apache::essayresponse::file_submission('0','bridgetask','portfiles',\$award); + if ($award eq 'SUBMITTED' && + $Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) { $Apache::lonhomework::results{"resource.0.tries"}= 1+$Apache::lonhomework::history{"resource.0.tries"}; } + $Apache::lonhomework::results{"resource.0.award"}=$award; &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); + if ($award eq 'SUBMITTED') { + &add_to_queue(); + } } + } elsif ($target eq 'webgrade') { + $result.="\n
"; + $result.=' '; + $result.=' '; + $result.=' '; + $result.=''.&Apache::loncommon::endbodytag().''; } elsif ($target eq 'meta') { $result.=''."\n"; #$result.=&Apache::response::meta_part_order(); @@ -205,10 +255,175 @@ sub end_Task { return $result; } +sub add_to_queue { + my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my %data; + #$data{"$symb\0timestamp"}=time; + $data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name]; + &Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum); +} + +sub show_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\0queue"; + my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); + $result.="\n

Current Queue

"; + foreach my $key (sort(keys(%queue))) { + my ($symb,undef,$user) = split("\0",$key); + my ($uname,$udom) = split('@',$user); + my $title=&Apache::lonnet::gettitle($symb); + $result.=""; + } + $result.="
resourceuserTime available for grading
$title$uname"; + my $slot=$queue{$key}->[0]; + my %slot_data=&Apache::lonnet::get_slot($slot); + $result.="End time: ".&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."
\n"; + return $result; +} + +sub decode_queue_key { + my ($key)=@_; + my ($symb,undef,$user) = split("\0",$key); + my ($uname,$udom) = split('@',$user); + return ($symb,$uname,$udom); +} + +sub queue_key_locked { + my ($key,$cdom,$cnum)=@_; + my ($key_locked,$value)= + &Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum); + if ($key_locked eq "$key\0locked") { + return $value; + } + return undef; +} + +sub pick_from_queue_data { + my ($check_section,$queue,$cdom,$cnum)=@_; + foreach my $key (sort(keys(%$queue))) { + my ($symb,$uname,$udom)=&decode_queue_key($key); + if ($check_section) { + my $section=&Apache::lonnet::getsection($uname,$udom); + if ($section ne $check_section) { + &Apache::lonnet::logthis("not my sec"); + next; + } + } + my $slot=$queue->{$key}[0]; + my %slot_data=&Apache::lonnet::get_slot($slot); + if ($slot_data{'endtime'} > time) { + &Apache::lonnet::logthis("not time"); + next; + } + if (&queue_key_locked($key,$cdom,$cnum)) { + &Apache::lonnet::logthis("someone already has um."); + next; + } + return $key; + } + return undef; +} + +sub find_mid_grade { + my ($symb,$cdom,$cnum)=@_; + my $todo=$env{'form.gradingkey'}; + my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + if ($todo) { + my $who=&queue_key_locked($todo,$cdom,$cnum); + if ($who eq $me) { return $todo; } + } + my $regexp="^$symb\0.*\0locked\$"; + my %locks=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); + foreach my $key (keys(%locks)) { + my $who=$locks{$key}; + if ($who eq $me) { + $todo=$key; + $todo=~s/\0locked$//; + return $todo; + } + } + return undef; +} + +sub get_from_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))); + while (1) { + my $starttime=time; + &Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime}, + $cdom,$cnum); + &Apache::lonnet::logthis("$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 + 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"); + } + # no one 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"); + } + # no user to grade + if (!$todo) { last; } + &Apache::lonnet::logthis("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; } + my (undef,$endtime)= + &Apache::lonnet::get('gradingqueue',["$symb\0timestamp"], + $cdom,$cnum); + &Apache::lonnet::logthis("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"], + $cdom,$cnum); + &Apache::lonnet::logthis("check $key .. $value"); + if ($key eq $todo && ref($value)) { + } else { + &Apache::lonnet::del('gradingqueue',["$todo\0locked"], + $cdom,$cnum); + &Apache::lonnet::logthis("del"); + next; + } + } + &Apache::lonnet::logthis("last $todo"); + last; + } + return $todo; +} + sub start_ClosingParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'web') { + } elsif ($target eq 'webgrade') { + &Apache::lonxml::startredirection(); } return $result; } @@ -217,6 +432,8 @@ sub end_ClosingParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'web') { + } elsif ($target eq 'webgrade') { + &Apache::lonxml::endredirection(); } return $result; } @@ -232,21 +449,29 @@ sub start_Dimension { return ''; } +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'}}); + return $order[0]; +} + sub end_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'web') { - #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 $instance=$order[0]; + my $instance=&get_instance(); $result=$dimension{'intro'}.$dimension{$instance.'.text'}; - #FIXME: don't show the criteria yet - #foreach my $id (@{$dimension{$instance.'.criterias'}}) { - # $result.=$dimension{$instance.'.criteria.'.$id}; - #} + } elsif ($target eq 'webgrade') { + my $instance=&get_instance(); + $result.="\n".''; + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + $result.=''; + } + $result.='
'. + $dimension{$instance.'.criteria.'.$id}.'
'; } return $result; } @@ -254,8 +479,8 @@ sub end_Dimension { sub start_IntroParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; - if ($target eq 'web') { - if ($tagstack->[-2] eq 'Dimension') { + if ($target eq 'web' || $target eq 'webgrade') { + if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') { &Apache::lonxml::startredirection(); } } @@ -265,8 +490,8 @@ sub start_IntroParagraph { sub end_IntroParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; - if ($target eq 'web') { - if ($tagstack->[-2] eq 'Dimension') { + if ($target eq 'web' || $target eq 'webgrade') { + if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') { $dimension{'intro'}=&Apache::lonxml::endredirection(); } } @@ -288,7 +513,7 @@ sub end_Instance { sub start_InstanceText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { &Apache::lonxml::startredirection(); } return ''; @@ -297,7 +522,7 @@ sub start_InstanceText { sub end_InstanceText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $instance_id=$Apache::bridgetask::instance[-1]; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { $dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection(); } return ''; @@ -305,7 +530,7 @@ sub end_InstanceText { sub start_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { &Apache::lonxml::startredirection(); } return ''; @@ -314,7 +539,7 @@ sub start_Criteria { sub end_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $instance_id=$Apache::bridgetask::instance[-1]; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { my $criteria=&Apache::lonxml::endredirection(); my $id=$Apache::lonxml::curdepth; $dimension{$instance_id.'.criteria.'.$id}=$criteria; @@ -327,10 +552,10 @@ sub proctor_validation_screen { my ($slot) = @_; my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg'); - $user=$ENV{'form.proctorname'}; - if ($ENV{'form.proctordomain'}) { $domain=$ENV{'form.proctordomain'}; } + $user=$env{'form.proctorname'}; + if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; } my $msg; - if ($ENV{'form.proctorpassword'}) { + if ($env{'form.proctorpassword'}) { $msg='

'.&mt("Failed to authenticate the proctor.") .'

'; } @@ -338,7 +563,7 @@ sub proctor_validation_screen {

Proctor Validation

Your room's proctor needs to validate your access to this resource.

$msg -
+