diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-12 22:20:26 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-12 22:20:26 -0400 |
| commit | 2ca4a9c30a767334eb5ae9cba568c8ceb9810476 (patch) | |
| tree | 953928841599c15e68f50951f21e18d42e88eea5 /www/js/EventCtrl.js | |
| parent | 2e41b53afdffbab91b3b84ced757034240f7eba1 (diff) | |
#325 - fixed events error
Former-commit-id: 0de4c461aec66e84dcd1604b21102f3450b7144f
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 710f36bd..3c720991 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -247,7 +247,11 @@ angular.module('zmApp.controllers') // start from the latest. If this fails, nothing displays NVRDataModel.debug("EventCtrl: grabbing # of event pages"); - nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss"); + nolangFrom = ""; + nolangTo = ""; + if ($rootScope.fromString) + nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss"); + if ($rootScope.toString) nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss"); NVRDataModel.getEventsPages($scope.id, nolangFrom, nolangTo) .then(function (data) { @@ -258,8 +262,13 @@ angular.module('zmApp.controllers') $scope.viewTitle.title = data.count; NVRDataModel.debug("EventCtrl: grabbing events for: id=" + $scope.id + " Date/Time:" + $rootScope.fromString + "-" + $rootScope.toString); - nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss"); + nolangFrom = ""; + nolangTo = ""; + if ($rootScope.fromString) + nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss"); + if ($rootScope.toString) nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss"); + NVRDataModel.getEvents($scope.id, eventsPage, "", nolangFrom, nolangTo) .then(function (data) { @@ -1606,8 +1615,13 @@ angular.module('zmApp.controllers') loadingStr = "none"; } - nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss"); - nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss"); + nolangFrom = ""; + nolangTo = ""; + if ($rootScope.fromString) + nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss"); + if ($rootScope.toString) + nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss"); + NVRDataModel.getEvents($scope.id, eventsPage, loadingStr, nolangFrom, nolangTo) .then(function (data) { var loginData = NVRDataModel.getLogin(); |