Merge remote-tracking branch 'origin/Development' into roadmap

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java

@@ -285,33 +285,59 @@ public class WordBuilder {
         for (FieldSet compositeField: compositeFields) {
             if (visibilityRuleService.isElementVisible(compositeField.getId()) && hasVisibleFields(compositeField, visibilityRuleService)) {
                 char c = 'a';
+                int multiplicityItems = 0;
                 boolean hasMultiplicityItems = false;
                 int paragraphPos = -1;
+                int paragraphPosInner = -1;
                 if (compositeField.getTitle() != null && !compositeField.getTitle().isEmpty() && !createListing) {
                     XWPFParagraph paragraph = addParagraphContent("\t" + page + "." + section + "." + (compositeField.getOrdinal() +1) + " " + compositeField.getTitle(), mainDocumentPart, ParagraphStyle.HEADER6, numId);
                     CTDecimalNumber number = paragraph.getCTP().getPPr().getNumPr().addNewIlvl();
                     number.setVal(BigInteger.valueOf(indent));
                     paragraphPos = mainDocumentPart.getPosOfParagraph(paragraph);
                     if(compositeField.getMultiplicityItems() != null && !compositeField.getMultiplicityItems().isEmpty()){
-                        addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.HEADER6, numId);
+//                        addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.HEADER6, numId);
+                        XWPFParagraph paragraphInner = addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.TEXT, numId);
+                        paragraphPosInner = mainDocumentPart.getPosOfParagraph(paragraphInner);
                         hasMultiplicityItems = true;
+                        multiplicityItems++;
                     }
                 }
                 hasValue = createFields(compositeField.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService, hasMultiplicityItems);
                 if(hasValue){
                     returnedValue = true;
+                } else if(paragraphPosInner > -1){
+                    mainDocumentPart.removeBodyElement(paragraphPosInner);
+                    c--;
+                    multiplicityItems--;
                 }
                 if (compositeField.getMultiplicityItems() != null && !compositeField.getMultiplicityItems().isEmpty()) {
                     List<FieldSet> list = compositeField.getMultiplicityItems().stream().sorted(Comparator.comparingInt(FieldSet::getOrdinal)).collect(Collectors.toList());
                     for (FieldSet multiplicityFieldset : list) {
+                        paragraphPosInner = -1;
                         if(!createListing){
                             c++;
-                            addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.HEADER6, numId);
+//                            addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.HEADER6, numId);
+                            XWPFParagraph paragraphInner = addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.TEXT, numId);
+                            paragraphPosInner = mainDocumentPart.getPosOfParagraph(paragraphInner);
                             hasMultiplicityItems = true;
+                            multiplicityItems++;
                         }
-                        hasValue = createFields(multiplicityFieldset.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService, hasMultiplicityItems);
+//                        hasValue = createFields(multiplicityFieldset.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService, hasMultiplicityItems);
-                        if(hasValue){
+                        boolean hasValueInner = createFields(multiplicityFieldset.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService, hasMultiplicityItems);
+//                        if(hasValue){
+                        if(hasValueInner){
+                            hasValue = true;
                             returnedValue = true;
+                        } else if(paragraphPosInner > -1){
+                            mainDocumentPart.removeBodyElement(paragraphPosInner);
+                            c--;
+                            multiplicityItems--;
+                        }
+                    }
+                    if(multiplicityItems == 1) {
+                        String text = mainDocumentPart.getLastParagraph().getRuns().get(0).getText(0);
+                        if(text.equals("a. ")) {
+                            mainDocumentPart.getLastParagraph().removeRun(0);
                         }
                     }
                 }
