From b648d41ee798e9377da78f0f9a5b5a024ab5ff0c Mon Sep 17 00:00:00 2001
From: Alessandro Francia <a.francia@teamdev.it>
Date: Tue, 15 May 2018 16:57:57 +0200
Subject: [PATCH] get magazine

---
 Step/wwwroot/assets/styles/base/tooling.less  |  2 +-
 Step/wwwroot/assets/styles/style.css          |  2 +-
 Step/wwwroot/src/@types/depot.d.ts            | 17 ++++++
 Step/wwwroot/src/app.business-logic.ts        |  5 +-
 Step/wwwroot/src/components/depot.ts          | 10 ++-
 Step/wwwroot/src/components/depot.vue         | 27 ++------
 .../modules/base-components/cards/tool.vue    |  4 +-
 Step/wwwroot/src/services/depotService.ts     | 13 +++-
 Step/wwwroot/src/store/depot.store.ts         | 61 ++++++++++---------
 9 files changed, 82 insertions(+), 59 deletions(-)

diff --git a/Step/wwwroot/assets/styles/base/tooling.less b/Step/wwwroot/assets/styles/base/tooling.less
index 9a46ae0d..4a4e6832 100644
--- a/Step/wwwroot/assets/styles/base/tooling.less
+++ b/Step/wwwroot/assets/styles/base/tooling.less
@@ -91,7 +91,7 @@
       // flex-flow: column;
       // align-self: center;
           text-align: left;
-          width:145px;
+          width:  calc(~'100% - 159px');
           margin-top: 11px;
 
   }
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 356d2890..e20fa307 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -2671,7 +2671,7 @@ footer .container button.big:before {
 }
 .tool .text-body {
   text-align: left;
-  width: 145px;
+  width: calc(100% - 159px);
   margin-top: 11px;
 }
 .tool .text-right {
diff --git a/Step/wwwroot/src/@types/depot.d.ts b/Step/wwwroot/src/@types/depot.d.ts
index e8f5c268..da79dbd3 100644
--- a/Step/wwwroot/src/@types/depot.d.ts
+++ b/Step/wwwroot/src/@types/depot.d.ts
@@ -18,4 +18,21 @@ declare module server {
         toolType: number
     }
 
+    export interface AvailableToolModel{
+        multiTools: MultiTools,
+        tools: Tools
+    }
+
+    export interface MultiTools{
+        id: number,
+        name: string,
+        childsTools: Array<Object>
+    }
+
+    export interface Tools{
+        id: number,
+        familyName: string,
+        toolType: number
+    }
+
 }
