--- loncom/homework/bridgetask.pm 2005/05/10 20:58:38 1.23
+++ loncom/homework/bridgetask.pm 2005/05/20 18:53:53 1.28
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.23 2005/05/10 20:58:38 albertel Exp $
+# $Id: bridgetask.pm,v 1.28 2005/05/20 18:53:53 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -71,11 +71,16 @@ sub proctor_check_auth {
if ($authhost ne 'no_host') {
my $version=
$Apache::lonhomework::results{'resource.version'}=
- $Apache::lonhomework::history{'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;
}
}
@@ -83,8 +88,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]','<select name="previousversion">
<option>Pick one</option>
</select>');
@@ -100,7 +122,10 @@ sub add_grading_button {
}
sub add_request_another_attempt_button {
-
+ my $result;
+ $result.=' <input type="submit" name="requestattempt" value="'.
+ &mt("Request another attempt").'" />';
+ return $result;
}
sub start_Task {
@@ -118,7 +143,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.='<form name="gradesubmission" method="POST" action="';
my $uri=$env{'request.uri'};
@@ -128,6 +152,7 @@ sub start_Task {
}
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);
@@ -136,6 +161,7 @@ sub start_Task {
$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') ||
@@ -194,11 +220,12 @@ sub start_Task {
'" value="'.$env{"form.grade_$field"}.'" />'."\n";
}
}
- if ($Apache::lonhomework::history{'resource.status'} eq 'fail') {
+ my $version=&get_version();
+ if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
$result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
- $result.=&request_another_attempt_button();
+ $result.=&add_request_another_attempt_button();
}
- if ($Apache::lonhomework::history{'resource.status'} eq 'pass') {
+ if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
$result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
}
}
@@ -239,7 +266,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'};
+ my $version=&get_version();
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex') {
if (
@@ -249,7 +276,7 @@ sub end_Task {
if ($target eq 'web') {
if ($status eq 'CAN_ANSWER') {
$result.="\n".'<table border="1">'.
- &Apache::inputtags::file_selector($version,
+ &Apache::inputtags::file_selector("$version.0",
"bridgetask","*",
'portfolioonly').
"</table>";
@@ -262,14 +289,18 @@ sub end_Task {
}
if ($target eq 'grade' && !$env{'form.webgrade'}) {
my $award='SUBMITTED';
- &Apache::essayresponse::file_submission('0','bridgetask',
+ &Apache::essayresponse::file_submission("$version.0",'bridgetask',
'portfiles',\$award);
if ($award eq 'SUBMITTED' &&
- $Apache::lonhomework::results{"resource.$version.bridgetask.portfiles"}) {
- $Apache::lonhomework::results{"resource.$version.tries"}=
- 1+$Apache::lonhomework::history{"resource.$version.tries"};
+ $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) {
+ $Apache::lonhomework::results{"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::results{"resource.$version.award"}=$award;
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&Apache::structuretags::finalize_storage();
if ($award eq 'SUBMITTED') {
@@ -287,7 +318,7 @@ sub end_Task {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
my $status=
- $Apache::lonhomework::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') {
@@ -307,20 +338,34 @@ sub end_Task {
$Apache::lonhomework::results{'resource.grader'}=
$env{'user.name'}.'@'.$env{'user.domain'};
if ($review) {
- $Apache::lonhomework::results{'resource.status'}='review';
+ $Apache::lonhomework::results{"resource.$version.status"}='review';
&move_to_review_queue();
} elsif ($ungraded) {
- $Apache::lonhomework::results{'resource.status'}='ungraded';
+ $Apache::lonhomework::results{"resource.$version.status"}='ungraded';
&check_queue_unlock();
} elsif ($mandatory_failed) {
- $Apache::lonhomework::results{'resource.status'}='fail';
- $Apache::lonhomework::results{"resource.$version.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::lonhomework::results{'resource.status'}='pass';
- $Apache::lonhomework::results{"resource.$version.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.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') {
@@ -352,7 +397,12 @@ sub check_queue_unlock {
}
sub remove_from_queue {
- &Apache::lonxml::debug("Want to remove. Done?");
+ 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('gradingqueue',\@keys,$cdom,$cnum);
}
sub setup_env_for_other_user {
@@ -381,27 +431,27 @@ 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>".
+ $result.="\n<h3>Current Queue</h3><table border='1'><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);
my $title=&Apache::lonnet::gettitle($symb);
- $result.="<tr><td>$title</td><td>$uname</td><td>";
+ $result.="<tr><td>$title</td><td>$uname</td>";
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
} elsif ($key=~/timestamp$/) {
my ($symb,undef) = split("\0",$key);
my $title=&Apache::lonnet::gettitle($symb);
- $result.="<tr><td>$title</td><td></td><td>";
+ $result.="<tr><td>$title</td><td></td>";
$result.='<td>last queue modification time</td><td>'.
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
} else {
my ($symb,$uname,$udom) = &decode_queue_key($key);
my $title=&Apache::lonnet::gettitle($symb);
- $result.="<tr><td>$title</td><td>$uname</td><td>";
+ $result.="<tr><td>$title</td><td>$uname</td>";
my $slot=$queue{$key}->[0];
my %slot_data=&Apache::lonnet::get_slot($slot);
- $result.='<td>queue entry</td><td>End time: '.
+ $result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
"</td></tr>";
}
@@ -597,15 +647,16 @@ sub get_instance {
sub end_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- my $dim_id=&get_id($parstack,$safeeval);
+ 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.status'} eq 'pass' ||
- $Apache::lonhomework::history{'resource.status'} eq 'fail') {
+ 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.$dim_id.$instance.$id.status"};
- my $comment=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"};
+ my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
+ my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
$result.='<table border="1"><tr><td>';
if ($status eq 'fail') {
$result.='<font color="red">'.&mt('Did not pass').'</font>';
@@ -615,8 +666,8 @@ sub get_instance {
&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>';
+ if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
+ $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';
}
$result.=$dimension{$instance.'.criteria.'.$id}.
'</td></tr></table>';
@@ -625,7 +676,7 @@ sub get_instance {
} 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"};
+ my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
$result.='<tr><td width="100%" valign="top">'.
'<a name="'.$link.'" />'.
'<a name="next_'.$last_link.'" />'.
@@ -633,7 +684,7 @@ sub get_instance {
#$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>'.
+ '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$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 />'.
@@ -666,8 +717,8 @@ sub get_instance {
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 $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++; }
@@ -686,16 +737,16 @@ 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"}=
+ $Apache::lonhomework::results{"resource.$version.$dim.status"}=
'review';
} elsif ($ungraded) {
- $Apache::lonhomework::results{"resource.$dim_id.status"}=
+ $Apache::lonhomework::results{"resource.$version.$dim.status"}=
'ungraded';
} elsif ($mandatory_failed) {
- $Apache::lonhomework::results{"resource.$dim_id.status"}=
+ $Apache::lonhomework::results{"resource.$version.$dim.status"}=
'fail';
} else {
- $Apache::lonhomework::results{"resource.$dim_id.status"}=
+ $Apache::lonhomework::results{"resource.$version.$dim.status"}=
'pass';
}
}