From 881c94d1f4b9b4503e7ca97385f7d1b15f70f4b5 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 23 Oct 2016 02:00:31 +0530 Subject: #353 - allow toggling of server time, also resolves #346 gracefully Former-commit-id: bd82b1be1e0157eed5531c2d05d6de199308d7a4 --- www/js/EventCtrl.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'www/js/EventCtrl.js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index dfdbb779..f5719226 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -676,9 +676,10 @@ angular.module('zmApp.controllers') disableBack: true }); - var mToDate = moment(); - - var mFromDate = moment().subtract(parseInt(val), unit); + + // we have to convert from and to, to server time + var mToDate = moment().tz(NVRDataModel.getTimeZoneNow()); + var mFromDate = moment().subtract(parseInt(val), unit).tz(NVRDataModel.getTimeZoneNow()); // console.log("Moment Dates:" + mFromDate.format() + " TO " + mToDate.format()); -- cgit v1.2.3