--- loncom/homework/bridgetask.pm 2005/05/03 14:52:31 1.17
+++ loncom/homework/bridgetask.pm 2005/05/10 20:58:38 1.23
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.17 2005/05/03 14:52:31 albertel Exp $
+# $Id: bridgetask.pm,v 1.23 2005/05/10 20:58:38 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'};
@@ -67,8 +69,13 @@ 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;
return 1;
}
}
@@ -92,6 +99,10 @@ sub add_grading_button {
return $result;
}
+sub add_request_another_attempt_button {
+
+}
+
sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@@ -115,14 +126,14 @@ sub start_Task {
$body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
}
}
- 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');
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' ) ||
@@ -130,6 +141,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 +154,8 @@ sub start_Task {
} elsif ($status eq 'NEEDS_CHECKIN') {
$msg.='<h1>'.&mt('You need the Proctor to validate you.').
'</h1>'.&proctor_validation_screen($slot);
+ } elsif ($status eq 'WAITING_FOR_GRADE') {
+ $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
} elsif ($status ne 'NOT_YET_VIEWED') {
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
}
@@ -156,12 +170,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 +194,21 @@ sub start_Task {
'" value="'.$env{"form.grade_$field"}.'" />'."\n";
}
}
+ if ($Apache::lonhomework::history{'resource.status'} eq 'fail') {
+ $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
+ $result.=&request_another_attempt_button();
+ }
+ if ($Apache::lonhomework::history{'resource.status'} eq 'pass') {
+ $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
+ }
+ }
+ } 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.='<input type="hidden" name="webgrade" value="yes" />';
+ $result.=&show_queue();
}
- } elsif ($target eq 'webgrade') {
- $result.=$head_tag_start.$body_tag_start.$form_tag_start;
- $result.=
- '<input type="hidden" name="grade_target" value="webgrade" />';
- $result.=&show_queue();
my $todo=&get_from_queue();
if ($todo) {
&setup_env_for_other_user($todo,$safeeval);
@@ -194,12 +220,14 @@ sub start_Task {
$Apache::bridgetask::queue_key=$todo;
&Apache::structuretags::initialize_storage();
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
+ $result.="\n".'<table width="100%" style="width:100%" border="1">';
} else {
- $result.="\n".
- '<table><tr><td>No user to be graded.</td></tr></table>';
+ if ($target eq 'webgrade') {
+ $result.="\n".
+ '<table><tr><td>No user to be graded.</td></tr></table>';
+ }
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 = '';
@@ -211,6 +239,7 @@ sub end_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
my $status=$Apache::inputtags::status['-1'];
+ my $version=$Apache::lonhomework::history{'resource.version'};
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex') {
if (
@@ -220,7 +249,8 @@ sub end_Task {
if ($target eq 'web') {
if ($status eq 'CAN_ANSWER') {
$result.="\n".'<table border="1">'.
- &Apache::inputtags::file_selector('0',"bridgetask","*",
+ &Apache::inputtags::file_selector($version,
+ "bridgetask","*",
'portfolioonly').
"</table>";
$result.=&Apache::inputtags::gradestatus('0');
@@ -230,29 +260,79 @@ sub end_Task {
$result.=&Apache::lonxml::xmlend().'</html>';
}
}
- 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"}=
- 1+$Apache::lonhomework::history{"resource.0.tries"};
+ $Apache::lonhomework::results{"resource.$version.bridgetask.portfiles"}) {
+ $Apache::lonhomework::results{"resource.$version.tries"}=
+ 1+$Apache::lonhomework::history{"resource.$version.tries"};
}
- $Apache::lonhomework::results{"resource.0.award"}=$award;
+ $Apache::lonhomework::results{"resource.$version.award"}=$award;
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&Apache::structuretags::finalize_storage();
if ($award eq 'SUBMITTED') {
&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.$version.award"}='EXACT_ANS';
+ &remove_from_queue();
+ } else {
+ $Apache::lonhomework::results{'resource.status'}='pass';
+ $Apache::lonhomework::results{"resource.$version.award"}='INCORRECT';
+ &remove_from_queue();
+ }
+ &Apache::structuretags::finalize_storage();
+ }
} elsif ($target eq 'webgrade') {
- $result.="\n<hr />";
- $result.='<input type="submit" name="next" value="'.
- &mt('Save & Next').'" /> ';
- $result.='<input type="submit" name="end" value="'.
- &mt('Save & Stop Grading').'" /> ';
- $result.='<input type="submit" name="end" value="'.
- &mt('Throw Away & Stop Grading').'" /> ';
+ $result.="</table>\n<hr />";
+ #$result.='<input type="submit" name="next" value="'.
+ # &mt('Save & Next').'" /> ';
+ #$result.='<input type="submit" name="end" value="'.
+ # &mt('Save & Stop Grading').'" /> ';
+ #$result.='<input type="submit" name="throwaway" value="'.
+ # &mt('Throw Away & Stop Grading').'" /> ';
+ #$result.='<input type="submit" name="save" value="'.
+ # &mt('Save Partial Grade and Continue Grading').'" /> ';
$result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
} elsif ($target eq 'meta') {
$result.='<parameter part="0" package="Task"></parameter>'."\n";
@@ -263,6 +343,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);
@@ -289,7 +381,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<h3>Current Queue</h3><table><tr><th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
+ $result.="\n<h3>Current Queue</h3><table><tr><th>resource</th>".
+ "<th>user</th><th>type</th><th>data</th></tr>";
foreach my $key (sort(keys(%queue))) {
if ($key=~/locked$/) {
my ($symb,$uname,$udom) = &decode_queue_key($key);
@@ -308,7 +401,9 @@ sub show_queue {
$result.="<tr><td>$title</td><td>$uname</td><td>";
my $slot=$queue{$key}->[0];
my %slot_data=&Apache::lonnet::get_slot($slot);
- $result.='<td>queue entry</td><td>End time: '.&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."</td></tr>";
+ $result.='<td>queue entry</td><td>End time: '.
+ &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
+ "</td></tr>";
}
}
$result.="</table><hr />\n";
@@ -468,14 +563,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 '';
}
@@ -488,22 +592,115 @@ sub get_instance {
return $order[0];
}
-sub end_Dimension {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $result;
- if ($target eq 'web') {
+{
+ my $last_link;
+ sub end_Dimension {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ my $dim_id=&get_id($parstack,$safeeval);
my $instance=&get_instance();
- $result=$dimension{'intro'}.$dimension{$instance.'.text'};
- } elsif ($target eq 'webgrade') {
- my $instance=&get_instance();
- $result.="\n".'<table>';
- foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- $result.='<tr><td>'.
- $dimension{$instance.'.criteria.'.$id}.'</td></tr>';
+ 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') {
+ 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.='<table border="1"><tr><td>';
+ if ($status eq 'fail') {
+ $result.='<font color="red">'.&mt('Did not pass').'</font>';
+ } elsif ($status eq 'pass') {
+ $result.='<font color="green">'.&mt('Passed').'</font>';
+ } else {
+ &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");
+ }
+ $result.='</td></tr><tr><td>';
+ if ($Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}) {
+ $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}.'</td></tr><tr><td>';
+ }
+ $result.=$dimension{$instance.'.criteria.'.$id}.
+ '</td></tr></table>';
+ }
+ }
+ } 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"};
+ $result.='<tr><td width="100%" valign="top">'.
+ '<a name="'.$link.'" />'.
+ '<a name="next_'.$last_link.'" />'.
+ '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'.
+ #$dimension{$instance.'.criteria.'.$id}.
+ '</td>'.
+ '<td><nobr>Additional Comment for Student</nobr> <br />'.
+ '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}).'</textarea>'.
+ '</td>'.
+ '<td>'.
+ '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'.
+ '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />Pass</label><br />'.
+ '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />Fail</label><br />'.
+ '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />Review</label><br />'.
+ '</td>'.
+ '<td>'.
+ '<a href="#'.$last_link.'">Prev</a><br />'.
+ '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.
+ '<input type="submit" name="next" value="'.
+ &mt('Done').'" /> '.
+ '</td></tr>';
+ $result.='<tr><td colspan="4">';
+ 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.='<a href="'.$file.'" target="lonGRDs"><img src="'.
+ &Apache::loncommon::icon($file).'" border=0"> '.$file.
+ '</a>';
+ }
+ $result.='</td></tr>';
+ $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';
+ }
}
- $result.='</table>';
+ return $result;
}
- return $result;
}
sub start_IntroParagraph {
@@ -530,9 +727,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 '';
}
@@ -560,7 +760,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 '';
@@ -569,10 +769,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 '';