From 1dd11dbe9721aeb8bd5b3932b1ae51b6baabcb64 Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Mon, 31 Jan 2022 13:59:19 +0200 Subject: [PATCH] added templates list in dialog --- .../confirm-delete-attribute-dialog.component.html | 4 ++++ .../confirm-delete-attribute-dialog.component.scss | 10 ++++++++++ .../confirm-delete-attribute-dialog.component.ts | 10 ++++++---- .../dossier-attributes-listing-screen.component.ts | 2 +- .../file-attributes-listing-screen.component.ts | 2 +- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html index b7442e49a..04603ec4c 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html @@ -18,6 +18,10 @@ {{ checkbox.label }} + +
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.scss index 52d6e73ce..aa43ca8aa 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.scss @@ -15,3 +15,13 @@ mat-checkbox { margin-bottom: 6px; } } + +.templates-container { + padding: 0 45px; + margin-top: 0; + flex-direction: column; + + li { + margin: 5px 0; + } +} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.ts index fb9f07737..f5b04b7f1 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { DossierAttributeConfig, FileAttributeConfig } from '@red/domain'; +import { DossierAttributeConfig, FileAttributeConfig, IReportTemplate } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; @@ -13,7 +13,7 @@ interface CheckBox { interface DialogData { attribute: FileAttributeConfig | DossierAttributeConfig; - count: number; + templates: IReportTemplate[]; } @Component({ @@ -35,10 +35,12 @@ export class ConfirmDeleteAttributeDialogComponent { get checkBoxConfig(): CheckBox[] { const checkBoxes = isFileAttributeConfig(this.data.attribute) ? this._fileAttributeCheckboxes : this._dossierAttributeCheckboxes; - if (this.data.count !== 0) { + if (this.data.templates.length !== 0) { checkBoxes.push({ value: false, - label: this._translateService.instant('confirm-delete-file-attribute.impacted-report', { count: this.data.count }), + label: this._translateService.instant('confirm-delete-file-attribute.impacted-report', { + count: this.data.templates.length, + }), }); } diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts index 50f43dc35..15a253d7c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts @@ -61,7 +61,7 @@ export class DossierAttributesListingScreenComponent extends ListingComponent { + this._dialogService.openDialog('deleteAttribute', $event, { attribute: dossierAttribute, templates: resp }, async () => { this._loadingService.start(); const ids = dossierAttribute ? [dossierAttribute.id] : this.listingService.selected.map(item => item.id); await firstValueFrom(this._dossierAttributesService.delete(ids)); diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts index b98fd7620..9f621d23b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts @@ -96,7 +96,7 @@ export class FileAttributesListingScreenComponent extends ListingComponent { + this._dialogService.openDialog('deleteAttribute', $event, { attribute: fileAttribute, templates: resp }, async () => { this._loadingService.start(); if (fileAttribute) { await firstValueFrom(this._fileAttributesService.deleteFileAttributes([fileAttribute.id], dossierTemplateId));