[LON-CAPA-cvs] cvs: loncom(version_2_1_X) /interface slotrequest.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 21 Mar 2006 16:05:59 -0000
albertel Tue Mar 21 11:05:59 2006 EDT
Modified files: (Branch: version_2_1_X)
/loncom/interface slotrequest.pm
Log:
- backport 1.53
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.48 loncom/interface/slotrequest.pm:1.48.2.1
--- loncom/interface/slotrequest.pm:1.48 Sun Feb 26 14:40:14 2006
+++ loncom/interface/slotrequest.pm Tue Mar 21 11:05:57 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for requesting to have slots added to a students record
#
-# $Id: slotrequest.pm,v 1.48 2006/02/26 19:40:14 albertel Exp $
+# $Id: slotrequest.pm,v 1.48.2.1 2006/03/21 16:05:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -551,6 +551,12 @@
&& $slot->{'symb'} ne $symb) {
return 0;
}
+ # reserve time not yet started
+ if ($slot->{'startreserve'} > time) {
+ return 0;
+ }
+ &Apache::lonxml::debug("$slot_name reserve good");
+
my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots,
$consumed_uniqueperiods);
if ($conflict) {