--- loncom/homework/bridgetask.pm 2005/05/06 20:26:35 1.18 +++ loncom/homework/bridgetask.pm 2005/05/10 20:29:26 1.22 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.18 2005/05/06 20:26:35 albertel Exp $ +# $Id: bridgetask.pm,v 1.22 2005/05/10 20:29:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,6 +48,8 @@ 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 @@ -57,7 +59,7 @@ sub initialize_bridgetask { } sub proctor_check_auth { - my ($slot)=@_; + my ($slot_name,$slot)=@_; my $user=$env{'form.proctorname'}; my $domain=$env{'form.proctordomain'}; @@ -69,6 +71,8 @@ sub proctor_check_auth { if ($authhost ne 'no_host') { $Apache::lonhomework::results{'resource.checkedin'}= $user.'@'.$domain; + $Apache::lonhomework::results{'resource.checkedin.slot'}= + $slot_name; return 1; } } @@ -92,6 +96,10 @@ sub add_grading_button { return $result; } +sub add_request_another_attempt_button { + +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -115,7 +123,7 @@ sub start_Task { $body_tag_start.=$uri.'">'.&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,my $slot_name,$slot) = &Apache::lonhomework::check_task_access('0'); @@ -130,6 +138,7 @@ sub start_Task { ( $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" ) { @@ -142,6 +151,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').'

'; } @@ -156,12 +167,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. } } } @@ -177,12 +191,21 @@ sub start_Task { '" value="'.$env{"form.grade_$field"}.'" />'."\n"; } } + if ($Apache::lonhomework::history{'resource.status'} eq 'fail') { + $result.='

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

'; + $result.=&request_another_attempt_button(); + } + if ($Apache::lonhomework::history{'resource.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.=&show_queue(); } - } elsif ($target eq 'webgrade') { - $result.=$head_tag_start.$body_tag_start.$form_tag_start; - $result.= - ''; - $result.=&show_queue(); my $todo=&get_from_queue(); if ($todo) { &setup_env_for_other_user($todo,$safeeval); @@ -196,11 +219,12 @@ sub start_Task { &Apache::lonhomework::showhash(%Apache::lonhomework::history); $result.="\n".''; } else { - $result.="\n". - '
No user to be graded.
'; + if ($target eq 'webgrade') { + $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 = ''; @@ -231,9 +255,10 @@ sub end_Task { $result.=&Apache::lonxml::xmlend().''; } } - if ($target eq 'grade') { + if ($target eq 'grade' && !$env{'form.webgrade'}) { my $award='SUBMITTED'; - &Apache::essayresponse::file_submission('0','bridgetask','portfiles',\$award); + &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"}= @@ -246,14 +271,63 @@ sub end_Task { &add_to_queue(); } } + 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.$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.status'}='review'; + &move_to_review_queue(); + } elsif ($ungraded) { + $Apache::lonhomework::results{'resource.status'}='ungraded'; + &check_queue_unlock(); + } elsif ($mandatory_failed) { + $Apache::lonhomework::results{'resource.status'}='fail'; + $Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS'; + &remove_from_queue(); + } else { + $Apache::lonhomework::results{'resource.status'}='pass'; + $Apache::lonhomework::results{"resource.0.award"}='INCORRECT'; + &remove_from_queue(); + } + &Apache::structuretags::finalize_storage(); + } } elsif ($target eq 'webgrade') { $result.="\n
"; - $result.=' '; - $result.=' '; - $result.=' '; + #$result.=' '; + #$result.=' '; + #$result.=' '; + #$result.=' '; $result.=''.&Apache::loncommon::endbodytag().''; } elsif ($target eq 'meta') { $result.=''."\n"; @@ -264,6 +338,18 @@ sub end_Task { return $result; } +sub move_to_review_queue { + &Apache::lonxml::debug("Want to move"); +} + +sub check_queue_unlock { + &Apache::lonxml::debug("Want to unlock?"); +} + +sub remove_from_queue { + &Apache::lonxml::debug("Want to remove. Done?"); +} + sub setup_env_for_other_user { my ($queue_key,$safeeval)=@_; my ($symb,$uname,$udom)=&decode_queue_key($queue_key); @@ -290,7 +376,8 @@ sub show_queue { my $cdom=$env{'course.'.$cid.'.domain'}; my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); - $result.="\n

Current Queue

"; + $result.="\n

Current Queue

resourceusertypedata
". + ""; foreach my $key (sort(keys(%queue))) { if ($key=~/locked$/) { my ($symb,$uname,$udom) = &decode_queue_key($key); @@ -309,7 +396,9 @@ sub show_queue { $result.=""; + $result.='"; } } $result.="
resourceusertypedata
$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'})."
queue entryEnd time: '. + &Apache::lonlocal::locallocaltime($slot_data{'endtime'}). + "
\n"; @@ -469,14 +558,23 @@ 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); + $Apache::bridgetask::dimensionmandatory{$dim_id}= + &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); return ''; } @@ -494,34 +592,107 @@ sub get_instance { sub end_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; + my $dim_id=&get_id($parstack,$safeeval); + my $instance=&get_instance(); if ($target eq 'web') { - my $instance=&get_instance(); $result=$dimension{'intro'}.$dimension{$instance.'.text'}; + if ($Apache::lonhomework::history{'resource.status'} eq 'pass' || + $Apache::lonhomework::history{'resource.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"}; + $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.$dim_id.$instance.$id.comment"}) { + $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}.'
'; + } + $result.=$dimension{$instance.'.criteria.'.$id}. + '
'; + } + } } elsif ($target eq 'webgrade') { - my $instance=&get_instance(); foreach my $id (@{$dimension{$instance.'.criterias'}}) { my $link='criteria_'.$instance.'_'.$id; - $result.=''. + my $status=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.status"}; + $result.=''. ''. ''. '
'. #$dimension{$instance.'.criteria.'.$id}. ''. - 'Additional Comment for Student
'. - ''. + 'Additional Comment for Student
'. + ''. ''. ''. - '
'. - '
'. - '
'. - '
'. + '
'. + '
'. + '
'. + '
'. ''. ''. 'Prev
'. - 'Next
'. + '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"})) { + 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.$dim_id.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id}; + $Apache::lonhomework::results{"resource.$dim_id.$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.$dim_id.status"}= + 'review'; + } elsif ($ungraded) { + $Apache::lonhomework::results{"resource.$dim_id.status"}= + 'ungraded'; + } elsif ($mandatory_failed) { + $Apache::lonhomework::results{"resource.$dim_id.status"}= + 'fail'; + } else { + $Apache::lonhomework::results{"resource.$dim_id.status"}= + 'pass'; + } } return $result; } @@ -551,9 +722,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 ''; } @@ -581,7 +755,7 @@ sub end_InstanceText { sub start_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'webgrade') { + if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { &Apache::lonxml::startredirection(); } return ''; @@ -590,10 +764,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' || $target eq 'webgrade') { + 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 '';