diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml index fb39b4c0..110b2e07 100644 --- a/Step.Utils/languages/IT.xml +++ b/Step.Utils/languages/IT.xml @@ -191,6 +191,12 @@ Cerca un utensile per nome Posizione disponibile + + Caricamento Utensile: Mag %d P%d + Scaricamento Utensile: Mag %d P%d + Trasferimento Utensile: from Mag %d P%d to Mag %d P%d + Tool-Manager Occupato + Un'operazione sta bloccando il gestore degli utensili... Generali: diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml index a89c1ca1..d091de88 100644 --- a/Step.Utils/languages/en.xml +++ b/Step.Utils/languages/en.xml @@ -195,6 +195,12 @@ Cancel Load + + Loading Tool: Mag %d P%d + Unloading Tool: Mag %d P%d + Tranfer Tool: from Mag %d P%d to Mag %d P%d + Tool-Manager Busy + An Operation in Tool-Manager is in progress... Generics: diff --git a/Step/wwwroot/src/components/tooling/depot-action-loading.vue b/Step/wwwroot/src/components/tooling/depot-action-loading.vue index 92239a12..db5cf1ff 100644 --- a/Step/wwwroot/src/components/tooling/depot-action-loading.vue +++ b/Step/wwwroot/src/components/tooling/depot-action-loading.vue @@ -2,12 +2,18 @@
-
{{'depot_action_loading_header' | localize("Operazione in corso - Magazzino N")}}
+
{{'depot_action_loading_header' | localize("Caricamento Utensile - Magazzino %d [%d]",magazineStatusModel().destinationMagazine,magazineStatusModel().destinationPosition)}}
- + +
@@ -22,6 +28,25 @@ export default { components: { cardAssistedTooling, modal: Modal }, props: { imgSource: { default: "../../assets/icons/png/start-machine.png" } + }, + methods: { + magazineStatusModel() { + return this.$store.state.depot.magazineStatusModel; + }, + translateId(id,ismultitool){ + if(ismultitool) + return this.$options.filters.localize("tooling_shank_abbreviation", "S%d",id); + else + return this.$options.filters.localize("tooling_tool_abbreviation", "T%d",id); + }, + getInfoEquipmentIcon(id,ismultitool) { + if(ismultitool) + return "../assets/icons/Tools/Shanks.png"; + if(id && (id==151 || id==700)) + return "../assets/icons/Tools/Saw.png"; + else + return "../assets/icons/Tools/Tools.png"; + } } }; diff --git a/Step/wwwroot/src/components/tooling/depot-action-transfer.vue b/Step/wwwroot/src/components/tooling/depot-action-transfer.vue index 2eb15676..27b63d10 100644 --- a/Step/wwwroot/src/components/tooling/depot-action-transfer.vue +++ b/Step/wwwroot/src/components/tooling/depot-action-transfer.vue @@ -2,13 +2,25 @@
-
{{'depot_action_transfer_header' | localize("Operazione in corso - Magazzino N")}}
+
{{'depot_action_transfer_header' | localize("Transferimento Utensile - da Magazzino %d [%d] a %d [%d] ",magazineStatusModel().originMagazine,magazineStatusModel().originPosition,magazineStatusModel().destinationMagazine,magazineStatusModel().destinationPosition)}}
- - + + + +
@@ -23,6 +35,25 @@ export default { components: { cardAssistedTooling, modal: Modal }, props: { imgSource: { default: "../../assets/icons/png/start-machine.png" } + }, + methods: { + magazineStatusModel() { + return this.$store.state.depot.magazineStatusModel; + }, + translateId(id,ismultitool){ + if(ismultitool) + return this.$options.filters.localize("tooling_shank_abbreviation", "S%d",id); + else + return this.$options.filters.localize("tooling_tool_abbreviation", "T%d",id); + }, + getInfoEquipmentIcon(id,ismultitool) { + if(ismultitool) + return "../assets/icons/Tools/Shanks.png"; + if(id && (id==151 || id==700)) + return "../assets/icons/Tools/Saw.png"; + else + return "../assets/icons/Tools/Tools.png"; + } } }; diff --git a/Step/wwwroot/src/components/tooling/depot-action-unloading.vue b/Step/wwwroot/src/components/tooling/depot-action-unloading.vue index 2026e6ee..6245563e 100644 --- a/Step/wwwroot/src/components/tooling/depot-action-unloading.vue +++ b/Step/wwwroot/src/components/tooling/depot-action-unloading.vue @@ -2,12 +2,18 @@
-
{{'depot_action_unloading_header' | localize("Operazione in corso - Magazzino N")}}
+
{{'depot_action_unloading_header' | localize("Scaricamento Utensile - Magazzino %d [%d]",magazineStatusModel().originMagazine,magazineStatusModel().originPosition)}}
-
- +
+ +
@@ -22,6 +28,25 @@ export default { components: { cardAssistedTooling, modal: Modal }, props: { imgSource: { default: "../assets/icons/png/start-machine.png" } + }, + methods: { + magazineStatusModel() { + return this.$store.state.depot.magazineStatusModel; + }, + translateId(id,ismultitool){ + if(ismultitool) + return this.$options.filters.localize("tooling_shank_abbreviation", "S%d",id); + else + return this.$options.filters.localize("tooling_tool_abbreviation", "T%d",id); + }, + getInfoEquipmentIcon(id,ismultitool) { + if(ismultitool) + return "../assets/icons/Tools/Shanks.png"; + if(id && (id==151 || id==700)) + return "../assets/icons/Tools/Saw.png"; + else + return "../assets/icons/Tools/Tools.png"; + } } };