Chrysostomos for scheduler

[myslice.git] / plugins / scheduler2 / static / js / scheduler2.js

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index f57774e..7c4a9c7 100755 (executable)
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -34,7 +34,7 @@ var schedulerTblId = "scheduler-reservation-table";
 var schedulerTblFirstColWidth = 150;\r
 //Some Data\r
 var schedulerSlotsPerHour = 6;\r
-var schedulerMaxRows = 25;\r
+var schedulerMaxRows = 12;\r
 var SchedulerData = [];\r
 var SchedulerSlots = [];\r
 var SchedulerDataViewData = [];\r
@@ -121,7 +121,7 @@ var tmpSchedulerLeases = [];
         },\r
         on_all_resources_new_record: function (data) {\r
             //alert(data.toSource());\r
-            if (SchedulerData.length < schedulerMaxRows)\r
+            if (data.exclusive == null)\r
                 SchedulerData.push({ id: data.urn, index: SchedulerData.length, name: data.hrn, granularity: data.granularity, leases: schedulerGetLeases(60 / schedulerSlotsPerHour), type: data.type });\r
             //alert(data.toSource());\r
 \r
@@ -165,7 +165,7 @@ var tmpSchedulerLeases = [];
         // no prefix\r
         on_filter_added: function (filter) {\r
             var tmpScope = angular.element(document.getElementById('SchedulerCtrl')).scope();\r
-            tmpScope.SetSchedulerResources(0, schedulerMaxRows, filter);\r
+            tmpScope.initSchedulerResources(schedulerMaxRows, filter);\r
         },\r
 \r
         // ... be sure to list all events here\r
@@ -218,10 +218,11 @@ var tmpSchedulerLeases = [];
                 slide: function (event, ui) {\r
                     //$("#amount").val("$" + ui.values[0] + " - $" + ui.values[1]);\r
                     //console.log(ui.value);\r
+                    var angScope = angular.element(document.getElementById('SchedulerCtrl')).scope();\r
                     if (_schedulerCurrentCellPosition > ui.value)\r
-                        angular.element(document.getElementById('SchedulerCtrl')).scope().moveBackSlot(ui.value, ui.value + SchedulerTotalVisibleCells);\r
+                        angScope.moveBackSlot(ui.value, ui.value + SchedulerTotalVisibleCells);\r
                     else if (_schedulerCurrentCellPosition < ui.value)\r
-                        angular.element(document.getElementById('SchedulerCtrl')).scope().moveFrontSlot(ui.value, ui.value + SchedulerTotalVisibleCells);\r
+                        angScope.moveFrontSlot(ui.value, ui.value + SchedulerTotalVisibleCells);\r
                     _schedulerCurrentCellPosition = ui.value;\r
                 }\r
             });\r
@@ -262,7 +263,7 @@ var tmpSchedulerLeases = [];
             //    SchedulerData.push({ name: 'nitos1', leases: schedulerGetLeases(60 / schedulerSlotsPerHour), urn: 'nitos1', type: 'node' });\r
             //}\r
             var tmpScope = angular.element(document.getElementById('SchedulerCtrl')).scope();\r
-            tmpScope.SetSchedulerResources(0, schedulerMaxRows, null);\r
+            tmpScope.initSchedulerResources(schedulerMaxRows, null);\r
         },\r
         _SetPeriodInPage: function (start, end) {\r
         }\r