Mercurial > hg > ng2-query-ismi
diff app/query-select.component.ts @ 32:4c046f3244ec
new 'id_is' query type. new '_type' attribute.
author | casties |
---|---|
date | Tue, 02 Feb 2016 19:20:44 +0100 |
parents | 34cd764e234b |
children | e19d4c5e10a1 |
line wrap: on
line diff
--- a/app/query-select.component.ts Mon Feb 01 20:10:55 2016 +0100 +++ b/app/query-select.component.ts Tue Feb 02 19:20:44 2016 +0100 @@ -21,7 +21,7 @@ </option> </select> - <span *ngIf="selectedMode && (selectedMode.id=='type_is' || selectedMode.id=='relation_is')"> + <span *ngIf="selectedMode?.id=='type_is' || selectedMode?.id=='relation_is'"> <select *ngIf="queryOptions" [(ngModel)]="selectedOption" (change)="onSelectOption($event)"> <option></option> <option *ngFor="#option of queryOptions" [value]="option"> @@ -30,7 +30,7 @@ </select> </span> - <span *ngIf="selectedMode && (selectedMode.id=='att_contains' || selectedMode.id=='att_contains_norm')"> + <span *ngIf="selectedMode?.id=='att_contains' || selectedMode?.id=='att_contains_norm'"> <select [(ngModel)]="selectedOption"> <option></option> <option *ngFor="#option of queryOptions" [value]="option"> @@ -41,7 +41,7 @@ <input type="text" [(ngModel)]="queryInput"/> </span> - <span *ngIf="selectedMode && selectedMode.id=='att_num_range'"> + <span *ngIf="selectedMode?.id=='att_num_range'"> <select [(ngModel)]="selectedOption"> <option></option> <option *ngFor="#option of queryOptions" [value]="option"> @@ -54,6 +54,10 @@ <input type="text" [(ngModel)]="queryInput2"/> </span> + <span *ngIf="selectedMode?.id=='id_is'"> + <input type="text" [(ngModel)]="queryInput"/> + </span> + <button type="submit">Submit</button> </form> </div> @@ -110,25 +114,30 @@ var opt = this.selectedOption; if (opt) { step = new QueryStep(this.selectedMode, {'objectType': opt}); - } + } } else if (this.selectedMode.id == 'relation_is') { var opt = this.selectedOption; if (opt) { step = new QueryStep(this.selectedMode, {'relationType': opt}); - } + } } else if (this.selectedMode.id == 'att_contains') { var att = this.selectedOption; var val = this.queryInput; if (att && val) { step = new QueryStep(this.selectedMode, {'attribute': att, 'value': val}); - } + } + } else if (this.selectedMode.id == 'id_is') { + var val = this.queryInput; + if (val) { + step = new QueryStep(this.selectedMode, {'value': val}); + } } else if (this.selectedMode.id == 'att_num_range') { var att = this.selectedOption; var nlo = this.queryInput; var nhi = this.queryInput2; if (att && nlo && nhi) { step = new QueryStep(this.selectedMode, {'attribute': att, 'numLo': nlo, 'numHi': nhi}); - } + } } else if (this.selectedMode.id == 'att_contains_norm') { var att = this.selectedOption; var val = this.queryInput;