version 1.168, 2005/06/20 19:54:28
|
version 1.171, 2005/07/11 19:41:53
|
Line 401 sub finalizeawards {
|
Line 401 sub finalizeawards {
|
} |
} |
|
|
sub decideoutput { |
sub decideoutput { |
my ($award,$awardmsg,$solved,$previous,$target)=@_; |
my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_; |
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
my $previousmsg; |
my $previousmsg; |
Line 413 sub decideoutput {
|
Line 413 sub decideoutput {
|
'not_charged_try' => '#ffffaa', |
'not_charged_try' => '#ffffaa', |
'no_message' => '#fffff', |
'no_message' => '#fffff', |
); |
); |
|
|
if ($previous) { $previousmsg=&mt('You have entered that answer before'); } |
if ($previous) { $previousmsg=&mt('You have entered that answer before'); } |
|
|
if ($solved =~ /^correct/) { |
if ($solved =~ /^correct/) { |
if ($award eq 'ASSIGNED_SCORE') { |
$bgcolor=$possiblecolors{'correct'}; |
$message = &mt("A score has been assigned."); |
$message=&mt('You are correct.'); |
|
if ($awarded < 1 && $awarded > 0) { |
|
$message=&mt('You are partially correct.'); |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
|
} elsif ($awarded < 1) { |
|
$message=&mt('Incorrect.'); |
|
$bgcolor=$possiblecolors{'charged_try'}; |
|
} |
|
|
|
if ($target eq 'tex') { |
|
$message = '\textbf{'.$message.'}'; |
} else { |
} else { |
if ($target eq 'tex') { |
$message = "<b>".$message."</b>"; |
$message = '\textbf{'.&mt('You are correct.').'}'; |
} |
} else { |
$added_computer_text=1; |
$message = "<b>".&mt('You are correct.')."</b>"; |
|
|
if ($env{'request.filename'} !~ |
|
m|/res/lib/templates/examupload.problem$|) { |
|
if ($target ne 'tex') { |
$message.=" ".&mt("Computer's answer now shown above."); |
$message.=" ".&mt("Computer's answer now shown above."); |
} |
} |
$added_computer_text=1; |
|
unless ($env{'course.'. |
unless ($env{'course.'. |
$env{'request.course.id'}. |
$env{'request.course.id'}. |
'.disable_receipt_display'} eq 'yes') { |
'.disable_receipt_display'} eq 'yes') { |
Line 434 sub decideoutput {
|
Line 447 sub decideoutput {
|
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
} |
} |
} |
} |
$bgcolor=$possiblecolors{'correct'}; |
|
$button=0; |
$button=0; |
$previousmsg=''; |
$previousmsg=''; |
} elsif ($solved =~ /^excused/) { |
} elsif ($solved =~ /^excused/) { |
Line 787 sub gradestatus {
|
Line 799 sub gradestatus {
|
if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' && |
if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' && |
$status ne 'INVALID_ACCESS') { |
$status ne 'INVALID_ACCESS') { |
my $award = $Apache::lonhomework::history{"resource.$id.award"}; |
my $award = $Apache::lonhomework::history{"resource.$id.award"}; |
|
my $awarded = $Apache::lonhomework::history{"resource.$id.awarded"}; |
my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; |
my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; |
my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; |
my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; |
my $awardmsg = $Apache::lonhomework::history{"resource.$id.awardmsg"}; |
my $awardmsg = $Apache::lonhomework::history{"resource.$id.awardmsg"}; |
Line 794 sub gradestatus {
|
Line 807 sub gradestatus {
|
if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') { |
if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') { |
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,$bgcolor,$message,$previousmsg) = |
($showbutton,$bgcolor,$message,$previousmsg) = |
&decideoutput($award,$awardmsg,$solved,$previous,$target); |
&decideoutput($award,$awarded,$awardmsg,$solved,$previous, |
|
$target); |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$message='\vskip 2 mm '.$message.' '; |
$message='\vskip 2 mm '.$message.' '; |
} else { |
} else { |