diff options
Diffstat (limited to 'www/js/EventDateTimeFilterCtrl.js')
| -rw-r--r-- | www/js/EventDateTimeFilterCtrl.js | 79 |
1 files changed, 42 insertions, 37 deletions
diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js index 24df1f52..772b16be 100644 --- a/www/js/EventDateTimeFilterCtrl.js +++ b/www/js/EventDateTimeFilterCtrl.js @@ -2,40 +2,46 @@ /* jslint browser: true*/ /* global cordova,StatusBar,angular,console,moment */ - - angular.module('zmApp.controllers') - .controller('zmApp.EventDateTimeFilterCtrl', ['$scope', '$ionicSlideBoxDelegate', '$ionicSideMenuDelegate', '$rootScope', '$ionicHistory', 'NVRDataModel', '$state', function ($scope, $ionicScrollDelegate, $ionicSideMenuDelegate, $rootScope, $ionicHistory, NVRDataModel, $state) { + .controller('zmApp.EventDateTimeFilterCtrl', ['$scope', '$ionicSlideBoxDelegate', '$ionicSideMenuDelegate', '$rootScope', '$ionicHistory', 'NVRDataModel', '$state', function($scope, $ionicScrollDelegate, $ionicSideMenuDelegate, $rootScope, $ionicHistory, NVRDataModel, $state) + { //---------------------------------------------------------------- // Alarm notification handling //---------------------------------------------------------------- - $scope.handleAlarms = function () { + $scope.handleAlarms = function() + { $rootScope.isAlarm = !$rootScope.isAlarm; - if (!$rootScope.isAlarm) { + if (!$rootScope.isAlarm) + { $rootScope.alarmCount = "0"; - $ionicHistory.nextViewOptions({ + $ionicHistory.nextViewOptions( + { disableBack: true }); - $state.go("events", { + $state.go("events", + { "id": 0, - "playEvent":false - }, { + "playEvent": false + }, + { reload: true }); return; } }; - $scope.$on('$ionicView.beforeEnter', function () { + $scope.$on('$ionicView.beforeEnter', function() + { $scope.today = moment().format("YYYY-MM-DD"); }); - + //-------------------------------------------------------------------------- // Clears filters //-------------------------------------------------------------------------- - $scope.removeFilters = function () { + $scope.removeFilters = function() + { $rootScope.isEventFilterOn = false; $rootScope.fromDate = ""; $rootScope.fromTime = ""; @@ -57,16 +63,17 @@ angular.module('zmApp.controllers') } else // in events, backview is undefined? { - $ionicHistory.nextViewOptions({ - disableBack: true - }); - $state.go("events", { - "id": 0, - "playEvent":false - }); - return; + $ionicHistory.nextViewOptions( + { + disableBack: true + }); + $state.go("events", + { + "id": 0, + "playEvent": false + }); + return; } - //$ionicHistory.goBack(); }; @@ -75,51 +82,50 @@ angular.module('zmApp.controllers') // Saves filters in root variables so EventFilter can access it. I know: // don't root. //-------------------------------------------------------------------------- - $scope.saveFilters = function () { - if (!$rootScope.fromDate) { + $scope.saveFilters = function() + { + if (!$rootScope.fromDate) + { //console.log("RESET fromDate"); $rootScope.fromDate = new Date(); NVRDataModel.debug("DateTimeFilter: resetting from date"); } - if (!$rootScope.toDate) { + if (!$rootScope.toDate) + { // console.log("RESET toDate"); $rootScope.toDate = new Date(); NVRDataModel.debug("DateTimeFilter: resetting to date"); } - if (!$rootScope.fromTime) { + if (!$rootScope.fromTime) + { // console.log("RESET fromTime"); $rootScope.fromTime = new Date(99, 5, 24, 0, 0, 0, 0); //moment().format("hh:mm:ss"); NVRDataModel.debug("DateTimeFilter: resetting from time"); } - - if (!$rootScope.toTime) { + if (!$rootScope.toTime) + { //console.log("RESET toTime"); $rootScope.toTime = new Date(99, 5, 24, 23, 59, 59, 0); //$rootScope.toTime = "01:01:02"; //moment().format("hh:mm:ss"); NVRDataModel.debug("DateTimeFilter: resetting to time"); } - if ($rootScope.fromDate > $rootScope.toDate) { - NVRDataModel.log ("From date > To Date, swapping"); + NVRDataModel.log("From date > To Date, swapping"); var t = $rootScope.fromDate; $rootScope.fromDate = $rootScope.toDate; $rootScope.toDate = t; } - + $rootScope.isEventFilterOn = true; $rootScope.fromString = moment($rootScope.fromDate).format("YYYY-MM-DD") + " " + moment($rootScope.fromTime).format("HH:mm:ss"); $rootScope.toString = moment($rootScope.toDate).format("YYYY-MM-DD") + " " + moment($rootScope.toTime).format("HH:mm:ss"); - - - - //console.log("CONCAT DATES " + temp); // // var startDate = moment(temp).format("YYYY-MM-DD hh:mm:ss"); @@ -127,7 +133,6 @@ angular.module('zmApp.controllers') $ionicHistory.goBack(); }; + } -} - -]);
\ No newline at end of file + ]); |