'."\n";
push(@Apache::inputtags::status,$status);
@@ -695,19 +752,22 @@ sub start_Task {
}
my $msg;
if ($status eq 'UNAVAILABLE') {
- $msg.='
'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'
';
+ $msg.='
'.&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.='
'.&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);
+ $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.').'
';
+ $msg.='
'.&mt('Your submission is in the grading queue.').'
';
} elsif ($env{'form.donescreen'}) {
$result .= &done_screen($version);
- } elsif ($status ne 'NOT_YET_VIEWED') {
- $msg.='
'.&mt('Not open to be viewed').'
';
+ } elsif ($status eq 'NOT_YET_VIEWED') {
+ my $symb=&Apache::lonnet::symbread();
+ $msg.=&Apache::structuretags::firstaccess_msg($accessmsg,$symb);
+ } else {
+ $msg.='
'.&mt('Not open to be viewed').'
';
}
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
$msg.='The problem '.$accessmsg;
@@ -784,6 +844,11 @@ sub start_Task {
$result.='
'.&mt("Stopped grading.").''.$back;
} elsif ($status_code eq 'cancel') {
$result.='
'.&mt("Cancelled grading.").''.$back;
+ } elsif ($status_code eq 'terminated') {
+ $result.= '
'.&mt('Terminated grading').''.
+ '
'.
+ &mt('Grading for [_1] has not been saved because of a grading key mismatch.',
+ ''.$env{'form.terminated'}.'').''.$back;
} elsif ($status_code eq 'never_versioned') {
$result.='
'.
&mt("Requested user has never accessed the task.").
@@ -932,7 +997,7 @@ sub get_key_todo {
my $classlist=&get_limited_classlist();
if (!&allow_grade_user($classlist->{$uname.':'.$udom})) {
return (undef,'not_allowed',
- &mt('Requested student ([_1]) is in a section you aren\'t allowed to grade.',$uname.':'.$udom));
+ &mt("Requested student ([_1]) is in a section you aren't allowed to grade.",$uname.':'.$udom));
}
}
my $gradingkey=&encode_queue_key($symb,$udom,$uname);
@@ -1004,6 +1069,8 @@ sub get_key_todo {
return (undef,'stop');
} elsif ($env{'form.cancel'}) {
return (undef,'cancel');
+ } elsif ($env{'form.terminated'}) {
+ return (undef, 'terminated');
} elsif ($env{'form.next'}) {
return (undef,'select_user');
}
@@ -1049,13 +1116,17 @@ sub get_key_todo {
if ($env{'form.queuemode'} ne 'selected') {
# don't get something new from the queue if they hit the stop button
- if (!(($env{'form.cancel'} || $env{'form.stop'})
+ if (!(($env{'form.cancel'} || $env{'form.stop'} || $env{'form.terminated'})
&& $target eq 'webgrade')
&& !$env{'form.gradingaction'}) {
&Apache::lonxml::debug("Getting anew $queue");
return (&get_from_queue($queue));
} else {
- return (undef,'stop');
+ if ($env{'form.terminated'}) {
+ return (undef,'terminated');
+ } else {
+ return (undef,'stop');
+ }
}
}
return (undef,undef)
@@ -1085,14 +1156,21 @@ sub end_Task {
}
if ($status eq 'CAN_ANSWER' && !$previous &&
!$env{'form.donescreen'}) {
- $result.="\n".''.
+ my ($portheader,$porttext);
+ if ($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}) {
+ $portheader = &mt('Submit Additional Portfolio Files for Grading');
+ $porttext = &mt('Indicate which additional files from your portfolio are to be evaluated in grading this task.');
+ } else {
+ $portheader = &mt('Submit Portfolio Files for Grading');
+ $porttext = &mt('Indicate the files from your portfolio to be evaluated in grading this task.');
+ }
+ $result.="\n".''.&Apache::lonhtmlcommon::start_pick_box().
&Apache::inputtags::file_selector("$version.0",
"bridgetask","*",
'portfolioonly',
- '
-
'.&mt('Submit Portfolio Files for Grading').'
-
'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'
').
- "
";
+ ''.$portheader.'
'.
+ $porttext.'
').
+ &Apache::lonhtmlcommon::end_pick_box().'
- |