--- loncom/interface/lonnavmaps.pm 2004/07/26 22:28:24 1.267.2.2 +++ loncom/interface/lonnavmaps.pm 2004/09/13 20:09:33 1.267.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.267.2.2 2004/07/26 22:28:24 albertel Exp $ +# $Id: lonnavmaps.pm,v 1.267.2.4 2004/09/13 20:09:33 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -513,7 +513,7 @@ sub timeToHumanString { } # Not this year, so show the year - my $timeStr = strftime("on %A, %b %e %G at %I:%M %P", localtime($time)); + my $timeStr = strftime("on %A, %b %e %Y at %I:%M %P", localtime($time)); $timeStr =~ s/12:00 am/00:00/; $timeStr =~ s/12:00 pm/noon/; return $timeStr; @@ -3982,6 +3982,7 @@ sub getCompletionStatus { # Left as separate if statements in case we ever do more with this if ($status eq 'correct_by_student') {return $self->CORRECT;} + if ($status eq 'correct_by_scantron') {return $self->CORRECT;} if ($status eq 'correct_by_override') {return $self->CORRECT_BY_OVERRIDE; } if ($status eq 'incorrect_attempted') {return $self->INCORRECT; } if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }