loncom/homework/bridgetask.pm - diff

Return to bridgetask.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.252 and 1.254

version 1.252, 2010/08/23 03:24:01	version 1.254, 2010/09/27 20:59:41
Line 784 sub start_Task {	Line 784 sub start_Task {
$result.='<b>'.&mt("Stopped grading.").'</b>'.$back;	$result.='<b>'.&mt("Stopped grading.").'</b>'.$back;
} elsif ($status_code eq 'cancel') {	} elsif ($status_code eq 'cancel') {
$result.='<b>'.&mt("Cancelled grading.").'</b>'.$back;	$result.='<b>'.&mt("Cancelled grading.").'</b>'.$back;
	} elsif ($status_code eq 'terminated') {
	$result.= '<b>'.&mt('Terminated grading').'</b><br />'.
	'<span class="LC_error">'.
	&mt('Grading for [_1] has not been saved because of a grading key mismatch.',
	'<tt>'.$env{'form.terminated'}.'</tt>').'</span><br />'.$back;
} elsif ($status_code eq 'never_versioned') {	} elsif ($status_code eq 'never_versioned') {
$result.='<b>'.	$result.='<b>'.
&mt("Requested user has never accessed the task.").	&mt("Requested user has never accessed the task.").
Line 1004 sub get_key_todo {	Line 1009 sub get_key_todo {
return (undef,'stop');	return (undef,'stop');
} elsif ($env{'form.cancel'}) {	} elsif ($env{'form.cancel'}) {
return (undef,'cancel');	return (undef,'cancel');
	} elsif ($env{'form.terminated'}) {
	return (undef, 'terminated');
} elsif ($env{'form.next'}) {	} elsif ($env{'form.next'}) {
return (undef,'select_user');	return (undef,'select_user');
}	}
Line 1049 sub get_key_todo {	Line 1056 sub get_key_todo {

if ($env{'form.queuemode'} ne 'selected') {	if ($env{'form.queuemode'} ne 'selected') {
# don't get something new from the queue if they hit the stop button	# 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')	&& $target eq 'webgrade')
&& !$env{'form.gradingaction'}) {	&& !$env{'form.gradingaction'}) {
&Apache::lonxml::debug("Getting anew $queue");	&Apache::lonxml::debug("Getting anew $queue");
return (&get_from_queue($queue));	return (&get_from_queue($queue));
} else {	} else {
return (undef,'stop');	if ($env{'form.terminated'}) {
	return (undef,'terminated');
	} else {
	return (undef,'stop');
	}
}	}
}	}
return (undef,undef)	return (undef,undef)
Line 1320 DONEBUTTON	Line 1331 DONEBUTTON
$Apache::lonhomework::results{"resource.$version.0.solved"};	$Apache::lonhomework::results{"resource.$version.0.solved"};
}	}
&minimize_storage();	&minimize_storage();
my $canstore;	my ($canstore,$domain,$name);
if ($env{'form.gradingkey'}) {	if ($env{'form.gradingkey'}) {
my ($symb,$courseid,$domain,$name) =	(my $symb,my $courseid,$domain,$name) =
&Apache::lonnet::whichuser();	&Apache::lonnet::whichuser();
my $todo=&unescape($env{'form.gradingkey'});	my $todo=&unescape($env{'form.gradingkey'});
my ($keysymb,$uname,$udom)=&decode_queue_key($todo);	my ($keysymb,$uname,$udom)=&decode_queue_key($todo);
Line 1334 DONEBUTTON	Line 1345 DONEBUTTON
}	}
if ($canstore) {	if ($canstore) {
&Apache::structuretags::finalize_storage();	&Apache::structuretags::finalize_storage();
} else {	# data stored, now handle queue
$result .= '<br /><div class="LC_error">'.	if ($review) {
&mt('Information extracted from the current gradingkey was for a different BT or user from those for which grading data are to be stored.').' '.&mt('No grading changes stored.').'</div><br />';	if ($env{'form.queue'} eq 'reviewqueue') {
}	&check_queue_unlock($env{'form.queue'});
	&Apache::lonxml::debug(" still needs review not changing status.");
# data stored, now handle queue
if ($review) {
if ($env{'form.queue'} eq 'reviewqueue') {
&check_queue_unlock($env{'form.queue'});
&Apache::lonxml::debug(" still needs review not changing status.");
} else {
if ($env{'form.queue'} ne 'none') {
&move_between_queues($env{'form.queue'},'reviewqueue');
} else {	} else {
&add_to_queue('reviewqueue',\%queue_data);	if ($env{'form.queue'} ne 'none') {
	&move_between_queues($env{'form.queue'},'reviewqueue');
	} else {
	&add_to_queue('reviewqueue',\%queue_data);
	}
}	}
}	} elsif ($ungraded) {
} elsif ($ungraded) {	if ($env{'form.queue'} eq 'reviewqueue') {
if ($env{'form.queue'} eq 'reviewqueue') {	&Apache::lonxml::debug("moving back.");
&Apache::lonxml::debug("moving back.");	&move_between_queues($env{'form.queue'},
&move_between_queues($env{'form.queue'},	'gradingqueue');
'gradingqueue');	} elsif ($env{'form.queue'} eq 'none' ) {
} elsif ($env{'form.queue'} eq 'none' ) {	&add_to_queue('gradingqueue',\%queue_data);
&add_to_queue('gradingqueue',\%queue_data);	} else {
} else {	&check_queue_unlock($env{'form.queue'});
&check_queue_unlock($env{'form.queue'});	}
}	} elsif ($mandatory_failed) {
} elsif ($mandatory_failed) {	&remove_from_queue($env{'form.queue'});
&remove_from_queue($env{'form.queue'});	} else {
} else {	&remove_from_queue($env{'form.queue'});
&remove_from_queue($env{'form.queue'});	}
}	} else {
}	&check_queue_unlock($env{'form.queue'});
	$env{'form.terminated'} = $name.':'.$domain;
	}
	}
if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {	if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {
# instance generation occurred and hasn't yet been stored	# instance generation occurred and hasn't yet been stored
&Apache::structuretags::finalize_storage();	&Apache::structuretags::finalize_storage();

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.252
changed lines
	Added in v.1.254