diff --git a/modules/item/back/models/item-type.json b/modules/item/back/models/item-type.json index 407b4d15a..843d9877f 100644 --- a/modules/item/back/models/item-type.json +++ b/modules/item/back/models/item-type.json @@ -18,18 +18,12 @@ "name": { "type": "string" }, - "temperatureFk": { - "type": "string" - }, "life": { "type": "number" }, "promo": { "type": "number" }, - "itemPackingTypeFk": { - "type": "string" - }, "isUnconventionalSize": { "type": "number" } @@ -49,6 +43,16 @@ "type": "belongsTo", "model": "ItemCategory", "foreignKey": "categoryFk" + }, + "itemPackingType": { + "type": "belongsTo", + "model": "ItemPackingType", + "foreignKey": "itemPackingTypeFk" + }, + "temperature": { + "type": "belongsTo", + "model": "Temperature", + "foreignKey": "temperatureFk" } }, "acls": [ diff --git a/modules/item/front/item-type/card/index.js b/modules/item/front/item-type/card/index.js index 21a2d5bc8..fa6b37340 100644 --- a/modules/item/front/item-type/card/index.js +++ b/modules/item/front/item-type/card/index.js @@ -6,7 +6,9 @@ class Controller extends ModuleCard { const filter = { include: [ {relation: 'worker'}, - {relation: 'category'} + {relation: 'category'}, + {relation: 'itemPackingType'}, + {relation: 'temperature'} ] }; diff --git a/modules/item/front/item-type/summary/index.html b/modules/item/front/item-type/summary/index.html index 72604c912..d003c8f38 100644 --- a/modules/item/front/item-type/summary/index.html +++ b/modules/item/front/item-type/summary/index.html @@ -27,7 +27,7 @@ + value="{{summary.temperature.name}}"> + value="{{summary.itemPackingType.description}}">