--- loncom/homework/inputtags.pm 2007/10/03 02:10:45 1.232
+++ loncom/homework/inputtags.pm 2008/09/01 10:01:57 1.245
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.232 2007/10/03 02:10:45 albertel Exp $
+# $Id: inputtags.pm,v 1.245 2008/09/01 10:01:57 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -306,7 +306,9 @@ sub start_textline {
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
}
$oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
-
+ $oldresponse =~ s/^\s+//;
+ $oldresponse =~ s/\s+$//;
+ $oldresponse =~ s/\s+/ /g;
if ($Apache::lonhomework::type ne 'exam') {
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
$result='';
@@ -548,6 +550,18 @@ sub awarddetail_to_awarded {
return 0;
}
+sub hide_award {
+ my ($award) = @_;
+ if (&Apache::lonhomework::show_no_problem_status()) {
+ return 1;
+ }
+ if ($award =~
+ /^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|ASSIGNED_SCORE|INCORRECT)/) {
+ return 1;
+ }
+ return 0;
+}
+
sub finalizeawards {
my ($awardref,$msgref,$nameref,$reverse,$final_scantron)=@_;
my $result;
@@ -624,8 +638,8 @@ sub decideoutput {
);
my $part = $Apache::inputtags::part;
- my $handgrade =
- ('yes' eq lc(&Apache::lonnet::EXT("resource.$part.handgrade")));
+ my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade");
+ my $handgrade = ('yes' eq lc($tohandgrade));
my $computer = ($handgrade)? ''
: " ".&mt("Computer's answer now shown above.");
@@ -655,14 +669,18 @@ sub decideoutput {
$message.= $computer;
}
$added_computer_text=1;
- my ($symb) = &Apache::lonnet::whichuser();
- if (($symb ne '')
- &&
- ($env{'course.'.$env{'request.course.id'}.
- '.disable_receipt_display'} ne 'yes')) {
- $message.=(($target eq 'web')?'
':' ').
- &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
- (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
+ if ($awarded > 0) {
+ my ($symb) = &Apache::lonnet::whichuser();
+ if (($symb ne '')
+ &&
+ ($env{'course.'.$env{'request.course.id'}.
+ '.disable_receipt_display'} ne 'yes') &&
+ ($Apache::lonhomework::type ne 'practice')) {
+ $message.=(($target eq 'web')?'
':' ').
+ &mt('Your receipt is [_1]',
+ (&Apache::lonnet::receipt($Apache::inputtags::part).
+ (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
+ }
}
}
$button=0;
@@ -689,12 +707,14 @@ sub decideoutput {
$message.= $computer;
}
$added_computer_text=1;
- unless ($env{'course.'.
+ if ($awarded > 0
+ && $env{'course.'.
$env{'request.course.id'}.
- '.disable_receipt_display'} eq 'yes') {
+ '.disable_receipt_display'} ne 'yes') {
$message.=(($target eq 'web')?'
':' ').
- 'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
- (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
+ &mt('Your receipt is [_1]',
+ (&Apache::lonnet::receipt($Apache::inputtags::part).
+ (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
}
$css_class=$possible_class{'correct'};
$button=0;
@@ -710,6 +730,9 @@ sub decideoutput {
$button = 1;
} elsif ($award eq 'MISSING_ANSWER') {
$message = &mt('Some items were not submitted.');
+ if ($target ne 'tex') {
+ $message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
+ }
$css_class=$possible_class{'not_charged_try'};
$button = 1;
} elsif ($award eq 'ERROR') {
@@ -725,10 +748,10 @@ sub decideoutput {
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'MISORDERED_RANK') {
- $message = &mt('You have provided an invalid ranking');
- if ($target ne 'tex') {
- $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems');
- }
+ $message = &mt('You have provided an invalid ranking.');
+ if ($target ne 'tex') {
+ $message.=' '.&mt('Please refer to [_1]',&Apache::loncommon::help_open_topic('Ranking_Problems',&mt('help on ranking problems')));
+ }
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'INVALID_FILETYPE') {
@@ -770,7 +793,8 @@ sub decideoutput {
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'BAD_FORMULA') {
- $message = &mt("Unable to understand formula");
+ $message = &mt("Unable to understand formula").'.';
+ if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')};
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'INCORRECT') {
@@ -815,8 +839,9 @@ sub decideoutput {
}
}
- if (lc($Apache::lonhomework::problemstatus) eq 'no' &&
- $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
+ if (&Apache::lonhomework::hide_problem_status()
+ && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
+ && &hide_award($award)) {
$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
$css_class=$possible_class{'no_grade'};
$button=1;
@@ -826,6 +851,15 @@ sub decideoutput {
$message.= $computer;
$added_computer_text=1;
}
+ if ($Apache::lonhomework::type eq 'practice') {
+ if ($target eq 'web') {
+ $message .= '
';
+ } else {
+ $message .= ' ';
+ }
+ $message.=&mt('Submissions to practice problems are not permanently recorded.');
+ }
+
return ($button,$css_class,$message,$previousmsg);
}
@@ -879,8 +913,9 @@ sub setgradedata {
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
return '';
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
- /^correct/ || $Apache::lonhomework::scantronmode ||
- lc($Apache::lonhomework::problemstatus) eq 'no') {
+ /^correct/
+ || $Apache::lonhomework::scantronmode
+ || &Apache::lonhomework::hide_problem_status() ) {
# the student doesn't already have it correct,
# or we are in a mode (scantron orno problem status) where a correct
# can become incorrect
@@ -923,8 +958,8 @@ sub setgradedata {
} elsif ( $award eq 'INCORRECT' ) {
$Apache::lonhomework::results{"resource.$id.tries"} =
$Apache::lonhomework::history{"resource.$id.tries"} + 1;
- if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
- $Apache::lonhomework::scantronmode) {
+ if (&Apache::lonhomework::hide_problem_status()
+ || $Apache::lonhomework::scantronmode) {
$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
}
$Apache::lonhomework::results{"resource.$id.solved"} =
@@ -943,12 +978,18 @@ sub setgradedata {
} else {
$Apache::lonhomework::results{"resource.$id.solved"} =
'incorrect_attempted';
- if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
- $Apache::lonhomework::scantronmode) {
+ if (&Apache::lonhomework::show_no_problem_status()
+ || $Apache::lonhomework::scantronmode) {
$Apache::lonhomework::results{"resource.$id.tries"} =
$Apache::lonhomework::history{"resource.$id.tries"} + 1;
$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
}
+
+ if (&Apache::lonhomework::show_some_problem_status()) {
+ # clear out the awarded if they had gotten it wrong/right
+ # and are now in an error mode
+ $Apache::lonhomework::results{"resource.$id.awarded"} = '';
+ }
}
if (defined($msg)) {
$Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg;
@@ -962,7 +1003,7 @@ sub setgradedata {
# check if this was a previous submission if it was delete the
# unneeded data and update the previously_used attribute
if ( $previously_used eq 'PREVIOUSLY_USED') {
- if (lc($Apache::lonhomework::problemstatus) ne 'no') {
+ if (&Apache::lonhomework::show_problem_status()) {
delete($Apache::lonhomework::results{"resource.$id.tries"});
$Apache::lonhomework::results{"resource.$id.previous"} = '1';
}
@@ -1048,7 +1089,7 @@ sub grade {
my ($match) =
&previous_match(\@Apache::inputtags::previous_version,
scalar(@Apache::inputtags::response));
-
+
if ($match) {
$previously_used = 'PREVIOUSLY_LAST';
foreach my $value (@Apache::inputtags::previous) {
@@ -1221,16 +1262,16 @@ sub previous_tries {
my $previous = $count_lookup{$which};
$message =~ s{()}{ as submission \# $previous $1};
} elsif ($Apache::lonhomework::history{"$prefix.tries"}) {
- if (!(lc($Apache::lonhomework::problemstatus) eq 'no'
+ if (!(&Apache::lonhomework::hide_problem_status()
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')
&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/
) {
+ my $txt_correct = &mt('Correct');
$message =~ s{(