--- loncom/homework/bridgetask.pm 2005/05/10 20:29:26 1.22 +++ loncom/homework/bridgetask.pm 2005/05/24 19:33:28 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.22 2005/05/10 20:29:26 albertel Exp $ +# $Id: bridgetask.pm,v 1.30 2005/05/24 19:33:28 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,10 +69,18 @@ sub proctor_check_auth { if ($puser eq $user && $pdom eq $domain) { my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom); if ($authhost ne 'no_host') { - $Apache::lonhomework::results{'resource.checkedin'}= + my $version= + $Apache::lonhomework::results{'resource.version'}= + ++$Apache::lonhomework::history{'resource.version'}; + $Apache::lonhomework::results{"resource.$version.checkedin"}= $user.'@'.$domain; - $Apache::lonhomework::results{'resource.checkedin.slot'}= + $Apache::lonhomework::results{"resource.$version.checkedin.slot"}= $slot_name; + foreach my $key (keys(%Apache::lonhomework::history)) { + if ($key=~/^resource\.0\./) { + $Apache::lonhomework::results{$key}=''; + } + } return 1; } } @@ -80,24 +88,82 @@ sub proctor_check_auth { return 0; } +sub get_version { + my ($version,$previous); + if ($env{'form.previousversion'} && + defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) { + $version=$env{'form.previousversion'}; + $previous=1; + } else { + $version=$Apache::lonhomework::history{'resource.version'}; + $previous=0; + } + if (wantarray) { + return ($version,$previous); + } + return $version; +} + sub add_previous_version_button { + my ($status)=@_; my $result; - $result.=&mt(' Show a previously done version: [_1]',''); + if ($Apache::lonhomework::history{'resource.version'} eq '') { + return ''; + } + if ($Apache::lonhomework::history{'resource.version'} < 2 && + $status ne 'NEEDS_CHECKIN') { + return ''; + } + my $version=&get_version(); + if ($env{'form.previousversion'} ne '' && + $env{'form.previousversion'} eq $version) { + $result.="

".&mt("Showing previous version [_1]",$version). + "

\n"; + } + my @to_show; + foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) { + if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) { + push(@to_show,$test_version); + } + } + my $list='\n\n"; + $result.='
'. + &mt(' Show a previously done version: [_1]','')."
"; return $result; } sub add_grading_button { - my $result; - $result.=' '; $result.=''; return $result; } sub add_request_another_attempt_button { - + my $result; + $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 .= ''."\n"; + } + } + return $result; } sub start_Task { @@ -115,7 +181,6 @@ sub start_Task { &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) { $body_tag_start.='
'.$body_tag_start; @@ -184,18 +252,15 @@ sub start_Task { $result.="$head_tag_start$name $body_tag_start \n $form_tag_start". ''; - # if we are viewing someone else preserve that info - if (defined $env{'form.grade_symb'}) { - foreach my $field ('symb','courseid','domain','username') { - $result .= ''."\n"; - } - } - if ($Apache::lonhomework::history{'resource.status'} eq 'fail') { + $result.=&preserve_grade_info(); + my ($version,$previous)=&get_version(); + if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { $result.='

'.&mt('Did not pass').'

'; - $result.=&request_another_attempt_button(); + if (!$previous) { + $result.=&add_request_another_attempt_button(); + } } - if ($Apache::lonhomework::history{'resource.status'} eq 'pass') { + if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { $result.='

'.&mt('Passed').'

