Merge branch 'dev' into staging

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@denbi/cloud-portal-webapp",
-  "version": "4.804.0",
+  "version": "4.807.0",
   "description": "de.NBI Cloud Portal",
   "scripts": {
     "ng": "ng serve",
@@ -38,15 +38,15 @@
     "@ng-select/ng-select": "^11.2.0",
     "@sindresorhus/transliterate": "1.6.0",
     "@types/d3": "7.4.3",
-    "@types/jquery": "3.5.27",
+    "@types/jquery": "3.5.29",
     "acorn": "8.11.2",
     "ajv-formats": "2.1.1",
     "angulartics2": "12.2.1",
     "billboard.js": "3.10.3",
     "bootstrap": "4.6.2",
     "chart.js": "4.4.0",
     "cli-color": "2.0.3",
-    "core-js": "3.33.2",
+    "core-js": "3.33.3",
     "css-loader": "6.8.1",
     "cssnano": "6.0.1",
     "d3": "7.8.5",
@@ -91,7 +91,7 @@
     "@playwright/test": "1.39.0",
     "@typescript-eslint/eslint-plugin": "^6.9.0",
     "@typescript-eslint/parser": "^6.9.0",
-    "@types/jasmine": "5.1.2",
+    "@types/jasmine": "5.1.4",
     "@types/node": "20.8.10",
     "async": "3.2.5",
     "audit-ci": "6.6.1",

src/app/applications/application-formular/application-formular.component.html

@@ -255,9 +255,15 @@ <h5 class="col-md-6 form-control-label">General Information</h5>
 									/>
 									<div class="input-group-append"><span class="input-group-text"> months </span></div>
 								</div>
-								<span class="help-block"
-									>How long would you like to run this project ({{ max_lifetime }} months is maximum)?</span
-								>
+								<span class="help-block">How long would you like to run this project?</span>
+								<div class="alert alert-primary">
+									The maximum possible initial lifetime to be requested is
+									<strong>{{ max_lifetime }} months.</strong> Under certain conditions, longer initial terms can also be
+									granted, for example in the case the project is an <strong>NFDI</strong> 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. Please consider: After initially approved, you are able
+									to extend your project lifetime by sending extension requests.
+								</div>
 							</div>
 						</div>
 

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;
 			}