Chrysostomos for scheduler

[unfold.git] / plugins / scheduler2 / static / js / scheduler-SchedulerCtrl.js

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