--- loncom/homework/bridgetask.pm 2005/05/10 16:03:44 1.20
+++ loncom/homework/bridgetask.pm 2005/05/27 21:13:46 1.33
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.20 2005/05/10 16:03:44 albertel Exp $
+# $Id: bridgetask.pm,v 1.33 2005/05/27 21:13:46 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -59,7 +59,7 @@ sub initialize_bridgetask {
}
sub proctor_check_auth {
- my ($slot)=@_;
+ my ($slot_name,$slot)=@_;
my $user=$env{'form.proctorname'};
my $domain=$env{'form.proctordomain'};
@@ -69,8 +69,18 @@ sub proctor_check_auth {
if ($puser eq $user && $pdom eq $domain) {
my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
if ($authhost ne 'no_host') {
- $Apache::lonhomework::results{'resource.checkedin'}=
+ my $version=
+ $Apache::lonhomework::results{'resource.version'}=
+ ++$Apache::lonhomework::history{'resource.version'};
+ $Apache::lonhomework::results{"resource.$version.checkedin"}=
$user.'@'.$domain;
+ $Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
+ $slot_name;
+ foreach my $key (keys(%Apache::lonhomework::history)) {
+ if ($key=~/^resource\.0\./) {
+ $Apache::lonhomework::results{$key}='';
+ }
+ }
return 1;
}
}
@@ -78,19 +88,89 @@ sub proctor_check_auth {
return 0;
}
+sub get_version {
+ my ($version,$previous);
+ if ($env{'form.previousversion'} &&
+ defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
+ $version=$env{'form.previousversion'};
+ $previous=1;
+ } else {
+ $version=$Apache::lonhomework::history{'resource.version'};
+ $previous=0;
+ }
+ if (wantarray) {
+ return ($version,$previous);
+ }
+ return $version;
+}
+
sub add_previous_version_button {
+ my ($status)=@_;
my $result;
- $result.=&mt(' Show a previously done version: [_1]','
-Pick one
- ');
+ if ($Apache::lonhomework::history{'resource.version'} eq '') {
+ return '';
+ }
+ if ($Apache::lonhomework::history{'resource.version'} < 2 &&
+ $status ne 'NEEDS_CHECKIN') {
+ return '';
+ }
+ my $version=&get_version();
+ if ($env{'form.previousversion'} ne '' &&
+ $env{'form.previousversion'} eq $version) {
+ $result.="
".&mt("Showing previous version [_1]",$version).
+ " \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=''.
+ join(" \n",@to_show).
+ " \n";
+ $result.='";
return $result;
}
sub add_grading_button {
- my $result;
- $result.=' ';
$result.=' ';
+ if ( 1) {
+ #need a permissions for limitng this to 'powerful users'
+ #check if review queue has items
+ $result.=' '."\n";
+ $result.=' '."\n";
+ }
+ return $result;
+}
+
+sub add_request_another_attempt_button {
+ my $result;
+ $result.=' ';
+ return $result;
+}
+
+sub preserve_grade_info {
+ my $result;
+ # if we are viewing someone else preserve that info
+ if (defined $env{'form.grade_symb'}) {
+ foreach my $field ('symb','courseid','domain','username') {
+ $result .= ' '."\n";
+ }
+ }
return $result;
}
@@ -109,7 +189,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.='";
}
}
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
$target eq 'tex') {
+ my ($version,$previous)=&get_version();
($status,$accessmsg,my $slot_name,$slot) =
&Apache::lonhomework::check_task_access('0');
push(@Apache::inputtags::status,$status);
$Apache::inputtags::slot_name=$slot_name;
my $expression='$external::datestatus="'.$status.'";';
- $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
+ $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';
&Apache::run::run($expression,$safeeval);
&Apache::lonxml::debug("Got $status");
- if (( $status eq 'CLOSED' ) ||
- ( $status eq 'BANNED') ||
- ( $status eq 'UNAVAILABLE') ||
- ( $status eq 'NOT_IN_A_SLOT') ||
- ( $status eq 'NEEDS_CHECKIN') ||
- ( $status eq 'INVALID_ACCESS')) {
+ $body_tag_start.=&add_previous_version_button($status);
+ 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.''.$body_tag_start;
@@ -144,6 +227,8 @@ sub start_Task {
} elsif ($status eq 'NEEDS_CHECKIN') {
$msg.=''.&mt('You need the Proctor to validate you.').
' '.&proctor_validation_screen($slot);
+ } elsif ($status eq 'WAITING_FOR_GRADE') {
+ $msg.=''.&mt('Your submission is in the grading queue.').' ';
} elsif ($status ne 'NOT_YET_VIEWED') {
$msg.=''.&mt('Not open to be viewed').' ';
}
@@ -158,12 +243,15 @@ sub start_Task {
} else {
$result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
}
- } elsif ($target eq 'grade') {
+ } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
if ($status eq 'NEEDS_CHECKIN') {
- if (&proctor_check_auth($slot)) {
+ if (&proctor_check_auth($slot_name,$slot)) {
#FIXME immeadiatly add this to the grading queue
# with slot->{'endtime'} for when grading can
# begin on this resource
+ # FIXME I think the above is done by default,
+ # need to check that
+ # failure doesn't do this.
}
}
}
@@ -172,36 +260,79 @@ sub start_Task {
$result.="$head_tag_start$name
$body_tag_start \n $form_tag_start".
' ';
- # if we are viewing someone else preserve that info
- if (defined $env{'form.grade_symb'}) {
- foreach my $field ('symb','courseid','domain','username') {
- $result .= ' '."\n";
+ $result.=&preserve_grade_info();
+ my ($version,$previous)=&get_version();
+ if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+ $result.=''.&mt('Did not pass').' ';
+ if (!$previous) {
+ $result.=&add_request_another_attempt_button();
}
}
+ if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
+ $result.=''.&mt('Passed').' ';
+ }
}
- } elsif ($target eq 'webgrade') {
- $result.=$head_tag_start.$body_tag_start.$form_tag_start;
- $result.=' ';
- $result.=&show_queue();
- my $todo=&get_from_queue();
+ } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
+ $target eq 'webgrade') {
+ my $webgrade='yes';
+ if ($target eq 'webgrade') {
+ $result.=$head_tag_start.$body_tag_start;
+ $result.=' Review'.&show_queue('reviewqueue');
+ $result.=' Grade'.&show_queue('gradingqueue');
+ }
+ # 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".'Found '.
&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'
';
- $result.=' ';
$Apache::bridgetask::queue_key=$todo;
&Apache::structuretags::initialize_storage();
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
- $result.="\n".'';
+ if ($target eq 'webgrade') {
+ $result.=' After -'.&show_queue($env{'form.queue'});
+ $result.="\n".'';
+ if ($status_code eq 'selected') {
+ $form_tag_start.=
+ ' ';
+ }
+ }
} else {
- $result.="\n".
- '';
+ if ($target eq 'webgrade') {
+ $result.="\n";
+ if ($status_code eq 'stop') {
+ $result.=''.&mt("Stopped grading.").' ';
+ } elsif ($status_code eq 'lock_failed') {
+ $result.=''.&mt("Failed to lock the request record.").' ';
+ } elsif ($status_code eq 'unlock') {
+ $result.=''.&mt("Unlocked the requested record.").' ';
+ $result.=&show_queue($env{'form.queue'},1);
+ } elsif ($status_code eq 'show_list') {
+ $result.=&show_queue($env{'form.queue'},1);
+ } else {
+ $result.=''.&mt("No user to be graded.").' ';
+ }
+ }
+ $webgrade='no';
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
}
-
+ if ($target eq 'webgrade' && defined($env{'form.queue'})) {
+ $result.=$form_tag_start;
+ $result.=' ';
+ $result.=' ';
+ }
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -209,10 +340,83 @@ 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');
+ }
+
+ my $queue=$env{'form.queue'};
+
+ if (!defined($queue)) {
+ $env{'form.queue'}=$queue='gradingqueue';
+ }
+
+ my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
+
+ 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,$previous)=&get_version();
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex') {
if (
@@ -220,9 +424,10 @@ 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".''.
- &Apache::inputtags::file_selector('0',"bridgetask","*",
+ &Apache::inputtags::file_selector("$version.0",
+ "bridgetask","*",
'portfolioonly').
"
";
$result.=&Apache::inputtags::gradestatus('0');
@@ -232,23 +437,27 @@ sub end_Task {
$result.=&Apache::lonxml::xmlend().'