--- loncom/homework/bridgetask.pm 2005/05/10 16:03:44 1.20
+++ loncom/homework/bridgetask.pm 2005/05/19 21:28:06 1.26
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.20 2005/05/10 16:03:44 albertel Exp $
+# $Id: bridgetask.pm,v 1.26 2005/05/19 21:28:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -59,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,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;
}
}
@@ -78,8 +83,25 @@ sub proctor_check_auth {
return 0;
}
+sub get_version {
+ if ($env{'form.previousversion'} &&
+ defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
+ return $env{'form.previousversion'};
+ }
+ return $Apache::lonhomework::history{'resource.version'};
+}
+
sub add_previous_version_button {
+ my ($status)=@_;
my $result;
+ if ($Apache::lonhomework::history{'resource.version'} eq '0') {
+ return '';
+ }
+ my $version=&get_version();
+ if ($version ne $Apache::lonhomework::history{'resource.version'}) {
+ return '';
+ }
+
$result.=&mt(' Show a previously done version: [_1]','
Pick one
');
@@ -94,6 +116,13 @@ sub add_grading_button {
return $result;
}
+sub add_request_another_attempt_button {
+ my $result;
+ $result.=' ';
+ return $result;
+}
+
sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@@ -109,7 +138,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.='
";
}
}
- 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') {
+ my $version=&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");
+ $body_tag_start.=&add_previous_version_button($status);
if (( $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" ) {
@@ -144,6 +175,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').' ';
}
@@ -158,12 +191,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.
}
}
}
@@ -179,11 +215,22 @@ sub start_Task {
'" value="'.$env{"form.grade_$field"}.'" />'."\n";
}
}
+ my $version=&get_version();
+ if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+ $result.=''.&mt('Did not pass').' ';
+ $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.=&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);
@@ -197,11 +244,12 @@ sub start_Task {
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
$result.="\n".'';
} else {
- $result.="\n".
- '';
+ if ($target eq 'webgrade') {
+ $result.="\n".
+ '';
+ }
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 = '';
@@ -213,6 +261,7 @@ sub end_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
my $status=$Apache::inputtags::status['-1'];
+ my $version=&get_version();
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex') {
if (
@@ -222,7 +271,8 @@ sub end_Task {
if ($target eq 'web') {
if ($status eq 'CAN_ANSWER') {
$result.="\n".''.
- &Apache::inputtags::file_selector('0',"bridgetask","*",
+ &Apache::inputtags::file_selector($version,
+ "bridgetask","*",
'portfolioonly').
"
";
$result.=&Apache::inputtags::gradestatus('0');
@@ -237,11 +287,11 @@ sub end_Task {
&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') {
@@ -256,9 +306,10 @@ sub end_Task {
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::lonhomeork::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') {
@@ -274,23 +325,39 @@ sub end_Task {
if ($optional_passed < $optional_required) {
$mandatory_failed++;
}
- $Apache::lonhomeork::results{'resource.grader'}=
+ &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::lonhomeork::results{'resource.status'}='review';
+ $Apache::lonhomework::results{"resource.$version.status"}='review';
&move_to_review_queue();
} elsif ($ungraded) {
- $Apache::lonhomeork::results{'resource.status'}='ungraded';
+ $Apache::lonhomework::results{"resource.$version.status"}='ungraded';
&check_queue_unlock();
} elsif ($mandatory_failed) {
- $Apache::lonhomeork::results{'resource.status'}='fail';
- $Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS';
+ $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();
} else {
- $Apache::lonhomeork::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.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 ";
@@ -312,6 +379,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);
@@ -554,13 +633,36 @@ sub get_instance {
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::lonhomeork::history{'resource.'.$instance.'.'.$id.'.status'};
+ my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
$result.=''.
' '.
' '.
@@ -568,7 +670,7 @@ sub get_instance {
#$dimension{$instance.'.criteria.'.$id}.
' '.
'Additional Comment for Student '.
- ''.
+ ''.
' '.
''.
' Ungraded '.
@@ -582,38 +684,56 @@ sub get_instance {
' '.
' ';
+ $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') {
+ } 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::lonhomeork::results{'resource.'.$instance.'.'.$id.'.status'}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
- $Apache::lonhomeork::results{'resource.'.$instance.'.'.$id.'.comment'}=$env{'form.HWVAL_comment_'.$instance.'_'.$id};
+ 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 'ungraded') {
- $ungraded++;
} 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::lonhomeork::results{'resource.'.$instance.'.status'}='review';
+ $Apache::lonhomework::results{"resource.$version.$dim.status"}=
+ 'review';
} elsif ($ungraded) {
- $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='ungraded';
+ $Apache::lonhomework::results{"resource.$version.$dim.status"}=
+ 'ungraded';
} elsif ($mandatory_failed) {
- $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='fail';
+ $Apache::lonhomework::results{"resource.$version.$dim.status"}=
+ 'fail';
} else {
- $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='pass';
+ $Apache::lonhomework::results{"resource.$version.$dim.status"}=
+ 'pass';
}
}
return $result;
@@ -677,7 +797,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 '';
@@ -686,7 +806,7 @@ 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=&get_id($parstack,$safeeval);
$dimension{$instance_id.'.criteria.'.$id}=$criteria;