\ No newline at end of file
diff --git a/Step/wwwroot/src/app.business-logic.ts b/Step/wwwroot/src/app.business-logic.ts
index 27be37d2..47763524 100644
--- a/Step/wwwroot/src/app.business-logic.ts
+++ b/Step/wwwroot/src/app.business-logic.ts
@@ -60,14 +60,13 @@ async function loadMachineConfig() {
     let ds = new DataService();
 
     let ts = new ToolingService();
-
-    let des = new DepotService();
+    
+    // let des = new DepotService();
 
     ds.GetSoftKeysConfiguration();
     ds.GetNcSoftKeysConfiguration();
     ds.GetHeadsConfiguration();
     ts.GetToolTableConfiguration();
-    des.GetMagazine(1);
 
     // load default language
     if ((store.state as AppModel).localization.currentLanguage == "")
diff --git a/Step/wwwroot/src/components/depot.ts b/Step/wwwroot/src/components/depot.ts
index 36b2423d..ef0c122b 100644
--- a/Step/wwwroot/src/components/depot.ts
+++ b/Step/wwwroot/src/components/depot.ts
@@ -1,11 +1,17 @@
 import Vue from "vue";
 import Component from "vue-class-component";
 import { tool, detailCard, cardToolDepot } from "src/modules/base-components/cards";
+import { store, AppModel } from "src/store";
 import { DepotService } from "../services/depotService";
 
 @Component({ components: { tool, detailCard, cardToolDepot } })
 export default class depot extends Vue {
 
+  public get depot(): server.DepotModel[] { return (this.$store.state as AppModel).depot.depot; }
+  public get availableMultiTools(): server.MultiTools[] { return (this.$store.state as AppModel).depot.availableMultiTool; }
+  public get availableTools(): server.Tools[] { return (this.$store.state as AppModel).depot. availableTool; }
+
+
   $route: any;
 
   depotId: number = 0;
@@ -14,7 +20,9 @@ export default class depot extends Vue {
 
   mounted() {
     new DepotService().GetMagazine(this.$route.params.id);
-    // this.depotId = this.$route.params.id;
+    new DepotService().GetMultiToolAvailable();
+    new DepotService().GetToolAvailable();
+    this.depotId = this.$route.params.id;
   }
 
   toggleEdit(){
diff --git a/Step/wwwroot/src/components/depot.vue b/Step/wwwroot/src/components/depot.vue
index b90cc40b..fb132e66 100644
--- a/Step/wwwroot/src/components/depot.vue
+++ b/Step/wwwroot/src/components/depot.vue
@@ -21,20 +21,8 @@
                     <button class="btn depot-btn-search"><i class="fa fa-filter"></i></button>
                   </div>
                   <div class="list-vertical scrollable">
-                      <tool code="E13" title="Utensile XYZ" img-source="../assets/images/tool.PNG"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
-                      <tool code="E13" title="Utensile XYZ"></tool>
+                      <tool v-for="m in availableMultiTools" :key="m.id" :code="m.id" :title="m.name" img-source="../assets/images/list-Shank.png"></tool>
+                      <tool v-for="t in availableTools" :key="t.id" :code="t.id" :title="t.familyName" img-source="../assets/icons/_png/fresa-raggiatura-104x104.png"></tool>
                   </div>
               </div>
               <div class="box-right">
@@ -45,13 +33,10 @@
                           <button class="btn" :v-if="false"><i class="fa fa-chevron-right"></i></button>
                       </div>
                       <div class="sd-section scrollable">
-                          <detail-card number="2"><card-tool-depot></card-tool-depot></detail-card>
-                          <detail-card number="3">Inserisci</detail-card>
-                          <detail-card number="4">Inserisci</detail-card>
-                          <detail-card number="5">Inserisci</detail-card>
-                          <detail-card number="6">Inserisci</detail-card>
-                          <detail-card number="7">Inserisci</detail-card>
-                          <detail-card number="8">Inserisci</detail-card>
+                          <detail-card v-for="(d,key) in depot" :key="key" :number="d.positionId">
+                              <card-tool-depot :code="d.childTool ? d.childTool.id : d.childShank.childsTools[0].id" :title="d.childTool ? d.childTool.familyName : d.childShank.childsTools[0].familyName">
+                              </card-tool-depot>
+                          </detail-card>
                       </div>
                     <div class="square-container">
                       <div class="linesquare">
diff --git a/Step/wwwroot/src/modules/base-components/cards/tool.vue b/Step/wwwroot/src/modules/base-components/cards/tool.vue
index 1e86b4a4..51302650 100644
--- a/Step/wwwroot/src/modules/base-components/cards/tool.vue
+++ b/Step/wwwroot/src/modules/base-components/cards/tool.vue
@@ -8,8 +8,8 @@
         <div>{{code}}</div>
         <div>{{title}}</div>
       </div>
-
-      <div class="text-right">{{store}}</div>
+        <!-- Forse in futuro potrà servire me lo ha detto Nicola-->
+      <!-- <div class="text-right">{{store}}</div> -->
       <i class="fa fa-info-circle"></i>
       <!-- <header>
           <span>{{title}}</span>
diff --git a/Step/wwwroot/src/services/depotService.ts b/Step/wwwroot/src/services/depotService.ts
index fb97dfbf..4b32f860 100644
--- a/Step/wwwroot/src/services/depotService.ts
+++ b/Step/wwwroot/src/services/depotService.ts
@@ -5,12 +5,21 @@ import { store, AppModel } from "../store";
 export class DepotService extends baseRestService {
 
     async GetMagazine(magazineId: any){
-        let result = await this.Get<server.DepotModel>("/api/tool_table/magazine/" + magazineId);
-        console.log(result);
+        let result = await this.Get<server.DepotModel[]>("/api/tool_table/magazine/" + magazineId);
+        depotActions.updateDepot(store, result);
+        return result;
+    }
+
+    async GetMultiToolAvailable(){
+        let result = await this.Get<any>("/api/tool_table/magazine/available_tools");
+        depotActions.updateAvailableMultiTool(store, result.multiTools);
+        return result;
     }
 
     async GetToolAvailable(){
         let result = await this.Get<any>("/api/tool_table/magazine/available_tools");
+        depotActions.updateAvailableTool(store, result.tools);
+        return result;
     }
 
     //   async GetToolTableConfiguration() {
diff --git a/Step/wwwroot/src/store/depot.store.ts b/Step/wwwroot/src/store/depot.store.ts
index 39eabbef..15e93773 100644
--- a/Step/wwwroot/src/store/depot.store.ts
+++ b/Step/wwwroot/src/store/depot.store.ts
@@ -1,46 +1,51 @@
 export interface DepotStoreModel {
-    magazines: Array<server.MagazineModel>
-    toolsConfiguration: Array<server.ToolsConfiguration>
-    tools: Array<server.Tool>
+    depot: Array<server.DepotModel>
+    availableMultiTool: Array<server.MultiTools>
+    availableTool: Array<server.Tools>
   }
   
   export interface DepotActions {
-    updateMagazine(context, model: server.MagazineModel[]);
-    updateTool(context, model: server.Tool);
-    updateTools(context, model: server.Tool[]);
+    updateDepot(context, model: server.DepotModel[]);
+    updateAvailableMultiTool(context, model: server.MultiTools[]);
+    updateAvailableTool(context, model: server.Tools[]);
   }
   
   export const depotStore = {
     state: {
-      magazines: [],
-      toolsConfiguration: [],
-      _tools: new Map<number, server.Tool>(),
-      tools: [],
+      depot: [],
+      availableMultiTool: [],
+      availableTool: []
     } as DepotStoreModel,
     mutations: {
-      UpdateMagazine(store, model: server.MagazineModel[]) {
+      UpdateDepot(store, model: server.DepotModel[]) {
+        debugger
         for (const key in model) {
-          store.magazines.push(model[key]);
+          store.depot.push(model[key]);
+        }
+      },
+      UpdateAvailableMultiTool(store, model: server.MultiTools[]) {
+        debugger
+        for (const key in model) {
+          store.availableMultiTool.push(model[key]);
+        }
+      },
+      UpdateAvailableTool(store, model: server.Tools[]) {
+        debugger
+        for (const key in model) {
+          store.availableTool.push(model[key]);
         }
       },
-      UpdateTool(store, model: server.Tool) {
-        store._tools.set(model.id, model);
-        store.tools = Array.from(store._tools.values());
-      }
     },
     actions: {
-        updateMagazine(context, model: server.MagazineModel[]) {
-            context.commit("UpdateMagazine", model);
-          },
-          updateTool(context, model: server.Tool) {
-            context.commit("UpdateTool", model);
-          },
-          updateTools(context, model: server.Tool[]) {
-            for (const key in model) {
-              const element = model[key];
-              context.commit("UpdateTool", element);
-            }
-          },
+        updateDepot(context, model: server.DepotModel[]) {
+          context.commit("UpdateDepot", model);
+        },
+        updateAvailableMultiTool(context, model: server.MultiTools[]) {
+          context.commit("UpdateAvailableMultiTool", model);
+        },
+        updateAvailableTool(context, model: server.Tools[]) {
+          context.commit("UpdateAvailableTool", model);
+        }
     } as DepotActions
   }