version 1.149.2.1, 2004/11/06 01:15:59
|
version 1.154, 2004/11/06 01:11:38
|
Line 317 sub finalizeawards {
|
Line 317 sub finalizeawards {
|
'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', |
'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
'APPROX_ANS', 'EXACT_ANS') { |
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { |
($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref); |
($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref); |
if (defined($result)) { return ($result,$msg); } |
if (defined($result)) { return ($result,$msg); } |
} |
} |
Line 347 sub decideoutput {
|
Line 347 sub decideoutput {
|
$message = '\textbf{'.&mt('You are correct.').'}'; |
$message = '\textbf{'.&mt('You are correct.').'}'; |
} else { |
} else { |
$message = "<b>".&mt('You are correct.')."</b>"; |
$message = "<b>".&mt('You are correct.')."</b>"; |
|
$message.=" ".&mt("Computer's answer now shown above."); |
} |
} |
$message.=" ".&mt("Computer's answer now shown above."); |
|
$added_computer_text=1; |
$added_computer_text=1; |
unless ($ENV{'course.'. |
unless ($ENV{'course.'. |
$ENV{'request.course.id'}. |
$ENV{'request.course.id'}. |
Line 380 sub decideoutput {
|
Line 380 sub decideoutput {
|
$message = '\textbf{'.&mt('You are correct.').'}'; |
$message = '\textbf{'.&mt('You are correct.').'}'; |
} else { |
} else { |
$message = "<b>".&mt('You are correct.')."</b>"; |
$message = "<b>".&mt('You are correct.')."</b>"; |
|
$message.=" ".&mt("Computer's answer now shown above."); |
} |
} |
$message.=" ".&mt("Computer's answer now shown above."); |
|
$added_computer_text=1; |
$added_computer_text=1; |
unless ($ENV{'course.'. |
unless ($ENV{'course.'. |
$ENV{'request.course.id'}. |
$ENV{'request.course.id'}. |
Line 439 sub decideoutput {
|
Line 439 sub decideoutput {
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_INVALID_STUDENT') { |
} elsif ($award eq 'UNIT_INVALID_STUDENT') { |
$message = &mt('Unable to interpret units. Computer reads units as "[_1]"','<tt>'.$awardmsg.'</tt>.'); |
$message = &mt('Unable to interpret units. Computer reads units as "[_1]".','<tt>'.$awardmsg.'</tt>'); |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') { |
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') { |
$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units ','<tt>'.$awardmsg.'</tt>.'); |
$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.','<tt>'.$awardmsg.'</tt>'); |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_NOTNEEDED') { |
} elsif ($award eq 'UNIT_NOTNEEDED') { |
$message = &mt('Only a number required. Computer reads units of "[_1]"','<tt>'.$awardmsg.'</tt>.'); |
$message = &mt('Only a number required. Computer reads units of "[_1]".','<tt>'.$awardmsg.'</tt>'); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'NO_UNIT') { |
} elsif ($award eq 'NO_UNIT') { |
Line 457 sub decideoutput {
|
Line 457 sub decideoutput {
|
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'COMMA_FAIL') { |
|
$message = &mt("Proper comma separation is required").'.'; |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
|
$button=1; |
} elsif ($award eq 'BAD_FORMULA') { |
} elsif ($award eq 'BAD_FORMULA') { |
$message = &mt("Unable to understand formula"); |
$message = &mt("Unable to understand formula"); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
Line 491 sub decideoutput {
|
Line 495 sub decideoutput {
|
$button=1; |
$button=1; |
} |
} |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
!$added_computer_text) { |
!$added_computer_text && $target ne 'tex') { |
$message.=" ".&mt("Computer's answer now shown above."); |
$message.=" ".&mt("Computer's answer now shown above."); |
$added_computer_text=1; |
$added_computer_text=1; |
} |
} |
Line 578 sub setgradedata {
|
Line 582 sub setgradedata {
|
} elsif ( $award eq 'INCORRECT' ) { |
} elsif ( $award eq 'INCORRECT' ) { |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
if (lc($Apache::lonhomework::problemstatus) eq 'no') { |
if (lc($Apache::lonhomework::problemstatus) eq 'no' || |
|
$Apache::lonhomework::scantronmode) { |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
} |
} |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
Line 597 sub setgradedata {
|
Line 602 sub setgradedata {
|
} else { |
} else { |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'incorrect_attempted'; |
'incorrect_attempted'; |
if (lc($Apache::lonhomework::problemstatus) eq 'no') { |
if (lc($Apache::lonhomework::problemstatus) eq 'no' || |
|
$Apache::lonhomework::scantronmode) { |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |