[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework inputtags.pm
raeburn
raeburn at source.lon-capa.org
Sun Dec 12 16:21:44 EST 2021
raeburn Sun Dec 12 21:21:44 2021 EDT
Modified files: (Branch: version_2_11_X)
/loncom/homework inputtags.pm
Log:
- For 2.11
Backport 1.352 (part), 1.354.
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.333.2.11 loncom/homework/inputtags.pm:1.333.2.12
--- loncom/homework/inputtags.pm:1.333.2.11 Sat Sep 11 16:12:25 2021
+++ loncom/homework/inputtags.pm Sun Dec 12 21:21:44 2021
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.333.2.11 2021/09/11 16:12:25 raeburn Exp $
+# $Id: inputtags.pm,v 1.333.2.12 2021/12/12 21:21:44 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1152,7 +1152,11 @@
if ($target ne 'tex') {
$message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
}
- $css_class=$possible_class{'not_charged_try'};
+ if (&Apache::lonhomework::show_some_problem_status()) {
+ $css_class=$possible_class{'no_charge_warn'};
+ } else {
+ $css_class=$possible_class{'not_charged_try'};
+ }
$button = 1;
} elsif ($award eq 'WRONG_NUMBOXESCHECKED') {
$message = &mt('Number of boxes checked outside permissible range (either too few or too many).');
@@ -1201,7 +1205,7 @@
} elsif ($award eq 'SIG_FAIL') {
my ($used,$min,$max)=split(':',$awardmsg);
my $word = ($used < $min) ? 'more' : 'fewer';
- $message = &mt("Submission not graded. Use $word significant figures.",$used);
+ $message = &mt("Submission not graded. Use $word significant figures.");
if (&Apache::lonhomework::show_some_problem_status()) {
$css_class=$possible_class{'no_charge_warn'};
} else {
@@ -1216,21 +1220,37 @@
} elsif ($award eq 'UNIT_INVALID_STUDENT') {
$message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
- $css_class=$possible_class{'not_charged_try'};
+ if (&Apache::lonhomework::show_some_problem_status()) {
+ $css_class=$possible_class{'no_charge_warn'};
+ } else {
+ $css_class=$possible_class{'not_charged_try'};
+ }
$button=1;
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
- $css_class=$possible_class{'not_charged_try'};
+ if (&Apache::lonhomework::show_some_problem_status()) {
+ $css_class=$possible_class{'no_charge_warn'};
+ } else {
+ $css_class=$possible_class{'not_charged_try'};
+ }
$button=1;
} elsif ($award eq 'UNIT_NOTNEEDED') {
$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));
- $css_class=$possible_class{'not_charged_try'};
+ if (&Apache::lonhomework::show_some_problem_status()) {
+ $css_class=$possible_class{'no_charge_warn'};
+ } else {
+ $css_class=$possible_class{'not_charged_try'};
+ }
$button=1;
} elsif ($award eq 'NO_UNIT') {
$message = &mt("Units required").'.';
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
- $css_class=$possible_class{'not_charged_try'};
+ if (&Apache::lonhomework::show_some_problem_status()) {
+ $css_class=$possible_class{'no_charge_warn'};
+ } else {
+ $css_class=$possible_class{'not_charged_try'};
+ }
$button=1;
} elsif ($award eq 'COMMA_FAIL') {
$message = &mt("Proper comma separation is required").'.';
More information about the LON-CAPA-cvs
mailing list