diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
index 5e26d6211..8764a7986 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
@@ -6,26 +6,26 @@
{{ 'confirm-delete-dossier-state.warning' | translate: translateArgs }}
-
- {{ 'confirm-delete-dossier-state.suggestion' | translate }}
+
-
+
+
+
+ {{ 'confirm-delete-dossier-state.form.state-placeholder' | translate }}
+
+ {{ state.name }}
+
+
+
+
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss
index 4128c859f..baff1afcf 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss
@@ -1,14 +1,7 @@
-.replacement-suggestion {
- font-size: 13px;
- line-height: 18px;
- color: var(--iqser-grey-1);
- margin-bottom: 24px;
-}
-
.dialog-header {
color: var(--iqser-primary);
}
-.heading {
- margin-bottom: 8px;
+.min-h-55 {
+ min-height: 55px;
}
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 901ee98ef..a81f88f33 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
@@ -45,17 +45,17 @@ export class ConfirmDeleteDossierStateDialogComponent {
};
}
- get replaceDossierStatusId(): string {
- return this.form.get('replaceDossierStatusId').value;
+ get label(): string {
+ return this.#replaceDossierStatusId ? _('confirm-delete-dossier-state.delete-replace') : _('confirm-delete-dossier-state.delete');
}
- get label(): string {
- return this.replaceDossierStatusId ? _('confirm-delete-dossier-state.delete-replace') : _('confirm-delete-dossier-state.delete');
+ get #replaceDossierStatusId(): string {
+ return this.form.get('replace').value ? this.form.get('replaceDossierStatusId').value : undefined;
}
async save(): Promise {
this._loadingService.start();
- await firstValueFrom(this._dossierStatesService.deleteState(this.data.toBeDeletedState, this.replaceDossierStatusId));
+ await firstValueFrom(this._dossierStatesService.deleteState(this.data.toBeDeletedState, this.#replaceDossierStatusId));
await firstValueFrom(
forkJoin([this._activeDossiersService.loadAll().pipe(take(1)), this._archivedDossiersService.loadAll().pipe(take(1))]),
);
@@ -66,6 +66,7 @@ export class ConfirmDeleteDossierStateDialogComponent {
#getForm(): UntypedFormGroup {
return this._formBuilder.group({
+ replace: [false],
replaceDossierStatusId: [null],
});
}
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json
index c0d5d3988..c8cad635e 100644
--- a/apps/red-ui/src/assets/i18n/de.json
+++ b/apps/red-ui/src/assets/i18n/de.json
@@ -502,8 +502,8 @@
"state": "",
"state-placeholder": ""
},
+ "question": "",
"success": "",
- "suggestion": "",
"title": "",
"warning": ""
},
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 1eb0b5d9d..d97384278 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -502,8 +502,8 @@
"state": "Replace State",
"state-placeholder": "Choose another state"
},
+ "question": "Replace the {count, plural, one{dossier's} other{dossiers'}} state with another state",
"success": "Successfully deleted state!",
- "suggestion": "Would you like to replace the dossiers' states with another state?",
"title": "Delete Dossier State",
"warning": "The {name} state is assigned to {count} {count, plural, one{dossier} other{dossiers}}."
},