From 71aebdae7d10a349dc2ee86c9539c1376758d5dd Mon Sep 17 00:00:00 2001
From: annabakouli <annabakouli@gmail.com>
Date: Wed, 3 Jan 2018 15:43:21 +0200
Subject: [PATCH] no message

---
 dmp-admin/src/app/app.module.ts               | 49 ++++++++++++-------
 .../autocomplete/autocomplete-component.html  | 13 +++++
 .../autocomplete/autocomplete-component.ts    |  7 ++-
 .../booleanDecision-component.html}           |  4 +-
 .../booleanDecision-component.ts              | 19 +++++++
 .../checkbox/checkbox-component.html          |  9 ++++
 .../components/checkbox/checkbox-component.ts | 20 ++++++++
 .../combobox/combobox-component.html          |  0
 .../combobox/combobox-component.ts            |  4 +-
 .../freetext/freetext-component.html          |  9 ++++
 .../components/freetext/freetext-component.ts | 21 ++++++++
 .../radiobox/radiobox-component.html          | 28 +++++++++++
 .../radiobox/radiobox-component.ts            |  8 +--
 .../textarea/textarea-component.html          |  9 ++++
 .../components/textarea/textarea-component.ts | 22 +++++++++
 .../wordlist/wordlist-component.html          |  4 ++
 .../wordlist/wordlist-component.ts            |  8 +--
 .../field-form/field-form.component.html      | 12 +++++
 .../field-form/field-form.component.ts        | 11 ++---
 .../app/models/DataField/AutocompleteData.ts  |  2 +
 .../models/DataField/BooleanDecisionData.ts   | 16 ++++++
 .../src/app/models/DataField/CheckBoxData.ts  | 16 ++++++
 .../src/app/models/DataField/DataField.ts     |  1 +
 .../src/app/models/DataField/FreeTextData.ts  | 16 ++++++
 .../src/app/models/DataField/RadioBoxData.ts  |  5 +-
 .../src/app/models/DataField/TextArea.ts      | 16 ++++++
 .../src/app/models/DataField/WordListData.ts  |  4 +-
 .../src/app/radiobox/radiobox-component.html  | 24 ---------
 .../commons/datafield/AutoCompleteData.java   |  3 --
 .../datafield/BooleanDecisionData.java        | 11 +++--
 .../commons/datafield/CheckBoxData.java       | 16 ++----
 .../commons/datafield/ComboBoxData.java       |  4 +-
 .../commons/datafield/FieldData.java          | 10 ++++
 .../commons/datafield/FreeTextData.java       | 39 +++++++++++++++
 .../commons/datafield/RadioBoxData.java       | 17 +++++--
 .../commons/datafield/TextAreaData.java       | 37 ++++++++++++++
 .../utilities/builders/ModelBuilder.java      | 11 ++---
 37 files changed, 405 insertions(+), 100 deletions(-)
 create mode 100644 dmp-admin/src/app/components/autocomplete/autocomplete-component.html
 rename dmp-admin/src/app/{ => components}/autocomplete/autocomplete-component.ts (76%)
 rename dmp-admin/src/app/{autocomplete/autocomplete-component.html => components/booleanDecision/booleanDecision-component.html} (79%)
 create mode 100644 dmp-admin/src/app/components/booleanDecision/booleanDecision-component.ts
 create mode 100644 dmp-admin/src/app/components/checkbox/checkbox-component.html
 create mode 100644 dmp-admin/src/app/components/checkbox/checkbox-component.ts
 rename dmp-admin/src/app/{ => components}/combobox/combobox-component.html (100%)
 rename dmp-admin/src/app/{ => components}/combobox/combobox-component.ts (85%)
 create mode 100644 dmp-admin/src/app/components/freetext/freetext-component.html
 create mode 100644 dmp-admin/src/app/components/freetext/freetext-component.ts
 create mode 100644 dmp-admin/src/app/components/radiobox/radiobox-component.html
 rename dmp-admin/src/app/{ => components}/radiobox/radiobox-component.ts (80%)
 create mode 100644 dmp-admin/src/app/components/textarea/textarea-component.html
 create mode 100644 dmp-admin/src/app/components/textarea/textarea-component.ts
 rename dmp-admin/src/app/{ => components}/wordlist/wordlist-component.html (82%)
 rename dmp-admin/src/app/{ => components}/wordlist/wordlist-component.ts (81%)
 create mode 100644 dmp-admin/src/app/models/DataField/BooleanDecisionData.ts
 create mode 100644 dmp-admin/src/app/models/DataField/CheckBoxData.ts
 create mode 100644 dmp-admin/src/app/models/DataField/FreeTextData.ts
 create mode 100644 dmp-admin/src/app/models/DataField/TextArea.ts
 delete mode 100644 dmp-admin/src/app/radiobox/radiobox-component.html
 create mode 100644 dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java
 create mode 100644 dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java

