loncom/homework/inputtags.pm - diff

Return to inputtags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/inputtags.pm between versions 1.260 and 1.261

version 1.260, 2009/07/17 15:27:17	version 1.261, 2010/02/28 23:27:36
Line 573 sub valid_award {	Line 573 sub valid_award {
'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT',	'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT',
'MISORDERED_RANK', 'INVALID_FILETYPE',	'MISORDERED_RANK', 'INVALID_FILETYPE',
'EXCESS_FILESIZE', 'DRAFT',	'EXCESS_FILESIZE', 'DRAFT',
'SUBMITTED', 'ASSIGNED_SCORE',	'SUBMITTED', 'SUBMITTED_CREDIT',
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {	'ANONYMOUS', 'ANONYMOUS_CREDIT',
	'ASSIGNED_SCORE', 'APPROX_ANS',
	'EXACT_ANS','COMMA_FAIL') {
if ($award eq $possibleaward) { return 1; }	if ($award eq $possibleaward) { return 1; }
}	}
return 0;	return 0;
Line 588 sub valid_award {	Line 590 sub valid_award {
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',	'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',	'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',	'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',
	'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT',
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');	'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
my $i=0;	my $i=0;
my %fwd_awards = map { ($_,$i++) } @awards;	my %fwd_awards = map { ($_,$i++) } @awards;
Line 611 sub hide_award {	Line 614 sub hide_award {
return 1;	return 1;
}	}
if ($award =~	if ($award =~
/^(?:EXACT_ANS\|APPROX_ANS\|SUBMITTED\|ASSIGNED_SCORE\|INCORRECT)/) {	/^(?:EXACT_ANS\|APPROX_ANS\|SUBMITTED\|SUBMITTED_CREDIT\|ANONYMOUS\|ANONYMOUS_CREDIT\|ASSIGNED_SCORE\|INCORRECT)/) {
return 1;	return 1;
}	}
return 0;	return 0;
Line 872 sub decideoutput {	Line 875 sub decideoutput {
$message = &mt("Your submission has been recorded.");	$message = &mt("Your submission has been recorded.");
$css_class=$possible_class{'no_grade'};	$css_class=$possible_class{'no_grade'};
$button=1;	$button=1;
	} elsif ($award eq 'SUBMITTED_CREDIT') {
	$message = &mt("Your submission has been recorded, and credit awarded.");
	$css_class=$possible_class{'correct'};
	$button=1;
	} elsif ($award eq 'ANONYMOUS') {
	$message = &mt("Your anonymous submission has been recorded.");
	$css_class=$possible_class{'no_grade'};
	$button=1;
	} elsif ($award eq 'ANONYMOUS_CREDIT') {
	$message = &mt("Your anonymous submission has been recorded, and credit awarded.");
	$css_class=$possible_class{'correct'};
} elsif ($award eq 'DRAFT') {	} elsif ($award eq 'DRAFT') {
$message = &mt("Copy saved but not submitted.");	$message = &mt("Copy saved but not submitted.");
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
Line 1035 sub setgradedata {	Line 1049 sub setgradedata {
$Apache::lonhomework::results{"resource.$id.solved"} =	$Apache::lonhomework::results{"resource.$id.solved"} =
$solvemsg;	$solvemsg;
$Apache::lonhomework::results{"resource.$id.awarded"} = '1';	$Apache::lonhomework::results{"resource.$id.awarded"} = '1';
	} elsif ( $award eq 'SUBMITTED_CREDIT' ) {
	$Apache::lonhomework::results{"resource.$id.tries"} =
	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
	$Apache::lonhomework::results{"resource.$id.solved"} =
	'credit_attempted';
	$Apache::lonhomework::results{"resource.$id.awarded"} = '1';
	} elsif ( $award eq 'ANONYMOUS_CREDIT' ) {
	$Apache::lonhomework::results{"resource.$id.tries"} =
	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
	$Apache::lonhomework::results{"resource.$id.solved"} =
	'credit_attempted';
	$Apache::lonhomework::results{"resource.$id.awarded"} = '1';
} elsif ( $award eq 'INCORRECT' ) {	} elsif ( $award eq 'INCORRECT' ) {
$Apache::lonhomework::results{"resource.$id.tries"} =	$Apache::lonhomework::results{"resource.$id.tries"} =
$Apache::lonhomework::history{"resource.$id.tries"} + 1;	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
Line 1049 sub setgradedata {	Line 1075 sub setgradedata {
$Apache::lonhomework::history{"resource.$id.tries"} + 1;	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
$Apache::lonhomework::results{"resource.$id.solved"} =	$Apache::lonhomework::results{"resource.$id.solved"} =
'ungraded_attempted';	'ungraded_attempted';
	} elsif ( $award eq 'ANONYMOUS' ) {
	$Apache::lonhomework::results{"resource.$id.tries"} =
	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
	$Apache::lonhomework::results{"resource.$id.solved"} =
	'ungraded_attempted';
} elsif ( $award eq 'DRAFT' ) {	} elsif ( $award eq 'DRAFT' ) {
$Apache::lonhomework::results{"resource.$id.solved"} = '';	$Apache::lonhomework::results{"resource.$id.solved"} = '';
} elsif ( $award eq 'NO_RESPONSE' ) {	} elsif ( $award eq 'NO_RESPONSE' ) {
Line 1108 sub setgradedata {	Line 1139 sub setgradedata {
if ($award eq 'SUBMITTED') {	if ($award eq 'SUBMITTED') {
&Apache::response::add_to_gradingqueue();	&Apache::response::add_to_gradingqueue();
}	}
	if (($Apache::lonhomework::type eq 'anonsurvey') \|\|
	($Apache::lonhomework::type eq 'anonsurveycred')) {
	$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
	}
}	}

sub find_which_previous {	sub find_which_previous {
Line 1222 sub get_grade_messages {	Line 1257 sub get_grade_messages {
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }	if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }
my $tries_text=&mt('Tries');	my $tries_text=&mt('Tries');
if ( $Apache::lonhomework::type eq 'survey' \|\|	if ( $Apache::lonhomework::type eq 'survey' \|\|
	$Apache::lonhomework::type eq 'surveycred' \|\|
	$Apache::lonhomework::type eq 'anonsurvey' \|\|
	$Apache::lonhomework::type eq 'anonsurveycred' \|\|
$Apache::lonhomework::parsing_a_task) {	$Apache::lonhomework::parsing_a_task) {
$tries_text=&mt('Submissions');	$tries_text=&mt('Submissions');
}	}

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

Removed from v.1.260
changed lines
	Added in v.1.261