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

Merge branch 'RED-9196' into 'master'

Browse Source 
RED-9196: fixed due date checkbox not being reverted.

See merge request redactmanager/red-ui!447
This commit is contained in:
Dan Percic 2024-06-10 13:12:21 +02:00
commit 355b8edd86
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@
<div class="due-date"> <div class="due-date">
<mat-checkbox <mat-checkbox
(change)="hasDueDate = !hasDueDate" (change)="toggleDueDateField()"
[checked]="hasDueDate" [checked]="hasDueDate"
[disabled]="form.get('dueDate').disabled" [disabled]="form.get('dueDate').disabled"
class="filter-menu-checkbox" class="filter-menu-checkbox"

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

@ -106,18 +106,16 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
description: this.dossier.description, description: this.dossier.description,
dueDate: this.dossier.dueDate, dueDate: this.dossier.dueDate,
}); });
this.hasDueDate = !!this.dossier.dueDate;
} }
async save(): EditDossierSaveResult { async save(): EditDossierSaveResult {
let dueDate; const dueDate = dateWithoutTime(dayjs(this.form.get('dueDate').value));
if (this.hasDueDate) {
dueDate = dateWithoutTime(dayjs(this.form.get('dueDate').value));
}
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: dueDate, dueDate: dueDate.isValid() ? dueDate.toISOString() : undefined,
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;
@ -190,6 +188,13 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
return this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId).color; return this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId).color;
} }
toggleDueDateField() {
this.hasDueDate = !this.hasDueDate;
if (!this.hasDueDate) {
this.form.controls['dueDate'].setValue(null);
}
}
async #closeDialogAndRedirectToDossier() { async #closeDialogAndRedirectToDossier() {
this._editDossierDialogRef.close(); this._editDossierDialogRef.close();
await this._router.navigate([this.dossier.dossiersListRouterLink]); await this._router.navigate([this.dossier.dossiersListRouterLink]);