From eb5700a93f7f62d04daad4363dae6f5cb1ea7996 Mon Sep 17 00:00:00 2001 From: vktrrdk Date: Fri, 16 Feb 2024 12:53:06 +0000 Subject: [PATCH] fix(Project overview): No extensions or modifications for projects with termination request --- .../projectmanagement/overview.component.html | 48 +++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index 26bf300cd8..279c5cb3d6 100644 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -285,7 +285,15 @@

- Extension by {{ project_application?.project_lifetime_request?.extra_lifetime }} months requested on {{ project_application?.project_lifetime_request?.date_submitted }} - + + - Termination requested
!( (project_application | hasstatusinlist: Application_States.LIFETIME_EXTENSION_REQUESTED) || (project_application | hasstatusinlist: Application_States.WAIT_FOR_CONFIRMATION_EXTENSION) || + (project_application | hasstatusinlist: Application_States.TERMINATION_REQUESTED) || + (project_application | hasstatusinlist: Application_States.WAIT_FOR_TERMINATION_FM) || lifetimeExtensionDisabled ) " @@ -343,13 +353,27 @@

*ngIf=" (project_application | hasstatusinlist: Application_States.LIFETIME_EXTENSION_REQUESTED) || (project_application | hasstatusinlist: Application_States.WAIT_FOR_CONFIRMATION_EXTENSION) || + (project_application | hasstatusinlist: Application_States.TERMINATION_REQUESTED) || + (project_application | hasstatusinlist: Application_States.WAIT_FOR_TERMINATION_FM) || lifetimeExtensionDisabled " class="btn btn-outline-secondary" disabled + data-toggle="tooltip" id="show_doi_question_modal_disabled" + [title]=" + (project_application | hasstatusinlist: Application_States.TERMINATION_REQUESTED) || + (project_application | hasstatusinlist: Application_States.WAIT_FOR_TERMINATION_FM) + ? 'You are not able to request an extension, as there is an ongoing termination request' + : 'You are not able to request another extension, as there currently is a pending extension request for this project' + " > - Extension requested + {{ + (project_application | hasstatusinlist: Application_States.TERMINATION_REQUESTED) || + (project_application | hasstatusinlist: Application_States.WAIT_FOR_TERMINATION_FM) + ? 'Request extension' + : 'Extension requested' + }} !( (project_application | hasstatusinlist: Application_States.MODIFICATION_REQUESTED) || (project_application | hasstatusinlist: Application_States.WAIT_FOR_CONFIRMATION_MODIFICATION) || + (project_application | hasstatusinlist: Application_States.TERMINATION_REQUESTED) || + (project_application | hasstatusinlist: Application_States.WAIT_FOR_TERMINATION_FM) || modificationRequestDisabled ) " @@ -497,6 +523,8 @@

!( (project_application | hasstatusinlist: Application_States.MODIFICATION_REQUESTED) || (project_application | hasstatusinlist: Application_States.WAIT_FOR_CONFIRMATION_MODIFICATION) || + (project_application | hasstatusinlist: Application_States.TERMINATION_REQUESTED) || + (project_application | hasstatusinlist: Application_States.WAIT_FOR_TERMINATION_FM) || modificationRequestDisabled ) " @@ -510,13 +538,27 @@

*ngIf=" (project_application | hasstatusinlist: Application_States.MODIFICATION_REQUESTED) || (project_application | hasstatusinlist: Application_States.WAIT_FOR_CONFIRMATION_MODIFICATION) || + (project_application | hasstatusinlist: Application_States.TERMINATION_REQUESTED) || + (project_application | hasstatusinlist: Application_States.WAIT_FOR_TERMINATION_FM) || modificationRequestDisabled " class="btn btn-outline-secondary" disabled id="show_modification_extension_button_disabled" + data-toggle="tooltip" + [title]=" + (project_application | hasstatusinlist: Application_States.TERMINATION_REQUESTED) || + (project_application | hasstatusinlist: Application_States.WAIT_FOR_TERMINATION_FM) + ? 'You are not able to request a modification request, as there is an ongoing termination request' + : 'You are not able to request another modification, as there currently is a pending modification request for this project' + " > - Resource modification requested + {{ + (project_application | hasstatusinlist: Application_States.TERMINATION_REQUESTED) || + (project_application | hasstatusinlist: Application_States.WAIT_FOR_TERMINATION_FM) + ? 'Request resource modification' + : 'Resource modification requested' + }}