From 84b05d931168df5eade1a5ca3c9dc0b303d98384 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 4 Jul 2016 17:27:18 -0400 Subject: #278 - go directly to live view via monitors (avoid packery jugglery in montage). Pending - set value of tappedMid Former-commit-id: 7805e086656ae4f05ee4af97d325f0e2b87f999a --- www/js/MonitorCtrl.js | 836 ++++++++++++++++++++++++++------------------------ 1 file changed, 437 insertions(+), 399 deletions(-) (limited to 'www/js/MonitorCtrl.js') diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index ab3631aa..42683717 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -6,453 +6,491 @@ // refer to comments in EventCtrl for the modal stuff. They are almost the same angular.module('zmApp.controllers') - .controller('zmApp.MonitorCtrl', ['$ionicPopup', 'zm', '$scope', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$ionicLoading', '$ionicModal', '$state', '$http', '$rootScope', '$timeout','$ionicHistory', '$ionicPlatform', '$translate', + .controller('zmApp.MonitorCtrl', ['$ionicPopup', 'zm', '$scope', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$ionicLoading', '$ionicModal', '$state', '$http', '$rootScope', '$timeout', '$ionicHistory', '$ionicPlatform', '$translate', function ($ionicPopup, zm, $scope, ZMDataModel, message, $ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $http, $rootScope, $timeout, $ionicHistory, $ionicPlatform, $translate) { - //----------------------------------------------------------------------- - // Controller Main - //----------------------------------------------------------------------- - - // var isModalOpen = false; - - // console.log("***EVENTS: Waiting for Monitors to load before I proceed"); - $scope.monitors = []; - $scope.monitors = message; - - - - - if ($scope.monitors.length == 0) - { - $rootScope.zmPopup= $ionicPopup.alert({ - title: $translate.instant('kNoMonitors'), - template: $translate.instant('kPleaseCheckCredentials') - }); - $ionicHistory.nextViewOptions({ - disableBack: true - }); - $state.go("login" ,{"wizard": false}); - return; - } - - var loginData = ZMDataModel.getLogin(); - monitorStateCheck(); - //console.log("Setting Awake to " + ZMDataModel.getKeepAwake()); - ZMDataModel.setAwake(ZMDataModel.getKeepAwake()); - - // FIXME: need this as modalctrl uses it. Not needed for monitor - // mode - - - // -------------------------------------------------------- - // Handling of back button in case modal is open should - // close the modal - // -------------------------------------------------------- - - $ionicPlatform.registerBackButtonAction(function (e) { - e.preventDefault(); - if ($scope.modal.isShown()) - { - // switch off awake, as liveview is finished - ZMDataModel.zmDebug("Modal is open, closing it"); - ZMDataModel.setAwake(false); - $scope.modal.remove(); - } - else - { - ZMDataModel.zmDebug("Modal is closed, so toggling or exiting"); - if (!$ionicSideMenuDelegate.isOpenLeft()) - { - $ionicSideMenuDelegate.toggleLeft(); - - } - else - { - navigator.app.exitApp(); + //----------------------------------------------------------------------- + // Controller Main + //----------------------------------------------------------------------- + + // var isModalOpen = false; + + // console.log("***EVENTS: Waiting for Monitors to load before I proceed"); + + + + var loginData; + + + + // -------------------------------------------------------- + // Handling of back button in case modal is open should + // close the modal + // -------------------------------------------------------- + + $ionicPlatform.registerBackButtonAction(function (e) { + e.preventDefault(); + if ($scope.modal.isShown()) { + // switch off awake, as liveview is finished + ZMDataModel.zmDebug("Modal is open, closing it"); + ZMDataModel.setAwake(false); + $scope.modal.remove(); + } else { + ZMDataModel.zmDebug("Modal is closed, so toggling or exiting"); + if (!$ionicSideMenuDelegate.isOpenLeft()) { + $ionicSideMenuDelegate.toggleLeft(); + + } else { + navigator.app.exitApp(); + } + } - - } - - }, 1000); - - - - - $scope.openMenu = function () { - $ionicSideMenuDelegate.toggleLeft(); - }; - - - //---------------------------------------------------------------- - // Alarm notification handling - //---------------------------------------------------------------- - $scope.handleAlarms = function() - { - $rootScope.isAlarm=!$rootScope.isAlarm; - if (!$rootScope.isAlarm) - { - $rootScope.alarmCount="0"; - $ionicHistory.nextViewOptions({disableBack: true}); - - - $state.go("events", {"id": 0}, { reload: true }); - } - }; - //----------------------------------------------------------------------- - // This function takes care of changing monitor parameters - // For now, I've only limited it to enable/disable and change monitor mode - // and changing monitor function - //----------------------------------------------------------------------- - $scope.changeConfig = function (monitorName, monitorId, enabled, func) { - var checked = false; - //console.log("called with " + monitorId + ":" + enabled + ":" + func); - if (enabled == '1') checked = true; - - $scope.monFunctions = [ - { - text: $translate.instant('kMonModect'), - value: "Modect" + + }, 1000); + + + + + $scope.openMenu = function () { + $ionicSideMenuDelegate.toggleLeft(); + }; + + + //---------------------------------------------------------------- + // Alarm notification handling + //---------------------------------------------------------------- + $scope.handleAlarms = function () { + $rootScope.isAlarm = !$rootScope.isAlarm; + if (!$rootScope.isAlarm) { + $rootScope.alarmCount = "0"; + $ionicHistory.nextViewOptions({ + disableBack: true + }); + + + $state.go("events", { + "id": 0 + }, { + reload: true + }); + } + }; + //----------------------------------------------------------------------- + // This function takes care of changing monitor parameters + // For now, I've only limited it to enable/disable and change monitor mode + // and changing monitor function + //----------------------------------------------------------------------- + $scope.changeConfig = function (monitorName, monitorId, enabled, func) { + var checked = false; + //console.log("called with " + monitorId + ":" + enabled + ":" + func); + if (enabled == '1') checked = true; + + $scope.monFunctions = [ + { + text: $translate.instant('kMonModect'), + value: "Modect" }, - { - text: $translate.instant('kMonMocord'), - value: "Mocord" + { + text: $translate.instant('kMonMocord'), + value: "Mocord" }, - { - text: $translate.instant('kMonRecord'), - value: "Record" + { + text: $translate.instant('kMonRecord'), + value: "Record" }, - { - text:$translate.instant('kMonNodect'), - value: "Nodect" + { + text: $translate.instant('kMonNodect'), + value: "Nodect" }, - { - text: $translate.instant('kMonMonitor'), - value: "Monitor" + { + text: $translate.instant('kMonMonitor'), + value: "Monitor" }, - { - text: $translate.instant('kMonNone'), - value: "None" + { + text: $translate.instant('kMonNone'), + value: "None" } ]; - $scope.monfunc = { - myfunc: func, - myenabled: checked - }; + $scope.monfunc = { + myfunc: func, + myenabled: checked + }; - $rootScope.zmPopup = $ionicPopup.show({ - scope: $scope, - template: 'Enabled {{item.text}} ', + $rootScope.zmPopup = $ionicPopup.show({ + scope: $scope, + template: 'Enabled {{item.text}} ', - title: $translate.instant('kChangeSettingsFor') + ' '+monitorName, + title: $translate.instant('kChangeSettingsFor') + ' ' + monitorName, - buttons: [ - { - text: $translate.instant('kButtonCancel'), + buttons: [ + { + text: $translate.instant('kButtonCancel'), }, - { - text:$translate.instant('kButtonSave'), - onTap: function (e) { + { + text: $translate.instant('kButtonSave'), + onTap: function (e) { - ZMDataModel.zmDebug("MonitorCtrl:changeConfig selection:" + $scope.monfunc.myenabled + - $scope.monfunc.myfunc); - var loginData = ZMDataModel.getLogin(); - var apiRestart = loginData.apiurl + "/states/change/restart.json"; - var apiMon = loginData.apiurl + "/monitors/" + monitorId + ".json"; + ZMDataModel.zmDebug("MonitorCtrl:changeConfig selection:" + $scope.monfunc.myenabled + + $scope.monfunc.myfunc); + var loginData = ZMDataModel.getLogin(); + var apiRestart = loginData.apiurl + "/states/change/restart.json"; + var apiMon = loginData.apiurl + "/monitors/" + monitorId + ".json"; - ZMDataModel.zmDebug("MonitorCtrl: URLs for changeConfig save:" + apiMon); + ZMDataModel.zmDebug("MonitorCtrl: URLs for changeConfig save:" + apiMon); - var isEnabled = ""; - isEnabled = ($scope.monfunc.myenabled == true) ? '1' : '0'; - - $ionicLoading.show({ - template:$translate.instant('kApplyingChanges')+"...", - noBackdrop: true, - duration: zm.largeHttpTimeout, - }); + var isEnabled = ""; + isEnabled = ($scope.monfunc.myenabled == true) ? '1' : '0'; - $http({ - url: apiMon, - method: 'post', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'Accept': '*/*', - }, - transformRequest: function (obj) { - var str = []; - for (var p in obj) - str.push(encodeURIComponent(p) + "=" + - encodeURIComponent(obj[p])); - var foo = str.join("&"); - // console.log("****RETURNING " + foo); - ZMDataModel.zmDebug("MonitorCtrl: parmeters constructed: " + foo); - return foo; - }, - data: { - 'Monitor[Function]': $scope.monfunc.myfunc, - 'Monitor[Enabled]': isEnabled, - } - - }) - - // I am not restarting ZM after monitor change - - .success(function () { - $ionicLoading.hide(); - ZMDataModel.zmDebug("MonitorCtrl: Not restarting ZM - Make sure you have the patch installed in MonitorsController.php or this won't work"); - doRefresh(); - /* ZMDataModel.zmDebug ("MonitorCtrl: Restarting ZM"); - $ionicLoading.show({ - template: "Successfully changed Monitor. Please wait, restarting ZoneMinder...", - noBackdrop: true, - duration: zm.largeHttpTimeout, - }); - $http.post(apiRestart) - .then(function (success) { - $ionicLoading.hide(); - var refresh = ZMDataModel.getMonitors(1); - refresh.then(function (data) { - $scope.monitors = data; - $scope.$broadcast('scroll.refreshComplete'); - }); - - }, - function (error) { - $ionicLoading.hide(); - - } - );*/ - - }) - .error(function (data, status, headers, config) { - ZMDataModel.zmDebug("MonitorCtrl: Error changing monitor " + JSON.stringify(data)); - $ionicLoading.hide(); $ionicLoading.show({ - template: $translate.instant('kErrorChangingMonitors')+"...", + template: $translate.instant('kApplyingChanges') + "...", noBackdrop: true, - duration: 3000, + duration: zm.largeHttpTimeout, }); - }); - } + $http({ + url: apiMon, + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'Accept': '*/*', + }, + transformRequest: function (obj) { + var str = []; + for (var p in obj) + str.push(encodeURIComponent(p) + "=" + + encodeURIComponent(obj[p])); + var foo = str.join("&"); + // console.log("****RETURNING " + foo); + ZMDataModel.zmDebug("MonitorCtrl: parmeters constructed: " + foo); + return foo; + }, + data: { + 'Monitor[Function]': $scope.monfunc.myfunc, + 'Monitor[Enabled]': isEnabled, + } + + }) + + // I am not restarting ZM after monitor change + + .success(function () { + $ionicLoading.hide(); + ZMDataModel.zmDebug("MonitorCtrl: Not restarting ZM - Make sure you have the patch installed in MonitorsController.php or this won't work"); + doRefresh(); + /* ZMDataModel.zmDebug ("MonitorCtrl: Restarting ZM"); + $ionicLoading.show({ + template: "Successfully changed Monitor. Please wait, restarting ZoneMinder...", + noBackdrop: true, + duration: zm.largeHttpTimeout, + }); + $http.post(apiRestart) + .then(function (success) { + $ionicLoading.hide(); + var refresh = ZMDataModel.getMonitors(1); + refresh.then(function (data) { + $scope.monitors = data; + $scope.$broadcast('scroll.refreshComplete'); + }); + + }, + function (error) { + $ionicLoading.hide(); + + } + );*/ + + }) + .error(function (data, status, headers, config) { + ZMDataModel.zmDebug("MonitorCtrl: Error changing monitor " + JSON.stringify(data)); + $ionicLoading.hide(); + $ionicLoading.show({ + template: $translate.instant('kErrorChangingMonitors') + "...", + noBackdrop: true, + duration: 3000, + }); + }); + + } }, ] - }); - - }; - - - - // same logic as EventCtrl.js - $scope.finishedLoadingImage = function () { - // console.log("***Monitor image FINISHED Loading***"); - $ionicLoading.hide(); - }; - - - $scope.$on('$ionicView.loaded', function () { - // console.log("**VIEW ** Monitor Ctrl Loaded"); - }); - - - - - - //------------------------------------------------------------------------- - // Lets make sure we set screen dim properly as we enter - // The problem is we enter other states before we leave previous states - // from a callback perspective in ionic, so we really can't predictably - // reset power state on exit as if it is called after we enter another - // state, that effectively overwrites current view power management needs - //------------------------------------------------------------------------ - $scope.$on('$ionicView.enter', function () { - // console.log("**VIEW ** Monitor Ctrl Entered"); - ZMDataModel.setAwake(false); - $ionicSideMenuDelegate.canDragContent(true); - $scope.areImagesLoading = true; - }); - - $scope.$on('$ionicView.leave', function () { - // console.log("**VIEW ** Monitor Ctrl Left, force removing modal"); - if ($scope.modal) $scope.modal.remove(); - }); - - $scope.$on('$ionicView.unloaded', function () { - // console.log("**VIEW ** Monitor Ctrl Unloaded"); - }); - - $scope.openModal = function (mid, controllable, controlid, connKey, monitor) { - ZMDataModel.zmDebug("MonitorCtrl:Open Monitor Modal with monitor Id=" + mid + - " and Controllable:" + controllable + " with control ID:" + controlid); - - - $scope.monitor = monitor; - //console.log (">>>>>>>>>>>> MONITOR CRL " + $scope.monitor. - $scope.monitorId = mid; - $scope.monitorName = ZMDataModel.getMonitorName(mid); - $scope.LoginData = ZMDataModel.getLogin(); - $scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; - $scope.refMonitor = monitor; - ZMDataModel.zmLog("Monitor Orientation is: " + $scope.orientation); - $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; - - - - $scope.showPTZ = false; - $scope.monitorId = mid; - $scope.monitorName = ZMDataModel.getMonitorName(mid); - $scope.controlid = controlid; - - $scope.LoginData = ZMDataModel.getLogin(); - $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; - $scope.ptzMoveCommand = ""; - $scope.ptzStopCommand = ""; - - $scope.zoomInCommand = ""; - $scope.zoomOutCommand = ""; - $scope.zoomStopCommand = "zoomStop"; - $scope.canZoom = false; - - $scope.presetOn = false; - - $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); - $scope.isControllable = controllable; - - - // This is a modal to show the monitor footage - // We need to switch to always awake if set so the feed doesn't get interrupted - ZMDataModel.setAwake(ZMDataModel.getKeepAwake()); - - - - $ionicModal.fromTemplateUrl('templates/monitors-modal.html', { - scope: $scope, - animation: 'slide-in-up' - }) - .then(function (modal) { - $scope.modal = modal; - - $ionicLoading.show({ - template: $translate.instant('kPleaseWait')+"...", - noBackdrop: true, - duration: zm.loadingTimeout }); - $scope.isModalActive = true; - $scope.modal.show(); + + }; + + + + // same logic as EventCtrl.js + $scope.finishedLoadingImage = function () { + // console.log("***Monitor image FINISHED Loading***"); + $ionicLoading.hide(); + }; + + + $scope.$on('$ionicView.loaded', function () { + // console.log("**VIEW ** Monitor Ctrl Loaded"); + }); + + + + + + //------------------------------------------------------------------------- + // Lets make sure we set screen dim properly as we enter + // The problem is we enter other states before we leave previous states + // from a callback perspective in ionic, so we really can't predictably + // reset power state on exit as if it is called after we enter another + // state, that effectively overwrites current view power management needs + //------------------------------------------------------------------------ + $scope.$on('$ionicView.enter', function () { + // console.log("**VIEW ** Monitor Ctrl Entered"); + ZMDataModel.setAwake(false); + $ionicSideMenuDelegate.canDragContent(true); + $scope.areImagesLoading = true; }); - }; - - $scope.closeModal = function () { - // console.log("Close & Destroy Monitor Modal"); - - // stop networking -nph-zms keeps sucking data - - // switch off awake, as liveview is finished - ZMDataModel.setAwake(false); - $scope.modal.remove(); - $timeout (function() {ZMDataModel.zmLog("MonitorCtrl:Stopping network pull...");if (ZMDataModel.isForceNetworkStop()) ZMDataModel.stopNetwork("MonitorCtrl-closeModal");},300); - - - }; - //Cleanup the modal when we're done with it! - $scope.$on('$destroy', function () { - //console.log("Destroy Monitor Modal"); - $scope.modal.remove(); - }); - - - - - //----------------------------------------------------------------------- - // Controller Main - //----------------------------------------------------------------------- - - - function monitorStateCheck() { - var apiMonCheck; - - // The status is provided by zmdc.pl - // "not running", "pending", "running since", "Unable to connect" - var i; - for (i = 0; i < $scope.monitors.length; i++) { - (function (j) { - $scope.monitors[j].Monitor.isRunningText = "..."; - $scope.monitors[j].Monitor.isRunning = "..."; - $scope.monitors[j].Monitor.color = zm.monitorCheckingColor; - $scope.monitors[j].Monitor.char = "ion-checkmark-circled"; - apiMonCheck = loginData.apiurl + "/monitors/daemonStatus/id:" + $scope.monitors[j].Monitor.Id + "/daemon:zmc.json"; - - - //apiMonCheck = apiMonCheck.replace(loginData.url, $scope.monitors[j].Monitor.baseURL); - - - // in multiserver replace apiurl with baseurl - - - ZMDataModel.zmDebug("MonitorCtrl:monitorStateCheck: " + apiMonCheck); - //console.log("**** ZMC CHECK " + apiMonCheck); - $http.get(apiMonCheck) - .success(function (data) { - ZMDataModel.zmDebug("MonitorCtrl: monitor check state returned: " + JSON.stringify(data)); - if (data.statustext.indexOf("not running") > -1) { - $scope.monitors[j].Monitor.isRunning = "false"; - $scope.monitors[j].Monitor.color = zm.monitorNotRunningColor; - $scope.monitors[j].Monitor.char = "ion-close-circled"; - } else if (data.statustext.indexOf("pending") > -1) { - $scope.monitors[j].Monitor.isRunning = "pending"; - $scope.monitors[j].Monitor.color = zm.monitorPendingColor; - } else if (data.statustext.indexOf("running since") > -1) { - $scope.monitors[j].Monitor.isRunning = "true"; - $scope.monitors[j].Monitor.color = zm.monitorRunningColor; - } else if (data.statustext.indexOf("Unable to connect") > -1) { - $scope.monitors[j].Monitor.isRunning = "false"; - $scope.monitors[j].Monitor.color = zm.monitorNotRunningColor; - $scope.monitors[j].Monitor.char = "ion-close-circled"; + + $scope.$on('$ionicView.afterEnter', function () { + // console.log("**VIEW ** Monitor Ctrl Entered"); + $scope.monitors = []; + $scope.monitors = message; + + + + + if ($scope.monitors.length == 0) { + $rootScope.zmPopup = $ionicPopup.alert({ + title: $translate.instant('kNoMonitors'), + template: $translate.instant('kPleaseCheckCredentials') + }); + $ionicHistory.nextViewOptions({ + disableBack: true + }); + $state.go("login", { + "wizard": false + }); + return; + } + + loginData = ZMDataModel.getLogin(); + monitorStateCheck(); + //console.log("Setting Awake to " + ZMDataModel.getKeepAwake()); + ZMDataModel.setAwake(ZMDataModel.getKeepAwake()); + // Now lets see if we need to load live screen + + // $rootScope.tappedMid = 1; + if ($rootScope.tappedMid != 0) { + ZMDataModel.zmLog("Notification tapped, we need to go to monitor " + $rootScope.tappedMid); + + var tm = $rootScope.tappedMid; + $rootScope.tappedMid = 0; + var monitem; + for (var m = 0; m < $scope.monitors.length; m++) { + if ($scope.monitors[m].Monitor.Id == tm) { + monitem = $scope.monitors[m]; + break; } + } + + openModal(monitem.Monitor.Id, monitem.Monitor.Controllable, monitem.Monitor.ControlId, monitem.Monitor.connKey, monitem); + } + + + }); + + + $scope.$on('$ionicView.leave', function () { + // console.log("**VIEW ** Monitor Ctrl Left, force removing modal"); + if ($scope.modal) $scope.modal.remove(); + }); + + $scope.$on('$ionicView.unloaded', function () { + // console.log("**VIEW ** Monitor Ctrl Unloaded"); + }); + + + $scope.openModal = function (mid, controllable, controlid, connKey, monitor) { + + openModal(mid, controllable, controlid, connKey, monitor); + + }; + + function openModal(mid, controllable, controlid, connKey, monitor) { + ZMDataModel.zmDebug("MonitorCtrl:Open Monitor Modal with monitor Id=" + mid + + " and Controllable:" + controllable + " with control ID:" + controlid); + + + $scope.monitor = monitor; + //console.log (">>>>>>>>>>>> MONITOR CRL " + $scope.monitor. + $scope.monitorId = mid; + $scope.monitorName = ZMDataModel.getMonitorName(mid); + $scope.LoginData = ZMDataModel.getLogin(); + $scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; + $scope.refMonitor = monitor; + ZMDataModel.zmLog("Monitor Orientation is: " + $scope.orientation); + $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; - $scope.monitors[j].Monitor.isRunningText = data.statustext; + + + $scope.showPTZ = false; + $scope.monitorId = mid; + $scope.monitorName = ZMDataModel.getMonitorName(mid); + $scope.controlid = controlid; + + $scope.LoginData = ZMDataModel.getLogin(); + $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; + $scope.ptzMoveCommand = ""; + $scope.ptzStopCommand = ""; + + $scope.zoomInCommand = ""; + $scope.zoomOutCommand = ""; + $scope.zoomStopCommand = "zoomStop"; + $scope.canZoom = false; + + $scope.presetOn = false; + + $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); + $scope.isControllable = controllable; + + + // This is a modal to show the monitor footage + // We need to switch to always awake if set so the feed doesn't get interrupted + ZMDataModel.setAwake(ZMDataModel.getKeepAwake()); + + + + $ionicModal.fromTemplateUrl('templates/monitors-modal.html', { + scope: $scope, + animation: 'slide-in-up' }) - .error(function (data) { - ZMDataModel.zmDebug("MonitorCtrl: Error->monitor check state returned: " + - JSON.stringify(data)); - ZMDataModel.displayBanner('error', [$translate.instant('kErrorRetrievingState'), $translate.instant('kPleaseTryAgain')]); - $scope.monitors[j].Monitor.isRunning = "error"; - $scope.monitors[j].Monitor.color = zm.monitorErrorColor; - $scope.monitors[j].Monitor.char = "ion-help-circled"; + .then(function (modal) { + $scope.modal = modal; + + $ionicLoading.show({ + template: $translate.instant('kPleaseWait') + "...", + noBackdrop: true, + duration: zm.loadingTimeout + }); + $scope.isModalActive = true; + $scope.modal.show(); }); + } - })(i); - } - } + $scope.closeModal = function () { + // console.log("Close & Destroy Monitor Modal"); + // stop networking -nph-zms keeps sucking data - function doRefresh() { - $scope.monitors = []; + // switch off awake, as liveview is finished + ZMDataModel.setAwake(false); + $scope.modal.remove(); + $timeout(function () { + ZMDataModel.zmLog("MonitorCtrl:Stopping network pull..."); + if (ZMDataModel.isForceNetworkStop()) ZMDataModel.stopNetwork("MonitorCtrl-closeModal"); + }, 300); + + + }; + //Cleanup the modal when we're done with it! + $scope.$on('$destroy', function () { + //console.log("Destroy Monitor Modal"); + $scope.modal.remove(); + }); + + + + + //----------------------------------------------------------------------- + // Controller Main + //----------------------------------------------------------------------- + + + function monitorStateCheck() { + var apiMonCheck; + + // The status is provided by zmdc.pl + // "not running", "pending", "running since", "Unable to connect" + var i; + for (i = 0; i < $scope.monitors.length; i++) { + (function (j) { + $scope.monitors[j].Monitor.isRunningText = "..."; + $scope.monitors[j].Monitor.isRunning = "..."; + $scope.monitors[j].Monitor.color = zm.monitorCheckingColor; + $scope.monitors[j].Monitor.char = "ion-checkmark-circled"; + apiMonCheck = loginData.apiurl + "/monitors/daemonStatus/id:" + $scope.monitors[j].Monitor.Id + "/daemon:zmc.json"; + + + //apiMonCheck = apiMonCheck.replace(loginData.url, $scope.monitors[j].Monitor.baseURL); - var refresh = ZMDataModel.getMonitors(1); - refresh.then(function (data) { - $scope.monitors = data; - monitorStateCheck(); - $scope.$broadcast('scroll.refreshComplete'); - }); - } + // in multiserver replace apiurl with baseurl + + + ZMDataModel.zmDebug("MonitorCtrl:monitorStateCheck: " + apiMonCheck); + //console.log("**** ZMC CHECK " + apiMonCheck); + $http.get(apiMonCheck) + .success(function (data) { + ZMDataModel.zmDebug("MonitorCtrl: monitor check state returned: " + JSON.stringify(data)); + if (data.statustext.indexOf("not running") > -1) { + $scope.monitors[j].Monitor.isRunning = "false"; + $scope.monitors[j].Monitor.color = zm.monitorNotRunningColor; + $scope.monitors[j].Monitor.char = "ion-close-circled"; + } else if (data.statustext.indexOf("pending") > -1) { + $scope.monitors[j].Monitor.isRunning = "pending"; + $scope.monitors[j].Monitor.color = zm.monitorPendingColor; + } else if (data.statustext.indexOf("running since") > -1) { + $scope.monitors[j].Monitor.isRunning = "true"; + $scope.monitors[j].Monitor.color = zm.monitorRunningColor; + } else if (data.statustext.indexOf("Unable to connect") > -1) { + $scope.monitors[j].Monitor.isRunning = "false"; + $scope.monitors[j].Monitor.color = zm.monitorNotRunningColor; + $scope.monitors[j].Monitor.char = "ion-close-circled"; + } + + + $scope.monitors[j].Monitor.isRunningText = data.statustext; + }) + .error(function (data) { + ZMDataModel.zmDebug("MonitorCtrl: Error->monitor check state returned: " + + JSON.stringify(data)); + ZMDataModel.displayBanner('error', [$translate.instant('kErrorRetrievingState'), $translate.instant('kPleaseTryAgain')]); + $scope.monitors[j].Monitor.isRunning = "error"; + $scope.monitors[j].Monitor.color = zm.monitorErrorColor; + $scope.monitors[j].Monitor.char = "ion-help-circled"; + }); + + + })(i); + } + } + + + function doRefresh() { + $scope.monitors = []; + + var refresh = ZMDataModel.getMonitors(1); + + refresh.then(function (data) { + $scope.monitors = data; + monitorStateCheck(); + $scope.$broadcast('scroll.refreshComplete'); + }); + } - $scope.doRefresh = function () { - //console.log("***Pull to Refresh"); - doRefresh(); + $scope.doRefresh = function () { + //console.log("***Pull to Refresh"); + doRefresh(); - }; + }; }]); \ No newline at end of file -- cgit v1.2.3