From: Chrysostomos Kolovos Date: Tue, 20 May 2014 10:25:06 +0000 (+0300) Subject: Chrysostomos for scheduler X-Git-Tag: myslice-1.1~98 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=9e791eb325d63dbc5213d1fe9c67f76474fffed1 Chrysostomos for scheduler --- diff --git a/plugins/scheduler2/static/js/scheduler-helpers.js b/plugins/scheduler2/static/js/scheduler-helpers.js index 383cf1cf..1daeee00 100755 --- a/plugins/scheduler2/static/js/scheduler-helpers.js +++ b/plugins/scheduler2/static/js/scheduler-helpers.js @@ -195,7 +195,7 @@ function schedulerCompareOnDay(dateOne, dateTwo) { } else if (dateOne > dateTwo) { return -1; } else { - return 0; + return 1; } } diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js index 27300e33..10eaa9a8 100755 --- a/plugins/scheduler2/static/js/scheduler2.js +++ b/plugins/scheduler2/static/js/scheduler2.js @@ -289,12 +289,12 @@ var tmpSchedulerLeases = []; var tmpScope = angular.element(document.getElementById('SchedulerCtrl')).scope(); tmpScope.initSchedulerResources(schedulerMaxRows < SchedulerDataViewData.length ? schedulerMaxRows : SchedulerDataViewData.length); - console.log(SchedulerDateSelected); - console.log(SchedulerDateSelected.getTime()/1000); + //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); + //console.log(tomorrow); + //console.log(tomorrow.getTime()/1000); // Remove previous date interval manifold.raise_event(scheduler2Instance.options.query_all_leases_uuid, FILTER_REMOVED, ['start_time', '>']);