diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-17 14:05:43 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-17 14:05:43 -0500 |
| commit | b59f8ecd6492f73bab4559e448379e8d3fc47311 (patch) | |
| tree | b8d9c29db7428311aae943f349717f7441e9eb29 | |
| parent | ced7ea1ef0d12c050abd8d88ce39fa2fc4a1d84d (diff) | |
#89 - toggle between all events and only events with alarm frames
Former-commit-id: 83843aa769b04811442b1e7dbf910cdb7b475279
| -rw-r--r-- | www/js/EventCtrl.js | 7 | ||||
| -rw-r--r-- | www/templates/events-popover.html | 3 | ||||
| -rw-r--r-- | www/templates/events.html | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index c63fac37..7ebc764b 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -23,6 +23,8 @@ angular.module('zmApp.controllers') $scope.days = []; $scope.weeks = []; $scope.months = []; + + $scope.minAlarmCount = "1"; $scope.eventList = { showDelete: false @@ -1382,6 +1384,11 @@ angular.module('zmApp.controllers') loadMore(); }; + + $scope.toggleMinAlarmFrameCount = function () { + console.log ("Toggling"); + $scope.minAlarmCount = ($scope.minAlarmCount == '0') ? '1':'0'; + }; //-------------------------------------- diff --git a/www/templates/events-popover.html b/www/templates/events-popover.html index 0de4f857..43142ec0 100644 --- a/www/templates/events-popover.html +++ b/www/templates/events-popover.html @@ -9,6 +9,9 @@ <a class="item" ng-href="" ng-click="popover.hide();doRefresh();"> Refresh </a> + + <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="minAlarmCount=='1'">Show all events</a> + <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="minAlarmCount=='0'">Only show alarmed events</a> </div> </ion-content> </ion-popover-view> diff --git a/www/templates/events.html b/www/templates/events.html index 58ed0eca..37161fa7 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -34,9 +34,10 @@ <!-- lets make sure the events list is not empty as collection repeat needs height --> + <div ng-if="!eventsBeingLoaded"> <ion-list show-delete="eventList.showDelete"> - <ion-item repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}" overflow-scroll="true"> + <ion-item repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}" overflow-scroll="true" ng-if="event.Event.AlarmFrames >= minAlarmCount"> <!--<span class="events-filter-on" ng-if="isEventFilterOn">Filter</span>--> |