Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): 1227 - fixed null values for datepicker. #1345

Merged
merged 1 commit into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
- #1122 Fixed editing notification sendTo attribute
- #1328 Fixed semanticDataModel translation and part name within notification detail / edit view.
- #908 Renamed header in notification detail for parts from Supplier Parts to Affected parts
- #1151 Display of null values within contracts in datepicker to be empty if null

### Removed
- #1227 Removed scrollbar on approval dialog
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/modules/page/admin/core/admin.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export function assembleContract(contractResponse: ContractResponse): Contract {
contractType: contractResponse.contractType,
counterpartyAddress: contractResponse.counterpartyAddress,
creationDate: new CalendarDateModel(contractResponse.creationDate),
endDate: new CalendarDateModel(contractResponse.endDate),
endDate: contractResponse.endDate !== null ? new CalendarDateModel(contractResponse.endDate): null,
state: contractResponse.state,
policy: contractResponse.policy,
globalAssetId: contractResponse.globalAssetId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,12 @@ <h3>{{ 'table.noResultFound' | i18n }}</h3>
>
</ng-container>
<ng-container *ngIf="isDateElement(column)">
<ng-container *ngIf="element[column] !== null">
{{ (element[column] | date:'yyyy-MM-dd HH:mm') }}
</ng-container>
<ng-container *ngIf="element[column] === null">
{{ (element[column]) }}
</ng-container>
</ng-container>
<ng-container *ngIf="isOwnerElement(column)">
{{'table.owner.' + element[column]?.toLowerCase() | i18n}}
Expand Down
Loading