verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

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

This commit is contained in:
Carlos Jimenez 2018-04-05 09:08:53 +02:00
parent 5d8a0beba9 97481b3e0b
commit 045dca4663
5 changed files with 34 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,25 +8,25 @@
model="barcode.code"
vn-acl="buyer, replenisher">
</vn-textfield>
<vn-one pad-medium-top>
<vn-icon
vn-acl="buyer, replenisher"
pointer
pad-medium-top
vn-acl="buyer,replenisher"
pointer
medium-grey
vn-tooltip="Remove note"
tooltip-position="left"
icon="remove_circle_outline"
ng-click="$ctrl.removeBarcode($index)">
</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-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-button-bar>
<vn-submit label="Save"></vn-submit>

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

@ -1,36 +0,0 @@
<form name="form" ng-submit="$ctrl.submit()">
<vn-card pad-large>
<vn-title>Item barcode</vn-title>
<vn-horizontal ng-repeat="barcode in $ctrl.barcodes track by $index">
<vn-textfield
vn-three
label="Code"
model="barcode.code"
vn-acl="buyer, replenisher">
</vn-textfield>
<vn-one>
<vn-icon
pad-medium-top
vn-acl="buyer,replenisher"
pointer
medium-grey
vn-tooltip="Remove note"
tooltip-position="left"
icon="remove_circle_outline"
ng-click="$ctrl.removeBarcode($index)">
</vn-icon>
</vn-one>
</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-button-bar>
<vn-submit label="Save"></vn-submit>
</vn-button-bar>
</form>

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

@ -1,59 +0,0 @@
<vn-watcher
vn-id="watcher"
data="$ctrl.item"
form="form">
</vn-watcher>
<form name="form" ng-submit="$ctrl.submit()">
<vn-card pad-large>
<vn-title>Item niches</vn-title>
<vn-horizontal ng-repeat="itemNiche in $ctrl.niches track by $index">
<vn-autocomplete
ng-if="!itemNiche.id"
vn-one
data="$ctrl.warehouses"
show-field="name"
value-field="id"
initial-data="itemNiche.warehouse"
field="itemNiche.warehouseFk"
label="Warehouse"
vn-acl="buyer,replenisher">
</vn-autocomplete>
<vn-textfield
ng-if="itemNiche.id"
vn-one
label="Warehouse"
model="itemNiche.warehouse.name"
disabled="true">
</vn-textfield>
<vn-textfield
vn-two
label="Code"
model="itemNiche.code"
rule="itemNiche.code"
vn-acl="buyer,replenisher">
</vn-textfield>
<vn-one>
<vn-icon
vn-acl="buyer,replenisher"
pointer
medium-grey
vn-tooltip="Remove note"
tooltip-position="left"
icon="remove_circle_outline"
ng-click="$ctrl.removeNiche($index)">
</vn-icon>
</vn-one>
</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-button-bar>
<vn-submit label="Save"></vn-submit>
</vn-button-bar>
</form>

38
client/item/src/niche/niche.html
View File

@ -26,31 +26,31 @@
disabled="true">
</vn-textfield>
<vn-textfield
vn-two
vn-three
label="Code"
model="itemNiche.code"
rule="itemNiche.code"
vn-acl="buyer,replenisher">
</vn-textfield>
<vn-one pad-medium-top>
<vn-icon
vn-acl="buyer,replenisher"
pointer
medium-grey
icon="remove_circle_outline"
ng-click="$ctrl.removeNiche($index)">
</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-icon
pad-medium-top
vn-acl="buyer,replenisher"
pointer
medium-grey
vn-tooltip="Remove note"
tooltip-position="left"
icon="remove_circle_outline"
ng-click="$ctrl.removeNiche($index)">
</vn-icon>
</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-button-bar>
<vn-submit label="Save"></vn-submit>

4
e2e/helpers/selectors.js
View File

@ -233,7 +233,7 @@ export default {
addBarcodeButton: `${components.vnIcon}[icon="add_circle"]`,
thirdCodeInput: `vn-horizontal:nth-child(4) > ${components.vnTextfield}`,
submitBarcodesButton: `${components.vnSubmit}`,
firstCodeRemoveButton: `vn-horizontal:nth-child(2) > vn-one > ${components.vnIcon}[icon="remove_circle_outline"]`
firstCodeRemoveButton: `vn-horizontal:nth-child(2) > ${components.vnIcon}[icon="remove_circle_outline"]`
},
itemNiches: {
nicheButton: `${components.vnMenuItem}[ui-sref="item.card.niche"]`,
@ -245,7 +245,7 @@ export default {
secondWarehouseSelect: `vn-horizontal:nth-child(3) > ${components.vnAutocomplete}[field="itemNiche.warehouseFk"] input`,
secondWarehouseDisabled: `vn-horizontal:nth-child(3) > vn-textfield[label="Warehouse"] > div > input`,
secondCodeInput: `vn-horizontal:nth-child(3) > vn-textfield[label="Code"] > div > input`,
secondNicheRemoveButton: `vn-horizontal:nth-child(3) > vn-one > ${components.vnIcon}[icon="remove_circle_outline"]`,
secondNicheRemoveButton: `vn-horizontal:nth-child(3) > ${components.vnIcon}[icon="remove_circle_outline"]`,
thirdWarehouseSelect: `vn-horizontal:nth-child(4) > ${components.vnAutocomplete}[field="itemNiche.warehouseFk"] input`,
thirdWarehouseDisabled: `vn-horizontal:nth-child(4) > vn-textfield[label="Warehouse"] > div > input`,
thirdWarehouseSelectFourthOption: `vn-horizontal:nth-child(4) > ${components.vnAutocomplete}[field="itemNiche.warehouseFk"] vn-drop-down ul > li:nth-child(4)`,