Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-4243: Fixed due date color

Browse Source
This commit is contained in:
Adina Țeudan 2022-06-14 22:39:43 +03:00
parent d452e5051d
commit 2ba9d8affe
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
View File

@ -108,11 +108,15 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
} }
async save(): EditDossierSaveResult { 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 = { const dossier = {
...this.dossier, ...this.dossier,
dossierName: this.form.get('dossierName').value, dossierName: this.form.get('dossierName').value,
description: this.form.get('description').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, dossierTemplateId: this.form.get(DOSSIER_TEMPLATE_ID).value,
dossierStatusId: this.form.get('dossierStatusId').value, dossierStatusId: this.form.get('dossierStatusId').value,
} as IDossierRequest; } as IDossierRequest;

2
apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts
View File

@ -36,7 +36,7 @@ export class DossierNameColumnComponent {
} }
private get _dueDateDaysDiff(): number { 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 { getDossierTemplateNameFor(dossierTemplateId: string): string {