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

4002-item.itemType #974

Merged
carlosjr merged 10 commits from 4002-item.itemType into dev 2022-05-23 12:31:24 +00:00
Conversation 0 Commits 10 Files Changed 30 +18 -10
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b3f0ee026 - Show all commits

16
modules/item/back/models/item-type.json
View File

@ -18,18 +18,12 @@
"name": { "name": {
"type": "string" "type": "string"
}, },
"temperatureFk": {
"type": "string"
},
"life": { "life": {
vicent marked this conversation as resolved Outdated
carlosjr commented 2022-05-23 09:05:19 +00:00
Outdated
Review
Copy Link

relation still missing

relation still missing
"type": "number" "type": "number"
}, },
"promo": { "promo": {
vicent marked this conversation as resolved Outdated
carlosjr commented 2022-05-20 08:46:01 +00:00
Outdated
Review
Copy Link

it's important to add the relations to any foreign key instead of a siemple field (just the foreign key)

it's important to add the relations to any foreign key instead of a siemple field (just the foreign key)
"type": "number" "type": "number"
}, },
"itemPackingTypeFk": {
"type": "string"
},
"isUnconventionalSize": { "isUnconventionalSize": {
"type": "number" "type": "number"
} }
@ -49,6 +43,16 @@
"type": "belongsTo", "type": "belongsTo",
"model": "ItemCategory", "model": "ItemCategory",
"foreignKey": "categoryFk" "foreignKey": "categoryFk"
},
"itemPackingType": {
"type": "belongsTo",
"model": "ItemPackingType",
"foreignKey": "itemPackingTypeFk"
},
"temperature": {
"type": "belongsTo",
"model": "Temperature",
"foreignKey": "temperatureFk"
} }
}, },
"acls": [ "acls": [

4
modules/item/front/item-type/card/index.js
View File

@ -6,7 +6,9 @@ class Controller extends ModuleCard {
const filter = { const filter = {
include: [ include: [
{relation: 'worker'}, {relation: 'worker'},
{relation: 'category'} {relation: 'category'},
{relation: 'itemPackingType'},
{relation: 'temperature'}
] ]
}; };

4
modules/item/front/item-type/summary/index.html
View File

@ -27,7 +27,7 @@
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Temperature" label="Temperature"
value="{{summary.temperatureFk}}"> value="{{summary.temperature.name}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Life" label="Life"
@ -39,7 +39,7 @@
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Item packing type" label="Item packing type"
value="{{summary.itemPackingTypeFk}}"> value="{{summary.itemPackingType.description}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Is unconventional size" label="Is unconventional size"

4
modules/item/front/item-type/summary/index.js
View File

@ -10,7 +10,9 @@ class Controller extends Component {
const filter = { const filter = {
include: [ include: [
{relation: 'worker'}, {relation: 'worker'},
{relation: 'category'} {relation: 'category'},
{relation: 'itemPackingType'},
{relation: 'temperature'}
] ]
}; };
this.$http.get(`ItemTypes/${value.id}`, {filter}) this.$http.get(`ItemTypes/${value.id}`, {filter})