summaryrefslogtreecommitdiff
path: root/www/js/EventCtrl.js
diff options
context:
space:
mode:
authorARC <arjunrc@gmail.com>2015-05-04 04:32:51 -0400
committerARC <arjunrc@gmail.com>2015-05-04 04:32:51 -0400
commitbfe426a83bfcd32bac22bc06cccb15f15a9f9450 (patch)
tree996b8848922770b8127ad1abfa7f99dac566d895 /www/js/EventCtrl.js
parenta838bdff9750af4ed6be0bad981ceb65341609f1 (diff)
Events Graphs now supports time based filters (using the excellent moment library)
Diffstat (limited to 'www/js/EventCtrl.js')
-rw-r--r--www/js/EventCtrl.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 7ae08535..d49bc244 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -279,7 +279,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ion
$scope.doRefresh = function () {
console.log("***Pull to Refresh");
$scope.events = [];
- $scope.events = ZMDataModel.getEvents($scope.id, 1)
+ ZMDataModel.getEvents($scope.id, 1)
.then(function (data) {
console.log("EventCtrl Got events");
//var events = [];
@@ -287,6 +287,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ion
for (var i = 0; i < myevents.length; i++) {
myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
+
}
moreEvents = true;