From 54cdb69cb05f49f264e913b0c7ff56e3f47a19e1 Mon Sep 17 00:00:00 2001
From: Lucio Maranta <lucio.maranta@cms.it>
Date: Wed, 9 May 2018 08:45:47 +0200
Subject: [PATCH 1/5] Fix families API

---
 .../Controllers/WebApi/ToolTableController.cs | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/Step/Controllers/WebApi/ToolTableController.cs b/Step/Controllers/WebApi/ToolTableController.cs
index a3ac3788..2e956088 100644
--- a/Step/Controllers/WebApi/ToolTableController.cs
+++ b/Step/Controllers/WebApi/ToolTableController.cs
@@ -147,12 +147,39 @@ namespace Step.Controllers.WebApi
         }
 
         [Route("family"), HttpPost]
-        public IHttpActionResult AddFamily([FromBody] dynamic body)
+        public IHttpActionResult AddFamily([FromBody] DTOFamilyModel family)
         {
+            if (String.IsNullOrEmpty(family.Name))
+                return BadRequest();
+
             using (NcHandler ncHandler = new NcHandler())
             {
                 ncHandler.Connect();
-                CmsError libraryError = ncHandler.AddFamily(body.name.ToString(), out FamilyModel family);
+                CmsError libraryError = ncHandler.AddFamily(family.Name, out FamilyModel newFamily);
+                if (libraryError.IsError())
+                    if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
+                        return BadRequest(libraryError.message);
+
+                return Ok(newFamily);
+            }
+        }
+
+        public struct DTOFamilyModel
+        {
+            public string Name;
+        }
+
+        [Route("family/{oldName}"), HttpPut]
+        public IHttpActionResult PutFamily(string oldName, [FromBody]DTOFamilyModel family)
+        {
+            if (String.IsNullOrEmpty(family.Name))
+                return BadRequest();
+
+            using (NcHandler ncHandler = new NcHandler())
+            {
+                ncHandler.Connect();
+
+                CmsError libraryError = ncHandler.UpdateFamilyName(oldName, family.Name);
                 if (libraryError.IsError())
                     if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
                         return BadRequest(libraryError.message);
@@ -161,22 +188,6 @@ namespace Step.Controllers.WebApi
             }
         }
 
