From 997d4b61daca52929aa09893a5856a1e50760844 Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Mon, 8 Jan 2018 18:25:08 +0200
Subject: [PATCH] no message

---
 .../dynamic-form-field.component.html         |  4 +---
 .../dynamic-form-composite-field.html         | 19 ++++++++++++-------
 .../dynamic-form-section.ts                   |  1 +
 dmp-frontend/src/app/models/Field.ts          | 13 ++++++-------
 4 files changed, 20 insertions(+), 17 deletions(-)

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 54926f19c..40de1a4e8 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
@@ -52,9 +52,7 @@
 
 
     <div [hidden]="isValid">
-        <mat-error *ngIf="isValidRequired">
-            The field "{{field.title}}" <strong>required</strong>
-          </mat-error>
+      <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="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>
diff --git a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html
index 1185b3bf1..b86a12bee 100644
--- a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html
+++ b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.html
@@ -1,12 +1,17 @@
 <div [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>
+    <div *ngIf="compositeField.fields.length == 1" class="fieldset-component">
+        <h5 *ngIf="compositeField.title">{{compositeField.title}}</h5>
+        <div class="content-left-margin">
+            <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>
+        </div>
+    </div>
+
 
     <div *ngIf="compositeField.fields.length > 1" class="fieldset-component">
         <h5 *ngIf="compositeField.title">{{compositeField.title}}</h5>
diff --git a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts
index 515bd1ce9..c87a41890 100644
--- a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts
+++ b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts
@@ -2,6 +2,7 @@ import { VisibilityRulesService } from '../../visibility-rules/visibility-rules.
 import { FormGroup, Form, FormArray } from '@angular/forms';
 import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
 import { CompositeField } from '../../models/CompositeField';
+import { Section } from '@app/models/Section';
 
 
 @Component({
diff --git a/dmp-frontend/src/app/models/Field.ts b/dmp-frontend/src/app/models/Field.ts
index e7379dab3..c21090a1f 100644
--- a/dmp-frontend/src/app/models/Field.ts
+++ b/dmp-frontend/src/app/models/Field.ts
@@ -22,6 +22,7 @@ export class Field extends BaseModel implements Serializable<Field>, FormGenerat
     public multiplicityItems: Array<Field> = new Array<Field>();
     public data: any;
     public validations: Array<any>;//Array<ValidationTypes>
+    public validationRequired = false;
 
     fromJSONObject(item: any): Field {
         this.id = item.id;
@@ -46,19 +47,17 @@ export class Field extends BaseModel implements Serializable<Field>, FormGenerat
     
 
 
-    buildForm(): FormGroup {
-        let validationRequired = "false";
+    buildForm(): FormGroup {       
         if(this.validations)
-        this.validations.forEach(validation => {
-            if (validation == "REQUIRED")
-            {validationRequired = "true";}
-        });
+            this.validations.forEach(validation => {
+                if (validation == ValidationTypes.Required ) this.validationRequired = true;            
+            });
 
         let formGroup = this.formBuilder.group({
             id: [this.id],
             data:[this.data],
             /* title: [this.title], */
-            value: [this.value, validationRequired == "true"? Validators.required:null]/* ,
+            value: [this.value, this.validationRequired == true? Validators.required:null]/* ,
             description: [this.description],
             extendedDescription:[this.extendedDescription],
             viewStyle: [this.viewStyle],