Fix uk-close in criteria and subjects. Criteria: Add a criterion should be added at start
This commit is contained in:
parent
b1515cd395
commit
b0a0268a4e
|
@ -1 +1 @@
|
|||
Subproject commit ea952197289da5113cfb67c4c911cb5fd1583909
|
||||
Subproject commit 770c3fb3eff99ddab059f0de657f576443b01a7d
|
|
@ -46,10 +46,10 @@
|
|||
class="uk-margin-bottom uk-hidden@l">
|
||||
<div class="uk-flex-middle uk-grid-small uk-margin-medium-bottom" uk-grid>
|
||||
<div class="uk-flex uk-flex-right uk-width-1-1">
|
||||
<a class="uk-close" (click)="removeConstraint(getIndex(i), j)">
|
||||
<button class="uk-close uk-icon" (click)="removeConstraint(getIndex(i), j)">
|
||||
<icon name="close" ratio="1.5" [flex]="true"
|
||||
[attr.uk-tooltip]="(getConstraint(getIndex(i)).length === 1?'By removing this constraint, the filter will be removed too':null)"></icon>
|
||||
</a>
|
||||
</button>
|
||||
</div>
|
||||
<div class="uk-width-1-1" input type="select" inputClass="border-bottom" [placeholder]="{static: true, label: 'Choose a field'}"
|
||||
[options]="fields" [formInput]="constraint.get('field')">
|
||||
|
@ -92,10 +92,10 @@
|
|||
(change)="caseSensitive($event, constraint)"></mat-slide-toggle>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-center">
|
||||
<a class="uk-close" (click)="removeConstraint(getIndex(i), j)">
|
||||
<button class="uk-close uk-icon" (click)="removeConstraint(getIndex(i), j)">
|
||||
<icon name="close" ratio="1.5" [flex]="true"
|
||||
[attr.uk-tooltip]="(getConstraint(getIndex(i)).length === 1?'By removing this constraint, the filter will be removed too':null)"></icon>
|
||||
</a>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -101,7 +101,7 @@ export class CriteriaComponent implements OnInit {
|
|||
verb_suffix: this.fb.control('_caseinsensitive')
|
||||
})
|
||||
]);
|
||||
this.criteria.push(this.fb.group({
|
||||
this.criteria.insert(0, this.fb.group({
|
||||
constraint: constraintArray
|
||||
}));
|
||||
this.page = Math.ceil(this.criteria.length/this.pageSize);
|
||||
|
|
|
@ -95,8 +95,8 @@
|
|||
<form *ngIf="myForm">
|
||||
<div class="uk-margin-top uk-flex-center uk-flex uk-margin-medium-bottom">
|
||||
<a *ngIf="!isEditModal" (click)="addSubjectInForm()">
|
||||
<button class="uk-button uk-button-primary">
|
||||
<icon name="add"></icon>
|
||||
<button class="uk-button uk-button-primary uk-flex uk-flex-middle">
|
||||
<icon name="add" [flex]="true"></icon>
|
||||
<span class="uk-margin-xsmall-left">Add Subject</span>
|
||||
</button>
|
||||
</a>
|
||||
|
@ -106,10 +106,10 @@
|
|||
<div input [formInput]="myForm.controls[i]" type="text"
|
||||
placeholder="Type subjects as free text keywords" class="uk-width-expand"></div>
|
||||
<div *ngIf="!isEditModal" class="uk-width-auto uk-flex uk-flex-center uk-margin-left">
|
||||
<a class="uk-close" [class.uk-invisible]="myForm.length === 1"
|
||||
<button class="uk-close uk-icon" [class.uk-invisible]="myForm.length === 1"
|
||||
(click)="removeSubjectInForm(i)">
|
||||
<icon name="close" [flex]="true" [ratio]="1.5"></icon>
|
||||
</a>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit c80b7371801d42611c611707ca933c1c83c3c672
|
||||
Subproject commit e4c7254752de49fc801a30bde3cf0120e42cf9da
|
Loading…
Reference in New Issue