From: Jordan Augé <jordan.auge@lip6.fr>
Date: Wed, 23 Jul 2014 11:54:40 +0000 (+0200)
Subject: updated scheduler
X-Git-Tag: myslice-1.0~49^2~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=ebf8430d850f17659c922d84e94d234aa7391bac;p=myslice.git

updated scheduler
---

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 98902517..56d43992 100755
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -234,13 +234,13 @@ var SCHEDULER_COLWIDTH = 50;
         {
             var data, resource_granularity;
 
-            resource_granularity = model_resource.granularity === undefined ? RESOURCE_DEFAULT_GRANULARITY : model_resource.granularity;
+            //resource_granularity = model_resource.granularity === undefined ? RESOURCE_DEFAULT_GRANULARITY : model_resource.granularity;
 
             console.log("Selected", index, model_lease, model_resource);
 
             var day_timestamp = SchedulerDateSelected.getTime() / 1000;
-            var start_time = day_timestamp + index       * resource_granularity;
-            var end_time   = day_timestamp + (index + 1) * resource_granularity;
+            var start_time = day_timestamp + index       * model_resource.granularity; // XXX resource_granularity
+            var end_time   = day_timestamp + (index + 1) * model_resource.granularity; //
             var start_date = new Date(start_time * 1000);
             var end_date   = new Date(end_time   * 1000);
 
@@ -578,7 +578,9 @@ var SCHEDULER_COLWIDTH = 50;
                     var resource = jQuery.extend(true, {}, record);
 
                     // Fix granularity
-                    resource_granularity = ((resource.granularity === undefined) || (typeof(resource.granularity) != "number")) ? RESOURCE_DEFAULT_GRANULARITY : resource.granularity;
+                    //resource_granularity = ((resource.granularity === undefined) || (typeof(resource.granularity) != "number")) ? RESOURCE_DEFAULT_GRANULARITY : resource.granularity;
+                    if (typeof(resource.granularity) != "number")
+                        resource.granularity = RESOURCE_DEFAULT_GRANULARITY;
                     resource.leases = []; // a list of occupied timeslots
 
                     self.scope_resources_by_key[resource['urn']] = resource;