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

change name toFormGroupAlt

This commit is contained in:
annampak 2017-09-21 13:32:58 +03:00
parent 77b44527b5
commit 5c5bf3bfd0
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-frontend/src/app/entities/DataModel.ts
View File

@ -54,6 +54,10 @@ export class DataModel {
return this.fIndex.get(key);
}
public getFieldSourceByKey(key){
return this.fIndSources.get(key);
}

4
dmp-frontend/src/app/form/dynamic-form.component.ts
View File

@ -26,7 +26,7 @@ export class DynamicFormComponent implements OnInit {
constructor(private qcs: FieldControlService, private serverService: ServerService, private fieldVisibility: FieldVisibility, private dataModelService: dataModelBuilder) {
this.form = this.qcs.toFormGroup(new Array());
this.form = this.qcs.toFormGroup(new Array(), new Array());
}
@ -63,7 +63,7 @@ export class DynamicFormComponent implements OnInit {
this.dataModel = new DataModel();
this.dataModel = this.dataModelService.getDataModel(data);
this.form = this.qcs.toFormGroupAlt(this.dataModel.fields, this.dataModel.groups);
this.form = this.qcs.toFormGroup(this.dataModel.fields, this.dataModel.groups);
//this.form = this.qcs.toFormGroup(this.fields);
console.log("SUMMARY: ======>");

12
dmp-frontend/src/app/services/field-control.service.ts
View File

@ -7,19 +7,9 @@ import { GroupBase } from '../form/dynamic-form-group/group-base';
@Injectable()
export class FieldControlService {
constructor(){ }
toFormGroup(fields: FieldBase<any>[]){
let group: any ={};
fields.forEach(field => {
group[field.key] = field.required ? new FormControl(field.value || '', Validators.required)
: new FormControl(field.value || '')
});
return new FormGroup(group);
}
toFormGroupAlt(fields: FieldBase<any>[], groups: GroupBase<any>[]){
toFormGroup(fields: FieldBase<any>[], groups: GroupBase<any>[]){
let form: any = {};