--- loncom/homework/inputtags.pm 2013/08/20 00:46:35 1.320 +++ loncom/homework/inputtags.pm 2015/10/30 11:33:07 1.333.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.320 2013/08/20 00:46:35 raeburn Exp $ +# $Id: inputtags.pm,v 1.333.2.3 2015/10/30 11:33:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -222,7 +222,7 @@ sub start_textfield { $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) { - $oldresponse = '* '.&mt('only shown to submitter').' *'; + $oldresponse = '* '.&mt('(only shown to submitter)').' *'; } else { $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; } @@ -235,11 +235,16 @@ sub start_textfield { my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); $result=''; my $tagident = 'HWVAL_' . $resid; + my $itemid = 'HWVAL_'.$partid.'_'.$resid; if ($addchars) { $result.=&addchars($tagident, $addchars); } - my $textareaclass = 'class="LC_richDetectHtml spellchecked"'; - $result.= '"; - $result .= &spellcheck_onblur($tagident, $spellcheck); + $result .= &spellcheck_onblur($itemid, $spellcheck); return $result; } } elsif ($target eq 'edit') { @@ -424,7 +431,7 @@ sub start_textline { ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') || ($Apache::lonhomework::type eq 'anonsurvey') || ($Apache::lonhomework::type eq 'anonsurveycred')) { - $oldresponse = '* '.&mt('only shown to submitter').' *'; + $oldresponse = '* '.&mt('(only shown to submitter)').' *'; } else { $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; } @@ -452,18 +459,24 @@ sub start_textline { $readonly=''; } my $name = 'HWVAL_'.$id; + my $itemid = 'HWVAL_'.$partid.'_'.$id; + my $input_tag_id = $itemid.'_'.$input_id; if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { $name = "none"; } $result.= ''; + . ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />'; - $result .= &spellcheck_onblur($name, $spellcheck); + $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)) { @@ -870,7 +883,7 @@ END sub valid_award { my ($award) =@_; foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR', - 'NO_RESPONSE', + 'NO_RESPONSE','WRONG_NUMBOXESCHECKED', 'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', @@ -890,7 +903,7 @@ sub valid_award { { my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', - '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', @@ -980,6 +993,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]); @@ -992,7 +1022,7 @@ sub finalizeawards { } sub decideoutput { - my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_; + my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect,$tdclass)=@_; my $message=''; my $button=0; @@ -1117,6 +1147,13 @@ sub decideoutput { } $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).'); + if ($target ne 'tex') { + $message .= &Apache::loncommon::help_open_topic('Wrong_Num_Boxes_Checked'); + } + $css_class=$possible_class{'not_charged_try'}; + $button = 1; } elsif ($award eq 'ERROR') { $message = &mt('An error occurred while grading your answer.'); $css_class=$possible_class{'not_charged_try'}; @@ -1137,7 +1174,7 @@ sub decideoutput { $css_class=$possible_class{'not_charged_try'}; $button=1; } elsif ($award eq 'EXCESS_FILESIZE') { - $message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); + $message = &mt("Submission won't be graded. The combined size of submitted files exceeded the amount allowed."); $css_class=$possible_class{'not_charged_try'}; $button=1; } elsif ($award eq 'FILENAME_INUSE') { @@ -1488,7 +1525,8 @@ sub setgradedata { $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; $Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate"); $Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries"); - $Apache::lonhomework::results{"resourse.$id.version"} = &Apache::lonnet::usedversion(); + $Apache::lonhomework::results{"resource.$id.version"} = &Apache::lonnet::usedversion(); + $Apache::lonhomework::results{"resource.$id.maxtries"} = &Apache::lonnet::EXT("resource.$id.maxtries"); } sub find_which_previous { @@ -1568,7 +1606,7 @@ sub grade { } sub get_grade_messages { - my ($id,$prefix,$target,$status,$nocorrect) = @_; + my ($id,$prefix,$target,$status,$nocorrect,$tdclass) = @_; # nocorrect suppresses "Computer's answer now shown above" my ($message,$latemessage,$trystr,$previousmsg); my $showbutton = 1; @@ -1583,13 +1621,13 @@ sub get_grade_messages { &Apache::lonxml::debug('Getting message'); ($showbutton,my $css_class,$message,$previousmsg) = &decideoutput($award,$awarded,$awardmsg,$solved,$previous, - $target,(($status eq 'CAN_ANSWER') || $nocorrect)); + $target,(($status eq 'CAN_ANSWER') || $nocorrect),$tdclass); if ($target eq 'tex') { $message='\vskip 2 mm '.$message.' '; } else { - $message="
'.$button.' | '.$output; if (!$no_previous) { - $output.=''.&previous_tries($id,$target).' | '; + $output.=''.&previous_tries($id,$target).' | '; } $output.= '