loncom/homework/lonhomework.pm - diff

Return to lonhomework.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonhomework.pm between versions 1.323 and 1.326

version 1.323, 2011/02/06 18:43:10	version 1.326, 2011/06/06 16:48:39
Line 147 sub get_target {	Line 147 sub get_target {
} else {	} else {
if ($env{'form.problemstate'} eq 'WEB_GRADE') {	if ($env{'form.problemstate'} eq 'WEB_GRADE') {
return ('grade','webgrade','answer');	return ('grade','webgrade','answer');
	} elsif ($env{'form.problemmode'} eq 'view') {
	return ('grade','web','answer');
} elsif ($env{'form.problemmode'} eq 'saveview') {	} elsif ($env{'form.problemmode'} eq 'saveview') {
return ('modified','web','answer');	return ('modified','web','answer');
} elsif ($env{'form.problemmode'} eq 'discard') {	} elsif ($env{'form.problemmode'} eq 'discard') {
Line 432 sub check_access {	Line 434 sub check_access {
if ( $tries eq '' ) { $tries = '0'; }	if ( $tries eq '' ) { $tries = '0'; }
if ( $maxtries eq '' &&	if ( $maxtries eq '' &&
$env{'request.state'} ne 'construct') { $maxtries = '2'; }	$env{'request.state'} ne 'construct') { $maxtries = '2'; }
	$Apache::lonhomework::results{'resource.'.$id.'.maxtries'}=$maxtries;
if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }	if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
# if (correct and show prob status) or excused then CANNOT_ANSWER	# if (correct and show prob status) or excused then CANNOT_ANSWER
if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/	if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
&&	&&
&show_problem_status())	&show_problem_status()
	&&
	$Apache::lonhomework::history{"resource.$id.awarded"}==1)
\|\|	\|\|
$Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {	$Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
$status = 'CANNOT_ANSWER';	$status = 'CANNOT_ANSWER';

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

Removed from v.1.323
changed lines
	Added in v.1.326