--- loncom/interface/lonnavmaps.pm 2003/09/24 15:58:06 1.234 +++ loncom/interface/lonnavmaps.pm 2003/10/04 18:13:36 1.237 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.234 2003/09/24 15:58:06 matthew Exp $ +# $Id: lonnavmaps.pm,v 1.237 2003/10/04 18:13:36 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -127,7 +127,6 @@ sub real_handler { # Create the nav map my $navmap = Apache::lonnavmaps::navmap->new(); - if (!defined($navmap)) { my $requrl = $r->uri; $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized"; @@ -433,7 +432,7 @@ sub timeToHumanString { return &mt('never'); } unless (&Apache::lonlocal::current_language()=~/^en/) { - return localtime($time); + return &Apache::lonlocal::locallocaltime($time); } my $now = time(); @@ -3369,7 +3368,7 @@ sub opendate { } sub problemstatus { (my $self, my $part) = @_; - return $self->parmval("problemstatus", $part); + return lc $self->parmval("problemstatus", $part); } sub sig { (my $self, my $part) = @_; @@ -3547,7 +3546,11 @@ sub responseType { my $part = shift; $self->extractParts(); - return @{$self->{RESPONSE_TYPES}->{$part}}; + if (defined($self->{RESPONSE_TYPES}->{$part})) { + return @{$self->{RESPONSE_TYPES}->{$part}}; + } else { + return undef; + } } sub responseIds { @@ -3555,7 +3558,11 @@ sub responseIds { my $part = shift; $self->extractParts(); - return @{$self->{RESPONSE_IDS}->{$part}}; + if (defined($self->{RESPONSE_IDS}->{$part})) { + return @{$self->{RESPONSE_IDS}->{$part}}; + } else { + return undef; + } } # Private function: Extracts the parts information, both part names and @@ -3947,7 +3954,12 @@ sub status { #if ($self->{RESOURCE_ERROR}) { return NETWORK_FAILURE; } if ($completionStatus == NETWORK_FAILURE) { return NETWORK_FAILURE; } - my $suppressFeedback = lc($self->parmval("problemstatus", $part)) eq 'no'; + my $suppressFeedback = $self->problemstatus($part) eq 'no'; + # If there's an answer date and we're past it, don't + # suppress the feedback; student should know + if ($self->answerdate($part) && $self->answerdate($part) < time()) { + $suppressFeedback = 0; + } # There are a few whole rows we can dispose of: if ($completionStatus == CORRECT ||