Merge branch 'dev' into staging

deNBI · Jul 23, 2024 · 6e5e08b · 6e5e08b
2 parents 0aff3d1 + 5d3d1ec
commit 6e5e08b
Show file tree

Hide file tree

Showing 8 changed files with 684 additions and 717 deletions.
diff --git a/src/app/applications/application-card/application-card.component.html b/src/app/applications/application-card/application-card.component.html
@@ -1,49 +1,49 @@
 <tr>
-    <td>
-        <app-application-badges [application]="application"></app-application-badges>
-    </td>
-    <td>{{ application?.project_application_name }}</td>
-    <td>{{ application?.project_application_shortname }}</td>
-    <td>{{ application?.project_application_date_submitted }}</td>
-    <td style="word-wrap: break-word; min-width: 110px; max-width: 130px; white-space: normal">
-        @if (application?.project_application_user?.username) {
-            {{ application?.project_application_user?.username }}
-        } @else {
-            <span class="spinner-border text-info"></span>
-        }
-    </td>
-    <td>{{ application?.project_application_institute }}</td>
+	<td>
+		<app-application-badges [application]="application"></app-application-badges>
+	</td>
+	<td>{{ application?.project_application_name }}</td>
+	<td>{{ application?.project_application_shortname }}</td>
+	<td>{{ application?.project_application_date_submitted }}</td>
+	<td style="word-wrap: break-word; min-width: 110px; max-width: 130px; white-space: normal">
+		@if (application?.project_application_user?.username) {
+			{{ application?.project_application_user?.username }}
+		} @else {
+			<span class="spinner-border text-info"></span>
+		}
+	</td>
+	<td>{{ application?.project_application_institute }}</td>
 
-    @if (voView) {
-        <app-application-vo-actions
-                (switchCollapseEvent)="switchCollaps()"
-                class="table-line"
-                [application]="application"
-                [tabState]="tabState"
-                [computeCenters]="computeCenters"
-                (reloadNumbersTrigger)="triggerReloadNumbers()"
-                (removeApplicationTrigger)="triggerRemoveApplication()"
-                (reloadApplicationTrigger)="getApplication()"
-        ></app-application-vo-actions>
-    } @else if (facilityView) {
-        <app-application-facility-actions
-                (switchCollapseEvent)="switchCollaps()"
-                class="table-line"
-                [application]="application"
-                [tabState]="tabState"
-                (reloadNumbersTrigger)="triggerReloadNumbers()"
-                (removeApplicationTrigger)="triggerRemoveApplication()"
-                (reloadApplicationTrigger)="getApplication()"
-
-        ></app-application-facility-actions>
-    }
+	@if (voView) {
+		<app-application-vo-actions
+			(switchCollapseEvent)="switchCollaps()"
+			class="table-line"
+			[application]="application"
+			[tabState]="tabState"
+			[computeCenters]="computeCenters"
+			(reloadNumbersTrigger)="triggerReloadNumbers()"
+			(removeApplicationTrigger)="triggerRemoveApplication()"
+			(reloadApplicationTrigger)="getApplication()"
+		></app-application-vo-actions>
+	} @else if (facilityView) {
+		<app-application-facility-actions
+			(switchCollapseEvent)="switchCollaps()"
+			class="table-line"
+			[application]="application"
+			[tabState]="tabState"
+			(reloadNumbersTrigger)="triggerReloadNumbers()"
+			(removeApplicationTrigger)="triggerRemoveApplication()"
+			(reloadApplicationTrigger)="getApplication()"
+		></app-application-facility-actions>
+	}
 </tr>
 <td colspan="12">
-    @if (!isCollapsed) {
-        <app-application-detail #applicationdetail
-                                [class.collapse_no_margin]="isCollapsed"
-                                [class.collapse]="isCollapsed"
-                                [application]="application"
-        ></app-application-detail>
-    }
+	@if (!isCollapsed) {
+		<app-application-detail
+			#applicationdetail
+			[class.collapse_no_margin]="isCollapsed"
+			[class.collapse]="isCollapsed"
+			[application]="application"
+		></app-application-detail>
+	}
 </td>
diff --git a/src/app/applications/application-card/application-card.component.ts b/src/app/applications/application-card/application-card.component.ts
@@ -18,7 +18,6 @@ import { ApplicationDetailComponent } from '../application-detail/application-de
 	styleUrl: './application-card.component.scss',
 })
 export class ApplicationCardComponent extends AbstractBaseClass implements OnInit {
-
 	@Input() application: Application;
 	@Input() tabState: ApplicationTabStates = ApplicationTabStates.SUBMITTED;
 	@Input() computeCenters: ComputecenterComponent[] = [];
@@ -57,10 +56,7 @@ export class ApplicationCardComponent extends AbstractBaseClass implements OnIni
 		});
 	}
 
-	constructor(
-		private applicationsService: ApplicationsService,
-
-	) {
+	constructor(private applicationsService: ApplicationsService) {
 		super();
 	}
 

diff --git a/src/app/applications/application-detail/information-detail/information-detail.component.html b/src/app/applications/application-detail/information-detail/information-detail.component.html
@@ -7,7 +7,7 @@ <h5>
 					*ngFor="let term of application?.project_application_edam_terms"
 					style="margin-left: 5px"
 					class="badge bg-info"
-					><span id="topic_{{ term.name }}">{{ term.name }}</span>
+					><span id="topic_{{ term.term }}">{{ term.term }}</span>
 				</span>
 			</h5>
 		</td>