--- loncom/homework/inputtags.pm 2003/11/25 23:04:58 1.124
+++ loncom/homework/inputtags.pm 2004/02/24 23:22:24 1.132
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.124 2003/11/25 23:04:58 www Exp $
+# $Id: inputtags.pm,v 1.132 2004/02/24 23:22:24 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -24,8 +24,6 @@
# /home/httpd/html/adm/gpl.txt
#
# http://www.lon-capa.org/
-#
-# 2/19 Guy
package Apache::inputtags;
use HTML::Entities();
@@ -371,7 +369,7 @@ sub decideoutput {
$ENV{'request.course.id'}.
'.disable_receipt_display'} eq 'yes') {
$message.=(($target eq 'web')?'
':' ').
- &mt('Your receipt is').' '.&Apache::lonnet::receipt().
+ &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
}
}
@@ -398,7 +396,7 @@ sub decideoutput {
$ENV{'request.course.id'}.
'.disable_receipt_display'} eq 'yes') {
$message.=(($target eq 'web')?'
':' ').
- 'Your receipt is '.&Apache::lonnet::receipt().
+ 'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
}
$bgcolor=$possiblecolors{'correct'};
@@ -480,7 +478,7 @@ sub decideoutput {
}
if (lc($Apache::lonhomework::problemstatus) eq 'no' &&
$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
- $message = &mt("Answer Submitted");
+ $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
$bgcolor=$possiblecolors{'correct'};
$button=1;
}
@@ -500,7 +498,8 @@ sub removealldata {
sub setgradedata {
my ($award,$id,$previously_used) = @_;
# if the student already has it correct, don't modify the status
- if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+ if (!$Apache::lonhomework::scantronmode &&
+ $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
return '';
@@ -567,21 +566,28 @@ sub setgradedata {
}
}
- # check if this was a previous submission if it was delete the
- # unneeded data and update the previously_used attribute
- if ( $previously_used eq 'PREVIOUSLY_USED') {
- if (lc($Apache::lonhomework::problemstatus) ne 'no') {
- delete($Apache::lonhomework::results{"resource.$id.tries"});
- $Apache::lonhomework::results{"resource.$id.previous"} = '1';
- }
- } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
- #delete all data as they student didn't do anything, but save
- #the list of collaborators.
- &removealldata($id);
- #and since they didn't do anything we were never here
- return '';
- } else {
- $Apache::lonhomework::results{"resource.$id.previous"} = '0';
+ # did either of the overall awards chage? If so ignore the
+ # previous check
+ if (($Apache::lonhomework::results{"resource.$id.awarded"} eq
+ $Apache::lonhomework::history{"resource.$id.awarded"}) &&
+ ($Apache::lonhomework::results{"resource.$id.solved"} eq
+ $Apache::lonhomework::history{"resource.$id.solved"})) {
+ # check if this was a previous submission if it was delete the
+ # unneeded data and update the previously_used attribute
+ if ( $previously_used eq 'PREVIOUSLY_USED') {
+ if (lc($Apache::lonhomework::problemstatus) ne 'no') {
+ delete($Apache::lonhomework::results{"resource.$id.tries"});
+ $Apache::lonhomework::results{"resource.$id.previous"} = '1';
+ }
+ } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
+ #delete all data as they student didn't do anything, but save
+ #the list of collaborators.
+ &removealldata($id);
+ #and since they didn't do anything we were never here
+ return '';
+ } else {
+ $Apache::lonhomework::results{"resource.$id.previous"} = '0';
+ }
}
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~
/^correct/ ) {
@@ -655,7 +661,7 @@ sub gradestatus {
($showbutton,$bgcolor,$message,$previousmsg) =
&decideoutput($award,$solved,$previous,$target);
if ($target eq 'tex') {
- $message=' '.$message.' ';
+ $message='\vskip 2 mm '.$message.' ';
} else {
$message="
'.$button.' | '.$output.'