From f558910905931bb414c537849397f3937e452083 Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Tue, 28 Nov 2017 13:42:30 +0200
Subject: [PATCH] fixes, add ordinal & multiplicity fields

---
 .../compositefield-form.component.html        | 33 ++++++++++++-------
 .../app/field-form/field-form.component.html  | 16 ++++++---
 .../groupfield-form.component.html            |  8 ++---
 dmp-admin/src/app/models/CompositeField.ts    |  7 ++--
 dmp-admin/src/app/models/Field.ts             |  8 ++++-
 .../section-form/section-form.component.html  |  2 +-
 6 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/dmp-admin/src/app/compositefield-form/compositefield-form.component.html b/dmp-admin/src/app/compositefield-form/compositefield-form.component.html
index 6f44aa2d4..8973b51c4 100644
--- a/dmp-admin/src/app/compositefield-form/compositefield-form.component.html
+++ b/dmp-admin/src/app/compositefield-form/compositefield-form.component.html
@@ -1,12 +1,23 @@
-<div class= "container">
-        <h4>FieldSet</h4>
-        <div *ngFor="let field of dataModel.fields let i=index;">
-            <field-form [form]="form.get('fields').get(''+i)" [dataModel]="field"></field-form>
+<div>
+    <h4>FieldSet</h4>
+    <div [formGroup]="form">
+        <div class="form-row">
+            <div class="form-group col-md-12">
+                    <div class="form-group col-md-6">
+                            <label>Multiplicity</label>
+                            <input type="nymber" class="form-control" formControlName="multiplicity">
+                        </div>
+            </div>
+            
         </div>
-        
-        <div>
-            <a (click)="addNewField()" style="cursor: pointer">
-                Add another field +
-            </a>
-        </div>
-</div>
+    </div>
+    <div *ngFor="let field of dataModel.fields let i=index;">
+        <field-form [form]="form.get('fields').get(''+i)" [dataModel]="field"></field-form>
+    </div>
+
+    <div>
+        <a (click)="addNewField()" style="cursor: pointer">
+            Add another field +
+        </a>
+    </div>
+</div>
\ No newline at end of file
diff --git a/dmp-admin/src/app/field-form/field-form.component.html b/dmp-admin/src/app/field-form/field-form.component.html
index 1fea8d714..26e2884f3 100644
--- a/dmp-admin/src/app/field-form/field-form.component.html
+++ b/dmp-admin/src/app/field-form/field-form.component.html
@@ -35,12 +35,12 @@
             </div>
             <div class="form-group col-md-4">
                 <label>Ordinal</label>
-                <input type="number" class="form-control" formControlName="extendedDescription">
+                <input type="number" class="form-control" formControlName="ordinal">
             </div>
         </div>
         <div class="form-row">
-            <div class="form-group col-md-12">
-                <label>Default Visibility</label>
+            <div class="form-group col-md-4">
+                <label class="radio control-label" >Default Visibility</label>
                 <label class="radio-inline">
                     <input type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1"> true
                 </label>
@@ -48,13 +48,21 @@
                     <input type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2"> false
                 </label>
             </div>
+            <div class="form-group col-md-4">
+                <label>Multiplicity</label>
+                <input type="number" class="form-control" formControlName="multiplicity">
+            </div>
+            <div class="form-group col-md-4">
+                <label>Default Value</label>
+                <input type="text" class="form-control" formControlName="value">
+            </div>
         </div>
 
     </div>
     <div *ngFor="let rule of dataModel.rules let i=index;">
         <rule-form [form]="form.get('rules').get(''+i)" [dataModel]="rule"></rule-form>
     </div>
-    <div style="padding-left: 15px;">
+    <div>
         <a (click)="addNewRule(form)" style="cursor: pointer">
             Add another rule +
         </a>
diff --git a/dmp-admin/src/app/groupfield-form/groupfield-form.component.html b/dmp-admin/src/app/groupfield-form/groupfield-form.component.html
index d22e9f3c6..6aadc154c 100644
--- a/dmp-admin/src/app/groupfield-form/groupfield-form.component.html
+++ b/dmp-admin/src/app/groupfield-form/groupfield-form.component.html
@@ -1,4 +1,4 @@
-<div class= "container">
+<div><!-- style="border-style: solid;"-->
 <h4 style="text-decoration: underline;">GroupFields</h4>
 <div [formGroup]="form">
     <div class="form-row">
