--- loncom/homework/bridgetask.pm 2005/04/07 06:56:21 1.11 +++ 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.11 2005/04/07 06:56:21 albertel Exp $ +# $Id: bridgetask.pm,v 1.30 2005/05/24 19:33:28 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,14 +48,18 @@ sub initialize_bridgetask { $Apache::bridgetask::dimension=''; # list of all Dimension ids seen @Apache::bridgetask::dimensionlist=(); + # mandatory attribute of all Dimensions seen + %Apache::bridgetask::dimensionmandatory=(); # list of all current Instance ids @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 ($slot_name,$slot)=@_; my $user=$env{'form.proctorname'}; my $domain=$env{'form.proctordomain'}; @@ -65,8 +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.$version.checkedin.slot"}= + $slot_name; + foreach my $key (keys(%Apache::lonhomework::history)) { + if ($key=~/^resource\.0\./) { + $Apache::lonhomework::results{$key}=''; + } + } return 1; } } @@ -74,44 +88,126 @@ 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; + 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.=''; + return $result; +} + +sub add_request_another_attempt_button { my $result; - $result.=&mt(' Show a previously done version: [_1]',''); + $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 { 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) { + $body_tag_start.='
'.&add_grading_button()."
"; + } } - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || $target eq 'tex') { - ($status,$accessmsg,$slot) = + my ($version,$previous)=&get_version(); + ($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"}.'";'; + $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";'; &Apache::run::run($expression,$safeeval); &Apache::lonxml::debug("Got $status"); - if (( $status eq 'CLOSED' ) || - ( $status eq 'BANNED') || - ( $status eq 'UNAVAILABLE') || - ( $status eq 'NOT_IN_A_SLOT') || - ( $status eq 'NEEDS_CHECKIN') || - ( $status eq 'INVALID_ACCESS')) { + $body_tag_start.=&add_previous_version_button($status); + if (!$previous && ( + ( $status eq 'CLOSED' ) || + ( $status eq 'BANNED') || + ( $status eq 'UNAVAILABLE') || + ( $status eq 'NOT_IN_A_SLOT') || + ( $status eq 'NEEDS_CHECKIN') || + ( $status eq 'WAITING_FOR_GRADE') || + ( $status eq 'INVALID_ACCESS') )) { my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); if ( $target eq "web" ) { $result.= $head_tag_start.''.$body_tag_start; @@ -123,6 +219,8 @@ sub start_Task { } elsif ($status eq 'NEEDS_CHECKIN') { $msg.='

'.&mt('You need the Proctor to validate you.'). '

'.&proctor_validation_screen($slot); + } elsif ($status eq 'WAITING_FOR_GRADE') { + $msg.='

'.&mt('Your submission is in the grading queue.').'

'; } elsif ($status ne 'NOT_YET_VIEWED') { $msg.='

'.&mt('Not open to be viewed').'

'; } @@ -137,12 +235,15 @@ sub start_Task { } else { $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm "; } - } elsif ($target eq 'grade') { + } elsif ($target eq 'grade' && !$env{'form.webgrade'}) { if ($status eq 'NEEDS_CHECKIN') { - if (&proctor_check_auth($slot)) { + if (&proctor_check_auth($slot_name,$slot)) { #FIXME immeadiatly add this to the grading queue # with slot->{'endtime'} for when grading can # begin on this resource + # FIXME I think the above is done by default, + # need to check that + # failure doesn't do this. } } } @@ -151,13 +252,55 @@ 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"; + $result.=&preserve_grade_info(); + my ($version,$previous)=&get_version(); + if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { + $result.='

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

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

'.&mt('Passed').'

'; + } + } + } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) || + $target eq 'webgrade') { + if ($target eq 'webgrade') { + $result.=$head_tag_start.$body_tag_start.$form_tag_start; + $result.=''; + $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".''; + } + } else { + if ($target eq 'webgrade') { + $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); } } else { # page_start returned a starting result, delete it if we don't need it @@ -170,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 ( @@ -177,25 +321,111 @@ sub end_Task { ($target eq 'answer') || ($target eq 'tex') ) { if ($target eq 'web') { - if ($status eq 'CAN_ANSWER') { - $result.=''. - &Apache::inputtags::file_selector('0',"bridgetask","*", + if ($status eq 'CAN_ANSWER' && !$previous) { + $result.="\n".'
'. + &Apache::inputtags::file_selector("$version.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"}) { + if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { + my $award='SUBMITTED'; + &Apache::essayresponse::file_submission("$version.0",'bridgetask', + 'portfiles',\$award); + if ($award eq 'SUBMITTED' && + $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::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); + if ($award eq 'SUBMITTED') { + &add_to_queue('gradingqueue'); + } } + if ($target eq 'grade' && $env{'form.webgrade'}) { + my $optional_required= + &Apache::lonxml::get_param('OptionalRequired',$parstack, + $safeeval); + my $optional_passed=0; + my $mandatory_failed=0; + my $ungraded=0; + my $review=0; + &Apache::lonhomework::showhash(%Apache::lonhomework::results); + foreach my $dim_id (@Apache::bridgetask::dimensionlist) { + my $status= + $Apache::lonhomework::results{"resource.$version.$dim_id.status"}; + my $mandatory= + ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N'); + if ($status eq 'pass') { + if (!$mandatory) { $optional_passed++; } + } elsif ($status eq 'fail') { + if ($mandatory) { $mandatory_failed++; } + } elsif ($status eq 'ungraded') { + $ungraded++; + } elsif ($status eq 'review') { + $review++; + } + } + if ($optional_passed < $optional_required) { + $mandatory_failed++; + } + &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + $Apache::lonhomework::results{'resource.grader'}= + $env{'user.name'}.'@'.$env{'user.domain'}; + if ($review) { + $Apache::lonhomework::results{"resource.$version.status"}='review'; + &move_to_review_queue(); + } elsif ($ungraded) { + $Apache::lonhomework::results{"resource.$version.status"}='ungraded'; + &check_queue_unlock('gradingqueue'); + } 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'); + } 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(); + } + $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') { + $result.="\n
"; + #$result.=' '; + #$result.=' '; + #$result.=' '; + #$result.=' '; + $result.=''.&Apache::loncommon::endbodytag().''; } elsif ($target eq 'meta') { $result.=''."\n"; #$result.=&Apache::response::meta_part_order(); @@ -205,10 +435,232 @@ sub end_Task { return $result; } +sub move_to_review_queue { + + &Apache::lonxml::debug("Want to move"); +} + +sub check_queue_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 { + 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; + $env{'form.grade_courseid'}=$env{'request.course.id'}; + &Apache::lonxml::initialize_rndseed($safeeval); +} + +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($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($queue,$cdom,$cnum,$regexp); + $result.="\n

Current Queue

". + ""; + 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.='"; + } + } + $result.="
resourceusertypedata
$title$unamelock'.$queue{$key}.'
$titlelast queue modification time'. + &Apache::lonlocal::locallocaltime($queue{$key})."
$title$unamequeue entrySlot: '.$slot.' 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 ($queue,$key,$cdom,$cnum)=@_; + my ($key_locked,$value)= + &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum); + if ($key_locked eq "$key\0locked") { + return $value; + } + return undef; +} + +sub pick_from_queue_data { + 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"); + next; + } + } + 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($queue,$key,$cdom,$cnum)) { + &Apache::lonnet::logthis("someone already has um."); + next; + } + return $key; + } + return undef; +} + +sub find_mid_grade { + 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($queue,$todo,$cdom,$cnum); + if ($who eq $me) { return $todo; } + } + my $regexp="^$symb\0.*\0locked\$"; + my %locks=&Apache::lonnet::dump($queue,$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 ($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); + &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo))); + if ($todo) { return $todo; } + while (1) { + my $starttime=time; + &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime}, + $cdom,$cnum); + &Apache::lonnet::logthis("$starttime"); + my $regexp="^$symb\0queue\0"; + 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($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 + 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($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; } + my (undef,$endtime)= + &Apache::lonnet::get($queue,["$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($queue,["$todo"], + $cdom,$cnum); + &Apache::lonnet::logthis("check $key .. $value"); + if ($key eq $todo && ref($value)) { + } else { + &Apache::lonnet::del($queue,["$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,45 +669,163 @@ 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; } +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); + $Apache::bridgetask::dimensionmandatory{$dim_id}= + &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); return ''; } -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]; - $result=$dimension{'intro'}.$dimension{$instance.'.text'}; - #FIXME: don't show the criteria yet - #foreach my $id (@{$dimension{$instance.'.criterias'}}) { - # $result.=$dimension{$instance.'.criteria.'.$id}; - #} +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; + my $version=&get_version(); + my $which=($version-1)%$num; + return $order[$which]; +} + +{ + my $last_link; + sub end_Dimension { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + 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.$version.status"} eq 'pass' || + $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; + my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}; + $result.='
'; + if ($status eq 'fail') { + $result.=''.&mt('Did not pass').''; + } elsif ($status eq 'pass') { + $result.=''.&mt('Passed').''; + } else { + &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status"); + } + $result.='
'; + 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}. + '
'; + } + } + } elsif ($target eq 'webgrade') { + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + my $link='criteria_'.$instance.'_'.$id; + my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; + $result.=''. + ''. + ''. + '
'. + #$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.$version.bridgetask.portfiles"})) { + my $file=$file_url.$partial_file; + &Apache::lonnet::allowuploaded('/adm/bridgetask',$file); + $result.=' '.$file. + ''; + } + $result.=''; + $last_link=$link; + } + } elsif ($target eq 'grade' && $env{'form.webgrade'}) { + my $optional_passed=0; + my $mandatory_failed=0; + my $ungraded=0; + my $review=0; + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id}; + $Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id}; + my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); + if ($status eq 'pass') { + if (!$mandatory) { $optional_passed++; } + } elsif ($status eq 'fail') { + if ($mandatory) { $mandatory_failed++; } + } elsif ($status eq 'review') { + $review++; + } elsif ($status eq 'ungraded') { + $ungraded++; + } else { + &Apache::lonxml::error("got weird status --$status--"); + } + } + if ($optional_passed < $dimension{$instance.'.optionalrequired'}) { + $mandatory_failed++; + } + &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + if ($review) { + $Apache::lonhomework::results{"resource.$version.$dim.status"}= + 'review'; + } elsif ($ungraded) { + $Apache::lonhomework::results{"resource.$version.$dim.status"}= + 'ungraded'; + } elsif ($mandatory_failed) { + $Apache::lonhomework::results{"resource.$version.$dim.status"}= + 'fail'; + } else { + $Apache::lonhomework::results{"resource.$version.$dim.status"}= + 'pass'; + } + } + return $result; } - return $result; } 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 +835,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(); } } @@ -275,9 +845,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{$id.'.optionalrequired'}= + &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); return ''; } @@ -288,7 +861,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 +870,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 +878,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' || $target eq 'grade') { &Apache::lonxml::startredirection(); } return ''; @@ -314,10 +887,12 @@ 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' || $target eq 'grade') { 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 '';