--- loncom/homework/inputtags.pm 2002/01/30 17:32:42 1.52 +++ loncom/homework/inputtags.pm 2002/03/01 00:23:04 1.53 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.52 2002/01/30 17:32:42 albertel Exp $ +# $Id: inputtags.pm,v 1.53 2002/03/01 00:23:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -292,9 +292,15 @@ sub decideoutput { sub setgradedata { my ($award,$id,$previously_used) = @_; # if the student already has it correct, don't modify the status - if ( $Apache::lonhomework::history{"resource.$id.solved"} !~ + if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') { + $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; + return ''; + } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ /^correct/ ) { #handle assignment of tries and solved status + if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { + $Apache::lonhomework::results{"resource.$id.afterduedate"}=''; + } if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { $Apache::lonhomework::results{"resource.$id.tries"} = $Apache::lonhomework::history{"resource.$id.tries"} + 1; @@ -377,6 +383,7 @@ sub gradestatus { my ($id) = @_; my $showbutton = 1; my $message = ''; + my $latemessage = ''; my $trystr=''; my $button=''; my $previousmsg=''; @@ -410,12 +417,16 @@ sub gradestatus { if ( $showbutton ) { $button = '
'; } + if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { + #last submissions was after due date + $latemessage="The last submission was after the Due Date"; + } } - my $output= $previousmsg.$message.$trystr; + my $output= $previousmsg.$latemessage.$message.$trystr; if ($output =~ /^\s*$/) { return $button; } else { - return $button.''.$previousmsg.$message.$trystr.'
'; + return $button.''.$output.'
'; } } 1;