From 99fc9182c6231a2b6b07bf95bf9493e40dcd23b4 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Tue, 16 Jun 2020 18:46:20 +0530 Subject: [PATCH] feat: map all dates from server in HTTP services Fix #482 --- .../main/webapp/app/entities/entity-update.component.ts.ejs | 6 +++--- .../entities/entity-management-update.component.spec.ts.ejs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs b/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs index d11b8c69..3450dcf5 100644 --- a/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs +++ b/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs @@ -179,13 +179,13 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain if ([ 'Instant', 'ZonedDateTime' ].includes(fieldType) && !dateFunctionIncluded) { dateFunctionIncluded = true; _%> - public convertDateTimeFromServer(date: Date): string { + public convertDateTimeFromServer(date: Date): Date { if (date) { - return format(date, DATE_TIME_LONG_FORMAT); + return date; } return null; } - + public updateInstantField(field, event) { if (event.target.value) { this.<%= entityInstance %>[field] = parse(event.target.value, DATE_TIME_LONG_FORMAT, new Date()); diff --git a/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-management-update.component.spec.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-management-update.component.spec.ts.ejs index 9c3b92c1..f08f8187 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-management-update.component.spec.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-management-update.component.spec.ts.ejs @@ -127,7 +127,7 @@ describe('Component Tests', () => { const convertedDate = comp.convertDateTimeFromServer(date); // THEN - expect(convertedDate).toEqual(format(date, DATE_TIME_LONG_FORMAT)); + expect(convertedDate).toEqual(date); }); it('Should not convert date if date is not present', () => {