From 96f7b70bea42442fee478a433bd93ba2b14adf73 Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Thu, 31 May 2018 15:07:27 +0200
Subject: [PATCH] Fix Depot Behaviour

---
 Step/wwwroot/src/components/depot.vue | 35 ++++++++++++++++-----------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/Step/wwwroot/src/components/depot.vue b/Step/wwwroot/src/components/depot.vue
index fe9cc6d7..b0346f20 100644
--- a/Step/wwwroot/src/components/depot.vue
+++ b/Step/wwwroot/src/components/depot.vue
@@ -19,11 +19,20 @@
                     <input type="text" v-model="searchText">
                     <i class="fa fa-2x fa-search"></i>
                   </div>
-                      <drop class="list-vertical scrollable">
-                        <drag :transfer-data="m" v-for="m in availableMultiTools.filter(t => t.name.toLowerCase().indexOf(currentFilter) >=0)" :key="m.id">
-                            <tool :code="m.id" :title="m.name" img-source="../assets/icons/Tools/Shanks.png" @click="openInfoShank(m)"></tool></drag>
-                        <drag :transfer-data="t" v-for="t in availableTools.filter(t => t.familyName.toLowerCase().indexOf(currentFilter) >=0)" :key="t.id"><tool :code="t.id" :title="t.familyName" :img-source="getInfoEquipmentIcon(t.toolType)" @click="openInfoEquipment(t)"></tool></drag>
-                      </drop>
+                    <div class="list-vertical scrollable">  
+                        <drag :transfer-data="m" v-for="m in availableMultiTools.filter(t => t.name.toLowerCase().indexOf(currentFilter) >=0)" :key="m.id">        
+                            <template scope="props">
+                                <div v-if="props.transferData" class="tool">&nbsp;</div>
+                                <tool v-else :code="m.id" :title="m.name" img-source="../assets/icons/Tools/Shanks.png" @click="openInfoShank(m)"></tool>
+                            </template>
+                        </drag>
+                        <drag :transfer-data="t" v-for="t in availableTools.filter(t => t.familyName.toLowerCase().indexOf(currentFilter) >=0)" :key="t.id">
+                            <template scope="props">
+                                <div v-if="props.transferData" class="tool">&nbsp;</div>
+                                <tool v-else :code="t.id" :title="t.familyName" :img-source="getInfoEquipmentIcon(t.toolType)" @click="openInfoEquipment(t)"></tool>
+                            </template>
+                        </drag>  
+                    </div>
               </div>
               <div class="box-right">
                   <div class="single-depot">
@@ -34,16 +43,14 @@
                       </div>
                       <div class="sd-section scrollable" ref="positionslist">
                         <detail-card v-for="(pos, idx) in positions" :key="pos.positionId" :number="pos.positionId" class="depot-position" :class="{'selected': currentPosition == idx}">
-                          <span class="empty" v-if="!toolAtPosition(pos.positionId)">{{'depot_avaiable_position' | localize("Posizione disponibile")}}</span>
-                          <drop class="target" @drop="addToDepotPosition(pos.positionId, ...arguments)">
-                           <drag v-if="toolAtPosition(pos.positionId)" :transfer-data="toolAtPosition(pos.positionId)">
-                                <card-tool-depot :code="returnChild(toolAtPosition(pos.positionId)).id"
-                                                 :title="returnChild(toolAtPosition(pos.positionId)).name"
-                                                 :imgSource="getInfoEquipmentIcon(toolAtPosition(pos.positionId).childTool.toolType)"
-                                                 @click="removeToolsToDepot(pos.positionId, ...arguments)">
-                                </card-tool-depot>
-                           </drag>
+                          <drop class="target" v-if="!toolAtPosition(pos.positionId)" @drop="addToDepotPosition(pos.positionId, ...arguments)">
+                              <span class="empty" >{{'depot_avaiable_position' | localize("Posizione disponibile")}}</span>
                            </drop>
+                            <card-tool-depot v-if="toolAtPosition(pos.positionId)" :code="returnChild(toolAtPosition(pos.positionId)).id"
+                                :title="returnChild(toolAtPosition(pos.positionId)).name"
+                                :imgSource="getInfoEquipmentIconFromTool(toolAtPosition(pos.positionId))"
+                                @click="removeToolsToDepot(pos.positionId, ...arguments)">
+                            </card-tool-depot>
                         </detail-card>
                           <!-- <detail-card v-for="(d,key) in depot" :key="key" :number="d.positionId">
                               <vue-draggable>