new events for charts

Author: mboudraa

conf.json

@@ -1,9 +1,4 @@
 {
-    "mobileServerConfig": {
-        "port": 8888,
-        "host": "0.0.0.0"
-    },
-
     "webServerConfig": {
         "port": 8080,
         "host": "0.0.0.0",

install.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+cd src/main/webapp && npm install && bower install;

src/main/groovy/com/samantha/vertx/MobileServerVerticle.groovy

@@ -70,7 +70,7 @@ <h1 flex>Samantha</h1>
     </div>
 </section>
 
-<div ng-controller="DialogCtrl">
+<div ng-controller="ConnectionDialogCtrl">
     <polymer-dialog id="'modal-disconnected'" backdrop="'true'" layered="'true'" autoCloseDisabled="'true'" opened="opened" heading="'Device disconnected'" transition="'paper-dialog-transition-center'">
         Please connect your device to the server or you will be relocated to the device select screen in {{ countdown }} seconds.
     </polymer-dialog>

src/main/webapp/partials/applications.html

@@ -93,14 +93,14 @@ angular.module('samanthaApp')
                 console.log("start receiving apps -> " + response.data.total);
                 $scope.applications.length = 0;
                 $scope.progressDialogOpened = true;
-                $("#applicationLoadingProgressBar").get(0).max = response.data.total;
+                //$("#applicationLoadingProgressBar").get(0).max = response.data.total;
             });
 
 
             vertxEventBusService.on(deviceId + '/android.apps.progress', function (response) {
                 $scope.applications.push(response.data.application);
                 console.log("receiving app -> " + response.data.progress);
-                $("#applicationLoadingProgressBar").get(0).value = response.data.progress;
+                //$("#applicationLoadingProgressBar").get(0).value = response.data.progress;
             });
 
 

src/main/webapp/scripts/controllers/ApplicationsController.js

@@ -0,0 +1,37 @@
+'use strict';
+
+angular.module('samanthaApp')
+    .controller('ConnectionDialogCtrl', ['$scope', 'vertxEventBusService', '$routeParams', '$location', '$timeout',
+        function ($scope, vertxEventBusService, $routeParams, $location, $timeout) {
+            var counter = 60 * 5;
+            $scope.countdown = counter;
+            $scope.opened = false;
+            var mytimeout;
+            var deviceId = $routeParams['deviceId'];
+
+            var startCountDown = function () {
+                $scope.countdown = counter;
+                mytimeout = $timeout(startCountDown, 1000);
+                counter--;
+                if (counter < 0) {
+                    $scope.opened = false;
+                    $timeout.cancel(mytimeout);
+                    $location.path('/');
+                }
+
+            }
+
+            vertxEventBusService.on('device.connect', function (device) {
+                if (deviceId == device.id) {
+                    $scope.opened = false;
+                    $timeout.cancel(mytimeout);
+                }
+            });
+
+            vertxEventBusService.on('device.disconnect', function (device) {
+                if (deviceId == device.id) {
+                    $scope.opened = true;
+                    startCountDown();
+                }
+            });
+        }]);

src/main/webapp/scripts/controllers/ConnectionDialogController.js

@@ -33,7 +33,7 @@ angular.module('samanthaApp')
             };
 
             $scope.retrieveIp = function() {
-                $http.get('/ip').success(function(data) {
+                $http.get('/config').success(function(data) {
                     $scope.baseUrl = data.ip;
                 });
             }

src/main/webapp/scripts/controllers/DevicesController.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('samanthaApp')
-    .controller('DialogCtrl', ['$scope', 'vertxEventBusService', '$routeParams', '$location', '$timeout',
+    .controller('ProgressDialogCtrl', ['$scope', 'vertxEventBusService', '$routeParams', '$location', '$timeout',
         function ($scope, vertxEventBusService, $routeParams, $location, $timeout) {
             var counter = 15;
             $scope.countdown = counter;

src/main/webapp/scripts/controllers/DialogController.js renamed to src/main/webapp/scripts/controllers/ProgressDialogController.js

@@ -16,13 +16,13 @@ angular.module('samanthaApp')
             }
 
             vertxEventBusService.on('vertx.monitoring.start', function (response) {
-                if (response.deviceId == deviceId && packageName != response.packageName) {
+                if (response.deviceId == deviceId) {
                     packageName = response.packageName;
                     resetSeries();
                 }
             });
 
-            vertxEventBusService.on(deviceId + '/android.monitoring.progress', function (response) {
+            vertxEventBusService.on(deviceId + '/android.monitoring.progress/monitoring', function (response) {
                 var sysdump = response.data;
 
                 if (sysdump.cpuInfo) {

src/main/webapp/scripts/controllers/monitoring/ChartCpuController.js

@@ -16,13 +16,13 @@ angular.module('samanthaApp')
             };
 
             vertxEventBusService.on('vertx.monitoring.start', function (response) {
-                if (response.deviceId == deviceId && packageName != response.packageName) {
+                if (response.deviceId == deviceId) {
                     packageName = response.packageName;
                     resetSeries();
                 }
             });
 
-            vertxEventBusService.on(deviceId + '/android.monitoring.progress', function (response) {
+            vertxEventBusService.on(deviceId + '/android.monitoring.progress/monitoring', function (response) {
                 var sysdump = response.data;
 
                 if (sysdump.memoryInfo) {