From 7b2e633b9619909f0bd43007ee152a1e4154ef0a Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Tue, 17 May 2016 13:48:55 -0400
Subject: #250 - you can now put a min alarm count in dev settings that is
 honored in all (hopefully) screens

Former-commit-id: af9e73c877fc32709b6ef8b41781f5eaf7afbcd1
---
 www/templates/devoptions.html       | 9 +++++++++
 www/templates/events-popover.html   | 4 ++--
 www/templates/timeline-popover.html | 4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 15ff0d1d..bec45385 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -103,7 +103,16 @@
 
                 </label>
                 <br/>
+            </div>
+            
+            <div class="item item-input-inset">
+                Minimum Alarm Count&nbsp;
+                <label class="item-input-wrapper">
+                    <input type="tel" placeholder="" ng-model="loginData.minAlarmCount">
+                    <br/>
 
+                </label>
+                <br/>
             </div>
 
             <div class="item" style="background-color:#C8F7C5" ng-if="loginData.graphSize > 5000">
diff --git a/www/templates/events-popover.html b/www/templates/events-popover.html
index 866b4516..eec4f52d 100644
--- a/www/templates/events-popover.html
+++ b/www/templates/events-popover.html
@@ -10,8 +10,8 @@
               Refresh
             </a>
             
-            <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='1'">Show all events</a>
-             <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='0'"> Show alarmed events</a>
+            <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.enableAlarmCount">Show all events</a>
+             <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="!loginData.enableAlarmCount"> Show alarmed events</a>
           </div>
         </ion-content>
       </ion-popover-view>
diff --git a/www/templates/timeline-popover.html b/www/templates/timeline-popover.html
index 42fbc508..7d8760a3 100644
--- a/www/templates/timeline-popover.html
+++ b/www/templates/timeline-popover.html
@@ -2,8 +2,8 @@
         <ion-content>
           <div class="list" ng-click="popover.hide()">
               
-            <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='1'">Show all events</a>
-             <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='0'"> Show alarmed events</a>  
+            <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.enableAlarmCount">Show all events</a>
+             <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="!loginData.enableAlarmCount"> Show alarmed events</a>  
               
               
             <a class="item" ng-href="" ng-click="popover.hide();buttonClicked(0);">Month</a>
-- 
cgit v1.2.3