From db55cdf9975981785bc653f0cbcd941fc0acc96e Mon Sep 17 00:00:00 2001 From: davidcanonieto Date: Wed, 20 Nov 2019 16:48:05 +0000 Subject: [PATCH] [AAE-898] Fix Datetime card view model custom format (#5265) * [AAE-898] Fix Datetime card view model custom format * Fix e2e tests and rebase --- e2e/core/card-view/card-view-component.e2e.ts | 2 +- .../card-view/models/card-view-datetimeitem.model.ts | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/e2e/core/card-view/card-view-component.e2e.ts b/e2e/core/card-view/card-view-component.e2e.ts index 0be4a72175..56378e53f4 100644 --- a/e2e/core/card-view/card-view-component.e2e.ts +++ b/e2e/core/card-view/card-view-component.e2e.ts @@ -271,7 +271,7 @@ describe('CardView Component', () => { it('[C279962] Should be present a default value', async () => { await expect(await metadataViewPage.getPropertyText('date', 'date')).toEqual('12/24/83'); - await expect(await metadataViewPage.getPropertyText('datetime', 'datetime')).toEqual('Dec 24, 1983, 10:00'); + await expect(await metadataViewPage.getPropertyText('datetime', 'datetime')).toEqual('12/24/83, 10:00 AM'); }); it('[C312447] Should be able to clear the date field', async () => { diff --git a/lib/core/card-view/models/card-view-datetimeitem.model.ts b/lib/core/card-view/models/card-view-datetimeitem.model.ts index a868848e70..92e2085949 100644 --- a/lib/core/card-view/models/card-view-datetimeitem.model.ts +++ b/lib/core/card-view/models/card-view-datetimeitem.model.ts @@ -18,8 +18,17 @@ import { CardViewItem } from '../interfaces/card-view-item.interface'; import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service'; import { CardViewDateItemModel } from './card-view-dateitem.model'; +import { CardViewDateItemProperties } from '../interfaces/card-view.interfaces'; export class CardViewDatetimeItemModel extends CardViewDateItemModel implements CardViewItem, DynamicComponentModel { type: string = 'datetime'; format: string = 'MMM d, y, H:mm'; + + constructor(cardViewDateItemProperties: CardViewDateItemProperties) { + super(cardViewDateItemProperties); + + if (cardViewDateItemProperties.format) { + this.format = cardViewDateItemProperties.format; + } + } }