From 3d68ac9b2658fdfdff7cd9d52a8cd2bb35d57402 Mon Sep 17 00:00:00 2001 From: Nicola Carminati Date: Sat, 27 Apr 2019 18:25:26 +0200 Subject: [PATCH] Other fixes in shanks --- .../tooling/components/tooling-equipment.ts | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts index 8c7bbd41..9d211206 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts @@ -535,14 +535,21 @@ public isEquipmentSelected(offset){ // Controllo se l'utensile può essere eliminato se in magazzino public checkIfCanDeleteTool() { if(this.selectedTool) { - // Check if magazine is in magazine - if (this.magazines.length > 0) { - var magId = this.getToolMagPosition(this.selectedTool.shankId) - var mag = this.magazines.find(d => d.id == magId); - - if (mag) + if(!this.isSiemens || this.multitoolOptionActive){ + if(this.selectedTool.shankId) return true; - } + else + return false; + }else{ + if (this.magazines.length > 0) { + var magId = this.getToolMagPosition(this.selectedTool.shankId) + var mag = this.magazines.find(d => d.id == magId); + + if (mag) + return true; + }; + + } } return false