From e5d31cb080edeb70b76dd7ca80f06b858050d063 Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Thu, 30 Nov 2017 10:14:54 +0200
Subject: [PATCH] ordinal & id in all classes

---
 .../compositefield-form.component.html        | 10 +++++++-
 .../groupfield-form.component.html            | 10 +++++---
 dmp-admin/src/app/models/CompositeField.ts    |  8 ++++++-
 dmp-admin/src/app/models/Multiplicity.ts      | 23 +++++++++++++++++++
 .../section-form/section-form.component.html  | 10 +++++---
 5 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 dmp-admin/src/app/models/Multiplicity.ts

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 af80693f9..84663eee8 100644
--- a/dmp-admin/src/app/compositefield-form/compositefield-form.component.html
+++ b/dmp-admin/src/app/compositefield-form/compositefield-form.component.html
@@ -2,10 +2,18 @@
     <div [formGroup]="form">
         <div class="form-row">
             <div class="form-group col-md-12">
-                <div class="form-group col-md-6">
+                <div class="form-group col-md-4">
                     <label>Multiplicity</label>
                     <input type="nymber" class="form-control" formControlName="multiplicity">
                 </div>
+                <div class="form-group col-md-4">
+                    <label>Ordinal</label>
+                    <input type="nymber" class="form-control" formControlName="ordinal">
+                </div>
+                <div class="form-group col-md-4">
+                    <label>Id</label>
+                    <input type="nymber" class="form-control" formControlName="id">
+                </div>
             </div>
 
         </div>
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 e7be03060..04c141f5c 100644
--- a/dmp-admin/src/app/groupfield-form/groupfield-form.component.html
+++ b/dmp-admin/src/app/groupfield-form/groupfield-form.component.html
@@ -2,15 +2,19 @@
     <!-- style="border-style: solid;"-->
     <div [formGroup]="form">
         <div class="form-row">
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-5">
                 <label>Title</label>
                 <input type="text" class="form-control" formControlName="title">
             </div>
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-2">
                 <label>Id</label>
                 <input type="text" class="form-control" formControlName="id">
             </div>
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-2">
+                <label>Ordinal</label>
+                <input type="text" class="form-control" formControlName="ordinal">
+            </div>
+            <div class="form-group col-md-3">
                 <label class="radio control-label">DefaultVisibility</label>
                 <label class="radio-inline">
                     <input type="radio" id="defaultVisibility" value="true" formControlName="defaultVisibility"> true
diff --git a/dmp-admin/src/app/models/CompositeField.ts b/dmp-admin/src/app/models/CompositeField.ts
index 02e55f321..89463970a 100644
--- a/dmp-admin/src/app/models/CompositeField.ts
+++ b/dmp-admin/src/app/models/CompositeField.ts
@@ -6,17 +6,23 @@ import {Field} from './Field'
 export class CompositeField extends BaseModel implements Serializable<CompositeField> {
     public fields:Array<Field> = new Array<Field>();
     public multiplicity:number;
+    public id:string;
+    public ordinal:number;
 
     fromJSONObject(item:any):CompositeField{
         
         this.fields = new JsonSerializer<Field>().fromJSONArray(item.fields,Field);
         this.multiplicity = item.multiplicity;
+        this.id = item.id;
+        this.ordinal = item.ordinal;
         return this;
     }
 
     buildForm():FormGroup{
         let formGroup = this.formBuilder.group({
-            multiplicity:[this.multiplicity]
+            multiplicity:[this.multiplicity],
+            id:[this.id],
+            ordinal:[this.ordinal]
         });
 
         let fieldsFormArray = new Array<FormGroup>();        
diff --git a/dmp-admin/src/app/models/Multiplicity.ts b/dmp-admin/src/app/models/Multiplicity.ts
new file mode 100644
index 000000000..66f85c3d8
--- /dev/null
+++ b/dmp-admin/src/app/models/Multiplicity.ts
@@ -0,0 +1,23 @@
+import { BaseModel } from './BaseModel';
+import { FormGroup } from '@angular/forms';
+import { FormGenerator } from './interfaces/FormGenerator';
+import { Serializable } from './interfaces/Serializable';
+export class Multiplicity extends BaseModel implements Serializable<Multiplicity>,FormGenerator<FormGroup>{
+    public min:number;
+    public max:string;
+
+    fromJSONObject(item:any):Multiplicity{
+        this.min = item.min;
+        this.max = item.max;
+        return this;
+    }
+
+    buildForm():FormGroup{
+        let formGroup = this.formBuilder.group({
+            min: [this.min],
+            max: [this.max]
+                     
+        });        
+        return formGroup;
+    }
+}
\ No newline at end of file
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 7dac649cc..dad32002f 100644
--- a/dmp-admin/src/app/section-form/section-form.component.html
+++ b/dmp-admin/src/app/section-form/section-form.component.html
@@ -2,15 +2,19 @@
     <!--style="border-style: solid;"-->
     <div [formGroup]="form">
         <div class="form-row">
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-5">
                 <label>Title</label>
                 <input type="text" class="form-control" formControlName="title">
             </div>
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-2">
                 <label>Id</label>
                 <input type="text" class="form-control" formControlName="id">
             </div>
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-2">
+                <label>Ordinal</label>
+                <input type="text" class="form-control" formControlName="ordinal">
+            </div>
+            <div class="form-group col-md-3">
                 <label class="radio control-label">defaultVisibility</label>
                 <label class="radio-inline">
                     <input type="radio" name="defaultVisibility" id="inlineRadio1" value="true" formControlName="defaultVisibility"> true