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

This commit is contained in:
SAMBA\bernat 2018-02-13 09:51:25 +01:00
commit 8c9ee4f6bc
1 changed files with 2 additions and 8 deletions

View File

@ -46,7 +46,6 @@
<vn-textfield vn-one label="Phone" field="$ctrl.address.phone"></vn-textfield> <vn-textfield vn-one label="Phone" field="$ctrl.address.phone"></vn-textfield>
<vn-textfield vn-one label="Mobile" field="$ctrl.address.mobile"></vn-textfield> <vn-textfield vn-one label="Mobile" field="$ctrl.address.mobile"></vn-textfield>
</vn-horizontal> </vn-horizontal>
<vn-one margin-medium-top> <vn-one margin-medium-top>
<vn-title>Notes</vn-title> <vn-title>Notes</vn-title>
<mg-ajax path="/client/api/ObservationTypes" options="mgIndex as observationsTypes"></mg-ajax> <mg-ajax path="/client/api/ObservationTypes" options="mgIndex as observationsTypes"></mg-ajax>
@ -59,8 +58,7 @@
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-three label="Description" model="observation.description"></vn-textfield>
@ -69,8 +67,7 @@
pointer pointer
medium-grey medium-grey
icon="remove_circle_outline" icon="remove_circle_outline"
ng-click="$ctrl.removeObservation($index)" ng-click="$ctrl.removeObservation($index)">
>
</vn-icon> </vn-icon>
<vn-icon <vn-icon
pointer pointer
@ -82,10 +79,7 @@
></vn-icon> ></vn-icon>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
</vn-one> </vn-one>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-button-bar> <vn-button-bar>