verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Bernat Exposito 2018-02-26 14:37:20 +01:00
parent 665fcd3976 cbdf544232
commit c2eda39745
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/client/src/address-edit/address-edit.html
View File

@ -52,16 +52,21 @@
<vn-horizontal ng-repeat="observation in $ctrl.observations track by $index"> <vn-horizontal ng-repeat="observation in $ctrl.observations track by $index">
<vn-autocomplete <vn-autocomplete
vn-one vn-one
initial-data = "observation.observationType" initial-data="observation.observationType"
field = "observation.observationTypeFk" field="observation.observationTypeFk"
data = "observationsTypes.model" data="observationsTypes.model"
show-field = "description" show-field="description"
label = "Observation type" label="Observation type"
order = "description ASC" order="description ASC"
filter-search="{where: {description: {regexp: 'search'}}}"> filter-search="{where: {description: {regexp: 'search'}}}">
<tpl-item>{{$parent.$parent.item.description}}</tpl-item> <tpl-item>{{$parent.$parent.item.description}}</tpl-item>
</vn-autocomplete> </vn-autocomplete>
<vn-textfield vn-three label="Description" model="observation.description"></vn-textfield> <vn-textfield
vn-auto
label="Description"
model="observation.description"
rule="addressObservation.description">
</vn-textfield>
<vn-one pad-medium-top> <vn-one pad-medium-top>
<vn-icon <vn-icon
pointer pointer
@ -74,7 +79,7 @@
margin-medium-left margin-medium-left
orange orange
icon="add_circle" icon="add_circle"
ng-if = "observation.showAddIcon && observationsTypes.model.length > $ctrl.observations.length" ng-if="observation.showAddIcon && observationsTypes.model.length > $ctrl.observations.length"
ng-click="$ctrl.addObservation()"> ng-click="$ctrl.addObservation()">
</vn-icon> </vn-icon>
</vn-one> </vn-one>