From 1eb4cf8dfc741d355618f3cbb0c9f6eff497808b Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Mon, 18 Apr 2016 14:51:37 -0400
Subject: fixed alarm not flashing on montage monitors

Former-commit-id: 9a6cfb4fd2eaec058793da9673210b447085742c
---
 www/js/MontageCtrl.js      | 13 +++++++------
 www/templates/montage.html |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'www')

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 08501774..869117f5 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -453,11 +453,12 @@ function initPackery()
         {
             //console.log ("**** TRAPPED EVENT: "+alarmMonitors[i]);
             
-            for (var j=0; j<$scope.monitors.length; j++)
+            for (var j=0; j<$scope.MontageMonitors.length; j++)
             {
-                if ($scope.monitors[j].Monitor.Id == alarmMonitors[i])
+                if ($scope.MontageMonitors[j].Monitor.Id == alarmMonitors[i])
                 {
-                    $scope.monitors[j].Monitor.isAlarmed="true";
+                    ZMDataModel.zmDebug ("Enabling alarm for Monitor:"+$scope.monitors[j].Monitor.Id );
+                    $scope.MontageMonitors[j].Monitor.isAlarmed=true;
                     scheduleRemoveFlash(j);
                 }
             }
@@ -469,10 +470,10 @@ function initPackery()
     
     function scheduleRemoveFlash(id)
     {
-        ZMDataModel.zmDebug ("Scheduled a 10 sec timer for dis-alarming monitor ID="+id);
+        ZMDataModel.zmDebug ("Scheduled a "+zm.alarmFlashTimer+"ms timer for dis-alarming monitor ID:"+$scope.MontageMonitors[id].Monitor.Id);
         $timeout( function() {
-            $scope.monitors[id].Monitor.isAlarmed = 'false';
-            ZMDataModel.zmDebug ("dis-alarming monitor ID="+id);
+            $scope.MontageMonitors[id].Monitor.isAlarmed = false;
+            ZMDataModel.zmDebug ("dis-alarming monitor ID:"+$scope.MontageMonitors[id].Monitor.Id);
         },zm.alarmFlashTimer);
     }
 
diff --git a/www/templates/montage.html b/www/templates/montage.html
index ea739586..2724661e 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -76,10 +76,10 @@
 
 
 
-                            <figcaption id="slowpulse" ng-class="monitor.Monitor.isAlarmed=='true'?'alarmed-figcaption animated infinite flash':'normal-figcaption'" >
+                            <figcaption id="slowpulse" ng-class="monitor.Monitor.isAlarmed==true?'alarmed-figcaption animated infinite flash':'normal-figcaption'" >
 
                                     &nbsp;<i class="ion-monitor"></i>
-                                   {{monitor.Monitor.Name}}&nbsp;
+                                   {{monitor.Monitor.isAlarmed}}:{{monitor.Monitor.Name}}&nbsp;
 
                             </figcaption>
 
-- 
cgit v1.2.3