diff --git a/client/gulp/config.js b/client/gulp/config.js index be983635..481c1b5f 100644 --- a/client/gulp/config.js +++ b/client/gulp/config.js @@ -33,4 +33,4 @@ module.exports = { 'buildDir': './build/' -}; \ No newline at end of file +}; diff --git a/client/src/app-components/people-list.js b/client/src/app-components/people-list.js index 604d8967..70a37feb 100644 --- a/client/src/app-components/people-list.js +++ b/client/src/app-components/people-list.js @@ -114,4 +114,4 @@ class PeopleList extends React.Component { } -export default PeopleList; \ No newline at end of file +export default PeopleList; diff --git a/client/src/app-components/ticket-event.js b/client/src/app-components/ticket-event.js index 3130b91a..bdcd9b2e 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 { @@ -80,7 +82,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)}
{this.renderFileRow(this.props.file)} @@ -92,7 +94,7 @@ class TicketEvent extends React.Component {
{this.props.author.name} assigned this ticket - on {this.props.date} + on {DateTransformer.transformToString(this.props.date)}
) } @@ -102,7 +104,7 @@ class TicketEvent extends React.Component {
{this.props.author.name} unassigned this ticket - on {this.props.date} + on {DateTransformer.transformToString(this.props.date)}
) } @@ -112,7 +114,7 @@ class TicketEvent extends React.Component {
{this.props.author.name} closed this ticket - on {this.props.date} + on {DateTransformer.transformToString(this.props.date)}
) } @@ -122,7 +124,7 @@ class TicketEvent extends React.Component {
{this.props.author.name} reopen this ticket - on {this.props.date} + on {DateTransformer.transformToString(this.props.date)}
); } @@ -133,7 +135,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)} ); } @@ -144,7 +146,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)} ); } @@ -225,4 +227,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 6dfe68fc..18293252 100644 --- a/client/src/app-components/ticket-list.js +++ b/client/src/app-components/ticket-list.js @@ -64,7 +64,7 @@ class TicketList extends React.Component { size: 'medium' }; } - + getTableProps() { return { loading: this.props.loading, @@ -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), + 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..bce229eb 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)}
{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 5fda837d..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) + signupDate: DateTransformer.transformToString(user.signupDate, false) }; } @@ -159,4 +159,4 @@ class AdminPanelListUsers extends React.Component { } } -export default AdminPanelListUsers; \ No newline at end of file +export default AdminPanelListUsers; diff --git a/client/src/data/fixtures/article-fixtures.js b/client/src/data/fixtures/article-fixtures.js index 1181ffe9..be932a8c 100644 --- a/client/src/data/fixtures/article-fixtures.js +++ b/client/src/data/fixtures/article-fixtures.js @@ -16,35 +16,35 @@ module.exports = [ id: '1', title: 'Mannaging apps for your account', content: 'Curabitur sed dignissim turpis, sed lacinia urna. Vestibulum semper suscipit interdum. Proin sed sem gravida massa tristique rhoncus auctor eu diam. Donec fringilla in ex non dignissim. Praesent sed ultricies eros. Nullam vel augue eget libero volutpat sodales sit amet et orci.', - lastEdited: 20160516, + lastEdited: 201605161230, position: 1 }, { id: '2', title: 'How to assign new task and files', content: 'Aliquam aliquet mi nulla. Nam vel orci diam. Suspendisse euismod orci efficitur nulla mattis eleifend vitae quis neque. Etiam orci dolor, dignissim quis convallis quis, rhoncus eu tellus. Phasellus aliquam ut enim id ultrices. Nunc dolor arcu, viverra vel ullamcorper nec, dignissim a lectus. Praesent fringilla, neque nec suscipit placerat, augue elit suscipit velit, in feugiat leo justo id tortor.', - lastEdited: 20150429, + lastEdited: 201504291029, position: 2 }, { id: '3', title: 'Updating your profile picture', content: 'Aliquam aliquet mi nulla. Nam vel orci diam. Suspendisse euismod orci efficitur nulla mattis eleifend vitae quis neque. Etiam orci dolor, dignissim quis convallis quis, rhoncus eu tellus. Phasellus aliquam ut enim id ultrices. Nunc dolor arcu, viverra vel ullamcorper nec, dignissim a lectus. Praesent fringilla, neque nec suscipit placerat, augue elit suscipit velit, in feugiat leo justo id tortor.', - lastEdited: 20150429, + lastEdited: 201504291422, position: 3 }, { id: '4', title: 'Deleting your account', content: 'Aliquam aliquet mi nulla. Nam vel orci diam. Suspendisse euismod orci efficitur nulla mattis eleifend vitae quis neque. Etiam orci dolor, dignissim quis convallis quis, rhoncus eu tellus. Phasellus aliquam ut enim id ultrices. Nunc dolor arcu, viverra vel ullamcorper nec, dignissim a lectus. Praesent fringilla, neque nec suscipit placerat, augue elit suscipit velit, in feugiat leo justo id tortor.', - lastEdited: 20150929, + lastEdited: 201509290102, position: 4 }, { id: '5', title: 'Upload files to your cloud drive', content: 'Aliquam aliquet mi nulla. Nam vel orci diam. Suspendisse euismod orci efficitur nulla mattis eleifend vitae quis neque. Etiam orci dolor, dignissim quis convallis quis, rhoncus eu tellus. Phasellus aliquam ut enim id ultrices. Nunc dolor arcu, viverra vel ullamcorper nec, dignissim a lectus. Praesent fringilla, neque nec suscipit placerat, augue elit suscipit velit, in feugiat leo justo id tortor.', - lastEdited: 20131229, + lastEdited: 201312290549, position: 5 } ] @@ -59,35 +59,35 @@ module.exports = [ id: '1', title: 'Mannaging apps for your account', content: 'Curabitur sed dignissim turpis, sed lacinia urna. Vestibulum semper suscipit interdum. Proin sed sem gravida massa tristique rhoncus auctor eu diam. Donec fringilla in ex non dignissim. Praesent sed ultricies eros. Nullam vel augue eget libero volutpat sodales sit amet et orci.', - lastEdited: 20160516, + lastEdited: 201605161200, position: 1 }, { id: '2', title: 'How to assign new task and files', content: 'Aliquam aliquet mi nulla. Nam vel orci diam. Suspendisse euismod orci efficitur nulla mattis eleifend vitae quis neque. Etiam orci dolor, dignissim quis convallis quis, rhoncus eu tellus. Phasellus aliquam ut enim id ultrices. Nunc dolor arcu, viverra vel ullamcorper nec, dignissim a lectus. Praesent fringilla, neque nec suscipit placerat, augue elit suscipit velit, in feugiat leo justo id tortor.', - lastEdited: 20150429, + lastEdited: 201504291159, position: 2 }, { id: '3', title: 'Updating your profile picture', content: 'Aliquam aliquet mi nulla. Nam vel orci diam. Suspendisse euismod orci efficitur nulla mattis eleifend vitae quis neque. Etiam orci dolor, dignissim quis convallis quis, rhoncus eu tellus. Phasellus aliquam ut enim id ultrices. Nunc dolor arcu, viverra vel ullamcorper nec, dignissim a lectus. Praesent fringilla, neque nec suscipit placerat, augue elit suscipit velit, in feugiat leo justo id tortor.', - lastEdited: 20150429, + lastEdited: 201504291222, position: 3 }, { id: '4', title: 'Deleting your account', content: 'Aliquam aliquet mi nulla. Nam vel orci diam. Suspendisse euismod orci efficitur nulla mattis eleifend vitae quis neque. Etiam orci dolor, dignissim quis convallis quis, rhoncus eu tellus. Phasellus aliquam ut enim id ultrices. Nunc dolor arcu, viverra vel ullamcorper nec, dignissim a lectus. Praesent fringilla, neque nec suscipit placerat, augue elit suscipit velit, in feugiat leo justo id tortor.', - lastEdited: 20150929, + lastEdited: 201509292359, position: 4 }, { id: '5', title: 'Upload files to your cloud drive', content: 'Aliquam aliquet mi nulla. Nam vel orci diam. Suspendisse euismod orci efficitur nulla mattis eleifend vitae quis neque. Etiam orci dolor, dignissim quis convallis quis, rhoncus eu tellus. Phasellus aliquam ut enim id ultrices. Nunc dolor arcu, viverra vel ullamcorper nec, dignissim a lectus. Praesent fringilla, neque nec suscipit placerat, augue elit suscipit velit, in feugiat leo justo id tortor.', - lastEdited: 20131229, + lastEdited: 201312290000, position: 5 } ] @@ -156,4 +156,4 @@ module.exports = [ }; } } -]; \ No newline at end of file +]; diff --git a/client/src/data/fixtures/staff-fixtures.js b/client/src/data/fixtures/staff-fixtures.js index 07744b51..dd6cae10 100644 --- a/client/src/data/fixtures/staff-fixtures.js +++ b/client/src/data/fixtures/staff-fixtures.js @@ -420,7 +420,7 @@ module.exports = [ name: 'Technical Issues', owners: 5 }, - date: '20160416', + date: '201604161230', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: true, @@ -439,7 +439,7 @@ module.exports = [ events: [ { type: 'ASSIGN', - date: '20150409', + date: '201504091149', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -449,7 +449,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150409', + date: '201504091238', content: 'Do you have apache installed? It generally happens if you dont have apache.', author: { name: 'Emilia Clarke', @@ -460,7 +460,7 @@ module.exports = [ }, { type: 'UN_ASSIGN', - date: '20150410', + date: '201504102349', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -470,7 +470,7 @@ module.exports = [ }, { type: 'DEPARTMENT_CHANGED', - date: '20150411', + date: '201504110021', content: 'System support', author: { name: 'Emilia Clarke', @@ -481,7 +481,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150412', + date: '201504120123', content: 'I have already installed apache, but the problem persists', author: { name: 'Haskell Curry', @@ -491,7 +491,7 @@ module.exports = [ }, { type: 'PRIORITY_CHANGED', - date: '20150413', + date: '201504130402', content: 'MEDIUM', author: { name: 'Emilia Clarke', @@ -502,7 +502,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150511', + date: '201505110405', content: 'Thanks!, I solved it by myself', author: { name: 'Haskell Curry', @@ -512,7 +512,7 @@ module.exports = [ }, { type: 'CLOSE', - date: '20150513', + date: '201505130429', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -522,7 +522,7 @@ module.exports = [ }, { type: 'RE_OPEN', - date: '20151018', + date: '201510180430', author: { name: 'Haskell Curry', email: 'haskell@lambda.com', @@ -540,7 +540,7 @@ module.exports = [ name: 'Technical Issues', owners: 5 }, - date: '20160415', + date: '201604150550', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: false, @@ -556,7 +556,7 @@ module.exports = [ events: [ { type: 'ASSIGN', - date: '20150409', + date: '201504091010', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -566,7 +566,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150409', + date: '201504091012', content: 'Do you have apache installed? It generally happens if you dont have apache.', author: { name: 'Emilia Clarke', @@ -577,7 +577,7 @@ module.exports = [ }, { type: 'UN_ASSIGN', - date: '20150410', + date: '201504101245', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -587,7 +587,7 @@ module.exports = [ }, { type: 'DEPARTMENT_CHANGED', - date: '20150411', + date: '201504112359', content: 'System support', author: { name: 'Emilia Clarke', @@ -598,7 +598,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150412', + date: '201504122359', content: 'I have already installed apache, but the problem persists', author: { name: 'Haskell Curry', @@ -608,7 +608,7 @@ module.exports = [ }, { type: 'PRIORITY_CHANGED', - date: '20150413', + date: '201504132240', content: 'MEDIUM', author: { name: 'Emilia Clarke', @@ -619,7 +619,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150511', + date: '201505112241', content: 'Thanks!, I soved it by myself', author: { name: 'Haskell Curry', @@ -629,7 +629,7 @@ module.exports = [ }, { type: 'CLOSE', - date: '20150513', + date: '201505132243', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -639,7 +639,7 @@ module.exports = [ }, { type: 'RE_OPEN', - date: '20151018', + date: '201510182250', author: { name: 'Haskell Curry', email: 'haskell@lambda.com', @@ -657,7 +657,7 @@ module.exports = [ name: 'Technical Issues', owners: 5 }, - date: '20150409', + date: '201504092255', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: false, @@ -673,7 +673,7 @@ module.exports = [ events: [ { type: 'ASSIGN', - date: '20150409', + date: '201504092300', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -683,7 +683,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150409', + date: '201504092301', content: 'Do you have apache installed? It generally happens if you dont have apache.', author: { name: 'Emilia Clarke', @@ -694,7 +694,7 @@ module.exports = [ }, { type: 'UN_ASSIGN', - date: '20150410', + date: '201504102302', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -704,7 +704,7 @@ module.exports = [ }, { type: 'DEPARTMENT_CHANGED', - date: '20150411', + date: '201504112303', content: 'System support', author: { name: 'Emilia Clarke', @@ -715,7 +715,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150412', + date: '201504122304', content: 'I have already installed apache, but the problem persists', author: { name: 'Haskell Curry', @@ -725,7 +725,7 @@ module.exports = [ }, { type: 'PRIORITY_CHANGED', - date: '20150413', + date: '201504132305', content: 'MEDIUM', author: { name: 'Emilia Clarke', @@ -736,7 +736,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150511', + date: '201505112306', content: 'Thanks!, I soved it by myself', author: { name: 'Haskell Curry', @@ -746,7 +746,7 @@ module.exports = [ }, { type: 'CLOSE', - date: '20150513', + date: '201505132307', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -756,7 +756,7 @@ module.exports = [ }, { type: 'RE_OPEN', - date: '20151018', + date: '201510182309', author: { name: 'Haskell Curry', email: 'haskell@lambda.com', @@ -774,7 +774,7 @@ module.exports = [ name: 'Sales Support', owners: 2 }, - date: '20160416', + date: '201604162310', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: false, @@ -812,7 +812,7 @@ module.exports = [ name: 'Sales Support', owners: 2 }, - date: '20160416', + date: '201604161040', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: true, @@ -839,7 +839,7 @@ module.exports = [ name: 'Sales Support', owners: 2 }, - date: '20160416', + date: '201604161042', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: true, @@ -866,7 +866,7 @@ module.exports = [ name: 'Technical Issues', owners: 2 }, - date: '20160416', + date: '201604161055', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: true, @@ -905,7 +905,7 @@ module.exports = [ name: 'Sales Support', owners: 2 }, - date: '20160416', + date: '201604161055', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: false, @@ -946,7 +946,7 @@ module.exports = [ id: 1, name: 'Sales Support' }, - date: '20160416', + date: '201604161100', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: false, @@ -984,7 +984,7 @@ module.exports = [ departments: [{id: 2, name: 'Technical issues'}], assignedTickets: 4, closedTickets: 21, - lastLogin: 20161212 + lastLogin: 201612121150 }, { id: 22, @@ -993,7 +993,7 @@ module.exports = [ departments: [{id: 2, name: 'Technical issues'}, {id: 1, name: 'Sales Support'}], assignedTickets: 9, closedTickets: 0, - lastLogin: 20161212 + lastLogin: 201612121155 }, { id: 22, @@ -1002,7 +1002,7 @@ module.exports = [ departments: [{id: 1, name: 'Sales Support'}], assignedTickets: -1, closedTickets: -1, - lastLogin: 20160212 + lastLogin: 201602121158 }, { id: 22, @@ -1011,7 +1011,7 @@ module.exports = [ departments: [{id: 1, name: 'Sales Support'}, {id: 3, name: 'System and Administration'}], assignedTickets: 100, closedTickets: 21, - lastLogin: 20130101 + lastLogin: 201301012346 }, { id: 22, @@ -1020,7 +1020,7 @@ module.exports = [ departments: [{id: 3, name: 'System and Administration'}], assignedTickets: 1, closedTickets: 1, - lastLogin: 2012050 + lastLogin: 20120501330 } ] }; @@ -1048,4 +1048,4 @@ module.exports = [ }; } } -]; \ No newline at end of file +]; diff --git a/client/src/data/fixtures/ticket-fixtures.js b/client/src/data/fixtures/ticket-fixtures.js index f753b2ab..1975b855 100644 --- a/client/src/data/fixtures/ticket-fixtures.js +++ b/client/src/data/fixtures/ticket-fixtures.js @@ -102,7 +102,7 @@ module.exports = [ id: 1, name: 'Sales Support' }, - date: '20160415', + date: '201604151155', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: false, @@ -119,7 +119,7 @@ module.exports = [ events: [ { type: 'ASSIGN', - date: '20150409', + date: '201504090650', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -129,7 +129,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150409', + date: '201504090729', content: 'Do you have apache installed? It generally happens if you dont have apache.', author: { name: 'Emilia Clarke', @@ -140,7 +140,7 @@ module.exports = [ }, { type: 'UN_ASSIGN', - date: '20150410', + date: '201504100922', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -150,7 +150,7 @@ module.exports = [ }, { type: 'DEPARTMENT_CHANGED', - date: '20150411', + date: '201504111000', content: 'System support', author: { name: 'Emilia Clarke', @@ -161,7 +161,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150412', + date: '201504121001', content: 'I have already installed apache, but the problem persists', author: { name: 'Haskell Curry', @@ -171,7 +171,7 @@ module.exports = [ }, { type: 'PRIORITY_CHANGED', - date: '20150413', + date: '201504131002', content: 'MEDIUM', author: { name: 'Emilia Clarke', @@ -182,7 +182,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150511', + date: '201505111003', content: 'Thanks!, I soved it by myself', author: { name: 'Haskell Curry', @@ -192,7 +192,7 @@ module.exports = [ }, { type: 'CLOSE', - date: '20150513', + date: '201505131004', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -202,7 +202,7 @@ module.exports = [ }, { type: 'RE_OPEN', - date: '20151018', + date: '201510181005', author: { name: 'Haskell Curry', email: 'haskell@lambda.com', diff --git a/client/src/data/fixtures/user-fixtures.js b/client/src/data/fixtures/user-fixtures.js index 9845da48..d611956b 100644 --- a/client/src/data/fixtures/user-fixtures.js +++ b/client/src/data/fixtures/user-fixtures.js @@ -15,7 +15,7 @@ module.exports = [ 'userId': 12, 'token': 'cc6b4921e6733d6aafe284ec0d7be57e', 'rememberToken': (data.remember) ? 'aa41efe0a1b3eeb9bf303e4561ff8392' : null, - 'rememberExpiration': (data.remember) ? 20180806 : 0 + 'rememberExpiration': (data.remember) ? 201808061020 : 0 } }; } else { @@ -147,14 +147,14 @@ module.exports = [ email: 'kurt@currycurrylady.hs', tickets: _.times(13).map(() => { return { - ticketNumber: '118551', + ticketNumber: '1185510000', title: 'Lorem ipsum door', content: 'I had a problem with the installation of the php server', department: { id: 1, name: 'Sales Support' }, - date: '20150409', + date: '201504090001', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: false, @@ -170,7 +170,7 @@ module.exports = [ events: [ { type: 'ASSIGN', - date: '20150409', + date: '201504090003', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -180,7 +180,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150409', + date: '201504090005', content: 'Do you have apache installed? It generally happens if you dont have apache.', author: { name: 'Emilia Clarke', @@ -191,7 +191,7 @@ module.exports = [ }, { type: 'UN_ASSIGN', - date: '20150410', + date: '201504100009', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -201,7 +201,7 @@ module.exports = [ }, { type: 'DEPARTMENT_CHANGED', - date: '20150411', + date: '201504110011', content: 'System support', author: { name: 'Emilia Clarke', @@ -212,7 +212,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150412', + date: '201504120024', content: 'I have already installed apache, but the problem persists', author: { name: 'Haskell Curry', @@ -222,7 +222,7 @@ module.exports = [ }, { type: 'PRIORITY_CHANGED', - date: '20150413', + date: '201504130035', content: 'MEDIUM', author: { name: 'Emilia Clarke', @@ -233,7 +233,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150511', + date: '201505110110', content: 'Thanks!, I soved it by myself', author: { name: 'Haskell Curry', @@ -243,7 +243,7 @@ module.exports = [ }, { type: 'CLOSE', - date: '20150513', + date: '201505130113', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -253,7 +253,7 @@ module.exports = [ }, { type: 'RE_OPEN', - date: '20151018', + date: '201510180114', author: { name: 'Haskell Curry', email: 'haskell@lambda.com', @@ -285,70 +285,70 @@ module.exports = [ name: 'Haskell Curry', email: 'haskell@currycurrylady.com', tickets: 5, - signupDate: 20160415 + signupDate: 201604151230 }, { id: 97, name: 'Alan Turing', email: 'turing@currycurrylady.com', tickets: 1, - signupDate: 20160401 + signupDate: 201604011230 }, { id: 89, name: 'David Hilbert', email: 'hilbert@currycurrylady.com', tickets: 2, - signupDate: 20160208 + signupDate: 201602081230 }, { id: 83, name: 'Kurt Gödel', email: 'kurt@currycurrylady.com', tickets: 10, - signupDate: 20160110 + signupDate: 201601101230 }, { id: 79, name: 'Mojzesz Presburger', email: 'presburger@currycurrylady.com', tickets: 6, - signupDate: 20150415 + signupDate: 201504151230 }, { id: 73, name: 'Haskell Curry', email: 'haskell@currycurrylady.com', tickets: 5, - signupDate: 20160415 + signupDate: 201604151230 }, { id: 71, name: 'Alan Turing', email: 'turing@currycurrylady.com', tickets: 1, - signupDate: 20160401 + signupDate: 201604011230 }, { id: 67, name: 'David Hilbert', email: 'hilbert@currycurrylady.com', tickets: 2, - signupDate: 20160208 + signupDate: 201602081230 }, { id: 61, name: 'Kurt Gödel', email: 'kurt@currycurrylady.com', tickets: 10, - signupDate: 20160110 + signupDate: 201601101233 }, { id: 59, name: 'Mojzesz Presburger', email: 'presburger@currycurrylady.com', tickets: 6, - signupDate: 20150415 + signupDate: 201504151236 } ] } @@ -373,7 +373,7 @@ module.exports = [ id: 2, name: 'Technical Issues' }, - date: '20160416', + date: '201604161427', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: true, @@ -392,7 +392,7 @@ module.exports = [ events: [ { type: 'ASSIGN', - date: '20150409', + date: '201504090729', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -402,7 +402,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150409', + date: '201504090731', content: 'Do you have apache installed? It generally happens if you dont have apache.', author: { name: 'Emilia Clarke', @@ -413,7 +413,7 @@ module.exports = [ }, { type: 'UN_ASSIGN', - date: '20150410', + date: '201504100732', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -423,7 +423,7 @@ module.exports = [ }, { type: 'DEPARTMENT_CHANGED', - date: '20150411', + date: '201504110735', content: 'System support', author: { name: 'Emilia Clarke', @@ -434,7 +434,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150412', + date: '201504120749', content: 'I have already installed apache, but the problem persists', author: { name: 'Haskell Curry', @@ -444,7 +444,7 @@ module.exports = [ }, { type: 'PRIORITY_CHANGED', - date: '20150413', + date: '201504130755', content: 'MEDIUM', author: { name: 'Emilia Clarke', @@ -455,7 +455,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150511', + date: '201505110759', content: 'Thanks!, I solved it by myself', author: { name: 'Haskell Curry', @@ -465,7 +465,7 @@ module.exports = [ }, { type: 'CLOSE', - date: '20150513', + date: '201505130800', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -475,7 +475,7 @@ module.exports = [ }, { type: 'RE_OPEN', - date: '20151018', + date: '201510180807', author: { name: 'Haskell Curry', email: 'haskell@lambda.com', @@ -492,7 +492,7 @@ module.exports = [ id: 1, name: 'Sales Support' }, - date: '20160415', + date: '201604150849', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: false, @@ -508,7 +508,7 @@ module.exports = [ events: [ { type: 'ASSIGN', - date: '20150409', + date: '201504090855', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -518,7 +518,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150409', + date: '201504090912', content: 'Do you have apache installed? It generally happens if you dont have apache.', author: { name: 'Emilia Clarke', @@ -529,7 +529,7 @@ module.exports = [ }, { type: 'UN_ASSIGN', - date: '20150410', + date: '201504100924', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -539,7 +539,7 @@ module.exports = [ }, { type: 'DEPARTMENT_CHANGED', - date: '20150411', + date: '201504110932', content: 'System support', author: { name: 'Emilia Clarke', @@ -550,7 +550,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150412', + date: '201504120941', content: 'I have already installed apache, but the problem persists', author: { name: 'Haskell Curry', @@ -560,7 +560,7 @@ module.exports = [ }, { type: 'PRIORITY_CHANGED', - date: '20150413', + date: '201504130943', content: 'MEDIUM', author: { name: 'Emilia Clarke', @@ -571,7 +571,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150511', + date: '201505110955', content: 'Thanks!, I soved it by myself', author: { name: 'Haskell Curry', @@ -581,7 +581,7 @@ module.exports = [ }, { type: 'CLOSE', - date: '20150513', + date: '201505131030', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -591,7 +591,7 @@ module.exports = [ }, { type: 'RE_OPEN', - date: '20151018', + date: '201510181031', author: { name: 'Haskell Curry', email: 'haskell@lambda.com', @@ -608,7 +608,7 @@ module.exports = [ id: 1, name: 'Sales Support' }, - date: '20150409', + date: '201504091032', file: 'http://www.opensupports.com/some_file.zip', language: 'en', unread: false, @@ -624,7 +624,7 @@ module.exports = [ events: [ { type: 'ASSIGN', - date: '20150409', + date: '201504091033', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -634,7 +634,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150409', + date: '201504091055', content: 'Do you have apache installed? It generally happens if you dont have apache.', author: { name: 'Emilia Clarke', @@ -645,7 +645,7 @@ module.exports = [ }, { type: 'UN_ASSIGN', - date: '20150410', + date: '201504101059', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -655,7 +655,7 @@ module.exports = [ }, { type: 'DEPARTMENT_CHANGED', - date: '20150411', + date: '201504111115', content: 'System support', author: { name: 'Emilia Clarke', @@ -666,7 +666,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150412', + date: '201504121117', content: 'I have already installed apache, but the problem persists', author: { name: 'Haskell Curry', @@ -676,7 +676,7 @@ module.exports = [ }, { type: 'PRIORITY_CHANGED', - date: '20150413', + date: '201504131119', content: 'MEDIUM', author: { name: 'Emilia Clarke', @@ -687,7 +687,7 @@ module.exports = [ }, { type: 'COMMENT', - date: '20150511', + date: '201505111121', content: 'Thanks!, I soved it by myself', author: { name: 'Haskell Curry', @@ -697,7 +697,7 @@ module.exports = [ }, { type: 'CLOSE', - date: '20150513', + date: '201505131231', author: { name: 'Emilia Clarke', email: 'jobs@steve.com', @@ -707,7 +707,7 @@ module.exports = [ }, { type: 'RE_OPEN', - date: '20151018', + date: '201510181244', author: { name: 'Haskell Curry', email: 'haskell@lambda.com', @@ -802,4 +802,4 @@ module.exports = [ }; } } -]; \ No newline at end of file +]; diff --git a/client/src/lib-core/date-transformer.js b/client/src/lib-core/date-transformer.js index a64dfa64..fbfaaeb6 100644 --- a/client/src/lib-core/date-transformer.js +++ b/client/src/lib-core/date-transformer.js @@ -1,13 +1,19 @@ let month = ["", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; export default { - transformToString (date) { - date += ''; //Transform to string + transformToString(date, expressive = true) { + date += ''; // Transform to string let y = date.substring(0, 4); let m = date.substring(4, 6); let d = date.substring(6, 8); m = (m[0] - '0') * 10 + (m[1] - '0'); - return d + " " + month[m] + " " + y; + if(!expressive) + return d + " " + month[m] + " " + y; + + let hr = date.substring(8, 10); + let min = date.substring(10, 12); + + return d + " " + month[m] + " " + y + " at " + hr + ":" + min; } -}; \ No newline at end of file +}; diff --git a/server/libs/Date.php b/server/libs/Date.php index 5f2f6dbe..c3e8ba0c 100644 --- a/server/libs/Date.php +++ b/server/libs/Date.php @@ -1,6 +1,6 @@ -