From b99502237af67360e7c49ba9095a1950a4bfb7b8 Mon Sep 17 00:00:00 2001
From: annabakouli <annabakouli@gmail.com>
Date: Wed, 3 Jan 2018 16:19:38 +0200
Subject: [PATCH] no message

---
 .../field-form/field-form.component.html      |  2 +-
 .../form/form.component.ts                    | 14 +++++------
 .../src/app/models/DataSetProfile/Field.ts    | 10 +++++++-
 .../src/app/models/DataSetProfile/FieldSet.ts |  4 ++--
 .../src/app/models/DataSetProfile/Section.ts  |  6 ++---
 .../commons/datafield/FreeTextData.java       |  2 +-
 .../utilities/builders/ModelBuilder.java      | 23 ++++++++++---------
 7 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.html b/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.html
index 3a3db98a7..e09e59dcf 100644
--- a/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.html
+++ b/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.html
@@ -41,7 +41,7 @@
             <div *ngSwitchCase="'booleanDecision'">
                 <booleanDecision-component [form]="form" [dataModel]="dataModel"></booleanDecision-component>
             </div>
-            <div *ngSwitchCase="'checkbox'">
+            <div *ngSwitchCase="'checkBox'">
                 <checkbox-component [form]="form" [dataModel]="dataModel"></checkbox-component>
             </div>
         </div>
diff --git a/dmp-admin/src/app/dataset-profile-form/form/form.component.ts b/dmp-admin/src/app/dataset-profile-form/form/form.component.ts
index fdd6cbaf7..b16ca40e2 100644
--- a/dmp-admin/src/app/dataset-profile-form/form/form.component.ts
+++ b/dmp-admin/src/app/dataset-profile-form/form/form.component.ts
@@ -1,16 +1,14 @@
-import { DatasetProfileService } from 'app/services/dataset-profile.service';
+import { Section } from '../../models/DataSetProfile/Section';
+import { JsonSerializer } from '../../utilities/JsonSerializer';
+import { DatasetProfileService } from '../../services/dataset-profile.service';
+import { RestBase } from '../../services/rest-base';
+import { DatasetProfileModel } from '../../models/DataSetProfile/DatasetProfileModel';
+import { Page } from '../../models/DataSetProfile/Page';
 import { Component, OnInit } from '@angular/core';
 import { FormGroup, FormControl } from '@angular/forms';
-import { JsonSerializer } from 'app/utilities/JsonSerializer';
 import { SectionFormComponent } from '../section-form/section-form.component';
-import { Section } from 'app/models/DataSetProfile/Section';
-import { FieldGroup } from 'app/models/DataSetProfile/FieldGroup';
-import { DatasetProfileModel } from 'app/models/DataSetProfile/DatasetProfileModel';
-import { TestModel } from 'app/testModel/testModel';
 import { FormArray } from '@angular/forms/src/model';
-import { RestBase } from 'app/services/rest-base';
 import { Router, ActivatedRoute, ParamMap, Params } from '@angular/router';
-import { Page } from 'app/models/DataSetProfile/Page'
 import { PageFormComponent } from '../page-form/page-component'
 
 @Component({
diff --git a/dmp-admin/src/app/models/DataSetProfile/Field.ts b/dmp-admin/src/app/models/DataSetProfile/Field.ts
index 9b10791cc..0472e032b 100644
--- a/dmp-admin/src/app/models/DataSetProfile/Field.ts
+++ b/dmp-admin/src/app/models/DataSetProfile/Field.ts
@@ -1,4 +1,8 @@
-import { RadioBoxData } from '../DataField/RadioBoxData';
+import { BooleanDecisionData } from '../DataField/BooleanDecisionData';
+import { FreeTextData } from '../DataField/FreeTextData';
+import { TextArea } from '../DataField/TextArea';
+import { CheckBoxData } from '../DataField/CheckBoxData';
+import { RadioBoxData } from '../DataField/RadioBoxData';
 import { WordListData } from '../DataField/WordListData';
 import { AutocompleteData } from '../DataField/AutocompleteData';
 import { DataField } from '../DataField/DataField';
@@ -40,6 +44,10 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
                 if(item.data.type === "wordlist")this.data = new JsonSerializer<WordListData>().fromJSONObject(item.data,WordListData);
             }else{
                 if(this.viewStyle.renderStyle === "radiobox") this.data = new JsonSerializer<RadioBoxData>().fromJSONObject(item.data,RadioBoxData);
+                if(this.viewStyle.renderStyle === "checkBox") this.data = new JsonSerializer<CheckBoxData>().fromJSONObject(item.data,CheckBoxData);
+                if(this.viewStyle.renderStyle === "textarea") this.data = new JsonSerializer<TextArea>().fromJSONObject(item.data,TextArea);
+                if(this.viewStyle.renderStyle === "freetext") this.data = new JsonSerializer<FreeTextData>().fromJSONObject(item.data,FreeTextData);
+                if(this.viewStyle.renderStyle === "booleanDecision") this.data = new JsonSerializer<BooleanDecisionData>().fromJSONObject(item.data,BooleanDecisionData);
             }
         }
         return this;
