updated scheduler
authorJordan Augé <jordan.auge@lip6.fr>
Thu, 10 Jul 2014 21:05:26 +0000 (23:05 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Thu, 10 Jul 2014 21:05:26 +0000 (23:05 +0200)
plugins/scheduler2/static/js/scheduler2.js

index 0b5339f..59ef6e6 100755 (executable)
@@ -605,10 +605,13 @@ var SCHEDULER_COLWIDTH = 50;
                     var day_timestamp = SchedulerDateSelected.getTime() / 1000;\r
 \r
                     var id_start = (lease.start_time - day_timestamp) / resource.granularity;\r
-                    if (id_start < 0) {\r
-                        /* Some leases might be in the past */\r
+\r
+                    /* Some leases might be in the past */\r
+                    if (id_start < 0)\r
                         id_start = 0;\r
-                    }\r
+                    /* Leases in the future: ignore */\r
+                    if (id_start >= self._all_slots.length)\r
+                        return true; // ~ continue\r
     \r
                     var id_end   = (lease.end_time   - day_timestamp) / resource.granularity - 1;\r
                     var colspan_lease = resource.granularity / self._granularity; //eg. 3600 / 1800 => 2 cells\r