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

bugs with radiobox&combobox

This commit is contained in:
annampak 2018-01-22 16:28:33 +02:00
parent 4f2fb712cf
commit 0d47fe0fd6
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-admin/src/app/components/combobox/combobox-component.ts
View File

@ -13,7 +13,7 @@ export class ComboboxComponent implements OnInit{
options = [{id:"autocomplete", value: "autocomplete"}, {id:"wordlist", value: "wordlist"}]; options = [{id:"autocomplete", value: "autocomplete"}, {id:"wordlist", value: "wordlist"}];
ngOnInit(){ ngOnInit(){
if (this.dataModel.data){ if (this.dataModel.data && this.form.get("data")){
this.type = this.form.get("data").get("type").value; this.type = this.form.get("data").get("type").value;
} }

13
dmp-admin/src/app/components/radiobox/radiobox-component.html
View File

@ -1,9 +1,10 @@
<div [formGroup]="form" class="form-row"> <div [formGroup]="form" class="form-row">
<div class="form-group col-md-12">
<label>Label</label>
<input type="string" class="form-control" formControlName="label">
</div>
<div formGroupName="data"> <div formGroupName="data">
<div class="form-group col-md-12">
<label>Label</label>
<input type="string" class="form-control" formControlName="label">
</div>
<div formArrayName="options"> <div formArrayName="options">
<div *ngFor="let option of form.get('data').get('options').controls index as i"> <div *ngFor="let option of form.get('data').get('options').controls index as i">
<div [formGroupName]="i"> <div [formGroupName]="i">
@ -21,8 +22,8 @@
</div> </div>
<div> <div>
<a (click)="addNewRow(form)" style="cursor: pointer"> <a (click)="addNewRow(form)" style="cursor: pointer">
Add + Add +
</a> </a>
</div> </div>
</div> </div>

7
dmp-admin/src/app/components/radiobox/radiobox-component.ts
View File

@ -17,9 +17,10 @@ export class RadioBoxComponent implements OnInit{
private options = new Array<ListingItem>(); private options = new Array<ListingItem>();
ngOnInit(){ ngOnInit(){
if (this.form.get("data")) this.form.removeControl("data"); //if (this.form.get("data")) this.form.removeControl("data");
this.form.addControl("data", this.data.buildForm()); if (!this.form.get("data"))
this.addNewRow(); this.form.addControl("data", this.data.buildForm());
if(!this.dataModel.data) this.addNewRow();
} }
addNewRow(){ addNewRow(){

2
dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.html
View File

@ -9,7 +9,7 @@
<div formGroupName="viewStyle"> <div formGroupName="viewStyle">
<div class="form-group"> <div class="form-group">
<label>View style</label> <label>View style</label>
<select class="form-control" formControlName="renderStyle"> <select class="form-control" formControlName="renderStyle" (change)= "onchangeCombo($event)">
<option value="textarea">textarea</option> <option value="textarea">textarea</option>
<option value="booleanDecision">booleanDecision</option> <option value="booleanDecision">booleanDecision</option>
<option value='combobox'>combobox</option> <option value='combobox'>combobox</option>

2
dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts
View File

@ -48,6 +48,6 @@ export class FieldFormComponent {
} }
onchangeCombo() { onchangeCombo() {
debugger; if (this.form.get("data")) this.form.removeControl("data");
} }
} }