diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-11 11:35:08 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-11 11:35:08 -0400 |
| commit | bd70ae20ce65049a5b10898d7f56030b4c91418d (patch) | |
| tree | 01cad58df3bc1e4f5e36973b064b559218fbf399 /www/js | |
| parent | 62ba7223884d19145e0fb022c9134888983a665d (diff) | |
#245 - aesthetics
Former-commit-id: f09a16641cc71888f16c1edae4aa56d37e39e157
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index 624f4a06..d6376b55 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -265,7 +265,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ .then (function (data) { ZMDataModel.zmDebug ("Success in monitor alarmed status " + JSON.stringify(data)); - $scope.monStatus = " - "+ status[parseInt(data.data.status)]; + $scope.monStatus = status[parseInt(data.data.status)]; }, function (error) { @@ -652,6 +652,40 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ }; + + + //----------------------------------------------------------------------- + // color for monitor state + //----------------------------------------------------------------------- + + $scope.stateColor = function() + { + console.log ("***MONSTATUS**"+$scope.monStatus+"**"); + var color=""; + switch ($scope.monStatus) + { + case "": + color="background-color:none"; + break; + case "idle": + color="background-color:#4B77BE"; + break; + case "pre-alarm": + color="background-color:#e67e22"; + break; + case "alarmed": + color="background-color:#D91E18"; + break; + case "alert": + color="background-color:#e67e22"; + break; + case "record": + color="background-color:#26A65B"; + break; + } + + return "padding-left:4px;padding-right:4px;"+color; + }; //----------------------------------------------------------------------- @@ -1056,7 +1090,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); console.log ("************* GENERATED CONNKEY " + $scope.connKey); $scope.currentFrame = 1; - + $scope.monStatus = ""; configurePTZ($scope.monitorId); |