Chrysostomos for scheduler

diff --git a/plugins/scheduler2/static/js/scheduler-SchedulerCtrl.js b/plugins/scheduler2/static/js/scheduler-SchedulerCtrl.js
index 5105144..90288ab 100755 (executable)
--- a/plugins/scheduler2/static/js/scheduler-SchedulerCtrl.js
+++ b/plugins/scheduler2/static/js/scheduler-SchedulerCtrl.js
@@ -54,8 +54,7 @@ myApp.factory('$exceptionHandler', function () {
             $scope.resources = new Array();\r
 \r
             for (var k = 0; k < pageSize; k++) {\r
-                if ($scope.resources.length < SchedulerDataViewData.length)\r
-                    $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));\r
+                $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));\r
                 $scope.resources[k].leases = [];\r
             }\r
             $scope.pageSize = pageSize;\r
@@ -67,12 +66,12 @@ myApp.factory('$exceptionHandler', function () {
         $scope.setPage = function(page) {\r
             var tmpFrm = $scope.pageSize * page;\r
             var tmpTo = tmpFrm + $scope.pageSize;\r
+            tmpTo = SchedulerDataViewData.length < tmpTo ? SchedulerDataViewData.length : tmpTo;\r
             $scope.curPage = page;\r
             $scope.resources = [];\r
             var j = 0;\r
             for (var k = tmpFrm; k < tmpTo; k++) {\r
-                if ($scope.resources.length < SchedulerDataViewData.length)\r
-                    $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));\r
+                $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));\r
                 $scope.resources[j].leases = [];\r
                 j++;\r
             }\r
@@ -134,7 +133,7 @@ myApp.factory('$exceptionHandler', function () {
         };\r
 \r
         $scope.getPageNumbers = function () {\r
-            var totalNumbersShowned = ($scope.totalPages > 10 ? 10 : $scope.totalPages );\r
+            var totalNumbersShowned = ($scope.totalPages > 10 ? 10 : $scope.totalPages + 1 );\r
             var tmtNumDiv = totalNumbersShowned / 2;\r
             //local\r
             var numFrom = 1;\r

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 50ee2d9..8c4c49f 100755 (executable)
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -46,7 +46,7 @@ var _schedulerCurrentCellPosition = 0;
 var _leasesDone = false;\r
 var _resourcesDone = false;\r
 //Enable Debug\r
-var schedulerDebug = false;\r
+var schedulerDebug = true;\r
 //tmp to delete\r
 var tmpSchedulerLeases = [];\r
 \r
@@ -126,7 +126,7 @@ var tmpSchedulerLeases = [];
         },\r
         on_all_resources_new_record: function (data) {\r
             //alert(data.toSource());\r
-            if (data.exclusive == true)\r
+            if (data.exclusive == true){\r
                 SchedulerData.push({\r
                     id: data.urn,\r
                     index: SchedulerData.length,\r
@@ -136,6 +136,10 @@ var tmpSchedulerLeases = [];
                     type: data.type,\r
                     org_resource: data\r
                 });\r
+                if (schedulerDebug && SchedulerData[SchedulerData.length - 1].org_resource.network_hrn == 'omf') {\r
+                    SchedulerData[SchedulerData.length - 1].granularity = 30;\r
+                }\r
+            }\r
             //alert(data.toSource());\r
 \r
         },\r
@@ -355,6 +359,7 @@ var tmpSchedulerLeases = [];
             var value = filter[2];\r
             var colValue = resource.org_resource[key];\r
             var ret = true;\r
+            if (schedulerDebug &&  colValue == 'omf') colValue = 'nitos';\r
 \r
             if (op == '=' || op == '==') {\r
                 if (colValue != value || colValue == null || colValue == "" || colValue == "n/a")

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index fd1afe3..f5faba9 100755 (executable)
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -73,7 +73,7 @@
                     <div class="dataTables_paginate paging_bootstrap">\r
                         <ul class="pagination">\r
                             <li class="prev disabled"><a href="#">← Previous</a></li>\r
-                            <li ng-cloak ng-repeat="t in getPageNumbers() track by $index" ng-class="{active: t==curPage+1}"><a href="" ng-click="setPage(t-1)">{[{t}]}</a></li>\r
+                            <li ng-cloak ng-repeat="t in getPageNumbers() track by $index" ng-class="{active: t==curPage+1}"><a href="#" ng-click="setPage(t-1)">{[{t}]}</a></li>\r
                             <li class="next disabled"><a href="#">Next → </a></li>\r
                         </ul>\r
                     </div>\r