diff --git a/assets/js/dashboard/date.js b/assets/js/dashboard/date.js index 86f8e5406..eb63ff674 100644 --- a/assets/js/dashboard/date.js +++ b/assets/js/dashboard/date.js @@ -36,12 +36,17 @@ export function formatDay(date) { return `${date.getDate()} ${formatMonth(date)}`; } +export function parseUTCDate(dateString) { + var date = new Date(dateString); + return new Date(date.getTime() + date.getTimezoneOffset() * 60000); +} + // https://stackoverflow.com/a/11124448 -export function newDateInOffset(siteOffset) { +export function nowInOffset(siteOffset) { const browserOffset = (new Date()).getTimezoneOffset() * 60 return new Date(new Date().getTime() + (siteOffset * 1000) + (browserOffset * 1000)) } export function isToday(site, date) { - return formatISO(date) === formatISO(newDateInOffset(site.offset)) + return formatISO(date) === formatISO(nowInOffset(site.offset)) } diff --git a/assets/js/dashboard/query.js b/assets/js/dashboard/query.js index 49070bcdd..7a07d3df2 100644 --- a/assets/js/dashboard/query.js +++ b/assets/js/dashboard/query.js @@ -1,4 +1,4 @@ -import {formatDay, formatMonthYYYY, newDateInOffset} from './date' +import {formatDay, formatMonthYYYY, nowInOffset, parseUTCDate} from './date' const PERIODS = ['day', 'month', '7d', '30d', '3mo', '6mo'] @@ -19,7 +19,7 @@ export function parseQuery(querystring, site) { return { period: period, - date: q.get('date') ? new Date(q.get('date')) : newDateInOffset(site.offset), + date: q.get('date') ? parseUTCDate(q.get('date')) : nowInOffset(site.offset), filters: { 'goal': q.get('goal') }