From c23868af0f08416f1c8c39c11456b13451083690 Mon Sep 17 00:00:00 2001 From: Sofia Papacharalampous Date: Tue, 14 May 2024 15:38:12 +0300 Subject: [PATCH] fixed editable contacts on finalized dmp --- .../ui/dmp/dmp-editor-blueprint/dmp-editor.component.html | 2 +- .../app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html index 85f5c534b..480826958 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html @@ -239,7 +239,7 @@
-
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts index ccc289181..21bc35e57 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts @@ -63,6 +63,7 @@ export class DmpEditorComponent extends BaseEditor implemen isNew = true; isDeleted = false; + isFinalized = false; item: Dmp; selectedBlueprint: DmpBlueprint; step: number = 0; @@ -115,11 +116,11 @@ export class DmpEditorComponent extends BaseEditor implemen } protected get canSave(): boolean { - return !this.isDeleted && (this.hasPermission(this.authService.permissionEnum.EditDmp) || this.item?.authorizationFlags?.some(x => x === AppPermission.EditDmp)); + return !this.isDeleted && !this.isFinalized && (this.hasPermission(this.authService.permissionEnum.EditDmp) || this.item?.authorizationFlags?.some(x => x === AppPermission.EditDmp)); } protected get canFinalize(): boolean { - return !this.isDeleted && (this.hasPermission(this.authService.permissionEnum.EditDmp) || this.item?.authorizationFlags?.some(x => x === AppPermission.EditDmp)); + return !this.isDeleted && !this.isFinalized && (this.hasPermission(this.authService.permissionEnum.EditDmp) || this.item?.authorizationFlags?.some(x => x === AppPermission.EditDmp)); } protected canEditSection(id: Guid): boolean { @@ -219,6 +220,7 @@ export class DmpEditorComponent extends BaseEditor implemen this.selectedBlueprint = data?.blueprint; this.isDeleted = data ? data.isActive === IsActive.Inactive : false; + this.isFinalized = data ? data.status === DmpStatus.Finalized : false; if (data && data.id) { const descriptionSectionPermissionResolverModel: DescriptionSectionPermissionResolver = {