--- loncom/homework/bridgetask.pm 2005/05/03 00:05:41 1.14 +++ loncom/homework/bridgetask.pm 2005/05/09 21:55:01 1.19 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.14 2005/05/03 00:05:41 albertel Exp $ +# $Id: bridgetask.pm,v 1.19 2005/05/09 21:55:01 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,6 +52,8 @@ 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 { @@ -93,14 +95,17 @@ sub add_grading_button { sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - &Apache::structuretags::initialize_storage(); - &Apache::lonhomework::showhash(%Apache::lonhomework::history); my ($status,$accessmsg,$slot); + if ($target ne 'webgrade') { + &Apache::structuretags::initialize_storage(); + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + } + $Apache::lonhomework::parsing_a_task=1; #should get back a or the neccesary stuff to start XML/MathML my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); - + if ($target eq 'web') { $body_tag_start.=&add_previous_version_button(); if ($Apache::lonhomework::modifygrades) { @@ -174,11 +179,28 @@ sub start_Task { } } } elsif ($target eq 'webgrade') { - $result.=$head_tag_start.$body_tag_start.$form_tag_start. - 'Yahoo!'; + $result.=$head_tag_start.$body_tag_start.$form_tag_start; + $result.= + ''; $result.=&show_queue(); - $result.=&get_from_queue(); - + my $todo=&get_from_queue(); + 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); + $result.="\n".''; + } 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 = ''; @@ -191,14 +213,14 @@ sub end_Task { my $result=''; my $status=$Apache::inputtags::status['-1']; if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || - $target eq 'tex' || $target eq 'webgrade') { + $target eq 'tex') { if ( (($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'). "
"; @@ -224,6 +246,15 @@ sub end_Task { &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(); @@ -233,12 +264,21 @@ sub end_Task { return $result; } +sub setup_env_for_other_user { + my ($queue_key,$safeeval)=@_; + my ($symb,$uname,$udom)=&decode_queue_key($queue_key); + $env{'form.grade_symb'}=$symb; + $env{'form.grade_domain'}=$udom; + $env{'form.grade_username'}=$uname; + $env{'form.grade_courseid'}=$env{'request.course.id'}; + &Apache::lonxml::initialize_rndseed($safeeval); +} + 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); } @@ -248,19 +288,31 @@ sub show_queue { 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 $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); - $result.=""; + $result.="\n

Current Queue

resourceuserTime available for grading
"; 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.=""; + if ($key=~/locked$/) { + my ($symb,$uname,$udom) = &decode_queue_key($key); + my $title=&Apache::lonnet::gettitle($symb); + $result.="'; + } elsif ($key=~/timestamp$/) { + my ($symb,undef) = split("\0",$key); + my $title=&Apache::lonnet::gettitle($symb); + $result.=""; + } else { + my ($symb,$uname,$udom) = &decode_queue_key($key); + my $title=&Apache::lonnet::gettitle($symb); + $result.=""; + } } - $result.="
resourceusertypedata
$title$uname"; - my $slot=$queue{$key}->[0]; - my %slot_data=&Apache::lonnet::get_slot($slot); - $result.="End time: ".&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."
$title$uname"; + $result.='lock'.$queue{$key}.'
$title"; + $result.='last queue modification time'. + &Apache::lonlocal::locallocaltime($queue{$key})."
$title$uname"; + my $slot=$queue{$key}->[0]; + my %slot_data=&Apache::lonnet::get_slot($slot); + $result.='queue entryEnd time: '.&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."
"; + $result.="
\n"; return $result; } @@ -272,7 +324,7 @@ sub decode_queue_key { } sub queue_key_locked { - my ($key)=@_; + my ($key,$cdom,$cnum)=@_; my ($key_locked,$value)= &Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum); if ($key_locked eq "$key\0locked") { @@ -282,54 +334,98 @@ sub queue_key_locked { } sub pick_from_queue_data { - my ($check_section,$queue)=@_; - foreach my $key (sort(keys(%$queue))) { + my ($check_section,$queue,$cdom,$cnum)=@_; + foreach my $key (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) { next; } + if ($section eq $check_section) { + &Apache::lonnet::logthis("my sec"); + next; + } } my $slot=$queue->{$key}[0]; my %slot_data=&Apache::lonnet::get_slot($slot); - if ($slot_data{'endtime'} > time) { next; } - if (&queue_key_locked($key)) { next; } + 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=&Apache::lonnet::unescape($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))); + if ($todo) { return $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'}) { - $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue); + &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) { - $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue); + &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 @@ -338,13 +434,16 @@ sub get_from_queue { 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; @@ -370,11 +469,18 @@ sub end_ClosingParagraph { return $result; } +sub get_id { + my ($parstack,$safeeval)=@_; + my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); + if (!$id) { $id=$Apache::lonxml::curdepth; } + return $id; +} + my %dimension; sub start_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; undef(%dimension); - my $dim_id=$Apache::lonxml::curdepth; + my $dim_id=&get_id($parstack,$safeeval); $Apache::bridgetask::dimension=$dim_id; push(@Apache::bridgetask::dimensionlist,$dim_id); undef(@Apache::bridgetask::instance); @@ -390,22 +496,50 @@ sub get_instance { return $order[0]; } -sub end_Dimension { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result; - if ($target eq 'web') { - my $instance=&get_instance(); - $result=$dimension{'intro'}.$dimension{$instance.'.text'}; - } elsif ($target eq 'webgrade') { +{ + my $last_link; + sub end_Dimension { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; my $instance=&get_instance(); - $result.=''; - foreach my $id (@{$dimension{$instance.'.criterias'}}) { - $result.=''; + if ($target eq 'web') { + $result=$dimension{'intro'}.$dimension{$instance.'.text'}; + } elsif ($target eq 'webgrade') { + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + my $link='criteria_'.$instance.'_'.$id; + $result.=''. + ''. + ''. + ''; + $last_link=$link; + } + } elsif ($target eq 'grade') { + my $optional_passed=0; + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + if ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'pass') { + } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'fail') { + } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'ungraded') { + } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'review') { + } + } } - $result.='
'. - $dimension{$instance.'.criteria.'.$id}.'
'. + ''. + ''. + '
'. + #$dimension{$instance.'.criteria.'.$id}. + '		Additional Comment for Student
'. + ''. + '		'. + '
'. + '
'. + '
'. + '
'. + '		'. + 'Prev
'. + 'Next
'. + '
'; + return $result; } - return $result; } sub start_IntroParagraph { @@ -432,9 +566,12 @@ sub end_IntroParagraph { sub start_Instance { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - push(@{$dimension{'instances'}},$Apache::lonxml::curdepth); - push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth); - push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth); + my $id=&get_id($parstack,$safeeval); + push(@{$dimension{'instances'}},$id); + push(@Apache::bridgetask::instance,$id); + push(@Apache::bridgetask::instancelist,$id); + $dimension{$instance_id.'.optionalrequired'}= + &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); return ''; } @@ -473,8 +610,10 @@ sub end_Criteria { my $instance_id=$Apache::bridgetask::instance[-1]; if ($target eq 'web' || $target eq 'webgrade') { my $criteria=&Apache::lonxml::endredirection(); - my $id=$Apache::lonxml::curdepth; + my $id=&get_id($parstack,$safeeval); $dimension{$instance_id.'.criteria.'.$id}=$criteria; + $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}= + &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); push(@{$dimension{$instance_id.'.criterias'}},$id); } return '';