diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/EventDateTimeFilterCtrl.js | 8 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index be6aa43b..16b33431 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -987,7 +987,7 @@ angular.module('zmApp.controllers') var apiurl = loginData.apiurl + '/host/getVersion.json'; $http.get(apiurl) .then(function (success) { - if (success.data.version) { + if ( success.data.version) { d.resolve(success.data.version); } else { d.resolve("0.0.0"); diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js index 3c9bcb8a..f9e982f5 100644 --- a/www/js/EventDateTimeFilterCtrl.js +++ b/www/js/EventDateTimeFilterCtrl.js @@ -88,6 +88,14 @@ angular.module('zmApp.controllers') } + if ($rootScope.fromDate > $rootScope.toDate) + { + 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"); diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index ec9d345a..7e874fa4 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -234,8 +234,10 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic NVRDataModel.debug("logging state transition"); NVRDataModel.debug("Transitioning state to: " + statetoGo + " with param " + JSON.stringify($rootScope.lastStateParam)); + + $state.go(statetoGo, $rootScope.lastStateParam); - + }, function (error) { // API Error NVRDataModel.log("API Error handler: going to login getAPI returned error: " + JSON.stringify(error)); |