From 2ba9d8affe16a146712a302db0acfb54e630ac79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 14 Jun 2022 22:39:43 +0300 Subject: [PATCH] RED-4243: Fixed due date color --- .../general-info/edit-dossier-general-info.component.ts | 6 +++++- .../dossier-name-column/dossier-name-column.component.ts | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 1b9b0998e..aebb3e22a 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -108,11 +108,15 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti } async save(): EditDossierSaveResult { + let dueDate; + if (this.hasDueDate) { + dueDate = dayjs(this.form.get('dueDate').value).set('h', 0).set('m', 0).set('s', 0); + } const dossier = { ...this.dossier, dossierName: this.form.get('dossierName').value, description: this.form.get('description').value, - dueDate: this.hasDueDate ? this.form.get('dueDate').value : undefined, + dueDate: dueDate, dossierTemplateId: this.form.get(DOSSIER_TEMPLATE_ID).value, dossierStatusId: this.form.get('dossierStatusId').value, } as IDossierRequest; diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts index 21b8c207e..d5f49fa7a 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts @@ -36,7 +36,7 @@ export class DossierNameColumnComponent { } private get _dueDateDaysDiff(): number { - return dayjs(this.dossier.dueDate).diff(dayjs().startOf('day'), 'days'); + return dayjs(this.dossier.dueDate).get('date') - dayjs().get('date'); } getDossierTemplateNameFor(dossierTemplateId: string): string {