Forráskód Böngészése

Panel - Recon: Fix outOfRangeClients count. Implement Badges.

DSR! 4 éve
szülő
commit
58e3c0d9a9

+ 2 - 0
src/pineapple/modules/Recon/js/module.js

@@ -2,6 +2,7 @@ registerController('ReconController', ['$api', '$scope', '$rootScope', '$interva
     $scope.accessPoints = [];
     $scope.unassociatedClients = [];
     $scope.outOfRangeClients = [];
+    $scope.outOfRangeClientsCount = 0;
     $scope.scans = [];
     $scope.selectedScan = "";
     $scope.loadedScan = null;
@@ -57,6 +58,7 @@ registerController('ReconController', ['$api', '$scope', '$rootScope', '$interva
         $scope.accessPoints = data['ap_list'];
         $scope.unassociatedClients = data['unassociated_clients'];
         $scope.outOfRangeClients = data['out_of_range_clients'];
+        $scope.outOfRangeClientsCount = Object.keys(data['out_of_range_clients']).length;
     }
 
     function checkScanStatus() {

+ 6 - 15
src/pineapple/modules/Recon/module.html

@@ -104,10 +104,7 @@
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">
-                        Scan Results
-                        <span ng-show="accessPoints.length">
-                            ({{ accessPoints.length }})
-                        </span>
+                        Scan Results <span ng-show="accessPoints.length" class="badge">{{ accessPoints.length }}</span>
                         <span class="dropdown" ng-show="accessPoints.length || outOfRangeClients.length || unassociatedClients.length">
                             <button class="btn btn-xs btn-default dropdown-toggle" type="button" id="reconDropdown"
                                     data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-disabled="running && !paused">
@@ -124,7 +121,7 @@
                     </h3>
                 </div>
                 <div class="table-responsive">
-                    <table class="table" ng-hide="(accessPoints.length == 0)">
+                    <table class="table" ng-hide="(accessPoints.length === 0)">
                         <thead>
                         <tr class="default-cursor">
                             <th ng-click="orderByName='ssid'; reverseSort = !reverseSort">SSID <span ng-show="orderByName=='ssid'"><span class="caret" ng-show="reverseSort"></span><span class="caret caret-reversed" ng-show="!reverseSort"></span></span></th>
@@ -184,15 +181,12 @@
         </div>
     </div>
 
-    <div class="row" ng-hide="(outOfRangeClients.length == 0)">
+    <div class="row" ng-hide="(outOfRangeClients.length === 0)">
         <div class="col-md-12">
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">
-                        Out of Range Clients
-                        <span ng-show="outOfRangeClients.length">
-                            ({{ outOfRangeClients.length }})
-                        </span>
+                        Out of Range Clients <span class="badge">{{ outOfRangeClientsCount }}</span>
                     </h3>
                 </div>
                 <div class="table-responsive">
@@ -223,15 +217,12 @@
         </div>
     </div>
 
-    <div class="row" ng-hide="(unassociatedClients.length == 0)">
+    <div class="row" ng-hide="(unassociatedClients.length === 0)">
         <div class="col-md-12">
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">
-                        Unassociated Clients
-                        <span ng-show="unassociatedClients.length">
-                            ({{ unassociatedClients.length }})
-                        </span>
+                        Unassociated Clients <span class="badge">{{ unassociatedClients.length }}</span>
                     </h3>
                 </div>
                 <div class="table-responsive">