Other fixes in shanks

2019-04-27 18:25:26 +02:00
parent c9d31331b0
commit 3d68ac9b26
1 changed files with 14 additions and 7 deletions
@@ -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