--- loncom/homework/bridgetask.pm 2005/04/29 21:22:33 1.13
+++ loncom/homework/bridgetask.pm 2005/05/10 16:03:44 1.20
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.13 2005/04/29 21:22:33 albertel Exp $
+# $Id: bridgetask.pm,v 1.20 2005/05/10 16:03:44 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,10 +48,14 @@ 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
@Apache::bridgetask::instancelist=();
+ # key of queud user data that we are currently grading
+ $Apache::bridgetask::queue_key='';
}
sub proctor_check_auth {
@@ -93,14 +97,17 @@ sub add_grading_button {
sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- &Apache::structuretags::initialize_storage();
- &Apache::lonhomework::showhash(%Apache::lonhomework::history);
my ($status,$accessmsg,$slot);
+ if ($target ne 'webgrade') {
+ &Apache::structuretags::initialize_storage();
+ &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+ }
+
$Apache::lonhomework::parsing_a_task=1;
#should get back a <html> or the neccesary stuff to start XML/MathML
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&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) {
@@ -112,9 +119,10 @@ sub start_Task {
}
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex') {
- ($status,$accessmsg,$slot) =
+ ($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"}.'";';
&Apache::run::run($expression,$safeeval);
@@ -173,8 +181,27 @@ sub start_Task {
}
}
} elsif ($target eq 'webgrade') {
- $result.=$head_tag_start.$body_tag_start.$form_tag_start.
- 'Yahoo!';
+ $result.=$head_tag_start.$body_tag_start.$form_tag_start;
+ $result.='<input type="hidden" name="webgrade" value="yes" />';
+ $result.=&show_queue();
+ my $todo=&get_from_queue();
+ if ($todo) {
+ &setup_env_for_other_user($todo,$safeeval);
+ my ($symb,$uname,$udom)=&decode_queue_key($todo);
+ $result.="\n".'<table><tr><td>Found '.
+ &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
+ $result.='<input type="hidden" name="gradingkey" value="'.
+ &Apache::lonnet::escape($todo).'" />';
+ $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>';
+ 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 = '';
@@ -187,14 +214,14 @@ sub end_Task {
my $result='';
my $status=$Apache::inputtags::status['-1'];
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
- $target eq 'tex' || $target eq 'webgrade') {
+ $target eq 'tex') {
if (
(($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
($target eq 'answer') || ($target eq 'tex')
) {
if ($target eq 'web') {
if ($status eq 'CAN_ANSWER') {
- $result.='<table border="1">'.
+ $result.="\n".'<table border="1">'.
&Apache::inputtags::file_selector('0',"bridgetask","*",
'portfolioonly').
"</table>";
@@ -205,16 +232,77 @@ 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);
- if ($Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {
+ &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.0.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;
+ foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
+ my $status=
+ $Apache::lonhomeork::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::lonhomeork::results{'resource.grader'}=
+ $env{'user.name'}.'@'.$env{'user.domain'};
+ if ($review) {
+ $Apache::lonhomeork::results{'resource.status'}='review';
+ &move_to_review_queue();
+ } elsif ($ungraded) {
+ $Apache::lonhomeork::results{'resource.status'}='ungraded';
+ &check_queue_unlock();
+ } elsif ($mandatory_failed) {
+ $Apache::lonhomeork::results{'resource.status'}='fail';
+ $Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS';
+ &remove_from_queue();
+ } else {
+ $Apache::lonhomeork::results{'resource.status'}='pass';
+ $Apache::lonhomework::results{"resource.0.award"}='INCORRECT';
+ &remove_from_queue();
+ }
+ }
+ } elsif ($target eq 'webgrade') {
+ $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";
#$result.=&Apache::response::meta_part_order();
@@ -224,6 +312,194 @@ sub end_Task {
return $result;
}
+sub setup_env_for_other_user {
+ my ($queue_key,$safeeval)=@_;
+ my ($symb,$uname,$udom)=&decode_queue_key($queue_key);
+ $env{'form.grade_symb'}=$symb;
+ $env{'form.grade_domain'}=$udom;
+ $env{'form.grade_username'}=$uname;
+ $env{'form.grade_courseid'}=$env{'request.course.id'};
+ &Apache::lonxml::initialize_rndseed($safeeval);
+}
+
+sub add_to_queue {
+ my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+ my $cnum=$env{'course.'.$cid.'.num'};
+ my $cdom=$env{'course.'.$cid.'.domain'};
+ my %data;
+ $data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name];
+ &Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum);
+}
+
+sub show_queue {
+ my $result;
+ my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+ my $cnum=$env{'course.'.$cid.'.num'};
+ 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>";
+ 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.='<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.='<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>";
+ 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.="</table><hr />\n";
+ return $result;
+}
+
+sub decode_queue_key {
+ my ($key)=@_;
+ my ($symb,undef,$user) = split("\0",$key);
+ my ($uname,$udom) = split('@',$user);
+ return ($symb,$uname,$udom);
+}
+
+sub queue_key_locked {
+ my ($key,$cdom,$cnum)=@_;
+ my ($key_locked,$value)=
+ &Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum);
+ if ($key_locked eq "$key\0locked") {
+ return $value;
+ }
+ return undef;
+}
+
+sub pick_from_queue_data {
+ my ($check_section,$queue,$cdom,$cnum)=@_;
+ foreach my $key (keys(%$queue)) {
+ my ($symb,$uname,$udom)=&decode_queue_key($key);
+ if ($check_section) {
+ my $section=&Apache::lonnet::getsection($uname,$udom);
+ if ($section eq $check_section) {
+ &Apache::lonnet::logthis("my sec");
+ next;
+ }
+ }
+ my $slot=$queue->{$key}[0];
+ my %slot_data=&Apache::lonnet::get_slot($slot);
+ if ($slot_data{'endtime'} > time) {
+ &Apache::lonnet::logthis("not time");
+ next;
+ }
+ if (&queue_key_locked($key,$cdom,$cnum)) {
+ &Apache::lonnet::logthis("someone already has um.");
+ next;
+ }
+ return $key;
+ }
+ return undef;
+}
+
+sub find_mid_grade {
+ my ($symb,$cdom,$cnum)=@_;
+ my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
+ my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ if ($todo) {
+ my $who=&queue_key_locked($todo,$cdom,$cnum);
+ if ($who eq $me) { return $todo; }
+ }
+ my $regexp="^$symb\0.*\0locked\$";
+ my %locks=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
+ foreach my $key (keys(%locks)) {
+ my $who=$locks{$key};
+ if ($who eq $me) {
+ $todo=$key;
+ $todo=~s/\0locked$//;
+ return $todo;
+ }
+ }
+ return undef;
+}
+
+sub get_from_queue {
+ my $result;
+ my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+ my $cnum=$env{'course.'.$cid.'.num'};
+ my $cdom=$env{'course.'.$cid.'.domain'};
+ my $todo;
+ # FIXME need to find if I am 'mid grading'
+ $todo=&find_mid_grade($symb,$cdom,$cnum);
+ &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo)));
+ if ($todo) { return $todo; }
+ while (1) {
+ my $starttime=time;
+ &Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime},
+ $cdom,$cnum);
+ &Apache::lonnet::logthis("$starttime");
+ my $regexp="^$symb\0queue\0";
+ my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
+ #make a pass looking for a user in my section
+ if ($env{'request.course.sec'}) {
+ &Apache::lonnet::logthis("sce");
+ $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue,
+ $cdom,$cnum);
+ &Apache::lonnet::logthis("sce $todo");
+ }
+ # no one in our section so look for any user that is ready for grading
+ if (!$todo) {
+ &Apache::lonnet::logthis("no sce");
+ $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue,
+ $cdom,$cnum);
+ &Apache::lonnet::logthis("no sce $todo");
+ }
+ # no user to grade
+ if (!$todo) { last; }
+ &Apache::lonnet::logthis("got $todo");
+ # otherwise found someone so lets try to lock them
+ my $success=&Apache::lonnet::newput('gradingqueue',
+ {"$todo\0locked"=>
+ $env{'user.name'}.'@'.$env{'user.domain'}},
+ $cdom,$cnum);
+ # someone else already picked them
+ &Apache::lonnet::logthis("success $todo");
+ if ($success ne 'ok') { next; }
+ my (undef,$endtime)=
+ &Apache::lonnet::get('gradingqueue',["$symb\0timestamp"],
+ $cdom,$cnum);
+ &Apache::lonnet::logthis("emd $endtime");
+ # someone else already modified the queue,
+ # perhaps our picked user wass already fully graded between
+ # when we picked him and when we locked his record? so lets
+ # double check.
+ if ($endtime != $starttime) {
+ my ($key,$value)=
+ &Apache::lonnet::get('gradingqueue',["$todo"],
+ $cdom,$cnum);
+ &Apache::lonnet::logthis("check $key .. $value");
+ if ($key eq $todo && ref($value)) {
+ } else {
+ &Apache::lonnet::del('gradingqueue',["$todo\0locked"],
+ $cdom,$cnum);
+ &Apache::lonnet::logthis("del");
+ next;
+ }
+ }
+ &Apache::lonnet::logthis("last $todo");
+ last;
+ }
+ return $todo;
+}
+
sub start_ClosingParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
@@ -244,14 +520,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 '';
}
@@ -264,22 +549,75 @@ sub get_instance {
return $order[0];
}
-sub end_Dimension {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $result;
- if ($target eq 'web') {
- my $instance=&get_instance();
- $result=$dimension{'intro'}.$dimension{$instance.'.text'};
- } elsif ($target eq 'webgrade') {
+{
+ my $last_link;
+ sub end_Dimension {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
my $instance=&get_instance();
- $result.='<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'};
+ } elsif ($target eq 'webgrade') {
+ foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+ my $link='criteria_'.$instance.'_'.$id;
+ my $status=$Apache::lonhomeork::history{'resource.'.$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::lonhomeork::history{'resource.'.$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>';
+ $last_link=$link;
+ }
+ } elsif ($target eq 'grade') {
+ 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 $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++;
+ }
+ }
+ if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
+ $mandatory_failed++;
+ }
+ if ($review) {
+ $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='review';
+ } elsif ($ungraded) {
+ $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='ungraded';
+ } elsif ($mandatory_failed) {
+ $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='fail';
+ } else {
+ $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='pass';
+ }
}
- $result.='</table>';
+ return $result;
}
- return $result;
}
sub start_IntroParagraph {
@@ -306,9 +644,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 '';
}
@@ -347,8 +688,10 @@ sub end_Criteria {
my $instance_id=$Apache::bridgetask::instance[-1];
if ($target eq 'web' || $target eq 'webgrade') {
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 '';