From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 14 May 2014 13:54:28 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~106
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3be2cc2bab8bbde89a4dc72afcc0346171b1b763;hp=7854df75afedb76acc75692956a5c7b65da64ee0;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 6297ec9c..8fe408fe 100755
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -242,6 +242,10 @@ var tmpSchedulerLeases = [];
                 }
             },
 
+            on_lease_filter_added: function(filter) {
+                console.log("Filter on Leases added !");
+            },
+
             // ... be sure to list all events here
 
             /* RECORD HANDLERS */
@@ -284,6 +288,21 @@ var tmpSchedulerLeases = [];
                         $('#tblSlider').slider('value', 0);
                         var tmpScope = angular.element(document.getElementById('SchedulerCtrl')).scope();
                         tmpScope.initSchedulerResources(schedulerMaxRows < SchedulerDataViewData.length ? schedulerMaxRows : SchedulerDataViewData.length);
+
+                        console.log(SchedulerDateSelected);
+                        console.log(SchedulerDateSelected.getTime()/1000);
+                        var tomorrow = new Date(SchedulerDateSelected);
+                        tomorrow.setDate(SchedulerDateSelected.getDate()+1);
+                        console.log(tomorrow);
+                        console.log(tomorrow.getTime()/1000);
+                        
+                        // Remove previous date interval
+                        manifold.raise_event(scheduler2Instance.options.query_lease_uuid, FILTER_REMOVED, ['start_time', '>']);
+                        manifold.raise_event(scheduler2Instance.options.query_lease_uuid, FILTER_REMOVED, ['start_time', '<']);
+
+                        // Add new date interval
+                        manifold.raise_event(scheduler2Instance.options.query_lease_uuid, FILTER_ADDED, ['start_time', '>', SchedulerDateSelected.getTime()/1000]);
+                        manifold.raise_event(scheduler2Instance.options.query_lease_uuid, FILTER_ADDED, ['start_time', '<', tomorrow.getTime()/1000]);
                     } else {
                         alert("Please select a date, so the scheduler can reserve leases.");
                     }