--- loncom/interface/lonnavmaps.pm 2005/10/01 06:21:12 1.342
+++ loncom/interface/lonnavmaps.pm 2005/10/30 02:31:01 1.345
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.342 2005/10/01 06:21:12 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.345 2005/10/30 02:31:01 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1158,7 +1158,7 @@ sub render_resource {
# Is this the current resource?
if (!$params->{'displayedHereMarker'} &&
$resource->symb() eq $params->{'here'} ) {
- $curMarkerBegin = '> ';
+ $curMarkerBegin = '>';
$curMarkerEnd = '<';
$params->{'displayedHereMarker'} = 1;
}
@@ -1847,10 +1847,6 @@ END
$args->{'multipart'} = $curRes->multipart();
if ($condenseParts) { # do the condensation
- if (!$curRes->opendate("0")) {
- @parts = ();
- $args->{'condensed'} = 1;
- }
if (!$args->{'condensed'}) {
# Decide whether to condense based on similarity
my $status = $curRes->status($parts[0]);
@@ -4582,6 +4578,13 @@ sub status {
return CORRECT;
}
+ # If it's WRONG... and not open
+ if ( ($completionStatus == INCORRECT ||
+ $completionStatus == INCORRECT_BY_OVERRIDE)
+ && (!$self->opendate($part) || $self->opendate($part) > time()) ) {
+ return INCORRECT;
+ }
+
if ($completionStatus == ATTEMPTED) {
return ATTEMPTED;
}