From 3cbbc38370b754e8ace809a136a0ebef53e1485b Mon Sep 17 00:00:00 2001
From: amentis <amentis@cite.gr>
Date: Wed, 15 May 2024 10:46:50 +0300
Subject: [PATCH] plan overview show user roles with section

---
 .../app/ui/dmp/overview/dmp-overview.component.html  | 12 ++++++++----
 .../app/ui/dmp/overview/dmp-overview.component.ts    |  9 +++++++++
 dmp-frontend/src/assets/i18n/en.json                 |  3 +++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index 4d8cfc31b..481c0d4a4 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -239,15 +239,15 @@
 					</ng-container>
 					<div class="row">
 						<div class="col-12">
-							<div class="frame mb-3 pt-4 pl-4 pr-5 pb-3">
+							<div class="frame mb-3 pt-4 pl-3 pr-3 pb-3">
 								<div class="row">
 									<div class="col-12">
 										<p class="header">{{ 'DMP-OVERVIEW.DMP-AUTHORS' | translate }}</p>
 									</div>
 									<div class="col-12">
 										<div *ngFor="let dmpUser of dmp.dmpUsers" class="row authors">
-											<div class="col-auto pr-0">
-												<button class="account_btn">
+											<div class="col-auto d-flex flex-row">
+												<button class="account_btn mr-3 pl-0">
 													<mat-icon class="account-icon">account_circle</mat-icon>
 												</button>
 											</div>
@@ -257,7 +257,11 @@
 													<span *ngIf="isUserAuthor(dmpUser.user?.id)">
 													({{ 'DMP-OVERVIEW.YOU' | translate }})</span>
 												</p>
-												<p class="authors-role">{{ enumUtils.toDmpUserRoleString(dmpUser.role) }}</p>
+												<p class="authors-role">
+													<span>{{ enumUtils.toDmpUserRoleString(dmpUser.role) }} - </span>
+													<span *ngIf="!dmpUser.sectionId">{{ 'DMP-OVERVIEW.ROLES.ALL-SECTIONS' | translate}}</span>
+													<span *ngIf="dmpUser.sectionId">{{ getSectionNameById(dmpUser.sectionId) }}</span>
+												</p>
 											</div>
 											<div *ngIf="canAssignDmpUsers(dmp) && dmp.status === dmpStatusEnum.Draft && dmpUser.role != dmpUserRoleEnum.Owner" class="col-auto">
 												<button (click)="removeUserFromDmp(dmpUser)" mat-mini-fab matTooltip="{{ 'DMP-OVERVIEW.ACTIONS.REMOVE-AUTHOR' | translate}}" matTooltipPosition="above">
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index acd56a99a..0e60e7253 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -710,6 +710,14 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		return path + reference;
 	}
 
+	getSectionNameById(sectionId: Guid): string {
+		if (sectionId == null)  return '';
+		
+		let sections: DmpBlueprintDefinitionSection[] = this.dmp?.blueprint?.definition?.sections?.filter((section:DmpBlueprintDefinitionSection) => sectionId===section.id);
+
+		return sections == null ? '' : sections[0].label; 
+	}
+
 	checkLockStatus(id: Guid) {
 		this.lockService.checkLockStatus(Guid.parse(id.toString())).pipe(takeUntil(this._destroyed))
 			.subscribe(lockStatus => {
@@ -757,6 +765,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 			[nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.status)].join('.'),
 			[nameof<Dmp>(x => x.descriptions), nameof<Description>(x => x.isActive)].join('.'),
 			[nameof<Dmp>(x => x.dmpUsers), nameof<DmpUser>(x => x.id)].join('.'),
+			[nameof<Dmp>(x => x.dmpUsers), nameof<DmpUser>(x => x.sectionId)].join('.'),
 			[nameof<Dmp>(x => x.dmpUsers), nameof<DmpUser>(x => x.user.id)].join('.'),
 			[nameof<Dmp>(x => x.dmpUsers), nameof<DmpUser>(x => x.user.name)].join('.'),
 			[nameof<Dmp>(x => x.dmpUsers), nameof<DmpUser>(x => x.role)].join('.'),
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index b8e9bc3ff..39b15fbc1 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -703,6 +703,9 @@
 		"MIN-DESCRIPTIONS-DIALOG": {
 			"TITLE": "Min({{minMultiplicity}}) Descriptions needed using this template.",
 			"MESSAGE": "Add Description."
+		},
+		"ROLES": {
+			"ALL-SECTIONS": "All Sections"
 		}
 	},
 	"DESCRIPTION-OVERVIEW": {