[LON-CAPA-cvs] cvs: loncom /homework inputtags.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 15 Jul 2004 19:44:54 -0000
albertel Thu Jul 15 15:44:54 2004 EDT
Modified files:
/loncom/homework inputtags.pm
Log:
- fixes double display of 'Computer's Answer now shown' BUG#3199
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.147 loncom/homework/inputtags.pm:1.148
--- loncom/homework/inputtags.pm:1.147 Mon Jun 28 11:01:44 2004
+++ loncom/homework/inputtags.pm Thu Jul 15 15:44:54 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.147 2004/06/28 15:01:44 sakharuk Exp $
+# $Id: inputtags.pm,v 1.148 2004/07/15 19:44:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -330,6 +330,7 @@
my $button=0;
my $previousmsg;
my $bgcolor='orange';
+ my $added_computer_text=0;
my %possiblecolors =
( 'correct' => '#aaffaa',
'charged_try' => '#ffaaaa',
@@ -347,7 +348,8 @@
} else {
$message = "<b>".&mt('You are correct.')."</b>";
}
- $message.= " ".&mt(" Computer's answer now shown.");
+ $message.=" ".&mt("Computer's answer now shown.");
+ $added_computer_text=1;
unless ($ENV{'course.'.
$ENV{'request.course.id'}.
'.disable_receipt_display'} eq 'yes') {
@@ -379,7 +381,8 @@
} else {
$message = "<b>".&mt('You are correct.')."</b>";
}
- $message.= " ".&mt(" Computer's answer now shown.");
+ $message.=" ".&mt("Computer's answer now shown.");
+ $added_computer_text=1;
unless ($ENV{'course.'.
$ENV{'request.course.id'}.
'.disable_receipt_display'} eq 'yes') {
@@ -487,8 +490,10 @@
$bgcolor=$possiblecolors{'correct'};
$button=1;
}
- if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER') {
+ if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
+ !$added_computer_text) {
$message.=" ".&mt("Computer's answer now shown.");
+ $added_computer_text=1;
}
return ($button,$bgcolor,$message,$previousmsg);
}