fix(dates): overdue on dashboard

polonel · Jan 16, 2019 · 921e258 · 921e258
1 parent 808a740
commit 921e258
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/helpers/hbs/helpers.js b/src/helpers/hbs/helpers.js
@@ -22,7 +22,7 @@
 // node_modules
 var _       = require('lodash');
 var moment  = require('moment-timezone');
-require('moment-duration-format');
+require('moment-duration-format')(moment);
 
 // The module to be exported
 var helpers = {

diff --git a/src/public/js/pages/dashboard.js b/src/public/js/pages/dashboard.js
@@ -71,9 +71,9 @@ define('pages/dashboard', [
                             html += '<td class="uk-width-1-10 uk-text-nowrap"><span class="uk-badge ticket-status-open uk-width-1-1">Open</span></td>';
                             html += '<td class="uk-width-6-10">' + ticket.subject + '</td>';
                             if (ticket.updated)
-                                html += '<td class="uk-width-2-10 uk-text-right uk-text-muted uk-text-small">' + moment(ticket.updated).format(dashboardPage.shortDateFormat) + '</td>';
+                                html += '<td class="uk-width-2-10 uk-text-right uk-text-muted uk-text-small">' + moment.utc(ticket.updated).tz(helpers.getTimezone()).format(dashboardPage.shortDateFormat) + '</td>';
                             else
-                                html += '<td class="uk-width-2-10 uk-text-right uk-text-muted uk-text-small">' + moment(ticket.date).format(dashboardPage.shortDateFormat) + '</td>';
+                                html += '<td class="uk-width-2-10 uk-text-right uk-text-muted uk-text-small">' + moment.utc(ticket.date).tz(helpers.getTimezone()).format(dashboardPage.shortDateFormat) + '</td>';
                             html += '</tr>';
                         });
 
@@ -105,7 +105,7 @@ define('pages/dashboard', [
                         var lastUpdated = $('#lastUpdated').find('span');
 
                         var formatString = helpers.getLongDateFormat() + ' ' + helpers.getTimeFormat();
-                        var formated = moment(_data.lastUpdated, 'MM/DD/YYYY hh:mm:ssa').format(formatString);
+                        var formated = moment.utc(_data.lastUpdated, 'MM/DD/YYYY hh:mm:ssa').tz(helpers.getTimezone()).format(formatString);
                         lastUpdated.text(formated);
 
                         if (!_data.data) {