--- loncom/homework/inputtags.pm 2015/03/10 23:11:22 1.331
+++ 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.331 2015/03/10 23:11:22 raeburn Exp $
+# $Id: inputtags.pm,v 1.353 2021/09/05 05:55:50 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -460,17 +460,24 @@ 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";
}
$result.= '';
$result .= &spellcheck_onblur($itemid, $spellcheck);
+ if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
+ (($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) &&
+ (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {
+ $result.=&edit_mathresponse_button($input_tag_id);
+ }
}
if ($Apache::lonhomework::type eq 'exam'
&& &needs_exam_box($tagstack)) {
@@ -660,10 +667,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:').'
';
@@ -685,7 +695,6 @@ sub file_selector {
&mt('Select Portfolio Files: (one or more files per submission)').'
'.
''.
'
';
-
}
$result.=&Apache::lonhtmlcommon::row_closure(1);
return $result;
@@ -906,7 +915,7 @@ sub valid_award {
{
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
- 'WRONG_NUMCHECKEDBOXES','TOO_LONG',
+ 'WRONG_NUMBOXESCHECKED','TOO_LONG',
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION',
@@ -996,6 +1005,23 @@ sub finalizeawards {
$j++;
}
+ # if at least one response item is set to include lenient grading
+ # and that item is partially correct then overall award reflects
+ # that, unless an award for one of the other response items does
+ # not fall within the basic awards for correct or incorrect.
+ if ($Apache::inputtags::leniency) {
+ if (($$awardref[$which] eq 'INCORRECT')
+ && (grep { $_ eq 'EXACT_ANS' ||
+ $_ eq 'APPROX_ANS' ||
+ $_ eq 'ASSIGNED_SCORE' } (@$awardref))
+ && !((grep { $_ ne 'INCORRECT' &&
+ $_ ne 'EXACT_ANS' &&
+ $_ ne 'APPROX_ANS' &&
+ $_ ne 'ASSIGNED_SCORE' } (@$awardref)))) {
+ return ('ASSIGNED_SCORE');
+ }
+ }
+
if (defined($which)) {
if (ref($nameref)) {
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
@@ -1021,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;
@@ -1034,7 +1061,7 @@ sub decideoutput {
#
my $computer = ($handgrade || $nocorrect)? ''
- : " ".&mt("Computer's answer now shown above.");
+ : &mt("Computer's answer now shown above.");
&Apache::lonxml::debug("handgrade has :$handgrade:");
if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
@@ -1058,7 +1085,9 @@ sub decideoutput {
$message = '\textbf{'.$message.'}';
} else {
$message = "".$message."";
- $message.= $computer;
+ if ($computer) {
+ $message = "$computer $message";
+ }
}
$added_computer_text=1;
if ($awarded > 0) {
@@ -1102,7 +1131,9 @@ sub decideoutput {
$message = '\textbf{'.&mt('You are correct.').'}';
} else {
$message = "".&mt('You are correct.')."";
- $message.= $computer;
+ if ($computer) {
+ $message = "$computer $message";
+ }
}
$added_computer_text=1;
if ($awarded > 0
@@ -1180,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);
@@ -1304,17 +1339,27 @@ 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.");
}
}
}
$css_class=$possible_class{'no_grade'};
$button=1;
+ if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') {
+ if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
+ $message = 'Answer Submitted';
+ } else {
+ undef($message);
+ }
+ }
}
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
!$added_computer_text && $target ne 'tex') {
- $message.= $computer;
+ if ($computer) {
+ $message = "$computer $message";
+ }
$added_computer_text=1;
}
if ($Apache::lonhomework::type eq 'practice') {
@@ -1611,7 +1656,11 @@ sub get_grade_messages {
if ($target eq 'tex') {
$message='\vskip 2 mm '.$message.' ';
} else {
- $message="
'.$button.' | '.$output; - if (!$no_previous) { + if ((!$no_previous) && + (($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') || + ($env{'request.role.adv'}))) { $output.=''.&previous_tries($id,$target).' | '; } $output.= '