From 02e799cc9f4ef5a5f2129b50388b4e686d8465dd Mon Sep 17 00:00:00 2001 From: Max Red Date: Tue, 13 Dec 2016 16:33:58 -0300 Subject: [PATCH] Max - Modifies frontend to make sure date is displayed correctly at each place and adds at when showing hours and minutes [skip ci] --- client/src/app-components/ticket-event.js | 19 ++++++++++--------- client/src/app-components/ticket-list.js | 2 +- client/src/app-components/ticket-viewer.js | 11 ++++++----- .../panel/users/admin-panel-list-users.js | 2 +- client/src/lib-core/date-transformer.js | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/client/src/app-components/ticket-event.js b/client/src/app-components/ticket-event.js index 3130b91a..6b108a18 100644 --- a/client/src/app-components/ticket-event.js +++ b/client/src/app-components/ticket-event.js @@ -2,6 +2,8 @@ import React from 'react'; import classNames from 'classnames'; import i18n from 'lib-app/i18n'; + +import DateTransformer from 'lib-core/date-transformer'; import Icon from 'core-components/icon'; class TicketEvent extends React.Component { @@ -22,7 +24,6 @@ class TicketEvent extends React.Component { render() { let iconNode = null; - if (this.props.type === 'COMMENT' && this.props.author && this.props.author.staff) { iconNode = this.renderStaffPic(); } else { @@ -80,7 +81,7 @@ class TicketEvent extends React.Component { {this.props.author.name} ({i18n((this.props.author.staff) ? 'STAFF' : 'CUSTOMER')}) -
{this.props.date}
+
{DateTransformer.transformToString(this.props.date, true)}
{this.renderFileRow(this.props.file)} @@ -92,7 +93,7 @@ class TicketEvent extends React.Component {
{this.props.author.name} assigned this ticket - on {this.props.date} + on {DateTransformer.transformToString(this.props.date, true)}
) } @@ -102,7 +103,7 @@ class TicketEvent extends React.Component {
{this.props.author.name} unassigned this ticket - on {this.props.date} + on {DateTransformer.transformToString(this.props.date, true)}
) } @@ -112,7 +113,7 @@ class TicketEvent extends React.Component {
{this.props.author.name} closed this ticket - on {this.props.date} + on {DateTransformer.transformToString(this.props.date, true)}
) } @@ -122,7 +123,7 @@ class TicketEvent extends React.Component {
{this.props.author.name} reopen this ticket - on {this.props.date} + on {DateTransformer.transformToString(this.props.date, true)}
); } @@ -133,7 +134,7 @@ class TicketEvent extends React.Component { {this.props.author.name} change department to {this.props.content} - on {this.props.date} + on {DateTransformer.transformToString(this.props.date, true)} ); } @@ -144,7 +145,7 @@ class TicketEvent extends React.Component { {this.props.author.name} change priority to {this.props.content} - on {this.props.date} + on {DateTransformer.transformToString(this.props.date, true)} ); } @@ -225,4 +226,4 @@ class TicketEvent extends React.Component { } } -export default TicketEvent; \ No newline at end of file +export default TicketEvent; diff --git a/client/src/app-components/ticket-list.js b/client/src/app-components/ticket-list.js index a8d3274d..18293252 100644 --- a/client/src/app-components/ticket-list.js +++ b/client/src/app-components/ticket-list.js @@ -177,7 +177,7 @@ class TicketList extends React.Component { priority: this.getTicketPriority(ticket.priority), department: ticket.department.name, author: ticket.author.name, - date: DateTransformer.transformToString(ticket.date, true), + date: DateTransformer.transformToString(ticket.date, false), unread: this.isTicketUnread(ticket), highlighted: this.isTicketUnread(ticket) }; diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js index fd5cb252..b95f1fda 100644 --- a/client/src/app-components/ticket-viewer.js +++ b/client/src/app-components/ticket-viewer.js @@ -8,6 +8,7 @@ import SessionStore from 'lib-app/session-store'; import TicketEvent from 'app-components/ticket-event'; import AreYouSure from 'app-components/are-you-sure'; +import DateTransformer from 'lib-core/date-transformer'; import Form from 'core-components/form'; import FormField from 'core-components/form-field'; import SubmitButton from 'core-components/submit-button'; @@ -88,7 +89,7 @@ class TicketViewer extends React.Component { onChange={this.onDepartmentDropdownChanged.bind(this)} />
{ticket.author.name}
-
{ticket.date}
+
{DateTransformer.transformToString(ticket.date, true)}
{i18n('PRIORITY')}
@@ -132,7 +133,7 @@ class TicketViewer extends React.Component {
{ticket.department.name}
{ticket.author.name}
-
{ticket.date}
+
{DateTransformer.transformToString(ticket.date, false)}
{i18n('PRIORITY')}
@@ -317,7 +318,7 @@ class TicketViewer extends React.Component { this.setState({ loading: false }); - + this.onTicketModification(); } @@ -326,7 +327,7 @@ class TicketViewer extends React.Component { loading: false }); } - + onTicketModification() { if (this.props.onChange) { this.props.onChange(); @@ -334,4 +335,4 @@ class TicketViewer extends React.Component { } } -export default TicketViewer; \ No newline at end of file +export default TicketViewer; diff --git a/client/src/app/admin/panel/users/admin-panel-list-users.js b/client/src/app/admin/panel/users/admin-panel-list-users.js index 43113f46..2b23c374 100644 --- a/client/src/app/admin/panel/users/admin-panel-list-users.js +++ b/client/src/app/admin/panel/users/admin-panel-list-users.js @@ -96,7 +96,7 @@ class AdminPanelListUsers extends React.Component { {user.tickets} ), - signupDate: DateTransformer.transformToString(user.signupDate, true) + signupDate: DateTransformer.transformToString(user.signupDate, false) }; } diff --git a/client/src/lib-core/date-transformer.js b/client/src/lib-core/date-transformer.js index 21079985..792132b7 100644 --- a/client/src/lib-core/date-transformer.js +++ b/client/src/lib-core/date-transformer.js @@ -14,6 +14,6 @@ export default { let hr = date.substring(8, 10); let min = date.substring(10, 12); - return d + " " + month[m] + " " + y + " " + hr + ":" + min; + return d + " " + month[m] + " " + y + " at " + hr + ":" + min; } };