diff --git a/dmp-admin/src/app/models/DataSetProfile/FieldSet.ts b/dmp-admin/src/app/models/DataSetProfile/FieldSet.ts
index 8e0d1bf90..ca9f98d9e 100644
--- a/dmp-admin/src/app/models/DataSetProfile/FieldSet.ts
+++ b/dmp-admin/src/app/models/DataSetProfile/FieldSet.ts
@@ -1,5 +1,5 @@
-import { FormGroup } from '@angular/forms';
-import { JsonSerializer } from 'app/utilities/JsonSerializer';
+import { JsonSerializer } from '../../utilities/JsonSerializer';
+import { FormGroup } from '@angular/forms';
 import { Serializable } from '../interfaces/Serializable';
 import { BaseModel } from '../BaseModel';
 import {Field} from './Field' 
diff --git a/dmp-admin/src/app/models/DataSetProfile/Section.ts b/dmp-admin/src/app/models/DataSetProfile/Section.ts
index e00d85cc9..dae51bedc 100644
--- a/dmp-admin/src/app/models/DataSetProfile/Section.ts
+++ b/dmp-admin/src/app/models/DataSetProfile/Section.ts
@@ -1,10 +1,10 @@
-import { BaseModel } from '../BaseModel';
+import { JsonSerializer } from '../../utilities/JsonSerializer';
+import { FieldSet } from './FieldSet';
+import { BaseModel } from '../BaseModel';
 import { FormGenerator } from '../interfaces/FormGenerator';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { JsonSerializer } from 'app/utilities/JsonSerializer';
 import { Serializable } from '../interfaces/Serializable';
 import { FieldGroup } from './FieldGroup';
-import { FieldSet } from 'app/models/DataSetProfile/FieldSet';
 
 export class Section extends BaseModel implements Serializable<Section>, FormGenerator<FormGroup>{
     public sections: Array<Section> = new Array<Section>();
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java
index 2c9423675..87d1e178e 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java
+++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java
@@ -33,7 +33,7 @@ public class FreeTextData extends FieldData<FreeTextData> {
 
     @Override
     public FreeTextData fromXml(Element item) {
-        item.setAttribute("label",this.getLabel());
+        this.setLabel(item.getAttribute("label"));
         return this;
     }
 }
diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java b/dmp-backend/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java
index f107ac299..74c39468a 100644
--- a/dmp-backend/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java
+++ b/dmp-backend/src/main/java/eu/eudat/utilities/builders/ModelBuilder.java
@@ -63,24 +63,24 @@ public class ModelBuilder {
 		return list;
 	}
 
-	public <U extends FieldData<U>> U toFieldData(Object data,String type,Element dataElement){
+	public <U> FieldData<U> toFieldData(Object data,String type,Element dataElement){
 		if(type.equals("combobox")){
 			if(dataElement!=null){
 				if(dataElement.getAttribute("type").equals("autocomplete")){
-					return (U) new AutoCompleteData().fromData(data);
+					return (FieldData<U>) new AutoCompleteData().fromData(data);
 				}else if(dataElement.getAttribute("type").equals("wordlist"))
-					return (U) new WordListData().fromData(data);
+					return (FieldData<U>) new WordListData().fromData(data);
 			}
 		}
-		if(type.equals("booleanDecision"))return (U) new BooleanDecisionData().fromData(data);
-		if(type.equals("radiobox"))return (U) new RadioBoxData().fromData(data);
-		if(type.equals("checkBox"))return (U) new CheckBoxData().fromData(data);
-		if(type.equals("freetext"))return (U) new FreeTextData().fromData(data);
-		if(type.equals("textarea"))return (U) new TextAreaData().fromData(data);
+		if(type.equals("booleanDecision"))return (FieldData<U>) new BooleanDecisionData().fromData(data);
+		if(type.equals("radiobox"))return (FieldData<U>) new RadioBoxData().fromData(data);
+		if(type.equals("checkBox"))return (FieldData<U>) new CheckBoxData().fromData(data);
+		if(type.equals("freetext"))return (FieldData<U>) new FreeTextData().fromData(data);
+		if(type.equals("textarea"))return (FieldData<U>) new TextAreaData().fromData(data);
 		return null;
 	}
 
-	public <U > FieldData<U> toFieldData(Object data,String type){
+	public <U> FieldData<U> toFieldData(Object data,String type){
 		if(type.equals("combobox")){
 			String comboboxType = (String)((Map<String,Object>)data).get("type");
 			if(comboboxType.equals("autocomplete")){
@@ -88,10 +88,11 @@ public class ModelBuilder {
 			}else if(comboboxType.equals("wordlist"))
 				return (FieldData<U>) new WordListData().fromData(data);
 		}
-		if(type.equals("booleanDecision"))return null;
+		if(type.equals("booleanDecision"))return (FieldData<U>) new BooleanDecisionData().fromData(data);
 		if(type.equals("radiobox"))return (FieldData<U>) new RadioBoxData().fromData(data);
 		if(type.equals("checkBox"))return (FieldData<U>) new CheckBoxData().fromData(data);
-		if(type.equals("freetext"))return null;
+		if(type.equals("freetext"))return (FieldData<U>) new FreeTextData().fromData(data);
+		if(type.equals("textarea"))return (FieldData<U>) new TextAreaData().fromData(data);
 		return null;
 	}