@@ -11,17 +11,17 @@
             <input type="text" class="form-control" formControlName="id">
         </div>
         <div class="form-group col-md-4">
-            <label>defaultVisibility</label>
+            <label>DefaultVisibility</label>
             <input type="text" class="form-control" formControlName="defaultVisibility">
         </div>
     </div>
     <div class="form-row">
         <div class="form-group col-md-6">
-            <label>description</label>
+            <label>Description</label>
             <input type="text" class="form-control" formControlName="description">
         </div>
         <div class="form-group col-md-6">
-            <label>extendedDescription</label>
+            <label>ExtendedDescription</label>
             <input type="text" class="form-control" formControlName="extendedDescription">
         </div>
     </div>
diff --git a/dmp-admin/src/app/models/CompositeField.ts b/dmp-admin/src/app/models/CompositeField.ts
index 4de8a6122..02e55f321 100644
--- a/dmp-admin/src/app/models/CompositeField.ts
+++ b/dmp-admin/src/app/models/CompositeField.ts
@@ -5,16 +5,19 @@ import { BaseModel } from './BaseModel';
 import {Field} from './Field' 
 export class CompositeField extends BaseModel implements Serializable<CompositeField> {
     public fields:Array<Field> = new Array<Field>();
-    
+    public multiplicity:number;
 
     fromJSONObject(item:any):CompositeField{
         
         this.fields = new JsonSerializer<Field>().fromJSONArray(item.fields,Field);
+        this.multiplicity = item.multiplicity;
         return this;
     }
 
     buildForm():FormGroup{
-        let formGroup = this.formBuilder.group({});
+        let formGroup = this.formBuilder.group({
+            multiplicity:[this.multiplicity]
+        });
 
         let fieldsFormArray = new Array<FormGroup>();        
         this.fields.forEach(item => {
diff --git a/dmp-admin/src/app/models/Field.ts b/dmp-admin/src/app/models/Field.ts
index e512ddfee..0de1568aa 100644
--- a/dmp-admin/src/app/models/Field.ts
+++ b/dmp-admin/src/app/models/Field.ts
@@ -15,6 +15,8 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
     public viewStyle:string;
     public defaultVisibility:boolean;
     public page:number;
+    public multiplicity: number;
+    public ordinal: number;
     public rules: Array<Rule> = new Array<Rule>();
 
     fromJSONObject(item:any):Field{
@@ -26,6 +28,8 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
         this.viewStyle = item.viewStyle;
         this.defaultVisibility = item.defaultVisibility;
         this.page = item.page;
+        this.multiplicity = item.multiplicity;
+        this.ordinal = item.ordinal;
         this.rules = new JsonSerializer<Rule>().fromJSONArray(item.rule, Rule);
         return this;
     }
@@ -39,7 +43,9 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
             extendedDescription:[this.extendedDescription],
             viewStyle: [this.viewStyle],
             defaultVisibility:[this.defaultVisibility],
-            page:[this.page] 
+            page:[this.page] ,
+            multiplicity: [this.multiplicity],
+            ordinal:[this.ordinal]
         });
         
         let rulesFormArray = new Array<FormGroup>();
diff --git a/dmp-admin/src/app/section-form/section-form.component.html b/dmp-admin/src/app/section-form/section-form.component.html
index fd537e14d..c72b5c26c 100644
--- a/dmp-admin/src/app/section-form/section-form.component.html
+++ b/dmp-admin/src/app/section-form/section-form.component.html
@@ -1,4 +1,4 @@
-<div><!--style="border-style: solid;"-->
+<div style="background-color: #f5f5f5;border: 1px solid #e3e3e3;padding: 24px;"><!--style="border-style: solid;"-->
     <h4 style="text-decoration: underline;">Section</h4>
     <div [formGroup]="form">
         <div class="form-row">