diff --git a/dmp-admin/src/app/app.module.ts b/dmp-admin/src/app/app.module.ts
index 1d56beb33..6f798be24 100644
--- a/dmp-admin/src/app/app.module.ts
+++ b/dmp-admin/src/app/app.module.ts
@@ -1,9 +1,19 @@
-import { BrowserModule } from '@angular/platform-browser';
+import { CheckBoxComponent } from './components/checkbox/checkbox-component';
+import { FreeTextData } from './models/DataField/FreeTextData';
+import { BooleanDecisionComponent } from './components/booleanDecision/booleanDecision-component';
+import { FreeTextComponent } from './components/freetext/freetext-component';
+import { TextAreaComponent } from './components/textarea/textarea-component';
+import { RadioBoxComponent } from './components/radiobox/radiobox-component';
+import { WordlistComponent } from './components/wordlist/wordlist-component';
+import { AutocompleteComponent } from './components/autocomplete/autocomplete-component';
+import { ComboboxComponent } from './components/combobox/combobox-component';
+
+
+import { BrowserModule } from '@angular/platform-browser';
 import { RouterModule, Routes } from '@angular/router';
 import { NgModule } from '@angular/core';
-//import { HttpModule, Http, Response, RequestOptions, RequestMethod, Headers, URLSearchParams } from '@angular/http';
 import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { HttpModule} from '@angular/http';
+import { HttpModule } from '@angular/http';
 import { DataTableModule } from "angular2-datatable";
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { DialogService } from "ng2-bootstrap-modal";
@@ -27,7 +37,7 @@ import { DatarepoService } from './services/datarepo-service';
 import { GlobalInterceptor } from './services/interceptor';
 import { Toolbox } from './services/toolbox';
 
-import { DataFilterPipe }   from './pipes/data-filter.pipe';
+import { DataFilterPipe } from './pipes/data-filter.pipe';
 import { DatasetProfileTableFilterPipe } from './pipes/datasetprofile-table-filter.pipe';
 import { DmpTableFilterPipe } from './pipes/dmp-table-filter.pipe';
 import { ServiceTableFilterPipe } from './pipes/service-table-filter.pipe';
@@ -68,10 +78,7 @@ import { RuleFormComponent } from './dataset-profile-form/rule-component/rule.co
 import { SectionFormComponent } from './dataset-profile-form/section-form/section-form.component';
 import { PageFormComponent } from './dataset-profile-form/page-form/page-component';
 import { CompositeFieldFormComponent } from './dataset-profile-form/compositefield-form/compositefield-form.component';
-import { ComboboxComponent } from './combobox/combobox-component';
-import { AutocompleteComponent } from './autocomplete/autocomplete-component';
-import { WordlistComponent } from './wordlist/wordlist-component';
-import { RadioBoxComponent } from './radiobox/radiobox-component';
+
 
 
 
@@ -87,15 +94,15 @@ import { RadioBoxComponent } from './radiobox/radiobox-component';
     ServiceTableFilterPipe,
     ResearcherTableFilterPipe,
     DatarepoTableFilterPipe,
-    
+
     AppComponent,
     GooggleSignInComponent,
     FieldFormComponent,
     FormComponent,
     GroupFieldFormComponent,
     RuleFormComponent,
-	SectionFormComponent,
-	PageFormComponent,
+    SectionFormComponent,
+    PageFormComponent,
     CompositeFieldFormComponent,
     ComboboxComponent,
     AutocompleteComponent,
@@ -117,7 +124,11 @@ import { RadioBoxComponent } from './radiobox/radiobox-component';
     ResearcherEditorComponent,
     DatareposEditorComponent,
     DatasetprofileEditorComponent,
-    DatasetProfileGUIEditorComponent
+    DatasetProfileGUIEditorComponent,
+    TextAreaComponent,
+    CheckBoxComponent,
+    BooleanDecisionComponent,
+    FreeTextComponent
   ],
   imports: [
     BrowserModule,
@@ -132,13 +143,13 @@ import { RadioBoxComponent } from './radiobox/radiobox-component';
     AppRouting
   ],
   providers: [{
-                  provide: HTTP_INTERCEPTORS,
-                  useClass: GlobalInterceptor,
-                  multi: true,
-              },
-              DatasetsServiceService, TokenService, DmpsServiceService, ResearcherService,
-              DialogService, DatasetProfileService, ProjectService, OrganisationService, DatarepoService,
-              DmpProfileService, RegistryService, ServiceService, NativeLoginService, HttpModule, Toolbox, HttpClient, RestBase],
+    provide: HTTP_INTERCEPTORS,
+    useClass: GlobalInterceptor,
+    multi: true,
+  },
+    DatasetsServiceService, TokenService, DmpsServiceService, ResearcherService,
+    DialogService, DatasetProfileService, ProjectService, OrganisationService, DatarepoService,
+    DmpProfileService, RegistryService, ServiceService, NativeLoginService, HttpModule, Toolbox, HttpClient, RestBase],
   bootstrap: [AppComponent]
 })
 export class AppModule { }
