From deafc837154ef704606cc631d57ccef19236e4c3 Mon Sep 17 00:00:00 2001 From: vktrrdk Date: Thu, 15 Aug 2024 07:07:25 +0000 Subject: [PATCH 1/2] fix(Facility Manager): Missing tooltips on application management buttons --- .../application-facility-actions.component.html | 10 +++++++++- .../application-facility-actions.component.ts | 1 + .../application-vo-actions.component.html | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/applications/application-facility-actions/application-facility-actions.component.html b/src/app/applications/application-facility-actions/application-facility-actions.component.html index cd541f612a..f61483bdc8 100644 --- a/src/app/applications/application-facility-actions/application-facility-actions.component.html +++ b/src/app/applications/application-facility-actions/application-facility-actions.component.html @@ -10,6 +10,7 @@ (click)="showConfirmationModal(ConfirmationActions.APPROVE_APPLICATION)" type=" button" class="btn btn-success" + tooltip="Approve Application" >   Approve @@ -23,6 +24,7 @@ (click)="showConfirmationModal(ConfirmationActions.DECLINE_APPLICATION)" type="button" class="btn btn-danger" + tooltip="Decline Application" >   Decline @@ -36,6 +38,7 @@ type="button" [attr.data-test-id]="'extension_approval_' + application?.project_application_name" class="btn btn-success" + tooltip="Approve Extension" >   Approve Extension @@ -48,6 +51,7 @@ (click)="showConfirmationModal(ConfirmationActions.DECLINE_EXTENSION)" type="button" class="btn btn-danger" + tooltip="Decline Extension" >   Decline Extension @@ -62,6 +66,7 @@ class="btn btn-success" [attr.data-test-id]="'approveModificationButton_' + application?.project_application_shortname" (click)="showConfirmationModal(ConfirmationActions.APPROVE_MODIFICATION)" + tooltop="Approve Modification" >   Approve Modification @@ -73,6 +78,7 @@ (click)="showConfirmationModal(ConfirmationActions.DECLINE_MODIFICATION)" type="button" class="btn btn-danger" + tooltip="Decline Modification" > Decline Modification @@ -85,6 +91,7 @@ type="button" class="btn btn-danger" data-test-id="terminate_project_btn" + tooltip="Terminate Project" (click)="showConfirmationModal(ConfirmationActions.APPROVE_TERMINATION)" >   @@ -97,6 +104,7 @@ (click)="showConfirmationModal(ConfirmationActions.DECLINE_TERMINATION)" type="button" class="btn btn-warning" + tooltip="Decline Termination" > Decline Termination @@ -109,7 +117,7 @@ type="button" class="btn btn-secondary" style="margin: 2px" - tooltip="Show details" + tooltip="{{ isCollapsed ? 'Show' : 'Hide' }} details" >   Show diff --git a/src/app/applications/application-facility-actions/application-facility-actions.component.ts b/src/app/applications/application-facility-actions/application-facility-actions.component.ts index a3b3ea5f4e..8dd100d819 100644 --- a/src/app/applications/application-facility-actions/application-facility-actions.component.ts +++ b/src/app/applications/application-facility-actions/application-facility-actions.component.ts @@ -44,6 +44,7 @@ export class ApplicationFacilityActionsComponent extends AbstractBaseClass { } switchCollaps() { + this.isCollapsed = !this.isCollapsed; this.switchCollapseEvent.emit(); } diff --git a/src/app/applications/application-vo-actions/application-vo-actions.component.html b/src/app/applications/application-vo-actions/application-vo-actions.component.html index 407ced35d7..aa5d414343 100644 --- a/src/app/applications/application-vo-actions/application-vo-actions.component.html +++ b/src/app/applications/application-vo-actions/application-vo-actions.component.html @@ -81,7 +81,7 @@ [disabled]="!selectedComputeCenter" type="button" class="btn btn-success" - tooltip="Approve Application!!!" + tooltip="Approve Application" >   Approve & Create From d8b42c399ef76eba9bd4a001e86927a38e52f1a1 Mon Sep 17 00:00:00 2001 From: vktrrdk <43116821+vktrrdk@users.noreply.github.com> Date: Thu, 15 Aug 2024 07:09:20 +0000 Subject: [PATCH 2/2] fix(Linting):blacked code --- src/app/applications/application.model/application.model.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/applications/application.model/application.model.ts b/src/app/applications/application.model/application.model.ts index 6451c09517..24496f14de 100644 --- a/src/app/applications/application.model/application.model.ts +++ b/src/app/applications/application.model/application.model.ts @@ -1,4 +1,4 @@ - import moment from 'moment'; +import moment from 'moment'; import { ApplicationLifetimeExtension } from '../application_extension.model'; import { ComputecenterComponent } from '../../projectmanagement/computecenter.component'; import { ApplicationDissemination } from '../application-dissemination';