--- loncom/homework/inputtags.pm 2016/05/30 02:45:32 1.343
+++ loncom/homework/inputtags.pm 2021/09/05 05:55:50 1.353
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.343 2016/05/30 02:45:32 raeburn Exp $
+# $Id: inputtags.pm,v 1.353 2021/09/05 05:55:50 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -460,6 +460,7 @@ sub start_textline {
}
my $name = 'HWVAL_'.$id;
my $itemid = 'HWVAL_'.$partid.'_'.$id;
+ # NOTE: the input id should match the one given by defaut_homework input_id().
my $input_tag_id = $itemid.'_'.$input_id;
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
$name = "none";
@@ -666,13 +667,14 @@ sub file_selector {
if ($constraints) {
$result .= $constraints.'
';
}
- if ($which eq 'uploadonly' || $which eq 'both') {
+ if ($which eq 'uploadonly' || $which eq 'both') {
my $free_space = $maxfilesize * 1048576;
$result .= &mt('Submit a file: (only one file per submission)').
'
'.
- '
'
- }
+ '" id="HWFILE'.$jspart.'_'.$id.'" class="LC_flUpload LC_hwkfile" />'.
+ '
';
+ }
if ( $which eq 'both') {
$result.='
'.''.&mt('OR:').'
';
}
@@ -693,7 +695,6 @@ sub file_selector {
&mt('Select Portfolio Files: (one or more files per submission)').'
'.
''.
'
';
-
}
$result.=&Apache::lonhtmlcommon::row_closure(1);
return $result;
@@ -1046,6 +1047,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;
@@ -1209,8 +1211,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.");
+ 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);
@@ -1903,9 +1909,16 @@ sub previous_tries {
my $tries_text = &get_tries_text('link');
my $prefix = $env{'form.request.prefix'};
$prefix =~ tr{.}{_};
- my $function_name = "LONCAPA_previous_tries_".$prefix.
- $Apache::lonxml::curdepth.'_'.$env{'form.counter'};
- my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."
";
+ my $function_name = 'LONCAPA_previous_tries_'.$prefix;
+ if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {
+ $function_name .= $Apache::lonxml::curdepth;
+ } else {
+ $function_name .= &js_escape($id);
+ }
+ $function_name .= '_'.$Apache::lonxml::counter;
+ my $possmathjax = 1;
+ my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,
+ &mt($tries_text),$possmathjax)."
";
return $result;
}