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

This commit is contained in:
Daniel Herrero 2018-02-21 11:11:18 +01:00
commit ade0e3beb0
20 changed files with 169 additions and 29 deletions

View File

@ -13,8 +13,7 @@
{ {
"url": "/list", "url": "/list",
"state": "item.index", "state": "item.index",
"component": "vn-item-list", "component": "vn-item-list"
"acl": ["developer"]
}, },
{ {
"url": "/create", "url": "/create",
@ -37,7 +36,8 @@
"menu": { "menu": {
"description": "Basic data", "description": "Basic data",
"icon": "folder" "icon": "folder"
} },
"acl": ["buyer"]
}, },
{ {
"url" : "/tags", "url" : "/tags",
@ -49,7 +49,8 @@
"menu": { "menu": {
"description": "Tags", "description": "Tags",
"icon": "folder" "icon": "folder"
} },
"acl": ["buyer"]
}, },
{ {
"url" : "/history", "url" : "/history",
@ -73,7 +74,8 @@
"menu": { "menu": {
"description": "Niche", "description": "Niche",
"icon": "folder" "icon": "folder"
} },
"acl": ["buyer","replenisher"]
}, },
{ {
"url" : "/botanical", "url" : "/botanical",
@ -85,7 +87,8 @@
"menu": { "menu": {
"description": "Botanical", "description": "Botanical",
"icon": "folder" "icon": "folder"
} },
"acl": ["buyer"]
},{ },{
"url" : "/barcode", "url" : "/barcode",
"state": "item.card.itemBarcode", "state": "item.card.itemBarcode",
@ -96,7 +99,8 @@
"menu": { "menu": {
"description": "Barcode", "description": "Barcode",
"icon": "folder" "icon": "folder"
} },
"acl": ["buyer","replenisher"]
},{ },{
"url" : "/summary", "url" : "/summary",
"state": "item.card.summary", "state": "item.card.summary",

View File

@ -1,14 +1,17 @@
<vn-horizontal pad-medium border-solid-bottom> <vn-horizontal pad-medium border-solid-bottom>
<vn-auto margin-medium-right> <vn-auto margin-medium-right ui-sref="item.card.summary({ id: {{$ctrl.item.id}} })">
<img ng-src="http://verdnatura.es/vn-image-data/catalog/200x200/{{$ctrl.item.image}}" on-error-src/> <img ng-src="http://verdnatura.es/vn-image-data/catalog/200x200/{{$ctrl.item.image}}" on-error-src/>
</vn-auto> </vn-auto>
<vn-one> <vn-one ui-sref="item.card.summary({ id: {{$ctrl.item.id}} })">
<div><span translate>Id</span>: <b>{{$ctrl.item.id}}</b></div> <div><span translate>Id</span>: <b>{{$ctrl.item.id}}</b></div>
<div><span translate>Name</span>: <b>{{$ctrl.item.name}}</b></div> <div><span translate>Name</span>: <b>{{$ctrl.item.name}}</b></div>
<div><span translate>Description</span>: <b>{{$ctrl.item.description}}</b></div> <div><span translate>Description</span>: <b>{{$ctrl.item.description}}</b></div>
<div><span translate>Size</span>: <b>{{$ctrl.item.size}}</b></div> <div><span translate>Size</span>: <b>{{$ctrl.item.size}}</b></div>
<div><span translate>Type</span>: <b>{{$ctrl.item.itemType.name}}</b></div> <div><span translate>Type</span>: <b>{{$ctrl.item.itemType.name}}</b></div>
</vn-one> </vn-one>
<a vn-auto vn-circle bg-minor ui-sref="item.card.summary({ id: {{$ctrl.item.id}} })" style="align-self: center;">
<img src="./preview.svg" alt="preview"/>
</a>
</vn-horizontal> </vn-horizontal>

View File

@ -13,9 +13,9 @@
</vn-horizontal> </vn-horizontal>
</vn-card> </vn-card>
<vn-card margin-medium-top> <vn-card margin-medium-top>
<a class="item-product-link" ng-repeat="item in index.model.instances" ui-sref="item.card.data({ id: {{item.id}} })" > <vn-auto class="item-product-link" ng-repeat="item in index.model.instances">
<vn-item-product title="View item" item="item"></vn-item-product> <vn-item-product title="View item" item="item"></vn-item-product>
</a> </vn-auto>
</vn-card> </vn-card>
<vn-paging index="index" total="index.model.count"></vn-paging> <vn-paging index="index" total="index.model.count"></vn-paging>
</div> </div>

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 30 24" style="enable-background:new 0 0 30 24;" xml:space="preserve" width="24px" heigth="24px">
<g>
<path d="M27,0H3C1.4,0,0,1.3,0,3v18c0,1.7,1.4,3,3,3h24c1.6,0,3-1.3,3-3V3C30,1.3,28.6,0,27,0z M27.9,19.8c0,1.4-1.2,2.6-2.6,2.6
H4.6c-1.4,0-2.6-1.2-2.6-2.6V4.2c0-1.4,1.2-2.6,2.6-2.6h20.7c1.4,0,2.6,1.2,2.6,2.6V19.8z"/>
<path d="M24.6,2.9H5.4c-1,0-1.9,0.8-1.9,1.9v14.4c0,1,0.8,1.9,1.9,1.9h19.1c1,0,1.9-0.8,1.9-1.9V4.8C26.4,3.8,25.6,2.9,24.6,2.9z"
/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 750 B

View File

@ -1,12 +1,12 @@
vn-item-product { vn-item-product {
display: block; display: block;
} }
a.item-product-link { vn-auto.item-product-link {
display: block; display: block;
text-decoration: none; text-decoration: none;
color: inherit; color: inherit;
} }
a.item-product-link:hover { vn-auto.item-product-link:hover {
color: white; color: white;
background-color: #424242; background-color: #424242;
} }

View File

@ -135,7 +135,7 @@ export default {
}, },
itemsIndex: { itemsIndex: {
createItemButton: `${components.vnFloatButton}`, createItemButton: `${components.vnFloatButton}`,
searchResult: `${components.vnItemProduct} > vn-horizontal`, searchResult: `${components.vnItemProduct} > vn-horizontal > vn-one`,
searchItemInput: `${components.vnTextfield}`, searchItemInput: `${components.vnTextfield}`,
searchButton: `${components.vnSearchBar} > vn-icon-button > button` searchButton: `${components.vnSearchBar} > vn-icon-button > button`
}, },
@ -160,6 +160,16 @@ export default {
firstCodeInput: `vn-horizontal:nth-child(2) > ${components.vnTextfield}`, firstCodeInput: `vn-horizontal:nth-child(2) > ${components.vnTextfield}`,
thirdCodeInput: `vn-horizontal:nth-child(4) > ${components.vnTextfield}`, thirdCodeInput: `vn-horizontal:nth-child(4) > ${components.vnTextfield}`,
submitNichesButton: `${components.vnSubmit}` submitNichesButton: `${components.vnSubmit}`
},
itemBotanical: {
botanicalButton: `${components.vnMenuItem}[ui-sref="item.card.botanical"]`,
botanicalInput: `vn-horizontal:nth-child(2) > ${components.vnTextfield}`,
genusSelect: `${components.vnAutocomplete}[field="$ctrl.botanical.genusFk"] > vn-vertical > ${components.vnTextfield}`,
genusSelectOptionOne: `${components.vnAutocomplete}[field="$ctrl.botanical.genusFk"] > vn-vertical > vn-drop-down > vn-vertical:not(.ng-hide) > vn-auto:nth-child(2) > ul > li:nth-child(1)`,
genusSelectOptionTwo: `${components.vnAutocomplete}[field="$ctrl.botanical.genusFk"] > vn-vertical > vn-drop-down > vn-vertical:not(.ng-hide) > vn-auto:nth-child(2) > ul > li:nth-child(2)`,
speciesSelect: `${components.vnAutocomplete}[field="$ctrl.botanical.specieFk"] > vn-vertical > ${components.vnTextfield}`,
speciesSelectOptionOne: `${components.vnAutocomplete}[field="$ctrl.botanical.specieFk"] > vn-vertical > vn-drop-down > vn-vertical:not(.ng-hide) > vn-auto:nth-child(2) > ul > li:nth-child(1)`,
speciesSelectOptionTwo: `${components.vnAutocomplete}[field="$ctrl.botanical.specieFk"] > vn-vertical > vn-drop-down > vn-vertical:not(.ng-hide) > vn-auto:nth-child(2) > ul > li:nth-child(2)`,
submitBotanicalButton: `${components.vnSubmit}`
} }
}; };