-        [Route("family/{oldName}"), HttpPut]
-        public IHttpActionResult PutFamily(string oldName, [FromBody]dynamic body)
-        {
-            using (NcHandler ncHandler = new NcHandler())
-            {
-                ncHandler.Connect();
-
-                CmsError libraryError = ncHandler.UpdateFamilyName(oldName, body.name.ToString());
-                if (libraryError.IsError())
-                    if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
-                        return BadRequest(libraryError.message);
-
-                return Ok();
-            }
-        }
-
         [Route("family/{name}"), HttpDelete]
         public IHttpActionResult DeleteFamily(string name)
         {

From 7d23e417b77523d843daa1bb6a8bcc0c802aa98e Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Wed, 9 May 2018 10:50:38 +0200
Subject: [PATCH 2/5] Added feature: select-axis buttons if heads < 3

---
 Step/wwwroot/assets/styles/base/buttons.less  | 12 ++++
 Step/wwwroot/assets/styles/base/head.less     |  4 ++
 .../assets/styles/base/plc-softkeys.less      | 26 +++++++++
 Step/wwwroot/assets/styles/style.css          | 39 +++++++++++++
 .../wwwroot/src/components/under-the-hood.vue | 10 ++++
 Step/wwwroot/src/modules/axes-softkeys.vue    | 57 +++++++++++++++++++
 Step/wwwroot/src/modules/mheads.vue           |  7 +--
 .../src/modules/under-the-hood/jog-menu.vue   | 11 +++-
 8 files changed, 159 insertions(+), 7 deletions(-)
 create mode 100644 Step/wwwroot/src/modules/axes-softkeys.vue

diff --git a/Step/wwwroot/assets/styles/base/buttons.less b/Step/wwwroot/assets/styles/base/buttons.less
index b83d5d65..ee50ec2e 100644
--- a/Step/wwwroot/assets/styles/base/buttons.less
+++ b/Step/wwwroot/assets/styles/base/buttons.less
@@ -135,6 +135,10 @@ button.square {
     margin: 0 8px;
     padding: 0 4px;
     display: flex;
+    &.collapsed{
+        margin: 0;
+        padding: 0;
+    }
 }
 
 .btn-group {
@@ -168,12 +172,20 @@ button.soft {
     font-size: 14px;
     border-radius: 2px;
 
+
     &.icon{
       display: flex;
       padding: 1px 12px;
       align-items: center;
     }
 
+    &.axes{
+        width: 54px;
+        font-size: 1.8em;
+        display: block;
+        font-weight: 600;
+      }
+
     img {
         width: 18px;
         image-rendering: -webkit-optimize-contrast;
diff --git a/Step/wwwroot/assets/styles/base/head.less b/Step/wwwroot/assets/styles/base/head.less
index 13768b30..a5bf0773 100644
--- a/Step/wwwroot/assets/styles/base/head.less
+++ b/Step/wwwroot/assets/styles/base/head.less
@@ -370,7 +370,11 @@
     flex-flow: row wrap;
     width: 512px;
     height: 230px;
+    overflow-x: hidden;
 }
+.mini{
+    width: 262px;
+  }
 
 .heads-container-lt4 {
     right: -12px;
diff --git a/Step/wwwroot/assets/styles/base/plc-softkeys.less b/Step/wwwroot/assets/styles/base/plc-softkeys.less
index 4a30d79d..3acc9e25 100644
--- a/Step/wwwroot/assets/styles/base/plc-softkeys.less
+++ b/Step/wwwroot/assets/styles/base/plc-softkeys.less
@@ -404,6 +404,32 @@
     }
 }
 
+#axes-softkeys-container {
+    position: absolute;
+    top: 0;
+    left: 322px;
+    width: 258px;
+    height: 223px;
+    margin: -4px;
+    display: flex;
+    flex-flow: row wrap;
+    overflow: hidden;
+    .empty-space {
+        display: block;
+        width: 54px;
+        height: 48px;
+        margin: 4px;
+        background-color: #4e585e;
+        border-radius: 2px;
+    }
+    div {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-wrap: wrap;
+    }
+}
+
 .jog-menu,
 .auto-menu {
     // width: 100%;
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 2bf7aa12..d4413a2f 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -394,6 +394,10 @@ button.square:hover {
   padding: 0 4px;
   display: flex;
 }
+.btn-spacer.collapsed {
+  margin: 0;
+  padding: 0;
+}
 .btn-group {
   margin: 0 8px;
   padding: 0;
@@ -429,6 +433,12 @@ button.soft.icon {
   padding: 1px 12px;
   align-items: center;
 }
+button.soft.axes {
+  width: 54px;
+  font-size: 1.8em;
+  display: block;
+  font-weight: 600;
+}
 button.soft img {
   width: 18px;
   image-rendering: -webkit-optimize-contrast;
@@ -1864,6 +1874,31 @@ footer .container button.big:before {
   display: flex;
   flex-wrap: wrap;
 }
+#axes-softkeys-container {
+  position: absolute;
+  top: 0;
+  left: 322px;
+  width: 258px;
+  height: 223px;
+  margin: -4px;
+  display: flex;
+  flex-flow: row wrap;
+  overflow: hidden;
+}
+#axes-softkeys-container .empty-space {
+  display: block;
+  width: 54px;
+  height: 48px;
+  margin: 4px;
+  background-color: #4e585e;
+  border-radius: 2px;
+}
+#axes-softkeys-container div {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-wrap: wrap;
+}
 .jog-menu,
 .auto-menu {
   background-color: #4e585e;
@@ -2544,6 +2579,10 @@ footer .container button.big:before {
   flex-flow: row wrap;
   width: 512px;
   height: 230px;
+  overflow-x: hidden;
+}
+.mini {
+  width: 262px;
 }
 .heads-container-lt4 {
   right: -12px;
diff --git a/Step/wwwroot/src/components/under-the-hood.vue b/Step/wwwroot/src/components/under-the-hood.vue
index f1f337f5..dc40ebe4 100644
--- a/Step/wwwroot/src/components/under-the-hood.vue
+++ b/Step/wwwroot/src/components/under-the-hood.vue
@@ -15,6 +15,7 @@
       </div>
       <div class="keys-area">
         <nc-soft-keys></nc-soft-keys>
+        <axes-soft-keys v-if="showAxisBtn" v-bind:isDisabled="!showJog"></axes-soft-keys>
         <mheads></mheads>
         <jog-menu v-if="showJog"></jog-menu>
         <auto-menu v-if="showAuto"></auto-menu>
@@ -26,6 +27,7 @@
 import { appModelActions } from "src/store";
 import plcSoftKeys from "src/modules/plc-softkeys.vue";
 import ncSoftKeys from "src/modules/nc-softkeys.vue";
+import axesSoftKeys from "src/modules/axes-softkeys.vue";
 import mheads from "src/modules/mheads.vue";
 import jogMenu from "src/modules/under-the-hood/jog-menu.vue";
 import autoMenu from "src/modules/under-the-hood/auto-menu.vue";
@@ -36,6 +38,7 @@ export default {
   components: {
     plcSoftKeys,
     ncSoftKeys,
+    axesSoftKeys,
     mheads,
     jogMenu,
     autoMenu,
@@ -57,6 +60,13 @@ export default {
       let mdi = this.$store.getters.getNcSoftKeyStatus(2);
       let edit = this.$store.getters.getNcSoftKeyStatus(3);
       return this.isCnReady() && ((auto && auto.value) || (mdi && mdi.value) || (edit && edit.value));
+    },
+    showAxisBtn: function(){
+      let headsnum = this.$store.state.machineInfo.heads.length
+      if(headsnum <= 2)
+        return true
+      else
+        return false;
     }
   },
   methods: {
diff --git a/Step/wwwroot/src/modules/axes-softkeys.vue b/Step/wwwroot/src/modules/axes-softkeys.vue
new file mode 100644
index 00000000..8a6c31c0
--- /dev/null
+++ b/Step/wwwroot/src/modules/axes-softkeys.vue
@@ -0,0 +1,57 @@
+<template>
+<div id="axes-softkeys-container">
+  <div >
+
+        <button class="soft icon axes"
+                @click="setAxes(a.id)"
+                v-for="a in axes"
+                :key="a.id"
+                :disabled="isDisabled"
+                :class="{active: a.id == selectedAxisId}">{{a.name}}</button>
+
+      <div class="empty-space" v-for="(item,index) in emptySpaces" :key="'Empty_' + index"></div>
+  </div>
+</div>
+</template>
+<script>
+import { Hub } from "src/services/hub";
+export default {
+
+  computed: {
+    axes: function() {
+      return this.$store.state.process.axes;
+    },
+    emptySpaces: function() {
+      let num = this.$store.state.process.axes.length;
+      if(num >= this.maxNumVisible)
+        return 0;
+      else
+        return this.maxNumVisible - num;
+    },
+    selectedAxisId: function() {
+      return this.$store.state.process.selectedAxis;
+    }
+  },
+  methods: {
+    getAxesName() {
+      let id = this.$store.state.process.selectedAxis;
+      for (const k in this.$store.state.process.axes) {
+        let a = this.$store.state.process.axes[k];
+        if (a.id == id) return a.name;
+      }
+      return null;
+    },
+    setAxes(id) {
+      Hub.Current.selectAxis(id);
+    },
+  },
+  props:{
+      isDisabled: { default: true, type: Boolean }
+  },
+  data: function() {
+    return {
+      maxNumVisible: 16
+    };
+  }
+};
+</script>
diff --git a/Step/wwwroot/src/modules/mheads.vue b/Step/wwwroot/src/modules/mheads.vue
index 25707379..1ce3786f 100644
--- a/Step/wwwroot/src/modules/mheads.vue
+++ b/Step/wwwroot/src/modules/mheads.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="heads-container scrollable_auto" :class="{'heads-container-lt4':(heads.length <=4)}">
+<div class="heads-container scrollable_auto" :class="{'mini':(heads.length <=2) , 'heads-container-lt4':(heads.length <=4)}">
   <head-std :title="h.name" v-for="h in heads" :key="h.id"
             :rpm="getHeadsProperty(h.id).actualSpeed"
             :tool="getHeadsProperty(h.id).mountedTool"
@@ -17,10 +17,7 @@
             :isActive="getHeadsProperty(h.id).isActive"
             @overridePlus="overridePlus(h.id)" @overrideMinus="overrideMinus(h.id)"
             ></head-std>
-   <div class="head-place-holder" v-if="heads.length <4"></div>
-   <div class="head-place-holder" v-if="heads.length <3"></div>
-   <div class="head-place-holder" v-if="heads.length <2"></div>
-   <div class="head-place-holder" v-if="heads.length <1 || (heads.length>4 && heads.length%2)"></div>
+   <div class="head-place-holder" v-if="heads.length <=1 || (heads.length>2 && heads.length%2)"></div>
   <!-- <head-std :percentage="40" :load="55" :tool=1 :rpm=160000 title="head2"  process="1"></head-std>
   <head-std :percentage="100" :load="65" :tool=2 title="head3"  process="1"></head-std>
   <head-std title="head4" :load="100" process="1"></head-std>
diff --git a/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue b/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
index e53afd43..347ac798 100644
--- a/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="jog-menu" ref="menu">
-    <button @click="toggleAxes()" :class="{active:showAxesMenu}" :disabled="axes.length == 0" class="soft">{{"jog_menu_axis" | localize("Asse")}} {{getAxesName()}}</button>
-    <div class="btn-spacer">
+    <button v-if="showAxisBtn" @click="toggleAxes()" :class="{active:showAxesMenu}" :disabled="axes.length == 0" class="soft">{{"jog_menu_axis" | localize("Asse")}} {{getAxesName()}}</button>
+    <div class="btn-spacer" :class="{'collapsed': !showAxisBtn }">
       <button @click="ncClick(23)" :disabled="!isKeyActive(23)" :class="{active:isKeySelected(23) , inverted:isReadOnly(23)}" class="soft square"><i class="fa fa-minus"></i></button>
       <button v-if="!machineInfo.isSiemens" @click="ncClick(24)" :disabled="!isKeyActive(24)" :class="{active:isKeySelected(24) , inverted:isReadOnly(24)}" class="soft">{{name(24)}}</button>
       <button @click="ncClick(22)" :disabled="!isKeyActive(22)" :class="{active:isKeySelected(22) , readonly:isReadOnly(22)}" class="soft square"><i class="fa fa-plus"></i></button>
@@ -60,6 +60,13 @@ export default {
       // 180px è la metà della larghezza del contenitore .incr-menu-container configurata da css
       // 50px è la metà della larghezza del bottone Inc comprensivo di margini.
       return (this.$refs.incbutton.offsetLeft - 180 + 50).toString() + "px";
+    },
+    showAxisBtn: function(){
+      let headsnum = this.$store.state.machineInfo.heads.length
+      if(headsnum > 2)
+        return true
+      else
+        return false;
     }
   },
 

From 4d097dae72a16e9cb82136cbbb68f82d0d9b9175 Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Wed, 9 May 2018 11:47:24 +0200
Subject: [PATCH 3/5] FIx button dimensions in sub-menus

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

diff --git a/Step/wwwroot/assets/styles/base/plc-softkeys.less b/Step/wwwroot/assets/styles/base/plc-softkeys.less
index 3acc9e25..250ddf13 100644
--- a/Step/wwwroot/assets/styles/base/plc-softkeys.less
+++ b/Step/wwwroot/assets/styles/base/plc-softkeys.less
@@ -198,7 +198,7 @@
     &.command {
     }
     .menu-container {
-        width: 360px;
+        width: 386px;
         top: 80px;
         position: absolute;
         display: flex;
@@ -207,13 +207,13 @@
         z-index: 100;
         transform: translateZ(0);
         &.top {
-            top: -80px;
+            top: -88px;
             .menu::before {
                 content: "\f0d7";
                 color: #4b4b4b;
                 position: absolute;
                 left: calc(~"50% - 11px");
-                top: 47px;
+                top: 60px;
                 font-family: 'fontawesome';
                 font-size: 38px;
             }
@@ -224,7 +224,7 @@
           justify-content: flex-start;
         }
         &.right{
-          left: -176px;
+          left: -189px;
           justify-content: flex-end;
         }
         &.bottom {
@@ -244,9 +244,9 @@
             padding: 7px;
             button {
                 background-image: linear-gradient(to bottom, #5f676b, #4e585e);
-                width: 48px;
-                height: 48px;
-                margin: 0.5px;
+                width: 60px;
+                height: 60px;
+                margin: 1px;
                 font-size: 20px;
                 color: #fff;
                 border: none;
@@ -452,9 +452,9 @@
     }
     .axes-menu-container>.menu>button {
         background-image: linear-gradient(to bottom, #5f676b, #4e585e);
-        min-width: 48px;
-        height: 48px;
-        margin: 0.5px;
+        min-width: 60px;
+        height: 60px;
+        margin: 1px;
         font-size: 20px;
         color: #fff;
         border: none;
@@ -468,10 +468,10 @@
     }
     .incr-menu-container>.menu>button {
         background-image: linear-gradient(to bottom, #5f676b, #4e585e);
-        min-width: 48px;
-        max-width: 48px;
-        height: 48px;
-        margin: 0.5px;
+        min-width: 60px;
+        max-width: 60px;
+        height: 60px;
+        margin: 1px;
         font-size: 16px;
         color: #fff;
         border: none;
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index d4413a2f..665c48c4 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -1676,7 +1676,7 @@ footer .container button.big:before {
   height: 42px;
 }
 .soft-key .menu-container {
-  width: 360px;
+  width: 386px;
   top: 80px;
   position: absolute;
   display: flex;
@@ -1686,14 +1686,14 @@ footer .container button.big:before {
   transform: translateZ(0);
 }
 .soft-key .menu-container.top {
-  top: -80px;
+  top: -88px;
 }
 .soft-key .menu-container.top .menu::before {
   content: "\f0d7";
   color: #4b4b4b;
   position: absolute;
   left: calc(50% - 11px);
-  top: 47px;
+  top: 60px;
   font-family: 'fontawesome';
   font-size: 38px;
 }
@@ -1702,7 +1702,7 @@ footer .container button.big:before {
   justify-content: flex-start;
 }
 .soft-key .menu-container.right {
-  left: -176px;
+  left: -189px;
   justify-content: flex-end;
 }
 .soft-key .menu-container.bottom .menu::before {
@@ -1721,9 +1721,9 @@ footer .container button.big:before {
 }
 .soft-key .menu-container .menu button {
   background-image: linear-gradient(to bottom, #5f676b, #4e585e);
-  width: 48px;
-  height: 48px;
-  margin: 0.5px;
+  width: 60px;
+  height: 60px;
+  margin: 1px;
   font-size: 20px;
   color: #fff;
   border: none;
@@ -1922,9 +1922,9 @@ footer .container button.big:before {
 .jog-menu .axes-menu-container > .menu > button,
 .auto-menu .axes-menu-container > .menu > button {
   background-image: linear-gradient(to bottom, #5f676b, #4e585e);
-  min-width: 48px;
-  height: 48px;
-  margin: 0.5px;
+  min-width: 60px;
+  height: 60px;
+  margin: 1px;
   font-size: 20px;
   color: #fff;
   border: none;
@@ -1941,10 +1941,10 @@ footer .container button.big:before {
 .jog-menu .incr-menu-container > .menu > button,
 .auto-menu .incr-menu-container > .menu > button {
   background-image: linear-gradient(to bottom, #5f676b, #4e585e);
-  min-width: 48px;
-  max-width: 48px;
-  height: 48px;
-  margin: 0.5px;
+  min-width: 60px;
+  max-width: 60px;
+  height: 60px;
+  margin: 1px;
   font-size: 16px;
   color: #fff;
   border: none;

From 953211b5068560294c10e44937223c2f193eb044 Mon Sep 17 00:00:00 2001
From: Lucio Maranta <lucio.maranta@cms.it>
Date: Wed, 9 May 2018 14:55:14 +0200
Subject: [PATCH 4/5] Fix tools models

---
 .../DTOModels/ToolModels/DTOEdgeModel.cs      |  8 ++--
 .../DTOModels/ToolModels/DTOShankModel.cs     | 20 ++++-----
 .../ToolModels/DTOSiemensToolModel.cs         | 43 ++++++++++++-------
 .../ToolModels/DTOUpdateMagazineModel.cs      |  4 +-
 .../Controllers/WebApi/ToolTableController.cs | 24 ++++-------
 5 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/Step.Model/DTOModels/ToolModels/DTOEdgeModel.cs b/Step.Model/DTOModels/ToolModels/DTOEdgeModel.cs
index bf959695..6d5b7545 100644
--- a/Step.Model/DTOModels/ToolModels/DTOEdgeModel.cs
+++ b/Step.Model/DTOModels/ToolModels/DTOEdgeModel.cs
@@ -7,16 +7,16 @@ namespace Step.Model.DTOModels.ToolModels
     public class DTOEdgeModel
     {
         [Required]
-        public double ResidualLife;
+        public double ResidualLife { get; set; }
 
         [Required]
-        public double NominalLife;
+        public double NominalLife { get; set; }
 
         [Required]
-        public double PreAlmLife;
+        public double PreAlmLife { get; set; }
 
         [Required]
-        public Dictionary<string, double> EdgeAdditionalParams;
+        public Dictionary<string, double> EdgeAdditionalParams { get; set; }
 
         public static explicit operator EdgeModel(DTOEdgeModel obj)
         {
diff --git a/Step.Model/DTOModels/ToolModels/DTOShankModel.cs b/Step.Model/DTOModels/ToolModels/DTOShankModel.cs
index db5b34ad..a41ff911 100644
--- a/Step.Model/DTOModels/ToolModels/DTOShankModel.cs
+++ b/Step.Model/DTOModels/ToolModels/DTOShankModel.cs
@@ -10,25 +10,25 @@ namespace Step.Model.DTOModels.ToolModels
 
         public int Id;
         [Required]
-        public string Name;
+        public string Name { get; set; }
         [Required]
-        public bool IsEnabled;
+        public bool IsEnabled { get; set; }
         [Required]
-        public bool IsInhibited;
+        public bool IsInhibited { get; set; }
         [Required]
-        public bool InChangeTool;
+        public bool InChangeTool { get; set; }
         [Required]
-        public bool InFixedPlace;
+        public bool InFixedPlace { get; set; }
         [Required]
-        public bool InUse;
+        public bool InUse { get; set; }
         [Required]
-        public int LeftSize;
+        public int LeftSize { get; set; }
         [Required]
-        public int RightSize;
+        public int RightSize { get; set; }
         [Required]
-        public int MagazinePositionType;
+        public int MagazinePositionType { get; set; }
         [Required]
-        public List<DTOShankChildModel> ChildsTools;
+        public List<DTOShankChildModel> ChildsTools { get; set; }
 
         public static explicit operator ShankModel(DTOShankModel obj)
         {
diff --git a/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs b/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs
index 2469bf23..5f7cccf3 100644
--- a/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs
+++ b/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs
@@ -6,50 +6,63 @@ namespace Step.Model.DTOModels.ToolModels
     public class DTOSiemensToolModel
     {
         [Required]
-        public string FamilyName;
+        public string FamilyName { get; set; }
 
         [Required]
-        public int MagazinePositionType;
+        public int MagazinePositionType { get; set; }
 
         [Required]
-        public int ToolType;
+        public int ToolType { get; set; }
 
         [Required]
-        public int LeftSize;
+        public int LeftSize { get; set; }
 
         [Required]
-        public int RightSize;
+        public int RightSize { get; set; }
 
         [Required]
-        public ROTATION Rotation;
+        public ROTATION Rotation { get; set; }
 
         [Required]
-        public bool Cooling1;
+        public bool Cooling1 { get; set; }
 
         [Required]
-        public bool Cooling2;
+        public bool Cooling2 { get; set; }
 
         [Required]
-        public bool IsActive;
+        public bool IsActive { get; set; }
 
         [Required]
-        public bool InFixedPlace;
+        public bool InFixedPlace { get; set; }
 
         [Required]
-        public bool IsInhibited;
+        public bool IsInhibited { get; set; }
 
         [Required]
-        public bool IsMeasured;
+        public bool IsMeasured { get; set; }
 
         [Required]
-        public bool InChangeTool;
+        public bool InChangeTool { get; set; }
 
         [Required]
-        public bool IsInUse;
+        public bool IsInUse { get; set; }
 
         [Required]
-        public bool PreAlarm;
+        public bool PreAlarm { get; set; }
 
         // public List<Dictionary<string, double>> EdgesData;
     }
+
+    public class DTOMagazinesPositionsModel
+    {
+        [Required()]
+        public int Type { get; set; }
+    }
+
+    public class DTOFamilyModel
+    {
+        [Required]
+        public string Name { get; set; }
+    }
+
 }
\ No newline at end of file
diff --git a/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs b/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs
index 0ebd8abe..3641479a 100644
--- a/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs
+++ b/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs
@@ -5,9 +5,9 @@ namespace Step.Model.DTOModels.ToolModels
     public class DTOUpdateMagazineModel
     {
         [Required]
-        public int PositionId;
+        public int PositionId { get; set; }
 
         [Required]
-        public int ToolId;
+        public int ToolId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Step/Controllers/WebApi/ToolTableController.cs b/Step/Controllers/WebApi/ToolTableController.cs
index 2e956088..b79394c0 100644
--- a/Step/Controllers/WebApi/ToolTableController.cs
+++ b/Step/Controllers/WebApi/ToolTableController.cs
@@ -46,9 +46,7 @@ namespace Step.Controllers.WebApi
         public IHttpActionResult AddTool([FromBody][Required]DTOSiemensToolModel tool)
         {
             if (!ModelState.IsValid)
-            {
                 return BadRequest(ModelState);
-            }
 
             using (NcHandler ncHandler = new NcHandler())
             {
@@ -69,9 +67,7 @@ namespace Step.Controllers.WebApi
         public IHttpActionResult UpdateTool(int id, [FromBody][Required]DTOSiemensToolModel tool)
         {
             if (!ModelState.IsValid)
-            {
                 return BadRequest(ModelState);
-            }
 
             using (NcHandler ncHandler = new NcHandler())
             {
@@ -164,11 +160,6 @@ namespace Step.Controllers.WebApi
             }
         }
 
-        public struct DTOFamilyModel
-        {
-            public string Name;
-        }
-
         [Route("family/{oldName}"), HttpPut]
         public IHttpActionResult PutFamily(string oldName, [FromBody]DTOFamilyModel family)
         {
@@ -219,20 +210,23 @@ namespace Step.Controllers.WebApi
             }
         }
 
-        [Route("magazine/{magazineId}/position/{position}"), HttpPut]
-        public IHttpActionResult PutMagazinePosition(int magazineId, int position, [FromBody]dynamic body)
+
+        [Route("magazine/{magazineId}/position/{positionId}"), HttpPut]
+        public IHttpActionResult PutMagazinePosition([Required]int magazineId, [Required]int positionId, [FromBody]DTOMagazinesPositionsModel magazinesPos)
         {
+            if (!ModelState.IsValid)
+                return BadRequest(ModelState);
+
             using (NcHandler ncHandler = new NcHandler())
             {
                 ncHandler.Connect();
-                if (magazineId == 0 || position == 0 || body == null || body.type == null)
-                    return BadRequest();
+
                 // Create Library model
                 PositionsModel pos = new PositionsModel()
                 {
-                    Id = position,
+                    Id = positionId,
                     MagazineId = magazineId,
-                    Type = Convert.ToInt32(body.type)
+                    Type = Convert.ToInt32(magazinesPos.Type)
                 };
                 // Update
                 CmsError libraryError = ncHandler.UpdateMagazinePosition(pos);

From 12d2e19b954b2b68a4bc6e8c1236c127df2b1f0e Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Wed, 9 May 2018 17:24:12 +0200
Subject: [PATCH 5/5] Fix Tooling-List UI

---
 Step/wwwroot/assets/images/Shank.png            | Bin 0 -> 16259 bytes
 Step/wwwroot/assets/images/list-Shank2.png      | Bin 0 -> 15694 bytes
 Step/wwwroot/assets/images/list-blade.PNG       | Bin 0 -> 17445 bytes
 Step/wwwroot/assets/images/list-mag-pos.png     | Bin 0 -> 15337 bytes
 Step/wwwroot/assets/images/list-tool.PNG        | Bin 0 -> 16476 bytes
 Step/wwwroot/assets/images/list-undefined.PNG   | Bin 0 -> 15732 bytes
 Step/wwwroot/assets/images/tool.PNG             | Bin 1144 -> 0 bytes
 Step/wwwroot/assets/styles/base/card.less       |  12 ++++++++++--
 .../assets/styles/base/tooling-equipment.less   |   3 ---
 Step/wwwroot/assets/styles/style.css            |  15 +++++++++------
 .../wwwroot/src/components/tooling-equipment.ts |  11 +++++++++++
 .../src/components/tooling-equipment.vue        |   2 +-
 Step/wwwroot/src/components/tooling-magpos.vue  |   1 +
 Step/wwwroot/src/components/tooling-shanks.vue  |   1 +
 .../modules/base-components/cards/equipment.vue |   2 +-
 15 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 Step/wwwroot/assets/images/Shank.png
 create mode 100644 Step/wwwroot/assets/images/list-Shank2.png
 create mode 100644 Step/wwwroot/assets/images/list-blade.PNG
 create mode 100644 Step/wwwroot/assets/images/list-mag-pos.png
 create mode 100644 Step/wwwroot/assets/images/list-tool.PNG
 create mode 100644 Step/wwwroot/assets/images/list-undefined.PNG
 delete mode 100644 Step/wwwroot/assets/images/tool.PNG

diff --git a/Step/wwwroot/assets/images/Shank.png b/Step/wwwroot/assets/images/Shank.png
new file mode 100644
index 0000000000000000000000000000000000000000..c87c68e47141654f54c8a4ba9d8edb3849c44633
GIT binary patch
literal 16259
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

literal 0
HcmV?d00001

diff --git a/Step/wwwroot/assets/images/list-Shank2.png b/Step/wwwroot/assets/images/list-Shank2.png
new file mode 100644
index 0000000000000000000000000000000000000000..50888ab881f372ac040ecd253aebec70f3ed9ad9
GIT binary patch
literal 15694
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

literal 0
HcmV?d00001

diff --git a/Step/wwwroot/assets/images/list-blade.PNG b/Step/wwwroot/assets/images/list-blade.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..f0d13f8f84f65959ad66bdb3b82d0442296db431
GIT binary patch
literal 17445
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
B)notw

literal 0
HcmV?d00001

diff --git a/Step/wwwroot/assets/images/list-mag-pos.png b/Step/wwwroot/assets/images/list-mag-pos.png
new file mode 100644
index 0000000000000000000000000000000000000000..2aee22114db6638d0e3cc60026079d57134b3b2a
GIT binary patch
literal 15337
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
Au>b%7

literal 0
HcmV?d00001

diff --git a/Step/wwwroot/assets/images/list-tool.PNG b/Step/wwwroot/assets/images/list-tool.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..f79e0e40c21ff53fadf644e9e008798ea83a16b2
GIT binary patch
literal 16476
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
UN+Ovqw&(w2qv9o{5i8dH2c>G&+yDRo

literal 0
HcmV?d00001

diff --git a/Step/wwwroot/assets/images/list-undefined.PNG b/Step/wwwroot/assets/images/list-undefined.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..89d489ae0e7ca556e287b8808825ccce3bdbcf70
GIT binary patch
literal 15732
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
BRh9q%

literal 0
HcmV?d00001

diff --git a/Step/wwwroot/assets/images/tool.PNG b/Step/wwwroot/assets/images/tool.PNG
deleted file mode 100644
index 874611582200b9b0bd3672bded34c348e7d15b8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1144
zcmV-;1c&>HP)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1Pw_<K~z{r?O4ex
zc2OLD&2#1`!+(GU85dTvF_mFqEDI|NB_+v16eS^67E+>Qqhv)&7KkK6qzs7+C1mFJ
z^_=fs-Fx5jo;!HI#aHiBPwBn){C>|p=QkZT`cL2z>TI}#IvXybGQPjRrN4fMe=79$
z_Lhc+hw0$pK>EcxED6Of?eFi?z`y|Y^z_i!*ck2Y?MYAn;_K^+CMG5*C@6>$5)x=>
zY3WzHYgs5ny1BWL&1U;ya&j`w&d$=)(-U1^UsHB=_Rq7Vq$D~zI+84yhvlQ6nVF%$
zz(AEy(9h40s;a7}y}g~>-Q88s%F4><<KsiJU=EgruCA_9R8*8oh)nD>1Z#iy^z@|p
z`FY8LIT#j-<9>gCr@Om5y12NYm6a8Wi;J@pqsRRGd}a$f3tMMrXY}^=CV6oTLqd@l
zi;IiY+}unV85tBE9ZdlN0d_HJggAxC$w_KyX`%G=bc%_Ip`D!_$&+K~3VnQhWCGzp
z8*^3&8zCVfs*gkh>Om;<<>iH1TU*J)!$alF*+d1=gHY)G{XLbGl$a9g<>f`;;o;=(
z@6UbC<IvEM<k2yNLJ{<*r>9g<P{4JdWo2b0i)9r5&CN~f>guB4;9%~%N*bvIhLQ={
zUR_<ybpoOkjf{*)Z>zDqyi8$XVcd0KWMrhF7Hdf8;o%|W<>hg+9LZ5rQ^UHEBOqCL
zbrmcsDq<m~2VJ2UEOK&kxK2Ry^6BYmVIRM_xuML=OuMx{K0egl-EF8_359-se$wdZ
zC^M*aA~PZ)g4Wj7q!oOi#FdwqbJydP($dn{V1q`2n$3eyD0VX|D~szuW@u<AOCS+&
zw1tI*-1SOg7I=7gkXET76uPmo!O9KKs7!BfZ|dvo6CVBf`8mbL#&Xxogq_~rUTZsw
zp_gY=%hc3VIzB#@R;ls){7m)r_1twzrlh2>(a;fuLOVM<*_X-`6@Db#!omWJM*#7?
zy}eC!b#=Nk0p?Z=;vxuzUR_-=XW-V>mhR4=CSrI-Ji>W=e7x}E@T|DF*x_j?Arz{_
z>+35uH8pV^T47>hB27(Av1VcfhJ|84F%oM=+1S`9SvCg4LQ#}EIy$&ctq?;CZV5(V
zSST<)J}xZ&W{E;CYQ0LB61uy)%MwI(ggX$D0aLnCfJ`Kdudgrn87_vUrKNOoaw1t5
z!<0}Qe?vn9bA+So@9$^b3uO$VwPJ9mnwy(r^|-dSmfe>sDk|9j0?>9b12`)1T9^_F
zpvB?dG&nf;Gfd!;mYbVvSBh{ay1cw(@B9{~g#sw*DCkOHXWQD^RIL(WAvb{E!je!&
zK&@S0UuR_uaf=e9{UEDws!$~`q&Q0?@Xv%g8!n;FhD)e(LG%ZmNGQwjS>sIr0000<
KMNUMnLSTY#xFp8_

diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less
index ffaa1d66..ead87536 100644
--- a/Step/wwwroot/assets/styles/base/card.less
+++ b/Step/wwwroot/assets/styles/base/card.less
@@ -116,13 +116,20 @@
   &.selected{
     background-color: rgba(23, 145, 255, 0.75);
     color: #fff;
+    .image{    
+        background-color: #FFF; 
+    }
   }
 
-  .image{
+  .image{    
       display: flex;
       align-items: center;
       justify-content: center;
-      margin: 16px 14px 16px 16px;
+      margin-top: 8px;
+      margin-left: 14px;
+      width: 48px;
+      height: 48px;
+      background-color: #DDD; 
       img{
           width: 48px;
           height: 48px;
@@ -133,6 +140,7 @@
           text-align: left;
           width:145px;
           margin-top: 11px;
+          margin-left: 14px;
 
   }
 }
diff --git a/Step/wwwroot/assets/styles/base/tooling-equipment.less b/Step/wwwroot/assets/styles/base/tooling-equipment.less
index 7b742b8e..1524bdc5 100644
--- a/Step/wwwroot/assets/styles/base/tooling-equipment.less
+++ b/Step/wwwroot/assets/styles/base/tooling-equipment.less
@@ -173,9 +173,6 @@
 }
 
 .tooling-families-container, .tooling-shanks-container, .tooling-magpos-container{
-    & img:empty{
-        display: none;
-    }
 
     .text-body div + div{
         margin-top: 11px;
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 665c48c4..927355f8 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -2789,11 +2789,18 @@ footer .container button.big:before {
   background-color: rgba(23, 145, 255, 0.75);
   color: #fff;
 }
+.equipment.selected .image {
+  background-color: #FFF;
+}
 .equipment .image {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin: 16px 14px 16px 16px;
+  margin-top: 8px;
+  margin-left: 14px;
+  width: 48px;
+  height: 48px;
+  background-color: #DDD;
 }
 .equipment .image img {
   width: 48px;
@@ -2803,6 +2810,7 @@ footer .container button.big:before {
   text-align: left;
   width: 145px;
   margin-top: 11px;
+  margin-left: 14px;
 }
 .input-box {
   width: 100%;
@@ -5549,11 +5557,6 @@ footer .container button.big:before {
   font-size: 18px;
   font-weight: 600;
 }
-.tooling-families-container img:empty,
-.tooling-shanks-container img:empty,
-.tooling-magpos-container img:empty {
-  display: none;
-}
 .tooling-families-container .text-body div + div,
 .tooling-shanks-container .text-body div + div,
 .tooling-magpos-container .text-body div + div {
diff --git a/Step/wwwroot/src/components/tooling-equipment.ts b/Step/wwwroot/src/components/tooling-equipment.ts
index 1588e1b7..34ca24b8 100644
--- a/Step/wwwroot/src/components/tooling-equipment.ts
+++ b/Step/wwwroot/src/components/tooling-equipment.ts
@@ -74,6 +74,17 @@ export default class toolingEquipment extends Vue {
     this.$router.push({ path: path});
   }
 
+  public getToolIcon = function (id) {
+    if(id == 9999)
+      return "../assets/images/list-undefined.PNG"
+    else if(id == 151 || id == 700 )
+        return "../assets/images/list-blade.PNG"
+    else
+      return "../assets/images/list-tool.PNG"
+  }
+
+  
+
   async save(item){
     item.name = "";
     toolingActions.updateToolsConfiguration(store,item);
diff --git a/Step/wwwroot/src/components/tooling-equipment.vue b/Step/wwwroot/src/components/tooling-equipment.vue
index 31f10252..009d4947 100644
--- a/Step/wwwroot/src/components/tooling-equipment.vue
+++ b/Step/wwwroot/src/components/tooling-equipment.vue
@@ -21,7 +21,7 @@
                   </div>
                   <div class="list-vertical scrollable">
                       <equipment v-for="t in tools" :key="t.id" :code="t.id" :title="t.familyName" 
-                                 img-source="../assets/images/tool.PNG"
+                                 :img-source="getToolIcon(t.toolType)"
                                  :class="{selected: selectedTool == t}"
                                  @click="selectTool(t)"></equipment>
                   </div>
diff --git a/Step/wwwroot/src/components/tooling-magpos.vue b/Step/wwwroot/src/components/tooling-magpos.vue
index 49aa8876..ebc4c25c 100644
--- a/Step/wwwroot/src/components/tooling-magpos.vue
+++ b/Step/wwwroot/src/components/tooling-magpos.vue
@@ -22,6 +22,7 @@
                   <div class="list-vertical scrollable">
                       <equipment v-for="(m,k) in magpos" :key="k" :code="'Magazzino' + ' ' + m.magazineId" :title="'Manina' + ' ' + m.id"
                                  :class="{selected: selectedTool == m}"
+                                 :img-source="'../assets/images/list-mag-pos.PNG'"
                                  @click="selectTool(m)"></equipment>
                   </div>
                   <div class="footer">
diff --git a/Step/wwwroot/src/components/tooling-shanks.vue b/Step/wwwroot/src/components/tooling-shanks.vue
index 93e53c07..4c9b5fe9 100644
--- a/Step/wwwroot/src/components/tooling-shanks.vue
+++ b/Step/wwwroot/src/components/tooling-shanks.vue
@@ -22,6 +22,7 @@
                   <div class="list-vertical scrollable">
                       <equipment v-for="s in shanks" :key="s.id" :title="'Codolo' + ' ' + s.id"
                                  v-if="s.id != ''"
+                                 :img-source="'../assets/images/shank.PNG'"
                                  :class="{selected: selectedTool == s}"
                                  @click="selectTool(s)"></equipment>
                   </div>
diff --git a/Step/wwwroot/src/modules/base-components/cards/equipment.vue b/Step/wwwroot/src/modules/base-components/cards/equipment.vue
index 66e66e0a..e88e890f 100644
--- a/Step/wwwroot/src/modules/base-components/cards/equipment.vue
+++ b/Step/wwwroot/src/modules/base-components/cards/equipment.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- <div class="test-container"> -->
       <div class="equipment" @click="onClick">
-        <div class="image">
+        <div v-if="imgSource" class="image">
           <img :src="imgSource" alt="">
         </div>
         <div class="text-body">