From 79abd405ca4366593b2456e4c5d9aab220d288a1 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 30 Jan 2017 11:25:13 +0530 Subject: updated files with code that got deleted when I merged the PR #433 --- www/js/DataModel.js | 10 ++++++++++ www/js/app.js | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+) (limited to 'www/js') diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 77e5ae9a..7c46c1d0 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -148,6 +148,7 @@ angular.module('zmApp.controllers') 'fastLogin': true, 'followTimeLine': false, 'timelineScale': -1, + 'hideArchived': false }; @@ -961,6 +962,8 @@ angular.module('zmApp.controllers') } + + if (typeof loginData.monSingleImageQuality == 'undefined') { @@ -968,6 +971,13 @@ angular.module('zmApp.controllers') } + if (typeof loginData.hideArchived == 'undefined') + { + + loginData.hideArchived = false; + + } + log("DataModel init recovered this loginData as " + JSON.stringify(loginData)); } else diff --git a/www/js/app.js b/www/js/app.js index 52b25185..f7bc5e69 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -102,6 +102,24 @@ angular.module('zmApp', [ }) + +// for events view +.filter ('eventListFilter', function(NVRDataModel) +{ + return function (input) { + var ld = NVRDataModel.getLogin(); + var out = []; + angular.forEach (input, function (item) + { + if (item.Event.Archived == '0' || !ld.hideArchived) { + out.push(item); + } + }); + return out; + }; + +}) + // filter for montage iteration .filter('onlyEnabled', function() { -- cgit v1.2.3