From b9ee32a7f0222663b81af9afc862a901ad0ed6e4 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 28 Nov 2023 15:53:25 +0000 Subject: [PATCH 1/2] feat(NFDI): Allow longer project lifetimes --- .../application-formular.component.html | 11 ++++++++--- .../application-formular.component.ts | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/app/applications/application-formular/application-formular.component.html b/src/app/applications/application-formular/application-formular.component.html index e9cc5aab17..3a61363287 100644 --- a/src/app/applications/application-formular/application-formular.component.html +++ b/src/app/applications/application-formular/application-formular.component.html @@ -255,9 +255,14 @@
General Information
/>
months
- How long would you like to run this project ({{ max_lifetime }} months is maximum)? + How long would you like to run this project? +
+ The maximum possible initial lifetime to be requested is + {{ max_lifetime }} months. Under certain conditions, longer initial terms can also be + granted, for example in the case the project is an NFDI project. Please click the + corresponding options in the further course of the form and enter further information in the available + comment and description fields if necessary. +
diff --git a/src/app/applications/application-formular/application-formular.component.ts b/src/app/applications/application-formular/application-formular.component.ts index aa308eab32..236689976f 100644 --- a/src/app/applications/application-formular/application-formular.component.ts +++ b/src/app/applications/application-formular/application-formular.component.ts @@ -83,7 +83,9 @@ export class ApplicationFormularComponent extends ApplicationBaseClassComponent WIKI_PERSONAL_DATA: string = WIKI_PERSONAL_DATA; GDPR_LINK: string = GDPR_LINK; survey_link_visible: boolean = false; - max_lifetime: number = 6; + + MAX_LIFETIME_DEFAULT: number = 6; + max_lifetime: number = this.MAX_LIFETIME_DEFAULT; acknowledgeModalTitle: string = 'Acknowledge'; acknowledgeModalType: string = 'info'; @@ -418,6 +420,8 @@ export class ApplicationFormularComponent extends ApplicationBaseClassComponent case 'nfdi': { if (!checked) { this.application.project_application_nfdi = ''; + } else { + this.max_lifetime = 12; } break; } From 808400e6afaaf6105441fdfdd958fa61957324db Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 29 Nov 2023 13:40:41 +0000 Subject: [PATCH 2/2] feat(Lifetimes): Allow longer initial lifetimes and amount adjustment for certain projects --- .../application-formular.component.html | 3 +- .../applications/applications.component.html | 101 +++++++++++++----- .../lifetime-request.component.html | 13 ++- .../lifetime-request.component.ts | 9 +- 4 files changed, 97 insertions(+), 29 deletions(-) diff --git a/src/app/applications/application-formular/application-formular.component.html b/src/app/applications/application-formular/application-formular.component.html index 3a61363287..272ce3c109 100644 --- a/src/app/applications/application-formular/application-formular.component.html +++ b/src/app/applications/application-formular/application-formular.component.html @@ -261,7 +261,8 @@
General Information
{{ max_lifetime }} months. Under certain conditions, longer initial terms can also be granted, for example in the case the project is an NFDI project. Please click the corresponding options in the further course of the form and enter further information in the available - comment and description fields if necessary. + comment and description fields if necessary. Please consider: After initially approved, you are able + to extend your project lifetime by sending extension requests. diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index e5dee227a7..4e5bef6f67 100644 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -111,9 +111,9 @@ selectedCenter[application.project_application_id] !== undefined ? 'is-valid' : 'is-invalid' " *ngIf=" - (application | hasstatusinlist : Application_States.SUBMITTED) || - (application | hasstatusinlist : Application_States.CONFIRMATION_DECLINED) || - ((application | hasstatusinlist : Application_States.WAIT_FOR_CONFIRMATION) && + (application | hasstatusinlist: Application_States.SUBMITTED) || + (application | hasstatusinlist: Application_States.CONFIRMATION_DECLINED) || + ((application | hasstatusinlist: Application_States.WAIT_FOR_CONFIRMATION) && !application?.project_application_compute_center?.FacilityId) " [(ngModel)]="selectedCenter[application.project_application_id]" @@ -134,7 +134,7 @@ - {{ + {{ application?.project_application_compute_center?.Name }} @@ -143,8 +143,8 @@
+
+ +
+
+ +
+ Amount of requested lifetime months +
+ +
+
+ +
+ Lifetime you want to grant +
+
+
Resources* @@ -1096,7 +1147,7 @@
name="{{ fl.name }}_requested" id="{{ fl.name }}_requested" type="text" - value="{{ selectedApplication | flavorCounter : fl }}" + value="{{ selectedApplication | flavorCounter: fl }}" placeholder="0" disabled /> @@ -1116,7 +1167,7 @@
step="1" placeholder="e.g 1" (ngModelChange)="onChangeFlavor(fl, $event)" - [ngModel]="adjustedApplication | flavorCounter : fl" + [ngModel]="adjustedApplication | flavorCounter: fl" #name="ngModel" appMinAmount="0" appIntegerOrNull @@ -1485,7 +1536,7 @@

Adjust lifetime extension for {{ selectedApplication?.project_application_sh type="number" min="1" step="1" - max="6" + max="24" [(ngModel)]="adjustedApplication?.project_lifetime_request.extra_lifetime" appMinAmount="0" appInteger diff --git a/src/app/projectmanagement/modals/lifetime-request/lifetime-request.component.html b/src/app/projectmanagement/modals/lifetime-request/lifetime-request.component.html index 84714a890a..2b44f2e2c9 100644 --- a/src/app/projectmanagement/modals/lifetime-request/lifetime-request.component.html +++ b/src/app/projectmanagement/modals/lifetime-request/lifetime-request.component.html @@ -76,7 +76,18 @@

Extension request for {{ project?.project_application_shortname }}

months
- Number of months you want to extend the project (up to a maximum of 6 months). + Number of months you want to extend the project. Consider a maximum of {{ max_lifetime }} months + + +
+
+
+ Please consider: in certain cases the possible amount of months to extend the project can be higher than the + given maximum. This applies e.g for NFDI-projects. Please use the comment function to justify + the need for an extension beyond the maximum possible number of months. +
diff --git a/src/app/projectmanagement/modals/lifetime-request/lifetime-request.component.ts b/src/app/projectmanagement/modals/lifetime-request/lifetime-request.component.ts index 6c1a9a6955..25530a9de1 100644 --- a/src/app/projectmanagement/modals/lifetime-request/lifetime-request.component.ts +++ b/src/app/projectmanagement/modals/lifetime-request/lifetime-request.component.ts @@ -24,7 +24,8 @@ export class LifetimeRequestComponent implements OnInit, OnDestroy { life_time_string: string; end_date: Date; new_end_date: Date | string; - max_lifetime: number = 6; + MAX_LIFETIME_DEFAULT: number = 6; + max_lifetime: number = this.MAX_LIFETIME_DEFAULT; selected_ontology_terms: EdamOntologyTerm[] = []; edam_ontology_terms: EdamOntologyTerm[]; ontology_search_keyword: string = 'term'; @@ -45,7 +46,11 @@ export class LifetimeRequestComponent implements OnInit, OnDestroy { this.edam_ontology_terms = terms; this.searchTermsInEdamTerms(); }); - + if (this.project.project_application_nfdi?.length > 0) { + this.max_lifetime = 12; + } else { + this.max_lifetime = this.MAX_LIFETIME_DEFAULT; + } if (this.project.project_lifetime_request) { this.temp_project_extension = new ApplicationLifetimeExtension(this.project.project_lifetime_request); } else {