Sort CEs in L2 unis table

Change-Id: I934f8fa6895d7819739a7323b7001e3ebcdacbd1
Signed-off-by: Elisha Oren <elisha.oren@hpe.com>

diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.controller.js b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.controller.js
index 0af1d1019c6c0ab33df0eaa3a123bd259488e324..d79c92b3c573e9a1f90bf8b2c3e9c4760dbf5fc7 100644 (file)
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.controller.js
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.controller.js
@@ -490,6 +490,17 @@ define([ 'app/cpeui/cpeui.module' ], function(cpeui) {
       return uni['uni-id'];
     };
 
+    $scope.getKeys = function(obj){
+        var keys = [];
+        for(var keyName in obj){
+            keys.push(keyName)
+        }
+        return keys;
+    }
+    $scope.sortCeFromId = function(ce) {
+        return $scope.cesDisplayNames[ce];
+    };
+
     $scope.isEmpty = function(obj){
         return angular.equals({}, obj);
     }

diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.tpl.html b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.tpl.html
index 71b62cd5e3b1a723b34bd8fdd996819042b87b35..e43cba112af2fb25a04ccb12888ac0f14a3dc2ec 100644 (file)
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.tpl.html
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.tpl.html
@@ -117,8 +117,8 @@
                                         <th class="minimal-width"></th>
                                     </tr>
                                 </thead>
-                                <tbody ng-if-end ng-repeat="(ce, unis) in item.device2unis | orderBy : ce ">
-                                    <tr ng-repeat="uni in unis | orderBy: sortUni">
+                                <tbody ng-if-end ng-repeat="ce in getKeys(item.device2unis) | orderBy: sortCeFromId">
+                                    <tr ng-repeat="uni in item.device2unis[ce] | orderBy: sortUni">
                                         <td ng-if="$first" class="minimal-width" rowspan="{{unis.length}}">{{ cesDisplayNames[ce] }}</td>
                                         <td class="minimal-width">{{ uni.prettyID }}</td>
                                         <td>