--- loncom/homework/inputtags.pm 2019/03/18 20:21:14 1.333.2.5 +++ loncom/homework/inputtags.pm 2021/12/30 03:54:45 1.333.2.12.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.333.2.5 2019/03/18 20:21:14 raeburn Exp $ +# $Id: inputtags.pm,v 1.333.2.12.2.1 2021/12/30 03:54:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -666,10 +666,13 @@ sub file_selector { if ($constraints) { $result .= $constraints.'
'; } - if ($which eq 'uploadonly' || $which eq 'both') { - $result.=&mt('Submit a file: (only one file per submission)'). - '

'; + if ($which eq 'uploadonly' || $which eq 'both') { + my $free_space = $maxfilesize * 1048576; + $result .= &mt('Submit a file: (only one file per submission)'). + '
'. + '
'; } if ( $which eq 'both') { $result.='
'.''.&mt('OR:').'
'; @@ -691,7 +694,6 @@ sub file_selector { &mt('Select Portfolio Files: (one or more files per submission)').'
'. ''. '
'; - } $result.=&Apache::lonhtmlcommon::row_closure(1); return $result; @@ -1035,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; @@ -1149,7 +1152,11 @@ sub decideoutput { 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).'); @@ -1198,8 +1205,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); @@ -1209,21 +1220,37 @@ sub decideoutput { } 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").'.'; @@ -1322,7 +1349,8 @@ sub decideoutput { my $first_access=&Apache::lonnet::get_first_access($interval[1]); if (defined($first_access)) { my $due_date= &Apache::lonnet::EXT("resource.$part.duedate"); - unless (($due_date) && ($due_date < $first_access + $interval[0])) { + my ($timelimit) = ($interval[0] =~ /^(\d+)/); + unless (($due_date) && ($due_date < $first_access + $timelimit)) { $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached."); } } @@ -1872,13 +1900,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; }