Session info screen added WIP

Author: 2nolife

src/main/resources/web/index.html

@@ -70,6 +70,7 @@
 <script src="js/app.js"></script>
 <script src="js/services.js"></script>
 <script src="js/controllers.js"></script>
+<script src="js/utils.js"></script>
 
 </body>
 </html>

src/main/resources/web/js/app.js

@@ -11,6 +11,7 @@ akkaFtp.config(function($routeProvider) {
   $routeProvider
     .when('/', { templateUrl: 'parts/dashboard.html', controller: 'dashboardCtrl' })
     .when('/sessions', { templateUrl: 'parts/sessions.html', controller: 'sessionsCtrl' })
+    .when('/sessions/:id', { templateUrl: 'parts/session.html', controller: 'sessionCtrl' })
     .when('/disconnected', { templateUrl: 'parts/disconnected.html', controller: 'disconnectedCtrl' })
     .when('/control', { templateUrl: 'parts/control.html', controller: 'controlCtrl' })
     .otherwise({ redirectTo: '/' });

src/main/resources/web/js/controllers.js

@@ -30,13 +30,6 @@ controllers.controller('dashboardCtrl', function($scope, $timeout, dashboardServ
     $scope.downloadTotal = bytesToSize(traffic.downloadedBytes);
   }
 
-  function bytesToSize(bytes) {
-    var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
-    if (bytes == 0) return '0 B';
-    var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
-    return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[i];
-  }
-
 });
 
 controllers.controller('sessionsCtrl', function($scope, $timeout, sessionService) {
@@ -46,6 +39,7 @@ controllers.controller('sessionsCtrl', function($scope, $timeout, sessionService
     sessionService.sessions.get(
         function (data) {
           $scope.sessions = data.sessions;
+          trafficToUnits(data.sessions)
           promise = $timeout($scope.getSessions, 10*1000);
         },
         function () {
@@ -58,6 +52,14 @@ controllers.controller('sessionsCtrl', function($scope, $timeout, sessionService
   $scope.$on('$destroy', function(){
     $timeout.cancel(promise);
   });
+
+  function trafficToUnits(sessions) {
+    sessions.forEach(function(x) {
+      x.uploadTotal = bytesToSize(x.uploadedBytes);
+      x.downloadTotal = bytesToSize(x.downloadedBytes);
+    });
+  }
+
 });
 
 controllers.controller('disconnectedCtrl', function($scope, $timeout, sessionService) {
@@ -67,6 +69,7 @@ controllers.controller('disconnectedCtrl', function($scope, $timeout, sessionSer
     sessionService.disconnected.get(
         function (data) {
           $scope.sessions = data.sessions;
+          trafficToUnits(data.sessions)
           promise = $timeout($scope.getSessions, 10*1000);
         },
         function () {
@@ -79,6 +82,14 @@ controllers.controller('disconnectedCtrl', function($scope, $timeout, sessionSer
   $scope.$on('$destroy', function(){
     $timeout.cancel(promise);
   });
+
+  function trafficToUnits(sessions) {
+    sessions.forEach(function(x) {
+      x.uploadTotal = bytesToSize(x.uploadedBytes);
+      x.downloadTotal = bytesToSize(x.downloadedBytes);
+    });
+  }
+
 });
 
 controllers.controller('controlCtrl', function($scope, controlService) {
@@ -124,3 +135,27 @@ controllers.controller('mainNavCtrl', function($scope, $location) {
   }
 
 });
+
+controllers.controller('sessionCtrl', function($scope, $timeout, $routeParams, sessionService) {
+  var promise;
+
+  $scope.sessionId = $routeParams.id;
+
+  $scope.getSession = function() {
+    sessionService.session($scope.sessionId).get(
+      function (data) {
+        $scope.payload = data;
+        promise = $timeout($scope.getSession, 2*1000);
+      },
+      function () {
+        console.error('disconneced');
+      }
+    )
+  };
+  $scope.getSession();
+
+  $scope.$on('$destroy', function(){
+    $timeout.cancel(promise);
+  });
+
+});

src/main/resources/web/js/services.js

@@ -12,6 +12,10 @@ services.factory('sessionService', function($resource) {
   service.sessions = $resource('/api/sessions');
   service.disconnected = $resource('/api/sessions?disconnected');
 
+  service.session = function(id) {
+    return $resource('/api/sessions/'+id);
+  };
+
   return service;
 });
 

src/main/resources/web/parts/disconnected.html

@@ -16,11 +16,11 @@ <h1 class="page-header">Disconnected sessions</h1>
         </thead>
         <tbody>
         <tr ng-repeat="x in sessions">
-          <td>{{x.id}}</td>
+          <td><a href="#/sessions/{{x.id}}">{{x.id}}</a></td>
           <td>{{x.username}}</td>
           <td>{{x.lastCommand}}</td>
-          <td>{{x.uploadedBytes}}</td>
-          <td>{{x.downloadedBytes}}</td>
+          <td>{{x.uploadTotal}}</td>
+          <td>{{x.downloadTotal}}</td>
         </tr>
         </tbody>
       </table>

src/main/resources/web/parts/session.html

@@ -0,0 +1,8 @@
+<section id="session">
+
+  <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+    <h1 class="page-header">Session {{sessionId}}</h1>
+
+    {{payload}}
+
+</section>

src/main/resources/web/parts/sessions.html

@@ -1,4 +1,4 @@
-<section id="settings">
+<section id="sessions">
 
   <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
     <h1 class="page-header">Active sessions</h1>
@@ -16,11 +16,11 @@ <h1 class="page-header">Active sessions</h1>
         </thead>
         <tbody>
         <tr ng-repeat="x in sessions">
-          <td>{{x.id}}</td>
+          <td><a href="#/sessions/{{x.id}}">{{x.id}}</a></td>
           <td>{{x.username}}</td>
           <td>{{x.lastCommand}}</td>
-          <td>{{x.uploadedBytes}}</td>
-          <td>{{x.downloadedBytes}}</td>
+          <td>{{x.uploadTotal}}</td>
+          <td>{{x.downloadTotal}}</td>
         </tr>
         </tbody>
       </table>