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

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

This commit is contained in:
Carlos Jimenez 2018-04-04 16:33:20 +02:00
parent 47c21a2915 520c1eb8f5
commit 7a3c2d0725
11 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,6 @@
<vn-one> <vn-one>
<vn-icon <vn-icon
pointer pointer
margin-medium-left
vn-tooltip="Add note" vn-tooltip="Add note"
tooltip-position = "right" tooltip-position = "right"
orange orange

5
client/core/src/components/autocomplete/autocomplete.html
View File

@ -17,6 +17,11 @@
</div> </div>
<label class="mdl-textfield__label" translate>{{::$ctrl.label}}</label> <label class="mdl-textfield__label" translate>{{::$ctrl.label}}</label>
</div> </div>
<i class="material-icons pointer"
ng-show="!$ctrl.disabled && $ctrl.hasValue && ($ctrl.hasFocus || $ctrl.hasMouseIn)"
ng-click="$ctrl.clear()">
clear
</i>
</div> </div>
<vn-drop-down <vn-drop-down
vn-id="drop-down" vn-id="drop-down"

3
client/core/src/components/autocomplete/autocomplete.js
View File

@ -45,7 +45,7 @@ export default class Autocomplete extends Input {
this.refreshSelection(); this.refreshSelection();
if (this.onChange) if (this.onChange)
this.onChange(value); this.onChange({value});
} }
/** /**
@ -235,6 +235,7 @@ ngModule.component('vnAutocomplete', {
showField: '@?', showField: '@?',
valueField: '@?', valueField: '@?',
selectFields: '<?', selectFields: '<?',
disabled: '<?',
where: '@?', where: '@?',
order: '@?', order: '@?',
label: '@', label: '@',

26
client/item/src/barcode/item-barcode.html
View File

@ -8,25 +8,27 @@
model="barcode.code" model="barcode.code"
vn-acl="buyer, replenisher"> vn-acl="buyer, replenisher">
</vn-textfield> </vn-textfield>
<vn-one pad-medium-top> <vn-one>
<vn-icon <vn-icon
vn-acl="buyer, replenisher" pad-medium-top
pointer vn-acl="buyer,replenisher"
pointer
medium-grey medium-grey
vn-tooltip="Remove note"
tooltip-position="left"
icon="remove_circle_outline" icon="remove_circle_outline"
ng-click="$ctrl.removeBarcode($index)"> ng-click="$ctrl.removeBarcode($index)">
</vn-icon> </vn-icon>
<vn-icon
vn-acl="buyer, replenisher"
pointer
margin-medium-left
orange
icon="add_circle"
ng-if = "barcode.showAddIcon"
ng-click="$ctrl.addBarcode()"
></vn-icon>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
<vn-one>
<vn-icon
vn-acl="buyer, replenisher"
pointer vn-tooltip="Add note"
tooltip-position="right" orange icon="add_circle"
ng-click="$ctrl.addBarcode()">
</vn-icon>
</vn-one>
</vn-card> </vn-card>
<vn-button-bar> <vn-button-bar>
<vn-submit label="Save"></vn-submit> <vn-submit label="Save"></vn-submit>

23
client/item/src/niche/item-niche.html
View File

@ -32,25 +32,26 @@
rule="itemNiche.code" rule="itemNiche.code"
vn-acl="buyer,replenisher"> vn-acl="buyer,replenisher">
</vn-textfield> </vn-textfield>
<vn-one pad-medium-top> <vn-one>
<vn-icon <vn-icon
vn-acl="buyer,replenisher" vn-acl="buyer,replenisher"
pointer pointer
medium-grey medium-grey
vn-tooltip="Remove note"
tooltip-position="left"
icon="remove_circle_outline" icon="remove_circle_outline"
ng-click="$ctrl.removeNiche($index)"> ng-click="$ctrl.removeNiche($index)">
</vn-icon> </vn-icon>
<vn-icon
vn-acl="buyer, replenisher"
pointer
margin-medium-left
orange
icon="add_circle"
ng-if="itemNiche.showAddIcon"
ng-click="$ctrl.addNiche()">
</vn-icon>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
<vn-one>
<vn-icon
vn-acl="buyer, replenisher"
pointer vn-tooltip="Add note"
tooltip-position="right" orange icon="add_circle"
ng-click="$ctrl.addNiche()">
</vn-icon>
</vn-one>
</vn-card> </vn-card>
<vn-button-bar> <vn-button-bar>
<vn-submit label="Save"></vn-submit> <vn-submit label="Save"></vn-submit>

2
client/ticket/routes.json
View File

@ -170,7 +170,7 @@
"ticket": "$ctrl.ticket" "ticket": "$ctrl.ticket"
}, },
"menu": { "menu": {
"description": "Sale Checked", "description": "Sale checked",
"icon": "assignment" "icon": "assignment"
} }
} }

2
client/ticket/src/locale/es.yml
View File

@ -35,3 +35,5 @@ Tickets: Tickets
Tracking: Revisión Tracking: Revisión
Worker: Trabajador Worker: Trabajador
Created : Añadido Created : Añadido
Sale checked: Control clientes
Is checked: Comprobado

2
client/ticket/src/note/ticket-observation.html
View File

@ -48,7 +48,7 @@
</vn-one> </vn-one>
<vn-one> <vn-one>
<vn-icon <vn-icon
pointer margin-medium-left vn-tooltip="Add note" pointer vn-tooltip="Add note"
tooltip-position="right" orange icon="add_circle" tooltip-position="right" orange icon="add_circle"
ng-if="observationTypes.model.length > $ctrl.ticketObservations.length" ng-if="observationTypes.model.length > $ctrl.ticketObservations.length"
ng-click="$ctrl.addObservation()"> ng-click="$ctrl.addObservation()">

1
client/ticket/src/package/index/package.html
View File

@ -53,7 +53,6 @@
<vn-one> <vn-one>
<vn-icon <vn-icon
pointer pointer
margin-medium-left
vn-tooltip="Add package" vn-tooltip="Add package"
tooltip-position = "right" tooltip-position = "right"
orange orange

5
client/ticket/src/tracking/edit/edit.html
View File

@ -1,4 +1,4 @@
<mg-ajax path="/ticket/api/TicketTrackings/" options="vnPost"></mg-ajax> <mg-ajax path="/ticket/api/TicketTrackings" options="vnPost"></mg-ajax>
<vn-watcher <vn-watcher
vn-id="watcher" vn-id="watcher"
data="$ctrl.ticket" data="$ctrl.ticket"
@ -9,7 +9,8 @@
<vn-card pad-large> <vn-card pad-large>
<vn-title>New state</vn-title> <vn-title>New state</vn-title>
<vn-horizontal> <vn-horizontal>
<vn-autocomplete vn-one <vn-autocomplete
vn-one
field="$ctrl.ticket.stateFk" field="$ctrl.ticket.stateFk"
url="/ticket/api/States" url="/ticket/api/States"
label="State" label="State"

4
client/ticket/src/tracking/index.html
View File

@ -4,8 +4,8 @@
<vn-vertical> <vn-vertical>
<vn-title>Tracking</vn-title> <vn-title>Tracking</vn-title>
<vn-grid-header on-order="$ctrl.onOrder(field, order)"> <vn-grid-header on-order="$ctrl.onOrder(field, order)">
<vn-column-header vn-one pad-medium-h field="state.name" text="State"></vn-column-header> <vn-column-header vn-one pad-medium-h field="state.name" text="State" order-locked></vn-column-header>
<vn-column-header vn-two pad-medium-h field="employee" text="Employee"></vn-column-header> <vn-column-header vn-two pad-medium-h field="employee" text="Employee" order-locked></vn-column-header>
<vn-column-header vn-two pad-medium-h field="created" text="Created" default-order="ASC"></vn-column-header> <vn-column-header vn-two pad-medium-h field="created" text="Created" default-order="ASC"></vn-column-header>
</vn-grid-header> </vn-grid-header>
<vn-one class="list list-content"> <vn-one class="list list-content">