--- loncom/homework/inputtags.pm 2003/06/24 19:18:01 1.107
+++ loncom/homework/inputtags.pm 2003/09/23 01:52:57 1.114.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.107 2003/06/24 19:18:01 albertel Exp $
+# $Id: inputtags.pm,v 1.114.2.1 2003/09/23 01:52:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -343,13 +343,23 @@ sub decideoutput {
} else {
$message = "You are correct.";
}
- $message.=' Your receipt is '.&Apache::lonnet::receipt;
+ unless ($ENV{'course.'.
+ $ENV{'request.course.id'}.
+ '.disable_receipt_display'} eq 'yes') {
+ $message.=(($target eq 'web')?'
':' ').
+ 'Your receipt is '.&Apache::lonnet::receipt().
+ (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
+ }
}
$bgcolor=$possiblecolors{'correct'};
$button=0;
$previousmsg='';
} elsif ($solved =~ /^excused/) {
- $message = "You are excused from the problem.";
+ if ($target eq 'tex') {
+ $message = ' \textbf{You are excused from the problem.} ';
+ } else {
+ $message = "You are excused from the problem.";
+ }
$bgcolor=$possiblecolors{'charged_try'};
$button=0;
$previousmsg='';
@@ -359,8 +369,14 @@ sub decideoutput {
$bgcolor=$possiblecolors{'charged_try'};
$button=1;
} else {
- $message = "You are correct. Your receipt is ".
- &Apache::lonnet::receipt;
+ $message = "You are correct.";
+ unless ($ENV{'course.'.
+ $ENV{'request.course.id'}.
+ '.disable_receipt_display'} eq 'yes') {
+ $message.=(($target eq 'web')?'
':' ').
+ 'Your receipt is '.&Apache::lonnet::receipt().
+ (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
+ }
$bgcolor=$possiblecolors{'correct'};
$button=0;
$previousmsg='';
@@ -386,8 +402,10 @@ sub decideoutput {
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'MISORDERED_RANK') {
- $message = 'You have provided an invalid ranking, please refer to '.
- &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+ $message = 'You have provided an invalid ranking';
+ if ($target ne 'tex') {
+ $message.=', please refer to '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+ }
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'INVALID_FILETYPE') {
@@ -399,8 +417,8 @@ sub decideoutput {
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_FAIL') {
- $message = "Units incorrect. ".
- &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";
+ $message = "Units incorrect. ";
+ if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} #Computer reads units as %s";
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_NOTNEEDED') {
@@ -408,8 +426,8 @@ sub decideoutput {
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'NO_UNIT') {
- $message = "Units required".
- &Apache::loncommon::help_open_topic('Physical_Units');
+ $message = "Units required";
+ if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'BAD_FORMULA') {
@@ -436,7 +454,8 @@ sub decideoutput {
$message = "Unknown message: $award";
$button=1;
}
- if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+ if (lc($Apache::lonhomework::problemstatus) eq 'no' &&
+ $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
$message = "Answer Submitted";
$bgcolor=$possiblecolors{'correct'};
$button=1;
@@ -602,7 +621,7 @@ sub gradestatus {
my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
&Apache::lonxml::debug("Found Award |$award|$solved|");
- if ( $award ne '' ) {
+ if ( $award ne '' || $solved ne '') {
&Apache::lonxml::debug('Getting message');
($showbutton,$bgcolor,$message,$previousmsg) =
&decideoutput($award,$solved,$previous,$target);