@@ -422,6 +448,7 @@ public class WordBuilder {
                             if(hasMultiplicityItems && format != null){
                                 mainDocumentPart.getLastParagraph().createRun().setText(format);
                                 hasMultiplicityItems = false;
+                                hasValue = true;
                             }
                             else{
                                 XWPFParagraph paragraph = addParagraphContent(format, mainDocumentPart, field.getViewStyle().getRenderStyle().equals("richTextarea") ? ParagraphStyle.HTML : ParagraphStyle.TEXT, numId);
@@ -461,6 +488,7 @@ public class WordBuilder {
     }
 
     public XWPFParagraph addParagraphContent(Object content, XWPFDocument mainDocumentPart, ParagraphStyle style, BigInteger numId) {
+//        this.indent = 0;
         if (content != null) {
             if (content instanceof String && ((String)content).isEmpty()) {
                 return null;

dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java

@@ -238,7 +238,14 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
 
     @Override
     public int compareTo(Object o) {
-        return this.ordinal.compareTo(((Field) o).getOrdinal());
+        Field comparedField = (Field) o;
+        if(this.ordinal != null) {
+            return this.ordinal.compareTo(comparedField.getOrdinal());
+        } else if (comparedField.getOrdinal() != null) {
+            return comparedField.getOrdinal().compareTo(this.ordinal);
+        } else {
+            return 0;
+        }
     }
 
     @Override

dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section-inner/form-section-inner.component.html

@@ -20,8 +20,8 @@
 					</div>
 					<div *ngIf="(compositeFieldFormGroup.get('multiplicity').value.max - 1) > (compositeFieldFormGroup.get('multiplicityItems').length)"
 						class="col-12 mt-1 ml-0 mr-0 addOneFieldButton">
-						<span class="pointer d-inline-flex align-items-center">
+						<span class="pointer d-inline-flex align-items-center" (click)="addMultipleField(i)" >
-							<button mat-icon-button color="primary" (click)="addMultipleField(i)" [disabled]="compositeFieldFormGroup.disabled">
+							<button mat-icon-button color="primary" [disabled]="compositeFieldFormGroup.disabled">
 								<mat-icon>add_circle</mat-icon>
 							</button>
 							<span class="mt-1" *ngIf="compositeFieldFormGroup.get('multiplicity').value.placeholder">{{compositeFieldFormGroup.get('multiplicity').value.placeholder}}</span>

dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html

@@ -32,8 +32,8 @@
 							</div>
 							<div *ngIf="(compositeFieldFormGroup.get('multiplicity').value.max - 1) > (compositeFieldFormGroup.get('multiplicityItems').length)"
 							 class="col-12 mt-1 ml-0 mr-0 addOneFieldButton">
-								<span class="pointer d-inline-flex align-items-center">
+								<span class="pointer d-inline-flex align-items-center" (click)="addMultipleField(i)">
-									<button mat-icon-button color="primary" (click)="addMultipleField(i)" [disabled]="compositeFieldFormGroup.disabled">
+									<button mat-icon-button color="primary" [disabled]="compositeFieldFormGroup.disabled">
 										<mat-icon>add_circle</mat-icon>
 									</button>
 									<span class="mt-1" *ngIf="compositeFieldFormGroup.get('multiplicity').value.placeholder">{{compositeFieldFormGroup.get('multiplicity').value.placeholder}}</span>
@@ -105,8 +105,8 @@
 							</div>
 							<div *ngIf="(fieldsetEntry.form.get('multiplicity').value.max - 1) > (fieldsetEntry.form.get('multiplicityItems').length)"
 							 class="col-12 mt-1 ml-0 mr-0 addOneFieldButton">
-								<span class="pointer d-inline-flex align-items-center">
+								<span class="pointer d-inline-flex align-items-center" (click)="addMultipleField(i)">
-									<button mat-icon-button color="primary" (click)="addMultipleField(i)" [disabled]="fieldsetEntry.form.disabled">
+									<button mat-icon-button color="primary" [disabled]="fieldsetEntry.form.disabled">
 										<mat-icon>add_circle</mat-icon>
 									</button>
 									<span class="mt-1" *ngIf="fieldsetEntry.form.get('multiplicity').value.placeholder">{{fieldsetEntry.form.get('multiplicity').value.placeholder}}</span>

dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts

@@ -1,4 +1,14 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
+import {
+	ChangeDetectionStrategy,
+	ChangeDetectorRef,
+	Component,
+	EventEmitter,
+	Input,
+	OnChanges,
+	OnInit,
+	Output,
+	SimpleChanges
+} from '@angular/core';
 import {FormArray, FormGroup} from '@angular/forms';
 import {Rule} from '@app/core/model/dataset-profile-definition/rule';
 import {BaseComponent} from '@common/base/base.component';
@@ -57,6 +67,7 @@ export class FormSectionComponent extends BaseComponent implements OnInit, OnCha
 		if (this.tocentry) {//maybe not needed as well
 			this.form = this.tocentry.form as FormGroup;
 		}
+		this.initMultipleFieldsVisibility();
 	}
 
 	ngOnChanges(changes: SimpleChanges) {
@@ -78,26 +89,9 @@ export class FormSectionComponent extends BaseComponent implements OnInit, OnCha
 	// 	this.visibilityRulesService.triggerVisibilityEvaluation();
 	// }
 
-	addMultipleField(fieldsetIndex: number) {
+	setMultipleFieldVisibility(parentCompositeField, compositeField: DatasetDescriptionCompositeFieldEditorModel, idMappings: { old: string, new: string }[]) {
-		const compositeFieldToBeCloned = (this.form.get('compositeFields').get('' + fieldsetIndex) as FormGroup).getRawValue();
-		const multiplicityItemsArray = (<FormArray>(this.form.get('compositeFields').get('' + fieldsetIndex).get('multiplicityItems')));
-
-		const ordinal = multiplicityItemsArray.length ? multiplicityItemsArray.controls.reduce((ordinal, currentControl) => {
-			const currentOrdinal = currentControl.get('ordinal').value as number;
-
-			if (currentOrdinal >= ordinal) {
-				return currentOrdinal + 1;
-			}
-			return ordinal as number;
-		}, 0) : 0;
-		const idMappings = [] as { old: string, new: string }[];
-		const compositeField: DatasetDescriptionCompositeFieldEditorModel = new DatasetDescriptionCompositeFieldEditorModel().cloneForMultiplicity(compositeFieldToBeCloned, ordinal, idMappings);
-
-
-
-
 		// ** COMPOSITE FIELD IS SHOWN OR HIDDEN FROM ANOTHER ELEMENT
-		const compositeFieldVisibilityDependencies = this.visibilityRulesService.getVisibilityDependency(compositeFieldToBeCloned);
+		const compositeFieldVisibilityDependencies = this.visibilityRulesService.getVisibilityDependency(parentCompositeField);
 		if (compositeFieldVisibilityDependencies && compositeFieldVisibilityDependencies.length) {
 
 			compositeFieldVisibilityDependencies.forEach(x => {
@@ -112,25 +106,16 @@ export class FormSectionComponent extends BaseComponent implements OnInit, OnCha
 		}
 
 		// console.log('idMappings ', idMappings);
-		compositeFieldToBeCloned.fields.forEach(element => {
+		parentCompositeField.fields.forEach(element => {
 			// console.log(this.visibilityRulesService.getVisibilityDependency(element.id));
 			const dependency = this.visibilityRulesService.getVisibilityDependency(element.id);
-
-
-
-			try {
-
 			if (dependency && dependency.length) {
-
 				// * INNER VISIBILITY DEPENDENCIES
 				// * IF INNER INPUT HIDES ANOTHER INNER INPUT
-
+				const innerDependency = parentCompositeField.fields.reduce((innerD, currentElement) => {
-					const innerDependency = compositeFieldToBeCloned.fields.reduce((innerD, currentElement) => {
-
 					const innerDependecies = dependency.filter(d => d.sourceControlId === currentElement.id);
 					return [...innerD, ...innerDependecies];
 				}, []) as VisibilityRuleSource[];
-
 				if (innerDependency.length) {
 					//Build visibility source
 					const updatedRules = innerDependency.map(x => {
@@ -173,6 +158,7 @@ export class FormSectionComponent extends BaseComponent implements OnInit, OnCha
 
 				const outerRules = (this.visibilityRulesService.getVisibilityDependency(target) as VisibilityRuleSource[]).filter(x => x.sourceControlId === element.id);
 				const updatedRules = outerRules.map(x => {
+					console.log(idMappings, element);
 					return {...x, sourceControlId: idMappings.find(y => y.old === element.id).new};
 				});
 
@@ -190,24 +176,14 @@ export class FormSectionComponent extends BaseComponent implements OnInit, OnCha
 						type: ''
 					} as Rule;
 				})
-
 				rules.forEach(rule => {
 					this.visibilityRulesService.addNewRule(rule);
 				})
-
 				// this.visibilityRulesService.appendVisibilityRule(visRule);
-
 			});
-
-
-
-
-
 			// * IF INNER INPUT IS HIDDEN BY OUTER INPUT
-
 			if (dependency && dependency.length) {
 				const fieldsThatHideInnerElement = dependency.filter(x => !innerIds.includes(x.sourceControlId));
-
 				if (fieldsThatHideInnerElement.length) {
 					fieldsThatHideInnerElement.forEach(x => {
 						const visRule: Rule = {
@@ -221,16 +197,41 @@ export class FormSectionComponent extends BaseComponent implements OnInit, OnCha
 					});
 				}
 			}
-
-
 			// console.log(`for ${element.id} targets are`, outerTargets);
-			} catch {
+		});
-				console.log('error');
 	}
 
+	initMultipleFieldsVisibility() {
+		(this.form.get('compositeFields') as FormArray).controls.forEach(control => {
+			let parentCompositeField = (control as FormGroup).getRawValue();
+			if (parentCompositeField.multiplicityItems && parentCompositeField.multiplicityItems.length > 0) {
+				parentCompositeField.multiplicityItems.forEach(compositeField => {
+					let idMappings: { old: string, new: string }[] = [{old: parentCompositeField.id, new: compositeField.id}];
+					parentCompositeField.fields.forEach((field, index) => {
+						idMappings.push({ old: field.id, new: compositeField.fields[index].id });
 					});
-		// console.log(this.visibilityRulesService);
+					this.setMultipleFieldVisibility(parentCompositeField, compositeField, idMappings);
-		// console.log(this.visibilityRulesService.getVisibilityDependency());
+				})
+			}
+		});
+	}
+
+	addMultipleField(fieldsetIndex: number) {
+		const compositeFieldToBeCloned = (this.form.get('compositeFields').get('' + fieldsetIndex) as FormGroup).getRawValue();
+		const multiplicityItemsArray = (<FormArray>(this.form.get('compositeFields').get('' + fieldsetIndex).get('multiplicityItems')));
+
+		const ordinal = multiplicityItemsArray.length ? multiplicityItemsArray.controls.reduce((ordinal, currentControl) => {
+			const currentOrdinal = currentControl.get('ordinal').value as number;
+
+			if (currentOrdinal >= ordinal) {
+				return currentOrdinal + 1;
+			}
+			return ordinal as number;
+		}, 0) : 0;
+		const idMappings = [] as { old: string, new: string }[];
+		const compositeField: DatasetDescriptionCompositeFieldEditorModel = new DatasetDescriptionCompositeFieldEditorModel().cloneForMultiplicity(compositeFieldToBeCloned, ordinal, idMappings);
+
+		this.setMultipleFieldVisibility(compositeFieldToBeCloned, compositeField, idMappings);
 		multiplicityItemsArray.push(compositeField.buildForm());
 	}
 
@@ -264,7 +265,6 @@ export class FormSectionComponent extends BaseComponent implements OnInit, OnCha
 	// }
 
 
-
 	onAskedToScroll(id: string) {
 		this.panelExpanded = true;
 		this.askedToScroll.emit(id);

dmp-frontend/src/app/ui/misc/dataset-description-form/visibility-rules/visibility-rules.service.ts

@@ -46,7 +46,6 @@ export class VisibilityRulesService {
 	}
 
 	public updateValueAndVisibility(id: string, value: any) {
-		console.log('updateValueAndVisibility');
 		const visibilityRules = this.visibilityRuleContext.rules.filter(item => item.sourceVisibilityRules.filter(source => source.sourceControlId === id).length > 0);
 		if (visibilityRules.length > 0) {
 			visibilityRules.forEach(item => this.evaluateVisibility(item, value, id));
@@ -347,7 +346,7 @@ export class VisibilityRulesService {
 	public addNewRule(rule: Rule, currentVisibility = this.DEFAULTVISIBILITY): void {
 		const targetId = rule.targetField;
 		const sourceId = rule.sourceField;
-
+		console.log(rule);
 		this.visibilityRuleContext.addToVisibilityRulesContext(rule);