diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-13 13:53:36 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-13 13:53:36 -0500 |
| commit | 23b05e3ba46a01b0aef63774004d0f1dd4359c03 (patch) | |
| tree | 34567e236ab4fafa02c37a6caf14d3467f6e2ee8 /www/js/MontageCtrl.js | |
| parent | 4e5e7d28a94106dab8ecf8ff08acfdf5589fe4c6 (diff) | |
#82 - alarm indication
Former-commit-id: 8ff19d73113773b4969e89e529ed3829766cde6b
Diffstat (limited to 'www/js/MontageCtrl.js')
| -rw-r--r-- | www/js/MontageCtrl.js | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 40b3a69c..7ff9cbd7 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -211,21 +211,28 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' { console.log ("**** TRAPPED EVENT: "+alarmMonitors[i]); - for (var j=0; i<$scope.monitors.length; i++) + for (var j=0; i<$scope.monitors.length; j++) { if ($scope.monitors[j].Monitor.Id == alarmMonitors[i]) { $scope.monitors[j].Monitor.isAlarmed="true"; + scheduleRemoveFlash(j); } } } - - - - + }); + + function scheduleRemoveFlash(id) + { + ZMDataModel.zmDebug ("Scheduled a 10 sec timer for dis-alarming monitor ID="+id); + $timeout( function() { + $scope.monitors[id].Monitor.isAlarmed = 'false'; + ZMDataModel.zmDebug ("dis-alarming monitor ID="+id); + },zm.alarmFlashTimer); + } //---------------------------------------------------------------- // Alarm notification handling |
