--- loncom/homework/inputtags.pm 2003/04/08 02:37:58 1.89
+++ loncom/homework/inputtags.pm 2003/04/19 09:00:54 1.92
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.89 2003/04/08 02:37:58 albertel Exp $
+# $Id: inputtags.pm,v 1.92 2003/04/19 09:00:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -252,6 +252,9 @@ sub finalizeawards {
foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }
}
if ($result eq '' ) {
+ foreach $award (@_) { if ($award eq 'ASSIGNED_SCORE') {$result=$award; last;} }
+ }
+ if ($result eq '' ) {
foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }
}
if ($result eq '' ) { $result='EXACT_ANS'; }
@@ -267,76 +270,85 @@ sub decideoutput {
if ($previous) { $previousmsg='You have entered that answer before'; }
if ($solved =~ /^correct/) {
- if ($target eq 'tex') {
- $message = '\textbf{You are correct}. Your receipt is '.
- &Apache::lonnet::receipt;
- } else {
- $message = "You are correct. Your receipt is ".
- &Apache::lonnet::receipt;
- }
- $button=0;
- $previousmsg='';
+ if ($award eq 'ASSIGNED_SCORE') {
+ $message = "A score has been assigned.";
+ } else {
+ if ($target eq 'tex') {
+ $message = '\textbf{You are correct}.';
+ } else {
+ $message = "You are correct.";
+ }
+ $message=' Your receipt is '.&Apache::lonnet::receipt;
+ }
+ $button=0;
+ $previousmsg='';
} elsif ($solved =~ /^excused/) {
- $message = "You are excused from the problem.";
- $button=0;
- $previousmsg='';
- } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
- if ($solved =~ /^incorrect/ || $solved eq '') {
- $message = "Incorrect";
- $button=1;
- } else {
- $message = "You are correct. Your receipt is ".
- &Apache::lonnet::receipt;
+ $message = "You are excused from the problem.";
$button=0;
$previousmsg='';
- }
+ } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
+ if ($solved =~ /^incorrect/ || $solved eq '') {
+ $message = "Incorrect";
+ $button=1;
+ } else {
+ $message = "You are correct. Your receipt is ".
+ &Apache::lonnet::receipt;
+ $button=0;
+ $previousmsg='';
+ }
} elsif ($award eq 'NO_RESPONSE') {
- $message = '';
- $button=1;
+ $message = '';
+ $button=1;
} elsif ($award eq 'MISSING_ANSWER') {
- $message = 'Some parts were not submitted';
- $button = 1;
+ $message = 'Some parts were not submitted';
+ $button = 1;
} elsif ($award eq 'WANTED_NUMERIC') {
- $message = "This question expects a numeric answer";
- $button=1;
+ $message = "This question expects a numeric answer";
+ $button=1;
} elsif ($award eq 'MISORDERED_RANK') {
- $message = 'You have provided an invalid ranking, please refer to '.
- &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
- $button=1;
+ $message = 'You have provided an invalid ranking, please refer to '.
+ &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+ $button=1;
} elsif ($award eq 'INVALID_FILETYPE') {
- $message = 'The filetype extension of the file you uploaded is not allowed.';
- $button=1;
+ $message = 'The filetype extension of the file you uploaded is not allowed.';
+ $button=1;
} elsif ($award eq 'SIG_FAIL') {
- $message = "Please adjust significant figures.";# you provided %s significant figures";
- $button=1;
+ $message = "Please adjust significant figures.";# you provided %s significant figures";
+ $button=1;
} elsif ($award eq 'UNIT_FAIL') {
- $message = "Units incorrect. ".
+ $message = "Units incorrect. ".
&Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";
- $button=1;
+ $button=1;
} elsif ($award eq 'UNIT_NOTNEEDED') {
- $message = "Only a number required.";# Computer reads units of %s";
- $button=1;
+ $message = "Only a number required.";# Computer reads units of %s";
+ $button=1;
} elsif ($award eq 'NO_UNIT') {
- $message = "Units required".
+ $message = "Units required".
&Apache::loncommon::help_open_topic('Physical_Units');
- $button=1;
+ $button=1;
} elsif ($award eq 'BAD_FORMULA') {
- $message = "Unable to understand formula";
- $button=1;
+ $message = "Unable to understand formula";
+ $button=1;
} elsif ($award eq 'INCORRECT') {
- $message = "Incorrect";
- $button=1;
+ $message = "Incorrect";
+ $button=1;
} elsif ($award eq 'SUBMITTED') {
- $message = "Your submission has been recorded.";
- $button=1;
+ $message = "Your submission has been recorded.";
+ $button=1;
} elsif ($award eq 'DRAFT') {
- $message = "A draft copy has been saved.";
- $button=1;
+ $message = "A draft copy has been saved.";
+ $button=1;
+ } elsif ($award eq 'ASSIGNED_SCORE') {
+ $message = "A score has been assigned.";
+ $button=0;
} else {
- $message = "Unknown message: $award";
- $button=1;
+ $message = "Unknown message: $award";
+ $button=1;
+ }
+ if (lc($Apache::lonhomework::problemstatus) ne 'yes') {
+ $message = "Answer Submitted";
+ $button=1;
}
- if ($Apache::lonhomework::type eq 'exam') {$message='';$previousmsg='';}
return ($button,$message,$previousmsg);
}
@@ -363,7 +375,19 @@ sub setgradedata {
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
$Apache::lonhomework::results{"resource.$id.afterduedate"}='';
}
- if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
+ if ( $award eq 'ASSIGNED_SCORE') {
+ $Apache::lonhomework::results{"resource.$id.tries"} =
+ $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+ $Apache::lonhomework::results{"resource.$id.solved"} =
+ 'correct_by_student';
+ my $numawards=scalar(@Apache::inputtags::response);
+ $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
+ foreach my $res (@Apache::inputtags::response) {
+ $Apache::lonhomework::results{"resource.$id.awarded"}+=
+ $Apache::lonhomework::results{"resource.$id.$res.awarded"};
+ }
+ $Apache::lonhomework::results{"resource.$id.awarded"}/=$numawards;
+ } elsif ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
$Apache::lonhomework::results{"resource.$id.tries"} =
$Apache::lonhomework::history{"resource.$id.tries"} + 1;
$Apache::lonhomework::results{"resource.$id.solved"} =