'. + &mt('Student submitted [_1] [_2] the deadline. + (Submission was at [_3], end of period was [_4].)', + $info,$when,scalar(localtime($submissiontime)), + scalar(localtime($slot{'endtime'}))). + '
'; + } + return $result; +} + +sub webgrade_standard_info { + my ($version)=&get_version(); + my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); + my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; + my $file_list="- \n";
+ foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
+ my $file=$file_url.$partial_file;
+ $file=~s|/+|/|g;
+ &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
+ $file_list.='
'.$file. + '
'."\n";
+ }
+ $file_list.="
'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'
'; } elsif ($status eq 'NOT_IN_A_SLOT') { $msg.=''.&mt('You are not currently signed up to work at this time and/or place.').'
'; + $msg.=&add_request_another_attempt_button("Sign up for time to work."); } 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 ($env{'form.donescreen'}) { + my $title=&Apache::lonnet::gettitle(); + my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'}); + my $files='- '.join('
- ',@files).'
Files submitted: $files
+You are now done with this Bridge Task
++ + +DONESCREEN } elsif ($status ne 'NOT_YET_VIEWED') { $msg.='
'.&mt('Not open to be viewed').'
'; } @@ -237,71 +496,118 @@ 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. - } + if(&proctor_check_auth($slot_name,$slot,'Task') + && defined($Apache::inputtags::slot_name)) { + my $result=&add_to_queue('gradingqueue', + [$Apache::inputtags::slot_name]); + &Apache::lonxml::debug("add_to_queue said $result"); + } } } } elsif ($target eq 'web') { my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval); $result.="$head_tag_start'.&mt('Did not pass').'
'; - if (!$previous) { - $result.=&add_request_another_attempt_button(); - } - } - if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { - $result.=''.&mt('Passed').'
'; - } + $result.=&internal_location(); + $result.=$form_tag_start. + ''; + &Apache::lonxml::startredirection(); } } 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.=''; - $result.='Before'.&show_queue('gradingqueue'); - } - my $todo; - # don't get something new from the queue if they hit the stop button - if (!($env{'form.stop'} && $target eq 'webgrade')) { - $todo=&get_from_queue('gradingqueue'); - } + $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,$msg)=&get_key_todo($target); + 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.' |
After'.&show_queue('gradingqueue'); + #$result.='
After -'.&show_queue($env{'form.queue'}); $result.="\n".'
| '; - if ($env{'form.stop'}) { - $result.=&mt("Stopped grading."); + $result.="\n"; + my $back=''; + if ($status_code eq 'stop') { + $result.=''.&mt("Stopped grading.").''.$back; + } elsif ($status_code eq 'lock_failed') { + $result.=''.&mt("Failed to lock the requested record.") + .''.$back; + } elsif ($status_code eq 'unlock') { + $result.=''.&mt("Unlocked the requested record.") + .''.$back; + $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(); + } elsif ($status_code eq 'unable') { + $result.=''.&mt("Unable to aqcuire a user to grade.").''.$back; + } elsif ($status_code eq 'not_allowed') { + $result.=''.&mt('Not allowed to grade the requested user.').' '.$msg.''.$back; } else { - $result.=&mt("No user to be graded."); + $result.=''.&mt("No user to be graded.").''.$back; } - $result.=' |
"; + my $temp=&Apache::edit::insertlist($target,$token); + $result.=$temp; } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -309,6 +615,158 @@ sub start_Task { return $result; } +sub get_key_todo { + my ($target)=@_; + my $todo; + + if (defined($env{'form.reviewasubmission'})) { + &Apache::lonxml::debug("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 $me=$env{'user.name'}.'@'.$env{'user.domain'}; + + #need to try both queues.. + if (defined($env{'form.regradeaspecificsubmission'}) && + defined($env{'form.gradinguser'}) && + defined($env{'form.gradingdomain'}) ) { + my ($symb,$cid)=&Apache::lonxml::whichuser(); + my $cnum = $env{'course.'.$cid.'.num'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my $uname = $env{'form.gradinguser'}; + my $udom = $env{'form.gradingdomain'}; + + my $gradingkey=&encode_queue_key($symb,$udom,$uname); + + my $queue; + + if (&in_queue('gradingqueue',$symb,$cdom,$cnum,$udom,$uname)) { + $env{'form.queue'} = $queue = 'gradingqueue'; + } elsif (&in_queue('reviewqueue' ,$symb,$cdom,$cnum,$udom,$uname)) { + $env{'form.queue'} = $queue = 'reviewqueue'; + } + + if (!$queue) { + $env{'form.queue'} = $queue = 'none'; + #not queued so doing either a re or pre grade + return ($gradingkey); + } + + my $who=&queue_key_locked($queue,$gradingkey); + if ($who eq $me) { + #already have the lock + $env{'form.gradingkey'}=&Apache::lonnet::escape($gradingkey); + return ($gradingkey); + } + + if (!defined($who)) { + if (&lock_key($queue,$gradingkey)) { + return ($gradingkey); + } else { + return (undef,'lock_failed'); + } + } + + #otherwise (defined($who) && $who ne $me) some else has it... + return (undef,'not_allowed', + &mt('Another user ([_1]) currently has the record for [_2] locked.', + $who,$env{'form.gradinguser'}.'@'.$env{'form.gradingdomain'})); + } + + + 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,'select_user'); + } + } + return ($gradingkey,'selected'); + } else { + return (undef,'select_user'); + } + } + 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); + 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 minimize_storage { + foreach my $key (keys(%Apache::lonhomework::results)) { + if ($key =~ /regrader$/) { next; } + if ($Apache::lonhomework::results{$key} eq + $Apache::lonhomework::history{$key}) { + delete($Apache::lonhomework::results{$key}); + } + } +} + sub end_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; @@ -316,18 +774,78 @@ sub end_Task { my ($version,$previous)=&get_version(); if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { - if ( - (($target eq 'web') && ($env{'request.state'} ne 'construct')) || - ($target eq 'answer') || ($target eq 'tex') - ) { + if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') { if ($target eq 'web') { - if ($status eq 'CAN_ANSWER' && !$previous) { + if (&show_task($status,$previous)) { + $result.=&Apache::lonxml::endredirection(); + } + if ($status eq 'CAN_ANSWER' && !$previous && + !$env{'form.donescreen'}) { $result.="\n".'
\n";
+
+ if ($bt_status eq 'pass') {
+ $status.='
\n";
+
+ my $internal_location=&internal_location();
+ $result=~s/\Q$internal_location\E/$status/;
}
}
if ($target eq 'web' || $target eq 'webgrade') {
@@ -347,14 +865,22 @@ sub end_Task {
$Apache::lonhomework::results{"resource.0.award"}=
$Apache::lonhomework::results{"resource.$version.0.award"}=
$award;
+ $Apache::lonhomework::results{"resource.0.submission"}=
+ $Apache::lonhomework::results{"resource.$version.0.submission"}='';
+ } else {
+ delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
+ $award = '';
}
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&Apache::structuretags::finalize_storage();
- if ($award eq 'SUBMITTED') {
- &add_to_queue('gradingqueue');
+ if ($award eq 'SUBMITTED'
+ && defined($Apache::inputtags::slot_name)) {
+ &add_to_queue('gradingqueue',[$Apache::inputtags::slot_name]);
}
+ } elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {
+ &Apache::structuretags::finalize_storage();
}
- 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);
@@ -365,7 +891,7 @@ sub end_Task {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
my $status=
- $Apache::lonhomework::results{"resource.$version.$dim_id.status"};
+ $Apache::lonhomework::results{"resource.$version.0.$dim_id.status"};
my $mandatory=
($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
if ($status eq 'pass') {
@@ -376,43 +902,80 @@ sub end_Task {
$ungraded++;
} elsif ($status eq 'review') {
$review++;
- }
+ } else {
+ $ungraded++;
+ }
}
if ($optional_passed < $optional_required) {
$mandatory_failed++;
}
&Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
- $Apache::lonhomework::results{'resource.grader'}=
+ $Apache::lonhomework::results{'resource.0.regrader'}=
$env{'user.name'}.'@'.$env{'user.domain'};
if ($review) {
- $Apache::lonhomework::results{"resource.$version.status"}='review';
- &move_to_review_queue();
+ $Apache::lonhomework::results{"resource.$version.0.status"}='review';
+ 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('gradingqueue');
+ $Apache::lonhomework::results{"resource.$version.0.status"}='ungraded';
+ 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.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('gradingqueue');
+ &remove_from_queue($env{'form.queue'});
+
+ my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+
+ if ($env{'form.regrade'} ne 'yes') {
+ $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.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();
+ if ($env{'form.regrade'} ne 'yes') {
+ $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"};
+ $Apache::lonhomework::results{"resource.0.status"}=
+ $Apache::lonhomework::results{"resource.$version.0.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.$version.0.award"};
$Apache::lonhomework::results{"resource.0.awarded"}=
- $Apache::lonhomework::results{"resource.$version.awarded"};
+ $Apache::lonhomework::results{"resource.$version.0.awarded"};
$Apache::lonhomework::results{"resource.0.solved"}=
- $Apache::lonhomework::results{"resource.$version.solved"};
+ $Apache::lonhomework::results{"resource.$version.0.solved"};
}
+ &minimize_storage();
&Apache::structuretags::finalize_storage();
}
} elsif ($target eq 'webgrade') {
@@ -427,40 +990,91 @@ sub end_Task {
# &mt('Save Partial Grade and Continue Grading').'" /> ';
$result.=''.&Apache::loncommon::endbodytag().'You passed the '.$title.' given on '. + $start_time.'
'; + } + if ($bt_status eq 'fail') { + $status.='You did not pass the '.$title.' given on '. + $start_time.'
'; + if (!$previous) { + $status.=&add_request_another_attempt_button(); + } + } + my $man_count=0; + my $opt_count=0; + my $opt_passed=0; + foreach my $dim_id (@Apache::bridgetask::dimensionlist) { + if ($Apache::bridgetask::dimensionmandatory{$dim_id} + eq 'N') { + $opt_count++; + if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') { + $opt_passed++; + } + } else { + $man_count++; + } + } + my $opt_req=&Apache::lonxml::get_param('OptionalRequired', + $parstack,$safeeval); + if ($opt_req !~ /\S/) { $opt_req='0'; } + $status.="\n".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."