From 1094495e2681ee26842499af25786c72ab1406b0 Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Mon, 14 Feb 2022 14:48:48 +0200 Subject: [PATCH] improvements in dossier-states-listing --- ...m-delete-dossier-state-dialog.component.ts | 10 ++----- ...dossier-states-listing-screen.component.ts | 29 +++++++------------ .../edit-dossier-general-info.component.ts | 12 ++++---- .../table-item/table-item.component.ts | 6 ++-- 4 files changed, 22 insertions(+), 35 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts index ec4cb8916..6088cb114 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts @@ -23,7 +23,7 @@ export class ConfirmDeleteDossierStateDialogComponent { readonly dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: DialogData, ) { - this.form = this._getForm(); + this.form = this.#getForm(); } get translateArgs() { @@ -42,14 +42,10 @@ export class ConfirmDeleteDossierStateDialogComponent { } get afterCloseValue(): string | true { - if (this.replaceDossierStatusId) { - return this.replaceDossierStatusId; - } - - return true; + return this.replaceDossierStatusId ?? true; } - private _getForm(): FormGroup { + #getForm(): FormGroup { return this._formBuilder.group({ replaceDossierStatusId: [null], }); diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts index d4d8e2d43..646b0f020 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts @@ -56,8 +56,8 @@ export class DossierStatesListingScreenComponent extends ListingComponent { - await this.#loadData(); + ngOnInit(): Promise { + return this.#loadData(); } openAddEditStateDialog($event: MouseEvent, dossierState?: IDossierState) { @@ -109,27 +109,18 @@ export class DossierStatesListingScreenComponent extends ListingComponent d.dossierTemplateId === templateId); - this.#setStatesCount(); - this.chartData = this.#loadChartData(); + const dossierStates = this.dossierStateService.all.filter(d => d.dossierTemplateId === this.#dossierTemplateId); + this.#setStatesCount(dossierStates); + this.chartData = this.dossierStateService.all.map(state => { + return { value: state.dossierCount, label: state.name, key: state.name, color: state.color }; + }); + this.entitiesService.setEntities(dossierStates || []); } catch (e) {} this._loadingService.stop(); } - #loadChartData(): DoughnutChartConfig[] { - const config: DoughnutChartConfig[] = []; - this.dossierStateService.all.forEach(state => { - config.push({ value: state.dossierCount, label: state.name, key: state.name, color: state.color }); - }); - - return config; - } - - #setStatesCount(): void { - this.dossierStateService.all.forEach( - state => (state.dossierCount = this._dossiersService.getCountWithState(state.dossierStatusId)), - ); + #setStatesCount(dossierStates: DossierState[]): void { + dossierStates.forEach(state => (state.dossierCount = this._dossiersService.getCountWithState(state.dossierStatusId))); } } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index bf935c777..efc7a6238 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -72,8 +72,8 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti } async ngOnInit() { - this._filterInvalidDossierTemplates(); - this.form = this._getForm(); + this.#filterInvalidDossierTemplates(); + this.form = this.#getForm(); if (!this.permissionsService.canEditDossier(this.dossier)) { this.form.disable(); } @@ -132,11 +132,11 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti this._dialogService.openDialog('confirm', null, data, async () => { await firstValueFrom(this._dossiersService.delete(this.dossier)); this._editDossierDialogRef.close(); - this._router.navigate(['main', 'dossiers']).then(() => this._notifyDossierDeleted()); + this._router.navigate(['main', 'dossiers']).then(() => this.#notifyDossierDeleted()); }); } - private _getForm(): FormGroup { + #getForm(): FormGroup { return this._formBuilder.group({ dossierName: [this.dossier.dossierName, Validators.required], dossierTemplateId: [ @@ -154,11 +154,11 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti }); } - private _notifyDossierDeleted() { + #notifyDossierDeleted() { this._toaster.success(_('edit-dossier-dialog.delete-successful'), { params: { dossierName: this.dossier.dossierName } }); } - private _filterInvalidDossierTemplates() { + #filterInvalidDossierTemplates() { this.dossierTemplates = this._dossierTemplatesService.all.filter(r => { if (this.dossier?.dossierTemplateId === r.dossierTemplateId) { return true; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts index d1e991d3c..0151c3320 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts @@ -14,15 +14,15 @@ export class TableItemComponent implements OnChanges { @Input() dossier!: Dossier; readonly stats$: Observable; - private readonly _ngOnChanges$ = new BehaviorSubject(undefined); + readonly #ngOnChanges$ = new BehaviorSubject(undefined); constructor(readonly dossierStatsService: DossierStatsService) { - this.stats$ = this._ngOnChanges$.pipe(switchMap(dossierId => this.dossierStatsService.watch$(dossierId))); + this.stats$ = this.#ngOnChanges$.pipe(switchMap(dossierId => this.dossierStatsService.watch$(dossierId))); } ngOnChanges() { if (this.dossier) { - this._ngOnChanges$.next(this.dossier.dossierId); + this.#ngOnChanges$.next(this.dossier.dossierId); } } }