MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

no message

This commit is contained in:
annampak 2018-01-03 17:46:23 +02:00
parent 3d8860870a
commit 7f54832319
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dmp-admin/src/app/models/DataSetProfile/Field.ts
View File

@ -29,7 +29,7 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
public ordinal: number; public ordinal: number;
public visible: Visibility = new Visibility(); public visible: Visibility = new Visibility();
public data:DataField<any>; public data:DataField<any>;
public validation: ValidationTypes; public validations: Array<ValidationTypes>;
fromJSONObject(item:any):Field{ fromJSONObject(item:any):Field{
this.id = item.id; this.id = item.id;
@ -38,7 +38,7 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
this.page = item.page; this.page = item.page;
// this.multiplicity = new JsonSerializer<Multiplicity>().fromJSONObject(item.multiplicity, Multiplicity); // this.multiplicity = new JsonSerializer<Multiplicity>().fromJSONObject(item.multiplicity, Multiplicity);
this.ordinal = item.ordinal; this.ordinal = item.ordinal;
this.validation = item.validation; this.validations = item.validations;
this.viewStyle = new JsonSerializer<ViewStyle>().fromJSONObject(item.viewStyle, ViewStyle); this.viewStyle = new JsonSerializer<ViewStyle>().fromJSONObject(item.viewStyle, ViewStyle);
this.visible = new JsonSerializer<Visibility>().fromJSONObject(item.visible, Visibility); this.visible = new JsonSerializer<Visibility>().fromJSONObject(item.visible, Visibility);
if(item.data) { if(item.data) {
@ -62,9 +62,8 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
title: [this.title], title: [this.title],
page:[this.page] , page:[this.page] ,
ordinal:[this.ordinal], ordinal:[this.ordinal],
validation:[this.validation] validations:[this.validations]
}); });
//formGroup.addControl("multiplicity", this.multiplicity.buildForm()); //formGroup.addControl("multiplicity", this.multiplicity.buildForm());
formGroup.addControl("defaultValue", this.defaultValue.buildForm()); formGroup.addControl("defaultValue", this.defaultValue.buildForm());