--- loncom/homework/inputtags.pm 2009/05/23 18:11:06 1.258
+++ loncom/homework/inputtags.pm 2010/06/05 01:38:43 1.262
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.258 2009/05/23 18:11:06 riegler Exp $
+# $Id: inputtags.pm,v 1.262 2010/06/05 01:38:43 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -394,7 +394,7 @@ sub start_textline {
'&part_'. $Apache::inputtags::part.
'&textresponse'.
'&HWVAL_' . $Apache::inputtags::response['-1'];
- $result="\n\\\\\n".'\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
+ $result='\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
} else {
$result='\framebox['.$size.'][s]{\tiny\strut}';
}
@@ -573,8 +573,10 @@ sub valid_award {
'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT',
'MISORDERED_RANK', 'INVALID_FILETYPE',
'EXCESS_FILESIZE', 'DRAFT',
- 'SUBMITTED', 'ASSIGNED_SCORE',
- 'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
+ 'SUBMITTED', 'SUBMITTED_CREDIT',
+ 'ANONYMOUS', 'ANONYMOUS_CREDIT',
+ 'ASSIGNED_SCORE', 'APPROX_ANS',
+ 'EXACT_ANS','COMMA_FAIL') {
if ($award eq $possibleaward) { return 1; }
}
return 0;
@@ -588,6 +590,7 @@ sub valid_award {
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',
+ 'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT',
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
my $i=0;
my %fwd_awards = map { ($_,$i++) } @awards;
@@ -611,7 +614,7 @@ sub hide_award {
return 1;
}
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 0;
@@ -872,6 +875,17 @@ sub decideoutput {
$message = &mt("Your submission has been recorded.");
$css_class=$possible_class{'no_grade'};
$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') {
$message = &mt("Copy saved but not submitted.");
$css_class=$possible_class{'not_charged_try'};
@@ -1035,6 +1049,18 @@ sub setgradedata {
$Apache::lonhomework::results{"resource.$id.solved"} =
$solvemsg;
$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' ) {
$Apache::lonhomework::results{"resource.$id.tries"} =
$Apache::lonhomework::history{"resource.$id.tries"} + 1;
@@ -1049,6 +1075,11 @@ sub setgradedata {
$Apache::lonhomework::history{"resource.$id.tries"} + 1;
$Apache::lonhomework::results{"resource.$id.solved"} =
'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' ) {
$Apache::lonhomework::results{"resource.$id.solved"} = '';
} elsif ( $award eq 'NO_RESPONSE' ) {
@@ -1108,6 +1139,10 @@ sub setgradedata {
if ($award eq 'SUBMITTED') {
&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 {
@@ -1222,6 +1257,9 @@ sub get_grade_messages {
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }
my $tries_text=&mt('Tries');
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) {
$tries_text=&mt('Submissions');
}
@@ -1289,11 +1327,9 @@ sub gradestatus {
if ( $showbutton ) {
if ($target ne 'tex') {
$button =
- '';
+ '';
}
}