From 556b1706d6fc78daaa821c9b704fd421910f82d0 Mon Sep 17 00:00:00 2001
From: annabakouli <annabakouli@gmail.com>
Date: Fri, 12 Jan 2018 11:00:26 +0200
Subject: [PATCH] no message

---
 .../eu/eudat/models/properties/FieldSet.java  | 84 +++++++++++--------
 .../components/datasetprofile/FieldSet.java   |  1 +
 .../dynamic-field-dropdown.html               |  1 +
 .../dynamic-form-field.component.html         |  8 +-
 .../src/app/form/dynamic-form.component.ts    |  5 +-
 dmp-frontend/src/app/models/Section.ts        |  2 +-
 6 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/FieldSet.java b/dmp-backend/src/main/java/eu/eudat/models/properties/FieldSet.java
index 41547c862..e60d1bb94 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/properties/FieldSet.java
+++ b/dmp-backend/src/main/java/eu/eudat/models/properties/FieldSet.java
@@ -1,44 +1,60 @@
 package eu.eudat.models.properties;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
-public class FieldSet implements PropertiesGenerator{	
-	private List<Field> fields;
-	private List<FieldSet> multiplicityItems;
-		
-	public List<FieldSet> getMultiplicityItems() {
-		return multiplicityItems;
-	}
+public class FieldSet implements PropertiesGenerator {
+    private String id;
+    private List<Field> fields;
+    private List<FieldSet> multiplicityItems;
+    private String commentFieldValue;
 
-	public void setMultiplicityItems(List<FieldSet> multiplicityItems) {
-		this.multiplicityItems = multiplicityItems;
-	}
+    public String getId() {
+        return id;
+    }
 
-	public List<Field> getFields() {
-		return fields;
-	}
+    public void setId(String id) {
+        this.id = id;
+    }
 
-	public void setFields(List<Field> fields) {
-		this.fields = fields;
-	}
+    public String getCommentFieldValue() {
+        return commentFieldValue;
+    }
 
-	@Override
-	public void toMap(Map<String, Object> fieldValues) {
-		this.fields.forEach(item->item.toMap(fieldValues));
-		Map<String,Object> multiplicity = new HashMap<String,Object>();
-		if(this.multiplicityItems!=null){
-			this.multiplicityItems.forEach(item->item.toMap(fieldValues,this.multiplicityItems.indexOf(item)));
-		}
-		//fieldValues.put(this.id,multiplicity);
-	}
+    public void setCommentFieldValue(String commentFieldValue) {
+        this.commentFieldValue = commentFieldValue;
+    }
 
-	@Override
-	public void toMap(Map<String, Object> fieldValues, int index) {
-		this.fields.forEach(item->item.toMap(fieldValues,index));
-		//this.multiplicityItems.forEach(item->item.toMap(fieldValues,index));		
-	}	
+    public List<FieldSet> getMultiplicityItems() {
+        return multiplicityItems;
+    }
+
+    public void setMultiplicityItems(List<FieldSet> multiplicityItems) {
+        this.multiplicityItems = multiplicityItems;
+    }
+
+    public List<Field> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<Field> fields) {
+        this.fields = fields;
+    }
+
+    @Override
+    public void toMap(Map<String, Object> fieldValues) {
+        fieldValues.put("commentFieldValue" + this.id, this.commentFieldValue);
+        this.fields.forEach(item -> item.toMap(fieldValues));
+        Map<String, Object> multiplicity = new HashMap<String, Object>();
+        if (this.multiplicityItems != null) {
+            this.multiplicityItems.forEach(item -> item.toMap(fieldValues, this.multiplicityItems.indexOf(item)));
+        }
+        //fieldValues.put(this.id,multiplicity);
+    }
+
+    @Override
+    public void toMap(Map<String, Object> fieldValues, int index) {
+        this.fields.forEach(item -> item.toMap(fieldValues, index));
+        //this.multiplicityItems.forEach(item->item.toMap(fieldValues,index));
+    }
 
 }
diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java b/dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java
index 8aaed0bd9..f5fcf2a84 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java
+++ b/dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java
@@ -135,6 +135,7 @@ public class FieldSet implements Comparable,PropertiesModelBuilder, ViewStyleDef
 
 	@Override
 	public void fromJsonObject(Map<String, Object> properties) {		
+		this.commentFieldValue = (String) properties.get("commentFieldValue"+this.id);
 		this.multiplicityItems = new LinkedList<FieldSet>();
 		this.fields.forEach(item->{
 			item.fromJsonObject(properties);
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
index 45f836cdf..783cef0fb 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
@@ -3,6 +3,7 @@
         <mat-select formControlName="value">
             <mat-option *ngFor="let opt of field.data.options" [value]="opt.value">{{opt.label}}</mat-option>
         </mat-select>
+        <mat-error *ngIf="form.get('value').errors?.required">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>                
     </mat-form-field>
 
 </div>
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html
index 40de1a4e8..f0c33eb4c 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html
@@ -12,6 +12,7 @@
     <div *ngSwitchCase="'freetext'">
       <mat-form-field>
         <input matInput formControlName="value" placeholder="{{field.data.label}}">
+        <mat-error *ngIf="form.get('value').errors?.required">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>        
       </mat-form-field>
     </div>
 
@@ -36,6 +37,7 @@
         <button mat-button *ngIf="form.get('value').value" matSuffix mat-icon-button aria-label="Clear" (click)="this.form.patchValue({'value': ''})">
             <mat-icon>close</mat-icon>
           </button>
+          <mat-error *ngIf="form.get('value').errors?.required">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>                  
       </mat-form-field>
 
     </div>
@@ -51,12 +53,12 @@
     <div *ngSwitchCase="'label'"> </div>
 
 
-    <div [hidden]="isValid">
+    <!--<div [hidden]="isValid">
       <mat-error *ngIf="isValidRequired">The field "{{field.data.label}}" <strong>required</strong></mat-error>
-      <!-- <div class="invalid-feedbackCustom" *ngIf="isValidRequired">The field "{{field.label}}" is required</div> -->
+       <div class="invalid-feedbackCustom" *ngIf="isValidRequired">The field "{{field.label}}" is required</div> 
       <div class="invalid-feedbackCustom" *ngIf="isValidPattern">The field {{field.label}} must match a regular expression {{field.regex}}</div>
       <div class="invalid-feedbackCustom" *ngIf="isValidCustom">The field {{field.label}} custom Validation</div>
-    </div>
+    </div>-->
 
   </div>
 </div>
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts
index 9b89a648b..992491df3 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form.component.ts
@@ -13,9 +13,8 @@ import { Router, ActivatedRoute, ParamMap, Params } from '@angular/router';
 import 'rxjs/add/operator/switchMap';
 import { Location } from '@angular/common';
 import {MatSidenavModule} from '@angular/material/sidenav';
-import { BaseHttpService } from '@app/utilities/cite-http-service-module/base-http.service';
-import { HostConfiguration } from '@app/app.constants';
-import { DatasetWizardService } from '@app/services/dataset-wizard/dataset-wizard.service';
+import { BaseHttpService } from '../utilities/cite-http-service-module/base-http.service';
+import { DatasetWizardService } from '../services/dataset-wizard/dataset-wizard.service';
 
 declare function simple_notifier(type: string, title: string, message: string): any;
 
diff --git a/dmp-frontend/src/app/models/Section.ts b/dmp-frontend/src/app/models/Section.ts
index 2ca192c8c..14fdba3af 100644
--- a/dmp-frontend/src/app/models/Section.ts
+++ b/dmp-frontend/src/app/models/Section.ts
@@ -4,7 +4,7 @@ import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
 import { JsonSerializer } from '../utilities/JsonSerializer';
 import { Serializable } from './interfaces/Serializable';
 import { FieldGroup } from './FieldGroup';
-import { CompositeField } from '@app/models/CompositeField';
+import { CompositeField } from './CompositeField';
 
 export class Section extends BaseModel implements Serializable<Section>, FormGenerator<FormGroup>{
     public sections: Array<Section> = new Array<Section>();