From 3bbe71d2187fb551b5c0c9ba000e4298b7c07a4e Mon Sep 17 00:00:00 2001
From: "CITE\\amentis" <amentis@cite.gr>
Date: Tue, 24 Sep 2024 16:54:08 +0300
Subject: [PATCH] ui fix

---
 frontend/src/app/ui/plan/overview/plan-overview.component.html  | 2 +-
 frontend/src/app/ui/plan/overview/plan-overview.component.ts    | 1 +
 .../ui/plan/plan-editor-blueprint/plan-editor.component.html    | 2 +-
 .../app/ui/plan/plan-editor-blueprint/plan-editor.component.ts  | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/ui/plan/overview/plan-overview.component.html b/frontend/src/app/ui/plan/overview/plan-overview.component.html
index 74170457c..0d978be71 100644
--- a/frontend/src/app/ui/plan/overview/plan-overview.component.html
+++ b/frontend/src/app/ui/plan/overview/plan-overview.component.html
@@ -181,7 +181,7 @@
 						<div class="row">
 							<div class="col-12">
 								<div class="frame mb-3 pt-4 pl-4 pr-5 pb-3">
-									<ng-container *ngIf="availableStatusesTransitions && availableStatusesTransitions.length > 0 && !isLocked && hasDoi(plan) && plan.belongsToCurrentTenant != false">
+									<ng-container *ngIf="availableStatusesTransitions && availableStatusesTransitions.length > 0 && !isLocked && plan.versionStatus != planVersionStatusEnum.Previous && hasDoi(plan) && plan.belongsToCurrentTenant != false">
 										<div *ngFor='let status of availableStatusesTransitions'>
 											<div class="row align-items-center" (click)="persistStatus(status)">
 												<div class="col-auto pr-0">
diff --git a/frontend/src/app/ui/plan/overview/plan-overview.component.ts b/frontend/src/app/ui/plan/overview/plan-overview.component.ts
index e48a29973..2dd923f4c 100644
--- a/frontend/src/app/ui/plan/overview/plan-overview.component.ts
+++ b/frontend/src/app/ui/plan/overview/plan-overview.component.ts
@@ -83,6 +83,7 @@ export class PlanOverviewComponent extends BaseComponent implements OnInit {
 	planAccessTypeEnum = PlanAccessType;
 	planStatusEnum = PlanStatusEnum;
 	planUserRoleEnum = PlanUserRole;
+	planVersionStatusEnum = PlanVersionStatus;
 
 	authorFocus: string;
 	userName: string;
diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
index f7dd906ab..623524554 100644
--- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
+++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
@@ -52,7 +52,7 @@
 										<button [disabled]="saving" mat-menu-item (click)="formSubmit()" type="button">{{ 'PLAN-EDITOR.ACTIONS.SAVE-AND-CONTINUE' | translate }}</button>
 									</mat-menu>
 								</div>
-								<div *ngIf="availableStatusesTransitions && availableStatusesTransitions.length > 0 && !isLocked && !isNew && hasNotDoi()" class="col-auto d-flex align-items-center" [matTooltipDisabled]="formGroup.pristine" matTooltip="{{'PLAN-EDITOR.ACTIONS.FINALIZE.CAN-NOT-FINALIZE' | translate}}">
+								<div *ngIf="availableStatusesTransitions && availableStatusesTransitions.length > 0 && item.versionStatus != planVersionStatusEnum.Previous &&!isLocked && !isNew && hasNotDoi()" class="col-auto d-flex align-items-center" [matTooltipDisabled]="formGroup.pristine" matTooltip="{{'PLAN-EDITOR.ACTIONS.FINALIZE.CAN-NOT-FINALIZE' | translate}}">
 									<button *ngFor='let status of availableStatusesTransitions' [disabled]="saving || !formGroup.pristine" mat-button class="rounded-btn primary-inverted mr-2" type="button" (click)="persistStatus(status)">{{ status.action?.length > 0 ? status.action : status.name }}</button>
 								</div>
 								<div *ngIf="isLocked" class="col-auto d-flex align-items-center">
diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts
index 5d16e4fd4..775f8f2c8 100644
--- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts
+++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts
@@ -63,6 +63,7 @@ import { PlanAssociatedUser } from '@app/core/model/user/user';
 import { PlanStatusService } from '@app/core/services/plan/plan-status.service';
 import { PlanStatus } from '@app/core/model/plan-status/plan-status';
 import { PlanStatusAvailableActionType } from '@app/core/common/enum/plan-status-available-action-type';
+import { PlanVersionStatus } from '@app/core/common/enum/plan-version-status';
 
 @Component({
 	selector: 'app-plan-editor',
@@ -89,6 +90,7 @@ export class PlanEditorComponent extends BaseEditor<PlanEditorModel, Plan> imple
 	planAccessTypeEnum = PlanAccessType;
 	planAccessTypeEnumValues = this.enumUtils.getEnumValues<PlanAccessType>(PlanAccessType);
 	planUserTypeEnum = PlanUserType;
+	planVersionStatusEnum = PlanVersionStatus;
 	planUserTypeEnumValues = this.enumUtils.getEnumValues<PlanUserType>(PlanUserType);
 	planUserRoleEnumValues = this.enumUtils.getEnumValues<PlanUserRole>(PlanUserRole);
 	fileTransformerEntityTypeEnum = FileTransformerEntityType;