diff --git a/dmp-admin/src/app/components/autocomplete/autocomplete-component.html b/dmp-admin/src/app/components/autocomplete/autocomplete-component.html
new file mode 100644
index 000000000..aa75c0aff
--- /dev/null
+++ b/dmp-admin/src/app/components/autocomplete/autocomplete-component.html
@@ -0,0 +1,13 @@
+<div [formGroup]="form">
+    <div formGroupName="data" class="form-row">
+        <div class="form-group col-md-12" >
+            <label>Label</label>
+            <input type="string" class="form-control" formControlName="label">
+        </div>
+        <div class="form-group col-md-12" >
+            <label>Url</label>
+            <input type="string" class="form-control" formControlName="url">
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/dmp-admin/src/app/autocomplete/autocomplete-component.ts b/dmp-admin/src/app/components/autocomplete/autocomplete-component.ts
similarity index 76%
rename from dmp-admin/src/app/autocomplete/autocomplete-component.ts
rename to dmp-admin/src/app/components/autocomplete/autocomplete-component.ts
index c4021147e..28fbcb69e 100644
--- a/dmp-admin/src/app/autocomplete/autocomplete-component.ts
+++ b/dmp-admin/src/app/components/autocomplete/autocomplete-component.ts
@@ -1,9 +1,8 @@
-import { FormGroup } from '@angular/forms';
-import { Field } from 'app/models/DataSetProfile/Field';
+import { AutocompleteData } from '../../models/DataField/AutocompleteData';
+import { Field } from '../../models/DataSetProfile/Field';
+import { FormGroup } from '@angular/forms';
 import { Component, Input, OnInit } from '@angular/core';
-import { AutocompleteData } from 'app/models/DataField/AutocompleteData';
 import { FormArray } from '@angular/forms/src/model';
