--- loncom/homework/bridgetask.pm 2005/03/28 19:26:10 1.4
+++ loncom/homework/bridgetask.pm 2005/05/03 00:05:41 1.14
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.4 2005/03/28 19:26:10 albertel Exp $
+# $Id: bridgetask.pm,v 1.14 2005/05/03 00:05:41 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,20 +37,33 @@ use Apache::lonmenu;
use Apache::lonlocal;
use Apache::lonxml;
use Time::HiRes qw( gettimeofday tv_interval );
+
BEGIN {
&Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));
}
+sub initialize_bridgetask {
+ # id of current Dimension, 0 means that no dimension is current
+ # (inside <Task> only)
+ $Apache::bridgetask::dimension='';
+ # list of all Dimension ids seen
+ @Apache::bridgetask::dimensionlist=();
+ # list of all current Instance ids
+ @Apache::bridgetask::instance=();
+ # list of all Instance ids seen in this problem
+ @Apache::bridgetask::instancelist=();
+}
+
sub proctor_check_auth {
my ($slot)=@_;
- my $user=$ENV{'form.proctorname'};
- my $domain=$ENV{'form.proctordomain'};
+ my $user=$env{'form.proctorname'};
+ my $domain=$env{'form.proctordomain'};
my @allowed=split(",",$slot->{'proctor'});
foreach my $possible (@allowed) {
my ($puser,$pdom)=(split('@',$possible));
if ($puser eq $user && $pdom eq $domain) {
- my $authhost=&Apache::lonnet::authenticate($puser,$ENV{'form.proctorpassword'},$pdom);
+ my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
if ($authhost ne 'no_host') {
$Apache::lonhomework::results{'resource.checkedin'}=
$user.'@'.$domain;
@@ -61,23 +74,48 @@ sub proctor_check_auth {
return 0;
}
+sub add_previous_version_button {
+ my $result;
+ $result.=&mt(' Show a previously done version: [_1]','<select name="previousversion">
+<option>Pick one</option>
+</select>');
+ return $result;
+}
+
+sub add_grading_button {
+ my $result;
+ $result.=' <input type="submit" name="gradeasubmission" value="'.
+ &mt("Get a submission to grade").'" />';
+ $result.='<input type="hidden" name="grade_target" value="webgrade" />';
+ return $result;
+}
+
sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
&Apache::structuretags::initialize_storage();
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
-
my ($status,$accessmsg,$slot);
$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) {
+ $body_tag_start.='<form name="gradesubmission" method="POST" action="';
+ my $uri=$env{'request.uri'};
+ if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
+ $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
+ }
+ }
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);
+ 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);
@@ -128,13 +166,19 @@ sub start_Task {
$body_tag_start \n $form_tag_start".
'<input type="hidden" name="submitted" value="yes" />';
# if we are viewing someone else preserve that info
- if (defined $ENV{'form.grade_symb'}) {
+ if (defined $env{'form.grade_symb'}) {
foreach my $field ('symb','courseid','domain','username') {
$result .= '<input type="hidden" name="grade_'.$field.
- '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
+ '" value="'.$env{"form.grade_$field"}.'" />'."\n";
}
}
}
+ } elsif ($target eq 'webgrade') {
+ $result.=$head_tag_start.$body_tag_start.$form_tag_start.
+ 'Yahoo!';
+ $result.=&show_queue();
+ $result.=&get_from_queue();
+
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -147,18 +191,38 @@ 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 'tex' || $target eq 'webgrade') {
if (
- (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
+ (($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">'.
+ &Apache::inputtags::file_selector('0',"bridgetask","*",
+ 'portfolioonly').
+ "</table>";
+ $result.=&Apache::inputtags::gradestatus('0');
+ }
+ }
+ if ($target eq 'web' || $target eq 'webgrade') {
$result.=&Apache::lonxml::xmlend().'</html>';
}
}
if ($target eq 'grade') {
+ my $award='SUBMITTED';
+ &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();
+ }
}
} elsif ($target eq 'meta') {
$result.='<parameter part="0" package="Task"></parameter>'."\n";
@@ -169,11 +233,129 @@ sub end_Task {
return $result;
}
+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\0timestamp"}=time;
+ $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\0queue";
+ my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
+ $result.="<table><tr><th>resource</th><th>user</th><th>Time available for grading</th></tr>";
+ foreach my $key (sort(keys(%queue))) {
+ my ($symb,undef,$user) = split("\0",$key);
+ my ($uname,$udom) = split('@',$user);
+ 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.="End time: ".&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."</td></tr>";
+ }
+ $result.="</table>";
+ 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)=@_;
+ 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)=@_;
+ foreach my $key (sort(keys(%$queue))) {
+ my ($symb,$uname,$udom)=&decode_queue_key($key);
+ if ($check_section) {
+ my $section=&Apache::lonnet::getsection($uname,$udom);
+ if ($section ne $check_section) { next; }
+ }
+ my $slot=$queue->{$key}[0];
+ my %slot_data=&Apache::lonnet::get_slot($slot);
+ if ($slot_data{'endtime'} > time) { next; }
+ if (&queue_key_locked($key)) { next; }
+ return $key;
+ }
+ 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;
+ while (1) {
+ my $starttime=time;
+ &Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime},
+ $cdom,$cnum);
+ 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'}) {
+ $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue);
+ }
+ # no one in our section so look for any user that is ready for grading
+ if (!$todo) {
+ $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue);
+ }
+ # no user to grade
+ if (!$todo) { last; }
+ # 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
+ if ($success ne 'ok') { next; }
+ my (undef,$endtime)=
+ &Apache::lonnet::get('gradingqueue',["$symb\0timestamp"],
+ $cdom,$cnum);
+ # 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);
+ if ($key eq $todo && ref($value)) {
+ } else {
+ &Apache::lonnet::del('gradingqueue',["$todo\0locked"],
+ $cdom,$cnum);
+ next;
+ }
+ }
+ last;
+ }
+ return $todo;
+}
+
sub start_ClosingParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
- $result='<table border="1"><tr><td>Closing</td></tr><tr><td>';
+ } elsif ($target eq 'webgrade') {
+ &Apache::lonxml::startredirection();
}
return $result;
}
@@ -182,36 +364,45 @@ sub end_ClosingParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
- $result='</td></tr></table>';
+ } elsif ($target eq 'webgrade') {
+ &Apache::lonxml::endredirection();
}
return $result;
}
my %dimension;
-my $dim_id;
sub start_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
undef(%dimension);
- $dim_id=$Apache::lonxml::curdepth;
+ my $dim_id=$Apache::lonxml::curdepth;
+ $Apache::bridgetask::dimension=$dim_id;
+ push(@Apache::bridgetask::dimensionlist,$dim_id);
+ undef(@Apache::bridgetask::instance);
return '';
}
+sub get_instance {
+ #FIXME just grabbing the first one for now, need
+ #to randomly pick one until all have been seen
+ #then start repicking
+ &Apache::response::pushrandomnumber();
+ my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
+ return $order[0];
+}
+
sub end_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
- #FIXME just grabbing the first one for now, need
- #to randomly pick one until all have been seen
- #then start repicking
- my $instance=$dimension{'instances'}->[0];
- $result=$dimension{'intro'}.
- $dimension{$instance.'.text'}.
- '<table border="1"><tr><td>Criteria</td></tr><tr><td>';
+ my $instance=&get_instance();
+ $result=$dimension{'intro'}.$dimension{$instance.'.text'};
+ } elsif ($target eq 'webgrade') {
+ my $instance=&get_instance();
+ $result.='<table>';
foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- $result.=$dimension{$instance.'.criteria.'.$id}.
- '</td></tr><tr><td>';
+ $result.='<tr><td>'.
+ $dimension{$instance.'.criteria.'.$id}.'</td></tr>';
}
- $result=~s/<tr><td>$//;
$result.='</table>';
}
return $result;
@@ -220,11 +411,9 @@ sub end_Dimension {
sub start_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- if ($target eq 'web') {
- if ($tagstack->[-2] eq 'Dimension') {
+ if ($target eq 'web' || $target eq 'webgrade') {
+ if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {
&Apache::lonxml::startredirection();
- } else {
- $result='<table border="1"><tr><td>Intro</td></tr><tr><td>';
}
}
return $result;
@@ -233,21 +422,19 @@ sub start_IntroParagraph {
sub end_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- if ($target eq 'web') {
- if ($tagstack->[-2] eq 'Dimension') {
+ if ($target eq 'web' || $target eq 'webgrade') {
+ if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {
$dimension{'intro'}=&Apache::lonxml::endredirection();
- } else {
- $result='</td></tr></table>';
}
}
return $result;
}
-my $instance_id;
sub start_Instance {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
push(@{$dimension{'instances'}},$Apache::lonxml::curdepth);
- $instance_id=$Apache::lonxml::curdepth;
+ push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth);
+ push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth);
return '';
}
@@ -258,7 +445,7 @@ sub end_Instance {
sub start_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'webgrade') {
&Apache::lonxml::startredirection();
}
return '';
@@ -266,7 +453,8 @@ sub start_InstanceText {
sub end_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if ($target eq 'web') {
+ my $instance_id=$Apache::bridgetask::instance[-1];
+ if ($target eq 'web' || $target eq 'webgrade') {
$dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection();
}
return '';
@@ -274,7 +462,7 @@ sub end_InstanceText {
sub start_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'webgrade') {
&Apache::lonxml::startredirection();
}
return '';
@@ -282,7 +470,8 @@ sub start_Criteria {
sub end_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if ($target eq 'web') {
+ my $instance_id=$Apache::bridgetask::instance[-1];
+ if ($target eq 'web' || $target eq 'webgrade') {
my $criteria=&Apache::lonxml::endredirection();
my $id=$Apache::lonxml::curdepth;
$dimension{$instance_id.'.criteria.'.$id}=$criteria;
@@ -294,14 +483,11 @@ sub end_Criteria {
sub proctor_validation_screen {
my ($slot) = @_;
my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
- my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:gif",&Apache::lonnet::homeserver($user,$domain));
- my $url="/uploaded/$domain/$user/internal/studentphoto.gif";
- my $tokenurl=&Apache::lonnet::tokenwrapper($url);
- my $dom=(&Apache::lonxml::whichuser())[2];
- my $user=$ENV{'form.proctorname'};
- if ($ENV{'form.proctordomain'}) { $dom=$ENV{'form.proctordomain'}; }
+ my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
+ $user=$env{'form.proctorname'};
+ if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; }
my $msg;
- if ($ENV{'form.proctorpassword'}) {
+ if ($env{'form.proctorpassword'}) {
$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
.'</font></p>';
}
@@ -309,17 +495,17 @@ sub proctor_validation_screen {
<h2>Proctor Validation</h2>
<p>Your room's proctor needs to validate your access to this resource.</p>
$msg
-<form name="checkout" method="POST" action="$ENV{'request.uri'}">
+<form name="checkout" method="POST" action="$env{'request.uri'}">
<input type="hidden" name="validate" value="yes" />
<input type="hidden" name="submitted" value="yes" />
<table>
<tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$user" /></td></tr>
<tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
- <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$dom" /></td></tr>
+ <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$domain" /></td></tr>
</table>
<input type="submit" name="checkoutbutton" value="Validate" /><br />
Student who should be logged in is:<br />
-<img src="$tokenurl" /><br />
+<img src="$url" /><br />
</form>
ENDCHECKOUT
return $result;