diff --git a/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.html b/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.html
index 8f26c85b91..24f00b89dd 100644
--- a/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.html
+++ b/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.html
@@ -3,7 +3,7 @@
Comment by reviewer:
- {{ application?.project_application_manager_comment }}
+ {{ comment }}
diff --git a/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.ts b/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.ts
index ff6c9c4515..640464e032 100644
--- a/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.ts
+++ b/src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.ts
@@ -1,5 +1,4 @@
import { Component, Input, OnInit } from '@angular/core';
-import { Application } from '../../application.model/application.model';
import { is_vo, elixir_id } from '../../../shared/globalvar';
/**
@@ -10,11 +9,9 @@ import { is_vo, elixir_id } from '../../../shared/globalvar';
templateUrl: './adjustment-detail.component.html',
})
export class AdjustmentDetailComponent implements OnInit {
- @Input() application: Application;
is_vo: boolean = is_vo;
+ @Input() comment: string;
elixir_id: string = elixir_id;
- ngOnInit() {
-
- }
+ ngOnInit() {}
}
diff --git a/src/app/applications/application-detail/application-detail.component.html b/src/app/applications/application-detail/application-detail.component.html
index 5ad723dca7..3399cb7e20 100644
--- a/src/app/applications/application-detail/application-detail.component.html
+++ b/src/app/applications/application-detail/application-detail.component.html
@@ -58,6 +58,26 @@
>Application Adjustment
+
+
+
+
+
+
-
+ @if (COMMENT_TAB_ACTIVE) {
+
+ } @else if (MODIFICATION_COMMENT_TAB_ACTIVE) {
+
+ } @else if (LIFETIME_COMMENT_TAB_ACTIVE) {
+
+ }
diff --git a/src/app/applications/application-detail/application-detail.component.ts b/src/app/applications/application-detail/application-detail.component.ts
index ef5f794798..c30f9414b4 100644
--- a/src/app/applications/application-detail/application-detail.component.ts
+++ b/src/app/applications/application-detail/application-detail.component.ts
@@ -28,6 +28,8 @@ export class ApplicationDetailComponent extends ApplicationBaseClassComponent im
MODIFICATION_TAB: number = 4;
EXTENSION_TAB: number = 5;
COMMENT_TAB: number = 6;
+ MODIFICATION_COMMENT_TAB: number = 7;
+ LIFETIME_COMMENT_TAB: number = 8;
PI_USER_TAB_ACTIVE: boolean = true;
INFORMATION_TAB_ACTIVE: boolean = false;
RESOURCE_TAB_ACTIVE: boolean = false;
@@ -35,7 +37,8 @@ export class ApplicationDetailComponent extends ApplicationBaseClassComponent im
MODIFICATION_TAB_ACTIVE: boolean = false;
EXTENSION_TAB_ACTIVE: boolean = false;
COMMENT_TAB_ACTIVE: boolean = false;
-
+ MODIFICATION_COMMENT_TAB_ACTIVE: boolean = false;
+ LIFETIME_COMMENT_TAB_ACTIVE: boolean = false;
@Input() application: Application;
@Input() default_tab: number = this.PI_USER_TAB;
@@ -52,10 +55,13 @@ export class ApplicationDetailComponent extends ApplicationBaseClassComponent im
this.MODIFICATION_TAB_ACTIVE = false;
this.EXTENSION_TAB_ACTIVE = false;
this.COMMENT_TAB_ACTIVE = false;
+ this.MODIFICATION_COMMENT_TAB_ACTIVE = false;
+ this.LIFETIME_COMMENT_TAB_ACTIVE = false;
}
setTab(tab_num: number): void {
this.setAllTabsFalse();
+ console.log(tab_num);
switch (tab_num) {
case this.PI_USER_TAB:
this.PI_USER_TAB_ACTIVE = true;
@@ -78,6 +84,12 @@ export class ApplicationDetailComponent extends ApplicationBaseClassComponent im
case this.COMMENT_TAB:
this.COMMENT_TAB_ACTIVE = true;
break;
+ case this.LIFETIME_COMMENT_TAB:
+ this.LIFETIME_COMMENT_TAB_ACTIVE = true;
+ break;
+ case this.MODIFICATION_COMMENT_TAB:
+ this.MODIFICATION_COMMENT_TAB_ACTIVE = true;
+ break;
default:
break;
}
diff --git a/src/app/applications/application-vo-actions/application-vo-actions.component.ts b/src/app/applications/application-vo-actions/application-vo-actions.component.ts
index 958abb6c2f..d3d8311db6 100644
--- a/src/app/applications/application-vo-actions/application-vo-actions.component.ts
+++ b/src/app/applications/application-vo-actions/application-vo-actions.component.ts
@@ -467,6 +467,8 @@ export class ApplicationVoActionsComponent extends AbstractBaseClass implements
}
}
if (action === 'adjustedModificationRequest') {
+ this.triggerReloadApplication();
+
// this.isLoaded = false;
// this.changeTabState(ApplicationTabStates.MODIFICATION_EXTENSION);
}
diff --git a/src/app/applications/type-overview.component.html b/src/app/applications/type-overview.component.html
index e0561c5a7d..b75405cda8 100644
--- a/src/app/applications/type-overview.component.html
+++ b/src/app/applications/type-overview.component.html
@@ -235,8 +235,8 @@
New Kubernetes Application
@@ -279,7 +279,7 @@
Configurability – Kubernetes allows the configuration of any resource type available,
- such as virtual machines, network.
+ such as containers and network.
diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html
index adb3016ba2..633dad5272 100644
--- a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html
+++ b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html
@@ -1,5 +1,5 @@