Skip to content

Commit efba57b

Browse files
Merge pull request #1345 from eclipse-tractusx/chore/1151-fix-nullvalues-on-datepicker
chore(release): 1227 - fixed null values for datepicker.
2 parents a6be804 + 94d9500 commit efba57b

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
1616
- #1122 Fixed editing notification sendTo attribute
1717
- #1328 Fixed semanticDataModel translation and part name within notification detail / edit view.
1818
- #908 Renamed header in notification detail for parts from Supplier Parts to Affected parts
19+
- #1151 Display of null values within contracts in datepicker to be empty if null
1920

2021
### Removed
2122
- #1227 Removed scrollbar on approval dialog

frontend/src/app/modules/page/admin/core/admin.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export function assembleContract(contractResponse: ContractResponse): Contract {
9090
contractType: contractResponse.contractType,
9191
counterpartyAddress: contractResponse.counterpartyAddress,
9292
creationDate: new CalendarDateModel(contractResponse.creationDate),
93-
endDate: new CalendarDateModel(contractResponse.endDate),
93+
endDate: contractResponse.endDate !== null ? new CalendarDateModel(contractResponse.endDate): null,
9494
state: contractResponse.state,
9595
policy: contractResponse.policy,
9696
globalAssetId: contractResponse.globalAssetId,

frontend/src/app/modules/shared/components/table/table.component.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,12 @@ <h3>{{ 'table.noResultFound' | i18n }}</h3>
427427
>
428428
</ng-container>
429429
<ng-container *ngIf="isDateElement(column)">
430+
<ng-container *ngIf="element[column] !== null">
430431
{{ (element[column] | date:'yyyy-MM-dd HH:mm') }}
432+
</ng-container>
433+
<ng-container *ngIf="element[column] === null">
434+
{{ (element[column]) }}
435+
</ng-container>
431436
</ng-container>
432437
<ng-container *ngIf="isOwnerElement(column)">
433438
{{'table.owner.' + element[column]?.toLowerCase() | i18n}}

0 commit comments

Comments
 (0)