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

page field in sections

This commit is contained in:
annampak 2017-12-11 10:50:34 +02:00
parent 628b53f01b
commit 54a70c5c70
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
this.defaultValue = new JsonSerializer<DefaultValue>().fromJSONObject(item.defaultValue, DefaultValue); this.defaultValue = new JsonSerializer<DefaultValue>().fromJSONObject(item.defaultValue, DefaultValue);
this.description = item.description; this.description = item.description;
this.extendedDescription = item.extendedDescription; this.extendedDescription = item.extendedDescription;
this.defaultVisibility = item.defaultVisibility ? item.defaultVisibility : true; this.defaultVisibility = item.defaultVisibility !==null ? item.defaultVisibility : true;
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;
@ -70,7 +70,7 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
//formGroup.addControl("data",this.data? this.data.buildForm():this.formBuilder.group({})); //formGroup.addControl("data",this.data? this.data.buildForm():this.formBuilder.group({}));
if(this.data)formGroup.addControl("data",this.data.buildForm()); if(this.data)formGroup.addControl("data",this.data.buildForm());
if( !formGroup.controls["defaultVisibility"].value) formGroup.controls["defaultVisibility"].setValue(true); if( formGroup.controls["defaultVisibility"].value == null) formGroup.controls["defaultVisibility"].setValue(true);
return formGroup; return formGroup;
} }

12
dmp-admin/src/app/section-form/section-form.component.html
View File

@ -1,7 +1,7 @@
<div class="section-container"> <div class="section-container">
<div class="row" [formGroup]="form"> <div class="row" [formGroup]="form">
<div class="row"> <div class="row">
<div class="form-group col-md-5"> <div class="form-group col-md-4">
<label>Title</label> <label>Title</label>
<input type="text" class="form-control" formControlName="title"> <input type="text" class="form-control" formControlName="title">
</div> </div>
@ -11,9 +11,13 @@
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Ordinal</label> <label>Ordinal</label>
<input type="text" class="form-control" formControlName="ordinal"> <input type="number" class="form-control" formControlName="ordinal">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-2">
<label>Page</label>
<input type="number" class="form-control" formControlName="page">
</div>
<div class="form-group col-md-2">
<label class="radio control-label">Default Visibility</label> <label class="radio control-label">Default Visibility</label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" [value]="true" formControlName="defaultVisibility"> true <input type="radio" [value]="true" formControlName="defaultVisibility"> true
@ -21,7 +25,7 @@
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" [value]="false" formControlName="defaultVisibility"> false <input type="radio" [value]="false" formControlName="defaultVisibility"> false
</label> </label>
</div> </div>
</div> </div>
</div> </div>