From c2d49d57d600bdae01963791b347bd812c2aca86 Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Thu, 28 Feb 2019 16:11:29 +0100
Subject: [PATCH 1/2] Fix visuals in tool-in-spindle

---
 Step/wwwroot/assets/styles/base/depot.less                 | 4 ++++
 Step/wwwroot/assets/styles/base/head.less                  | 3 +--
 Step/wwwroot/assets/styles/style.css                       | 7 +++++--
 .../app_modules/production/components/head-production.vue  | 2 +-
 .../src/app_modules/tooling/components/tooling-depot.ts    | 2 +-
 .../src/app_modules/tooling/components/tooling-depot.vue   | 4 ++--
 .../src/modules/base-components/cards/card-busy-depot.vue  | 6 +++++-
 Step/wwwroot/src/modules/heads/head-SPINDLE.vue            | 2 +-
 Step/wwwroot/src/modules/heads/head.vue                    | 2 +-
 9 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Step/wwwroot/assets/styles/base/depot.less b/Step/wwwroot/assets/styles/base/depot.less
index 9b16cdae..6ffab436 100644
--- a/Step/wwwroot/assets/styles/base/depot.less
+++ b/Step/wwwroot/assets/styles/base/depot.less
@@ -82,6 +82,10 @@
                 align-items: center;
                 justify-content: center;
                 font-size: 3em;
