--- loncom/homework/inputtags.pm 2019/08/11 17:16:25 1.333.2.7
+++ loncom/homework/inputtags.pm 2021/09/11 16:12:25 1.333.2.11
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.333.2.7 2019/08/11 17:16:25 raeburn Exp $
+# $Id: inputtags.pm,v 1.333.2.11 2021/09/11 16:12:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1037,6 +1037,7 @@ sub decideoutput {
'not_charged_try' => 'LC_answer_not_charged_try',
'no_grade' => 'LC_answer_no_grade',
'no_message' => 'LC_no_message',
+ 'no_charge_warn' => 'LC_answer_warning',
);
my $part = $Apache::inputtags::part;
@@ -1200,8 +1201,12 @@ sub decideoutput {
} elsif ($award eq 'SIG_FAIL') {
my ($used,$min,$max)=split(':',$awardmsg);
my $word = ($used < $min) ? 'more' : 'fewer';
- $message = &mt("Submission not graded. Use $word digits.",$used);
- $css_class=$possible_class{'not_charged_try'};
+ $message = &mt("Submission not graded. Use $word significant figures.",$used);
+ 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_INVALID_INSTRUCTOR') {
$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);
@@ -1874,13 +1879,15 @@ sub previous_tries {
my $prefix = $env{'form.request.prefix'};
$prefix =~ tr{.}{_};
my $function_name = 'LONCAPA_previous_tries_'.$prefix;
- if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {
+ if (($env{'request.state'} eq 'construct') || ($id =~ /\W/)) {
$function_name .= $Apache::lonxml::curdepth;
} else {
- $function_name .= &js_escape($id);
+ $function_name .= $id;
}
$function_name .= '_'.$Apache::lonxml::counter;
- my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."
";
+ my $possmathjax = 1;
+ my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,
+ &mt($tries_text),$possmathjax)."
";
return $result;
}