View File

@ -25,5 +25,13 @@
"model": "TaxType", "model": "TaxType",
"foreignKey": "taxTypeFk" "foreignKey": "taxTypeFk"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -24,5 +24,13 @@
"change_date_time": { "change_date_time": {
"type": "date" "type": "date"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -18,5 +18,13 @@
"showOrder": { "showOrder": {
"type": "number" "type": "number"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -27,5 +27,13 @@
"model": "TaxCode", "model": "TaxCode",
"foreignKey": "taxCodeFk" "foreignKey": "taxCodeFk"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -32,5 +32,13 @@
"model": "Specie", "model": "Specie",
"foreignKey": "specieFk" "foreignKey": "specieFk"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -18,5 +18,13 @@
"life": { "life": {
"type": "Number" "type": "Number"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -34,5 +34,13 @@
"model": "Account", "model": "Account",
"foreignKey": "userFk" "foreignKey": "userFk"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -18,5 +18,13 @@
"name": { "name": {
"type": "String" "type": "String"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -15,5 +15,13 @@
"name": { "name": {
"type": "String" "type": "String"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -31,5 +31,13 @@
"model": "Genus", "model": "Genus",
"foreignKey": "genus_id" "foreignKey": "genus_id"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -26,5 +26,13 @@
"unit": { "unit": {
"type": "String" "type": "String"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -18,5 +18,13 @@
"code": { "code": {
"type": "String" "type": "String"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -42,5 +42,13 @@
"model": "Link", "model": "Link",
"foreignKey": "linkFk" "foreignKey": "linkFk"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

View File

@ -31,5 +31,13 @@
"model": "Country", "model": "Country",
"foreignKey": "countryFk" "foreignKey": "countryFk"
} }
} },
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }