From: Chrysostomos Kolovos <xrklvs@gmail.com>
Date: Fri, 2 May 2014 14:37:37 +0000 (+0300)
Subject: Chrysostomos for scheduler
X-Git-Tag: myslice-1.1~121^2~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=dd0ce5dc4178b5af7101b997a078070bee6fb988;p=myslice.git

Chrysostomos for scheduler
---

diff --git a/plugins/scheduler2/static/js/scheduler-SchedulerCtrl.js b/plugins/scheduler2/static/js/scheduler-SchedulerCtrl.js
index 51051447..90288ab4 100755
--- 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();
 
             for (var k = 0; k < pageSize; k++) {
-                if ($scope.resources.length < SchedulerDataViewData.length)
-                    $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));
+                $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));
                 $scope.resources[k].leases = [];
             }
             $scope.pageSize = pageSize;
@@ -67,12 +66,12 @@ myApp.factory('$exceptionHandler', function () {
         $scope.setPage = function(page) {
             var tmpFrm = $scope.pageSize * page;
             var tmpTo = tmpFrm + $scope.pageSize;
+            tmpTo = SchedulerDataViewData.length < tmpTo ? SchedulerDataViewData.length : tmpTo;
             $scope.curPage = page;
             $scope.resources = [];
             var j = 0;
             for (var k = tmpFrm; k < tmpTo; k++) {
-                if ($scope.resources.length < SchedulerDataViewData.length)
-                    $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));
+                $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));
                 $scope.resources[j].leases = [];
                 j++;
             }
@@ -134,7 +133,7 @@ myApp.factory('$exceptionHandler', function () {
         };
 
         $scope.getPageNumbers = function () {
-            var totalNumbersShowned = ($scope.totalPages > 10 ? 10 : $scope.totalPages );
+            var totalNumbersShowned = ($scope.totalPages > 10 ? 10 : $scope.totalPages + 1 );
             var tmtNumDiv = totalNumbersShowned / 2;
             //local
             var numFrom = 1;
diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 50ee2d9c..8c4c49f3 100755
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -46,7 +46,7 @@ var _schedulerCurrentCellPosition = 0;
 var _leasesDone = false;
 var _resourcesDone = false;
 //Enable Debug
-var schedulerDebug = false;
+var schedulerDebug = true;
 //tmp to delete
 var tmpSchedulerLeases = [];
 
@@ -126,7 +126,7 @@ var tmpSchedulerLeases = [];
         },
         on_all_resources_new_record: function (data) {
             //alert(data.toSource());
-            if (data.exclusive == true)
+            if (data.exclusive == true){
                 SchedulerData.push({
                     id: data.urn,
                     index: SchedulerData.length,
@@ -136,6 +136,10 @@ var tmpSchedulerLeases = [];
                     type: data.type,
                     org_resource: data
                 });
+                if (schedulerDebug && SchedulerData[SchedulerData.length - 1].org_resource.network_hrn == 'omf') {
+                    SchedulerData[SchedulerData.length - 1].granularity = 30;
+                }
+            }
             //alert(data.toSource());
 
         },
@@ -355,6 +359,7 @@ var tmpSchedulerLeases = [];
             var value = filter[2];
             var colValue = resource.org_resource[key];
             var ret = true;
+            if (schedulerDebug &&  colValue == 'omf') colValue = 'nitos';
 
             if (op == '=' || op == '==') {
                 if (colValue != value || colValue == null || colValue == "" || colValue == "n/a")
diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index fd1afe3a..f5faba9f 100755
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -73,7 +73,7 @@
                     <div class="dataTables_paginate paging_bootstrap">
                         <ul class="pagination">
                             <li class="prev disabled"><a href="#">← Previous</a></li>
-                            <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>
+                            <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>
                             <li class="next disabled"><a href="#">Next → </a></li>
                         </ul>
                     </div>