From 536ba9b900eea05dd5ca2922660ff3276b65123e Mon Sep 17 00:00:00 2001
From: Diamantis Tziotzios <dtziotzios@cite.gr>
Date: Tue, 9 Jan 2024 09:42:58 +0200
Subject: [PATCH] Fixes for #9152 #9153 #9162 #9265 #9266 #9311 #9312

---
 .../managers/DataManagementPlanManager.java   |  10 ++-
 .../src/main/resources/documents/h2020.docx   | Bin 30266 -> 30387 bytes
 .../editor/dmp-blueprint-editor.model.ts      |  84 +++++++++---------
 .../editor/dmp-profile-editor.component.ts    |   6 ++
 .../dmp-editor-blueprint.component.html       |   6 +-
 .../dmp-editor-blueprint.component.scss       |  12 ++-
 .../dmp/overview/dmp-overview.component.scss  |   2 +-
 dmp-frontend/src/assets/i18n/en.json          |   4 +-
 .../src/assets/resources/skipDisable.json     |   1 -
 9 files changed, 72 insertions(+), 53 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 3f9b6b184..7726e9200 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -1422,7 +1422,7 @@ public class DataManagementPlanManager {
                             for (Researcher researcher : dmpEntity.getResearchers()) {
                                 XWPFRun runResearcher = systemFieldParagraph.createRun();
                                 runResearcher.addBreak();
-                                runResearcher.setText("• " + researcher.getLabel());
+                                runResearcher.setText(researcher.getLabel());
                                 runResearcher.setColor("116a78");
                             }
                             break;
@@ -1430,7 +1430,7 @@ public class DataManagementPlanManager {
                             for (Organisation organisation : dmpEntity.getOrganisations()) {
                                 XWPFRun runOrganisation = systemFieldParagraph.createRun();
                                 runOrganisation.addBreak();
-                                runOrganisation.setText("• " + organisation.getLabel());
+                                runOrganisation.setText(organisation.getLabel());
                                 runOrganisation.setColor("116a78");
                             }
                             break;
@@ -1581,6 +1581,12 @@ public class DataManagementPlanManager {
                 //runDatasetTitle.setBold(true);
                 //runDatasetTitle.setFontSize(12);
 
+                XWPFParagraph descriptionParagraph = document.createParagraph();
+                XWPFRun descriptionParagraphRun = descriptionParagraph.createRun();
+                descriptionParagraphRun.setText("Description: ");
+                descriptionParagraphRun.setColor("000000");
+                wordBuilder.addParagraphContent(datasetEntity.getDescription(), document, ParagraphStyle.HTML, BigInteger.ZERO, 0);
+
                 XWPFParagraph datasetTemplateParagraph = document.createParagraph();
 //                          datasetTemplateParagraph.setStyle("Heading3");
                 XWPFRun runDatasetTemplate1 = datasetTemplateParagraph.createRun();
diff --git a/dmp-backend/web/src/main/resources/documents/h2020.docx b/dmp-backend/web/src/main/resources/documents/h2020.docx
index b0e721ab0234053b1488fd2d6b2b8af8a066d1c2..defd937d3cebd101cc9f654ded15d45e44763143 100644
GIT binary patch
delta 11722
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
M+)!Yo9siN~Kc5;XL;wH)

delta 11547
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

diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-blueprint-editor.model.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-blueprint-editor.model.ts
index bda17b1b1..034561b37 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-blueprint-editor.model.ts
+++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-blueprint-editor.model.ts
@@ -5,15 +5,15 @@ import { ValidationErrorModel } from "@common/forms/validation/error-model/valid
 import { ValidationContext } from "@common/forms/validation/validation-context";
 
 export class DmpBlueprintEditor {
-    public id: string;
+	public id: string;
 	public label: string;
-    public definition: DmpBlueprintDefinitionEditor = new DmpBlueprintDefinitionEditor();
-    public status: number;
+	public definition: DmpBlueprintDefinitionEditor = new DmpBlueprintDefinitionEditor();
+	public status: number;
 	public created: Date;
 	public modified: Date;
 	public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
 
-    fromModel(item: DmpBlueprint): DmpBlueprintEditor {
+	fromModel(item: DmpBlueprint): DmpBlueprintEditor {
 		this.id = item.id;
 		this.label = item.label;
 		this.definition = new DmpBlueprintDefinitionEditor().fromModel(item.definition);
@@ -51,9 +51,9 @@ export class DmpBlueprintEditor {
 
 export class DmpBlueprintDefinitionEditor {
 
-    public sections: SectionDmpBlueprintEditor[] = new Array<SectionDmpBlueprintEditor>();
+	public sections: SectionDmpBlueprintEditor[] = new Array<SectionDmpBlueprintEditor>();
 
-    fromModel(item: DmpBlueprintDefinition): DmpBlueprintDefinitionEditor {
+	fromModel(item: DmpBlueprintDefinition): DmpBlueprintDefinitionEditor {
 		if (item.sections) { item.sections.map(x => this.sections.push(new SectionDmpBlueprintEditor().fromModel(x))); }
 		return this;
 	}
@@ -62,7 +62,7 @@ export class DmpBlueprintDefinitionEditor {
 		const formBuilder = new FormBuilder();
 		const formGroup = formBuilder.group({});
 		const sectionsFormArray = new Array<FormGroup>();
-		this.sections.forEach(item => {
+		this.sections.sort((a, b) => a.ordinal - b.ordinal).forEach(item => {
 			const form: FormGroup = item.buildForm();
 			sectionsFormArray.push(form);
 		});
@@ -72,23 +72,23 @@ export class DmpBlueprintDefinitionEditor {
 }
 
 export class SectionDmpBlueprintEditor {
-    public id: string;
-    public label: string;
-    public description: string;
-    public ordinal: number;
-    public fields: FieldInSectionEditor[] = new Array<FieldInSectionEditor>();
+	public id: string;
+	public label: string;
+	public description: string;
+	public ordinal: number;
+	public fields: FieldInSectionEditor[] = new Array<FieldInSectionEditor>();
 	public hasTemplates: boolean;
-    public descriptionTemplates: DescriptionTemplatesInSectionEditor[] = new Array<DescriptionTemplatesInSectionEditor>();
+	public descriptionTemplates: DescriptionTemplatesInSectionEditor[] = new Array<DescriptionTemplatesInSectionEditor>();
 	public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
 
-    fromModel(item: SectionDmpBlueprint): SectionDmpBlueprintEditor {
+	fromModel(item: SectionDmpBlueprint): SectionDmpBlueprintEditor {
 		this.id = item.id;
 		this.label = item.label;
 		this.description = item.description;
-        this.ordinal = item.ordinal;
+		this.ordinal = item.ordinal;
 		if (item.fields) { item.fields.map(x => this.fields.push(new FieldInSectionEditor().fromModel(x))); }
 		this.hasTemplates = item.hasTemplates;
-        if (item.descriptionTemplates) { item.descriptionTemplates.map(x => this.descriptionTemplates.push(new DescriptionTemplatesInSectionEditor().fromModel(x))); }
+		if (item.descriptionTemplates) { item.descriptionTemplates.map(x => this.descriptionTemplates.push(new DescriptionTemplatesInSectionEditor().fromModel(x))); }
 		return this;
 	}
 
@@ -101,14 +101,14 @@ export class SectionDmpBlueprintEditor {
 			ordinal: [{ value: this.ordinal, disabled: disabled }, context.getValidation('ordinal')],
 			hasTemplates: [{ value: this.hasTemplates, disabled: disabled }, context.getValidation('hasTemplates')]
 		});
-        const formBuilder = new FormBuilder();
-        const fieldsFormArray = new Array<FormGroup>();
-		this.fields.forEach(item => {
+		const formBuilder = new FormBuilder();
+		const fieldsFormArray = new Array<FormGroup>();
+		this.fields.sort((a, b) => a.ordinal - b.ordinal).forEach(item => {
 			const form: FormGroup = item.buildForm();
 			fieldsFormArray.push(form);
 		});
 		formGroup.addControl('fields', formBuilder.array(fieldsFormArray));
-        const descriptionTemplatesFormArray = new Array<FormGroup>();
+		const descriptionTemplatesFormArray = new Array<FormGroup>();
 		this.descriptionTemplates.forEach(item => {
 			const form: FormGroup = item.buildForm();
 			descriptionTemplatesFormArray.push(form);
@@ -130,25 +130,25 @@ export class SectionDmpBlueprintEditor {
 }
 
 export class FieldInSectionEditor {
-    public id: string;
+	public id: string;
 	public category: FieldCategory;
-    public type: number;
-    public label: string;
-    public placeholder: string;
-    public description: string;
-    public required: boolean;
-    public ordinal: number;
+	public type: number;
+	public label: string;
+	public placeholder: string;
+	public description: string;
+	public required: boolean;
+	public ordinal: number;
 	public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
 
-    fromModel(item: FieldInSection): FieldInSectionEditor {
+	fromModel(item: FieldInSection): FieldInSectionEditor {
 		this.id = item.id;
 		this.category = item.category;
 		this.type = item.type;
 		this.label = item.label;
-        this.placeholder = item.placeholder;
-        this.description = item.description;
-        this.required = item.required;
-        this.ordinal = item.ordinal;
+		this.placeholder = item.placeholder;
+		this.description = item.description;
+		this.required = item.required;
+		this.ordinal = item.ordinal;
 		return this;
 	}
 
@@ -182,19 +182,19 @@ export class FieldInSectionEditor {
 }
 
 export class DescriptionTemplatesInSectionEditor {
-    public id: string;
-    public descriptionTemplateId: string;
-    public label: string;
-    public minMultiplicity: number;
-    public maxMultiplicity: number;
+	public id: string;
+	public descriptionTemplateId: string;
+	public label: string;
+	public minMultiplicity: number;
+	public maxMultiplicity: number;
 	public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
 
-    fromModel(item: DescriptionTemplatesInSection): DescriptionTemplatesInSectionEditor {
+	fromModel(item: DescriptionTemplatesInSection): DescriptionTemplatesInSectionEditor {
 		this.id = item.id;
 		this.descriptionTemplateId = item.descriptionTemplateId;
-        this.label = item.label;
-        this.minMultiplicity = item.minMultiplicity;
-        this.maxMultiplicity = item.maxMultiplicity;
+		this.label = item.label;
+		this.minMultiplicity = item.minMultiplicity;
+		this.maxMultiplicity = item.maxMultiplicity;
 		return this;
 	}
 
@@ -253,4 +253,4 @@ export class DescriptionTemplatesInSectionEditor {
 // 		});
 // 		return formGroup;
 // 	}
-// }
\ No newline at end of file
+// }
diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts
index 66108cebd..65c604863 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts
@@ -249,6 +249,9 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 	  
 	removeField(sectionIndex: number, fieldIndex: number): void {
 		this.fieldsArray(sectionIndex).removeAt(fieldIndex);
+		this.fieldsArray(sectionIndex).controls.forEach((field, index) => {
+			field.get('ordinal').setValue(index + 1);
+		});
 	}
 
 	systemFieldsArray(sectionIndex: number): FormArray {
@@ -366,6 +369,9 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
 	drop(event: CdkDragDrop<string[]>, sectionIndex: number) {
 		moveItemInArray(this.fieldsArray(sectionIndex).controls, event.previousIndex, event.currentIndex);
     	moveItemInArray(this.fieldsArray(sectionIndex).value, event.previousIndex, event.currentIndex);
+		this.fieldsArray(sectionIndex).controls.forEach((field, index) => {
+			field.get('ordinal').setValue(index + 1);
+		});
 	}
 
 	dropSections(event: CdkDragDrop<string[]>) {
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html
index e94a96db9..f60d38f2c 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html
@@ -84,7 +84,7 @@
 				<div class="col-auto formForStep0" id="editor-form" *ngIf="this.step === 0 && this.isNew">
 					<div class="col-12 blueprint-section" [hidden]="this.step !== 0">
 						<div class="">
-							<div class="heading2">0.1 Title of DMP *</div>
+							<div class="heading2">Title of DMP *</div>
 							<mat-form-field>
 								<mat-label>Title</mat-label>
 								<input matInput type="text" name="label" [formControl]="formGroup.get('label')" required>
@@ -95,13 +95,13 @@
 							</mat-form-field>
 						</div>
 						<div class="">
-							<div class="heading2">0.2 Description of DMP *</div>
+							<div class="heading2">Description of DMP *</div>
 							<rich-text-editor-component [parentFormGroup]="formGroup" [controlName]="'description'"
 								[placeholder]="'Fill with description'" [required]="true">
 							</rich-text-editor-component>
 						</div>
 						<div class="" style="margin-top: 3%;">
-							<div class="heading2">0.3 Blueprint of DMP *</div>
+							<div class="heading2">Blueprint of DMP *</div>
 							<mat-form-field>
 								<mat-label>Select blueprint</mat-label>
 								<app-single-auto-complete [required]="false" [formControl]="formGroup.get('profile')" placeholder="Select blueprint" [configuration]="dmpBlueprintAutoCompleteConfiguration">
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.scss b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.scss
index e8209775a..a9283c45b 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.scss
@@ -425,5 +425,13 @@ a:hover {
 
 ::ng-deep .input-form .mat-form-field-appearance-outline .mat-form-field-infix {
 	font-size: 1rem;
-	padding: 0.6em 0 1em 0 !important;
-}
\ No newline at end of file
+	// padding: 0.6em 0 1em 0 !important;
+}
+
+::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
+	padding: 1em 0 1em 0 !important;
+}
+
+// ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
+// 	padding: 0rem 0rem 0.4rem 0rem !important;
+// }
\ No newline at end of file
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
index 9833fa58d..5f3773e0b 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
@@ -332,7 +332,7 @@
 	vertical-align: bottom;
 }
 
-::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
+:host ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
 	padding: 0rem 0rem 0.4rem 0rem !important;
 }
 
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 8991904c1..0361a9f8e 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -318,7 +318,7 @@
 				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
 				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
 				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
+				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
 				"TEMPLATE-OUTLINE": "Template outline",
@@ -1159,7 +1159,7 @@
 			"DATASET-SELECTION": "Dataset selection",
 			"DESCRIPTION-INFO": "Description info",
 			"LICENSE-INFO": "License",
-			"DATASET": "Dataset",
+			"DATASET": "Description",
 			"PREVIOUS": "Previous",
 			"NEXT": "Next"
 		},
diff --git a/dmp-frontend/src/assets/resources/skipDisable.json b/dmp-frontend/src/assets/resources/skipDisable.json
index 61fc34953..3a0850e64 100644
--- a/dmp-frontend/src/assets/resources/skipDisable.json
+++ b/dmp-frontend/src/assets/resources/skipDisable.json
@@ -1,6 +1,5 @@
 [
 	"DatasetProfileEditorModel.description",
-	"DatasetProfileEditorModel.type",
 	"DatasetProfileEditorModel.label",
 	"SectionEditorModel.title",
 	"SectionEditorModel.description",