-import { JsonSerializer } from 'app/utilities/JsonSerializer';
 
 @Component({
     selector: 'autocomplete-component',
diff --git a/dmp-admin/src/app/autocomplete/autocomplete-component.html b/dmp-admin/src/app/components/booleanDecision/booleanDecision-component.html
similarity index 79%
rename from dmp-admin/src/app/autocomplete/autocomplete-component.html
rename to dmp-admin/src/app/components/booleanDecision/booleanDecision-component.html
index f210ba7f7..2411edac1 100644
--- a/dmp-admin/src/app/autocomplete/autocomplete-component.html
+++ b/dmp-admin/src/app/components/booleanDecision/booleanDecision-component.html
@@ -1,8 +1,8 @@
 <div [formGroup]="form">
     <div formGroupName="data" class="form-row">
         <div class="form-group col-md-12" >
-            <label>Url</label>
-            <input type="string" class="form-control" formControlName="url">
+            <label>Label</label>
+            <input type="string" class="form-control" formControlName="label">
         </div>
     </div>
 
diff --git a/dmp-admin/src/app/components/booleanDecision/booleanDecision-component.ts b/dmp-admin/src/app/components/booleanDecision/booleanDecision-component.ts
new file mode 100644
index 000000000..c5f844075
--- /dev/null
+++ b/dmp-admin/src/app/components/booleanDecision/booleanDecision-component.ts
@@ -0,0 +1,19 @@
+import { Field } from '../../models/DataSetProfile/Field';
+import { BooleanDecisionData } from '../../models/DataField/BooleanDecisionData';
+import { FormGroup } from '@angular/forms';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormArray } from '@angular/forms/src/model';
+
+@Component({
+    selector: 'booleanDecision-component',
+    templateUrl: './booleanDecision-component.html'
+})
+export class BooleanDecisionComponent implements OnInit{
+    @Input() dataModel: Field;
+    @Input() form: FormGroup;
+    private data:BooleanDecisionData = new BooleanDecisionData(); 
+    
+    ngOnInit(){
+        this.form.addControl("data", this.data.buildForm());
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/checkbox/checkbox-component.html b/dmp-admin/src/app/components/checkbox/checkbox-component.html
new file mode 100644
index 000000000..2411edac1
--- /dev/null
+++ b/dmp-admin/src/app/components/checkbox/checkbox-component.html
@@ -0,0 +1,9 @@
+<div [formGroup]="form">
+    <div formGroupName="data" class="form-row">
+        <div class="form-group col-md-12" >
+            <label>Label</label>
+            <input type="string" class="form-control" formControlName="label">
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/checkbox/checkbox-component.ts b/dmp-admin/src/app/components/checkbox/checkbox-component.ts
new file mode 100644
index 000000000..d8553c086
--- /dev/null
+++ b/dmp-admin/src/app/components/checkbox/checkbox-component.ts
@@ -0,0 +1,20 @@
+import { Field } from '../../models/DataSetProfile/Field';
+import { CheckBoxData } from '../../models/DataField/CheckBoxData';
+import { BooleanDecisionData } from '../../models/DataField/BooleanDecisionData';
+import { FormGroup } from '@angular/forms';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormArray } from '@angular/forms/src/model';
+
+@Component({
+    selector: 'checkbox-component',
+    templateUrl: './checkbox-component.html'
+})
+export class CheckBoxComponent implements OnInit{
+    @Input() dataModel: Field;
+    @Input() form: FormGroup;
+    private data:CheckBoxData = new CheckBoxData(); 
+    
+    ngOnInit(){
+        this.form.addControl("data", this.data.buildForm());
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/combobox/combobox-component.html b/dmp-admin/src/app/components/combobox/combobox-component.html
similarity index 100%
rename from dmp-admin/src/app/combobox/combobox-component.html
rename to dmp-admin/src/app/components/combobox/combobox-component.html
diff --git a/dmp-admin/src/app/combobox/combobox-component.ts b/dmp-admin/src/app/components/combobox/combobox-component.ts
similarity index 85%
rename from dmp-admin/src/app/combobox/combobox-component.ts
rename to dmp-admin/src/app/components/combobox/combobox-component.ts
index 2a1a99000..661018b15 100644
--- a/dmp-admin/src/app/combobox/combobox-component.ts
+++ b/dmp-admin/src/app/components/combobox/combobox-component.ts
@@ -1,5 +1,5 @@
-import { FormGroup } from '@angular/forms';
-import { Field } from 'app/models/DataSetProfile/Field';
+import { Field } from '../../models/DataSetProfile/Field';
+import { FormGroup } from '@angular/forms';
 import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
diff --git a/dmp-admin/src/app/components/freetext/freetext-component.html b/dmp-admin/src/app/components/freetext/freetext-component.html
new file mode 100644
index 000000000..2411edac1
--- /dev/null
+++ b/dmp-admin/src/app/components/freetext/freetext-component.html
@@ -0,0 +1,9 @@
+<div [formGroup]="form">
+    <div formGroupName="data" class="form-row">
+        <div class="form-group col-md-12" >
+            <label>Label</label>
+            <input type="string" class="form-control" formControlName="label">
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/freetext/freetext-component.ts b/dmp-admin/src/app/components/freetext/freetext-component.ts
new file mode 100644
index 000000000..0e1077469
--- /dev/null
+++ b/dmp-admin/src/app/components/freetext/freetext-component.ts
@@ -0,0 +1,21 @@
+import { Field } from '../../models/DataSetProfile/Field';
+import { FreeTextData } from '../../models/DataField/FreeTextData';
+import { CheckBoxData } from '../../models/DataField/CheckBoxData';
+import { BooleanDecisionData } from '../../models/DataField/BooleanDecisionData';
+import { FormGroup } from '@angular/forms';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormArray } from '@angular/forms/src/model';
+
+@Component({
+    selector: 'freetext-component',
+    templateUrl: './freetext-component.html'
+})
+export class FreeTextComponent implements OnInit{
+    @Input() dataModel: Field;
+    @Input() form: FormGroup;
+    private data:FreeTextData = new FreeTextData(); 
+    
+    ngOnInit(){
+        this.form.addControl("data", this.data.buildForm());
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/radiobox/radiobox-component.html b/dmp-admin/src/app/components/radiobox/radiobox-component.html
new file mode 100644
index 000000000..7e309f987
--- /dev/null
+++ b/dmp-admin/src/app/components/radiobox/radiobox-component.html
@@ -0,0 +1,28 @@
+<div [formGroup]="form" class="form-row">
+    <div class="form-group col-md-12">
+        <label>Label</label>
+        <input type="string" class="form-control" formControlName="label">
+    </div>
+    <div formGroupName="data">
+        <div formArrayName="options">
+            <div *ngFor="let option of form.get('data').get('options').controls index as i">
+                <div [formGroupName]="i">
+                    <div class="form-group col-md-6">
+                        <label>Label</label>
+                        <input type="text" class="form-control" formControlName="label">
+                    </div>
+                    <div class="form-group col-md-6">
+                        <label>Value</label>
+                        <input type="text" class="form-control" formControlName="value">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div>
+        <a (click)="addNewRow(form)" style="cursor: pointer">
+                    Add +
+                </a>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/dmp-admin/src/app/radiobox/radiobox-component.ts b/dmp-admin/src/app/components/radiobox/radiobox-component.ts
similarity index 80%
rename from dmp-admin/src/app/radiobox/radiobox-component.ts
rename to dmp-admin/src/app/components/radiobox/radiobox-component.ts
index 16416990a..e7064d84c 100644
--- a/dmp-admin/src/app/radiobox/radiobox-component.ts
+++ b/dmp-admin/src/app/components/radiobox/radiobox-component.ts
@@ -1,10 +1,10 @@
 import { FormGroup } from '@angular/forms';
-import { Field } from '../models/DataSetProfile/Field';
+import { Field } from '../../models/DataSetProfile/Field';
 import { Component, Input, OnInit } from '@angular/core';
-import { RadioBoxData } from '../models/DataField/RadioBoxData';
+import { RadioBoxData } from '../../models/DataField/RadioBoxData';
 import { FormArray } from '@angular/forms/src/model';
-import { ListingItem } from '../models/Commons/ListingItem';
-import { JsonSerializer } from '../utilities/JsonSerializer';
+import { ListingItem } from '../../models/Commons/ListingItem';
+import { JsonSerializer } from '../../utilities/JsonSerializer';
 
 @Component({
     selector: 'radiobox-component',
diff --git a/dmp-admin/src/app/components/textarea/textarea-component.html b/dmp-admin/src/app/components/textarea/textarea-component.html
new file mode 100644
index 000000000..2411edac1
--- /dev/null
+++ b/dmp-admin/src/app/components/textarea/textarea-component.html
@@ -0,0 +1,9 @@
+<div [formGroup]="form">
+    <div formGroupName="data" class="form-row">
+        <div class="form-group col-md-12" >
+            <label>Label</label>
+            <input type="string" class="form-control" formControlName="label">
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/textarea/textarea-component.ts b/dmp-admin/src/app/components/textarea/textarea-component.ts
new file mode 100644
index 000000000..2a04a5566
--- /dev/null
+++ b/dmp-admin/src/app/components/textarea/textarea-component.ts
@@ -0,0 +1,22 @@
+import { Field } from '../../models/DataSetProfile/Field';
+import { TextArea } from '../../models/DataField/TextArea';
+import { FreeTextData } from '../../models/DataField/FreeTextData';
+import { CheckBoxData } from '../../models/DataField/CheckBoxData';
+import { BooleanDecisionData } from '../../models/DataField/BooleanDecisionData';
+import { FormGroup } from '@angular/forms';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormArray } from '@angular/forms/src/model';
+
+@Component({
+    selector: 'textarea-component',
+    templateUrl: './textarea-component.html'
+})
+export class TextAreaComponent implements OnInit{
+    @Input() dataModel: Field;
+    @Input() form: FormGroup;
+    private data:TextArea = new TextArea(); 
+    
+    ngOnInit(){
+        this.form.addControl("data", this.data.buildForm());
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/wordlist/wordlist-component.html b/dmp-admin/src/app/components/wordlist/wordlist-component.html
similarity index 82%
rename from dmp-admin/src/app/wordlist/wordlist-component.html
rename to dmp-admin/src/app/components/wordlist/wordlist-component.html
index 64b6b89e7..73da25ad7 100644
--- a/dmp-admin/src/app/wordlist/wordlist-component.html
+++ b/dmp-admin/src/app/components/wordlist/wordlist-component.html
@@ -1,5 +1,9 @@
 <div [formGroup]="form" class="form-row">
     <div formGroupName="data">
+        <div class="form-group col-md-12" >
+            <label>Label</label>
+            <input type="string" class="form-control" formControlName="label">
+        </div>
         <div formArrayName="options">
             <div *ngFor="let option of form.get('data').get('options').controls index as i">
                 <div [formGroupName]="i">
diff --git a/dmp-admin/src/app/wordlist/wordlist-component.ts b/dmp-admin/src/app/components/wordlist/wordlist-component.ts
similarity index 81%
rename from dmp-admin/src/app/wordlist/wordlist-component.ts
rename to dmp-admin/src/app/components/wordlist/wordlist-component.ts
index a5deb7c5f..00c33f8b9 100644
--- a/dmp-admin/src/app/wordlist/wordlist-component.ts
+++ b/dmp-admin/src/app/components/wordlist/wordlist-component.ts
@@ -1,10 +1,10 @@
 import { FormGroup } from '@angular/forms';
-import { Field } from '../models/DataSetProfile/Field';
+import { Field } from '../../models/DataSetProfile/Field';
 import { Component, Input, OnInit } from '@angular/core';
-import { WordListData } from '../models/DataField/WordListData';
+import { WordListData } from '../../models/DataField/WordListData';
 import { FormArray } from '@angular/forms/src/model';
-import { ListingItem } from '../models/Commons/ListingItem';
-import { JsonSerializer } from '../utilities/JsonSerializer';
+import { ListingItem } from '../../models/Commons/ListingItem';
+import { JsonSerializer } from '../../utilities/JsonSerializer';
 
 @Component({
     selector: 'wordlist-component',
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 75d7128d5..3a3db98a7 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
@@ -32,6 +32,18 @@
             <div *ngSwitchCase="'radiobox'">
                 <radiobox-component [form]="form" [dataModel]="dataModel"></radiobox-component>
             </div>
+            <div *ngSwitchCase="'freetext'">
+                <freetext-component [form]="form" [dataModel]="dataModel"></freetext-component>
+            </div>
+            <div *ngSwitchCase="'textarea'">
+                <textarea-component [form]="form" [dataModel]="dataModel"></textarea-component>
+            </div>
+            <div *ngSwitchCase="'booleanDecision'">
+                <booleanDecision-component [form]="form" [dataModel]="dataModel"></booleanDecision-component>
+            </div>
+            <div *ngSwitchCase="'checkbox'">
+                <checkbox-component [form]="form" [dataModel]="dataModel"></checkbox-component>
+            </div>
         </div>
         <!-- <div class="row">
             <div class="form-group col-md-6">
diff --git a/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts b/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts
index 1c3738fd0..6a55a3c10 100644
--- a/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts
+++ b/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts
@@ -1,10 +1,7 @@
-import { Component, Input } from '@angular/core';
-import { FormGroup, FormControl } from '@angular/forms';
-import { Field } from 'app/models/DataSetProfile/Field';
-import { Rule } from 'app/models/DataSetProfile/Rule';
-import { Multiplicity } from 'app/models/DataSetProfile/Multiplicity';
-import { FormArray } from '@angular/forms/src/model';
-import { ComboboxComponent } from 'app/combobox/combobox-component';
+import { Field } from '../../models/DataSetProfile/Field';
+import { Rule } from '../../models/DataSetProfile/Rule';
+import { Component, Input } from '@angular/core';
+import { FormGroup, FormControl, FormArray } from '@angular/forms';
 
 @Component({
   selector: 'field-form',
diff --git a/dmp-admin/src/app/models/DataField/AutocompleteData.ts b/dmp-admin/src/app/models/DataField/AutocompleteData.ts
index 86323da37..11873a833 100644
--- a/dmp-admin/src/app/models/DataField/AutocompleteData.ts
+++ b/dmp-admin/src/app/models/DataField/AutocompleteData.ts
@@ -8,6 +8,7 @@ export class AutocompleteData extends DataField<AutocompleteData>{
 
     buildForm():FormGroup{
         return this.formBuilder.group({
+            label:[this.label],
             type:[this.type],
             url:[this.url]
         })
@@ -16,6 +17,7 @@ export class AutocompleteData extends DataField<AutocompleteData>{
     fromJSONObject(item:any):AutocompleteData{
         this.type = item.type;
         this.url = item.url;
+        this.label = item.label;
         return this;
     }
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/DataField/BooleanDecisionData.ts b/dmp-admin/src/app/models/DataField/BooleanDecisionData.ts
new file mode 100644
index 000000000..f8d8c9dd6
--- /dev/null
+++ b/dmp-admin/src/app/models/DataField/BooleanDecisionData.ts
@@ -0,0 +1,16 @@
+import { DataField } from './DataField';
+import { FormGroup } from '@angular/forms';
+export class BooleanDecisionData extends DataField<BooleanDecisionData>{
+    
+    buildForm():FormGroup{
+        let formGroup = this.formBuilder.group({
+            label:this.label
+        });
+        return formGroup;
+    }
+
+    fromJSONObject(item:any):BooleanDecisionData{        
+       this.label = item.label
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/DataField/CheckBoxData.ts b/dmp-admin/src/app/models/DataField/CheckBoxData.ts
new file mode 100644
index 000000000..ab3713697
--- /dev/null
+++ b/dmp-admin/src/app/models/DataField/CheckBoxData.ts
@@ -0,0 +1,16 @@
+import { DataField } from './DataField';
+import { FormGroup } from '@angular/forms';
+export class CheckBoxData extends DataField<CheckBoxData>{
+
+    buildForm():FormGroup{
+        let formGroup = this.formBuilder.group({
+            label:this.label
+        });
+        return formGroup;
+    }
+
+    fromJSONObject(item:any):CheckBoxData{        
+        this.label = item.label
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/DataField/DataField.ts b/dmp-admin/src/app/models/DataField/DataField.ts
index bcc0cdbeb..e520408df 100644
--- a/dmp-admin/src/app/models/DataField/DataField.ts
+++ b/dmp-admin/src/app/models/DataField/DataField.ts
@@ -3,6 +3,7 @@ import { FormGenerator } from '../interfaces/FormGenerator';
 import { Serializable } from '../interfaces/Serializable';
 import { FormGroup } from '@angular/forms' 
 export abstract class DataField<T> extends BaseModel implements Serializable<T>,FormGenerator<FormGroup>{
+    public label:string;
     
     buildForm():FormGroup{
         throw new Error("Build Form Is not not correctly overriden");
diff --git a/dmp-admin/src/app/models/DataField/FreeTextData.ts b/dmp-admin/src/app/models/DataField/FreeTextData.ts
new file mode 100644
index 000000000..f32703ec0
--- /dev/null
+++ b/dmp-admin/src/app/models/DataField/FreeTextData.ts
@@ -0,0 +1,16 @@
+import { DataField } from './DataField';
+import { FormGroup } from '@angular/forms';
+export class FreeTextData extends DataField<FreeTextData>{
+    
+    buildForm():FormGroup{
+        let formGroup = this.formBuilder.group({
+            label:this.label
+        });
+        return formGroup;
+    }
+
+    fromJSONObject(item:any):FreeTextData{        
+        this.label = item.label
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/DataField/RadioBoxData.ts b/dmp-admin/src/app/models/DataField/RadioBoxData.ts
index ed059be4d..3ab65970d 100644
--- a/dmp-admin/src/app/models/DataField/RadioBoxData.ts
+++ b/dmp-admin/src/app/models/DataField/RadioBoxData.ts
@@ -7,7 +7,9 @@ export class RadioBoxData extends DataField<RadioBoxData>{
     public options:Array<ListingItem>;
     
     buildForm():FormGroup{
-        let formGroup = this.formBuilder.group({});
+        let formGroup = this.formBuilder.group({
+            label:[this.label]
+        });
         let optionsFormArray = new Array<FormGroup>();
         if (this.options) {
             this.options.forEach(item => {
@@ -21,6 +23,7 @@ export class RadioBoxData extends DataField<RadioBoxData>{
 
     fromJSONObject(item:any):RadioBoxData{        
         this.options  = new JsonSerializer<ListingItem>().fromJSONArray(item.options,ListingItem);
+        this.label = item.label
         return this;
     }
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/DataField/TextArea.ts b/dmp-admin/src/app/models/DataField/TextArea.ts
new file mode 100644
index 000000000..f5e24dbcc
--- /dev/null
+++ b/dmp-admin/src/app/models/DataField/TextArea.ts
@@ -0,0 +1,16 @@
+import { DataField } from './DataField';
+import { FormGroup } from '@angular/forms';
+export class TextArea extends DataField<TextArea>{
+
+    buildForm(): FormGroup {
+        let formGroup = this.formBuilder.group({
+            label: this.label
+        });
+        return formGroup;
+    }
+
+    fromJSONObject(item: any): TextArea {
+        this.label = item.label
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/models/DataField/WordListData.ts b/dmp-admin/src/app/models/DataField/WordListData.ts
index 3e5a86033..82eab7882 100644
--- a/dmp-admin/src/app/models/DataField/WordListData.ts
+++ b/dmp-admin/src/app/models/DataField/WordListData.ts
@@ -8,7 +8,8 @@ export class WordListData extends DataField<WordListData>{
     public options:Array<ListingItem>;
     buildForm():FormGroup{
         let formGroup = this.formBuilder.group({
-            type:[this.type]
+            type:[this.type],
+            label:[this.label]
         });
         let optionsFormArray = new Array<FormGroup>();
         if (this.options) {
@@ -25,6 +26,7 @@ export class WordListData extends DataField<WordListData>{
     fromJSONObject(item:any):WordListData{
         this.type = item.type;
         this.options  = new JsonSerializer<ListingItem>().fromJSONArray(item.options,ListingItem);
+        this.label = item.label;
         return this;
     }
 }
\ No newline at end of file
diff --git a/dmp-admin/src/app/radiobox/radiobox-component.html b/dmp-admin/src/app/radiobox/radiobox-component.html
deleted file mode 100644
index a9e85fb79..000000000
--- a/dmp-admin/src/app/radiobox/radiobox-component.html
+++ /dev/null
@@ -1,24 +0,0 @@
-    <div [formGroup]="form" class="form-row">
-            <div formGroupName="data">
-                <div formArrayName="options">
-                    <div *ngFor="let option of form.get('data').get('options').controls index as i">
-                        <div [formGroupName]="i">
-                            <div class="form-group col-md-6">
-                                <label>Label</label>
-                                <input type="text" class="form-control" formControlName="label">
-                            </div>
-                            <div class="form-group col-md-6">
-                                <label>Value</label>
-                                <input type="text" class="form-control" formControlName="value">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div>
-                <a (click)="addNewRow(form)" style="cursor: pointer">
-                    Add +
-                </a>
-            </div>
-        
-        </div>
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java
index cdf85e939..0e59411f0 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java
+++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java
@@ -32,7 +32,6 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData>{
 		Element root = super.toXml(doc);
 
 		root.setAttribute("url", this.url);
-		
 		Element element = doc.createElement("option");
 		element.setAttribute("label", this.autoCompleteOptions.getLabel());
 		element.setAttribute("value", autoCompleteOptions.getValue());
@@ -44,7 +43,6 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData>{
 		super.fromXml(item);
 		this.url = item.getAttribute("url");
 		Element optionElement = (Element)item.getElementsByTagName("option").item(0);
-
 		if(optionElement!=null){
 			this.autoCompleteOptions = new Option();
 			this.autoCompleteOptions.setLabel(optionElement.getAttribute("label"));
@@ -63,7 +61,6 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData>{
 				this.autoCompleteOptions.setLabel(options.get("label"));
 				this.autoCompleteOptions.setValue(options.get("value"));
 			}
-			
 		}
 		
 		return this;
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java
index 84274e42a..024af5326 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java
+++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java
@@ -3,10 +3,14 @@ package eu.eudat.models.components.commons.datafield;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import java.util.Map;
+
 public class BooleanDecisionData extends FieldData<BooleanDecisionData>{
 
 	@Override
 	public BooleanDecisionData fromData(Object data) {
+		this.setLabel((String)((Map<String,Object>)data).get("label"));
+
 		return this;
 	}
 
@@ -17,13 +21,14 @@ public class BooleanDecisionData extends FieldData<BooleanDecisionData>{
 
 	@Override
 	public Element toXml(Document doc) {
-		
-		return doc.createElement("data");
+		Element element = doc.createElement("data");
+		element.setAttribute("label",this.getLabel());
+		return element;
 	}
 
 	@Override
 	public BooleanDecisionData fromXml(Element item) {
-		// TODO Auto-generated method stub
+		this.setLabel(item.getAttribute("label"));
 		return this;
 	}
 
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java
index 81a98340d..a2ec6d1bd 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java
+++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java
@@ -6,34 +6,24 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 public class CheckBoxData extends FieldData<CheckBoxData>{
-	private String label;
-
-	
-	public String getLabel() {
-		return label;
-	}
-
-	public void setLabel(String label) {
-		this.label = label;
-	}
 
 	@Override
 	public Element toXml(Document doc) {
 		Element root = doc.createElement("data");
-		root.setAttribute("label", this.label);
+		root.setAttribute("label", this.getLabel());
 		return root;
 	}
 
 	@Override
 	public CheckBoxData fromXml(Element item) {
-		this.label = item!=null?item.getAttribute("label"):""; //TODO
+		this.setLabel(item!=null?item.getAttribute("label"):"");
 		return this;
 	}
 
 	@Override
 	public CheckBoxData fromData(Object data) {
 		if(data!=null){
-			this.label= (String)((Map<String,Object>)data).get("label");
+			this.setLabel((String)((Map<String,Object>)data).get("label"));
 		}
 		return this;
 	}
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java
index 578a84e1a..61e73e41c 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java
+++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java
@@ -56,11 +56,12 @@ public abstract class ComboBoxData<T> extends FieldData<T>{
 	public Element toXml(Document doc) {
 		Element root = doc.createElement("data");
 		root.setAttribute("type", this.type);
+		root.setAttribute("label",this.getLabel());
 		return root;
 	}
 	@Override
 	public T fromXml(Element item) {
-		
+		this.setLabel(item.getAttribute("label"));
 		this.type = item.getAttribute("type");
 		return (T)this;
 	}
@@ -69,6 +70,7 @@ public abstract class ComboBoxData<T> extends FieldData<T>{
 		
 		if(data!=null){
 			this.type = (String)((Map<String,Object>)data).get("type");
+			this.setLabel((String)((Map<String,Object>)data).get("label"));
 		}
 		
 		return (T)this;
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java
index 2baa225eb..9895086b1 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java
+++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FieldData.java
@@ -6,6 +6,16 @@ import org.w3c.dom.Element;
 import eu.eudat.utilities.XmlSerializable;
 
 public abstract class FieldData<T> implements XmlSerializable<T>{
+	private String label;
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
 	public T fromData(Object data) {
 		return null;
 	}
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
new file mode 100644
index 000000000..2c9423675
--- /dev/null
+++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java
@@ -0,0 +1,39 @@
+package eu.eudat.models.components.commons.datafield;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by ikalyvas on 1/3/2018.
+ */
+public class FreeTextData extends FieldData<FreeTextData> {
+
+    @Override
+    public FreeTextData fromData(Object data) {
+        if(data!=null){
+            this.setLabel(((Map<String,String>)data).get("label"));
+        }
+        return this;
+    }
+
+    @Override
+    public Object toData() {
+        return null;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element root = doc.createElement("data");
+        root.setAttribute("label",this.getLabel());
+        return root;
+    }
+
+    @Override
+    public FreeTextData fromXml(Element item) {
+        item.setAttribute("label",this.getLabel());
+        return this;
+    }
+}
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java
index 4153144fd..935da982e 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java
+++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/RadioBoxData.java
@@ -13,37 +13,42 @@ import eu.eudat.utilities.XmlSerializable;
 
 public class RadioBoxData extends FieldData<RadioBoxData>{
 
-	private class Option implements XmlSerializable<Option>{
+	private class Option implements XmlSerializable<Option> {
 		private String label;
 		private String value;
+
 		public String getLabel() {
 			return label;
 		}
+
 		public void setLabel(String label) {
 			this.label = label;
 		}
+
 		public String getValue() {
 			return value;
 		}
+
 		public void setValue(String value) {
 			this.value = value;
 		}
+
 		@Override
 		public Element toXml(Document doc) {
 			Element option = doc.createElement("option");
 			option.setAttribute("label", this.label);
-			option.setAttribute("value",this.value);			
+			option.setAttribute("value", this.value);
 			return option;
 		}
+
 		@Override
 		public Option fromXml(Element item) {
 			this.label = item.getAttribute("label");
 			this.value = item.getAttribute("value");
 			return this;
 		}
-		
+
 	}
-	
 	private List<Option> options;
 	
 	public List<Option> getOptions() {
@@ -65,6 +70,7 @@ public class RadioBoxData extends FieldData<RadioBoxData>{
 				newOption.setValue(map.get("value"));
 				this.options.add(newOption);
 			}
+			this.setLabel(((Map<String,String>)data).get("label"));
 		}
 		return this;
 	}
@@ -82,6 +88,7 @@ public class RadioBoxData extends FieldData<RadioBoxData>{
 		for(Option option : this.options){
 			element.appendChild(option.toXml(doc));
 		}
+		root.setAttribute("label",this.getLabel());
 		root.appendChild(element);
 		return root;
 	}
@@ -91,7 +98,7 @@ public class RadioBoxData extends FieldData<RadioBoxData>{
 		
 		this.options = new LinkedList<>();
 		Element optionsElement = (Element)item.getElementsByTagName("options").item(0);
-
+		this.setLabel(item.getAttribute("label"));
 		if(optionsElement!=null){
 			NodeList optionElements = optionsElement.getChildNodes();
 			for (int temp = 0; temp < optionElements.getLength(); temp++) {
diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java
new file mode 100644
index 000000000..a1a13b52e
--- /dev/null
+++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java
@@ -0,0 +1,37 @@
+package eu.eudat.models.components.commons.datafield;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.Map;
+
+/**
+ * Created by ikalyvas on 1/3/2018.
+ */
+public class TextAreaData extends FieldData<TextAreaData>{
+    @Override
+    public TextAreaData fromData(Object data) {
+        if(data!=null){
+            this.setLabel(((Map<String,String>)data).get("label"));
+        }
+        return this;
+    }
+
+    @Override
+    public Object toData() {
+        return null;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element root = doc.createElement("data");
+        root.setAttribute("label",this.getLabel());
+        return root;
+    }
+
+    @Override
+    public TextAreaData fromXml(Element item) {
+        item.setAttribute("label",this.getLabel());
+        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 32ef95899..f107ac299 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
@@ -4,15 +4,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import eu.eudat.models.components.commons.datafield.*;
 import org.w3c.dom.Element;
 
 import eu.eudat.entities.xmlmodels.modeldefinition.DatabaseModelDefinition;
 import eu.eudat.entities.xmlmodels.datasetprofiledefinition.DatabaseViewStyleDefinition;
-import eu.eudat.models.components.commons.datafield.AutoCompleteData;
-import eu.eudat.models.components.commons.datafield.CheckBoxData;
-import eu.eudat.models.components.commons.datafield.FieldData;
-import eu.eudat.models.components.commons.datafield.RadioBoxData;
-import eu.eudat.models.components.commons.datafield.WordListData;
 import eu.eudat.utilities.ModelDefinition;
 import eu.eudat.utilities.ViewStyleDefinition;
 
@@ -76,10 +72,11 @@ public class ModelBuilder {
 					return (U) new WordListData().fromData(data);
 			}
 		}
-		if(type.equals("booleanDecision"))return null;
+		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 null;
+		if(type.equals("freetext"))return (U) new FreeTextData().fromData(data);
+		if(type.equals("textarea"))return (U) new TextAreaData().fromData(data);
 		return null;
 	}