From d37b20e72feea688c92d4aac58544c16e5456474 Mon Sep 17 00:00:00 2001 From: ARC Date: Wed, 13 May 2015 16:35:30 -0400 Subject: added disk usage display --- www/js/StateCtrl.js | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'www/js/StateCtrl.js') diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js index 1be2d2d7..b2bde9ed 100644 --- a/www/js/StateCtrl.js +++ b/www/js/StateCtrl.js @@ -8,22 +8,51 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup' $scope.zmRun="loading..."; $scope.zmLoad="loading..."; + $scope.zmDisk = "loading..."; $scope.color=""; $scope.showDanger=false; - $scope.dangerText = ["Show Danger Zone", "Hide Danger Zone"]; + $scope.dangerText = ["Show ZoneMinder Controls", "Hide ZoneMinder Controls"]; $scope.dangerButtonColor = ["button-positive", "button-assertive"]; var loginData = ZMDataModel.getLogin(); var apiRun = loginData.apiurl+"/host/daemonCheck.json"; var apiLoad = loginData.apiurl+"/host/getLoad.json"; + var apiDisk = loginData.apiurl+"/host/getDiskPercent.json"; var apiExec = loginData.apiurl+"/states/change/"; var inProgress = 0; getRunStatus(); getLoadStatus(); + getDiskStatus(); + function getDiskStatus(){ + $http.get(apiDisk) + .then( + function(success) + { + var obj = success.data.usage; + var du = 0; + console.log ("DISK:"+JSON.stringify(success)); + for (var p in obj) + { + if (obj.hasOwnProperty(p)) + { + du += parseFloat(obj[p].space); + + } + } + $scope.zmDisk=du.toFixed(1).toString()+"G"; + + }, + function (error) + { + $scope.zmDisk="unknown"; + console.log ("ERROR:"+JSON.stringify(error)); + } + ); + } function getRunStatus() { $http.get(apiRun) @@ -180,6 +209,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup' console.log("***Pull to Refresh"); getRunStatus(); getLoadStatus(); + getDiskStatus(); $scope.$broadcast('scroll.refreshComplete'); }; -- cgit v1.2.3