summaryrefslogtreecommitdiff
path: root/www/js/app.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/app.js')
-rw-r--r--www/js/app.js24
1 files changed, 22 insertions, 2 deletions
diff --git a/www/js/app.js b/www/js/app.js
index b543efaf..99b635b9 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -18,7 +18,6 @@ angular.module('zmApp', [
'ionic',
'ion-datetime-picker',
'ngIOS9UIWebViewPatch',
- 'tc.chartjs',
'zmApp.controllers',
'fileLogger',
'angular-carousel',
@@ -124,6 +123,27 @@ angular.module('zmApp', [
})
+// filter for EH iteration
+.filter('onlyEnabledAndEventHas', function () {
+
+ // Create the return function and set the required parameter name to **input**
+ return function (input) {
+
+ var out = [];
+
+ angular.forEach(input, function (item) {
+
+ if ((item.Monitor.Function != 'None') && (item.Monitor.Enabled != '0') && (item.Monitor.eventUrl != 'img/noevent.png')) {
+ out.push(item);
+ }
+
+ });
+
+ return out;
+ };
+
+})
+
// credit https://gist.github.com/Zren/beaafd64f395e23f4604
@@ -1766,7 +1786,7 @@ angular.module('zmApp', [
},
url: "/montage-history",
- templateUrl: "templates/montage-history2.html",
+ templateUrl: "templates/montage-history.html",
controller: 'zmApp.MontageHistoryCtrl',
params: {
minimal: false,