dev #1731

Merged
jgallego merged 105 commits from dev into test 2023-08-31 09:13:29 +00:00
2 changed files with 9 additions and 2 deletions
Showing only changes of commit 3b4626ee74 - Show all commits

View File

@ -1,7 +1,6 @@
<vn-autocomplete <vn-autocomplete
vn-one vn-one
url="Workers/search" url="Workers/search"
ng-model="$ctrl.workerFk"
search-function="{or: [ search-function="{or: [
{name: $search}, {name: $search},
{nickname: {like: '%'+ $search +'%'}}, {nickname: {like: '%'+ $search +'%'}},

View File

@ -20,8 +20,16 @@
vn-focus> vn-focus>
</vn-autocomplete> </vn-autocomplete>
<vn-worker-autocomplete <vn-worker-autocomplete
ng-if="$ctrl.isPickerDesignedState"> vn-one
ng-model="$ctrl.workerFk"
where="{role: 'employee'}">
</vn-worker-autocomplete> </vn-worker-autocomplete>
<vn-autocomplete
vn-one
url="Workers/activeWithInheritedRole"
ng-model="$ctrl.workerFk"
label="Worker">
</vn-autocomplete>
</vn-horizontal> </vn-horizontal>
</vn-card> </vn-card>
<vn-button-bar> <vn-button-bar>