diff options
Diffstat (limited to 'www/js/EventDateTimeFilterCtrl.js')
| -rw-r--r-- | www/js/EventDateTimeFilterCtrl.js | 142 |
1 files changed, 73 insertions, 69 deletions
diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js index 5169c939..e68abfa4 100644 --- a/www/js/EventDateTimeFilterCtrl.js +++ b/www/js/EventDateTimeFilterCtrl.js @@ -5,76 +5,80 @@ angular.module('zmApp.controllers') - .controller('zmApp.EventDateTimeFilterCtrl', ['$scope', '$ionicSlideBoxDelegate', '$ionicSideMenuDelegate', '$rootScope', '$ionicHistory', 'ZMDataModel', '$state', function ($scope, $ionicScrollDelegate,$ionicSideMenuDelegate, $rootScope, $ionicHistory, ZMDataModel, $state) { - -$scope.removeFilters = function() -{ - $rootScope.isEventFilterOn = false; - $rootScope.fromDate = ""; - $rootScope.fromTime= ""; - $rootScope.toDate = ""; - $rootScope.toTime=""; - $rootScope.fromString=""; - $rootScope.toString=""; - - // if you come here via the events pullup - // you are looking at a specific monitor ID - // going back will only retain that monitor ID - // so lets reload with all monitors - $ionicHistory.nextViewOptions({ - disableBack: true - }); - $state.go("events", {"id":0}); - - //$ionicHistory.goBack(); -}; - -$scope.saveFilters = function() -{ - if (!$rootScope.fromDate) - { - console.log ("RESET fromDate"); - $rootScope.fromDate = new Date(); - ZMDataModel.zmDebug ("DateTimeFilter: resetting from date"); - } - - if (!$rootScope.toDate) - { - console.log ("RESET toDate"); - $rootScope.toDate = new Date(); - ZMDataModel.zmDebug ("DateTimeFilter: resetting to date"); - } - - if (!$rootScope.fromTime) - { - console.log ("RESET fromTime"); - $rootScope.fromTime = new Date(99,5,24,0,0,0,0); //moment().format("hh:mm:ss"); - ZMDataModel.zmDebug ("DateTimeFilter: resetting from time"); - } - - - 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"); - ZMDataModel.zmDebug ("DateTimeFilter: resetting to time"); - } - - - $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"); - ZMDataModel.zmDebug ("DateTimeFilter: From/To is now: " + $rootScope.fromString + " & " +$rootScope.toString); - $ionicHistory.goBack(); -}; + .controller('zmApp.EventDateTimeFilterCtrl', ['$scope', '$ionicSlideBoxDelegate', '$ionicSideMenuDelegate', '$rootScope', '$ionicHistory', 'ZMDataModel', '$state', function ($scope, $ionicScrollDelegate, $ionicSideMenuDelegate, $rootScope, $ionicHistory, ZMDataModel, $state) { + + //-------------------------------------------------------------------------- + // Clears filters + //-------------------------------------------------------------------------- + + $scope.removeFilters = function () { + $rootScope.isEventFilterOn = false; + $rootScope.fromDate = ""; + $rootScope.fromTime = ""; + $rootScope.toDate = ""; + $rootScope.toTime = ""; + $rootScope.fromString = ""; + $rootScope.toString = ""; + + // if you come here via the events pullup + // you are looking at a specific monitor ID + // going back will only retain that monitor ID + // so lets reload with all monitors + $ionicHistory.nextViewOptions({ + disableBack: true + }); + $state.go("events", { + "id": 0 + }); + + //$ionicHistory.goBack(); + }; + + //-------------------------------------------------------------------------- + // Saves filters in root variables so EventFilter can access it. I know: + // don't root. + //-------------------------------------------------------------------------- + $scope.saveFilters = function () { + if (!$rootScope.fromDate) { + console.log("RESET fromDate"); + $rootScope.fromDate = new Date(); + ZMDataModel.zmDebug("DateTimeFilter: resetting from date"); + } + + if (!$rootScope.toDate) { + console.log("RESET toDate"); + $rootScope.toDate = new Date(); + ZMDataModel.zmDebug("DateTimeFilter: resetting to date"); + } + + if (!$rootScope.fromTime) { + console.log("RESET fromTime"); + $rootScope.fromTime = new Date(99, 5, 24, 0, 0, 0, 0); //moment().format("hh:mm:ss"); + ZMDataModel.zmDebug("DateTimeFilter: resetting from time"); + } + + + 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"); + ZMDataModel.zmDebug("DateTimeFilter: resetting to time"); + } + + + $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"); + ZMDataModel.zmDebug("DateTimeFilter: From/To is now: " + $rootScope.fromString + " & " + $rootScope.toString); + $ionicHistory.goBack(); + }; } -]); +]);
\ No newline at end of file |