--- loncom/homework/bridgetask.pm 2005/05/20 18:07:29 1.27
+++ loncom/homework/bridgetask.pm 2005/09/20 06:45:02 1.49
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.27 2005/05/20 18:07:29 albertel Exp $
+# $Id: bridgetask.pm,v 1.49 2005/09/20 06:45:02 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,7 @@ use Apache::File();
use Apache::lonmenu;
use Apache::lonlocal;
use Apache::lonxml;
+use Apache::slotrequest();
use Time::HiRes qw( gettimeofday tv_interval );
BEGIN {
@@ -76,6 +77,11 @@ sub proctor_check_auth {
$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;
}
}
@@ -84,42 +90,117 @@ sub proctor_check_auth {
}
sub get_version {
+ my ($version,$previous);
if ($env{'form.previousversion'} &&
+ $env{'form.previousversion'} ne 'current' &&
defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
- return $env{'form.previousversion'};
+ $version=$env{'form.previousversion'};
+ $previous=1;
+ } else {
+ $version=$Apache::lonhomework::history{'resource.version'};
+ $previous=0;
}
- return $Apache::lonhomework::history{'resource.version'};
+ if (wantarray) {
+ return ($version,$previous);
+ }
+ return $version;
}
sub add_previous_version_button {
my ($status)=@_;
my $result;
- if ($Apache::lonhomework::history{'resource.version'} eq '0') {
+ if ($Apache::lonhomework::history{'resource.version'} eq '') {
return '';
}
- my $version=&get_version();
- if ($version ne $Apache::lonhomework::history{'resource.version'}) {
+ if ($Apache::lonhomework::history{'resource.version'} < 2 &&
+ $status ne 'NEEDS_CHECKIN') {
return '';
}
-
- $result.=&mt(' Show a previously done version: [_1]','<select name="previousversion">
-<option>Pick one</option>
-</select>');
+ my $version=&get_version();
+ if ($env{'form.previousversion'} ne '' &&
+ $env{'form.previousversion'} eq $version) {
+ $result.="<h3>".&mt("Showing previous version [_1]",$version).
+ "</h3>\n";
+ }
+ my @to_show;
+ foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) {
+ if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) {
+ push(@to_show,$test_version);
+ }
+ }
+ my $list='<option>'.
+ join("</option>\n<option>",@to_show).
+ "</option>\n";
+ $list.='<option value="current">'.&mt('Current').'</option>';
+ $result.='<form name="getprevious" method="POST" action="';
+ my $uri=$env{'request.uri'};
+ if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
+ $result.=$uri.'">'.
+ &mt(' Show a previously done version: [_1]','<select onchange="this.form.submit()" name="previousversion">
+<option>'.&mt('Pick one').'</option>
+'.$list.'
+</select>')."</form>";
return $result;
}
sub add_grading_button {
- my $result;
- $result.=' <input type="submit" name="gradeasubmission" value="'.
+ my $result=' <input type="submit" name="gradeasubmission" value="'.
&mt("Get a submission to grade").'" />';
$result.='<input type="hidden" name="grade_target" value="webgrade" />';
+ if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
+ my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
+ $result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
+
+ $result.=' <input type="submit" name="reviewagrading" value="'.
+ &mt("Select an entry from the grading queue").'" /> </p>'."\n";
+
+ ($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
+ $result.='<p>'.&mt("Review Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
+ $result.=' <input type="submit" name="reviewasubmission" value="'.
+ &mt("Select an entry from the review queue").'" /> </p>'."\n";
+ $result.=' <input type="submit" name="regradeasubmission" value="'.
+ &mt("Select a user to regrade.").'" /> </p>'."\n";
+ }
return $result;
}
sub add_request_another_attempt_button {
+ my ($text)=@_;
+ if (!$text) { $text="Request another attempt"; }
+ my $result;
+ my $symb=&Apache::lonnet::symbread();
+ my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
+ my $action='get_reservation';
+ if ($slot_name) {
+ $text="Change reservation.";
+ $action='change_reservation';
+ my $description=&Apache::slotrequest::get_description($slot_name,
+ $slot);
+ $result.=(<<STUFF);
+<p> Will be next available: $description </p>
+STUFF
+ }
+
+ if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
+ $symb=&Apache::lonnet::escape($symb);
+ $result.='<form method="POST" action="/adm/slotrequest">'.
+ '<input type="hidden" name="symb" value="'.$symb.'" />'.
+ '<input type="hidden" name="command" value="'.$action.'" />'.
+ '<input type="submit" name="requestattempt" value="'.
+ &mt($text).'" />'.
+ '</form>';
+ return $result;
+}
+
+sub preserve_grade_info {
my $result;
- $result.=' <input type="submit" name="requestattempt" value="'.
- &mt("Request another attempt").'" />';
+ # if we are viewing someone else preserve that info
+ 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";
+ }
+ }
return $result;
}
@@ -143,11 +224,20 @@ sub start_Task {
my $uri=$env{'request.uri'};
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
$body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
+ my $symb=&Apache::lonnet::symbread();
+ if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
+ $body_tag_start.='<form method="POST" action="/adm/slotrequest">'.
+ '<input type="hidden" name="symb" value="'.$symb.'" />'.
+ '<input type="hidden" name="command" value="showslots" />'.
+ '<input type="submit" name="requestattempt" value="'.
+ &mt('Show Slot list').'" />'.
+ '</form>';
+ }
}
}
if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
$target eq 'tex') {
- my $version=&get_version();
+ my ($version,$previous)=&get_version();
($status,$accessmsg,my $slot_name,$slot) =
&Apache::lonhomework::check_task_access('0');
push(@Apache::inputtags::status,$status);
@@ -157,13 +247,14 @@ sub start_Task {
&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')) {
+ if (!$previous && (
+ ( $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" ) {
$result.= $head_tag_start.'</head>'.$body_tag_start;
@@ -172,6 +263,7 @@ sub start_Task {
$msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
} elsif ($status eq 'NOT_IN_A_SLOT') {
$msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
+ $msg.=&add_request_another_attempt_button("Sign up for time to work.");
} elsif ($status eq 'NEEDS_CHECKIN') {
$msg.='<h1>'.&mt('You need the Proctor to validate you.').
'</h1>'.&proctor_validation_screen($slot);
@@ -193,63 +285,92 @@ sub start_Task {
}
} elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
if ($status eq 'NEEDS_CHECKIN') {
- 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.
- }
+ &proctor_check_auth($slot_name,$slot);
}
}
} elsif ($target eq 'web') {
my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
$result.="$head_tag_start<title>$name</title></head>
- $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'}) {
- foreach my $field ('symb','courseid','domain','username') {
- $result .= '<input type="hidden" name="grade_'.$field.
- '" value="'.$env{"form.grade_$field"}.'" />'."\n";
- }
- }
- my $version=&get_version();
+ $body_tag_start \n";
+
+ my ($version,$previous)=&get_version();
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
$result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
- $result.=&add_request_another_attempt_button();
+ if (!$previous) {
+ $result.=&add_request_another_attempt_button();
+ }
}
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
$result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
}
+ $result.=$form_tag_start.
+ '<input type="hidden" name="submitted" value="yes" />';
+ $result.=&preserve_grade_info();
+
}
} elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
$target eq 'webgrade') {
+ my $webgrade='yes';
if ($target eq 'webgrade') {
- $result.=$head_tag_start.$body_tag_start.$form_tag_start;
- $result.='<input type="hidden" name="webgrade" value="yes" />';
- $result.=&show_queue();
+ $result.=$head_tag_start.$body_tag_start;
+ #$result.='<br />Review'.&show_queue('reviewqueue');
+ #$result.='<br />Grade'.&show_queue('gradingqueue');
}
- my $todo=&get_from_queue();
+ # FIXME Blast! still need to reorg this, need to reshow the
+ # queue being reviewed once done with the grade pass...
+ # Hrrm, vaildation pass should perhaps say 'not_locked'
+ # perhaps do a search if there is a key that is mine and if
+ # there isn't reshow the queue....
+ my ($todo,$status_code)=&get_key_todo($target);
+
+ &Apache::lonnet::logthis("got todo -$todo- stat -$status_code-");
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="'.
+ $form_tag_start.=
+ '<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">';
+ if ($target eq 'webgrade') {
+ #$result.='<br />After -'.&show_queue($env{'form.queue'});
+ $result.="\n".'<table width="100%" style="width:100%" border="1">';
+ if ($status_code eq 'selected') {
+ $form_tag_start.=
+ '<input type="hidden" name="queuemode" value="selected" />';
+ }
+ }
} else {
if ($target eq 'webgrade') {
- $result.="\n".
- '<table><tr><td>No user to be graded.</td></tr></table>';
+ $result.="\n";
+ if ($status_code eq 'stop') {
+ $result.='<b>'.&mt("Stopped grading.").'</b>';
+ } elsif ($status_code eq 'lock_failed') {
+ $result.='<b>'.&mt("Failed to lock the request record.").'</b>';
+ } elsif ($status_code eq 'unlock') {
+ $result.='<b>'.&mt("Unlocked the requested record.").'</b>';
+ $result.=&show_queue($env{'form.queue'},1);
+ } elsif ($status_code eq 'show_list') {
+ $result.=&show_queue($env{'form.queue'},1);
+ } elsif ($status_code eq 'select_user') {
+ $result.=&select_user();
+ } else {
+ $result.='<b>'.&mt("No user to be graded.").'</b>';
+ }
}
+ $webgrade='no';
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
}
+ if ($target eq 'webgrade' && defined($env{'form.queue'})) {
+ $result.=$form_tag_start;
+ $result.='<input type="hidden" name="webgrade" value="'.
+ $webgrade.'" />';
+ $result.='<input type="hidden" name="queue" value="'.
+ $env{'form.queue'}.'" />';
+ }
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -257,11 +378,103 @@ sub start_Task {
return $result;
}
+sub get_key_todo {
+ my ($target)=@_;
+ my $todo;
+
+ if (defined($env{'form.reviewasubmission'})) {
+ &Apache::lonnet::logthis("review a submission....");
+ $env{'form.queue'}='reviewqueue';
+ return (undef,'show_list');
+ }
+
+ if (defined($env{'form.reviewagrading'})) {
+ &Apache::lonxml::debug("review a grading....");
+ $env{'form.queue'}='gradingqueue';
+ return (undef,'show_list');
+ }
+
+ if (defined($env{'form.regradeasubmission'})) {
+ &Apache::lonxml::debug("regrade a grading....");
+ $env{'form.queue'}='none';
+ return (undef,'select_user');
+ }
+
+ my $queue=$env{'form.queue'};
+
+ if (!defined($queue)) {
+ $env{'form.queue'}=$queue='gradingqueue';
+ }
+
+ my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
+
+ if ($env{'form.queue'} eq 'none') {
+ if (defined($env{'form.gradingkey'})) {
+ if ($target eq 'webgrade') {
+ if ($env{'form.stop'}) {
+ return (undef,'stop');
+ } elsif ($env{'form.next'}) {
+ return (undef,'show_list');
+ }
+ }
+ return ($gradingkey,'selected');
+ } else {
+ return (undef,'show_list');
+ }
+ }
+ if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
+ && !defined($env{'form.gradingaction'})
+ && $env{'form.queuemode'} eq 'selected') {
+
+ my $who=&queue_key_locked($queue,$gradingkey);
+ my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ if ($who eq $me) {
+ &Apache::lonxml::debug("Found a key was given to me");
+ return ($gradingkey,'selected');
+ } else {
+ return (undef,'show_list');
+ }
+
+ }
+
+ if ($target eq 'webgrade' && $env{'form.queuemode'} eq 'selected') {
+ if ($env{'form.gradingaction'} eq 'resume') {
+ delete($env{'form.gradingaction'});
+ &Apache::lonxml::debug("Resuming a key");
+ return ($gradingkey);
+ } elsif ($env{'form.gradingaction'} eq 'unlock') {
+ &Apache::lonxml::debug("Unlocking a key ".
+ &check_queue_unlock($queue,$gradingkey,1));
+ return (undef,'unlock');
+ } elsif ($env{'form.gradingaction'} eq 'select') {
+ &Apache::lonxml::debug("Locking a key");
+ if (&lock_key($queue,$gradingkey)) {
+ &Apache::lonxml::debug("Success $queue");
+ return ($gradingkey);
+ }
+ &Apache::lonxml::debug("Failed $queue");
+ return (undef,'lock_failed');
+ }
+ }
+
+ if ($env{'form.queuemode'} ne 'selected') {
+ # don't get something new from the queue if they hit the stop button
+ if (!($env{'form.stop'} && $target eq 'webgrade')
+ && !$env{'form.gradingaction'}) {
+ &Apache::lonxml::debug("Getting anew $queue");
+ return (&get_from_queue($queue));
+ } else {
+ return (undef,'stop');
+ }
+ }
+ return (undef,undef)
+}
+
sub end_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
my $status=$Apache::inputtags::status['-1'];
- my $version=&get_version();
+ my ($version,$previous)=&get_version();
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex') {
if (
@@ -269,10 +482,14 @@ sub end_Task {
($target eq 'answer') || ($target eq 'tex')
) {
if ($target eq 'web') {
- if ($status eq 'CAN_ANSWER') {
+ if ($status eq 'CAN_ANSWER' && !$previous) {
$result.="\n".'<table border="1">'.
- &Apache::inputtags::file_selector('0',"bridgetask","*",
- 'portfolioonly').
+ &Apache::inputtags::file_selector("$version.0",
+ "bridgetask","*",
+ 'portfolioonly',
+ '
+<h2>'.&mt('Submit Portfolio Files for Grading').'</h2>
+<p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
"</table>";
$result.=&Apache::inputtags::gradestatus('0');
}
@@ -281,23 +498,27 @@ sub end_Task {
$result.=&Apache::lonxml::xmlend().'</html>';
}
}
- if ($target eq 'grade' && !$env{'form.webgrade'}) {
+ if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
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') {
- &add_to_queue();
+ &add_to_queue('gradingqueue',$Apache::inputtags::slot_name);
}
}
- if ($target eq 'grade' && $env{'form.webgrade'}) {
+ if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') {
my $optional_required=
&Apache::lonxml::get_param('OptionalRequired',$parstack,
$safeeval);
@@ -319,7 +540,9 @@ sub end_Task {
$ungraded++;
} elsif ($status eq 'review') {
$review++;
- }
+ } else {
+ $ungraded++;
+ }
}
if ($optional_passed < $optional_required) {
$mandatory_failed++;
@@ -329,26 +552,55 @@ sub end_Task {
$env{'user.name'}.'@'.$env{'user.domain'};
if ($review) {
$Apache::lonhomework::results{"resource.$version.status"}='review';
- &move_to_review_queue();
+ if ($env{'form.queue'} eq 'reviewqueue') {
+ &check_queue_unlock($env{'form.queue'});
+ &Apache::lonxml::debug(" still needs review not changing status.");
+ } else {
+ &move_between_queues($env{'form.queue'},'reviewqueue');
+ }
} elsif ($ungraded) {
$Apache::lonhomework::results{"resource.$version.status"}='ungraded';
- &check_queue_unlock();
+ if ($env{'form.queue'} eq 'reviewqueue' ||
+ $env{'form.queue'} eq 'none' ) {
+ &Apache::lonxml::debug("moving back.");
+ &move_between_queues($env{'form.queue'},'gradingqueue');
+ } else {
+ &check_queue_unlock($env{'form.queue'});
+ }
} elsif ($mandatory_failed) {
$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();
+ &remove_from_queue($env{'form.queue'});
+
+ my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+ $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
+ $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
+ &Apache::grades::version_portfiles(
+ \%Apache::lonhomework::results,
+ ["$version.0.bridgetask"],$courseid,
+ $symb,$udom,$uname,
+ ["$version.0.bridgetask"]);
} else {
$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();
+ &remove_from_queue($env{'form.queue'});
+
+ my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+ $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
+ $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
+ &Apache::grades::version_portfiles(
+ \%Apache::lonhomework::results,
+ ["$version.0.bridgetask"],$courseid,
+ $symb,$udom,$uname,
+ ["$version.0.bridgetask"]);
}
$Apache::lonhomework::results{"resource.status"}=
$Apache::lonhomework::results{"resource.$version.status"};
- if (defined($Apache::lonhomework::results{"resource.$version.awarded"})) {
+ 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"}=
@@ -378,26 +630,58 @@ sub end_Task {
return $result;
}
-sub move_to_review_queue {
- &Apache::lonxml::debug("Want to move");
+sub move_between_queues {
+ my ($src_queue,$dest_queue)=@_;
+ my $cur_data;
+ if ($src_queue ne 'none') {
+ $cur_data=&get_queue_data($src_queue);
+ if (!$cur_data) { return 'not_exist'; }
+ } else {
+ $cur_data = ['none'];
+ }
+ my $result=&add_to_queue($dest_queue,$cur_data->[0]);
+ if ($result ne 'ok') {
+ return $result;
+ }
+ &check_queue_unlock($src_queue);
+ return &remove_from_queue($src_queue);
}
sub check_queue_unlock {
- &Apache::lonxml::debug("Want to unlock?");
+ my ($queue,$key,$allow_not_me)=@_;
+ if ($queue eq 'none') { return 'ok'; }
+ my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+ if (!defined($key)) {
+ $key="$symb\0queue\0$uname\@$udom";
+ }
+ my $cnum=$env{'course.'.$cid.'.num'};
+ my $cdom=$env{'course.'.$cid.'.domain'};
+ my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
+ if ($who eq $me) {
+ return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
+ } elsif ($allow_not_me) {
+ &Apache::lonxml::debug("unlocking $who by $me");
+ return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
+ }
+ return 'not_owner';
}
sub remove_from_queue {
+ my ($queue)=@_;
+ if ($queue eq 'none') { return 'ok'; }
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);
+ return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
}
sub setup_env_for_other_user {
my ($queue_key,$safeeval)=@_;
my ($symb,$uname,$udom)=&decode_queue_key($queue_key);
+ &Apache::lonxml::debug("setup_env for $queue_key");
$env{'form.grade_symb'}=$symb;
$env{'form.grade_domain'}=$udom;
$env{'form.grade_username'}=$uname;
@@ -405,42 +689,109 @@ sub setup_env_for_other_user {
&Apache::lonxml::initialize_rndseed($safeeval);
}
+sub get_queue_data {
+ my ($queue)=@_;
+ my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+ my $cnum=$env{'course.'.$cid.'.num'};
+ my $cdom=$env{'course.'.$cid.'.domain'};
+ my $todo="$symb\0queue\0$uname\@$udom";
+ my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
+ if ($key eq $todo && ref($value)) {
+ return $value;
+ }
+ return undef;
+}
+
+sub check_queue_for_key {
+ my ($cid,$queue,$todo)=@_;
+ my $cnum=$env{'course.'.$cid.'.num'};
+ my $cdom=$env{'course.'.$cid.'.domain'};
+ my %results=
+ &Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum);
+
+ if (exists($results{$todo}) && ref($results{$todo})) {
+ if (defined($results{"$todo\0locked"})) {
+ return 'locked';
+ }
+ return 'enqueued';
+ }
+ return undef;
+}
+
sub add_to_queue {
+ my ($queue,$slot_name)=@_;
+ if ($queue eq 'none') { return 'ok'; }
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);
+ $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name];
+ return &Apache::lonnet::put($queue,\%data,$cdom,$cnum);
}
sub show_queue {
+ my ($queue,$with_selects)=@_;
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 border='1'><tr><th>resource</th>".
- "<th>user</th><th>type</th><th>data</th></tr>";
+ my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
+ my ($tmp)=%queue;
+ if ($tmp=~/^error: 2 /) {
+ return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";
+ }
+ $result.="\n<h3>Current Queue - $queue </h3><table border='1'><tr>";
+ if ($with_selects) { $result.="<th></th>"; }
+ $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
foreach my $key (sort(keys(%queue))) {
- if ($key=~/locked$/) {
+ if ($key=~/locked$/ && !$with_selects) {
my ($symb,$uname,$udom) = &decode_queue_key($key);
my $title=&Apache::lonnet::gettitle($symb);
$result.="<tr><td>$title</td><td>$uname</td>";
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
- } elsif ($key=~/timestamp$/) {
+ } elsif ($key=~/timestamp$/ && !$with_selects) {
my ($symb,undef) = split("\0",$key);
my $title=&Apache::lonnet::gettitle($symb);
$result.="<tr><td>$title</td><td></td>";
$result.='<td>last queue modification time</td><td>'.
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
- } else {
+ } elsif ($key!~/(timestamp|locked)$/) {
my ($symb,$uname,$udom) = &decode_queue_key($key);
my $title=&Apache::lonnet::gettitle($symb);
- $result.="<tr><td>$title</td><td>$uname</td>";
+ $result.="<tr>";
my $slot=$queue{$key}->[0];
my %slot_data=&Apache::lonnet::get_slot($slot);
+ if ($with_selects) {
+ my $ekey=&Apache::lonnet::escape($key);
+ my ($action,$description)=('select',&mt('Select'));
+ if (exists($queue{"$key\0locked"})) {
+ my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ if ($me eq $queue{"$key\0locked"}) {
+ ($action,$description)=('resume',&mt('Resume'));
+ } else {
+ ($action,$description)=('unlock',&mt('Unlock'));
+ }
+ }
+ if (time > $slot_data{'endtime'}) {
+ $result.=(<<FORM);
+<td>
+<form method="POST">
+ <input type="hidden" name="gradingkey" value="$ekey" />
+ <input type="hidden" name="queue" value="$queue" />
+ <input type="hidden" name="gradingaction" value="$action" />
+ <input type="hidden" name="webgrade" value="no" />
+ <input type="hidden" name="queuemode" value="selected" />
+ <input type="submit" name="submit" value="$description" />
+</form>
+</td>
+FORM
+
+ } else {
+ $result.='<td>'.&mt("In Progress").'</td>'
+ }
+ }
+ $result.="<td>$title</td><td>$uname</td>";
$result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
"</td></tr>";
@@ -450,6 +801,42 @@ sub show_queue {
return $result;
}
+sub get_queue_counts {
+ my ($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($queue,$cdom,$cnum,$regexp);
+ my ($tmp)=%queue;
+ if ($tmp=~/^error: 2 /) {
+ return (0,0,0);
+ }
+ my ($entries,$ready_to_grade,$locks)=(0,0,0);
+ foreach my $key (sort(keys(%queue))) {
+ if ($key=~/locked$/) {
+ $locks++;
+ } elsif ($key=~/timestamp$/) {
+ #ignore
+ } elsif ($key!~/(timestamp|locked)$/) {
+ my ($symb,$uname,$udom) = &decode_queue_key($key);
+ $entries++;
+ my $slot=$queue{$key}->[0];
+ my %slot_data=&Apache::lonnet::get_slot($slot);
+ if (time > $slot_data{'endtime'}) {
+ $ready_to_grade++;
+ }
+ }
+ }
+ return ($entries,$ready_to_grade,$locks);
+}
+
+sub encode_queue_key {
+ my ($symb,$udom,$uname)=@_;
+ return "$symb\0queue\0$uname\@$udom";
+}
+
sub decode_queue_key {
my ($key)=@_;
my ($symb,undef,$user) = split("\0",$key);
@@ -458,9 +845,14 @@ sub decode_queue_key {
}
sub queue_key_locked {
- my ($key,$cdom,$cnum)=@_;
+ my ($queue,$key,$cdom,$cnum)=@_;
+ if (!defined($cdom) || !defined($cnum)) {
+ my (undef,$cid)=&Apache::lonxml::whichuser();
+ $cnum=$env{'course.'.$cid.'.num'};
+ $cdom=$env{'course.'.$cid.'.domain'};
+ }
my ($key_locked,$value)=
- &Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum);
+ &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);
if ($key_locked eq "$key\0locked") {
return $value;
}
@@ -468,24 +860,24 @@ sub queue_key_locked {
}
sub pick_from_queue_data {
- my ($check_section,$queue,$cdom,$cnum)=@_;
- foreach my $key (keys(%$queue)) {
+ my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
+ foreach my $key (keys(%$queuedata)) {
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");
+ &Apache::lonxml::debug("my sec");
next;
}
}
- my $slot=$queue->{$key}[0];
+ my $slot=$queuedata->{$key}[0];
my %slot_data=&Apache::lonnet::get_slot($slot);
if ($slot_data{'endtime'} > time) {
- &Apache::lonnet::logthis("not time");
+ &Apache::lonxml::debug("not time");
next;
}
- if (&queue_key_locked($key,$cdom,$cnum)) {
- &Apache::lonnet::logthis("someone already has um.");
+ if (&queue_key_locked($queue,$key,$cdom,$cnum)) {
+ &Apache::lonxml::debug("someone already has um.");
next;
}
return $key;
@@ -494,15 +886,15 @@ sub pick_from_queue_data {
}
sub find_mid_grade {
- my ($symb,$cdom,$cnum)=@_;
+ my ($queue,$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);
+ my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
if ($who eq $me) { return $todo; }
}
my $regexp="^$symb\0.*\0locked\$";
- my %locks=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
+ my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
foreach my $key (keys(%locks)) {
my $who=$locks{$key};
if ($who eq $me) {
@@ -514,75 +906,166 @@ sub find_mid_grade {
return undef;
}
+sub lock_key {
+ my ($queue,$todo)=@_;
+ my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my (undef,$cid)=&Apache::lonxml::whichuser();
+ my $cnum=$env{'course.'.$cid.'.num'};
+ my $cdom=$env{'course.'.$cid.'.domain'};
+ my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},
+ $cdom,$cnum);
+ &Apache::lonxml::debug("success $success $todo");
+ if ($success eq 'ok') {
+ return 1;
+ }
+ return 0;
+}
+
sub get_from_queue {
+ my ($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)));
+ my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
+ &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));
if ($todo) { return $todo; }
while (1) {
my $starttime=time;
- &Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime},
+ &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime},
$cdom,$cnum);
- &Apache::lonnet::logthis("$starttime");
+ &Apache::lonxml::debug("$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
+ my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
+ #make a pass looking for a user _not_ 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");
+ &Apache::lonxml::debug("sce");
+ $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
+ \%queue,$cdom,$cnum);
+ &Apache::lonxml::debug("sce $todo");
}
- # no one in our section so look for any user that is ready for grading
+ # no one _not_ 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");
+ &Apache::lonxml::debug("no sce");
+ $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
+ \%queue,$cdom,$cnum);
+ &Apache::lonxml::debug("no sce $todo");
}
# no user to grade
if (!$todo) { last; }
- &Apache::lonnet::logthis("got $todo");
+ &Apache::lonxml::debug("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; }
+ # unless someone else already picked them
+ if (!&lock_key($queue,$todo)) { next; }
my (undef,$endtime)=
- &Apache::lonnet::get('gradingqueue',["$symb\0timestamp"],
+ &Apache::lonnet::get($queue,["$symb\0timestamp"],
$cdom,$cnum);
- &Apache::lonnet::logthis("emd $endtime");
+ &Apache::lonxml::debug("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"],
+ &Apache::lonnet::get($queue,["$todo"],
$cdom,$cnum);
- &Apache::lonnet::logthis("check $key .. $value");
+ &Apache::lonxml::debug("check $key .. $value");
if ($key eq $todo && ref($value)) {
} else {
- &Apache::lonnet::del('gradingqueue',["$todo\0locked"],
+ &Apache::lonnet::del($queue,["$todo\0locked"],
$cdom,$cnum);
- &Apache::lonnet::logthis("del");
+ &Apache::lonxml::debug("del");
next;
}
}
- &Apache::lonnet::logthis("last $todo");
+ &Apache::lonxml::debug("last $todo");
last;
}
return $todo;
}
+sub select_user {
+ my ($symb,$cid)=&Apache::lonxml::whichuser();
+ my $result.='<table border="1">';
+
+ &Apache::grades::init_perm();
+ my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',);
+ &Apache::grades::reset_perm();
+
+ foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+ my ($uname,$udom) = split(/:/,$student);
+ my %status = &get_student_status($symb,$cid,$udom,$uname);
+ my $queue = 'none';
+ if ($status{'reviewqueue'} eq 'enqueued') {
+ $queue = 'reviewqueue';
+ } elsif ($status{'gradingqueue'} eq 'enqueued') {
+ $queue = 'gradingqueue';
+ }
+ my $todo =
+ &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
+ $result.=<<RESULT;
+<tr>
+ <td>
+ <form method="POST">
+ <input type="hidden" name="gradingkey" value="$todo" />
+ <input type="hidden" name="queue" value="$queue" />
+ <input type="hidden" name="webgrade" value="no" />
+ <input type="submit" name="submit" value="Regrade" />
+ </form>
+ <td>$fullname->{$student}</td>
+ <td>
+RESULT
+
+ if ($status{'status'} eq 'pass') {
+ $result .= '<font color="green">'.&mt('Passed').'</font>';
+ } elsif ($status{'status'} eq 'fail') {
+ $result .= '<font color="red">'.&mt('Failed').'</font>';
+ } elsif ($status{'status'} eq 'review') {
+ $result .= '<font color="blue">'.&mt('Under Review').'</font>';
+ } elsif ($status{'status'} eq 'ungraded') {
+ $result .= &mt('Ungraded');
+ } elsif ($status{'status'} ne '') {
+ $result .= '<font color="orange">'.&mt('Unknown Status').'</font>';
+ } else {
+ $result.=" ";
+ }
+ if ($status{'version'}) {
+ $result .= ' '.&mt('Version').' '.$status{'version'};
+ }
+ $result.= '</td><td>';
+ if ($status{'reviewqueue'} eq 'enqueued') {
+ $result .= &mt('Awaiting Review');
+ } elsif ($status{'reviewqueue'} eq 'locked') {
+ $result .= &mt('Under Review');
+ } elsif ($status{'gradingqueue'} eq 'enqueued') {
+ $result .= &mt('Awaiting Grading');
+ } elsif ($status{'gradingqueue'} eq 'locked') {
+ $result .= &mt('Being Graded');
+ } else {
+ $result.=" ";
+ }
+ $result.= '</td></tr>';
+ }
+ $result.='</table>';
+ return $result;
+}
+
+sub get_student_status {
+ my ($symb,$cid,$udom,$uname)=@_;
+ my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
+ $udom,$uname);
+ my %status;
+ $status{'status'}=$record{'resource.status'};
+ $status{'version'}=$record{'resource.version'};
+ $status{'grader'}=$record{'resource.grader'};
+ $status{'reviewqueue'}=&check_queue_for_key($cid,'reviewqueue',
+ &encode_queue_key($symb,$udom,$uname));
+ $status{'gradingqueue'}=&check_queue_for_key($cid,'gradingqueue',
+ &encode_queue_key($symb,$udom,$uname));
+ return %status;
+}
+
sub start_ClosingParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
@@ -624,12 +1107,12 @@ sub start_Dimension {
}
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];
+ my $num=@order;
+ my $version=&get_version();
+ my $which=($version-1)%$num;
+ return $order[$which];
}
{
@@ -641,7 +1124,10 @@ sub get_instance {
my $instance=&get_instance();
my $version=&get_version();
if ($target eq 'web') {
- $result=$dimension{'intro'}.$dimension{$instance.'.text'};
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($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'}}) {
@@ -653,7 +1139,7 @@ sub get_instance {
} elsif ($status eq 'pass') {
$result.='<font color="green">'.&mt('Passed').'</font>';
} else {
- &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");
+ &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
}
$result.='</td></tr><tr><td>';
if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
@@ -664,39 +1150,49 @@ sub get_instance {
}
}
} elsif ($target eq 'webgrade') {
+ # in case of any side effects that we need
+ @Apache::scripttag::parser_env = @_;
+ &Apache::scripttag::xmlparse($dimension{'intro'});
+ @Apache::scripttag::parser_env = @_;
+ &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
foreach my $id (@{$dimension{$instance.'.criterias'}}) {
my $link='criteria_'.$instance.'_'.$id;
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.'" />'.
- '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'.
+ '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">';
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
+ $result.='</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::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 />'.
- '<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 />'.
+ '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label></nobr><br />'.
+ '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.
+ '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.
+ '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('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').'" /> '.
+ '<input type="submit" name="stop" value="'.
+ &mt('Stop').'" /> '.
'</td></tr>';
$result.='<tr><td colspan="4">';
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"})) {
+ foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
my $file=$file_url.$partial_file;
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
- $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.
+ $result.='<nobr><a href="'.$file.'" target="lonGRDs"><img src="'.
&Apache::loncommon::icon($file).'" border=0"> '.$file.
- '</a>';
+ '</a></nobr> ';
}
$result.='</td></tr>';
$last_link=$link;
@@ -719,7 +1215,7 @@ sub get_instance {
} elsif ($status eq 'ungraded') {
$ungraded++;
} else {
- &Apache::lonxml::error("got weird status --$status--");
+ $ungraded++;
}
}
if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
@@ -748,22 +1244,18 @@ sub start_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web' || $target eq 'webgrade') {
- if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {
- &Apache::lonxml::startredirection();
+ if ($tagstack->[-2] eq 'Dimension') {
+ $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser);
+
+ } elsif ($target eq 'webgrade') {
+ &Apache::lonxml::get_all_text('/introparagraph',$parser);
}
+
}
return $result;
}
sub end_IntroParagraph {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $result;
- if ($target eq 'web' || $target eq 'webgrade') {
- if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {
- $dimension{'intro'}=&Apache::lonxml::endredirection();
- }
- }
- return $result;
}
sub start_Instance {
@@ -778,40 +1270,27 @@ sub start_Instance {
}
sub end_Instance {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- return '';
}
sub start_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $instance_id=$Apache::bridgetask::instance[-1];
+ my $text=&Apache::lonxml::get_all_text('/instancetext',$parser);
if ($target eq 'web' || $target eq 'webgrade') {
- &Apache::lonxml::startredirection();
+ $dimension{$instance_id.'.text'}=$text;
}
return '';
}
sub end_InstanceText {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $instance_id=$Apache::bridgetask::instance[-1];
- if ($target eq 'web' || $target eq 'webgrade') {
- $dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection();
- }
return '';
}
sub start_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
- &Apache::lonxml::startredirection();
- }
- return '';
-}
-
-sub end_Criteria {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $instance_id=$Apache::bridgetask::instance[-1];
+ my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser);
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;
$dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
@@ -821,17 +1300,21 @@ sub end_Criteria {
return '';
}
+sub end_Criteria {
+}
+
sub proctor_validation_screen {
my ($slot) = @_;
my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
- $user=$env{'form.proctorname'};
- if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; }
+ my $name=&Apache::loncommon::plainname($user,$domain);
+
my $msg;
if ($env{'form.proctorpassword'}) {
$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
.'</font></p>';
}
+ if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
my $result= (<<ENDCHECKOUT);
<h2>Proctor Validation</h2>
<p>Your room's proctor needs to validate your access to this resource.</p>
@@ -840,13 +1323,22 @@ sub proctor_validation_screen {
<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>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></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="$domain" /></td></tr>
+ <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
</table>
<input type="submit" name="checkoutbutton" value="Validate" /><br />
-Student who should be logged in is:<br />
-<img src="$url" /><br />
+<table border="1">
+ <tr><td>
+ <table>
+ <tr><td colspan="2">Student who should be logged in is:</td></tr>
+ <tr><td>Name:</td><td>$name</td></tr>
+ <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
+ <tr><td>Usename</td><td>$user\@$domain</td></tr>
+ <tr><td colspan="2"><img src="$url" /></td></tr>
+ </table>
+ </tr></td>
+</table>
</form>
ENDCHECKOUT
return $result;