+                img{                
+                    max-width: 262px;
+                    max-height: 106px;
+                }
             }
             .busyPosHalf{
                 width: 136px;
diff --git a/Step/wwwroot/assets/styles/base/head.less b/Step/wwwroot/assets/styles/base/head.less
index e6bf166e..f48c5085 100644
--- a/Step/wwwroot/assets/styles/base/head.less
+++ b/Step/wwwroot/assets/styles/base/head.less
@@ -107,7 +107,7 @@
         overflow: hidden;
         .tool-name{
             white-space: pre;
-            line-height: 47px;
+            line-height: 41px;
         }
         .tool-duplo{
             font-size: 14px;
@@ -335,7 +335,6 @@
             overflow: hidden;
             .tool-name{
                 white-space: pre;
-                line-height: 47px;
                 line-height: 20px;
             }
             .tool-duplo{
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 0865fc01..33b2b6bf 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -5931,7 +5931,7 @@ footer .container button.big:before {
 .head-production .tool-box .tool-name,
 .head-awj .tool-box .tool-name {
   white-space: pre;
-  line-height: 47px;
+  line-height: 41px;
 }
 .head-spindle .tool-box .tool-duplo,
 .head-production .tool-box .tool-duplo,
@@ -6236,7 +6236,6 @@ footer .container button.big:before {
 }
 .head-std aside .tool-box .tool-name {
   white-space: pre;
-  line-height: 47px;
   line-height: 20px;
 }
 .head-std aside .tool-box .tool-duplo {
@@ -11638,6 +11637,10 @@ footer .container button.big:before {
   justify-content: center;
   font-size: 3em;
 }
+.depot-container .depot-position .busyContainer .busyPos img {
+  max-width: 262px;
+  max-height: 106px;
+}
 .depot-container .depot-position .busyContainer .busyPosHalf {
   width: 136px;
   height: 136px;
diff --git a/Step/wwwroot/src/app_modules/production/components/head-production.vue b/Step/wwwroot/src/app_modules/production/components/head-production.vue
index 42e4f0aa..f2df9537 100644
--- a/Step/wwwroot/src/app_modules/production/components/head-production.vue
+++ b/Step/wwwroot/src/app_modules/production/components/head-production.vue
@@ -47,7 +47,7 @@
     <div class="tool-box" v-if="type == 'SPINDLE'" >
       <label>{{'head_label_tool' | localize("Tool")}}</label>
       <span v-if="!isSiemens() || (isSiemens() && !toolMounted())">{{tool}}</span>
-      <span class="tool-name" v-if="isSiemens()" :title="toolName">{{toolName}}</span>
+      <span class="tool-name" v-if="isSiemens() && toolMounted()" :title="toolName">{{toolName}}</span>
       <span class="tool-duplo" v-if="isSiemens() && toolMounted()" :title="toolName">{{'tooling_tool_abbreviation' | localize('DP%d',toolDuplo)}}</span>
     </div>
     <div class="tool-box" v-if="type == 'WJ' ">
diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts
index 6236d2b6..34e98ec1 100644
--- a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts
+++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts
@@ -598,7 +598,7 @@ export default class depot extends Vue {
   // SIEMENS
   public doAddToDepotPosition(position, event) {
     if (this.draggingTool && this.draggingPosition == position.positionId) {
-      if (this.toolAtPosition(position.positionId) || !position.canLoadTool)
+      if (this.toolAtPosition(position.positionId) || !position.canLoadTool || position.occupied)
         return
 
       this.draggingIn = false;
diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
index ce4f520d..9cbe0cb1 100644
--- a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
+++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
@@ -55,7 +55,7 @@
                       <div class="loading" v-if="onLoading"><i class="fa fa-circle-o-notch fa-spin"></i></div>
                       <div class="sd-section scrollable" ref="positionslist">
 
-                        <detail-card v-for="(pos, idx) in positions" :key="pos.positionId" :physicalType="pos.physicalType" :label="'tooling_magpos_abbreviation' | localize('P%d',pos.positionId)" :number="pos.positionId" class="depot-position" @click="openModalLoadDepot(pos.positionId,pos.type)" :class="{'drop':draggingIn,'selected': currentPosition == idx}" :magpos-occupied="toolAtPosition(pos.positionId)" :editable="editable" :disabled="pos.disabled">
+                        <detail-card v-for="(pos, idx) in positions" :key="pos.positionId" :physicalType="pos.physicalType" :label="'tooling_magpos_abbreviation' | localize('P%d',pos.positionId)" :number="pos.positionId" class="depot-position" @click="openModalLoadDepot(pos.positionId,pos.type)" :class="{'drop':draggingIn,'selected': currentPosition == idx}" :magpos-occupied="toolAtPosition(pos.positionId) || pos.occupied" :editable="editable" :disabled="pos.disabled">
                           <Container class="target" group-name="tools" orientation="horizontal"
                                 :shoud-animate-drop="disableDropAnimation"
                                 @drag-enter="onDragEnter(pos.positionId)" @drag-leave="onDragLeave()"
@@ -71,7 +71,7 @@
                                 @click="removeToolsToDepot(pos.positionId, toolAtPosition(pos.positionId))"
                                 @clickinfo="toolAtPosition(pos.positionId).childShank ? openInfoShank(toolAtPosition(pos.positionId).toolId) : openInfoEquipment(toolAtPosition(pos.positionId).toolId)">
                             </card-tool-depot>
-                            <card-busy-depot v-if="!toolAtPosition(pos.positionId)" :type=pos.busyStatus></card-busy-depot>
+                            <card-busy-depot v-if="!toolAtPosition(pos.positionId)" :type="pos.busyStatus" :toolInSpindle="pos.occupied"></card-busy-depot>
                         </detail-card>
                       </div>
                     <div ref="squarecontainer" class="square-container-fixed">
diff --git a/Step/wwwroot/src/modules/base-components/cards/card-busy-depot.vue b/Step/wwwroot/src/modules/base-components/cards/card-busy-depot.vue
index 48aeee8b..554a02b2 100644
--- a/Step/wwwroot/src/modules/base-components/cards/card-busy-depot.vue
+++ b/Step/wwwroot/src/modules/base-components/cards/card-busy-depot.vue
@@ -21,12 +21,16 @@
         <div class="busyPos" v-if="type==0">
             <i class="fa fa-arrows-h"></i>
         </div>
+        <div class="busyPos" v-if="type==4 && toolInSpindle">
+            <img src="assets/icons/MagPos/Spindle.png"  />
+        </div>
     </span>
 </template>
 <script>
 export default {
     props:{
-        type: {default:4}
+        type: {default:4},
+        toolInSpindle: {default:false}
     },
     methods:{
     }
diff --git a/Step/wwwroot/src/modules/heads/head-SPINDLE.vue b/Step/wwwroot/src/modules/heads/head-SPINDLE.vue
index 0a9e6afe..7ee62c20 100644
--- a/Step/wwwroot/src/modules/heads/head-SPINDLE.vue
+++ b/Step/wwwroot/src/modules/heads/head-SPINDLE.vue
@@ -28,7 +28,7 @@
     <div class="tool-box">
       <label>{{'head_label_tool' | localize("Tool")}}</label>
       <span v-if="!isSiemens() || (isSiemens() && !toolMounted())">{{tool}}</span>
-      <span class="tool-name" v-if="isSiemens()" :title="toolName">{{toolName}}</span>
+      <span class="tool-name" v-if="isSiemens() && toolMounted()" :title="toolName">{{toolName}}</span>
       <span class="tool-duplo" v-if="isSiemens() && toolMounted()" :title="toolName">{{'tooling_tool_abbreviation' | localize('DP%d',toolDuplo)}}</span>
     </div>
 
diff --git a/Step/wwwroot/src/modules/heads/head.vue b/Step/wwwroot/src/modules/heads/head.vue
index a7fa2a53..02a1ddfb 100644
--- a/Step/wwwroot/src/modules/heads/head.vue
+++ b/Step/wwwroot/src/modules/heads/head.vue
@@ -34,7 +34,7 @@
       <div class="tool-box" :title="'heads_tooltip_tool' | localize('Mounted-Tool Info')">
         <label>{{'head_label_tool' | localize("Tool")}}</label>        
         <span v-if="!isSiemens() || (isSiemens() && !toolMounted())">{{tool}}</span>
-        <span class="tool-name" v-if="isSiemens()" :title="toolName">{{toolName}}</span>
+        <span class="tool-name" v-if="isSiemens() && toolMounted()" :title="toolName">{{toolName}}</span>
         <span class="tool-duplo" v-if="isSiemens() && toolMounted()" :title="toolName">{{'tooling_tool_abbreviation' | localize('DP%d',toolDuplo)}}</span>
       </div>
       <div class="load-box" :class="loadStatus()" :disabled="loadDisabled" :title="'heads_tooltip_load' | localize('Actual Load')">

From e5494df177a4bab34fe2c6cb6abc9a2bd37d5266 Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Fri, 1 Mar 2019 10:53:24 +0100
Subject: [PATCH 2/2] Fix Style

---
 Step/wwwroot/assets/styles/base/card.less | 4 ++--
 Step/wwwroot/assets/styles/style.css      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less
index e6e08abf..652adfe3 100644
--- a/Step/wwwroot/assets/styles/base/card.less
+++ b/Step/wwwroot/assets/styles/base/card.less
@@ -731,13 +731,13 @@
                 }
             }
             .number{
-                width: 130px;
+                width: 135px;
                 height: 32px;
                 border-radius: 2px;
                 display: flex;
                 justify-content: flex-end;
                 align-items: center;
-                margin-right: 13px;
+                margin-right: 8px;
                 color: @color-greyish-brown;
                 padding-right: 8px;
                 font-size: 20px;
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 33b2b6bf..dc948ec2 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -7179,13 +7179,13 @@ footer .container button.big:before {
 }
 .card-axes-production .first-box-axes .axes .number,
 .card-axes-production .second-box-axes .axes .number {
-  width: 130px;
+  width: 135px;
   height: 32px;
   border-radius: 2px;
   display: flex;
   justify-content: flex-end;
   align-items: center;
-  margin-right: 13px;
+  margin-right: 8px;
   color: #4b4b4b;
   padding-right: 8px;
   font-size: 20px;