--- loncom/homework/bridgetask.pm 2005/05/10 16:44:35 1.21
+++ loncom/homework/bridgetask.pm 2005/05/13 15:34:50 1.24
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.21 2005/05/10 16:44:35 albertel Exp $
+# $Id: bridgetask.pm,v 1.24 2005/05/13 15:34:50 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;
}
}
@@ -94,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)=@_;
@@ -119,12 +128,13 @@ sub start_Task {
}
if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
$target eq 'tex') {
+ my $version=$Apache::lonhomework::history{'resource.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' ) ||
@@ -132,6 +142,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" ) {
@@ -144,6 +155,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 +171,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,6 +195,13 @@ 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') {
@@ -217,6 +240,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 (
@@ -226,7 +250,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');
@@ -241,11 +266,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') {
@@ -290,11 +315,11 @@ sub end_Task {
&check_queue_unlock();
} elsif ($mandatory_failed) {
$Apache::lonhomework::results{'resource.status'}='fail';
- $Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS';
+ $Apache::lonhomework::results{"resource.$version.award"}='EXACT_ANS';
&remove_from_queue();
} else {
$Apache::lonhomework::results{'resource.status'}='pass';
- $Apache::lonhomework::results{"resource.0.award"}='INCORRECT';
+ $Apache::lonhomework::results{"resource.$version.award"}='INCORRECT';
&remove_from_queue();
}
&Apache::structuretags::finalize_storage();
@@ -577,10 +602,32 @@ sub get_instance {
my $instance=&get_instance();
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.='';
+ 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 $version=$Apache::lonhomework::history{'resource.version'};
foreach my $id (@{$dimension{$instance.'.criterias'}}) {
my $link='criteria_'.$instance.'_'.$id;
- my $status=$Apache::lonhomework::history{'resource.'.$instance.'.'.$id.'.status'};
+ my $status=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.status"};
$result.=''.
' '.
' '.
@@ -588,7 +635,7 @@ sub get_instance {
#$dimension{$instance.'.criteria.'.$id}.
' '.
'Additional Comment for Student '.
- ''.
+ ''.
' '.
''.
' Ungraded '.
@@ -602,16 +649,27 @@ 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::lonhomework::results{'resource.'.$instance.'.'.$id.'.status'}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
- $Apache::lonhomework::results{'resource.'.$instance.'.'.$id.'.comment'}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
+ 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++; }
@@ -622,7 +680,7 @@ sub get_instance {
} elsif ($status eq 'ungraded') {
$ungraded++;
} else {
- &Apache::lonxml::error("got wierd status --$status--");
+ &Apache::lonxml::error("got weird status --$status--");
}
}
if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
@@ -630,13 +688,17 @@ sub get_instance {
}
&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';
+ $Apache::lonhomework::results{"resource.$dim_id.status"}=
+ 'review';
} elsif ($ungraded) {
- $Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='ungraded';
+ $Apache::lonhomework::results{"resource.$dim_id.status"}=
+ 'ungraded';
} elsif ($mandatory_failed) {
- $Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='fail';
+ $Apache::lonhomework::results{"resource.$dim_id.status"}=
+ 'fail';
} else {
- $Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='pass';
+ $Apache::lonhomework::results{"resource.$dim_id.status"}=
+ 'pass';
}
}
return $result;