data label in field, description, extended description in datasetfield

dmp-frontend/src/app/form/dynamic-fields/dynamic-field-textarea/textarea.ts

@@ -1,11 +0,0 @@
-import {FieldBase} from '../field-base';
-
-export class TextAreaField extends FieldBase<string> {
-    controlType = 'textarea';
-    type: string;
-
-    constructor (options: {} = {}) {
-        super(options);
-        this.type = options['type'] || '';
-    }
-}

dmp-frontend/src/app/form/dynamic-fields/dynamic-field-textbox/field-textbox.css

@@ -1 +0,0 @@
-@CHARSET "UTF-8";

dmp-frontend/src/app/form/dynamic-fields/dynamic-field-textbox/field-textbox.html

@@ -1,3 +0,0 @@
-<label>{{field.description}}</label>
-<div>{{field.extendedDescription}}</div>
-<input matInput [formControlName]="field.key" [id]="field.key" [type]="field.type" required ="field.required">

dmp-frontend/src/app/form/dynamic-fields/dynamic-field-textbox/field-textbox.ts

@@ -1,11 +0,0 @@
-import {FieldBase} from '../field-base';
-
-export class TextboxField extends FieldBase<string> {
-    controlType = 'textbox';
-    type: string;
-
-    constructor (options: {} = {}) {
-        super(options);
-        this.type = options['type'] || '';
-    }
-}

dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html

@@ -11,7 +11,7 @@
 
     <div *ngSwitchCase="'freetext'">
       <mat-form-field>
-        <input matInput formControlName="value" placeholder={{field.title}}>
+        <input matInput formControlName="value" placeholder="{{field.data.label}}">
       </mat-form-field>
     </div>
 

dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html

@@ -1,6 +1,10 @@
 <div *ngIf="visibilityRulesService.isElementVisible(pathName,compositeField.id)" [id]="compositeField.id" [formGroup]="form">
 
     <h5 *ngIf="compositeField.title">{{compositeField.title}}</h5>
+    <h5 *ngIf="compositeField.description">{{compositeField.description}}</h5>
+    <h5 *ngIf="compositeField.extendedDescription" class="fieldset-extended-desc">
+        <i>{{compositeField.extendedDescription}}</i>
+    </h5>
     <df-field *ngIf="compositeField.fields.length == 1" [field]="compositeField.fields[0]" [form]="form.get('fields').get(''+0)"
         [pathName]="pathName+'.fields.'+0"></df-field>
 

dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts

@@ -21,7 +21,7 @@ export class DynamicFormCompositeFieldComponent implements OnInit {
 
   constructor(private visibilityRulesService: VisibilityRulesService) { }
 
-  ngOnInit() {
+  ngOnInit() {debugger;
     console.log(this.form);
   }
 

dmp-frontend/src/app/form/dynamic-form.component.html

@@ -30,3 +30,4 @@
 		</mat-sidenav-content>
 	 </mat-sidenav-container>
 </div>
+<p>Form value: {{ form.value | json }}</p>

dmp-frontend/src/app/models/CompositeField.ts

@@ -11,6 +11,8 @@ export class CompositeField extends BaseModel implements Serializable<CompositeF
     public multiplicity: Multiplicity;
     public multiplicityItems: Array<CompositeField> = new Array<CompositeField>();
     public title: string
+    public description: string
+    public extendedDescription: string
 
     fromJSONObject(item: any): CompositeField {
 
@@ -18,6 +20,8 @@ export class CompositeField extends BaseModel implements Serializable<CompositeF
         this.ordinal = item.ordinal;
         this.id = item.id;
         this.title = item.title;
+        this.description = item.description;
+        this.extendedDescription = item.extendedDescription;
         this.multiplicity = JsonSerializer.fromJSONObject(item.multiplicity, Multiplicity);
         //this.multiplicity = new Multiplicity();
         //this.multiplicity.max = 2;
@@ -29,7 +33,9 @@ export class CompositeField extends BaseModel implements Serializable<CompositeF
         let formGroup = this.formBuilder.group({
             id: this.id,
             ordinal: this.ordinal,
-            title: this.title
+            title: this.title,
+            description: this.description,
+            extendedDescription: this.extendedDescription
         });
 
         let fieldsFormArray = new Array<FormGroup>();

dmp-frontend/src/app/models/Field.ts

@@ -42,6 +42,7 @@ export class Field extends BaseModel implements Serializable<Field>, FormGenerat
     buildForm(): FormGroup {
         let formGroup = this.formBuilder.group({
             id: [this.id],
+            data:[this.data],
             /* title: [this.title], */
             value: [this.value]/* ,
             description: [this.description],