From 52247c755343b47b35aa43c79c57aca8c43fadde Mon Sep 17 00:00:00 2001
From: Lucio Maranta <lucio.maranta@cms.it>
Date: Fri, 20 Sep 2019 12:20:44 +0200
Subject: [PATCH] Fix heads style Added new family names

---
 .../Controllers/NcToolManagerController.cs     |  1 +
 .../WebApi/NcToolManagerController.cs          |  2 +-
 Step/wwwroot/assets/styles/base/card.less      |  4 ++++
 Step/wwwroot/assets/styles/base/head.less      | 15 +++++++++------
 Step/wwwroot/assets/styles/style.css           | 18 ++++++++++++------
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs
index 43e116e6..2fb3d71f 100644
--- a/Step.Database/Controllers/NcToolManagerController.cs
+++ b/Step.Database/Controllers/NcToolManagerController.cs
@@ -401,6 +401,7 @@ namespace Step.Database.Controllers
             if (dbFamily.FamilyId == 0)
                 dbFamily.FamilyId = GetFirstFreeId(dbCtx.Families.Select(x => x.FamilyId).ToList());
 
+            dbFamily.Name = dbFamily.Name + dbFamily.FamilyId;
             dbCtx.Families.Add(dbFamily);
 
             dbCtx.SaveChanges();
diff --git a/Step/Controllers/WebApi/NcToolManagerController.cs b/Step/Controllers/WebApi/NcToolManagerController.cs
index 471c90fe..11c867e7 100644
--- a/Step/Controllers/WebApi/NcToolManagerController.cs
+++ b/Step/Controllers/WebApi/NcToolManagerController.cs
@@ -889,7 +889,7 @@ namespace Step.Controllers.WebApi
         private static DTONcToolWithFamilyModel DTO_TOOL_WITH_FAM = new DTONcToolWithFamilyModel()
         {
             Id = 0,
-            Name = "NewFam",
+            Name = "Family",
             OffsetId1 = null,
             OffsetId2 = null,
             OffsetId3 = null,
diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less
index 12847696..3ea63c64 100644
--- a/Step/wwwroot/assets/styles/base/card.less
+++ b/Step/wwwroot/assets/styles/base/card.less
@@ -168,6 +168,10 @@
     .text-body-position {
       color: #fff;
     }
+
+    .text-body-spindle {
+      color: #fff;
+    }
   }
 
   .image {
diff --git a/Step/wwwroot/assets/styles/base/head.less b/Step/wwwroot/assets/styles/base/head.less
index edde32a9..40e1923c 100644
--- a/Step/wwwroot/assets/styles/base/head.less
+++ b/Step/wwwroot/assets/styles/base/head.less
@@ -109,13 +109,13 @@
     .tool-box{
         display: flex;
         width: 116px;
-        height: 104px;
+        height: 96px;
         border-left: 2px solid #979797;
         
         .tool-box-data{
             border: none;
             overflow: hidden;
-            height: 104px;
+            height: 96px;
             width: 114px;
             .tool-name {
                 white-space: pre;
@@ -135,7 +135,7 @@
             display: flex;
             align-items: center;
             width: 0px;
-            height: 114px;
+            height: 96px;
             font-size: 23px;
 
             i {
@@ -233,7 +233,7 @@
 
   .detail-box {
     background-color: white;
-    height: 104px;
+    height: 96px;
     width: 416px;
     display: flex;
     position: absolute;
@@ -593,7 +593,7 @@
 .head-production{
     max-width: 530px;
     width: 530px;
-    min-height: 96px;
+    height: 96px;
 }
 
 .width-small{
@@ -612,6 +612,9 @@
         margin: 8px 0;
         width:100%;
         text-align: center;
+        overflow: hidden;
+        height: 41px;
+        align-items: start;
     }
     > div {
         display: flex;
@@ -628,5 +631,5 @@
     }
 }
 .head-production.selected header{
-    min-height: 104px;
+    min-height: 96px;
 }
\ No newline at end of file
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 5d4d07b8..a5c39f5b 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -6758,7 +6758,7 @@ footer .container button.big:before {
 .head-awj .tool-box {
   display: flex;
   width: 116px;
-  height: 104px;
+  height: 96px;
   border-left: 2px solid #979797;
 }
 .head-spindle .tool-box .tool-box-data,
@@ -6766,7 +6766,7 @@ footer .container button.big:before {
 .head-awj .tool-box .tool-box-data {
   border: none;
   overflow: hidden;
-  height: 104px;
+  height: 96px;
   width: 114px;
 }
 .head-spindle .tool-box .tool-box-data .tool-name,
@@ -6792,7 +6792,7 @@ footer .container button.big:before {
   display: flex;
   align-items: center;
   width: 0px;
-  height: 114px;
+  height: 96px;
   font-size: 23px;
 }
 .head-spindle .tool-box .arrow-box i,
@@ -6974,7 +6974,7 @@ footer .container button.big:before {
 .head-production .detail-box,
 .head-awj .detail-box {
   background-color: white;
-  height: 104px;
+  height: 96px;
   width: 416px;
   display: flex;
   position: absolute;
@@ -7348,7 +7348,7 @@ footer .container button.big:before {
 .head-production {
   max-width: 530px;
   width: 530px;
-  min-height: 96px;
+  height: 96px;
 }
 .width-small {
   width: 512px;
@@ -7366,6 +7366,9 @@ footer .container button.big:before {
   margin: 8px 0;
   width: 100%;
   text-align: center;
+  overflow: hidden;
+  height: 41px;
+  align-items: start;
 }
 .head-production header > div {
   display: flex;
@@ -7381,7 +7384,7 @@ footer .container button.big:before {
   line-height: 27px;
 }
 .head-production.selected header {
-  min-height: 104px;
+  min-height: 96px;
 }
 .test-container {
   height: 100%;
@@ -7696,6 +7699,9 @@ footer .container button.big:before {
 .equipment.selected .text-body-position {
   color: #fff;
 }
+.equipment.selected .text-body-spindle {
+  color: #fff;
+}
 .equipment .image {
   display: flex;
   align-items: center;