--- loncom/interface/lonnavmaps.pm 2011/11/29 11:58:53 1.470
+++ loncom/interface/lonnavmaps.pm 2011/12/18 17:15:03 1.472
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.470 2011/11/29 11:58:53 foxr Exp $
+# $Id: lonnavmaps.pm,v 1.472 2011/12/18 17:15:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
@@ -1013,8 +1013,8 @@ sub render_resource {
# Is this the current resource?
if (!$params->{'displayedHereMarker'} &&
$resource->symb() eq $params->{'here'} ) {
- $curMarkerBegin = '';
- $curMarkerEnd = '';
+ $curMarkerBegin = '';
+ $curMarkerEnd = '';
$params->{'displayedHereMarker'} = 1;
}
@@ -5118,6 +5118,7 @@ sub check_for_slot {
my $ip = $slots{$slot_name}->{'ip'};
if ($self->simpleStatus() == OPEN) {
my $startreserve = $slots{$slot_name}->{'startreserve'};
+ my $endreserve = $slots{$slot_name}->{'endreserve'};
my @proctors;
if ($slots{$slot_name}->{'proctor'} ne '') {
@proctors = split(',',$slots{$slot_name}->{'proctor'});
@@ -5143,7 +5144,9 @@ sub check_for_slot {
}
} else {
if ($start > $now) {
- return (RESERVABLE,$startreserve,$slot_name);
+ if (!$endreserve || $endreserve > $now) {
+ return (RESERVABLE,$startreserve,$slot_name);
+ }
}
}
}