GroupFields
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
{
public fields:Array = new Array();
-
+ public multiplicity:number;
fromJSONObject(item:any):CompositeField{
this.fields = new JsonSerializer().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();
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,FormGenerato
public viewStyle:string;
public defaultVisibility:boolean;
public page:number;
+ public multiplicity: number;
+ public ordinal: number;
public rules: Array = new Array();
fromJSONObject(item:any):Field{
@@ -26,6 +28,8 @@ export class Field extends BaseModel implements Serializable,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().fromJSONArray(item.rule, Rule);
return this;
}
@@ -39,7 +43,9 @@ export class Field extends BaseModel implements Serializable,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();
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 @@
-