Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Browse Source
This commit is contained in:
Alessandro Francia
2018-06-18 09:14:41 +02:00
parent c3c6a251e7 fcaba00e27
commit ca845845fd
5 changed files with 101 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Utils/languages/IT.xml
+6
View File
@@ -191,6 +191,12 @@
<depot_search_placeholder>Cerca un utensile per nome</depot_search_placeholder>
<depot_avaiable_position>Posizione disponibile</depot_avaiable_position>
<!-- Tool Manager - Modals Labels -->
<depot_action_loading_header>Caricamento Utensile: Mag %d P%d</depot_action_loading_header>
<depot_action_unloading_header>Scaricamento Utensile: Mag %d P%d</depot_action_unloading_header>
<depot_action_transfer_header>Trasferimento Utensile: from Mag %d P%d to Mag %d P%d</depot_action_transfer_header>
<depot_action_generic_header>Tool-Manager Occupato</depot_action_generic_header>
<depot_action_generic_text>Un'operazione sta bloccando il gestore degli utensili...</depot_action_generic_text>
<!-- Tool Manager - Categories -->
<tooling_equipment_list_category_general>Generali:</tooling_equipment_list_category_general>
Step.Utils/languages/en.xml
+6
View File
@@ -195,6 +195,12 @@
<load_depot_btn_cancel>Cancel</load_depot_btn_cancel>
<load_depot_btn_confirm>Load</load_depot_btn_confirm>
<!-- Tool Manager - Modals Labels -->
<depot_action_loading_header>Loading Tool: Mag %d P%d</depot_action_loading_header>
<depot_action_unloading_header>Unloading Tool: Mag %d P%d</depot_action_unloading_header>
<depot_action_transfer_header>Tranfer Tool: from Mag %d P%d to Mag %d P%d</depot_action_transfer_header>
<depot_action_generic_header>Tool-Manager Busy</depot_action_generic_header>
<depot_action_generic_text>An Operation in Tool-Manager is in progress...</depot_action_generic_text>
<!-- Tool Manager - Categories -->
<tooling_equipment_list_category_general>Generics:</tooling_equipment_list_category_general>
Step/wwwroot/src/components/tooling/depot-action-loading.vue
+27 -2
View File
@@ -2,12 +2,18 @@
<modal type="depot-action-modal" class="depot-action-container">
<div class="depot-action-loading">
<div class="depot-action-loading-header">
<div class="depot-action-loading-header-label">{{'depot_action_loading_header' | localize("Operazione in corso - Magazzino N")}}</div>
<div class="depot-action-loading-header-label">{{'depot_action_loading_header' | localize("Caricamento Utensile - Magazzino %d [%d]",magazineStatusModel().destinationMagazine,magazineStatusModel().destinationPosition)}}</div>
</div>
<div class="depot-action-loading-body">
<div class="depot-action-loading-body-header">
<div class="depot-action-loading-body-box">
<card-assisted-tooling :is-up="true"></card-assisted-tooling>
<card-assisted-tooling
:is-up="true"
:title="magazineStatusModel().tool.name"
:code="translateId(magazineStatusModel().tool.id,magazineStatusModel().tool.isMultitool)"
:imgSource="getInfoEquipmentIcon(magazineStatusModel().tool.toolType,magazineStatusModel().tool.isMultitool)"
>
</card-assisted-tooling>
</div>
</div>
</div>
@@ -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";
}
}
};
</script>
Step/wwwroot/src/components/tooling/depot-action-transfer.vue
+34 -3
View File
@@ -2,13 +2,25 @@
<modal type="tooling" class="depot-action-container">
<div class="depot-action-transfer">
<div class="depot-action-transfer-header">
<div class="depot-action-transfer-header-label">{{'depot_action_transfer_header' | localize("Operazione in corso - Magazzino N")}}</div>
<div class="depot-action-transfer-header-label">{{'depot_action_transfer_header' | localize("Transferimento Utensile - da Magazzino %d [%d] a %d [%d] ",magazineStatusModel().originMagazine,magazineStatusModel().originPosition,magazineStatusModel().destinationMagazine,magazineStatusModel().destinationPosition)}}</div>
</div>
<div class="depot-action-transfer-body">
<div class="depot-action-transfer-body-header">
<div class="depot-action-transfer-body-box">
<card-assisted-tooling :is-down="true"></card-assisted-tooling>
<card-assisted-tooling :is-up="true"></card-assisted-tooling>
<card-assisted-tooling
:is-down="true"
:title="magazineStatusModel().tool.name"
:code="translateId(magazineStatusModel().tool.id,magazineStatusModel().tool.isMultitool)"
:imgSource="getInfoEquipmentIcon(magazineStatusModel().tool.toolType,magazineStatusModel().tool.isMultitool)"
>
</card-assisted-tooling>
<card-assisted-tooling
:is-up="true"
:title="magazineStatusModel().tool.name"
:code="translateId(magazineStatusModel().tool.id,magazineStatusModel().tool.isMultitool)"
:imgSource="getInfoEquipmentIcon(magazineStatusModel().tool.toolType,magazineStatusModel().tool.isMultitool)"
>
</card-assisted-tooling>
</div>
</div>
</div>
@@ -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";
}
}
};
</script>
Step/wwwroot/src/components/tooling/depot-action-unloading.vue
+28 -3
View File
@@ -2,12 +2,18 @@
<modal type="tooling" class="depot-action-container">
<div class="depot-action-unloading">
<div class="depot-action-unloading-header">
<div class="depot-action-unloading-header-label">{{'depot_action_unloading_header' | localize("Operazione in corso - Magazzino N")}}</div>
<div class="depot-action-unloading-header-label">{{'depot_action_unloading_header' | localize("Scaricamento Utensile - Magazzino %d [%d]",magazineStatusModel().originMagazine,magazineStatusModel().originPosition)}}</div>
</div>
<div class="depot-action-unloading-body">
<div class="depot-action-unloading-body-header">
<div class="depot-action-unloading-body-box">
<card-assisted-tooling :is-down="true"></card-assisted-tooling>
<div class="depot-action-unloading-body-box">
<card-assisted-tooling
:is-down="true"
:title="magazineStatusModel().tool.name"
:code="translateId(magazineStatusModel().tool.id,magazineStatusModel().tool.isMultitool)"
:imgSource="getInfoEquipmentIcon(magazineStatusModel().tool.toolType,magazineStatusModel().tool.isMultitool)"
>
</card-assisted-tooling>
</div>
</div>
</div>
@@ -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";
}
}
};
</script>