'; } } @@ -204,9 +269,13 @@ sub start_Task { if ($target eq 'webgrade') { $result.=$head_tag_start.$body_tag_start.$form_tag_start; $result.=''; - $result.=&show_queue(); + $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'); } - my $todo=&get_from_queue(); if ($todo) { &setup_env_for_other_user($todo,$safeeval); my ($symb,$uname,$udom)=&decode_queue_key($todo); @@ -217,11 +286,19 @@ sub start_Task { $Apache::bridgetask::queue_key=$todo; &Apache::structuretags::initialize_storage(); &Apache::lonhomework::showhash(%Apache::lonhomework::history); - $result.="\n".''; + if ($target eq 'webgrade') { + $result.='
After'.&show_queue('gradingqueue'); + $result.="\n".'
'; + } } else { if ($target eq 'webgrade') { - $result.="\n". - '
No user to be graded.
'; + $result.="\n".'
'; + if ($env{'form.stop'}) { + $result.=&mt("Stopped grading."); + } else { + $result.=&mt("No user to be graded."); + } + $result.='
'; } my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); } @@ -236,6 +313,7 @@ sub end_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; my $status=$Apache::inputtags::status['-1']; + my ($version,$previous)=&get_version(); if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { if ( @@ -243,9 +321,10 @@ sub end_Task { ($target eq 'answer') || ($target eq 'tex') ) { if ($target eq 'web') { - if ($status eq 'CAN_ANSWER') { + if ($status eq 'CAN_ANSWER' && !$previous) { $result.="\n".''. - &Apache::inputtags::file_selector('0',"bridgetask","*", + &Apache::inputtags::file_selector("$version.0", + "bridgetask","*", 'portfolioonly'). "
"; $result.=&Apache::inputtags::gradestatus('0'); @@ -255,20 +334,24 @@ sub end_Task { $result.=&Apache::lonxml::xmlend().''; } } - if ($target eq 'grade' && !$env{'form.webgrade'}) { + if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { my $award='SUBMITTED'; - &Apache::essayresponse::file_submission('0','bridgetask', + &Apache::essayresponse::file_submission("$version.0",'bridgetask', 'portfiles',\$award); if ($award eq 'SUBMITTED' && - $Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) { + $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) { $Apache::lonhomework::results{"resource.0.tries"}= - 1+$Apache::lonhomework::history{"resource.0.tries"}; + $Apache::lonhomework::results{"resource.$version.0.tries"}= + 1+$Apache::lonhomework::history{"resource.$version.0.tries"}; + + $Apache::lonhomework::results{"resource.0.award"}= + $Apache::lonhomework::results{"resource.$version.0.award"}= + $award; } - $Apache::lonhomework::results{"resource.0.award"}=$award; &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); if ($award eq 'SUBMITTED') { - &add_to_queue(); + &add_to_queue('gradingqueue'); } } if ($target eq 'grade' && $env{'form.webgrade'}) { @@ -282,7 +365,7 @@ sub end_Task { &Apache::lonhomework::showhash(%Apache::lonhomework::results); foreach my $dim_id (@Apache::bridgetask::dimensionlist) { my $status= - $Apache::lonhomework::results{"resource.$dim_id.status"}; + $Apache::lonhomework::results{"resource.$version.$dim_id.status"}; my $mandatory= ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N'); if ($status eq 'pass') { @@ -302,20 +385,34 @@ sub end_Task { $Apache::lonhomework::results{'resource.grader'}= $env{'user.name'}.'@'.$env{'user.domain'}; if ($review) { - $Apache::lonhomework::results{'resource.status'}='review'; + $Apache::lonhomework::results{"resource.$version.status"}='review'; &move_to_review_queue(); } elsif ($ungraded) { - $Apache::lonhomework::results{'resource.status'}='ungraded'; - &check_queue_unlock(); + $Apache::lonhomework::results{"resource.$version.status"}='ungraded'; + &check_queue_unlock('gradingqueue'); } elsif ($mandatory_failed) { - $Apache::lonhomework::results{'resource.status'}='fail'; - $Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS'; - &remove_from_queue(); + $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'); } else { - $Apache::lonhomework::results{'resource.status'}='pass'; - $Apache::lonhomework::results{"resource.0.award"}='INCORRECT'; + $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(); } + $Apache::lonhomework::results{"resource.status"}= + $Apache::lonhomework::results{"resource.$version.status"}; + if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) { + $Apache::lonhomework::results{"resource.0.award"}= + $Apache::lonhomework::results{"resource.$version.award"}; + $Apache::lonhomework::results{"resource.0.awarded"}= + $Apache::lonhomework::results{"resource.$version.awarded"}; + $Apache::lonhomework::results{"resource.0.solved"}= + $Apache::lonhomework::results{"resource.$version.solved"}; + } &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { @@ -339,20 +436,37 @@ sub end_Task { } sub move_to_review_queue { + &Apache::lonxml::debug("Want to move"); } 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 { - &Apache::lonxml::debug("Want to remove. Done?"); + 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 @keys=($key,"$key\0locked"); + &Apache::lonnet::del($queue,\@keys,$cdom,$cnum); } sub setup_env_for_other_user { my ($queue_key,$safeeval)=@_; 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_domain'}=$udom; $env{'form.grade_username'}=$uname; @@ -361,42 +475,44 @@ sub setup_env_for_other_user { } sub add_to_queue { + my ($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\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 { + 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('gradingqueue',$cdom,$cnum,$regexp); - $result.="\n

Current Queue

". + my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); + $result.="\n

Current Queue

resource
". ""; foreach my $key (sort(keys(%queue))) { if ($key=~/locked$/) { my ($symb,$uname,$udom) = &decode_queue_key($key); my $title=&Apache::lonnet::gettitle($symb); - $result.=""; $result.=''; } elsif ($key=~/timestamp$/) { my ($symb,undef) = split("\0",$key); my $title=&Apache::lonnet::gettitle($symb); - $result.=""; $result.='"; } else { my ($symb,$uname,$udom) = &decode_queue_key($key); my $title=&Apache::lonnet::gettitle($symb); - $result.=""; my $slot=$queue{$key}->[0]; my %slot_data=&Apache::lonnet::get_slot($slot); - $result.='"; } @@ -413,9 +529,9 @@ sub decode_queue_key { } sub queue_key_locked { - my ($key,$cdom,$cnum)=@_; + my ($queue,$key,$cdom,$cnum)=@_; 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; } @@ -423,8 +539,8 @@ 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); @@ -433,13 +549,13 @@ sub pick_from_queue_data { 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"); next; } - if (&queue_key_locked($key,$cdom,$cnum)) { + if (&queue_key_locked($queue,$key,$cdom,$cnum)) { &Apache::lonnet::logthis("someone already has um."); next; } @@ -449,15 +565,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) { @@ -470,27 +586,28 @@ sub find_mid_grade { } 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); + $todo=&find_mid_grade($queue,$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}, + &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime}, $cdom,$cnum); &Apache::lonnet::logthis("$starttime"); 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 if ($env{'request.course.sec'}) { &Apache::lonnet::logthis("sce"); - $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue, - $cdom,$cnum); + $todo=&pick_from_queue_data($queue,$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 @@ -504,7 +621,7 @@ 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('gradingqueue', + my $success=&Apache::lonnet::newput($queue, {"$todo\0locked"=> $env{'user.name'}.'@'.$env{'user.domain'}}, $cdom,$cnum); @@ -512,7 +629,7 @@ sub get_from_queue { &Apache::lonnet::logthis("success $todo"); if ($success ne 'ok') { next; } my (undef,$endtime)= - &Apache::lonnet::get('gradingqueue',["$symb\0timestamp"], + &Apache::lonnet::get($queue,["$symb\0timestamp"], $cdom,$cnum); &Apache::lonnet::logthis("emd $endtime"); # someone else already modified the queue, @@ -521,12 +638,12 @@ sub get_from_queue { # 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"); 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"); next; @@ -584,7 +701,10 @@ sub get_instance { #then start repicking &Apache::response::pushrandomnumber(); my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); - return $order[0]; + my $num=@order; + my $version=&get_version(); + my $which=($version-1)%$num; + return $order[$which]; } { @@ -592,15 +712,16 @@ sub get_instance { sub end_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; - my $dim_id=&get_id($parstack,$safeeval); + my $dim=&get_id($parstack,$safeeval); my $instance=&get_instance(); + my $version=&get_version(); if ($target eq 'web') { $result=$dimension{'intro'}.$dimension{$instance.'.text'}; - if ($Apache::lonhomework::history{'resource.status'} eq 'pass' || - $Apache::lonhomework::history{'resource.status'} eq 'fail') { + if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' || + $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { foreach my $id (@{$dimension{$instance.'.criterias'}}) { - my $status=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.status"}; - my $comment=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}; + my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; + my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}; $result.='
resourceusertypedata
$title$uname"; + $result.="
$title$unamelock'.$queue{$key}.'
$title"; + $result.="
$titlelast queue modification time'. &Apache::lonlocal::locallocaltime($queue{$key})."
$title$uname"; + $result.="
$title$unamequeue entryEnd time: '. + $result.='queue entrySlot: '.$slot.' End time: '. &Apache::lonlocal::locallocaltime($slot_data{'endtime'}). "
'; if ($status eq 'fail') { $result.=''.&mt('Did not pass').''; @@ -610,8 +731,8 @@ sub get_instance { &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status"); } $result.='
'; - if ($Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}) { - $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}.'
'; + if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) { + $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'
'; } $result.=$dimension{$instance.'.criteria.'.$id}. '
'; @@ -620,7 +741,7 @@ sub get_instance { } elsif ($target eq 'webgrade') { foreach my $id (@{$dimension{$instance.'.criterias'}}) { my $link='criteria_'.$instance.'_'.$id; - my $status=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.status"}; + my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; $result.=''. ''. ''. @@ -628,24 +749,26 @@ sub get_instance { #$dimension{$instance.'.criteria.'.$id}. ''. 'Additional Comment for Student
'. - ''. + ''. ''. ''. - '
'. - '
'. - '
'. - '
'. + '
'. + '
'. + '
'. + '
'. ''. ''. 'Prev
'. 'Next


'. ' '. + ' '. ''; $result.=''; my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio'; - foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.0.bridgetask.portfiles"})) { + foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) { my $file=$file_url.$partial_file; &Apache::lonnet::allowuploaded('/adm/bridgetask',$file); $result.=' m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); if ($review) { - $Apache::lonhomework::results{"resource.$dim_id.status"}= + $Apache::lonhomework::results{"resource.$version.$dim.status"}= 'review'; } elsif ($ungraded) { - $Apache::lonhomework::results{"resource.$dim_id.status"}= + $Apache::lonhomework::results{"resource.$version.$dim.status"}= 'ungraded'; } elsif ($mandatory_failed) { - $Apache::lonhomework::results{"resource.$dim_id.status"}= + $Apache::lonhomework::results{"resource.$version.$dim.status"}= 'fail'; } else { - $Apache::lonhomework::results{"resource.$dim_id.status"}= + $Apache::lonhomework::results{"resource.$version.$dim.status"}= 'pass'; } }