version 1.234, 2008/09/20 00:25:39
|
version 1.236, 2009/01/15 18:31:23
|
Line 608 sub end_numericalresponse {
|
Line 608 sub end_numericalresponse {
|
} |
} |
if (($target eq 'web') && ($tag eq 'formularesponse') |
if (($target eq 'web') && ($tag eq 'formularesponse') |
&& ($Apache::lonhomework::type ne 'exam') && ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') |
&& ($Apache::lonhomework::type ne 'exam') && ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') |
&& (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoneditor') ne 'no')){ |
&& (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) { |
$result.=&Apache::response::edit_mathresponse_button($id,"HWVAL_$id"); |
$result.=&Apache::response::edit_mathresponse_button($id,"HWVAL_$id"); |
} |
} |
|
|
&Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical); |
&Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical); |
Line 752 sub end_numericalresponse {
|
Line 752 sub end_numericalresponse {
|
if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') { |
if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') { |
my $error; |
my $error; |
if ($tag eq 'formularesponse') { |
if ($tag eq 'formularesponse') { |
$error=&mt('Computer\'s answer is incorrect ("[_1]").',join(', ',@$response)); |
$error=&mt("Computer's answer is incorrect ([_1]).",'"'.join(', ',@$response).'"'); |
} else { |
} else { |
# answer failed check if it is sig figs that is failing |
# answer failed check if it is sig figs that is failing |
my ($ad,$msg)=&check_submission($response,$partid,$id, |
my ($ad,$msg)=&check_submission($response,$partid,$id, |
$tag,$parstack, |
$tag,$parstack, |
$safeeval,1); |
$safeeval,1); |
|
$error=&mt("Computer's answer is incorrect ([_1]).",'"'.join(', ',@$response).'"').' '; |
if ($sigline ne '') { |
if ($sigline ne '') { |
$error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] or significant figures [_3] need to be adjusted.',join(', ',@$response),$tolline,$sigline); |
$error.=&mt('It is likely that the tolerance range [_1] or significant figures [_2] need to be adjusted.',$tolline,$sigline); |
} else { |
} else { |
$error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] needs to be adjusted.',join(', ',@$response),$tolline); |
$error.=&mt('It is likely that the tolerance range [_1] needs to be adjusted.',$tolline); |
} |
} |
} |
} |
if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') { |
if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') { |