From a1a7810ebd0dfb0d15865fa89dc59522b24d9bbe Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Fri, 10 Apr 2020 14:38:17 +0200
Subject: [PATCH 01/42] fix quote velocita

---
 .../assets/styles/base/quote-velocita.less       | 16 +++++++++++++---
 Thermo.Active/wwwroot/assets/styles/style.css    |  8 ++++++--
 .../components/SVG_Components/quote-velocita.vue |  2 ++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
index 6b7459d3..112181cd 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
@@ -12,11 +12,13 @@
     .specific{
 
         .svg-area{
+            width: 750px;
+            height: 750px;
 
             .disegnoQuoteVelocita{
-                margin-left: 200px;
-                width: 750px;
-                height: 750px;
+                margin-left: 500px;
+                width: 800px;
+                height: 800px;
             }
 
             .input-circles{
@@ -43,6 +45,14 @@
                 .circle6{
                 }
 
+                .circle7{
+
+                }
+
+                .circle8{
+                    
+                }
+
             }
 
         }
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 8d04901d..8a9a3737 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4644,11 +4644,15 @@ img {
   width: 1820px;
   height: 980px;
 }
-.modal.quote-velocita-info .specific .svg-area .disegnoQuoteVelocita {
-  margin-left: 200px;
+.modal.quote-velocita-info .specific .svg-area {
   width: 750px;
   height: 750px;
 }
+.modal.quote-velocita-info .specific .svg-area .disegnoQuoteVelocita {
+  margin-left: 500px;
+  width: 800px;
+  height: 800px;
+}
 .modal.quote-velocita-info .specific .svg-area .input-circles .circle {
   flex-direction: column;
 }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue
index 21a97536..21e2b705 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue
@@ -58,6 +58,8 @@
                     <label>30 mm/s</label>
                 </div>
             </div>
+            <span class="circle7">123 mm</span>
+            <span class="circle8">0 mm</span>
         </div>
     </div>
 </template>

From 1f9b64991761ffa5d17624f9e8244a2eed73f855 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Fri, 10 Apr 2020 15:17:23 +0200
Subject: [PATCH 02/42] fix ciclo modal

---
 .../wwwroot/assets/styles/base/ciclo.less        | 16 ++++++++++++++++
 Thermo.Active/wwwroot/assets/styles/style.css    |  3 +++
 .../SVG-Components/SVGcaricatore.vue             |  4 ++--
 .../components/base-components/caricatore.vue    |  6 +++---
 .../setup/ciclo/components/show-ciclo-info.vue   |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
index 514177fc..b785a3a4 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
@@ -6,6 +6,22 @@
 
 .@{modal}.ciclo-info {
 
+  .specific{
+
+    .disegno{
+
+      .disegnoCaricatore{
+        
+      }
+
+    }
+
+    div{
+      display: flex;
+    }
+
+  }
+
   .presenter {
     display: flex;
     flex-flow: column;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 8a9a3737..38d46fd7 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4506,6 +4506,9 @@ img {
   margin: auto;
   display: flex;
 }
+.modal.ciclo-info .specific div {
+  display: flex;
+}
 .modal.ciclo-info .presenter {
   display: flex;
   flex-flow: column;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue
index 5e192c0f..5f137a87 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue
@@ -1,6 +1,6 @@
 <template>
-    <div>
-        <img class="disCaricatore" src="assets/icons/svg/disegno-caricatore.svg">
+    <div class="disegno">
+        <img class="disegnoCaricatore" src="assets/icons/svg/disegno-caricatore.svg">
             <div class="dxalto">
                 <label class="dati">{{dxalto}} mm</label>
             </div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
index ecd51f92..3826f876 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
@@ -33,9 +33,9 @@
 			<slider :min="0" :max="300" v-model="altbanc" unit-of-measure="mm"></slider>
 		</aside>
 
-		<div class="divDx">
-			<svgcaricatore class="disCaricatore"></svgcaricatore>
-			<div class="DivBtn">
+		<div class="specific">
+			<svgcaricatore></svgcaricatore>
+			<div>
 				<button class="info btnscos">
 					<img src="assets/icons/png/info.png" />
 				</button>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue
index 6096026f..40976662 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue
@@ -17,7 +17,7 @@
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
 		</modal>
-		<stepfooter class="Step"></stepfooter>
+		<stepfooter></stepfooter>
 	</div>
 </template>
 

From 58127d06561b8fbb532b362aca8a25ebe5812a68 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Fri, 10 Apr 2020 15:47:56 +0200
Subject: [PATCH 03/42] fix svg

---
 .../assets/styles/base/quote-velocita.less    | 49 ++++++++++++++-
 Thermo.Active/wwwroot/assets/styles/style.css | 60 +++++++++++++++++++
 2 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
index 112181cd..2c723b5d 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
@@ -16,6 +16,7 @@
             height: 750px;
 
             .disegnoQuoteVelocita{
+                flex-shrink: 0;
                 margin-left: 500px;
                 width: 800px;
                 height: 800px;
@@ -23,34 +24,78 @@
 
             .input-circles{
 
+                span{
+                    object-fit: contain;
+                    font-size: 22px;
+                    font-weight: 500;
+                    font-stretch: normal;
+                    font-style: normal;
+                    line-height: normal;
+                    letter-spacing: normal;
+                    text-align: center;
+                    color: white;
+                    background-color: #979797;
+                }
+
                 .circle{
+                    width: 141px;
+                    height: 60px;
                     flex-direction: column;
+
+                    div{
+                        margin: auto;
+                        display: flex;
+                        flex-direction: row;
+                    }
+
                 }
 
                 .circle1{
+                    position: relative;
+                    top: 120px;
+                    right: 500px;
                 }
 
                 .circle2{
+                    position: relative;
+                    top: 140px;
+                    right: 750px;
                 }
 
                 .circle3{
+                    position: relative;
+                    top: 140px;
+                    right: 300px;
                 }
 
                 .circle4{
+                    position: relative;
+                    top: 395px;
+                    right: 400px;
                 }
 
                 .circle5{
+                    position: relative;
+                    top: 240px;
+                    right: 650px;
                 }
 
                 .circle6{
+                    position: relative;
+                    top: 305px;
+                    right: 550px;
                 }
 
                 .circle7{
-
+                    position: relative;
+                    bottom: 380px;
+                    right: 250px;
                 }
 
                 .circle8{
-                    
+                    position: relative;
+                    top: 320px;
+                    right: 220px;
                 }
 
             }
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 8a9a3737..825d8a58 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4649,13 +4649,73 @@ img {
   height: 750px;
 }
 .modal.quote-velocita-info .specific .svg-area .disegnoQuoteVelocita {
+  flex-shrink: 0;
   margin-left: 500px;
   width: 800px;
   height: 800px;
 }
+.modal.quote-velocita-info .specific .svg-area .input-circles span {
+  object-fit: contain;
+  font-size: 22px;
+  font-weight: 500;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  text-align: center;
+  color: white;
+  background-color: #979797;
+}
 .modal.quote-velocita-info .specific .svg-area .input-circles .circle {
+  width: 141px;
+  height: 60px;
   flex-direction: column;
 }
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle div {
+  margin: auto;
+  display: flex;
+  flex-direction: row;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle1 {
+  position: relative;
+  top: 120px;
+  right: 500px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle2 {
+  position: relative;
+  top: 140px;
+  right: 750px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle3 {
+  position: relative;
+  top: 140px;
+  right: 300px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle4 {
+  position: relative;
+  top: 395px;
+  right: 400px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle5 {
+  position: relative;
+  top: 240px;
+  right: 650px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle6 {
+  position: relative;
+  top: 305px;
+  right: 550px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle7 {
+  position: relative;
+  bottom: 380px;
+  right: 250px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle8 {
+  position: relative;
+  top: 320px;
+  right: 220px;
+}
 .modal.quote-velocita-info .specific button {
   margin-left: 10px;
   width: 48px;

From 830806c721de59ba176016fa4304ce3b38825295 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 14 Apr 2020 08:58:00 +0200
Subject: [PATCH 04/42] fix general css on setup.less for the scrollbar style

---
 .../wwwroot/assets/styles/base/formato.less   | 14 ------------
 .../wwwroot/assets/styles/base/setup.less     | 15 +++++++++++++
 Thermo.Active/wwwroot/assets/styles/style.css | 22 +++++++++----------
 .../components/discesa-cornice.vue            |  2 +-
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/formato.less b/Thermo.Active/wwwroot/assets/styles/base/formato.less
index f31d189e..9e5e664c 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/formato.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/formato.less
@@ -202,20 +202,6 @@
           overflow-x: auto;
           -webkit-overflow-scrolling: touch;
       
-          &::-webkit-scrollbar {
-            width: 10px;
-            height: 10px;
-          }
-      
-          &::-webkit-scrollbar-thumb {
-            background: @color-silver;
-            border-radius: 10px;
-          }
-      
-          &::-webkit-scrollbar-track {
-            background: transparent;
-          }
-      
           img {
             flex-shrink: 0;
             width: 215px;
diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less
index afcf6ef1..c86e40e2 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/setup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less
@@ -46,6 +46,21 @@
           flex: 0 0 520px;
           overflow-y: scroll;
           padding-right: 10px;
+
+          &::-webkit-scrollbar {
+            width: 10px;
+            height: 10px;
+          }
+      
+          &::-webkit-scrollbar-thumb {
+            background: @color-silver;
+            border-radius: 10px;
+          }
+      
+          &::-webkit-scrollbar-track {
+            background: transparent;
+          }
+
         }
 
         .specific {
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 825d8a58..17d1f75a 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -3992,17 +3992,6 @@ img {
   overflow-x: auto;
   -webkit-overflow-scrolling: touch;
 }
-.modal.formato-info .specific .slides::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-.modal.formato-info .specific .slides::-webkit-scrollbar-thumb {
-  background: #bbbcbc;
-  border-radius: 10px;
-}
-.modal.formato-info .specific .slides::-webkit-scrollbar-track {
-  background: transparent;
-}
 .modal.formato-info .specific .slides img {
   flex-shrink: 0;
   width: 215px;
@@ -4224,6 +4213,17 @@ img {
   overflow-y: scroll;
   padding-right: 10px;
 }
+.setup .modal section.body section aside::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.setup .modal section.body section aside::-webkit-scrollbar-thumb {
+  background: #bbbcbc;
+  border-radius: 10px;
+}
+.setup .modal section.body section aside::-webkit-scrollbar-track {
+  background: transparent;
+}
 .setup .modal section.body section .specific {
   display: flex;
   flex-direction: column;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
index 8b28057d..aeb183a5 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<aside>
+		<aside class="scrollable">
 			<div class="box">
 				<div class="header">
 					<label>Discesa Cornice</label>

From 749bc6287076c3d360d9a0c8fb73647adb5d64bd Mon Sep 17 00:00:00 2001
From: "francesco.guerrieri" <fraguerr1987@gmail.com>
Date: Tue, 14 Apr 2020 09:10:23 +0200
Subject: [PATCH 05/42] fixed styles

---
 .../assets/styles/base/imbutitura.less        | 47 +++++++++++
 .../wwwroot/assets/styles/base/layout.less    |  1 +
 Thermo.Active/wwwroot/assets/styles/style.css | 35 ++++++++
 .../wwwroot/src/app.business-logic.ts         |  3 +
 .../imbutitura/show-imbutitura-info.ts        | 56 +++++++++++++
 .../imbutitura/show-imbutitura-info.vue       | 79 +++++++++++++++++++
 .../setup/components/setup.vue                |  2 +-
 7 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 Thermo.Active/wwwroot/assets/styles/base/imbutitura.less
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.vue

diff --git a/Thermo.Active/wwwroot/assets/styles/base/imbutitura.less b/Thermo.Active/wwwroot/assets/styles/base/imbutitura.less
new file mode 100644
index 00000000..6c13309f
--- /dev/null
+++ b/Thermo.Active/wwwroot/assets/styles/base/imbutitura.less
@@ -0,0 +1,47 @@
+// out: false, sourceMap: false, main: ../style.less
+@import "grid-system.less";
+@import "colors.less";
+@import "fonts.less";
+
+.@{modal}.drawing-info {
+    width: 1820px;
+    height: 980px;
+    header {
+      background-color: @color-white;
+      color: @color-darkish-blue;
+      font-family: Lato;
+      font-weight: 600;
+      font-size: 24px;
+      text-align: left;
+      padding: 0px 23px;
+    }
+    .icon-dues{
+        margin: 5px;
+        width: 20px;
+        height: 20px;
+        object-fit: contain;
+    }
+
+    .box-select-drawing{
+        margin: 10px 0;
+    }
+
+    .graph-drawing{
+        align-self: flex-end;
+    }
+
+    .container-graph{
+        margin-left: 16px;
+    }
+
+    .box-graph{
+        border: solid 4px #848484;
+        width: 490px;
+        height: 280px;
+        background-color: #e5f3ff;
+        padding: 20px;
+    }
+
+  }
+
+
diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less
index 47b69d58..e4218c85 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/layout.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less
@@ -11,6 +11,7 @@
 @import "raffreddamento.less";
 @import "controstamposetup.less";
 @import "quote-velocita.less";
+@import "imbutitura.less";
 @import "estrazione.less";
 @import "popups.less";
 @import "grid-system.less";
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 8d04901d..9c1a6b32 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4662,6 +4662,41 @@ img {
   border: solid 1px #001e48;
   background-image: linear-gradient(to bottom, #1756ad, #002680);
 }
+.modal.drawing-info {
+  width: 1820px;
+  height: 980px;
+}
+.modal.drawing-info header {
+  background-color: #fff;
+  color: #002680;
+  font-family: Lato;
+  font-weight: 600;
+  font-size: 24px;
+  text-align: left;
+  padding: 0px 23px;
+}
+.modal.drawing-info .icon-dues {
+  margin: 5px;
+  width: 20px;
+  height: 20px;
+  object-fit: contain;
+}
+.modal.drawing-info .box-select-drawing {
+  margin: 10px 0;
+}
+.modal.drawing-info .graph-drawing {
+  align-self: flex-end;
+}
+.modal.drawing-info .container-graph {
+  margin-left: 16px;
+}
+.modal.drawing-info .box-graph {
+  border: solid 4px #848484;
+  width: 490px;
+  height: 280px;
+  background-color: #e5f3ff;
+  padding: 20px;
+}
 .modal.estrazione-info {
   margin-top: 100px;
   width: 1370px;
diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index 7eaec1fe..23608ace 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -14,6 +14,7 @@ import ShowControstampoInfo from "@/app_modules_thermo/controstampo_setup/compon
 import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue";
 import ShowEstrazioneInfo from "@/app_modules_thermo/estrazione/components/show-estrazione-info.vue";
 import ShowVuotoInfo from "@/app_modules_thermo/vuoto/show-vuoto-info.vue";
+import ShowImbutituraInfo from "@/app_modules_thermo/imbutitura/show-imbutitura-info.vue";
 // import { DataService } from "./services/dataService";
 // import { ToolingService } from "./services/toolingService";
 // import { DepotService } from "./services/depotService";
@@ -60,6 +61,8 @@ messageService.subscribeToChannel("show-pirometro-info", () => { ModalHelper.Sho
 messageService.subscribeToChannel("show-user-info", () => { ModalHelper.ShowModal(UserInfoDialog); });
 messageService.subscribeToChannel("show-machine-info", () => { ModalHelper.ShowModal(MachineInfoDialog); });
 messageService.subscribeToChannel("show-contact-info", () => { ModalHelper.ShowModal(ContactInfoDialog); });
+messageService.subscribeToChannel("show-imbutitura-info", () => { ModalHelper.ShowModal(ShowImbutituraInfo); });
+
 // messageService.subscribeToChannel("show-axes-calibration", () => { ModalHelper.ShowNcModal(AxesCalibration); });
 // messageService.subscribeToChannel("hide-axes-calibration", () => { ModalHelper.HideNcModal(AxesCalibration); });
 // messageService.subscribeToChannel("show-m155-questions", () => { ModalHelper.ShowNextM155Modal(); });
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.ts
new file mode 100644
index 00000000..8e706ed0
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.ts
@@ -0,0 +1,56 @@
+import Vue from "vue";
+import { Modal, ModalHelper } from "@/components/modals";
+import { Factory, messageService, awaiter } from "@/_base";
+import Component from "vue-class-component";
+import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"
+import { Prop } from "vue-property-decorator";
+import Slider from "@/app_modules_thermo/components/slider.vue";
+
+@Component({ 
+  components: { 
+  modal: Modal, 
+  slider: Slider,
+  stepfooter:StepFooter
+  } 
+})
+export default class ShowImbutituraInfo extends Vue {
+
+  @Prop({default:0})
+  ritardo:number;
+  @Prop({default:0})
+  altBolla:number;
+  @Prop({default:0})
+  portMantenimento:number;
+  @Prop({default:0})
+  portManuale:number;
+  @Prop({default:0})
+  portata:number;
+  @Prop({default:0})
+  durata:number;
+
+
+    annulla(){
+        ModalHelper.HideModal();
+      };
+  
+      conferma(){
+        ModalHelper.HideModal();
+      };
+  
+      async beforeMount() {
+          // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
+          messageService.subscribeToChannel("esc_pressed", args => {
+            this.close();
+          });
+        }
+      
+        beforeDestroy() {
+          messageService.deleteChannel("esc_pressed");
+        }
+      
+        close() {
+          messageService.deleteChannel("esc_pressed");
+          ModalHelper.HideModal();
+        }
+  
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.vue
new file mode 100644
index 00000000..abc38ab4
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.vue
@@ -0,0 +1,79 @@
+<template>
+<div class="setup">
+    <modal type="drawing-info" :title="'drawinginfo_lbl_title' | localize('Imbutitura')">
+			<div slot="header-buttons">
+				<button class="modal-close" @click="close()">
+					<i class="fa fa-remove"></i>
+				</button>
+			</div>
+        <section>
+            <aside class="scrollable">
+                    <div class="input-area">
+                        <img class="icon-dues" src="assets/icons/png/clessidra.png">
+                        <label>Ritardo</label>
+                        <div class="rect">{{ritardo}} mm</div>
+                    </div>
+                    <slider :min="0" :max="10" v-model="ritardo"></slider>
+                    <hr>
+                    <div class="input-area box-select-drawing">
+                    <label>Tipo</label>
+                        <select>
+                            <option class="opzione" value="A tempo">A tempo</option>
+                            <option class="opzione" value="Mantenuta">Mantenuta</option>
+                            <option class="opzione" value="Negativa">Negativa</option>
+                        </select>
+                    </div>
+                    <div class="input-area box-select-drawing">
+                    <label>Fotocellula</label>
+                        <select>
+                            <option class="opzione" value="Label opzioni">Label opzioni</option>
+                        </select>
+                    </div>
+                    <div class="input-area">
+                        <label>Altezza bolla</label>
+                        <div class="rect">{{altBolla}} mm</div>
+                    </div>
+                    <slider :min="0" :max="500" v-model="altBolla"></slider>
+                    <div class="input-area">
+                        <label>Portata mantenimento</label>
+                        <div class="rect">{{portMantenimento}} %</div>
+                    </div>
+                    <slider :min="0" :max="100" v-model="portMantenimento"></slider>
+                    <div class="input-area">
+                        <label>Portata manuale</label>
+                        <div class="rect">{{portManuale}} %</div>
+                    </div>
+                    <slider :min="0" :max="100" v-model="portManuale"></slider>
+            </aside>
+            <div class="specific graph-drawing">
+                <div class="container-graph">
+                    <div class="box-graph">
+                        <div class="input-area">
+                            <label>Portata</label>
+                            <div class="rect">{{portata}}</div>
+                        </div>
+                        <slider :min="0" :max="10" v-model="portata"></slider>
+                        <div class="input-area">
+                            <label>Durata</label>
+                            <div class="rect">{{durata}} s</div>
+                        </div>
+                        <slider :min="0" :max="2" v-model="durata"></slider>
+                    </div>
+                </div>
+            </div>
+        </section>
+        <footer>
+            <button class="btn" @click="annulla()">
+                <label>Annulla</label>
+            </button>
+            <button class="btn btn-success" @click="conferma()">
+                <label>Conferma</label>
+            </button>
+        </footer>
+    </modal>
+    <stepfooter />
+</div>
+
+</template>
+
+<script lang="ts" src="./show-imbutitura-info.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
index a8d325a3..03e3a763 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
@@ -38,7 +38,7 @@
                 ></setup-button>
 
                 <setup-button
-                    @click="sendMessage('show-imbutitura')"
+                    @click="sendMessage('show-imbutitura-info')"
                     :phase="6"
                     title="Imbutitura"
                     statusImage="fa fa-minus-circle"

From 7393f088d68571e3ed152eb533af394332daf89c Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 14 Apr 2020 10:37:20 +0200
Subject: [PATCH 06/42] fix ciclo modal and removed fixed dimension of label
 from setup.less

---
 .../assets/icons/svg/disegno-caricatore.svg   | 58 ++++++-------
 .../wwwroot/assets/styles/base/ciclo.less     | 82 ++++++++++++++++---
 .../wwwroot/assets/styles/base/setup.less     |  2 -
 Thermo.Active/wwwroot/assets/styles/style.css | 57 +++++++++++--
 .../SVG-Components/SVGcaricatore.vue          | 20 ++---
 .../components/base-components/caricatore.vue |  6 +-
 .../base-components/ciclo-formatura.vue       |  6 +-
 .../base-components/formatura-acrilico.ts     |  5 +-
 .../base-components/formatura-acrilico.vue    |  4 +
 .../formatura-cristallizzazione.ts            |  5 +-
 .../formatura-cristallizzazione.vue           |  4 +
 .../setup/ciclo/components/show-ciclo-info.ts |  2 +-
 12 files changed, 175 insertions(+), 76 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg b/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg
index ab439214..3c5b4fa6 100644
--- a/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg
+++ b/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg
@@ -26,8 +26,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.19291922"
-     inkscape:cx="1519.3127"
-     inkscape:cy="1010.0622"
+     inkscape:cx="1916.57"
+     inkscape:cy="1211.0442"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -44,7 +44,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -54,12 +54,12 @@
      id="layer1"
      transform="translate(0,410)">
     <rect
-       style="fill:#d3e6b2;fill-opacity:1;stroke:#90c03d;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#99cfff;fill-opacity:0.78810413;stroke:#002680;stroke-width:3.97218895;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3713"
-       width="652.98224"
-       height="518.09424"
-       x="233.41364"
-       y="-333.90689" />
+       width="649.02783"
+       height="514.02783"
+       x="234.80009"
+       y="-331.12692" />
     <path
        style="fill:none;stroke:#b3b3b3;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
        d="m 559.81277,211.26185 0.17621,-606.00267"
@@ -92,7 +92,7 @@
        inkscape:connector-curvature="0" />
     <g
        id="g4615"
-       transform="matrix(1.0022378,0,0,1.0027445,997.483,235.66226)"
+       transform="matrix(1.0022378,0,0,1.0027445,997.483,216.36226)"
        style="fill:none;fill-rule:evenodd;stroke:#545454">
       <circle
          id="circle4601"
@@ -137,44 +137,44 @@
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:0.16938418"
-       x="573.8316"
-       y="241.89957"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.73900414px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:0.18639043"
+       x="552.42944"
+       y="247.27948"
        id="text4635"
-       transform="scale(0.91143445,1.0971716)"><tspan
+       transform="scale(0.93821902,1.0658492)"><tspan
          sodipodi:role="line"
          id="tspan4633"
-         x="573.8316"
-         y="241.89957"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.16938418">AREA DI </tspan><tspan
+         x="552.42944"
+         y="247.27948"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.73900414px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.18639043">AREA DI </tspan><tspan
          sodipodi:role="line"
-         x="573.8316"
-         y="266.59402"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.75555611px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.16938418"
+         x="552.42944"
+         y="274.45322"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.73900414px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.18639043"
          id="tspan4637">CARICO</tspan></text>
     <path
-       style="fill:#ffffff;stroke:#cccccc;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 516.11114,295.02162 0.01,-46.34449"
+       style="fill:#ffffff;stroke:#cccccc;stroke-width:1.7468853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 510.48528,295.22181 0.0101,-49.54167"
        id="path4524-17"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#ffffff;stroke:#cccccc;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 603.1228,295.02163 0.01,-46.3445"
+       style="fill:#ffffff;stroke:#cccccc;stroke-width:1.7468853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 609.04672,295.22182 0.0101,-49.54168"
        id="path4524-17-9"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#ffffff;stroke:#cccccc;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 602.75626,248.90987 26.45833,0.0351"
+       style="fill:#ffffff;stroke:#cccccc;stroke-width:1.7468853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 608.63148,245.92901 29.9703,0.0377"
        id="path4528-5-5"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#ffffff;stroke:#cccccc;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 516.48766,248.90998 -26.46004,0.0351"
+       style="fill:#ffffff;stroke:#cccccc;stroke-width:1.7468853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 510.91173,245.92912 -29.97225,0.0378"
        id="path4528-5-5-7"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#ffffff;stroke:#cccccc;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 490.00431,248.97935 69.80852,-20.95602 69.42507,20.95596"
+       style="fill:#ffffff;stroke:#cccccc;stroke-width:1.7468853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 480.91307,246.00328 79.07486,-22.40165 78.64031,22.40159"
        id="path4699"
        inkscape:connector-curvature="0" />
     <path
diff --git a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
index b785a3a4..54f11e4a 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
@@ -7,28 +7,86 @@
 .@{modal}.ciclo-info {
 
   .specific{
+    padding: 0 10px;
 
-    .disegno{
+    .caricatore-buttons{
+
+      button{
+        margin-right: 15px;
+        margin-left: 5px;
+        width: 48px;
+        height: 48px;
+        object-fit: contain;
+        border-radius: 2px;
+        box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5);
+        border: none;
+        background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
+
+        &:last-of-type{
+          border: solid 1px #001e48;
+          background-image: linear-gradient(to bottom, #1756ad, #002680);
+        }
 
-      .disegnoCaricatore{
-        
       }
 
     }
 
-    div{
-      display: flex;
+    .svg-area{
+
+      .disegnoCaricatore{
+        flex-shrink: 0;
+        width: 1137px;
+        height: 707px;   
+      }
+
+      .input-circles{
+
+        label{
+          object-fit: contain;
+          background-color: #979797;
+        }
+
+        .circle1{
+          position: relative;
+          top: 130px;
+        }
+
+        .circle2{
+          position: relative;
+          top: 180px;
+        }
+
+        .circle3{
+          position: relative;
+          top: 180px;
+          right: 400px;
+        }
+
+        .circle4{
+          position: relative;
+          top: 70px;
+          right: 160px;
+        }
+
+      }
+
     }
 
-  }
-
-  .presenter {
-    display: flex;
-    flex-flow: column;
-    padding: 0 10px;
-
     .box {
+      margin-bottom: 10px;
       width: 500px;
+
+      .body{
+        padding: 5px 10px;
+      }
+
     }
+
   }
+
+  // .presenter {
+  //   display: flex;
+  //   flex-flow: column;
+  //   padding: 0 10px;
+  // }
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less
index afcf6ef1..d61dd07d 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/setup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less
@@ -72,8 +72,6 @@
 
               label {
                 margin: auto;
-                width: 89px;
-                height: 25px;
                 object-fit: contain;
                 font-size: 22px;
                 font-weight: 500;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 38d46fd7..370b7477 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4247,8 +4247,6 @@ img {
 }
 .setup .modal section.body section .specific .svg-area .input-circles label {
   margin: auto;
-  width: 89px;
-  height: 25px;
   object-fit: contain;
   font-size: 22px;
   font-weight: 500;
@@ -4506,17 +4504,58 @@ img {
   margin: auto;
   display: flex;
 }
-.modal.ciclo-info .specific div {
-  display: flex;
-}
-.modal.ciclo-info .presenter {
-  display: flex;
-  flex-flow: column;
+.modal.ciclo-info .specific {
   padding: 0 10px;
 }
-.modal.ciclo-info .presenter .box {
+.modal.ciclo-info .specific .caricatore-buttons button {
+  margin-right: 15px;
+  margin-left: 5px;
+  width: 48px;
+  height: 48px;
+  object-fit: contain;
+  border-radius: 2px;
+  box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5);
+  border: none;
+  background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
+}
+.modal.ciclo-info .specific .caricatore-buttons button:last-of-type {
+  border: solid 1px #001e48;
+  background-image: linear-gradient(to bottom, #1756ad, #002680);
+}
+.modal.ciclo-info .specific .svg-area .disegnoCaricatore {
+  flex-shrink: 0;
+  width: 1137px;
+  height: 707px;
+}
+.modal.ciclo-info .specific .svg-area .input-circles label {
+  object-fit: contain;
+  background-color: #979797;
+}
+.modal.ciclo-info .specific .svg-area .input-circles .circle1 {
+  position: relative;
+  top: 130px;
+}
+.modal.ciclo-info .specific .svg-area .input-circles .circle2 {
+  position: relative;
+  top: 180px;
+}
+.modal.ciclo-info .specific .svg-area .input-circles .circle3 {
+  position: relative;
+  top: 180px;
+  right: 400px;
+}
+.modal.ciclo-info .specific .svg-area .input-circles .circle4 {
+  position: relative;
+  top: 70px;
+  right: 160px;
+}
+.modal.ciclo-info .specific .box {
+  margin-bottom: 10px;
   width: 500px;
 }
+.modal.ciclo-info .specific .box .body {
+  padding: 5px 10px;
+}
 .modal.raffreddamento-info {
   margin-top: 200px;
   width: 626px;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue
index 5f137a87..6d2957e1 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue
@@ -1,18 +1,12 @@
 <template>
-    <div class="disegno">
+    <div class="svg-area">
         <img class="disegnoCaricatore" src="assets/icons/svg/disegno-caricatore.svg">
-            <div class="dxalto">
-                <label class="dati">{{dxalto}} mm</label>
-            </div>
-            <div class="dxbasso">
-                <label class="dati">{{dxbasso}} mm</label>
-            </div>
-            <div class="basso">
-                <label class="dati">{{minoreuguale}} {{basso}} mm</label>
-            </div>
-            <div class="volante">
-                <label class="dati">{{volante}} mm</label>
-            </div>
+        <div class="input-circles">
+            <label class="circle1">{{dxalto}} mm</label>
+            <label class="circle2">{{dxbasso}} mm</label>
+            <label class="circle3">{{minoreuguale}} {{basso}} mm</label>
+            <label class="circle4">{{volante}} mm</label>
+        </div>
     </div>
 </template>
 
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
index 3826f876..9b7d6bc0 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
@@ -35,11 +35,11 @@
 
 		<div class="specific">
 			<svgcaricatore></svgcaricatore>
-			<div>
-				<button class="info btnscos">
+			<div class="caricatore-buttons">
+				<button>
 					<img src="assets/icons/png/info.png" />
 				</button>
-				<button class="play btnscos">
+				<button>
 					<img src="assets/icons/png/play.png" />
 				</button>
 			</div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue
index 667ca689..bd889444 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<aside>
+		<aside class="scrollable">
 			<div class="input-area">
 				<label>Tipo</label>
 				<select class="RMat">
@@ -21,10 +21,10 @@
 			</div>
 		</aside>
 
-		<div class="presenter">
+		<div class="specific">
 			<acrilico></acrilico>
-			<cristallizzazione></cristallizzazione>
 			<riscaldo></riscaldo>
+			<cristallizzazione></cristallizzazione>
 		</div>
 	</section>
 </template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts
index f3383cac..2803f7f8 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts
@@ -2,11 +2,12 @@ import Vue from 'vue';
 import Component from 'vue-class-component';
 import { Prop } from 'vue-property-decorator';
 import Slider from "@/app_modules_thermo/components/slider.vue";
+import ToggleButton from "@/components/toggleButton.vue";
 
-@Component({ components: { slider: Slider } })
+@Component({ components: { slider: Slider, ToggleButton } })
 export default class MascheraAcrilico extends Vue {
 
-
+  enabling:boolean=true;
 
   @Prop({ default: 0 })
   durata: number;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue
index 312d3ab0..9163cfad 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue
@@ -4,6 +4,10 @@
 			<label>{{'corniceacrilico' | localize('Cornice per acrilico')}}</label>
 		</div>
 		<div class="body">
+			<div class="input-area">
+				<label>Abilitazione</label>
+				<toggle-button v-model="enabling"></toggle-button>
+			</div>
 			<div class="input-area">
 				<label>Durata</label>
 				<div class="rect">{{durata}} s</div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts
index edaf51a5..0c655d35 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts
@@ -2,11 +2,12 @@ import Vue from 'vue';
 import Component from 'vue-class-component';
 import { Prop } from 'vue-property-decorator';
 import Slider from "@/app_modules_thermo/components/slider.vue";
+import ToggleButton from "@/components/toggleButton.vue";
 
-@Component({ components: { slider: Slider } })
+@Component({ components: { slider: Slider, ToggleButton } })
 export default class MascheraCristallizzazione extends Vue {
 
-
+  enabling:boolean=true;
 
   @Prop({ default: 0 })
   durata: number;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue
index 0cc681a6..9c253bb6 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue
@@ -4,6 +4,10 @@
 			<label>{{'cristallizzazione' | localize('Cristallizzazione (secondo riscaldo)')}}</label>
 		</div>
 		<div class="body">
+			<div class="input-area">
+				<label>Abilitazione</label>
+				<toggle-button v-model="enabling"></toggle-button>
+			</div>
 			<div class="input-area">
 				<label>Durata</label>
 				<div class="rect">{{durata}} s</div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts
index da371163..5db91d45 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts
@@ -11,7 +11,7 @@ import Caricatore from "./base-components/caricatore.vue";
 @Component({ components: { modal: Modal, slider: Slider, stepfooter: StepFooter, caricatore: Caricatore, cicloformatura: CicloFormatura } })
 export default class ShowCicloInfo extends Vue {
 
-  show: string = "formatura";
+  show: string = "caricatore";
 
   annulla() {
     ModalHelper.HideModal();

From e00862bbd3afd340f489e076f4d2d8c2184e9090 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 14 Apr 2020 10:44:33 +0200
Subject: [PATCH 07/42] set aside scrollable

---
 .../setup/ciclo/components/base-components/caricatore.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
index 9b7d6bc0..bab3849c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<aside>
+		<aside class="scrollable">
 			<div class="input-area">
 				<label>Abilitazione</label>
 				<toggle-button></toggle-button>

From ef2942a4e1e829c1ce1ce6ab47f12194a31fd793 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 14 Apr 2020 11:04:51 +0200
Subject: [PATCH 08/42] fix for the scrollbar

---
 .../wwwroot/assets/styles/base/setup.less     | 22 +++++++++----------
 Thermo.Active/wwwroot/assets/styles/style.css | 11 ----------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less
index c86e40e2..f303a6b1 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/setup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less
@@ -47,19 +47,19 @@
           overflow-y: scroll;
           padding-right: 10px;
 
-          &::-webkit-scrollbar {
-            width: 10px;
-            height: 10px;
-          }
+          // &::-webkit-scrollbar {
+          //   width: 10px;
+          //   height: 10px;
+          // }
       
-          &::-webkit-scrollbar-thumb {
-            background: @color-silver;
-            border-radius: 10px;
-          }
+          // &::-webkit-scrollbar-thumb {
+          //   background: @color-silver;
+          //   border-radius: 10px;
+          // }
       
-          &::-webkit-scrollbar-track {
-            background: transparent;
-          }
+          // &::-webkit-scrollbar-track {
+          //   background: transparent;
+          // }
 
         }
 
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 17d1f75a..67b40d55 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4213,17 +4213,6 @@ img {
   overflow-y: scroll;
   padding-right: 10px;
 }
-.setup .modal section.body section aside::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-.setup .modal section.body section aside::-webkit-scrollbar-thumb {
-  background: #bbbcbc;
-  border-radius: 10px;
-}
-.setup .modal section.body section aside::-webkit-scrollbar-track {
-  background: transparent;
-}
 .setup .modal section.body section .specific {
   display: flex;
   flex-direction: column;

From 365c128e9423b7f49a271d220fded30b8712bf8c Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 14 Apr 2020 14:47:46 +0200
Subject: [PATCH 09/42] fix ciclo modal

---
 .../assets/icons/svg/disegno-caricatore.svg   | 1299 ++++++++++++++++-
 1 file changed, 1259 insertions(+), 40 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg b/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg
index 3c5b4fa6..b9178104 100644
--- a/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg
+++ b/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg
@@ -9,9 +9,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1137mm"
+   width="1186mm"
    height="707mm"
-   viewBox="0 0 1137 707"
+   viewBox="0 0 1186 707"
    version="1.1"
    id="svg8"
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.19291922"
-     inkscape:cx="1916.57"
-     inkscape:cy="1211.0442"
+     inkscape:zoom="0.26"
+     inkscape:cx="1903.0535"
+     inkscape:cy="1303.7306"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -44,7 +44,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -58,41 +58,41 @@
        id="rect3713"
        width="649.02783"
        height="514.02783"
-       x="234.80009"
+       x="259.69971"
        y="-331.12692" />
     <path
-       style="fill:none;stroke:#b3b3b3;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 559.81277,211.26185 0.17621,-606.00267"
+       style="fill:none;stroke:#b3b3b3;stroke-width:1.58749998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 584.71242,211.26185 0.17621,-606.00267"
        id="path4524"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#b3b3b3;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M -0.94254521,-74.962503 1144.0586,-74.81327"
+       style="fill:none;stroke:#b3b3b3;stroke-width:1.58749998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 23.957103,-74.962503 1168.9582,-74.81327"
        id="path4526"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#b3b3b3;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 1057.4831,-304.98191 80.0179,0.0121"
+       style="fill:none;stroke:#b3b3b3;stroke-width:1.58749998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1082.3827,-304.98191 80.0179,0.0121"
        id="path4528"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#b3b3b3;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 1074.2778,211.26185 0.1762,-606.00267"
+       style="fill:none;stroke:#b3b3b3;stroke-width:1.58749998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1099.1774,211.26185 0.1762,-606.00267"
        id="path4524-1"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#b3b3b3;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 1057.4831,152.25709 80.0179,0.0121"
+       style="fill:none;stroke:#b3b3b3;stroke-width:1.58749998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1082.3827,152.25709 80.0179,0.0121"
        id="path4528-5"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#b3b3b3;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 559.90349,196.47424 H 1074.3685"
+       style="fill:none;stroke:#b3b3b3;stroke-width:1.58749998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 584.80314,196.47424 H 1099.2681"
        id="path4575"
        inkscape:connector-curvature="0" />
     <g
        id="g4615"
-       transform="matrix(1.0022378,0,0,1.0027445,997.483,216.36226)"
+       transform="matrix(1.0022378,0,0,1.0027445,1022.3827,216.36226)"
        style="fill:none;fill-rule:evenodd;stroke:#545454">
       <circle
          id="circle4601"
@@ -138,48 +138,48 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.73900414px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:0.18639043"
-       x="552.42944"
+       x="578.96869"
        y="247.27948"
        id="text4635"
        transform="scale(0.93821902,1.0658492)"><tspan
          sodipodi:role="line"
          id="tspan4633"
-         x="552.42944"
+         x="578.96869"
          y="247.27948"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.73900414px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.18639043">AREA DI </tspan><tspan
          sodipodi:role="line"
-         x="552.42944"
-         y="274.45322"
+         x="578.96869"
+         y="274.45325"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.73900414px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.18639043"
          id="tspan4637">CARICO</tspan></text>
     <path
        style="fill:#ffffff;stroke:#cccccc;stroke-width:1.7468853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 510.48528,295.22181 0.0101,-49.54167"
+       d="m 535.38493,295.22181 0.0101,-49.54167"
        id="path4524-17"
        inkscape:connector-curvature="0" />
     <path
        style="fill:#ffffff;stroke:#cccccc;stroke-width:1.7468853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 609.04672,295.22182 0.0101,-49.54168"
+       d="m 633.94637,295.22182 0.0101,-49.54168"
        id="path4524-17-9"
        inkscape:connector-curvature="0" />
     <path
        style="fill:#ffffff;stroke:#cccccc;stroke-width:1.7468853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 608.63148,245.92901 29.9703,0.0377"
+       d="m 633.53113,245.92901 29.9703,0.0377"
        id="path4528-5-5"
        inkscape:connector-curvature="0" />
     <path
        style="fill:#ffffff;stroke:#cccccc;stroke-width:1.7468853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 510.91173,245.92912 -29.97225,0.0378"
+       d="m 535.81138,245.92912 -29.97225,0.0378"
        id="path4528-5-5-7"
        inkscape:connector-curvature="0" />
     <path
        style="fill:#ffffff;stroke:#cccccc;stroke-width:1.7468853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 480.91307,246.00328 79.07486,-22.40165 78.64031,22.40159"
+       d="m 505.81272,246.00328 79.07486,-22.40165 78.64031,22.40159"
        id="path4699"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"
-       style="fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:1.54690618;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:1.54690623;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path4701"
        sodipodi:sides="3"
        sodipodi:cx="1096.5509"
@@ -194,10 +194,10 @@
        d="m 1102.4305,-48.134267 -6.1919,-0.540851 -6.1918,-0.540851 3.5643,-5.091909 3.5643,-5.091908 2.6276,5.632759 z"
        inkscape:transform-center-x="-0.012842114"
        inkscape:transform-center-y="-1.8831994"
-       transform="matrix(0.99305617,-0.09567388,0.09032752,1.0518343,39.2878,95.57902)" />
+       transform="matrix(0.99305617,-0.09567388,0.09032752,1.0518343,64.187449,95.57902)" />
     <path
        sodipodi:type="star"
-       style="fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:1.54690648;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:1.54690647;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path4701-8"
        sodipodi:sides="3"
        sodipodi:cx="1096.5509"
@@ -212,15 +212,15 @@
        d="m 1102.4305,-48.134267 -6.1919,-0.540851 -6.1918,-0.540851 3.5643,-5.091909 3.5643,-5.091908 2.6276,5.632759 z"
        inkscape:transform-center-x="0.024471851"
        inkscape:transform-center-y="1.8730617"
-       transform="matrix(0.41537055,-0.96018071,0.90652454,0.43995593,715.32127,1218.486)" />
+       transform="matrix(0.41537055,-0.96018071,0.90652454,0.43995593,740.22092,1218.486)" />
     <path
-       style="fill:none;stroke:#b3b3b3;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 1123.4792,-71.870821 V 150.19085"
+       style="fill:none;stroke:#b3b3b3;stroke-width:1.58749998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1148.3788,-71.870821 V 150.19085"
        id="path4718"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"
-       style="fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:1.54690617;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:1.54690611;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path4701-2"
        sodipodi:sides="3"
        sodipodi:cx="1096.5509"
@@ -235,7 +235,7 @@
        d="m 1102.4305,-48.134267 -6.1919,-0.540851 -6.1918,-0.540851 3.5643,-5.091909 3.5643,-5.091908 2.6276,5.632759 z"
        inkscape:transform-center-x="-0.012842114"
        inkscape:transform-center-y="-1.8831994"
-       transform="matrix(0.99305618,-0.09567388,0.09032752,1.0518343,38.934005,-133.0583)" />
+       transform="matrix(0.99305618,-0.09567388,0.09032752,1.0518343,63.833654,-133.0583)" />
     <path
        sodipodi:type="star"
        style="fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:1.54690647;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -253,11 +253,1230 @@
        d="m 1102.4305,-48.134267 -6.1919,-0.540851 -6.1918,-0.540851 3.5643,-5.091909 3.5643,-5.091908 2.6276,5.632759 z"
        inkscape:transform-center-x="0.024471851"
        inkscape:transform-center-y="1.8730617"
-       transform="matrix(0.41537054,-0.96018072,0.90652454,0.43995594,714.96736,989.84794)" />
+       transform="matrix(0.41537054,-0.96018072,0.90652454,0.43995594,739.86701,989.84794)" />
     <path
-       style="fill:none;stroke:#b3b3b3;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 1123.1243,-300.50828 V -78.446558"
+       style="fill:none;stroke:#b3b3b3;stroke-width:1.58749998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1148.0239,-300.50828 V -78.446558"
        id="path4718-6"
        inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:1.26154959;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       id="rect912"
+       width="7.4876394"
+       height="20.323971"
+       x="253.5668"
+       y="-308.78809" />
+    <rect
+       style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:1.25789201;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       id="rect912-9"
+       width="7.4876394"
+       height="20.206291"
+       x="910.60632"
+       y="-314.42709" />
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8"
+       cx="134.179"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="140.59659"
+       y="-269.10074"
+       id="text872-0"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1144">A2</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5"
+       cx="194.179"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="207.31517"
+       y="-269.10071"
+       id="text872-0-5"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1146">A3</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-0"
+       cx="254.179"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="274.03372"
+       y="-269.10071"
+       id="text872-0-5-7"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1148">A4</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1"
+       cx="314.17899"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="340.75235"
+       y="-269.10068"
+       id="text872-0-5-3"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1150">A5</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6"
+       cx="374.17899"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="407.47095"
+       y="-269.10068"
+       id="text872-0-5-3-4"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1152">A6</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2"
+       cx="434.17899"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="474.18954"
+       y="-269.10071"
+       id="text872-0-5-3-4-9"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1154">A7</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2"
+       cx="494.17899"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="540.9082"
+       y="-269.10071"
+       id="text872-0-5-3-4-9-6"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1156">A8</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5"
+       cx="554.17902"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="607.62683"
+       y="-269.10071"
+       id="text872-0-5-3-4-9-6-8"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1158">A9</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-9"
+       cx="74.179001"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03007793px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="73.878014"
+       y="-269.10074"
+       id="text872-0-2"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan870-0-5"
+         x="73.878014"
+         y="-269.10074"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03007793px;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:1.3042872">A1</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6"
+       cx="614.17902"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="669.78613"
+       y="-269.10071"
+       id="text872-0-5-3-4-9-6-8-2"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1265"
+         x="669.78613"
+         y="-269.10071">A10</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4"
+       cx="674.17902"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="736.5047"
+       y="-269.10068"
+       id="text872-0-5-3-4-9-6-8-2-3"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1267"
+         x="736.5047"
+         y="-269.10068">A11</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1"
+       cx="734.17902"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="803.22333"
+       y="-269.10071"
+       id="text872-0-5-3-4-9-6-8-2-3-5"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1269"
+         x="803.22333"
+         y="-269.10071">A12</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0"
+       cx="794.17902"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="869.94196"
+       y="-269.10074"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1271"
+         x="869.94196"
+         y="-269.10074">A13</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9"
+       cx="854.17902"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="936.66052"
+       y="-269.10071"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1273"
+         x="936.66052"
+         y="-269.10071">A14</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-3"
+       cx="914.17902"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="1003.379"
+       y="-269.10071"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-6"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1338">A15</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-6"
+       cx="974.17902"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="1070.0977"
+       y="-269.10068"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-9"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1340">A16</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-6-2"
+       cx="1034.179"
+       cy="-304.69699" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009706px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872;"
+       x="1136.8162"
+       y="-269.10065"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-9-8"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1342">A17</tspan></text>
+    <rect
+       style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:1.26154959;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       id="rect912-2"
+       width="7.4876394"
+       height="20.323971"
+       x="253.56682"
+       y="-129.34009" />
+    <rect
+       style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:1.25789201;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       id="rect912-9-7"
+       width="7.4876394"
+       height="20.206291"
+       x="910.60638"
+       y="-134.9791" />
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-8"
+       cx="134.179"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="140.59659"
+       y="-107.72329"
+       id="text872-0-0"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1744"
+         x="140.59659"
+         y="-107.72329">B2</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-5"
+       cx="194.179"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="207.31517"
+       y="-107.72323"
+       id="text872-0-5-1"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1746"
+         x="207.31517"
+         y="-107.72323">B3</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-0-2"
+       cx="254.179"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="274.03372"
+       y="-107.72323"
+       id="text872-0-5-7-1"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1748"
+         x="274.03372"
+         y="-107.72323">B4</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-5"
+       cx="314.17899"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="340.75235"
+       y="-107.72317"
+       id="text872-0-5-3-2"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1750"
+         x="340.75235"
+         y="-107.72317">B5</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-3"
+       cx="374.17899"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="407.47095"
+       y="-107.72317"
+       id="text872-0-5-3-4-4"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1752"
+         x="407.47095"
+         y="-107.72317">B6</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-8"
+       cx="434.17896"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="474.18951"
+       y="-107.72323"
+       id="text872-0-5-3-4-9-5"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1754"
+         x="474.18951"
+         y="-107.72323">B7</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-4"
+       cx="494.17902"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="540.9082"
+       y="-107.72323"
+       id="text872-0-5-3-4-9-6-2"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1756"
+         x="540.9082"
+         y="-107.72323">B8</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-3"
+       cx="554.17902"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="607.62683"
+       y="-107.72323"
+       id="text872-0-5-3-4-9-6-8-3"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1758"
+         x="607.62683"
+         y="-107.72323">B9</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-9-8"
+       cx="74.178986"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="73.878014"
+       y="-107.72329"
+       id="text872-0-2-2"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1742"
+         x="73.878014"
+         y="-107.72329">B1</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-8"
+       cx="614.17908"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="669.78613"
+       y="-107.72323"
+       id="text872-0-5-3-4-9-6-8-2-9"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1760"
+         x="669.78613"
+         y="-107.72323">B10</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-0"
+       cx="674.17902"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="736.5047"
+       y="-107.72317"
+       id="text872-0-5-3-4-9-6-8-2-3-9"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1762"
+         x="736.5047"
+         y="-107.72317">B11</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-01"
+       cx="734.17902"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="803.22327"
+       y="-107.72323"
+       id="text872-0-5-3-4-9-6-8-2-3-5-0"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1764"
+         x="803.22327"
+         y="-107.72323">B12</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-8"
+       cx="794.17908"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="869.94196"
+       y="-107.72329"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-2"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1766"
+         x="869.94196"
+         y="-107.72329">B13</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-1"
+       cx="854.17908"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="936.66046"
+       y="-107.72323"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-2"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1768"
+         x="936.66046"
+         y="-107.72323">B14</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-3-9"
+       cx="914.17902"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="1003.379"
+       y="-107.72323"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-6-4"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1770"
+         x="1003.379"
+         y="-107.72323">B15</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-6-5"
+       cx="974.17908"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="1070.0977"
+       y="-107.72317"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-9-0"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1772"
+         x="1070.0977"
+         y="-107.72317">B16</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-6-2-2"
+       cx="1034.1791"
+       cy="-125.24899" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="1136.8162"
+       y="-107.72317"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-9-8-1"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1774"
+         x="1136.8162"
+         y="-107.72317">B17</tspan></text>
+    <rect
+       style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:1.26154959;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       id="rect912-7"
+       width="7.4876394"
+       height="20.323971"
+       x="253.5668"
+       y="-26.036095" />
+    <rect
+       style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:1.25789201;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       id="rect912-9-9"
+       width="7.4876394"
+       height="20.206291"
+       x="910.60638"
+       y="-31.6751" />
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-7"
+       cx="134.179"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="140.59657"
+       y="-14.821957"
+       id="text872-0-6"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1778"
+         x="140.59657"
+         y="-14.821957">C2</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-2"
+       cx="194.179"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="207.31516"
+       y="-14.821927"
+       id="text872-0-5-4"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1780"
+         x="207.31516"
+         y="-14.821927">C3</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-0-3"
+       cx="254.17899"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="274.03372"
+       y="-14.821927"
+       id="text872-0-5-7-4"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1782"
+         x="274.03372"
+         y="-14.821927">C4</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-9"
+       cx="314.17899"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="340.75235"
+       y="-14.821896"
+       id="text872-0-5-3-3"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1784"
+         x="340.75235"
+         y="-14.821896">C5</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-32"
+       cx="374.17899"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="407.47095"
+       y="-14.821896"
+       id="text872-0-5-3-4-5"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1786"
+         x="407.47095"
+         y="-14.821896">C6</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-7"
+       cx="434.17896"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="474.18951"
+       y="-14.821927"
+       id="text872-0-5-3-4-9-9"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1788"
+         x="474.18951"
+         y="-14.821927">C7</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-7"
+       cx="494.17902"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="540.9082"
+       y="-14.821927"
+       id="text872-0-5-3-4-9-6-4"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1790"
+         x="540.9082"
+         y="-14.821927">C8</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-63"
+       cx="554.17902"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="607.62683"
+       y="-14.821927"
+       id="text872-0-5-3-4-9-6-8-9"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1792"
+         x="607.62683"
+         y="-14.821927">C9</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-9-87"
+       cx="74.178993"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="73.878014"
+       y="-14.821957"
+       id="text872-0-2-8"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1776"
+         x="73.878014"
+         y="-14.821957">C1</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-6"
+       cx="614.17908"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="669.78613"
+       y="-14.821927"
+       id="text872-0-5-3-4-9-6-8-2-2"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1794"
+         x="669.78613"
+         y="-14.821927">C10</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-3"
+       cx="674.17902"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="736.5047"
+       y="-14.821896"
+       id="text872-0-5-3-4-9-6-8-2-3-93"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1796"
+         x="736.5047"
+         y="-14.821896">C11</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-8"
+       cx="734.17902"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="803.22327"
+       y="-14.821927"
+       id="text872-0-5-3-4-9-6-8-2-3-5-76"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1798"
+         x="803.22327"
+         y="-14.821927">C12</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-3"
+       cx="794.17908"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="869.94196"
+       y="-14.821957"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-5"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1800"
+         x="869.94196"
+         y="-14.821957">C13</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-4"
+       cx="854.17908"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="936.66046"
+       y="-14.821927"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-3"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1802"
+         x="936.66046"
+         y="-14.821927">C14</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-3-6"
+       cx="914.17902"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="1003.3791"
+       y="-14.821927"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-6-6"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1804"
+         x="1003.3791"
+         y="-14.821927">C15</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-6-3"
+       cx="974.17902"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="1070.0977"
+       y="-14.821896"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-9-6"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1806"
+         x="1070.0977"
+         y="-14.821896">C16</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-6-2-3"
+       cx="1034.179"
+       cy="-21.945" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="1136.8162"
+       y="-14.821865"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-9-8-8"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1808"
+         x="1136.8162"
+         y="-14.821865">C17</tspan></text>
+    <rect
+       style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:1.26154959;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       id="rect912-3"
+       width="7.4876394"
+       height="20.323971"
+       x="253.56682"
+       y="148.21001" />
+    <rect
+       style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:1.25789201;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       id="rect912-9-3"
+       width="7.4876394"
+       height="20.206291"
+       x="910.60638"
+       y="142.57101" />
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-1"
+       cx="134.179"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="140.59659"
+       y="141.87746"
+       id="text872-0-9"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1812"
+         x="140.59659"
+         y="141.87746">D2</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-7"
+       cx="194.179"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="207.31517"
+       y="141.87747"
+       id="text872-0-5-15"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1814"
+         x="207.31517"
+         y="141.87747">D3</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-0-0"
+       cx="254.179"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="274.03372"
+       y="141.87747"
+       id="text872-0-5-7-8"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1816"
+         x="274.03372"
+         y="141.87747">D4</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-54"
+       cx="314.17899"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="340.75235"
+       y="141.8775"
+       id="text872-0-5-3-1"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1818"
+         x="340.75235"
+         y="141.8775">D5</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-8"
+       cx="374.17899"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="407.47095"
+       y="141.8775"
+       id="text872-0-5-3-4-2"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1820"
+         x="407.47095"
+         y="141.8775">D6</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-78"
+       cx="434.17896"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="474.18951"
+       y="141.87747"
+       id="text872-0-5-3-4-9-1"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1822"
+         x="474.18951"
+         y="141.87747">D7</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-0"
+       cx="494.17902"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="540.9082"
+       y="141.87747"
+       id="text872-0-5-3-4-9-6-7"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1824"
+         x="540.9082"
+         y="141.87747">D8</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-5"
+       cx="554.17902"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="607.62683"
+       y="141.87747"
+       id="text872-0-5-3-4-9-6-8-1"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1826"
+         x="607.62683"
+         y="141.87747">D9</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-9-4"
+       cx="74.178986"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="73.878014"
+       y="141.87746"
+       id="text872-0-2-7"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1810"
+         x="73.878014"
+         y="141.87746">D1</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-9"
+       cx="614.17908"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="669.78613"
+       y="141.87747"
+       id="text872-0-5-3-4-9-6-8-2-1"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1828"
+         x="669.78613"
+         y="141.87747">D10</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-8"
+       cx="674.17902"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="736.5047"
+       y="141.8775"
+       id="text872-0-5-3-4-9-6-8-2-3-6"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1830"
+         x="736.5047"
+         y="141.8775">D11</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-1"
+       cx="734.17902"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="803.22327"
+       y="141.87747"
+       id="text872-0-5-3-4-9-6-8-2-3-5-79"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1832"
+         x="803.22327"
+         y="141.87747">D12</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-38"
+       cx="794.17908"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="869.94196"
+       y="141.87746"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-52"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1834"
+         x="869.94196"
+         y="141.87746">D13</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-49"
+       cx="854.17908"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="936.66046"
+       y="141.87747"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-0"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1836"
+         x="936.66046"
+         y="141.87747">D14</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-3-5"
+       cx="914.17902"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="1003.379"
+       y="141.87747"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-6-9"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1838"
+         x="1003.379"
+         y="141.87747">D15</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-6-24"
+       cx="974.17908"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="1070.0977"
+       y="141.8775"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-9-00"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1840"
+         x="1070.0977"
+         y="141.8775">D16</tspan></text>
+    <circle
+       r="18.442383"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#000000;stroke-width:3.11523533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853-8-5-1-6-2-2-5-6-4-1-0-9-6-2-7"
+       cx="1034.1791"
+       cy="152.30099" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.03009701px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3042872"
+       x="1136.8162"
+       y="141.87759"
+       id="text872-0-5-3-4-9-6-8-2-3-5-7-8-9-8-15"
+       transform="scale(0.89929967,1.1119764)"><tspan
+         sodipodi:role="line"
+         id="tspan1842"
+         x="1136.8162"
+         y="141.87759">D17</tspan></text>
+    <rect
+       style="opacity:1;fill:#bbbcbc;fill-opacity:0.74509805;stroke:#979797;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect849-4-6"
+       width="1055.1869"
+       height="24.186996"
+       x="25.179001"
+       y="-316.08398" />
+    <rect
+       style="opacity:1;fill:#bbbcbc;fill-opacity:0.74509805;stroke:#979797;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect849-4-2-8"
+       width="1055.1869"
+       height="24.186996"
+       x="25.179001"
+       y="-137.636" />
+    <rect
+       style="opacity:1;fill:#bbbcbc;fill-opacity:0.74509805;stroke:#979797;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect849-4-4-7"
+       width="1055.1869"
+       height="24.186996"
+       x="25.179001"
+       y="-34.331997" />
+    <rect
+       style="opacity:1;fill:#bbbcbc;fill-opacity:0.74509805;stroke:#979797;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect849-4-7-8"
+       width="1055.1869"
+       height="24.186996"
+       x="25.179001"
+       y="139.914" />
   </g>
 </svg>

From eb6dbbe958cc3f1db29eb8f7f6aab8e9e945f04b Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 14 Apr 2020 15:33:12 +0200
Subject: [PATCH 10/42] fix ciclo modal

---
 Thermo.Active/wwwroot/assets/styles/base/ciclo.less | 10 ++++++----
 Thermo.Active/wwwroot/assets/styles/style.css       | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
index 54f11e4a..e948c830 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
@@ -49,23 +49,25 @@
         .circle1{
           position: relative;
           top: 130px;
+          right: 25px;
         }
 
         .circle2{
           position: relative;
           top: 180px;
+          right: 25px;
         }
 
         .circle3{
           position: relative;
-          top: 180px;
-          right: 400px;
+          top: 175px;
+          right: 410px;
         }
 
         .circle4{
           position: relative;
-          top: 70px;
-          right: 160px;
+          top: 60px;
+          right: 180px;
         }
 
       }
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 370b7477..d4f4ba90 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4534,20 +4534,22 @@ img {
 .modal.ciclo-info .specific .svg-area .input-circles .circle1 {
   position: relative;
   top: 130px;
+  right: 25px;
 }
 .modal.ciclo-info .specific .svg-area .input-circles .circle2 {
   position: relative;
   top: 180px;
+  right: 25px;
 }
 .modal.ciclo-info .specific .svg-area .input-circles .circle3 {
   position: relative;
-  top: 180px;
-  right: 400px;
+  top: 175px;
+  right: 410px;
 }
 .modal.ciclo-info .specific .svg-area .input-circles .circle4 {
   position: relative;
-  top: 70px;
-  right: 160px;
+  top: 60px;
+  right: 180px;
 }
 .modal.ciclo-info .specific .box {
   margin-bottom: 10px;

From be0f0185ec14749fd908c1357180cc4561554108 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 14 Apr 2020 15:34:53 +0200
Subject: [PATCH 11/42] ultimate fix for the scrollbar style

---
 .../wwwroot/assets/styles/base/setup.less          | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less
index f303a6b1..368b1ade 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/setup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less
@@ -47,20 +47,6 @@
           overflow-y: scroll;
           padding-right: 10px;
 
-          // &::-webkit-scrollbar {
-          //   width: 10px;
-          //   height: 10px;
-          // }
-      
-          // &::-webkit-scrollbar-thumb {
-          //   background: @color-silver;
-          //   border-radius: 10px;
-          // }
-      
-          // &::-webkit-scrollbar-track {
-          //   background: transparent;
-          // }
-
         }
 
         .specific {

From b114c41730c5c6f85716293854ba831f5e70650e Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 14 Apr 2020 17:09:27 +0200
Subject: [PATCH 12/42] fix pirometro modal

---
 .../wwwroot/src/app.business-logic.ts         |  2 +-
 .../components/base-components/pirometro.vue  | 35 -------------------
 .../components/show-pirometro-info.vue        | 31 ----------------
 .../components/base-components/pirometro.ts   | 14 +++-----
 .../components/base-components/pirometro.vue  | 28 +++++++++++++++
 .../components/show-pirometro-info.ts         | 23 +-----------
 .../components/show-pirometro-info.vue        | 28 +++++++++++++++
 .../{ => setup}/pirometro/index.ts            |  0
 .../components/discesa-cornice.vue            | 17 +++------
 9 files changed, 67 insertions(+), 111 deletions(-)
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/base-components/pirometro.vue
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/show-pirometro-info.vue
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/pirometro/components/base-components/pirometro.ts (53%)
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/pirometro/components/show-pirometro-info.ts (73%)
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/pirometro/index.ts (100%)

diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index 7eaec1fe..1d185c39 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -5,7 +5,7 @@ import { messageService } from "@/_base/messageService";
 
 import { store, AppModel/*, MachineStatusModel, machineStatusActions, localizationModelActions, machineInfoActions*/ } from "@/store";
 import { UserInfoDialog, MachineInfoDialog, ContactInfoDialog } from "@/app_modules/machine";
-import ShowPirometroInfo from "@/app_modules_thermo/pirometro/components/show-pirometro-info.vue";
+import ShowPirometroInfo from "@/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue";
 import ShowFormatoInfo from "@/app_modules_thermo/setup/formato/components/show-formato-info.vue";
 import ShowRiscaldamentoInfo from "@/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue";
 import ShowCicloInfo from "@/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue";
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/base-components/pirometro.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/base-components/pirometro.vue
deleted file mode 100644
index b9c56051..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/base-components/pirometro.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-    <div class="DivP">
-            <div class="divPiro">
-                <div class="Abilitazione">
-                            <label class="abi">Abilitazione</label>
-                            <div class="switch">
-                                <div class="switch-on" v-if="abi=='ON'">
-                                    <label class="ON">{{abi}}</label> <button class="btn-switch-on" @click="retAbi()"></button>
-                                </div>
-                                <div class="switch-off" v-if="abi=='OFF'">
-                                    <button class="btn-switch-off" @click="retAbi()"></button><label class="OFF">{{abi}}</label> 
-                                </div>
-                            </div>
-                        </div>
-                <div class="datiP">
-                    <div class="ritardo">
-                        <img class="clessidra" src="assets/icons/png/clessidra.png"><label class="Ritardo">Ritardo</label>
-                    </div>
-                    <div class="rect">
-                        <label class="mock">{{mockR}}s</label>
-                    </div>
-                </div>
-                <slider :min="0" :max="10" v-model="mockR" :left="'0s'" :middle="'5s'" :right="'10s'"></slider>
-                <div class="datiP">
-                    <label class="Set-point">Set point</label>
-                    <div class="rect">
-                        <label class="mock">{{mockT}}°C</label>
-                    </div>
-                </div>
-                <slider :min="100" :max="300" v-model="mockT" :left="'100°C'" :middle="'200°C'" :right="'300°C'"></slider>
-            </div>
-        </div>
-</template>
-
-<script lang="ts" src="./pirometro.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/show-pirometro-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/show-pirometro-info.vue
deleted file mode 100644
index d4b9c30f..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/show-pirometro-info.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-<div class="temp">
-    <modal type="pirometro-info">
-        <div class="schede" slot="header-buttons">
-            <div class="selectorbtn">
-                <div class="selector P" v-if="activeP"></div>
-                <button class="Piro scheda" :class="{'active':activeP}" @click="ActiveP()"><label class="lab">Pirometro</label></button>
-            </div>
-            <div class="selectorbtn">
-                <div class="selector TRS" v-if="activeRS"></div>
-                <button class="TRiscSup scheda" :class="{'active':activeRS}" @click="ActiveRS()"><label class="lab">Termoregolazione riscaldo superiore</label></button>
-            </div>
-            <div class="selectorbtn">
-                <div class="selector TRI" v-if="activeRI"></div>
-                <button class="TRiscInf scheda" :class="{'active':activeRI}" @click="ActiveRI()"><label class="lab">Termoregolazione riscaldo inferiore</label></button>
-            </div>
-        </div>
-        <div class="divheader HP" slot="header-buttons">
-                <button class="mclose" @click="close()"><i class="fa fa-remove"></i></button>
-        </div>
-        <pirometro v-if="activeP"></pirometro>
-        <footer class="divFooter">
-            <button class="annulla confirm" @click="annulla()"><label class="Annulla" >Annulla</label></button>
-            <button class="conferma confirm" @click="conferma()"><label class="Conferma">Conferma</label></button>
-        </footer>
-    </modal>
-    <stepfooter class="Step"></stepfooter>
-</div>
-</template>
-
-<script lang="ts" src="./show-pirometro-info.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/base-components/pirometro.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts
similarity index 53%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/base-components/pirometro.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts
index 16a24390..342742a2 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/base-components/pirometro.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts
@@ -2,22 +2,16 @@ import Vue from 'vue';
 import Component from 'vue-class-component';
 import {Prop} from 'vue-property-decorator';
 import Slider from "@/app_modules_thermo/components/slider.vue";
+import ToggleButton from "@/components/toggleButton.vue";
 
-@Component({name:"pirometro", components: { slider:Slider}})
+@Component({name:"pirometro", components: { slider:Slider, ToggleButton}})
 export default class Pirometro extends Vue{
 
     @Prop({default:100})
-    temp:number;
+    temperatura:number;
     @Prop({default:0})
     ritardo:number;
 
-    abi:string="ON";
-    mockT:number=this.temp;
-    mockR:number=this.ritardo;
-
-    retAbi(){
-        if(this.abi=="OFF") this.abi="ON"
-        else this.abi="OFF";
-      };
+    enabling:boolean=true;
 
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue
new file mode 100644
index 00000000..3302704c
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue
@@ -0,0 +1,28 @@
+<template>
+    <section>
+        <div class="specific">
+                <div class="input-area">
+                    <label class="abi">Abilitazione</label>
+                    <toggle-button v-model="enabling"></toggle-button>
+                </div>
+                <div class="input-area">
+                    <div>
+                        <img src="assets/icons/png/clessidra.png"><label>Ritardo</label>
+                    </div>
+                    <div class="rect">
+                        {{ritardo}} s
+                    </div>
+                </div>
+                <slider :min="0" :max="10" v-model="ritardo" unit-of-measure="s"></slider>
+                <div class="input-area">
+                    <label>Set point</label>
+                    <div class="rect">
+                        {{temperatura}} °C
+                    </div>
+                </div>
+                <slider :min="100" :max="300" v-model="temperatura" unit-of-measure="°C"></slider>
+            </div>
+    </section>
+</template>
+
+<script lang="ts" src="./pirometro.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/show-pirometro-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts
similarity index 73%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/show-pirometro-info.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts
index 4e872653..b56acf6d 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/show-pirometro-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts
@@ -9,28 +9,7 @@ import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue";
 @Component({ components: { modal: Modal ,pirometro:Pirometro, stepfooter:StepFooter} })
 export default class ShowPirometroInfo extends Vue {
 
-    activeRI:boolean=false;
-    activeRS:boolean=false;
-    activeP:boolean=true;
-
-    ActiveRI(){
-      this.activeRI=true;
-      this.activeRS=false;
-      this.activeP=false;
-    };
-
-    ActiveRS(){
-      this.activeRI=false;
-      this.activeRS=true;
-      this.activeP=false;
-    };
-
-    ActiveP(){
-      this.activeRI=false;
-      this.activeRS=false;
-      this.activeP=true;
-    };
-
+    show:string='pirometro';
 
     annulla(){
       ModalHelper.HideModal();
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue
new file mode 100644
index 00000000..91c7c010
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue
@@ -0,0 +1,28 @@
+<template>
+<div class="setup">
+    <modal type="pirometro-info">
+		<div class="tab-header" slot="header-buttons">
+			<button :class="{'active':show=='pirometro'}" @click="show='pirometro'">Pirometro</button>
+			<button :class="{'active':show=='termo-superiore'}" @click="show='termo-superiore'">Termoregolazione riscaldo superiore</button>
+			<button :class="{'active':show=='termo-inferiore'}" @click="show='termo-inferiore'">Termoregolazione riscaldo inferiore</button>
+		</div>
+		<div slot="header-buttons">
+			<button class="modal-close" @click="close()">
+			<i class="fa fa-remove"></i>
+			</button>
+		</div>
+        <pirometro v-if="show=='pirometro'"></pirometro>
+		<footer>
+			<button class="btn" @click="annulla()">
+				Annulla
+			</button>
+			<button class="btn btn-success" @click="conferma()">
+				Conferma
+			</button>
+		</footer>
+	</modal>
+	<stepfooter></stepfooter>
+</div>
+</template>
+
+<script lang="ts" src="./show-pirometro-info.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/index.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/index.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/index.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/index.ts
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
index aeb183a5..af2c7bfd 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
@@ -11,7 +11,7 @@
 						<label>Ritardo</label>
 						<span class="rect">{{ritardo}} s</span>
 					</div>
-					<slider :min="0" :max="10" v-model="ritardo" :left="'0'" :middle="'5'" :right="'10'"></slider>
+					<slider :min="0" :max="10" v-model="ritardo"></slider>
 
 					<hr />
 
@@ -20,13 +20,13 @@
 						<label>Corsa</label>
 						<span class="rect">{{corsa}} mm</span>
 					</div>
-					<slider :min="0" :max="1059" v-model="corsa" :left="'0'" :middle="'530'" :right="'1059'"></slider>
+					<slider :min="0" :max="1059" v-model="corsa"></slider>
 					<div class="input-area">
 						<img src="assets/icons/png/alta.png" />
 						<label>Velocità salita</label>
 						<span class="rect">{{velSalita}} mm/s</span>
 					</div>
-					<slider :min="0" :max="200" v-model="velSalita" :left="'0'" :middle="'100'" :right="'200'"></slider>
+					<slider :min="0" :max="200" v-model="velSalita"></slider>
 
 					<hr />
 
@@ -35,20 +35,13 @@
 						<label>Rallentamento salita</label>
 						<span class="rect">{{ralSalita}} mm</span>
 					</div>
-					<slider :min="0" :max="1059" v-model="ralSalita" :left="'0'" :middle="'530'" :right="'1059'"></slider>
+					<slider :min="0" :max="1059" v-model="ralSalita"></slider>
 					<div class="input-area">
 						<img src="assets/icons/png/bassa.png" />
 						<label>Velocità salita lenta</label>
 						<span class="rect">{{velSalitaLenta}} mm/s</span>
 					</div>
-					<slider
-						:min="0"
-						:max="200"
-						v-model="velSalitaLenta"
-						:left="'0'"
-						:middle="'100'"
-						:right="'200'"
-					></slider>
+					<slider :min="0" :max="200" v-model="velSalitaLenta"></slider>
 				</div>
 			</div>
 		</aside>

From 8e69afb85346c40947aebc7af8d9f489595d09e8 Mon Sep 17 00:00:00 2001
From: "francesco.guerrieri" <fraguerr1987@gmail.com>
Date: Tue, 14 Apr 2020 19:05:06 +0200
Subject: [PATCH 13/42] fix styles modal controstampo

---
 .../assets/styles/base/controstamposetup.less | 99 ++++++++-----------
 .../wwwroot/assets/styles/base/pirometro.less |  9 --
 Thermo.Active/wwwroot/assets/styles/style.css | 99 ++++++-------------
 .../app_modules_thermo/components/scheda.vue  | 26 +++--
 .../base-components/aria-controstampo.vue     | 50 +++++-----
 .../base-components/ciclo-controstampo.ts     | 15 +--
 .../base-components/ciclo-controstampo.vue    | 54 +++++-----
 .../components/show-controstampo-info.ts      | 33 +------
 .../components/show-controstampo-info.vue     | 32 +++---
 .../formato/components/show-formato-info.vue  |  2 +-
 .../components/show-quote-velocita-info.vue   |  2 +-
 11 files changed, 159 insertions(+), 262 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less b/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less
index 1b20b462..0f62d260 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less
@@ -16,77 +16,58 @@
       text-align: left;
       padding: 0px 23px;
     }
-    .dato{
-      margin-left: 180px;
+    .slider-graph{
+      align-self: center;
+      width: 471px;
     }
 }
-.schedaC{
-  margin-left: 10px;
-  margin-top: 3px;
+
+.container-ciclo-controstampo {
+  display: flex;
+  justify-content: center;
+}
+
+.box-ciclo-controstampo {
+  display: flex;
+  flex-direction: column;
+  width: 471px;
+  margin-top: 45px;
+}
+
+.modal-controstampo{
+  padding:0;
+  height:100%;
+}
+
+.box-slider{
+  margin: 10px 0 0 10px;
+  padding: 15px;
   width: 490px;
-  height: 263px;
+  height: 260px;
   border: solid #848484;
   display: flex;
   flex-direction: column;
 }
-.CC{
-  width: 272px;
+
+.box-input-1{
+  background-color: #FFFFFF;
 }
-.CicloC{
-  height: 65px;
-  width: 272px;
+
+.box-input-2{
+  background-color: #E5F3FF;
 }
-.AC{
-  width: 260px;
+
+.box-input-3{
+  background-color: #B2DBFF;
 }
-.AriaC{
-  height: 65px;
-  width: 260px;
-}
-.VC{
-  width: 280px;
-}
-.VuotoC{
-  height: 65px;
-  width: 280px;
-}
-.EC{
-  width: 325px;
-}
-.EstrC{
-  height: 65px;
-  width: 325px;
-}
-.divAria{
-  display: flex;
-  margin-top: 20px;
-}
-.Dx1{
-  margin-top: 5px;
-  display: flex;
-  flex-direction: column;
-}
-.Dx2{
+
+.controstampo-graph{
   display: flex;
   flex-direction: column;
   justify-content: flex-end;
+  width: 36%;
 }
-.DX{
-  display: flex;
-}
-.rid{
-  margin-top: 2px;
-}
-.s1{
- background-color: white;
-}
-.s2{
- background-color: #e8e8e8 ;
-}
-.s3{
- background-color: #d3d3d3 ;
-}
-.datiA{
-  display: flex;
-  justify-content: center;
+
+.input-controstampo{
+  height:10px;
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
index ff2e0d22..14d24477 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
@@ -188,16 +188,7 @@ img {
   width: 427px;
 }
 
-.DivP {
-  display: flex;
-  justify-content: center;
-}
 
-.divPiro {
-  display: flex;
-  flex-direction: column;
-  margin-top: 45px;
-}
 
 .datiP {
   margin-top: 35px;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 8d04901d..83e4c5a9 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -3813,15 +3813,6 @@ img {
 .TRI {
   width: 427px;
 }
-.DivP {
-  display: flex;
-  justify-content: center;
-}
-.divPiro {
-  display: flex;
-  flex-direction: column;
-  margin-top: 45px;
-}
 .datiP {
   margin-top: 35px;
   display: flex;
@@ -4567,78 +4558,50 @@ img {
   text-align: left;
   padding: 0px 23px;
 }
-.modal.controstamposetup-info .dato {
-  margin-left: 180px;
+.modal.controstamposetup-info .slider-graph {
+  align-self: center;
+  width: 471px;
 }
-.schedaC {
-  margin-left: 10px;
-  margin-top: 3px;
+.container-ciclo-controstampo {
+  display: flex;
+  justify-content: center;
+}
+.box-ciclo-controstampo {
+  display: flex;
+  flex-direction: column;
+  width: 471px;
+  margin-top: 45px;
+}
+.modal-controstampo {
+  padding: 0;
+  height: 100%;
+}
+.box-slider {
+  margin: 10px 0 0 10px;
+  padding: 15px;
   width: 490px;
-  height: 263px;
+  height: 260px;
   border: solid #848484;
   display: flex;
   flex-direction: column;
 }
-.CC {
-  width: 272px;
+.box-input-1 {
+  background-color: #FFFFFF;
 }
-.CicloC {
-  height: 65px;
-  width: 272px;
+.box-input-2 {
+  background-color: #E5F3FF;
 }
-.AC {
-  width: 260px;
+.box-input-3 {
+  background-color: #B2DBFF;
 }
-.AriaC {
-  height: 65px;
-  width: 260px;
-}
-.VC {
-  width: 280px;
-}
-.VuotoC {
-  height: 65px;
-  width: 280px;
-}
-.EC {
-  width: 325px;
-}
-.EstrC {
-  height: 65px;
-  width: 325px;
-}
-.divAria {
-  display: flex;
-  margin-top: 20px;
-}
-.Dx1 {
-  margin-top: 5px;
-  display: flex;
-  flex-direction: column;
-}
-.Dx2 {
+.controstampo-graph {
   display: flex;
   flex-direction: column;
   justify-content: flex-end;
+  width: 36%;
 }
-.DX {
-  display: flex;
-}
-.rid {
-  margin-top: 2px;
-}
-.s1 {
-  background-color: white;
-}
-.s2 {
-  background-color: #e8e8e8;
-}
-.s3 {
-  background-color: #d3d3d3;
-}
-.datiA {
-  display: flex;
-  justify-content: center;
+.input-controstampo {
+  height: 10px;
 }
 .modal.quote-velocita-info {
   width: 1820px;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
index 2893e2e1..f6dcd616 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
@@ -1,23 +1,19 @@
 <template>
-    <div class="schedaC">
-        <div class="datiP rid">
-            <div class="ritardo rid">
-                <label class="Ritardo">Portata</label>
-            </div>
-            <div class="rect rid">
-                <label class="mock">{{mockP}}</label>
+    <div class="box-slider">
+        <div class="input-area input-controstampo">
+            <label>Portata</label>
+            <div class="rect">
+                {{mockP}}
             </div>
         </div>        
-        <slider class="rid" :min="0" :max="10" v-model="mockP" :left="'0'" :middle="'5'" :right="'10'"></slider>
-        <div class="datiP rid">
-            <div class="ritardo rid">
-                <label class="Ritardo">Durata</label>
-            </div>
-            <div class="rect rid">
-                <label class="mock">{{mockD}}s</label>
+        <slider :min="0" :max="10" v-model="mockP"></slider>
+        <div class="input-area input-controstampo">
+            <label>Durata</label>
+            <div class="rect">
+                {{mockD}} s
             </div>
         </div>
-        <slider class="rid" :min="0" :max="2" v-model="mockD" :left="'0s'" :middle="'1s'" :right="'2s'"></slider>
+        <slider :min="0" :max="10" v-model="mockD" :unit-of-measure="s"></slider>
     </div>
 </template>
 
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue
index 6bfb678f..dfbcb030 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue
@@ -1,36 +1,32 @@
 <template>
-    <div class="divAria">
-        <div class="divSX">
-            <div class="datiP">
-                <div class="ritardo">
-                    <img class="clessidra" src="assets/icons/png/clessidra.png"><label class="Ritardo">Ritardo</label>
-                </div>
-                <div class="rect">
-                    <label class="mock">{{mockR}}s</label>
-                </div>
+    <div class="setup modal-controstampo">
+    <section>
+        <aside class="scrollable">
+            <div class="input-area">
+                <img src="assets/icons/png/clessidra.png">
+                <label>Ritardo</label>
+                <div class="rect">{{mockR}}s</div>
             </div>
-            <slider :min="0" :max="10" v-model="mockR" :left="'0s'" :middle="'5s'" :right="'10s'"></slider>
+            <slider :min="0" :max="10" v-model="mockR" :unit-of-measure="s"></slider>
+        </aside>
+        <!-- <div class="sep"></div> -->
+        <div class="specific">
+            <scheda class="box-input-1"></scheda>
+            <scheda class="box-input-2"></scheda>
+            <scheda class="box-input-3"></scheda>
         </div>
-        <div class="sep"></div>
-            <div class="Dx1">
-                <scheda class="s1"></scheda>
-                <scheda class="s2"></scheda>
-                <scheda class="s3"></scheda>
-            </div>
-            <div class="Dx2">
-                <div class="dato">
-                    <div class="datiA">
-                        <div class="ritardo">
-                            <label class="Ritardo">Durata massima</label>
-                        </div>
-                        <div class="rect">
-                            <label class="mock">{{mockD}}s</label>
-                        </div>
+            <div class="controstampo-graph">
+                <div class="slider-graph">
+                    <div class="input-area">
+                        <label>Durata massima</label>
+                        <div class="rect">{{mockD}}s</div>
                     </div>
-                    <slider :min="0" :max="4" v-model="mockD" :left="'0s'" :middle="'2s'" :right="'4s'"></slider>
+                    <slider :min="0" :max="4" v-model="mockD" :unit-of-measure="s"></slider>
                 </div>
             </div>
-        </div>
+    </section>
+
+    </div>
 </template>
 
 <script lang="ts" src="./aria-controstampo.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.ts
index c18e400f..e8074db2 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.ts
@@ -2,8 +2,15 @@ import Vue from 'vue';
 import Component from 'vue-class-component';
 import {Prop} from 'vue-property-decorator';
 import Slider from "@/app_modules_thermo/components/slider.vue";
+import ToggleButton from "@/components/toggleButton.vue";
 
-@Component({name:"ciclocontrostampo", components: { slider:Slider}})
+@Component({
+  name:"ciclocontrostampo", 
+  components: { 
+    slider:Slider,
+    ToggleButton
+  }
+})
 export default class CicloControstampo extends Vue {
 
     @Prop({default:0})
@@ -11,13 +18,9 @@ export default class CicloControstampo extends Vue {
     @Prop({default:0})
     ritardo:number;
 
-    abi:string="ON";
+    abilit:boolean=false;
     mockD:number=this.durata;
     mockR:number=this.ritardo;
 
-    retAbi(){
-        if(this.abi=="OFF") this.abi="ON"
-        else this.abi="OFF";
-      };
 
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue
index e3944102..6adb94af 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue
@@ -1,41 +1,31 @@
 <template>
-    <div class="DivP">
-            <div class="divPiro">
-                <div class="Abilitazione">
-                            <label class="abi">Abilitazione</label>
-                            <div class="switch">
-                                <div class="switch-on" v-if="abi=='ON'">
-                                    <label class="ON">{{abi}}</label> <button class="btn-switch-on" @click="retAbi()"></button>
-                                </div>
-                                <div class="switch-off" v-if="abi=='OFF'">
-                                    <button class="btn-switch-off" @click="retAbi()"></button><label class="OFF">{{abi}}</label> 
-                                </div>
-                            </div>
-                        </div>
-                <div class="div">
-                    <label class="lab">Partenza</label>
-                    <select class="RMat">
+    <div class="container-ciclo-controstampo">
+            <div class="box-ciclo-controstampo">
+                <div class="input-area">
+                            <label>Abilitazione</label>
+                            <toggle-button v-model="abilit"></toggle-button>
+                </div>
+                <div class="input-area">
+                    <label>Partenza</label>
+                    <select>
                         <option class="opzione" value="Label partenza">Label partenza</option>
                     </select>
                 </div>
-                <div class="datiP">
-                    <div class="ritardo">
-                        <img class="clessidra" src="assets/icons/png/clessidra.png"><label class="Ritardo">Ritardo</label>
-                    </div>
-                    <div class="rect">
-                        <label class="mock">{{mockR}}s</label>
-                    </div>
+                <div class="input-area">
+                        <img src="assets/icons/png/clessidra.png">
+                        <label>Ritardo</label>
+                        <div class="rect">
+                            {{mockR}}s
+                        </div>
                 </div>
-                <slider :min="0" :max="10" v-model="mockR" :left="'0s'" :middle="'5s'" :right="'10s'"></slider>
-                <div class="datiP">
-                    <div class="ritardo">
-                        <label class="Ritardo">Durata</label>
-                    </div>
-                    <div class="rect">
-                        <label class="mock">{{mockD}}s</label>
-                    </div>
+                <slider :min="0" :max="10" v-model="mockR" unit-of-measure="s"></slider>
+                <div class="input-area">
+                        <label>Durata</label>
+                        <div class="rect">
+                            {{mockD}}s
+                        </div>
                 </div>
-                <slider class="Vslider" :min="0" :max="20" v-model="mockD" :left="'0s'" :middle="'10s'" :right="'20s'"></slider>
+                <slider :min="0" :max="20" v-model="mockD" unit-of-measure="s"></slider>
             </div>
         </div>
 </template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.ts
index 184af414..4b464204 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.ts
@@ -10,38 +10,7 @@ import AriaControstampo from "./base-components/aria-controstampo.vue";
 @Component({components: { modal: Modal,stepfooter:StepFooter,ciclocontrostampo:CicloControstampo,ariacontrostampo:AriaControstampo}})
 export default class ShowControstampoInfo extends Vue {
 
-    activeCC:boolean=false;
-    activeAC:boolean=true;
-    activeVC:boolean=false;
-    activeEC:boolean=false;
-    
-    ActiveCC(){
-      this.activeCC=true;
-      this.activeAC=false;
-      this.activeVC=false;
-      this.activeEC=false;
-    };
-
-    ActiveAC(){
-      this.activeCC=false;
-      this.activeAC=true;
-      this.activeVC=false;
-      this.activeEC=false;
-    };
-
-    ActiveVC(){
-      this.activeCC=false;
-      this.activeAC=false;
-      this.activeVC=true;
-      this.activeEC=false;
-    };
-
-    ActiveEC(){
-      this.activeCC=false;
-      this.activeAC=false;
-      this.activeVC=false;
-      this.activeEC=true;
-    };
+    show: string = "CC";
 
     annulla(){
       ModalHelper.HideModal();
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue
index e7a724db..d0e1bd62 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="temp">
+    <div class="setup">
     <modal type="controstamposetup-info">
-        <div class="schede" slot="header-buttons">
+        <!-- <div class="schede" slot="header-buttons">
             <div class="selectorbtn">
                 <div class="selector CC" v-if="activeCC"></div>
                 <button class="CicloC scheda" :class="{'active':activeCC}" @click="ActiveCC()"><label class="lab">Ciclo controstampo</label></button>
@@ -18,18 +18,26 @@
                 <div class="selector EC" v-if="activeEC"></div>
                 <button class="EstrC scheda" :class="{'active':activeEC}" @click="ActiveEC()"><label class="lab">Estrazione controstampo</label></button>
             </div>
-        </div>
-        <div class="divheader HCC" slot="header-buttons">
-            <button class="mclose" @click="close()"><i class="fa fa-remove"></i></button>
-        </div>
-        <ciclocontrostampo v-if="activeCC"></ciclocontrostampo>
-        <ariacontrostampo v-if="activeAC"></ariacontrostampo>
-        <footer class="divFooter">
-            <button class="annulla confirm" @click="annulla()"><label class="Annulla" >Annulla</label></button>
-            <button class="conferma confirm" @click="conferma()"><label class="Conferma">Conferma</label></button>
+        </div> -->
+		<div class="tab-header" slot="header-buttons">
+			<button :class="{'active':show == 'CC'}" @click="show='CC'">Ciclo controstampo</button>
+			<button :class="{'active':show == 'AC'}" @click="show='AC'">Aria controstampo</button>
+			<button :class="{'active':show == 'VC'}" @click="show='VC'">Vuoto controstampo</button>
+            <button :class="{'active':show == 'EC'}" @click="show='EC'">Estrazione controstampo</button>
+		</div>
+		<div slot="header-buttons">
+			<button class="modal-close" @click="close()">
+				<i class="fa fa-remove"></i>
+			</button>
+		</div>
+        <ciclocontrostampo v-if="show=='CC'"></ciclocontrostampo>
+        <ariacontrostampo v-if="show=='AC'"></ariacontrostampo>
+        <footer>
+			<button class="btn" @click="annulla()">Annulla</button>
+			<button class="btn btn-success" @click="conferma()">Conferma</button>
         </footer>
     </modal>
-    <stepfooter class="Step"></stepfooter>
+    <stepfooter></stepfooter>
 </div>
 </template>
 
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue
index e1bdc3af..d9a81c8c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue
@@ -13,7 +13,7 @@
 					<piastra></piastra>
 					<cornice></cornice>
 					<controstampo></controstampo>
-					<div class="radio-buttons">
+					<div class="radio-buttons"> 
 						<label>Zona di lavoro</label>
 						<label for="sx">Sx</label><br>
 						<input type="radio" id="sx" name="zona" value="Sx">
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue
index 44206b9c..c5f01074 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue
@@ -16,7 +16,7 @@
 				<button class="btn" @click="annulla()">Annulla</button>
 				<button class="btn btn-success" @click="conferma()">Conferma</button>
 			</footer>
-		</modal>
+		</modal> 
 		<stepfooter></stepfooter>
 	</div>
 </template>

From c10df963870e65265ded70480bc255622fa8fa0a Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Wed, 15 Apr 2020 09:00:18 +0200
Subject: [PATCH 14/42] fix pirometro modal

---
 .../wwwroot/assets/styles/base/pirometro.less | 205 +-----------------
 .../wwwroot/assets/styles/base/setup.less     |   1 -
 Thermo.Active/wwwroot/assets/styles/style.css | 161 +-------------
 .../components/base-components/pirometro.vue  |   2 +-
 4 files changed, 10 insertions(+), 359 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
index ff2e0d22..a021aa12 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
@@ -9,206 +9,13 @@
   width: 1820px;
   height: 980px;
 
-  header {
-    background-color: @color-white;
-    color: @color-darkish-blue;
+  section{
+
+    .specific{
+      width: 470px;
+      margin-left: 37%;
+    }
 
-    font-weight: 600;
-    font-size: 24px;
-    text-align: left;
-    padding: 0px 23px;
   }
-}
 
-//images
-img {
-  width: 36px;
-  height: 36px;
-  object-fit: contain;
-}
-
-.clessidra {
-  width: 23px;
-  height: 23px;
-}
-
-
-
-.btn-switch-on {
-  position: relative;
-  left: 41px;
-  top: 3px;
-  border: none;
-  width: 34px;
-  height: 34px;
-  border-radius: 20px;
-  background-color: @color-darkish-blue;
-}
-
-.btn-switch-off {
-  position: relative;
-  left: 3px;
-  top: 3px;
-  border: none;
-  width: 34px;
-  height: 34px;
-  border-radius: 20px;
-  background-color: @color-darkish-blue;
-}
-
-//divs
-.switch-on {
-  width: 112px;
-  height: 40px;
-  border-radius: 20px;
-  box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
-  background-color: @color-clear-blue;
-}
-
-.switch-off {
-  width: 112px;
-  height: 40px;
-  border-radius: 20px;
-  box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
-  background-color: @color-label-grey;
-}
-
-// .rectdato {
-//     display: flex;
-//     flex-direction: column;
-//     justify-content: center;
-//     width: 63px;
-//     height: 48px;
-//     border-radius: 2px;
-//     box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
-// }
-//labels
-.ON {
-  position: relative;
-  bottom: 4.5px;
-  left: 22px;
-  width: 29px;
-  height: 18px;
-
-  font-size: 18px;
-  font-weight: bold;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: 1;
-  letter-spacing: normal;
-  text-align: center;
-  color: @color-white;
-}
-
-.OFF {
-  position: relative;
-  bottom: 4.5px;
-  left: 19px;
-  width: 29px;
-  height: 18px;
-
-  font-size: 18px;
-  font-weight: bold;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: 1;
-  letter-spacing: normal;
-  text-align: center;
-  color: @color-white;
-}
-
-.Ritardo {
-  width: 77px;
-  height: 29px;
-
-  font-size: 24px;
-  font-weight: 500;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: normal;
-  letter-spacing: normal;
-  text-align: center;
-  color: @color-darkish-blue;
-}
-
-.Set-point {
-  margin-right: 10px;
-  width: 96px;
-  height: 29px;
-
-  font-size: 24px;
-  font-weight: 500;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: normal;
-  letter-spacing: normal;
-  text-align: center;
-  color: @color-darkish-blue;
-}
-
-.mock {
-  margin-left: 25px;
-  width: 30px;
-  height: 22px;
-
-  font-size: 18px;
-  font-weight: bold;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: normal;
-  letter-spacing: normal;
-  color: @color-silver;
-}
-
-
-.Piro {
-  width: 177px;
-  height: 65px;
-}
-
-.P {
-  width: 177px;
-}
-
-.TRiscSup {
-  width: 437px;
-  height: 65px;
-}
-
-.TRS {
-  width: 437px;
-}
-
-.TRiscInf {
-  width: 427px;
-  height: 65px;
-}
-
-.TRI {
-  width: 427px;
-}
-
-.DivP {
-  display: flex;
-  justify-content: center;
-}
-
-.divPiro {
-  display: flex;
-  flex-direction: column;
-  margin-top: 45px;
-}
-
-.datiP {
-  margin-top: 35px;
-  display: flex;
-  justify-content: center;
-}
-
-.ritardo {
-  margin-right: 10px;
-}
-
-.Step {
-  margin-top: 990px;
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less
index 716111d1..c327652a 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/setup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less
@@ -30,7 +30,6 @@
         height: 100%;
         display: flex;
         flex-flow: row nowrap;
-
         padding: 14px;
         display: flex;
         justify-content: flex-start;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 59b9f24c..76c5c49e 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -3674,164 +3674,9 @@
   width: 1820px;
   height: 980px;
 }
-.modal.pirometro-info header {
-  background-color: #fff;
-  color: #002680;
-  font-weight: 600;
-  font-size: 24px;
-  text-align: left;
-  padding: 0px 23px;
-}
-img {
-  width: 36px;
-  height: 36px;
-  object-fit: contain;
-}
-.clessidra {
-  width: 23px;
-  height: 23px;
-}
-.btn-switch-on {
-  position: relative;
-  left: 41px;
-  top: 3px;
-  border: none;
-  width: 34px;
-  height: 34px;
-  border-radius: 20px;
-  background-color: #002680;
-}
-.btn-switch-off {
-  position: relative;
-  left: 3px;
-  top: 3px;
-  border: none;
-  width: 34px;
-  height: 34px;
-  border-radius: 20px;
-  background-color: #002680;
-}
-.switch-on {
-  width: 112px;
-  height: 40px;
-  border-radius: 20px;
-  box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
-  background-color: #1791ff;
-}
-.switch-off {
-  width: 112px;
-  height: 40px;
-  border-radius: 20px;
-  box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
-  background-color: #979797;
-}
-.ON {
-  position: relative;
-  bottom: 4.5px;
-  left: 22px;
-  width: 29px;
-  height: 18px;
-  font-size: 18px;
-  font-weight: bold;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: 1;
-  letter-spacing: normal;
-  text-align: center;
-  color: #fff;
-}
-.OFF {
-  position: relative;
-  bottom: 4.5px;
-  left: 19px;
-  width: 29px;
-  height: 18px;
-  font-size: 18px;
-  font-weight: bold;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: 1;
-  letter-spacing: normal;
-  text-align: center;
-  color: #fff;
-}
-.Ritardo {
-  width: 77px;
-  height: 29px;
-  font-size: 24px;
-  font-weight: 500;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: normal;
-  letter-spacing: normal;
-  text-align: center;
-  color: #002680;
-}
-.Set-point {
-  margin-right: 10px;
-  width: 96px;
-  height: 29px;
-  font-size: 24px;
-  font-weight: 500;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: normal;
-  letter-spacing: normal;
-  text-align: center;
-  color: #002680;
-}
-.mock {
-  margin-left: 25px;
-  width: 30px;
-  height: 22px;
-  font-size: 18px;
-  font-weight: bold;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: normal;
-  letter-spacing: normal;
-  color: #bbbcbc;
-}
-.Piro {
-  width: 177px;
-  height: 65px;
-}
-.P {
-  width: 177px;
-}
-.TRiscSup {
-  width: 437px;
-  height: 65px;
-}
-.TRS {
-  width: 437px;
-}
-.TRiscInf {
-  width: 427px;
-  height: 65px;
-}
-.TRI {
-  width: 427px;
-}
-.DivP {
-  display: flex;
-  justify-content: center;
-}
-.divPiro {
-  display: flex;
-  flex-direction: column;
-  margin-top: 45px;
-}
-.datiP {
-  margin-top: 35px;
-  display: flex;
-  justify-content: center;
-}
-.ritardo {
-  margin-right: 10px;
-}
-.Step {
-  margin-top: 990px;
+.modal.pirometro-info section .specific {
+  width: 470px;
+  margin-left: 37%;
 }
 .modal.riscaldi-info .presenter {
   position: relative;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue
index 3302704c..46f98756 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue
@@ -21,7 +21,7 @@
                     </div>
                 </div>
                 <slider :min="100" :max="300" v-model="temperatura" unit-of-measure="°C"></slider>
-            </div>
+        </div>
     </section>
 </template>
 

From 2ebe927fc163d9b217c8e198534f3e982a9a28a7 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Wed, 15 Apr 2020 09:15:23 +0200
Subject: [PATCH 15/42] general fix for various modal

---
 .../ciclo/components/base-components/ciclo-formatura.vue      | 4 ++--
 .../ciclo/components/base-components/formatura-acrilico.vue   | 2 +-
 .../base-components/formatura-cristallizzazione.vue           | 2 +-
 .../ciclo/components/base-components/formatura-riscaldo.vue   | 2 +-
 .../app_modules_thermo/setup/formato/components/cornice.vue   | 4 ++--
 .../app_modules_thermo/setup/formato/components/lastra.vue    | 2 +-
 .../setup/formato/components/piastra_riduzione.vue            | 2 +-
 .../setup/pirometro/components/base-components/pirometro.vue  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue
index bd889444..63275983 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue
@@ -3,8 +3,8 @@
 		<aside class="scrollable">
 			<div class="input-area">
 				<label>Tipo</label>
-				<select class="RMat">
-					<option class="opzione" value="Termorivestito">Termorivestito</option>
+				<select>
+					<option value="Termorivestito">Termorivestito</option>
 				</select>
 			</div>
 			<div class="input-area">
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue
index 9163cfad..7069bc69 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="box">
 		<div class="header">
-			<label>{{'corniceacrilico' | localize('Cornice per acrilico')}}</label>
+			<label>Cornice per acrilico</label>
 		</div>
 		<div class="body">
 			<div class="input-area">
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue
index 9c253bb6..16b28612 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="box">
 		<div class="header">
-			<label>{{'cristallizzazione' | localize('Cristallizzazione (secondo riscaldo)')}}</label>
+			<label>Cristallizzazione (secondo riscaldo)</label>
 		</div>
 		<div class="body">
 			<div class="input-area">
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.vue
index b1664083..5225eda2 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="box">
 		<div class="header">
-			<label>{{'riscsupsuppl' | localize('Riscaldo superiore supplementare')}}</label>
+			<label>Riscaldo superiore supplementare</label>
 		</div>
 		<div class="body">
 			<div class="input-area">
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.vue
index 4da5b810..08c7633b 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="box box-cornice">
+	<div class="box">
 		<div class="header">
 			<label>Cornice</label>
 		</div>
@@ -7,7 +7,7 @@
 			<div class="input-area">
 				<label>Traversini</label>
 				<select>
-					<option class="opzione" value="Label tipo">Label tipo</option>
+					<option value="Label tipo">Label tipo</option>
 				</select>
 			</div>
 			<hr />
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.vue
index ea716d37..77b41853 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.vue
@@ -7,7 +7,7 @@
 			<div class="input-area">
 				<label>Materiale</label>
 				<select>
-					<option class="opzione" value="Policarbonato">Policarbonato</option>
+					<option value="Policarbonato">Policarbonato</option>
 				</select>
 			</div>
 			<hr />
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue
index 513f5f0a..e51800ee 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue
@@ -7,7 +7,7 @@
 			<div class="input-area">
 				<label>Tipo</label>
 				<select>
-					<option class="opzione" value="Label tipo">Label tipo</option>
+					<option value="Label tipo">Label tipo</option>
 				</select>
 			</div>
 			<hr />
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue
index 46f98756..3f8b7aa1 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue
@@ -2,7 +2,7 @@
     <section>
         <div class="specific">
                 <div class="input-area">
-                    <label class="abi">Abilitazione</label>
+                    <label>Abilitazione</label>
                     <toggle-button v-model="enabling"></toggle-button>
                 </div>
                 <div class="input-area">

From 3c90b6aa99ae59d71ca6e27629a296b4b8f89a9a Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Wed, 15 Apr 2020 10:49:32 +0200
Subject: [PATCH 16/42] fix vuoto modal

---
 .../wwwroot/src/app.business-logic.ts         |  2 +-
 .../setup/components/setup.vue                |  2 +-
 .../vuoto/base-components/vuoto-principale.ts | 19 +++++++
 .../base-components/vuoto-principale.vue      | 49 +++++++++++++++++++
 .../{ => setup}/vuoto/show-vuoto-info.ts      | 17 ++-----
 .../setup/vuoto/show-vuoto-info.vue           | 25 ++++++++++
 .../vuoto/show-vuoto-info.vue                 | 49 -------------------
 .../app_modules_thermo/vuoto/vuoto-info.vue   |  7 ---
 .../src/app_modules_thermo/vuoto/vuoto.ts     | 12 -----
 9 files changed, 100 insertions(+), 82 deletions(-)
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/vuoto/show-vuoto-info.ts (67%)
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.vue
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/vuoto-info.vue
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/vuoto.ts

diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index 1d185c39..635adaa6 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -13,7 +13,7 @@ import ShowRaffreddamentoInfo from "@/app_modules_thermo/raffreddamento/componen
 import ShowControstampoInfo from "@/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue";
 import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue";
 import ShowEstrazioneInfo from "@/app_modules_thermo/estrazione/components/show-estrazione-info.vue";
-import ShowVuotoInfo from "@/app_modules_thermo/vuoto/show-vuoto-info.vue";
+import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue";
 // import { DataService } from "./services/dataService";
 // import { ToolingService } from "./services/toolingService";
 // import { DepotService } from "./services/depotService";
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
index a8d325a3..146da417 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
@@ -59,7 +59,7 @@
                 ></setup-button>
 
                 <setup-button
-                    @click="sendMessage('show-vuoto')"
+                    @click="sendMessage('show-vuoto-info')"
                     :phase="9"
                     title="Vuoto"
                     statusImage="fa fa-minus-circle"
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts
new file mode 100644
index 00000000..c7720df4
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts
@@ -0,0 +1,19 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+import Slider from "@/app_modules_thermo/components/slider.vue"
+import Scheda from "@/app_modules_thermo/components/scheda.vue"
+
+@Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}})
+export default class VuotoPrincipale extends Vue{
+
+    @Prop({default:0})
+    ritardo:number;
+
+    @Prop({default:0})
+    percentuale:number;
+
+    @Prop({default:0})
+    durata:number;
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
new file mode 100644
index 00000000..8885e72c
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
@@ -0,0 +1,49 @@
+<template>
+    <section>
+        <aside class="scrollable">
+    		<div class="input-area">
+				<label>Partenza</label>
+				<select>
+					<option value="Label partenza">Label partenza</option>
+				</select>
+			</div>
+
+            <hr \>
+            
+            <div class="input-area">
+                <img src="assets/icons/png/clessidra.png" />
+                <label>Ritardo</label>
+                <div class="rect">
+                    {{ritardo}} s
+                </div>
+            </div>
+            <slider :min="0" :max="10" v-model="ritardo" unit-of-measure="s"></slider>
+
+            <hr \>
+
+            <div class="input-area">
+                <label>Portata in manuale</label>
+                <div class="rect">
+                    {{percentuale}} %
+                </div>
+            </div>
+            <slider :min="0" :max="100" v-model="percentuale" unit-of-measure="%"></slider>
+        </aside>
+		<div class="specific">
+			<scheda></scheda>
+			<scheda></scheda>
+			<scheda></scheda>
+		</div>
+        <div class="specific">
+            <div class="input-area">
+				<label>Durata massima</label>
+				<div class="rect">
+                    {{durata}} s
+                </div>
+			</div>
+		    <slider :min="0" :max="4" v-model="durata" unit-of-measure="s"></slider>
+        </div>
+    </section>
+</template>
+
+<script lang="ts" src="./vuoto-principale.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts
similarity index 67%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts
index ec15d6c1..2c8b84e1 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts
@@ -3,26 +3,19 @@ import { Modal, ModalHelper } from "@/components/modals";
 import { Factory, messageService, awaiter } from "@/_base";
 import Component from "vue-class-component";
 import { Prop } from 'vue-property-decorator';
-import Slider from "@/app_modules_thermo/components/slider.vue"
-import Scheda from "@/app_modules_thermo/components/scheda.vue"
-
-
-@Component({ components: { modal: Modal , slider:Slider, scheda:Scheda} })
-export default class Vuoto extends Vue {
+import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"
+import VuotoPrincipale from "./base-components/vuoto-principale.vue"
 
+@Component({ components: { modal: Modal , vuotoprincipale: VuotoPrincipale, stepfooter: StepFooter} })
+export default class ShowVuotoInfo extends Vue {
     
-    @Prop({default:0})
-    ritardo:number;
-    
-    s:string="ON";
-    mockR:number=this.ritardo;
+    show:string="principale";
 
     annulla(){
       ModalHelper.HideModal();
     };
 
     conferma(){
-      this.ritardo=this.mockR;
       ModalHelper.HideModal();
     };
 
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.vue
new file mode 100644
index 00000000..9516dbfb
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.vue
@@ -0,0 +1,25 @@
+<template>
+<div class="setup">
+	<modal type="vuoto-info">
+		<div class="tab-header" slot="header-buttons">
+			<button :class="{'active':show == 'principale'}" @click="show='principale'">Vuoto pricipale</button>
+			<button :class="{'active':show == 'diretto'}" @click="show='diretto'">Vuoto diretto</button>
+			<button :class="{'active':show == 'ausiliario'}" @click="show='ausiliario'">Vuoto ausiliario</button>
+			<button :class="{'active':show == 'prevuoto'}" @click="show='prevuoto'">Prevuoto</button>
+		</div>
+		<div slot="header-buttons">
+			<button class="modal-close" @click="close()">
+				<i class="fa fa-remove"></i>
+			</button>
+		</div>
+		<vuotoprincipale v-if="show=='principale'"></vuotoprincipale>
+		<footer>
+			<button class="btn" @click="annulla()">Annulla</button>
+			<button class="btn btn-success" @click="conferma()">Conferma</button>
+		</footer>
+	</modal>
+	<stepfooter></stepfooter>
+</div>
+</template>
+
+<script lang="ts" src="./show-vuoto-info.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue
deleted file mode 100644
index ee136595..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-	<modal type="vuoto-info">
-		<button class="close" slot="header-buttons" @click="close()">
-			<i class="fa fa-remove"></i>
-		</button>
-
-		<div class="ritardo">
-			<img class="clessidra" src="assets/icons/png/clessidra.png" />
-			<label>Ritardo</label>
-			<div class="rectr">
-				<label>{{mockR}}s</label>
-			</div>
-
-			<div class="div">
-				<label>Ritardo</label>
-				<div class="rect Alt"></div>
-				<label>{{alt}}s</label>
-			</div>
-			<slider :min="0" :max="10" v-model="alt" :left="'0 s'" :middle="'5 s'" :right="'10 s'"></slider>
-		</div>
-		<div class="portata-in-manuale">
-			<label>Portata in manuale</label>
-			<div class="rect">
-				<label>{{mockT}}%</label>
-			</div>
-
-			<div class="div">
-				<label>Portata in manuale</label>
-				<div class="rect Alt">{{alt}} %</div>
-			</div>
-			<slider :min="0" :max="100" v-model="alt" :left="'0 %'" :middle="'50%'" :right="'100%'"></slider>
-			<scheda></scheda>
-			<scheda></scheda>
-			<scheda></scheda>
-
-			<div class="portata massima">
-				<label>Portata massima</label>
-				<div class="rect">{{alt}}%</div>
-			</div>
-			<slider :min="0" :max="10" v-model="alt" :left="'0 s'" :middle="'5 s'" :right="'10s'"></slider>
-		</div>
-		<footer>
-			<button class="btn" @click="annulla()">Annulla</button>
-			<button class="btn btn-success" @click="conferma()">Conferma</button>
-		</footer>
-	</modal>
-</template>
-
-<script lang="ts" src="./show-vuoto-info.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/vuoto-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/vuoto-info.vue
deleted file mode 100644
index afd08903..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/vuoto-info.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-    <div class="vuoto-info">
-        <button @click="sendMessage('show-vuoto-info')" :title="'header_tooltip_btn_vuotoinfo' | localize('Vuoto')">Vuoto</button>
-    </div>
-</template>
-
-<script lang="ts" src="./show-vuoto-info.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/vuoto.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/vuoto.ts
deleted file mode 100644
index efa16f5f..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/vuoto.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import Vue from "vue";
-import Component from "vue-class-component";
-import { messageService } from "@/_base/messageService";
-
-@Component({name:"vuoto-info"})
-export default class VuotoInfo extends Vue {
-
-public sendMessage(name:string) {
-    messageService.publishToChannel(name);
-  }
-
-}
\ No newline at end of file

From e8f1e717517600d410f331725b395b789e1ad216 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Wed, 15 Apr 2020 11:01:18 +0200
Subject: [PATCH 17/42] fix vuoto modal

---
 .../setup/vuoto/base-components/vuoto-principale.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
index 8885e72c..0d47f552 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
@@ -8,7 +8,7 @@
 				</select>
 			</div>
 
-            <hr \>
+            <hr />
             
             <div class="input-area">
                 <img src="assets/icons/png/clessidra.png" />
@@ -19,7 +19,7 @@
             </div>
             <slider :min="0" :max="10" v-model="ritardo" unit-of-measure="s"></slider>
 
-            <hr \>
+            <hr />
 
             <div class="input-area">
                 <label>Portata in manuale</label>

From 38c2a33826deb1ec7301d1b2881e50baeadb13c5 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Wed, 15 Apr 2020 14:01:02 +0200
Subject: [PATCH 18/42] fix vuoto modal

---
 .../wwwroot/assets/styles/base/layout.less    |   1 +
 .../wwwroot/assets/styles/base/vuoto.less     | 459 ++----------------
 Thermo.Active/wwwroot/assets/styles/style.css |  25 +
 .../app_modules_thermo/components/scheda.ts   |   5 +-
 .../app_modules_thermo/components/scheda.vue  |  28 +-
 5 files changed, 74 insertions(+), 444 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less
index 47b69d58..6461f644 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/layout.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less
@@ -12,6 +12,7 @@
 @import "controstamposetup.less";
 @import "quote-velocita.less";
 @import "estrazione.less";
+@import "vuoto.less";
 @import "popups.less";
 @import "grid-system.less";
 @import "input.less";
diff --git a/Thermo.Active/wwwroot/assets/styles/base/vuoto.less b/Thermo.Active/wwwroot/assets/styles/base/vuoto.less
index 557637bd..32cdfe08 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/vuoto.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/vuoto.less
@@ -1,436 +1,45 @@
  // out: false, sourceMap: false, main: ../style.less
- .@{modal}.Vuoto-info {
+  @import "grid-system.less";
+  @import "colors.less";
+  @import "fonts.less";
+  @modal: modal;
+
+.@{modal}.vuoto-info {
     width: 1820px;
     height: 980px;
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5);
-    background-color: @color-background-white;
-  }
-  label { //vuoto principale
-    width: 164px;
-    height: 24px;
-    font-family: WorkSans;
-    font-size: 20px;
-    font-weight: bold;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color: @corlor-darkish-blue;
-  }
-  
-  label { //vuoto diretto
-    width: 131px;
-    height: 24px;
-    font-family: WorkSans;
-    font-size: 20px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color:@color-darkish-blue;
-  }
+ 
+  section{
 
-  label { //vuoto ausiliario
-    width: 154px;
-    height: 24px;
-    font-family: WorkSans;
-    font-size: 20px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color:@color-darkish-blue;
-  }
-  
-  label { //Prevuoto
-    width: 89px;
-    height: 24px;
-    font-family: WorkSans;
-    font-size: 20px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color: @color-darkish-blue;
-  }
+    .specific{
+      padding-left: 5px;
 
-  .close-card {//bottone di chiusura
-    width: 28px;
-    height: 28px;
-    object-fit: contain;
-  }  
-  .Mask {
-    width: 521px;
-    height: 826px;
-  }
-  .card_bg {
-    width: 1820px;
-    height: 826px;
-    background-color: @color-background-white;
-  }  
-  label { //partenza
-    width: 104px;
-    height: 28px;
-    font-family: WorkSans;
-    font-size: 24px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color: @color-darkish-blue;
-  }
-  .textfield {//label partenza
-    width: 220px;
-    height: 48px;
-    object-fit: contain;
-  }
-  label {
-    width: 164px;
-    height: 21px;
-    font-family: WorkSans;
-    font-size: 18px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color: @color-greyish-brown;
-  }
-  .triangle {// triangolino
-    width: 21px;
-    height: 16px;
-    transform: rotate(-180deg);
-    border-radius: 1px;
-    background-color: @color-darkish-blue;
-  }
-  
-  .button-bg {
-    width: 48px;
-    height: 48px;
-    object-fit: contain;
-    border-radius: 8px;
-    box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5);
-    background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
-  }
-   
-  .completo { //portata in manuale
-    width: 471px;
-    height: 122px;
-    object-fit: contain;
-  } 
-  label { //label "portata in manuale"
-    width: 224px;
-    height: 28px;
-    font-family: WorkSans;
-    font-size: 24px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    text-align: center;
-    color: @color-darkish-blue;
-  } 
-  .Rectangle {
-    width: 72px;
-    height: 48px;
-    border-radius: 2px;
-    box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
-  }
-  .textfield {
-    width: 72px;
-    height: 48px;
-    object-fit: contain;
-  }
-  label {// 50%
-    width: 38px;
-    height: 21px;
-    object-fit: contain;
-    font-family: WorkSans;
-    font-size: 18px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color: @color-greyish-brown;
-  }  
-  .Portata {
-    width: 78px;
-    height: 29px;
-    font-family: Lato;
-    font-size: 24px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    text-align: center;
-    color: @color-darkish-blue;
-  }
-  .textfield {//quadratino in cui scritto 4
-    width: 51px;
-    height: 48px;
-    object-fit: contain;
-  } 
-  label { //4
-    width: 17px;
-    height: 21px;
-    object-fit: contain;
-    font-family: WorkSans;
-    font-size: 18px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color:@color-greyish-brown;
-  }
-  .Durata {
-    width: 73px;
-    height: 29px;
-    font-family: Lato;
-    font-size: 24px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    text-align: center;
-    color: @color-darkish-blue;
-  }
-  .bg {
-    width: 303px;
-    height: 6px;
-    object-fit: contain;
-    border-radius: 3px;
-    background-color:@color-clear-blue;
-  }
-  
+      .box {
+        margin-bottom: 5px;
+        background-color: #e5f3ff;
 
-  .Portata {
-    width: 78px;
-    height: 29px;
-    font-family: Lato;
-    font-size: 24px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    text-align: center;
-    color: @color-darkish-blue;
-  }
-  .textfield {
-    width: 66px;
-    height: 48px;
-    object-fit: contain;
-  }
+        &:first-of-type{
+          background-color: white;
+        }
+
+        &:last-of-type{
+          background-color: #b3dbff;
+        }
   
-  label {//6.5
-    width: 32px;
-    height: 21px;
-    object-fit: contain;
-    font-family: WorkSans;
-    font-size: 18px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color:@color-greyish-brown;
-  }
-  .Durata {
-    width: 73px;
-    height: 29px;
-    font-family: Lato;
-    font-size: 24px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    text-align: center;
-    color: @color-darkish-blue;
-  }
+        .body{
+          padding: 0px;
+        }
   
-  .textfield {
-    width: 88px;
-    height: 48px;
-    object-fit: contain;
-  }
-  label {//0.23
-    width: 54px;
-    height: 21px;
-    object-fit: contain;
-    font-family: WorkSans;
-    font-size: 18px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color: @color-greyish-brown;
-  }
-  .button-bg {
-    width: 48px;
-    height: 48px;
-    object-fit: contain;
-    border-radius: 8px;
-    box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5);
-    background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
+      }
+
+      .input-area{
+        width: 480px;
+        margin: 3px;
+        margin-bottom: 0px;
+      }
+
+    }
+
   }
  
-  .Portata {
-    width: 78px;
-    height: 29px;
-    font-family: Lato;
-    font-size: 24px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    text-align: center;
-    color: @color-darkish-blue;
-  }
-  .textfield {
-    width: 51px;
-    height: 48px;
-    object-fit: contain;
-  }
-  label {//8
-    width: 17px;
-    height: 21px;
-    object-fit: contain;
-    font-family: WorkSans;
-    font-size: 18px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color: @color-greyish-brown;
-  }
-  .Durata {
-    width: 73px;
-    height: 29px;
-    font-family: Lato;
-    font-size: 24px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    text-align: center;
-    color: @color-darkish-blue;
-  }
-  
-  .textfield {
-    width: 78px;
-    height: 48px;
-    object-fit: contain;
-  }
-  
-  label {//0.6
-    width: 44px;
-    height: 21px;
-    object-fit: contain;
-    font-family: WorkSans;
-    font-size: 18px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    color: @color-greyish-brown;
-  
-  }  
-  
-  .completo {
-    width: 471px;
-    height: 122px;
-    object-fit: contain;
-  }
-  label {
-    width: 192px;
-    height: 28px;
-    font-family: WorkSans;
-    font-size: 24px;
-    font-weight: 500;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: normal;
-    letter-spacing: normal;
-    text-align: center;
-    color: @color-darkish-blue;
-  }
-  .Rectangle {
-    width: 84px;
-    height: 48px;
-    border-radius: 2px;
-    box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
-  }
-    label { //label 1.63 nel quadratino
-      width: 50px;
-      height: 21px;
-      object-fit: contain;
-      font-family: WorkSans;
-      font-size: 18px;
-      font-weight: 500;
-      font-stretch: normal;
-      font-style: normal;
-      line-height: normal;
-      letter-spacing: normal;
-      color: @color-greyish-brown;
-    }  
-      .button-bg {
-      width: 104px;
-      height: 48px;
-      object-fit: contain;
-      border-radius: 8px;
-      box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5);
-      background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
-    }
-     label {//annulla
-       width: 67px;
-       height: 21px;
-       object-fit: contain;
-       font-family: WorkSans;
-       font-size: 18px;
-      font-weight: 500;
-      font-stretch: normal;
-      font-style: normal;
-      line-height: normal;
-      letter-spacing: normal;
-      text-align: center;
-      color: @color-darkish-blue;
-    }
-    .button-bg {
-      width: 124px;
-      height: 48px;
-      object-fit: contain;
-      border-radius: 8px;
-      box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
-      border: solid 1px #001e48;
-      linear-gradient(to bottom, #1756ad, @color-darkish-blue);
 }
-
-      label {
-      width: 87px;
-      height: 21px;
-      font-family: WorkSans;
-      font-size: 18px;
-      font-weight: 500;
-      font-stretch: normal;
-      font-style: normal;
-      line-height: normal;
-      letter-spacing: normal;
-      text-align: center;
-      color:@color-background-white;
-    } 
-  
+  
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 76c5c49e..c7b000c8 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4649,6 +4649,31 @@
   margin-top: 20px;
   display: flex;
 }
+.modal.vuoto-info {
+  width: 1820px;
+  height: 980px;
+}
+.modal.vuoto-info section .specific {
+  padding-left: 5px;
+}
+.modal.vuoto-info section .specific .box {
+  margin-bottom: 5px;
+  background-color: #e5f3ff;
+}
+.modal.vuoto-info section .specific .box:first-of-type {
+  background-color: white;
+}
+.modal.vuoto-info section .specific .box:last-of-type {
+  background-color: #b3dbff;
+}
+.modal.vuoto-info section .specific .box .body {
+  padding: 0px;
+}
+.modal.vuoto-info section .specific .input-area {
+  width: 480px;
+  margin: 3px;
+  margin-bottom: 0px;
+}
 .popup {
   width: 288px;
   height: 218px;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts
index 52916edc..4d529bf7 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts
@@ -10,8 +10,5 @@ export default class Scheda extends Vue{
     portata:number;
     @Prop({default:0})
     durata:number;
-
-    mockD=this.durata;
-    mockP=this.portata;
-
+    
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
index 2893e2e1..25368419 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
@@ -1,23 +1,21 @@
 <template>
-    <div class="schedaC">
-        <div class="datiP rid">
-            <div class="ritardo rid">
-                <label class="Ritardo">Portata</label>
-            </div>
-            <div class="rect rid">
-                <label class="mock">{{mockP}}</label>
+    <div class="box">
+        <div class="body">
+        <div class="input-area">
+            <label>Portata</label>
+            <div class="rect">
+                {{portata}}
             </div>
         </div>        
-        <slider class="rid" :min="0" :max="10" v-model="mockP" :left="'0'" :middle="'5'" :right="'10'"></slider>
-        <div class="datiP rid">
-            <div class="ritardo rid">
-                <label class="Ritardo">Durata</label>
-            </div>
-            <div class="rect rid">
-                <label class="mock">{{mockD}}s</label>
+        <slider :min="0" :max="10" v-model="portata"></slider>
+        <div class="input-area">    
+            <label class="Ritardo">Durata</label>
+            <div class="rect">
+                {{durata}} s
             </div>
         </div>
-        <slider class="rid" :min="0" :max="2" v-model="mockD" :left="'0s'" :middle="'1s'" :right="'2s'"></slider>
+        <slider :min="0" :max="10" v-model="durata"></slider>
+        </div>
     </div>
 </template>
 

From c36775e0d0f852398f9d56fa2ab118215b250a85 Mon Sep 17 00:00:00 2001
From: Damiano <mcdamiano93@virgilio.it>
Date: Wed, 15 Apr 2020 15:05:25 +0200
Subject: [PATCH 19/42] modal "raffreddamento"

---
 .../base-components/estrazione-principale.ts  |  6 +-
 .../components/show-estrazione-info.ts        | 28 +++++----
 .../components/show-estrazione-info.vue       | 20 +++----
 .../components/base-components/ventilatori.ts |  6 +-
 .../base-components/ventilatori.vue           | 45 ++++++--------
 .../components/show-raffreddamento-info.ts    | 33 +++--------
 .../components/show-raffreddamento-info.vue   | 53 +++++++----------
 .../formato/components/piastra_riduzione.vue  |  2 +-
 .../vuoto/show-vuoto-info.vue                 | 59 ++++++++++---------
 9 files changed, 117 insertions(+), 135 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.ts
index c5add411..4e649ba6 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.ts
@@ -4,7 +4,11 @@ import {Prop} from 'vue-property-decorator';
 import Scheda from "@/app_modules_thermo/components/scheda.vue";
 import Slider from "@/app_modules_thermo/components/slider.vue"
 
-@Component({name:"estrprincipale", components:{scheda:Scheda,slider:Slider}})
+@Component({name:"estrprincipale", 
+components:{
+scheda:Scheda,
+slider:Slider}})
+
 export default class EstrazionePrincipale extends Vue{
 
     @Prop({default:0})
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts
index 826500bf..4917a069 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts
@@ -6,21 +6,27 @@ import { Modal, ModalHelper } from "@/components/modals";
 import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue";
 import EstrazionePrincipale from "./base-components/estrazione-principale.vue";
 
-@Component({components: { modal: Modal,stepfooter:StepFooter,estrprincipale:EstrazionePrincipale}})
+@Component({components: 
+  { modal: Modal,
+    stepfooter:StepFooter,
+    estrprincipale:EstrazionePrincipale
+  }
+})
 export default class ShowEstrazioneInfo extends Vue{
 
-    activeEP:boolean=true;
-    activeES:boolean=false;
+  show:string="EST";
+    // activeEP:boolean=true;
+    // activeES:boolean=false;
     
-    ActiveEP(){
-      this.activeEP=true;
-      this.activeES=false;
-    };
+    // ActiveEP(){
+    //   this.activeEP=true;
+    //   this.activeES=false;
+    // };
 
-    ActiveES(){
-      this.activeEP=false;
-      this.activeES=true;
-    };
+    // ActiveES(){
+    //   this.activeEP=false;
+    //   this.activeES=true;
+    // };
 
     annulla(){
         ModalHelper.HideModal();
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue
index fe20e161..47baf8b2 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue
@@ -1,27 +1,25 @@
 <template>
 	<section>
-		<div class="speficic">
+		<div class="spefic">
 			<modal type="estrazione-info">
 				<div class="schede" slot="header-buttons">
-					<div class="selectorbtn">
-						<div class="selector EP" v-if="activeEP"></div>
-						<button class :class="{'active': show =='activeEP'}" @click="ActiveEP()"></button>
+					<div class="selector button">
+						<div class="selector EST" v-if="EST"></div>
+						<button class :class="{'active': show =='EST'}" @click="EST()"></button>
 						<label>Estrazione principale</label>
 					</div>
-					<div class="selectorbtn">
-						<div class="selector ES" v-if="activeES"></div>
-						<!--da chiedere-->
-						<button :class="{'active': show=='activeES'}" @click="ActiveES()"></button>
+					<div class="selector button">
+						<div class="selector EST" v-if="EST"></div>
+						<button :class="{'active': show=='EST'}" @click="EST"></button>
 						<label>Estrazione secondaria</label>
 					</div>
 				</div>
 				<div class="divheader HE" slot="header-buttons">
 					<button class="modal-close" @click="close()">
-						<!--da chiedere-->
 						<i class="fa fa-remove"></i>
 					</button>
 				</div>
-				<estrprincipale v-if="activeEP"></estrprincipale>
+				<estrprincipale v-if="EST"></estrprincipale>
 				<footer class="divFooter">
 					<button class="annulla confirm" @click="annulla()">
 						<label class="Annulla">Annulla</label>
@@ -31,7 +29,7 @@
 					</button>
 				</footer>
 			</modal>
-			<stepfooter class="Step"></stepfooter>
+			<stepfooter></stepfooter>
 		</div>
 	</section>
 </template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.ts
index 689d3846..d8281b6e 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.ts
@@ -3,7 +3,11 @@ import Component from 'vue-class-component';
 import {Prop} from 'vue-property-decorator';
 import Slider from "@/app_modules_thermo/components/slider.vue";
 
-@Component({name:"ventilatori", components: {slider:Slider}})
+@Component({name:"ventilatori", 
+components: {
+    slider:Slider
+}
+})
 export default class Ventilatori extends Vue{
 
     @Prop({default:0})
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.vue
index a092f9c8..32a7f37f 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.vue
@@ -1,34 +1,25 @@
 <template>
-    <section>
+<section>
     <div class ="specific">
-    <div>
-                <label>Abilitazione</label>
-                <select>
-                    <option value="Combinazioni">Combinazioni</option>
-                </select> 
+        <div class="input-area">
+            <label>Abilitazione</label>
+            <select>
+                <option value="Combinazioni">Combinazioni</option>
+                </select>
         </div>
-        <div class="datiP">
-            <div class="ritardo">
-            <img="clessidra" src="assets/icons/png/clessidra.png">
-            <label>Ritardo</label>
-            </div>
-
-            <div class ="rect">
-            <span class ="rect">{{mockR}}s</span>
-            </div>
+        <div class="input-area">
+            <img src="assets/icons/png/clessidra.png">
+            <label>Ritardo</label>    
+            <div class ="rect">{{mockR}}s</div>
         </div>
-        <slider :min="0" :max="10" v-model="mockR" :left="'0s'" :middle="'5s'" :right="'10s'"></slider>
-         <div class="datiP">
-            <div class="ritardo">
-            <label>="Ritardo">Durata</label>
-            </div>
-            <div class ="rect">
-            <span class ="rect">{{mockD}}s</span>
-            </div>
-        </div>
-        <slider :min="0" :max="20" v-model="mockD" :left="'0s'" :middle="'10s'" :right="'20s'"></slider>
-    </div>    
-    </section>
+        <slider :min="0" :max="10" v-model="mockR" unit-of-measure="s"></slider>
+         <div class="input-area">
+            <label>Durata</label>
+            <div class ="rect">{{mockD}}s</div>
+             </div> 
+          <slider :min="0" :max="20" v-model="mockD"  unit-of-measure="s"></slider> 
+    </div>
+</section>
 </template>
 
 <script lang="ts" src="./ventilatori.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.ts
index c8f97142..9d3608cc 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.ts
@@ -6,32 +6,17 @@ import { Modal, ModalHelper } from "@/components/modals";
 import { Factory, messageService, awaiter } from "@/_base";
 import Ventilatori from "./base-components/ventilatori.vue" 
 
-@Component({ components: { modal: Modal,ventilatori:Ventilatori, stepfooter:StepFooter} })
+@Component({ 
+  components: { 
+  modal: Modal,
+  ventilatori:Ventilatori, 
+  stepfooter:StepFooter
+} 
+})
+
 export default class Raffreddamento extends Vue{
 
-  activeV:boolean=true;
-  activeN:boolean=false;
-  activeP:boolean=false;
-
-  
-  ActiveV(){
-    this.activeV=true;
-    this.activeN=false;
-    this.activeP=false;
-  };
-
-  ActiveN(){
-    this.activeV=false;
-    this.activeN=true;
-    this.activeP=false;
-  };
-
-  ActiveP(){
-    this.activeV=false;
-    this.activeN=false;
-    this.activeP=true;
-  };
-    
+    show: string = "ventilatori";   
     annulla(){
         ModalHelper.HideModal();
       };
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue
index 5ad42582..e19c0a5b 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue
@@ -1,37 +1,26 @@
 <template>
-	<section>
-		<div class="specific">
-			<modal type="raffreddamento-info">
-				<div class="schede" slot="header-buttons">
-					<div slot="selector button">
-						<div slot="selector V" v-if="show==activeV"></div>
-						<button :class="{'active': show == 'activeV'}" @click="show='ActiveV'">Ventilatori</button>
-					</div>
-					<div header="selector button">
-						<selettore v-if="show== 'selettore'"></selettore>
-						<button :class="{'active': show=='activeP'}" @click="ActiveP()"></button>
-						<label>Pirometro</label>
-					</div>
-					<div slot="selector button">
-						<selettoreN v-if="show==selettoreN"></selettoreN>
-						<button :class="{'active': show=='activeN'}" @click="ActiveN()"></button>
-						<label>Nebulizzatori</label>
-					</div>
-				</div>
-				<div slot="header-buttons">
-					<button class="modal-close" @click="close()">
-						<i class="fa fa-remove"></i>
-					</button>
-				</div>
-				<ventilatori v-if="show==activeV"></ventilatori>
+	<div class="setup">
+		<modal type="raffreddamento-info">
+				<div class="tab-header" slot="header-buttons">
+				<button :class="{'active':show == 'ventilatori'}" @click="show='ventilatori'">Ventilatori</button>
+				<button :class="{'active':show == 'pirometro'}" @click="show='pirometro'">Pirometro</button>
+				<button :class="{'active':show == 'nebulizzatori'}" @click="show='nebulizzatori'">Nebulizzatori</button>
+			</div>
+			<div slot="header-buttons">
+				<button class="modal-close" @click="close()">
+					<i class="fa fa-remove"></i>
+				</button>
+			</div>	
+				<ventilatori v-if="show=='ventilatori'"></ventilatori>
 				<footer>
-					<button class="btn" @click="annulla()">Annulla</button>
-					<button class="btn btn-success" @click="conferma()">Conferma</button>
+					<button class="btn" @click="annulla()">
+						Annulla</button>
+					<button class="btn btn-success" @click="conferma()">
+						Conferma</button>	
 				</footer>
-			</modal>
-			<stepfooter class="Step"></stepfooter>
-		</div>
-	</section>
+		</modal>
+		<stepfooter></stepfooter>
+	</div>		
 </template>
 
-<script lang="ts" src="./show-raffreddamento-info.ts"></script>
\ No newline at end of file
+<script lang="ts" src="./show-raffreddamento-info.ts"></script>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue
index 513f5f0a..9f407977 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="box">
 		<div class="header">
-			<label>Piastra di riduzione</label>
+		<label>Piastra di riduzione</label>
 		</div>
 		<div class="body">
 			<div class="input-area">
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue
index ee136595..b7b6caa1 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue
@@ -1,17 +1,20 @@
-<template>
-	<modal type="vuoto-info">
-		<button class="close" slot="header-buttons" @click="close()">
-			<i class="fa fa-remove"></i>
-		</button>
-
-		<div class="ritardo">
-			<img class="clessidra" src="assets/icons/png/clessidra.png" />
-			<label>Ritardo</label>
-			<div class="rectr">
+<!--<template>
+	<div class ="vuoto">
+		<modal type="vuoto-info">
+			<div slot="header-buttons ">
+				<button class="modal-close" @click="close()">
+					<i class="fa fa-remove"></i>
+				</button>
+			</div>	
+		<section>
+			<div class="specific">
+				<img class="clessidra" src="assets/icons/png/clessidra.png" />
+				<label>Ritardo</label>
+				<div class="rectr">
 				<label>{{mockR}}s</label>
-			</div>
+				</div>
 
-			<div class="div">
+			
 				<label>Ritardo</label>
 				<div class="rect Alt"></div>
 				<label>{{alt}}s</label>
@@ -20,30 +23,32 @@
 		</div>
 		<div class="portata-in-manuale">
 			<label>Portata in manuale</label>
-			<div class="rect">
-				<label>{{mockT}}%</label>
-			</div>
-
-			<div class="div">
-				<label>Portata in manuale</label>
-				<div class="rect Alt">{{alt}} %</div>
-			</div>
+			
+			<label>{{mockT}}%</label>
+			
+			
+			<label>Portata in manuale</label>
+			<div class="rect Alt">{{alt}} %</div>
+			 </div> 
 			<slider :min="0" :max="100" v-model="alt" :left="'0 %'" :middle="'50%'" :right="'100%'"></slider>
 			<scheda></scheda>
 			<scheda></scheda>
 			<scheda></scheda>
 
 			<div class="portata massima">
-				<label>Portata massima</label>
-				<div class="rect">{{alt}}%</div>
+			<label>Portata massima</label>
+			<div class="rect">{{alt}}%</div>
 			</div>
 			<slider :min="0" :max="10" v-model="alt" :left="'0 s'" :middle="'5 s'" :right="'10s'"></slider>
 		</div>
 		<footer>
-			<button class="btn" @click="annulla()">Annulla</button>
-			<button class="btn btn-success" @click="conferma()">Conferma</button>
+			<button class="btn" @click="annulla()">
+				Annulla</button>
+			<button class="btn btn-success" @click="conferma()">
+				Conferma</button>
 		</footer>
-	</modal>
-</template>
+</modal>
+</div>	
+ </template>
 
-<script lang="ts" src="./show-vuoto-info.ts"></script>
\ No newline at end of file
+<script lang="ts" src="./show-vuoto-info.ts"></script> 
\ No newline at end of file

From 0f1ff3262a4683303d161a69135e71505b376f52 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Wed, 15 Apr 2020 16:02:37 +0200
Subject: [PATCH 20/42] fix raffreddamento modal

---
 .../assets/styles/base/raffreddamento.less    | 46 ++++------------
 Thermo.Active/wwwroot/assets/styles/style.css | 38 ++-----------
 .../wwwroot/src/app.business-logic.ts         |  2 +-
 .../components/base-components/ventilatori.ts |  0
 .../base-components/ventilatori.vue           |  0
 .../components/show-raffreddamento-info.ts    |  0
 .../components/show-raffreddamento-info.vue   |  0
 .../{ => setup}/raffreddamento/index.ts       |  0
 .../vuoto/show-vuoto-info.vue                 | 54 -------------------
 9 files changed, 13 insertions(+), 127 deletions(-)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/raffreddamento/components/base-components/ventilatori.ts (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/raffreddamento/components/base-components/ventilatori.vue (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/raffreddamento/components/show-raffreddamento-info.ts (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/raffreddamento/components/show-raffreddamento-info.vue (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/raffreddamento/index.ts (100%)
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue

diff --git a/Thermo.Active/wwwroot/assets/styles/base/raffreddamento.less b/Thermo.Active/wwwroot/assets/styles/base/raffreddamento.less
index 057187d2..6488575a 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/raffreddamento.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/raffreddamento.less
@@ -8,42 +8,14 @@
     margin-top: 200px;
     width: 626px;
     height: 569px;
-      header {
-        background-color: @color-white;
-        color: @color-darkish-blue;
-        
-        font-weight: 600;
-        font-size: 24px;
-        text-align: left;
-        padding: 0px 23px;
-      }
-      .Piro{
-        width: 174px;
-        height: 65px;
-      }
-      .P{
-        width: 174px;
-      }
-      .Vslider{
-          margin-left: 70px;
-      }
+
+  section{
+
+    .specific{
+      margin-left: 50px;
+      width: 480px;
     }
 
-    .N{
-        width: 206px;
-    }
-    .Neb{
-        width: 206px;
-        height: 65px;
-    }
-    .V{
-        width: 183px;      
-    }
-    .Ventilatori{
-        width: 183px;
-        height: 65px;
-    }
-    .divVent{
-        display: flex;
-        flex-direction: column;
-    }
\ No newline at end of file
+  }
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index c7b000c8..b3fbb65f 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4397,41 +4397,9 @@
   width: 626px;
   height: 569px;
 }
-.modal.raffreddamento-info header {
-  background-color: #fff;
-  color: #002680;
-  font-weight: 600;
-  font-size: 24px;
-  text-align: left;
-  padding: 0px 23px;
-}
-.modal.raffreddamento-info .Piro {
-  width: 174px;
-  height: 65px;
-}
-.modal.raffreddamento-info .P {
-  width: 174px;
-}
-.modal.raffreddamento-info .Vslider {
-  margin-left: 70px;
-}
-.N {
-  width: 206px;
-}
-.Neb {
-  width: 206px;
-  height: 65px;
-}
-.V {
-  width: 183px;
-}
-.Ventilatori {
-  width: 183px;
-  height: 65px;
-}
-.divVent {
-  display: flex;
-  flex-direction: column;
+.modal.raffreddamento-info section .specific {
+  margin-left: 50px;
+  width: 480px;
 }
 .modal.controstamposetup-info {
   width: 1820px;
diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index 635adaa6..66e25125 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -9,7 +9,7 @@ import ShowPirometroInfo from "@/app_modules_thermo/setup/pirometro/components/s
 import ShowFormatoInfo from "@/app_modules_thermo/setup/formato/components/show-formato-info.vue";
 import ShowRiscaldamentoInfo from "@/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue";
 import ShowCicloInfo from "@/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue";
-import ShowRaffreddamentoInfo from "@/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue";
+import ShowRaffreddamentoInfo from "@/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue";
 import ShowControstampoInfo from "@/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue";
 import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue";
 import ShowEstrazioneInfo from "@/app_modules_thermo/estrazione/components/show-estrazione-info.vue";
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.vue
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/index.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/index.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/index.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/index.ts
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue
deleted file mode 100644
index b7b6caa1..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/vuoto/show-vuoto-info.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--<template>
-	<div class ="vuoto">
-		<modal type="vuoto-info">
-			<div slot="header-buttons ">
-				<button class="modal-close" @click="close()">
-					<i class="fa fa-remove"></i>
-				</button>
-			</div>	
-		<section>
-			<div class="specific">
-				<img class="clessidra" src="assets/icons/png/clessidra.png" />
-				<label>Ritardo</label>
-				<div class="rectr">
-				<label>{{mockR}}s</label>
-				</div>
-
-			
-				<label>Ritardo</label>
-				<div class="rect Alt"></div>
-				<label>{{alt}}s</label>
-			</div>
-			<slider :min="0" :max="10" v-model="alt" :left="'0 s'" :middle="'5 s'" :right="'10 s'"></slider>
-		</div>
-		<div class="portata-in-manuale">
-			<label>Portata in manuale</label>
-			
-			<label>{{mockT}}%</label>
-			
-			
-			<label>Portata in manuale</label>
-			<div class="rect Alt">{{alt}} %</div>
-			 </div> 
-			<slider :min="0" :max="100" v-model="alt" :left="'0 %'" :middle="'50%'" :right="'100%'"></slider>
-			<scheda></scheda>
-			<scheda></scheda>
-			<scheda></scheda>
-
-			<div class="portata massima">
-			<label>Portata massima</label>
-			<div class="rect">{{alt}}%</div>
-			</div>
-			<slider :min="0" :max="10" v-model="alt" :left="'0 s'" :middle="'5 s'" :right="'10s'"></slider>
-		</div>
-		<footer>
-			<button class="btn" @click="annulla()">
-				Annulla</button>
-			<button class="btn btn-success" @click="conferma()">
-				Conferma</button>
-		</footer>
-</modal>
-</div>	
- </template>
-
-<script lang="ts" src="./show-vuoto-info.ts"></script> 
\ No newline at end of file

From f2901ab6ecec3c38cdbf32bef357ee17187b6bd7 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Thu, 16 Apr 2020 09:37:28 +0200
Subject: [PATCH 21/42] merge and fix controstampo modal

---
 .../assets/styles/base/controstamposetup.less | 89 +++++++------------
 .../wwwroot/assets/styles/base/layout.less    |  1 +
 .../wwwroot/assets/styles/base/scheda.less    | 19 ++++
 .../wwwroot/assets/styles/base/vuoto.less     |  6 --
 Thermo.Active/wwwroot/assets/styles/style.css | 73 +++++----------
 .../app_modules_thermo/components/scheda.vue  |  2 +-
 .../base-components/aria-controstampo.vue     | 24 ++---
 .../base-components/ciclo-controstampo.vue    | 12 +--
 .../components/show-controstampo-info.vue     | 18 ----
 9 files changed, 88 insertions(+), 156 deletions(-)
 create mode 100644 Thermo.Active/wwwroot/assets/styles/base/scheda.less

diff --git a/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less b/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less
index 0f62d260..d06c14d1 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less
@@ -7,67 +7,40 @@
 .@{modal}.controstamposetup-info {
     width: 1820px;
     height: 980px;
-    header {
-      background-color: @color-white;
-      color: @color-darkish-blue;
-      
-      font-weight: 600;
-      font-size: 24px;
-      text-align: left;
-      padding: 0px 23px;
-    }
-    .slider-graph{
-      align-self: center;
-      width: 471px;
+
+    section{
+
+      .controstampo-cycle{
+        margin-left: 37%;
+      }
+
+      .specific{
+        padding-left: 5px;
+  
+        .box {
+          margin-bottom: 5px;
+          background-color: #e5f3ff;
+  
+          &:first-of-type{
+            background-color: white;
+          }
+  
+          &:last-of-type{
+            background-color: #b3dbff;
+          }
+    
+        }
+  
+        .input-area{
+          width: 480px;
+        }
+
+      }
+  
     }
+
 }
 
-.container-ciclo-controstampo {
-  display: flex;
-  justify-content: center;
-}
 
-.box-ciclo-controstampo {
-  display: flex;
-  flex-direction: column;
-  width: 471px;
-  margin-top: 45px;
-}
 
-.modal-controstampo{
-  padding:0;
-  height:100%;
-}
 
-.box-slider{
-  margin: 10px 0 0 10px;
-  padding: 15px;
-  width: 490px;
-  height: 260px;
-  border: solid #848484;
-  display: flex;
-  flex-direction: column;
-}
-
-.box-input-1{
-  background-color: #FFFFFF;
-}
-
-.box-input-2{
-  background-color: #E5F3FF;
-}
-
-.box-input-3{
-  background-color: #B2DBFF;
-}
-
-.controstampo-graph{
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-end;
-  width: 36%;
-}
-
-.input-controstampo{
-  height:10px;
-}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less
index 6461f644..c62678a4 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/layout.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less
@@ -12,6 +12,7 @@
 @import "controstamposetup.less";
 @import "quote-velocita.less";
 @import "estrazione.less";
+@import "scheda.less";
 @import "vuoto.less";
 @import "popups.less";
 @import "grid-system.less";
diff --git a/Thermo.Active/wwwroot/assets/styles/base/scheda.less b/Thermo.Active/wwwroot/assets/styles/base/scheda.less
new file mode 100644
index 00000000..3b079e64
--- /dev/null
+++ b/Thermo.Active/wwwroot/assets/styles/base/scheda.less
@@ -0,0 +1,19 @@
+// out: false, sourceMap: false, main: ../style.less
+@import "grid-system.less";
+@import "colors.less";
+@import "fonts.less";
+
+.scheda{
+
+    .body{
+        padding: 0px;
+
+        .input-area{
+            width: 480px;
+            margin: 3px;
+            margin-bottom: 0px;     
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/base/vuoto.less b/Thermo.Active/wwwroot/assets/styles/base/vuoto.less
index 32cdfe08..3d45fef1 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/vuoto.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/vuoto.less
@@ -25,16 +25,10 @@
           background-color: #b3dbff;
         }
   
-        .body{
-          padding: 0px;
-        }
-  
       }
 
       .input-area{
         width: 480px;
-        margin: 3px;
-        margin-bottom: 0px;
       }
 
     }
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index f070d18c..0ceeeaca 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4405,58 +4405,24 @@
   width: 1820px;
   height: 980px;
 }
-.modal.controstamposetup-info header {
-  background-color: #fff;
-  color: #002680;
-  font-weight: 600;
-  font-size: 24px;
-  text-align: left;
-  padding: 0px 23px;
+.modal.controstamposetup-info section .controstampo-cycle {
+  margin-left: 37%;
 }
-.modal.controstamposetup-info .slider-graph {
-  align-self: center;
-  width: 471px;
+.modal.controstamposetup-info section .specific {
+  padding-left: 5px;
 }
-.container-ciclo-controstampo {
-  display: flex;
-  justify-content: center;
+.modal.controstamposetup-info section .specific .box {
+  margin-bottom: 5px;
+  background-color: #e5f3ff;
 }
-.box-ciclo-controstampo {
-  display: flex;
-  flex-direction: column;
-  width: 471px;
-  margin-top: 45px;
+.modal.controstamposetup-info section .specific .box:first-of-type {
+  background-color: white;
 }
-.modal-controstampo {
-  padding: 0;
-  height: 100%;
+.modal.controstamposetup-info section .specific .box:last-of-type {
+  background-color: #b3dbff;
 }
-.box-slider {
-  margin: 10px 0 0 10px;
-  padding: 15px;
-  width: 490px;
-  height: 260px;
-  border: solid #848484;
-  display: flex;
-  flex-direction: column;
-}
-.box-input-1 {
-  background-color: #FFFFFF;
-}
-.box-input-2 {
-  background-color: #E5F3FF;
-}
-.box-input-3 {
-  background-color: #B2DBFF;
-}
-.controstampo-graph {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-end;
-  width: 36%;
-}
-.input-controstampo {
-  height: 10px;
+.modal.controstamposetup-info section .specific .input-area {
+  width: 480px;
 }
 .modal.quote-velocita-info {
   width: 1820px;
@@ -4589,6 +4555,14 @@
   margin-top: 20px;
   display: flex;
 }
+.scheda .body {
+  padding: 0px;
+}
+.scheda .body .input-area {
+  width: 480px;
+  margin: 3px;
+  margin-bottom: 0px;
+}
 .modal.vuoto-info {
   width: 1820px;
   height: 980px;
@@ -4606,13 +4580,8 @@
 .modal.vuoto-info section .specific .box:last-of-type {
   background-color: #b3dbff;
 }
-.modal.vuoto-info section .specific .box .body {
-  padding: 0px;
-}
 .modal.vuoto-info section .specific .input-area {
   width: 480px;
-  margin: 3px;
-  margin-bottom: 0px;
 }
 .popup {
   width: 288px;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
index 25368419..6efd40f7 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="box">
+    <div class="box scheda">
         <div class="body">
         <div class="input-area">
             <label>Portata</label>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue
index dfbcb030..38df8420 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue
@@ -1,5 +1,4 @@
 <template>
-    <div class="setup modal-controstampo">
     <section>
         <aside class="scrollable">
             <div class="input-area">
@@ -9,24 +8,19 @@
             </div>
             <slider :min="0" :max="10" v-model="mockR" :unit-of-measure="s"></slider>
         </aside>
-        <!-- <div class="sep"></div> -->
         <div class="specific">
-            <scheda class="box-input-1"></scheda>
-            <scheda class="box-input-2"></scheda>
-            <scheda class="box-input-3"></scheda>
+            <scheda></scheda>
+            <scheda></scheda>
+            <scheda></scheda>
         </div>
-            <div class="controstampo-graph">
-                <div class="slider-graph">
-                    <div class="input-area">
-                        <label>Durata massima</label>
-                        <div class="rect">{{mockD}}s</div>
-                    </div>
-                    <slider :min="0" :max="4" v-model="mockD" :unit-of-measure="s"></slider>
-                </div>
+        <div class="specific">
+            <div class="input-area">
+                <label>Durata massima</label>
+                <div class="rect">{{mockD}}s</div>
             </div>
+            <slider :min="0" :max="4" v-model="mockD" :unit-of-measure="s"></slider>
+        </div>
     </section>
-
-    </div>
 </template>
 
 <script lang="ts" src="./aria-controstampo.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue
index 6adb94af..addae4db 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue
@@ -1,14 +1,14 @@
 <template>
-    <div class="container-ciclo-controstampo">
-            <div class="box-ciclo-controstampo">
+    <section>
+        <div class="specific controstampo-cycle">
                 <div class="input-area">
-                            <label>Abilitazione</label>
-                            <toggle-button v-model="abilit"></toggle-button>
+                    <label>Abilitazione</label>
+                    <toggle-button v-model="abilit"></toggle-button>
                 </div>
                 <div class="input-area">
                     <label>Partenza</label>
                     <select>
-                        <option class="opzione" value="Label partenza">Label partenza</option>
+                        <option value="Label partenza">Label partenza</option>
                     </select>
                 </div>
                 <div class="input-area">
@@ -27,7 +27,7 @@
                 </div>
                 <slider :min="0" :max="20" v-model="mockD" unit-of-measure="s"></slider>
             </div>
-        </div>
+    </section>
 </template>
 
 <script lang="ts" src="./ciclo-controstampo.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue
index d0e1bd62..7ddfcc3c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue
@@ -1,24 +1,6 @@
 <template>
     <div class="setup">
     <modal type="controstamposetup-info">
-        <!-- <div class="schede" slot="header-buttons">
-            <div class="selectorbtn">
-                <div class="selector CC" v-if="activeCC"></div>
-                <button class="CicloC scheda" :class="{'active':activeCC}" @click="ActiveCC()"><label class="lab">Ciclo controstampo</label></button>
-            </div>
-            <div class="selectorbtn">
-                <div class="selector AC" v-if="activeAC"></div>
-                <button class="AriaC scheda" :class="{'active':activeAC}" @click="ActiveAC()"><label class="lab">Aria controstampo</label></button>
-            </div>
-            <div class="selectorbtn">
-                <div class="selector VC" v-if="activeVC"></div>
-                <button class="VuotoC scheda" :class="{'active':activeVC}" @click="ActiveVC()"><label class="lab">Vuoto controstampo</label></button>
-            </div>
-            <div class="selectorbtn">
-                <div class="selector EC" v-if="activeEC"></div>
-                <button class="EstrC scheda" :class="{'active':activeEC}" @click="ActiveEC()"><label class="lab">Estrazione controstampo</label></button>
-            </div>
-        </div> -->
 		<div class="tab-header" slot="header-buttons">
 			<button :class="{'active':show == 'CC'}" @click="show='CC'">Ciclo controstampo</button>
 			<button :class="{'active':show == 'AC'}" @click="show='AC'">Aria controstampo</button>

From dc962c3a53ec79ae7f70ba31a485028dfba279de Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Thu, 16 Apr 2020 09:40:05 +0200
Subject: [PATCH 22/42] fix the position for the folder of controstampo modal

---
 Thermo.Active/wwwroot/src/app.business-logic.ts                 | 2 +-
 .../components/base-components/aria-controstampo.ts             | 0
 .../components/base-components/aria-controstampo.vue            | 0
 .../components/base-components/ciclo-controstampo.ts            | 0
 .../components/base-components/ciclo-controstampo.vue           | 0
 .../controstampo_setup/components/show-controstampo-info.ts     | 0
 .../controstampo_setup/components/show-controstampo-info.vue    | 0
 .../app_modules_thermo/{ => setup}/controstampo_setup/index.ts  | 0
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/controstampo_setup/components/base-components/aria-controstampo.ts (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/controstampo_setup/components/base-components/aria-controstampo.vue (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/controstampo_setup/components/base-components/ciclo-controstampo.ts (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/controstampo_setup/components/base-components/ciclo-controstampo.vue (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/controstampo_setup/components/show-controstampo-info.ts (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/controstampo_setup/components/show-controstampo-info.vue (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/controstampo_setup/index.ts (100%)

diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index 66e25125..47225447 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -10,7 +10,7 @@ import ShowFormatoInfo from "@/app_modules_thermo/setup/formato/components/show-
 import ShowRiscaldamentoInfo from "@/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue";
 import ShowCicloInfo from "@/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue";
 import ShowRaffreddamentoInfo from "@/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue";
-import ShowControstampoInfo from "@/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue";
+import ShowControstampoInfo from "@/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue";
 import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue";
 import ShowEstrazioneInfo from "@/app_modules_thermo/estrazione/components/show-estrazione-info.vue";
 import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue";
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.vue
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.vue
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/index.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/index.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/index.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/index.ts

From 950220eabbb229beabf3ae2ab6b76a1639e475e1 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Thu, 16 Apr 2020 09:56:36 +0200
Subject: [PATCH 23/42] merge and fix imbutitura modal

---
 .../assets/styles/base/imbutitura.less        | 48 ++++++-------------
 Thermo.Active/wwwroot/assets/styles/style.css | 35 +++-----------
 .../wwwroot/src/app.business-logic.ts         |  2 +-
 .../imbutitura/show-imbutitura-info.ts        |  4 +-
 .../imbutitura/show-imbutitura-info.vue       | 35 +++++---------
 5 files changed, 35 insertions(+), 89 deletions(-)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/imbutitura/show-imbutitura-info.ts (92%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/imbutitura/show-imbutitura-info.vue (58%)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/imbutitura.less b/Thermo.Active/wwwroot/assets/styles/base/imbutitura.less
index 6c13309f..1c502af0 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/imbutitura.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/imbutitura.less
@@ -3,45 +3,25 @@
 @import "colors.less";
 @import "fonts.less";
 
-.@{modal}.drawing-info {
+.@{modal}.imbutitura-info {
     width: 1820px;
     height: 980px;
-    header {
-      background-color: @color-white;
-      color: @color-darkish-blue;
-      font-family: Lato;
-      font-weight: 600;
-      font-size: 24px;
-      text-align: left;
-      padding: 0px 23px;
-    }
-    .icon-dues{
-        margin: 5px;
-        width: 20px;
-        height: 20px;
-        object-fit: contain;
-    }
 
-    .box-select-drawing{
-        margin: 10px 0;
-    }
+    section{
 
-    .graph-drawing{
-        align-self: flex-end;
+      .specific{
+        padding-left: 5px;
+        justify-content: flex-end;
+  
+        .box {
+          margin-bottom: 5px;
+          background-color: #e5f3ff;
+        }
+     
+      }
+    
     }
-
-    .container-graph{
-        margin-left: 16px;
-    }
-
-    .box-graph{
-        border: solid 4px #848484;
-        width: 490px;
-        height: 280px;
-        background-color: #e5f3ff;
-        padding: 20px;
-    }
-
+   
   }
 
 
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index f102b799..7250e15d 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4510,40 +4510,17 @@
   border: solid 1px #001e48;
   background-image: linear-gradient(to bottom, #1756ad, #002680);
 }
-.modal.drawing-info {
+.modal.imbutitura-info {
   width: 1820px;
   height: 980px;
 }
-.modal.drawing-info header {
-  background-color: #fff;
-  color: #002680;
-  font-family: Lato;
-  font-weight: 600;
-  font-size: 24px;
-  text-align: left;
-  padding: 0px 23px;
+.modal.imbutitura-info section .specific {
+  padding-left: 5px;
+  justify-content: flex-end;
 }
-.modal.drawing-info .icon-dues {
-  margin: 5px;
-  width: 20px;
-  height: 20px;
-  object-fit: contain;
-}
-.modal.drawing-info .box-select-drawing {
-  margin: 10px 0;
-}
-.modal.drawing-info .graph-drawing {
-  align-self: flex-end;
-}
-.modal.drawing-info .container-graph {
-  margin-left: 16px;
-}
-.modal.drawing-info .box-graph {
-  border: solid 4px #848484;
-  width: 490px;
-  height: 280px;
+.modal.imbutitura-info section .specific .box {
+  margin-bottom: 5px;
   background-color: #e5f3ff;
-  padding: 20px;
 }
 .modal.estrazione-info {
   margin-top: 100px;
diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index f74e13cd..e5d85c60 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -14,7 +14,7 @@ import ShowControstampoInfo from "@/app_modules_thermo/setup/controstampo_setup/
 import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue";
 import ShowEstrazioneInfo from "@/app_modules_thermo/estrazione/components/show-estrazione-info.vue";
 import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue";
-import ShowImbutituraInfo from "@/app_modules_thermo/imbutitura/show-imbutitura-info.vue";
+import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue";
 // import { DataService } from "./services/dataService";
 // import { ToolingService } from "./services/toolingService";
 // import { DepotService } from "./services/depotService";
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts
similarity index 92%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts
index 8e706ed0..279f8007 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts
@@ -5,12 +5,14 @@ import Component from "vue-class-component";
 import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"
 import { Prop } from "vue-property-decorator";
 import Slider from "@/app_modules_thermo/components/slider.vue";
+import Scheda from "@/app_modules_thermo/components/scheda.vue";
 
 @Component({ 
   components: { 
   modal: Modal, 
   slider: Slider,
-  stepfooter:StepFooter
+  stepfooter:StepFooter,
+  scheda:Scheda
   } 
 })
 export default class ShowImbutituraInfo extends Vue {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue
similarity index 58%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.vue
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue
index abc38ab4..4826ee44 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/imbutitura/show-imbutitura-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="setup">
-    <modal type="drawing-info" :title="'drawinginfo_lbl_title' | localize('Imbutitura')">
+    <modal type="imbutitura-info" :title="'drawinginfo_lbl_title' | localize('Imbutitura')">
 			<div slot="header-buttons">
 				<button class="modal-close" @click="close()">
 					<i class="fa fa-remove"></i>
@@ -9,24 +9,24 @@
         <section>
             <aside class="scrollable">
                     <div class="input-area">
-                        <img class="icon-dues" src="assets/icons/png/clessidra.png">
+                        <img src="assets/icons/png/clessidra.png">
                         <label>Ritardo</label>
                         <div class="rect">{{ritardo}} mm</div>
                     </div>
                     <slider :min="0" :max="10" v-model="ritardo"></slider>
-                    <hr>
-                    <div class="input-area box-select-drawing">
+                    <hr />
+                    <div class="input-area">
                     <label>Tipo</label>
                         <select>
-                            <option class="opzione" value="A tempo">A tempo</option>
-                            <option class="opzione" value="Mantenuta">Mantenuta</option>
-                            <option class="opzione" value="Negativa">Negativa</option>
+                            <option value="A tempo">A tempo</option>
+                            <option value="Mantenuta">Mantenuta</option>
+                            <option value="Negativa">Negativa</option>
                         </select>
                     </div>
-                    <div class="input-area box-select-drawing">
+                    <div class="input-area">
                     <label>Fotocellula</label>
                         <select>
-                            <option class="opzione" value="Label opzioni">Label opzioni</option>
+                            <option value="Label opzioni">Label opzioni</option>
                         </select>
                     </div>
                     <div class="input-area">
@@ -45,21 +45,8 @@
                     </div>
                     <slider :min="0" :max="100" v-model="portManuale"></slider>
             </aside>
-            <div class="specific graph-drawing">
-                <div class="container-graph">
-                    <div class="box-graph">
-                        <div class="input-area">
-                            <label>Portata</label>
-                            <div class="rect">{{portata}}</div>
-                        </div>
-                        <slider :min="0" :max="10" v-model="portata"></slider>
-                        <div class="input-area">
-                            <label>Durata</label>
-                            <div class="rect">{{durata}} s</div>
-                        </div>
-                        <slider :min="0" :max="2" v-model="durata"></slider>
-                    </div>
-                </div>
+            <div class="specific">
+                <scheda></scheda>
             </div>
         </section>
         <footer>

From 78d37b835f5dc6861a0661259062d99f0a138211 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Thu, 16 Apr 2020 10:20:37 +0200
Subject: [PATCH 24/42] cleaning folders

---
 .../arch-interface/arch-interface.ts          | 75 -------------------
 .../arch-interface/arch-interface.vue         | 13 ----
 .../base-components/estrazione-principale.ts  | 19 -----
 .../base-components/estrazione-principale.vue | 27 -------
 .../components/show-estrazione-info.ts        | 55 --------------
 .../components/show-estrazione-info.vue       | 37 ---------
 .../app_modules_thermo/estrazione/index.ts    |  0
 7 files changed, 226 deletions(-)
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.ts
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.vue
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.ts
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue
 delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/index.ts

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.ts
deleted file mode 100644
index 31d99905..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import Vue from "vue";
- import Component from "vue-class-component";
-// import { Prop } from 'vue-property-decorator';
-
-
-// @Component({name:"archinterface"})
-// export default class PowerComponent extends Vue{
-//     @Prop({default:"45,180"}) 
-//     actualValue:string;
-//     @Prop({default:"47,180"})
-//      maxValue:number;
-//      @Prop({default:"5,180"})
-//      minValue:number;
-//      @Prop({default:10})
-//      kw :number;
-//      @Prop({default:100})
-//      potency:number;
-
-// public mounted(){
-//     this.intialize();
-// }
-
-//     public intialize(){
-//         var backgroundPath = document.querySelector("#background-circle");
-//         var valuePath = document.querySelector("#value-circle");
-//     backgroundPath.setAttribute('d',this.getArcPath(45, 20, 40, 40, 150));
-//     valuePath.setAttribute("d", this.getArcPath(45, 20, 40, 40, 150));
-   
-//     }
-
-//     public getArcPath(cx, cy, rx, ry, startAngle) {
-      
-//       var theta = startAngle * Math.PI / 180;
-          
-//       var dx = rx * Math.cos(theta);   
-//       var dy = ry * Math.sin(theta);
-      
-//       return [
-//         "M", cx + dx, cy + dy,
-//         "a", rx, ry, "0 1 1", 2 * -dx, 2 * -dy,
-//         "a", rx, ry, "0 1 1", 2 *  dx, 2 *  dy, "z"
-//       ].join(" ");
-//     };
-    
-
-// }
-
-
-declare var Gauge:any
-@Component({})
-export default class archinterface extends Vue{ 
-mounted(){
-  var gauge3 = Gauge(
-    document.getElementById("gauge3"), {
-      min:0,
-      max: 100,
-      value: 50
-    }
-  );
-  
-  function loop() {
-    var value1 = Math.random() * 100,
-        value2 = Math.random() * 100,
-        value3 = Math.random() * 100,
-        value4 = Math.random() * 100,
-        value5 = Math.random() * 100;
-  
-    // setValueAnimated(value, durationInSecs);
-    gauge3.setValueAnimated(value3, 1.5);
-    window.setTimeout(loop, 6000);
-  }
-  loop() 
-
-}
-}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.vue
deleted file mode 100644
index bc822d6a..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-<div class="arch">
-<div id="gauge3" class="gauge-container three">
-</div> 
-<div class="labels">
- <!-- <span class="label">{{actualValue}}</span> -->
-  <span class="label">Kw</span>
-  <label class="Potenza">Potenza</label>
-
-</div>  
-</div>
-</template>
-<script src="./arch-interface.ts" lang="ts" ></script>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.ts
deleted file mode 100644
index 4e649ba6..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import Vue from 'vue';
-import Component from 'vue-class-component';
-import {Prop} from 'vue-property-decorator';
-import Scheda from "@/app_modules_thermo/components/scheda.vue";
-import Slider from "@/app_modules_thermo/components/slider.vue"
-
-@Component({name:"estrprincipale", 
-components:{
-scheda:Scheda,
-slider:Slider}})
-
-export default class EstrazionePrincipale extends Vue{
-
-    @Prop({default:0})
-    ritardo:number;
-
-    mockR:number=this.ritardo;
-
-}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue
deleted file mode 100644
index 4c34283e..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-    <div class="divEstr">
-        <div class="divSx">
-            <div class="datiP">
-                <div class="ritardo">
-                    <img class="clessidra" src="assets/icons/png/clessidra.png"><label class="Ritardo">Ritardo</label>
-                </div>
-                <div class="rect">
-                    <label class="mock">{{mockR}}s</label>
-                </div>
-            </div>
-            <slider :min="0" :max="10" v-model="mockR" :left="'0s'" :middle="'5s'" :right="'10s'"></slider>
-            <div class="datiP scosdiv">
-                <label class="lab">Tipo</label>               
-                <select class="selTipi">
-                    <option class="opzione" value="Normale">Normale</option>
-                    <option class="opzione" value="Senza cornice">Senza cornice</option>
-                    <option class="opzione" value="Assistita">Assistita</option>
-                </select>
-            </div>
-            <scheda class="schedaE"></scheda>
-        </div>
-        <div class="sep"></div>
-    </div>
-</template>
-
-<script lang="ts" src="./estrazione-principale.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts
deleted file mode 100644
index 4917a069..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import Vue from 'vue';
-import Component from 'vue-class-component';
-import {Prop} from 'vue-property-decorator';
-import { Factory, messageService, awaiter } from "@/_base";
-import { Modal, ModalHelper } from "@/components/modals";
-import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue";
-import EstrazionePrincipale from "./base-components/estrazione-principale.vue";
-
-@Component({components: 
-  { modal: Modal,
-    stepfooter:StepFooter,
-    estrprincipale:EstrazionePrincipale
-  }
-})
-export default class ShowEstrazioneInfo extends Vue{
-
-  show:string="EST";
-    // activeEP:boolean=true;
-    // activeES:boolean=false;
-    
-    // ActiveEP(){
-    //   this.activeEP=true;
-    //   this.activeES=false;
-    // };
-
-    // ActiveES(){
-    //   this.activeEP=false;
-    //   this.activeES=true;
-    // };
-
-    annulla(){
-        ModalHelper.HideModal();
-      };
-  
-      conferma(){
-        ModalHelper.HideModal();
-      };
-  
-      async beforeMount() {
-          // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
-          messageService.subscribeToChannel("esc_pressed", args => {
-            this.close();
-          });
-        };
-      
-        beforeDestroy() {
-          messageService.deleteChannel("esc_pressed");
-        };
-      
-        close() {
-          messageService.deleteChannel("esc_pressed");
-          ModalHelper.HideModal();
-        };  
-
-}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue
deleted file mode 100644
index 47baf8b2..00000000
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-	<section>
-		<div class="spefic">
-			<modal type="estrazione-info">
-				<div class="schede" slot="header-buttons">
-					<div class="selector button">
-						<div class="selector EST" v-if="EST"></div>
-						<button class :class="{'active': show =='EST'}" @click="EST()"></button>
-						<label>Estrazione principale</label>
-					</div>
-					<div class="selector button">
-						<div class="selector EST" v-if="EST"></div>
-						<button :class="{'active': show=='EST'}" @click="EST"></button>
-						<label>Estrazione secondaria</label>
-					</div>
-				</div>
-				<div class="divheader HE" slot="header-buttons">
-					<button class="modal-close" @click="close()">
-						<i class="fa fa-remove"></i>
-					</button>
-				</div>
-				<estrprincipale v-if="EST"></estrprincipale>
-				<footer class="divFooter">
-					<button class="annulla confirm" @click="annulla()">
-						<label class="Annulla">Annulla</label>
-					</button>
-					<button class="conferma confirm" @click="conferma()">
-						<label class="Conferma">Conferma</label>
-					</button>
-				</footer>
-			</modal>
-			<stepfooter></stepfooter>
-		</div>
-	</section>
-</template>
-
-<script lang="ts" src="./show-estrazione-info.ts"></script>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/index.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/index.ts
deleted file mode 100644
index e69de29b..00000000

From b727e59f6678258fdedd839f09e3d6cbc08e1404 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Thu, 16 Apr 2020 10:22:43 +0200
Subject: [PATCH 25/42] fix app-business-logic

---
 Thermo.Active/wwwroot/src/app.business-logic.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index e5d85c60..1d6119ae 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -12,7 +12,7 @@ import ShowCicloInfo from "@/app_modules_thermo/setup/ciclo/components/show-cicl
 import ShowRaffreddamentoInfo from "@/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue";
 import ShowControstampoInfo from "@/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue";
 import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue";
-import ShowEstrazioneInfo from "@/app_modules_thermo/estrazione/components/show-estrazione-info.vue";
+// import ShowEstrazioneInfo from "@/app_modules_thermo/estrazione/components/show-estrazione-info.vue";
 import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue";
 import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue";
 // import { DataService } from "./services/dataService";
@@ -50,7 +50,7 @@ let HMIprodTimeout;
 let RerenderInterval;
 
 messageService.subscribeToChannel("show-vuoto-info", () => { ModalHelper.ShowModal(ShowVuotoInfo); });
-messageService.subscribeToChannel("show-estrazione-info", () => { ModalHelper.ShowModal(ShowEstrazioneInfo); });
+// messageService.subscribeToChannel("show-estrazione-info", () => { ModalHelper.ShowModal(ShowEstrazioneInfo); });
 messageService.subscribeToChannel("show-quote-velocita-info", () => { ModalHelper.ShowModal(ShowQuoteVelocitaInfo); });
 messageService.subscribeToChannel("show-controstampo-info", () => { ModalHelper.ShowModal(ShowControstampoInfo); });
 messageService.subscribeToChannel("show-raffreddamento-info", () => { ModalHelper.ShowModal(ShowRaffreddamentoInfo); });

From 627c269baa377218cc2d772d7ea0e2a2daffe5f6 Mon Sep 17 00:00:00 2001
From: Damiano <mcdamiano93@virgilio.it>
Date: Thu, 16 Apr 2020 15:18:43 +0200
Subject: [PATCH 26/42] fix modal"estrazione"

---
 .../assets/styles/base/estrazione.less        | 54 +++++--------------
 Thermo.Active/wwwroot/assets/styles/style.css | 45 ++--------------
 Thermo.Active/wwwroot/config.development.json |  2 +-
 .../base-components/estrazione-principale.vue | 37 ++++++-------
 .../components/show-estrazione-info.ts        | 13 +----
 .../components/show-estrazione-info.vue       | 46 ++++++----------
 6 files changed, 53 insertions(+), 144 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less
index af509802..b869d1b1 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less
@@ -5,48 +5,18 @@
 @modal: modal;
 
 .@{modal}.estrazione-info {
-    margin-top: 100px;
-    width: 1370px;
+    width: 1820px;
     height: 785px;
-    header {
-      background-color: @color-white;
-      color: @color-darkish-blue;
-      
-      font-weight: 600;
-      font-size: 24px;
-      text-align: left;
-      padding: 0px 23px;
-    }
-    .sep{
-        height: 606px;
-    }
-    .divSx{
-        margin-left: 20px;
-    }
-    .scosdiv{
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
+ .specific { 
+ justify-content: flex-end;
+.box{
+ background-color: #e5f3ff;   
 }
-.EP{
-    width: 287px;
-}
-.EstrP{
-    width: 287px;
-    height: 65px;
-}
-.ES{
-    width: 294px;
-}
-.EstrS{
-    width: 294px;
-    height: 65px;
-}
-.schedaE{
-    border: solid  #30916b;
-    background-color: #b2e6d2;
-}
-.divEstr{
-    margin-top: 20px;
-    display: flex;
+
+} 
+
+
+
+
+
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 8d04901d..d0657853 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4663,49 +4663,14 @@ img {
   background-image: linear-gradient(to bottom, #1756ad, #002680);
 }
 .modal.estrazione-info {
-  margin-top: 100px;
-  width: 1370px;
+  width: 1820px;
   height: 785px;
 }
-.modal.estrazione-info header {
-  background-color: #fff;
-  color: #002680;
-  font-weight: 600;
-  font-size: 24px;
-  text-align: left;
-  padding: 0px 23px;
+.modal.estrazione-info .specific {
+  justify-content: flex-end;
 }
-.modal.estrazione-info .sep {
-  height: 606px;
-}
-.modal.estrazione-info .divSx {
-  margin-left: 20px;
-}
-.modal.estrazione-info .scosdiv {
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-.EP {
-  width: 287px;
-}
-.EstrP {
-  width: 287px;
-  height: 65px;
-}
-.ES {
-  width: 294px;
-}
-.EstrS {
-  width: 294px;
-  height: 65px;
-}
-.schedaE {
-  border: solid #30916b;
-  background-color: #b2e6d2;
-}
-.divEstr {
-  margin-top: 20px;
-  display: flex;
+.modal.estrazione-info .specific .box {
+  background-color: #e5f3ff;
 }
 .popup {
   width: 288px;
diff --git a/Thermo.Active/wwwroot/config.development.json b/Thermo.Active/wwwroot/config.development.json
index d7aee5c1..d47c9870 100644
--- a/Thermo.Active/wwwroot/config.development.json
+++ b/Thermo.Active/wwwroot/config.development.json
@@ -2,6 +2,6 @@
   "env": "development",
   "api": {
     "enabled": true,
-    "apiServerUrl": "http://seriate.steamware.net:9000"
+    "apiServerUrl": "http://localhost:9000"
   }
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue
index 4c34283e..c864c6d5 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue
@@ -1,27 +1,28 @@
 <template>
-    <div class="divEstr">
-        <div class="divSx">
-            <div class="datiP">
-                <div class="ritardo">
-                    <img class="clessidra" src="assets/icons/png/clessidra.png"><label class="Ritardo">Ritardo</label>
-                </div>
+    <section>
+        <aside class ="scrollable">
+                <div class="input-area">
+                    <img src="assets/icons/png/clessidra.png">
+                    <label>Ritardo</label>
+                
                 <div class="rect">
-                    <label class="mock">{{mockR}}s</label>
+                    {{mockR}}s
                 </div>
             </div>
-            <slider :min="0" :max="10" v-model="mockR" :left="'0s'" :middle="'5s'" :right="'10s'"></slider>
-            <div class="datiP scosdiv">
-                <label class="lab">Tipo</label>               
-                <select class="selTipi">
-                    <option class="opzione" value="Normale">Normale</option>
-                    <option class="opzione" value="Senza cornice">Senza cornice</option>
-                    <option class="opzione" value="Assistita">Assistita</option>
+            <slider :min="0" :max="10" v-model="mockR"  unit-of-measure="s"></slider>
+            <div class="input-area">
+                <label>Tipo</label>               
+                <select> 
+                    <option value="Normale">Normale</option>
+                    <option value="Senza cornice">Senza cornice</option>
+                    <option value="Assistita">Assistita</option>
                 </select>
             </div>
-            <scheda class="schedaE"></scheda>
-        </div>
-        <div class="sep"></div>
-    </div>
+        </aside>
+        <div class="specific">
+        <scheda></scheda>
+        </div>   
+    </section>
 </template>
 
 <script lang="ts" src="./estrazione-principale.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts
index 826500bf..4626fe0b 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts
@@ -9,18 +9,7 @@ import EstrazionePrincipale from "./base-components/estrazione-principale.vue";
 @Component({components: { modal: Modal,stepfooter:StepFooter,estrprincipale:EstrazionePrincipale}})
 export default class ShowEstrazioneInfo extends Vue{
 
-    activeEP:boolean=true;
-    activeES:boolean=false;
-    
-    ActiveEP(){
-      this.activeEP=true;
-      this.activeES=false;
-    };
-
-    ActiveES(){
-      this.activeEP=false;
-      this.activeES=true;
-    };
+  show:string="principale";
 
     annulla(){
         ModalHelper.HideModal();
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue
index fe20e161..c70b9b0c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue
@@ -1,39 +1,23 @@
 <template>
-	<section>
-		<div class="speficic">
+	<div class="setup">
 			<modal type="estrazione-info">
-				<div class="schede" slot="header-buttons">
-					<div class="selectorbtn">
-						<div class="selector EP" v-if="activeEP"></div>
-						<button class :class="{'active': show =='activeEP'}" @click="ActiveEP()"></button>
-						<label>Estrazione principale</label>
-					</div>
-					<div class="selectorbtn">
-						<div class="selector ES" v-if="activeES"></div>
-						<!--da chiedere-->
-						<button :class="{'active': show=='activeES'}" @click="ActiveES()"></button>
-						<label>Estrazione secondaria</label>
-					</div>
-				</div>
-				<div class="divheader HE" slot="header-buttons">
-					<button class="modal-close" @click="close()">
-						<!--da chiedere-->
-						<i class="fa fa-remove"></i>
-					</button>
-				</div>
-				<estrprincipale v-if="activeEP"></estrprincipale>
-				<footer class="divFooter">
-					<button class="annulla confirm" @click="annulla()">
-						<label class="Annulla">Annulla</label>
-					</button>
-					<button class="conferma confirm" @click="conferma()">
-						<label class="Conferma">Conferma</label>
-					</button>
-				</footer>
+				<div class="tab-header" slot="header-buttons">
+				<button :class="{'active':show == 'principale'}" @click="show='principale'">Estrazione principale</button>
+				<button :class="{'active':show == 'secondaria'}" @click="show='secondaria'">Estrazione secondaria</button>
+			</div>
+			<div slot="header-buttons">
+				<button class="modal-close" @click="close()">
+					<i class="fa fa-remove"></i>
+				</button>
+			</div>
+				<estrprincipale v-if="show=='principale'"></estrprincipale>
+			<footer>
+                <button class="btn" @click="annulla()">Annulla</button>
+                <button class="btn btn-success" @click="conferma()">Conferma</button>
+            </footer>
 			</modal>
 			<stepfooter class="Step"></stepfooter>
 		</div>
-	</section>
 </template>
 
 <script lang="ts" src="./show-estrazione-info.ts"></script>

From f4eebef604986e2911062b057875762d9506d569 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Thu, 16 Apr 2020 15:30:10 +0200
Subject: [PATCH 27/42] move folder of estrazione modal and fix
 app_business_logic

---
 Thermo.Active/wwwroot/src/app.business-logic.ts                 | 2 +-
 .../components/base-components/estrazione-principale.ts         | 0
 .../components/base-components/estrazione-principale.vue        | 0
 .../{ => setup}/estrazione/components/show-estrazione-info.ts   | 0
 .../{ => setup}/estrazione/components/show-estrazione-info.vue  | 0
 .../src/app_modules_thermo/{ => setup}/estrazione/index.ts      | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/estrazione/components/base-components/estrazione-principale.ts (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/estrazione/components/base-components/estrazione-principale.vue (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/estrazione/components/show-estrazione-info.ts (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/estrazione/components/show-estrazione-info.vue (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => setup}/estrazione/index.ts (100%)

diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index e5d85c60..b05038f2 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -12,7 +12,7 @@ import ShowCicloInfo from "@/app_modules_thermo/setup/ciclo/components/show-cicl
 import ShowRaffreddamentoInfo from "@/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue";
 import ShowControstampoInfo from "@/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue";
 import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue";
-import ShowEstrazioneInfo from "@/app_modules_thermo/estrazione/components/show-estrazione-info.vue";
+import ShowEstrazioneInfo from "@/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue";
 import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue";
 import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue";
 // import { DataService } from "./services/dataService";
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/index.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/index.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/index.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/index.ts

From f6ca9ab90029be261b77849d100e1097bedf8d3f Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Thu, 16 Apr 2020 15:32:30 +0200
Subject: [PATCH 28/42] last fix for app-business-logic

---
 Thermo.Active/wwwroot/src/app.business-logic.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index ba97abd5..b05038f2 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -50,7 +50,7 @@ let HMIprodTimeout;
 let RerenderInterval;
 
 messageService.subscribeToChannel("show-vuoto-info", () => { ModalHelper.ShowModal(ShowVuotoInfo); });
-// messageService.subscribeToChannel("show-estrazione-info", () => { ModalHelper.ShowModal(ShowEstrazioneInfo); });
+messageService.subscribeToChannel("show-estrazione-info", () => { ModalHelper.ShowModal(ShowEstrazioneInfo); });
 messageService.subscribeToChannel("show-quote-velocita-info", () => { ModalHelper.ShowModal(ShowQuoteVelocitaInfo); });
 messageService.subscribeToChannel("show-controstampo-info", () => { ModalHelper.ShowModal(ShowControstampoInfo); });
 messageService.subscribeToChannel("show-raffreddamento-info", () => { ModalHelper.ShowModal(ShowRaffreddamentoInfo); });

From 1a658b77c3087f6eca8c618f2e0577e36b2662b9 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Fri, 17 Apr 2020 15:03:03 +0200
Subject: [PATCH 29/42] add termoregolazione superiore to pirometro modal

---
 .../wwwroot/assets/icons/png/double.png       | Bin 0 -> 416 bytes
 .../wwwroot/assets/icons/png/double@2x.png    | Bin 0 -> 717 bytes
 .../wwwroot/assets/icons/png/double@3x.png    | Bin 0 -> 1123 bytes
 .../wwwroot/assets/icons/png/temperatura.png  | Bin 0 -> 476 bytes
 .../assets/icons/png/temperatura@2x.png       | Bin 0 -> 878 bytes
 .../assets/icons/png/temperatura@3x.png       | Bin 0 -> 1368 bytes
 .../icons/svg/disegno-termosuperiore.svg      | 308 ++++++++++++++++++
 .../wwwroot/assets/styles/base/formato.less   |   9 -
 .../wwwroot/assets/styles/base/pirometro.less |  79 ++++-
 .../assets/styles/base/quote-velocita.less    |   2 -
 .../wwwroot/assets/styles/base/setup.less     |   3 +
 Thermo.Active/wwwroot/assets/styles/style.css |  67 +++-
 .../SVG_Components/SVG-termo-superiore.ts     |   8 +
 .../SVG_Components/SVG-termo-superiore.vue    |  29 ++
 .../base-components/termo-superiore.ts        |  23 ++
 .../base-components/termo-superiore.vue       |  60 ++++
 .../components/show-pirometro-info.ts         |   5 +-
 .../components/show-pirometro-info.vue        |   1 +
 18 files changed, 573 insertions(+), 21 deletions(-)
 create mode 100644 Thermo.Active/wwwroot/assets/icons/png/double.png
 create mode 100644 Thermo.Active/wwwroot/assets/icons/png/double@2x.png
 create mode 100644 Thermo.Active/wwwroot/assets/icons/png/double@3x.png
 create mode 100644 Thermo.Active/wwwroot/assets/icons/png/temperatura.png
 create mode 100644 Thermo.Active/wwwroot/assets/icons/png/temperatura@2x.png
 create mode 100644 Thermo.Active/wwwroot/assets/icons/png/temperatura@3x.png
 create mode 100644 Thermo.Active/wwwroot/assets/icons/svg/disegno-termosuperiore.svg
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue

diff --git a/Thermo.Active/wwwroot/assets/icons/png/double.png b/Thermo.Active/wwwroot/assets/icons/png/double.png
new file mode 100644
index 0000000000000000000000000000000000000000..13dc9ca69f5b23aaddcdb130a1382310422d16ca
GIT binary patch
literal 416
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB7>k44ofy`glX(f`xTHpSruq6Z
zXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TWzSWdSpS4N|DZ_xKM`8JDMvV@L$&
z+c0jvW(A(9sUP`nciJB3TYfwt*Jx5y9lzw|6jjBf+t=;nz8d?Q`83LFJ=i-xQ_m!P
zmTmLLIqB~f{r9}&?2;_*dm_{M<-AR6pVUuDlB%6u{7%zwZOa~(`efghGMRU_o~1@A
z;`1Xl*L7YHWLo-2^S*BC65l`PFCTGNYZpto9&pgJA<<uWGH2<JRksz~GuS6__N{Y%
zD5bb!rSm2+qg@7FzGkLea)RkCS*vC_Eer5ud=gqv#-CfooGx6I>2$JsT3BC7z)_8l
zd!7{}p8gl?JipH?_eO6`(>c3M8O9Tw96xc`9+(iU@#^2XTLt@M6xaMNoL2kuMaR0Y
i{=NBklzbasYkpv3dd`vQn;y3g6gr-+elF{r5}E*l`;emm

literal 0
HcmV?d00001

diff --git a/Thermo.Active/wwwroot/assets/icons/png/double@2x.png b/Thermo.Active/wwwroot/assets/icons/png/double@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e37d5a2dd9bfa89b9c970f6a4a5a77fbf072cd60
GIT binary patch
literal 717
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<^v49!D1}U6i==Pq0fyvy{#WAFU
z@$D=}zrzLsuF^+@_%6Iw=({LepuK~0!!xEiOYXMY3r$_5@%6ig+;Pu+s@}QBzt-5F
zx0q?x-aLz=qXC8-I2!l8xBg=OMgEKNub{Ivv)L|RYSp=Bt=S@TasP$r>}4-!Y@TN@
zNg$!Pev$oCj>v>F<~4TZvDcT^++W&boV)%<-Rgpz%w=ay)S^`uOkeWctS2NnrEBiN
z2Mc-m%tK=)B=wuGHE?0_dRFEY;w#OdD(SK;;%sT#&t3epXZoBe>#MQ7o%3D%X0tk*
zR+HKS9(%6t1yO=VF+NAKT?H1tVoNDM@nY55We1qfyvowf@Y}Ysl+WJ#9y1U7q3+(;
z*xb~Tw$~E-)6$o!A2kb%?q%HgUCv=kUg9~e8{OGomfX<FUcFQE8RL{QPq{8me413V
z><sG@&y6~b(b6Gr{Hpd82QG+kneuHlhms4cM*|0AQWy)TfTF{hE(Jy<mX1h46^9lE
zL+vJ(4grNU*9i=QOh;nY%u=sgHQPJ%ub1Jb(rWe+#Tve9_AlBFnN0GTn;$c3mA%;d
zY4Yn(_RHJ`-S$ULnx%X0K4{6P_IG*O=IK8<f0ZfRo|&BabsqEaXE$^fWUsoZ^nA<S
z_@f%uj7l9W9SmA!Y^gC}om0%tb}4Mq2YE$tU)BtuR~QzRdh;?JaWCuz3qHyQ3EDVp
zJ=JdU{GC@B%isI6=0CXbYR0vwvRqL;nd!y09&&z>d@c?w2$b-a<sXBcWo1l=>BfVg
Oq~z)9=d#Wzp$PyDPZ31`

literal 0
HcmV?d00001

diff --git a/Thermo.Active/wwwroot/assets/icons/png/double@3x.png b/Thermo.Active/wwwroot/assets/icons/png/double@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..71e5186981f2c4b18854fb5ddde6d966b4b624e7
GIT binary patch
literal 1123
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz1|<8_!p{OJ#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1gS-^~7gB1R}eM=6g{H&*oV@L(#
z+qs5$cMJp=-ZM?l4BGuoI!2Xm0{f0L+<#W>Ij~e-K%so)C${S=FE82uhAHT=!zI0)
zLerNkD#!>;yz;K+<l_GHmjw$P7?=ba7+4e-7&*|G5o!f7>n<%j_O$4yQusfu<LZ`q
zPb>7@^PjF~`4io@S?2ul#~-V6nO?SZuCVreHCu*%>q*s|`bjh9x!lRl%vssexu$>8
ziEbHrFX2}U?#g$53|#V8r_;1|Lt@I`Nh<3iuf6bCdUtxymhxnN&bU&kJIy+-Yb&$%
zy_@88W5a<R$G)$zROENQS6uqfdb-mLm!+!@+KQFmi)?v$skZ;<+;XwR?bTaUEq8zR
z+vqiA=buf%iR_V@yJS)%6RW>IJtv)*my#=eXUpE2n^*T<_P7~(Dr&9mUgJZj_LyY1
zZb*A^T5nF0*BP6mQxjv?iz?^XZd?7OXG7?Qb=Nb0OtGk0aMJIi*SVPesppR>EV`j7
z=5Q}{@AtpfE;Cqw5+5$liMwI2>4xS#kBB3Sn&&>+`Mv8wap<9xl9%BZZ)oyOGrAr-
z)!^lgy~$SMKJL$FJ&n~qvp4zH#3?%iW<%Ik?h6+epZ&Bh>RR>m4YHh(Jf*L`tLsl*
zS+|U7g=}K*-%tOw1s!g9C0u`H_Gj~voep~s*RNauqWIoQonODM{gX%x3-WxWsME=j
zEy1yQl2;IaqNhv5VTT!0Lnc*mcq<)}Vmq{E$)qdJ5ki933<T0tr!J8@G^t}lTcd&Y
zN|mny(_C6id0HYpRadreP*GZwsBp$h%hR?+RWOm48N1OpzIa<)TTr!n`&01>iNv{o
zOB8q#=L%*>ue(=zJ5(Z3FXrLYuVOFPH5rJn`*12fzn|l?Q1{yZZ{G4H#w8Vg_5ZY;
z?VY--f{tIqa`nCWe<v?L7$Kgh-1#={xVrP6X)!{Hs#i|kp0i}7o#3JuhH_PrcC)nF
z^D`y?l_<AFZqUDS^Ao@5Od;`<6zkp%Ic{Q)9B(i!$XPBp?d%CB8;)p(DQ~|lTYW^g
zJZ*DhUst=Jm}}AEI)QD1FIJqs!d3i!h8yd>9rM#FuY=fTY_g?4L2PSx!53>_qGf7n
zT6fYa!|y%_+B|XTFaFA#mwRWGF8{Il$(<!G9J?o<*qQ&=?N`=vm)aN0-p#Q)wa|Ly
z^_W#<U5gKda9?(Cne}eLz0(V=S6z=-Ro=CDL5P26KJ&!yCbd5p{LQPl+v=ThW-n-_
c+oJG+pJn5GH@QRYA3z!0)78&qol`;+0707P=>Px#

literal 0
HcmV?d00001

diff --git a/Thermo.Active/wwwroot/assets/icons/png/temperatura.png b/Thermo.Active/wwwroot/assets/icons/png/temperatura.png
new file mode 100644
index 0000000000000000000000000000000000000000..c16f8f7735069fdf9347c309be85b1cebb16f709
GIT binary patch
literal 476
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?5!3HEh7*2@?QjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPE4Y9e&K3YE-28dhMxZh`PZ!4!
z3&FLMY`u>-2(*1})o^iPNnRMi)y@$vbE<J~Q|_cgYR~vNn*Q;&HY6-p@R$^rvt^5b
z<(fBJHwkbnGIp!jX|pVv&CA8d^FGCH-Wk2sng0`Zbv^w3Z-LI~;#Ze<t$VNTS+wkx
zX-MlLjXnuG6P{$|8-)Tak5|R1vK(*<4V_*n)87%lS!ecNV;9p4)57yEU0ZW1a#hob
z;yIP)KOfn+>(&-Oj_Fn@yRLgK_;LHO#{8xqj@m~`?;2(aFIt!w-1{T?2G>JAzmL-Q
z-1%eE9<l6Y_$T~_b+SUDgkO-P(U+EY3z$o|>rH$&_j{>1ezKYWu<&m2%Gssn3rvfY
z&7#*7`%YD``Ci`kiznuKFT=YNYd`!AdOl0b@sdgH;)jjC&pyO5u-C*tT;2Ehj#>Nb
yh^CIF+}pQL7~g)gkZDs&<h3dhSNS88YMHLi%U-kT8;c<*WIbK|T-G@yGywp5%CuSl

literal 0
HcmV?d00001

diff --git a/Thermo.Active/wwwroot/assets/icons/png/temperatura@2x.png b/Thermo.Active/wwwroot/assets/icons/png/temperatura@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6d0c800068ac2c1de10a60c909606adbebffa80
GIT binary patch
literal 878
zcmeAS@N?(olHy`uVBq!ia0vp^N<gf@!3HGD`&XR=QjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPtF(X_&Q<^^tl0I*gn@zShNp{T
zNCfBG>8G=U0|nY=-!Z!w;UZr4aFwZsN0Z0vWYsQx5$?MxyqsL63;#0f+~r)!?HI$k
zNR&m~$%MaUSJ6vhm)(MsLX*X#xb#HCGn0fS|L{H0`eoTc%aX+t8WZKp-<^5ycg}L=
z<?GiMf0Zp*YhD^=A#=~`iHyy~43oAPz3Yo^zuh;_NA3P=qY^hs=Fa1f|L%-=C(F>c
zWjV7CZ?(-_zx^5CvrD&|UFbWVwmF=YrS<c))LvdbzIRV<>eh&TYLrda>a`Z)Y7G+M
zJbckd?Q;kh(;-t!%bh(k-zseWxhQSasS`GO$1(SYE^CBv{9C6VQZKZV!dG8?R{VQr
zm=yCxHM8E=jD=-uu1~Drru^40Ma|6puT1)JSH7(qw{A6^9B!RtzT3@jVj;gmlk7}h
z+1ac~5$mce_&YY6|4(;Uns}maU&{Q?*|&1bF1qYqd-bYp=h39<*I#$>xa{`W_u^~S
z^a=CA6#4%j$oz8u1JB|^Z>PoUhB#=vTNR?!KhcOq_eagX;-x_^^}Z#pY^iBFVJy|7
zeENgwxfzo^OjkCzEWX&BV#Bq*pu$(Q`zXsU9(OZd#%GoeEG=g?85Nwp#cvwK+M;wk
z`lOr~SF7fi&F7vRiP#$TR?z;U?L5u}#wD)D+(lP5Y%rS@Ebc1y@bX<F=Cq20gamd&
z?-%cM1GYyjk7sQ;a@Jzf?+1&FI}cCO%PIcxFKbmpKuxI8Mm9dhxUPMIj6b-IU;96D
zzmQ$GKfX>0XdJ_X-ju}$Qn_rJ?JYKYC)Qj(a-;i;Xt~18b6P>VYI-578yym+C@oIm
zopSoALAGPrF@YS$N4g36A8V|C$uhReKH8hFCBm}O>XMgP?;pPT>AZDIGNxIdVcqtb
zqcwk1^127n4Z1(ruAlc``#t2)i>9N3@2Bf}Jxi8OWe;HdpQAN(mizSGeY1S5E*%fA
z<6~=9*D&JU-&TKM{{tJ*=MS0h)V@!aZWP#3&v0?(?+07MCFDS9-P6_2Wt~$(69B-#
BWsU#<

literal 0
HcmV?d00001

diff --git a/Thermo.Active/wwwroot/assets/icons/png/temperatura@3x.png b/Thermo.Active/wwwroot/assets/icons/png/temperatura@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..39e4475ca703d22bac01d0175a10798f3f53dff3
GIT binary patch
literal 1368
zcmV-e1*iInP)<h;3K|Lk000e1NJLTq001)p001xu1^@s6yfs3E00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91GoS+i1ONa40RR91FaQ7m0En$OhyVZt!bwCyRA>e5nq6pAM-<1+CSl{&
zYNDoHqbL-lwuzB`y|fi=sVUWmVn{a05*4W;h{57x^&zwfeJV&=3a$9CHJguZ?Mon{
zf*{(WpwdVJD%A&R64WNG64WG{^>=P}!ezUAvpaV#dAS3_IdkUBod193&Yju0yI_Hz
z{1Nbc1d6<f(A3oQW-^&POyBR5myrJ=_k}{CFJrOT-{_ts<76U{Nc+spj1VcwL|jx<
zG>UC^B9S<qS!bebluScI!yZ8W=mZQx6M;ZrLr+i7pH6-{bpf45+1j+WwywbbjjgV)
zw6t_XFc@4?TwJ^r5*GMWD)j=7;BlLuG1VBE$;rt^P`xO~0Di5ere=FrSJyyiXXhhk
zp&w$OV1JrMzBw9=zLM6B31eg!@oI$%J>K5lKCQ|k<MH@y#ARiho}QldS2nlOBpGW~
z1Q2UtI0rC!t62%cv;NBFRvIJY7Kn-VJ{c3E=tUp?%y==XCi?Ve#>6Ok(T6`XUW}@V
zKL2-2H_@r;qp`8^b@VOdILH16%I=l)j0{8;ab&pw@MRn@>yX>LBBA>AY|U^!s}dp-
z2vTcRKrf|dWV{5Ot8br7u92B<yFWAYJp;Mo`!kbmWY|jz8kj=;v&GD`6$Bu&u`07c
z?m(|sW%iXh@8j?}nm!?@X0D}cG5|UNuo$^i&@kfTh?_Z(UBRA`I{a57E;ctezaeE4
z$rTy7QwGHB#UDhjQeIzCQ8B<3?LHg8m5|=f`Ro`cgF5{Fl{yGjaOD)IZlTRrTh%7R
zy;uOiKiOvF5-2uv*%ure8@r7CkPTIc@+t12Pn4IJ|Au`d`JZ(CI>>!x^VL?h$qWq*
zZ2_R1isjLIgou`ul&s=r^LO;Dj}GK_kB^V{g~Q=n%ut)Ol|(;#P0Wrq8GwEE9~2AB
zx4pf+_jqJZVtYy1vq^w|FfuZ782^(D!VU4kwix~6Z2pDVw8;=ezP(rpAhDK~mJb2-
zma;iX{13LZwFRY}@}uqBO4pTIWMsV%Ff2g<^psJ)#m)Xl`GSy{7#$sb2l<Ds%}SfD
zrD~BG9v&_xn%Yb5LnuXlxex?tfBE>N(sHHfN-Z)~RaHq_z@?%y$`5U}IaOW&_i?h?
ziZkS_*Y%tY9UQdC@R-dITsB7`v4}U(tAIP_5GS+hab;!Y723|O6ZBkP4l>*3ENhXG
z-Uxoy)@zgxN@plbo-;xGNJmG<GX|tZIit(|<0@%iXb?OBp-4LV=giLceD2%Bi{L8u
zN(WSDAl^ZJgx9<E_M@*Sv^nq4Ca)^(nW?U>K1GB9i2{(t<X_6l${vtw0QYNVbZnF4
zBjl}|$JXKhgU#m{N1gduGXg@^O?nqspZngOn3%XQH8m9iSUsR?$@_8r0=bjZ!D{SB
zX;a6HT!f7LKR_1#UBuU-yG`o#s@)Hdmz<jAu~A9Z!U+mLlW&k^#KYL$!*3VazSBPz
zJ0!)=b#hHc5O9Fp3&`)t*3W=^P(k7zYwXkR?(XaP_~+vzo1g16I5>E%wzjsP$LBRV
zTjSIrB$DLg_%w5Ju>Kq1<X=dgk(sdvWN~kVR6ThUpjR<la)^`-@(!|}wUgj8`W<^4
aQ~Gm~cAxvd3*apP0000<MNUMnLSTY_If2vw

literal 0
HcmV?d00001

diff --git a/Thermo.Active/wwwroot/assets/icons/svg/disegno-termosuperiore.svg b/Thermo.Active/wwwroot/assets/icons/svg/disegno-termosuperiore.svg
new file mode 100644
index 00000000..d0a6630e
--- /dev/null
+++ b/Thermo.Active/wwwroot/assets/icons/svg/disegno-termosuperiore.svg
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1000mm"
+   height="700mm"
+   viewBox="0 0 1000 700"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="disegno-termosuperiore.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.23751142"
+     inkscape:cx="2192.6931"
+     inkscape:cy="1312.0808"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Livello 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,403)">
+    <path
+       style="fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 88.76984,214.15039 v -576"
+       id="path815"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 88.26284,214.63315 h 879"
+       id="path817"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 89.25884,-245.34161 h 403.705"
+       id="path819"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 847.71604,214.15039 V 25.150382"
+       id="path821"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 89.22584,24.328661 H 971.2258"
+       id="path823"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 492.33569,214.15039 v -459"
+       id="path825"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 148.83569,214.15039 v -459"
+       id="path827"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="0.0087425072"
+       inkscape:transform-center-y="-1.3298527"
+       transform="rotate(-8.4725616,-339.47207,-803.35348)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-1"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="-1.3235569"
+       inkscape:transform-center-y="0.016029572"
+       transform="rotate(-39.002988,1214.2784,-1374.1232)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#4b4b4b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-7"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="0.012045521"
+       inkscape:transform-center-y="-1.556962"
+       transform="matrix(1.3624544,-0.17249811,0.20295319,1.158005,43.584775,60.630817)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:0.92936802;stroke:#4b4b4b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-76"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="0.012041679"
+       inkscape:transform-center-y="1.5569683"
+       transform="matrix(1.3624544,0.17249811,0.20295318,-1.158005,43.584604,-552.18694)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#4b4b4b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-3"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="0.012045088"
+       inkscape:transform-center-y="-1.5569573"
+       transform="matrix(1.3624544,-0.17249811,0.20295319,1.158005,43.584867,331.04274)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#4b4b4b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-30"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="0.01204157"
+       inkscape:transform-center-y="1.5569639"
+       transform="matrix(1.3624544,0.17249811,0.20295318,-1.158005,43.584604,-281.77494)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#4b4b4b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-5"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="0.012044897"
+       inkscape:transform-center-y="-1.5569619"
+       transform="matrix(1.3624544,-0.17249811,0.20295319,1.158005,43.584831,460.48274)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#4b4b4b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-4"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="0.012041987"
+       inkscape:transform-center-y="1.5569706"
+       transform="matrix(1.3624544,0.17249811,0.20295318,-1.158005,43.584604,-152.33494)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#4b4b4b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-13"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="1.5480672"
+       inkscape:transform-center-y="0.02094424"
+       transform="matrix(1.0864486,0.50862641,-0.43159125,1.2803698,262.97182,629.62985)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#4b4b4b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-75"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="-1.537404"
+       inkscape:transform-center-y="0.03164864"
+       transform="matrix(0.90492592,-0.87001785,0.73678084,1.0685697,769.12654,591.58776)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#4b4b4b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-2"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="1.5074217"
+       inkscape:transform-center-y="-0.0032851622"
+       transform="matrix(-0.17094391,-1.3882646,1.1157981,-0.21268668,1104.0335,218.75862)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#4b4b4b;fill-opacity:1;stroke:#4b4b4b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path829-54"
+       sodipodi:sides="3"
+       sodipodi:cx="18.241447"
+       sodipodi:cy="-298.28387"
+       sodipodi:r1="5.3497214"
+       sodipodi:r2="2.6748607"
+       sodipodi:arg1="0.67474094"
+       sodipodi:arg2="1.7219385"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 22.418878,-294.94193 -4.580177,-0.69758 -4.580178,-0.69758 2.894209,-3.61776 2.894209,-3.61776 1.685969,4.31534 z"
+       inkscape:transform-center-x="-1.52698"
+       inkscape:transform-center-y="-0.014825546"
+       transform="matrix(0.16850514,1.3509028,-1.1373731,0.20014019,578.26524,292.1591)" />
+  </g>
+</svg>
diff --git a/Thermo.Active/wwwroot/assets/styles/base/formato.less b/Thermo.Active/wwwroot/assets/styles/base/formato.less
index 9e5e664c..d3681086 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/formato.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/formato.less
@@ -181,15 +181,6 @@
             }
         
           }
-        
-          .input-circles {
-
-            .circle{
-              width: 141px;
-              height: 60px;
-            }
-
-          }
       
         }
       
diff --git a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
index a021aa12..ddd84787 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less
@@ -2,8 +2,9 @@
 @import "grid-system.less";
 @import "colors.less";
 @import "fonts.less";
+@import "setup.less";
 @modal: modal;
-
+@pirometro-margin: margin-left;
 
 .@{modal}.pirometro-info {
   width: 1820px;
@@ -13,7 +14,81 @@
 
     .specific{
       width: 470px;
-      margin-left: 37%;
+      @{pirometro-margin}:37%;
+    }
+
+    .termospecific{
+      @{pirometro-margin}:0%;
+
+      .svg-area{
+        padding-left: 90px;
+        width: 1270px;
+        height: 800px;
+
+        .disegnoTermoSuperiore{
+          flex-shrink: 0;
+          width: 1100px;
+          height: 750px;
+        }
+
+        .border-termo-superiore{
+
+          .circle1{
+            position: relative;
+            top: 135px;
+            right: 1150px;
+          }
+
+          .circle2{
+            position: relative;
+            top: 355px;
+            right: 1150px;
+          }
+
+          .circle3{
+            position: relative;
+            top: 425px;
+            right: 1150px;
+          }
+
+          .circle4{
+            position: relative;
+            top: 470px;
+            right: 635px;
+          }
+
+          .circle5{
+            position: relative;
+            top: 400px;
+            right: 255px;
+          }
+
+          .circle6{
+            width: 64px;
+            height: 20px;
+            color:white;
+            object-fit: contain;
+            background-color: #c03d58;
+            position: relative;
+            top: 95px;
+            right: 125px;
+          }
+
+        }
+
+      }
+
+      button{
+        margin-left: 5px;
+        width: 48px;
+        height: 48px;
+        object-fit: contain;
+        border-radius: 2px;
+        box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
+        border: solid 1px #001e48;
+        background-image: linear-gradient(to bottom, #1756ad, #002680);
+      }
+
     }
 
   }
diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
index 2c723b5d..9e96cdf2 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
@@ -38,8 +38,6 @@
                 }
 
                 .circle{
-                    width: 141px;
-                    height: 60px;
                     flex-direction: column;
 
                     div{
diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less
index c327652a..5fb0c383 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/setup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less
@@ -14,6 +14,7 @@
   height: 100vh;
 
   hr {
+    flex-shrink: 0;
     background-color: #979797;
     width: 100%;
     height: 2px;
@@ -61,6 +62,8 @@
               flex-direction: column;
 
               .circle {
+                width: 141px;
+                height: 60px;
                 box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.5);
                 background-color: rgba(255, 255, 255, 0.8);
                 display: flex;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 3a2c6c97..636f208a 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -3678,6 +3678,64 @@
   width: 470px;
   margin-left: 37%;
 }
+.modal.pirometro-info section .termospecific {
+  margin-left: 0%;
+}
+.modal.pirometro-info section .termospecific .svg-area {
+  padding-left: 90px;
+  width: 1270px;
+  height: 800px;
+}
+.modal.pirometro-info section .termospecific .svg-area .disegnoTermoSuperiore {
+  flex-shrink: 0;
+  width: 1100px;
+  height: 750px;
+}
+.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle1 {
+  position: relative;
+  top: 135px;
+  right: 1150px;
+}
+.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle2 {
+  position: relative;
+  top: 355px;
+  right: 1150px;
+}
+.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle3 {
+  position: relative;
+  top: 425px;
+  right: 1150px;
+}
+.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle4 {
+  position: relative;
+  top: 470px;
+  right: 635px;
+}
+.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle5 {
+  position: relative;
+  top: 400px;
+  right: 255px;
+}
+.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle6 {
+  width: 64px;
+  height: 20px;
+  color: white;
+  object-fit: contain;
+  background-color: #c03d58;
+  position: relative;
+  top: 95px;
+  right: 125px;
+}
+.modal.pirometro-info section .termospecific button {
+  margin-left: 5px;
+  width: 48px;
+  height: 48px;
+  object-fit: contain;
+  border-radius: 2px;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
+  border: solid 1px #001e48;
+  background-image: linear-gradient(to bottom, #1756ad, #002680);
+}
 .modal.riscaldi-info .presenter {
   position: relative;
   width: 100%;
@@ -3824,10 +3882,6 @@
   right: 730px;
   top: 140px;
 }
-.modal.formato-info .specific .svg-area .input-circles .circle {
-  width: 141px;
-  height: 60px;
-}
 .modal.formato-info .specific .slides {
   margin-top: 45px;
   margin-left: 20px;
@@ -4028,6 +4082,7 @@
   height: 100vh;
 }
 .setup hr {
+  flex-shrink: 0;
   background-color: #979797;
   width: 100%;
   height: 2px;
@@ -4071,6 +4126,8 @@
   flex-direction: column;
 }
 .setup .modal section.body section .specific .svg-area .input-circles .circle {
+  width: 141px;
+  height: 60px;
   box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.5);
   background-color: rgba(255, 255, 255, 0.8);
   display: flex;
@@ -4451,8 +4508,6 @@
   background-color: #979797;
 }
 .modal.quote-velocita-info .specific .svg-area .input-circles .circle {
-  width: 141px;
-  height: 60px;
   flex-direction: column;
 }
 .modal.quote-velocita-info .specific .svg-area .input-circles .circle div {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts
new file mode 100644
index 00000000..97d5b38c
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts
@@ -0,0 +1,8 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+
+@Component({name:'svgtermosuperiore'})
+export default class SVGTermoregolazioneSuperiore extends Vue{
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
new file mode 100644
index 00000000..70aaa887
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
@@ -0,0 +1,29 @@
+<template>
+    <div class="svg-area">
+        <img class="disegnoTermoSuperiore" src="assets/icons/svg/disegno-termosuperiore.svg">
+        <div class="input-circles border-termo-superiore">
+                <div class="circle circle1">
+                    <label>%</label>
+                </div>
+                <div class="circle circle2">
+                    <label>%</label>
+                </div>
+                <div class="circle circle3">
+                    <label>%</label>
+                </div>
+                <div class="circle circle4">
+                    <img src="assets/icons/png/temperatura.png">
+                    <label>°C</label>
+                </div>
+                <div class="circle circle5">
+                    <img src="assets/icons/png/temperatura.png">
+                    <label>°C</label>
+                </div>
+                <div class="circle6">
+                    270 °C
+                </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" src="./SVG-termo-superiore.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts
new file mode 100644
index 00000000..8feb141a
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts
@@ -0,0 +1,23 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+import Slider from "@/app_modules_thermo/components/slider.vue";
+import ToggleButton from "@/components/toggleButton.vue";
+import SVGTermoregolazioneSuperiore from './SVG_Components/SVG-termo-superiore.vue'
+
+@Component({name:'termosuperiore', components: { slider:Slider, ToggleButton, svgtermosuperiore:SVGTermoregolazioneSuperiore}})
+export default class TermoregolazioneSuperiore extends Vue{
+
+    @Prop({default:0})
+    inizioreg:number;
+    @Prop({default:0})
+    finereg:number;
+    @Prop({default:0})
+    max:number;
+    @Prop({default:0})
+    min:number;
+    @Prop({default:0})
+    riposo:number;
+    enabling:boolean=true;
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue
new file mode 100644
index 00000000..2b2421a0
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue
@@ -0,0 +1,60 @@
+<template>
+    <section>
+        <aside class="scrollable">
+            <div class="input-area">
+                <label>Inizio regolazione</label>
+                <div class="rect">
+                    {{inizioreg}} °C
+                </div>
+            </div>
+            <slider :min="0" :max="400" v-model="inizioreg" unit-of-measure="°C"></slider>
+            <div class="input-area">
+                <label>Fine regolazione</label>
+                <div class="rect">
+                    {{finereg}} °C
+                </div>
+            </div>
+            <slider :min="0" :max="400" v-model="finereg" unit-of-measure="°C"></slider>
+
+            <hr />
+
+            <div class="input-area">
+                <label>Massimo</label>
+                <div class="rect">
+                    {{max}} %
+                </div>
+            </div>
+            <slider :min="0" :max="100" v-model="max" unit-of-measure="%"></slider>
+            <div class="input-area">
+                <label>Minimo</label>
+                <div class="rect">
+                    {{min}} %
+                </div>
+            </div>
+            <slider :min="0" :max="100" v-model="min" unit-of-measure="%"></slider>
+
+            <hr />
+
+            <div class="input-area">
+                <label>Abilitazione riposo</label>
+                <toggle-button v-model="enabling"></toggle-button>
+            </div>
+            <div class="input-area">
+                <label>Percentuale riposo</label>
+                <div class="rect">
+                    {{riposo}} %
+                </div>
+            </div>
+            <slider :min="0" :max="100" v-model="finereg" unit-of-measure="%"></slider>
+
+        </aside>
+        <div class="specific termospecific">
+            <svgtermosuperiore></svgtermosuperiore>
+            <button>
+				<img src="assets/icons/png/double.png" />
+			</button>
+        </div>
+    </section>
+</template>
+
+<script lang="ts" src="./termo-superiore.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts
index b56acf6d..63ed59e0 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts
@@ -4,12 +4,13 @@ import { Factory, messageService, awaiter } from "@/_base";
 import Component from "vue-class-component";
 import { Prop } from 'vue-property-decorator';
 import Pirometro from "./base-components/pirometro.vue";
+import TermoregolazioneSuperiore from "./base-components/termo-superiore.vue";
 import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue";
 
-@Component({ components: { modal: Modal ,pirometro:Pirometro, stepfooter:StepFooter} })
+@Component({ components: { modal: Modal ,pirometro:Pirometro, stepfooter:StepFooter, termosuperiore:TermoregolazioneSuperiore} })
 export default class ShowPirometroInfo extends Vue {
 
-    show:string='pirometro';
+    show:string='termo-superiore';
 
     annulla(){
       ModalHelper.HideModal();
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue
index 91c7c010..ae0e48aa 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue
@@ -12,6 +12,7 @@
 			</button>
 		</div>
         <pirometro v-if="show=='pirometro'"></pirometro>
+		<termosuperiore v-if="show=='termo-superiore'"></termosuperiore>
 		<footer>
 			<button class="btn" @click="annulla()">
 				Annulla

From 11f219843a0e0ebb93913f8a6cd19564613ba7bc Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Mon, 20 Apr 2020 14:45:15 +0200
Subject: [PATCH 30/42] modal opzioni di lavorazione merged

---
 .../wwwroot/assets/styles/base/layout.less    |   1 +
 .../wwwroot/assets/styles/base/opzioni.less   |  91 ++++++++++++++
 Thermo.Active/wwwroot/assets/styles/style.css |  61 ++++++++++
 .../wwwroot/src/app.business-logic.ts         |   2 +
 .../arch-interface/arch-interface.ts          |   0
 .../arch-interface/arch-interface.vue         |   0
 .../setup/components/setup.vue                |   2 +-
 .../setup/components/step-footer.vue          |   2 +-
 .../base-components/inputSottosquadra.ts      |  20 ++++
 .../base-components/inputSottosquadra.vue     |  33 +++++
 .../components/base-components/inputTermo.ts  |  16 +++
 .../components/base-components/inputTermo.vue |  16 +++
 .../base-components/setupSottosquadra.ts      |  21 ++++
 .../base-components/setupSottosquadra.vue     |  11 ++
 .../components/base-components/setupTermo.ts  |  16 +++
 .../components/base-components/setupTermo.vue |   8 ++
 .../opzioni/components/sottosquadra-stampo.ts |  14 +++
 .../components/sottosquadra-stampo.vue        |  78 ++++++++++++
 .../opzioni/components/termoregolatori.ts     |  15 +++
 .../opzioni/components/termoregolatori.vue    | 113 ++++++++++++++++++
 .../setup/opzioni/show-opzioni-info.ts        |  45 +++++++
 .../setup/opzioni/show-opzioni-info.vue       |  28 +++++
 22 files changed, 591 insertions(+), 2 deletions(-)
 create mode 100644 Thermo.Active/wwwroot/assets/styles/base/opzioni.less
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => components}/arch-interface/arch-interface.ts (100%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => components}/arch-interface/arch-interface.vue (100%)
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.vue
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue

diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less
index 95f020a5..23a58891 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/layout.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less
@@ -11,6 +11,7 @@
 @import "raffreddamento.less";
 @import "controstamposetup.less";
 @import "quote-velocita.less";
+@import "opzioni.less";
 @import "imbutitura.less";
 @import "estrazione.less";
 @import "scheda.less";
diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less
new file mode 100644
index 00000000..02a2a5c5
--- /dev/null
+++ b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less
@@ -0,0 +1,91 @@
+// out: false, sourceMap: false, main: ../style.less
+@import "grid-system.less";
+@import "colors.less";
+@import "fonts.less";
+@modal: modal;
+
+.@{modal}.opzioni-info {
+    width: 1820px;
+    height: 980px;
+
+    hr {
+      width: 2px;
+      height: 830px;
+      background-color: #979797;
+      float: left;
+      margin: 0;
+    }
+
+    .section{
+      display: flex;
+
+        .specific{
+
+          &:last-of-type{
+            margin-left: 100px;
+            width: 471px;
+          }
+          
+          &:first-of-type{
+
+            .box-color{
+              background-color: #ffffff;
+            }
+
+            button{
+              background-color: #dddddd;
+              display: block;
+              color: #000000;
+              padding: 22px 16px;
+              width: 550px;
+              height: 64px;
+              border: none;
+              text-align: left;
+              cursor: pointer;
+              font-size: 17px;
+            }
+
+            .active{
+              background-color: rgba(23, 145, 255, 0.75);
+              color:#ffffff;
+            }
+
+            label{
+              font-size: 14px;
+              width: 60px;
+              margin-left: 5px;
+              margin-right: 30px;
+            }
+
+          }
+
+        }
+
+      }
+    
+      aside{
+
+        button{
+          display: block;
+          background-color: #bbbcbc;
+          color: #002680;
+          padding: 22px 16px;
+          margin: 2px 0;
+          width: 547px;
+          height: 70px;
+          border: none;
+          text-align: left;
+          cursor: pointer;
+          font-size: 17px;
+        }
+
+        .active{
+          background-color: #fff;
+          font-weight: bold;
+          border-top: 2px solid #002680;
+        }
+
+      }
+
+}
+
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 636f208a..23ebc1bb 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4565,6 +4565,67 @@
   border: solid 1px #001e48;
   background-image: linear-gradient(to bottom, #1756ad, #002680);
 }
+.modal.opzioni-info {
+  width: 1820px;
+  height: 980px;
+}
+.modal.opzioni-info hr {
+  width: 2px;
+  height: 830px;
+  background-color: #979797;
+  float: left;
+  margin: 0;
+}
+.modal.opzioni-info .section {
+  display: flex;
+}
+.modal.opzioni-info .section .specific:last-of-type {
+  margin-left: 100px;
+  width: 471px;
+}
+.modal.opzioni-info .section .specific:first-of-type .box-color {
+  background-color: #ffffff;
+}
+.modal.opzioni-info .section .specific:first-of-type button {
+  background-color: #dddddd;
+  display: block;
+  color: #000000;
+  padding: 22px 16px;
+  width: 550px;
+  height: 64px;
+  border: none;
+  text-align: left;
+  cursor: pointer;
+  font-size: 17px;
+}
+.modal.opzioni-info .section .specific:first-of-type .active {
+  background-color: rgba(23, 145, 255, 0.75);
+  color: #ffffff;
+}
+.modal.opzioni-info .section .specific:first-of-type label {
+  font-size: 14px;
+  width: 60px;
+  margin-left: 5px;
+  margin-right: 30px;
+}
+.modal.opzioni-info aside button {
+  display: block;
+  background-color: #bbbcbc;
+  color: #002680;
+  padding: 22px 16px;
+  margin: 2px 0;
+  width: 547px;
+  height: 70px;
+  border: none;
+  text-align: left;
+  cursor: pointer;
+  font-size: 17px;
+}
+.modal.opzioni-info aside .active {
+  background-color: #fff;
+  font-weight: bold;
+  border-top: 2px solid #002680;
+}
 .modal.imbutitura-info {
   width: 1820px;
   height: 980px;
diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index b05038f2..83ae1eb7 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -15,6 +15,7 @@ import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/com
 import ShowEstrazioneInfo from "@/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue";
 import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue";
 import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue";
+import ShowOpzioniInfo from "@/app_modules_thermo/setup/opzioni/show-opzioni-info.vue";
 // import { DataService } from "./services/dataService";
 // import { ToolingService } from "./services/toolingService";
 // import { DepotService } from "./services/depotService";
@@ -49,6 +50,7 @@ let HMIScreenshotInterval;
 let HMIprodTimeout;
 let RerenderInterval;
 
+messageService.subscribeToChannel("show-opzioni-info", () => { ModalHelper.ShowModal(ShowOpzioniInfo); });
 messageService.subscribeToChannel("show-vuoto-info", () => { ModalHelper.ShowModal(ShowVuotoInfo); });
 messageService.subscribeToChannel("show-estrazione-info", () => { ModalHelper.ShowModal(ShowEstrazioneInfo); });
 messageService.subscribeToChannel("show-quote-velocita-info", () => { ModalHelper.ShowModal(ShowQuoteVelocitaInfo); });
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/arch-interface.ts
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/arch-interface.ts
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/arch-interface.vue
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.vue
rename to Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/arch-interface.vue
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
index 3e0f36d2..2ddfaebe 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
@@ -73,7 +73,7 @@
                 ></setup-button>
 
                 <setup-button
-                    @click="sendMessage('show-lavorazione')"
+                    @click="sendMessage('show-opzioni-info')"
                     :phase="11"
                     title="Opzioni di lavorazione"
                     statusImage="fa fa-minus-circle"
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/step-footer.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/step-footer.vue
index 7fb9d501..9070326a 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/step-footer.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/step-footer.vue
@@ -132,7 +132,7 @@
             </div>
 
             <div class="row-test">
-                <button @click="sendMessage('show-lavorazione')" class="box-footer">
+                <button @click="sendMessage('show-opzioni-info')" class="box-footer">
                         <div class="arrow-phase-footer">
                             <div class="fase-vertical-align-footer">
                                 <span class="Numero-fase">11</span>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.ts
new file mode 100644
index 00000000..f8db5e74
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.ts
@@ -0,0 +1,20 @@
+import Vue from "vue";
+import Component from "vue-class-component";
+import { Prop } from "vue-property-decorator";
+import Slider from "@/app_modules_thermo/components/slider.vue";
+
+@Component({name:"input-sottosquadra", components:{slider:Slider}})
+
+export default class inputSottosquadra extends Vue{
+    
+    @Prop({default:0})
+    quota:number;
+    @Prop({default:0})
+    ritardoAtt:number;
+    @Prop({default:0})
+    ritardoDisatt:number;
+
+    mockQuota:number=this.quota;
+    mockRitAtt:number=this.ritardoAtt;
+    mockRitDis:number=this.ritardoDisatt;
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue
new file mode 100644
index 00000000..bbff5097
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue
@@ -0,0 +1,33 @@
+<template>
+	<div>
+		<div class="input-area">
+			<label>Modalità</label>
+            <select>
+                <option value="Label modalita">Label modalità</option>
+            </select>
+		</div>
+		<div class="input-area">
+			<img src="assets/icons/png/quota.png">
+			<label>Quota</label>
+				<div class="rect">
+					{{mockQuota}} mm
+				</div>
+		</div>
+		<slider :min="0" :max="800" v-model="mockQuota" unit-of-measure="mm"></slider>
+		<div class="input-area">
+			<label>Ritardo attivazione</label>
+				<div class="rect">
+					{{mockRitAtt}} s
+				</div>
+		</div>
+		<slider :min="0" :max="10" v-model="mockRitAtt" unit-of-measure="s"></slider>
+		<div class="input-area">
+			<label>Ritardo disattivazione</label>
+				<div class="rect">
+					{{mockRitDis}} s
+				</div>
+		</div>
+		<slider :min="0" :max="10" v-model="mockRitDis" unit-of-measure="s"></slider>
+	</div>
+</template>
+<script src="./inputSottosquadra.ts" />
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.ts
new file mode 100644
index 00000000..08abd78d
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.ts
@@ -0,0 +1,16 @@
+import Vue from "vue";
+import Component from "vue-class-component";
+import { Prop } from "vue-property-decorator";
+import Slider from "@/app_modules_thermo/components/slider.vue";
+import ToggleButton from "@/components/toggleButton.vue";
+
+@Component({name:"input-termo", components:{slider:Slider, ToggleButton}})
+
+export default class inputTermo extends Vue{
+    
+    @Prop({default:0})
+    setpoint:number;
+
+    abilit:boolean=false;
+    mockSet:number=this.setpoint;
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.vue
new file mode 100644
index 00000000..0c89cf9c
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.vue
@@ -0,0 +1,16 @@
+<template>
+	<div>
+		<div class="input-area">
+			<label>Abilitazione</label>
+			<toggle-button v-model="abilit"></toggle-button>
+		</div>
+		<div class="input-area">
+			<label>Setpoint</label>
+				<div class="rect">
+					{{mockSet}}°C
+				</div>
+		</div>
+		<slider :min="0" :max="400" v-model="mockSet" unit-of-measure="°C"></slider>
+	</div>
+</template>
+<script src="./inputTermo.ts" />
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.ts
new file mode 100644
index 00000000..bfa75314
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.ts
@@ -0,0 +1,21 @@
+import Vue from "vue";
+import Component from "vue-class-component";
+import { Prop } from "vue-property-decorator";
+
+@Component({})
+export default class setupSottosquadra extends Vue {
+
+  @Prop()
+  numSottoSq: string;
+  @Prop()
+  status: string;
+  @Prop()
+  modalita: number;
+  @Prop()
+  quota: number;
+  @Prop()
+  ritardoAtt: number;
+  @Prop()
+  ritardoDisatt: number;
+  
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue
new file mode 100644
index 00000000..4c1eac7e
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue
@@ -0,0 +1,11 @@
+<template>
+	<div class="section">
+		<label>{{numSottoSq}}</label>
+		<label>{{status}}</label>
+		<label>{{modalita}}</label>
+		<label>{{quota}} mm</label>
+		<label>{{ritardoAtt}} s</label>
+		<label>{{ritardoDisatt}} s</label>
+	</div>
+</template>
+<script src="./setupSottosquadra.ts" lang="ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts
new file mode 100644
index 00000000..8b63ec8f
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts
@@ -0,0 +1,16 @@
+import Vue from "vue";
+import Component from "vue-class-component";
+import { Prop } from "vue-property-decorator";
+
+@Component({})
+export default class setupTermo extends Vue {
+
+  @Prop()
+  numTermo: string;
+
+  @Prop()
+  status: string;
+
+  @Prop()
+  setpoint: number;
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue
new file mode 100644
index 00000000..84d5281a
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue
@@ -0,0 +1,8 @@
+<template>
+	<div class="section">
+			<label>{{numTermo}}</label>
+			<label>{{status}}</label>
+			<label>{{setpoint}} °C</label>
+	</div>
+</template>
+<script src="./setupTermo.ts" lang="ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts
new file mode 100644
index 00000000..01a4aa4b
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts
@@ -0,0 +1,14 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+import InputSottosquadra from "./base-components/inputSottosquadra.vue";
+import SetupSottosquadra from "./base-components/setupSottosquadra.vue";
+
+@Component({name:'sottosquadrastampo',
+    components: {
+    setupSottosquadra: SetupSottosquadra,
+    inputSottosquadra: InputSottosquadra
+  }})
+export default class SottosqaudraStampo extends Vue{
+    showSottosquadra: string = "sottosquadra-1";
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue
new file mode 100644
index 00000000..ba56e914
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue
@@ -0,0 +1,78 @@
+<template>
+    <div class="section">
+        <div class="specific">
+				<button :class="{'active':showSottosquadra == 'sottosquadra-1'}" @click="showSottosquadra='sottosquadra-1'">
+					<setup-sottosquadra
+						:numSottoSq="1"
+						status="ON"
+						modalita="Label modalità"
+						quota="230"
+						ritardoAtt="2"
+						ritardoDisatt="7"
+					></setup-sottosquadra>
+				</button>
+				<button :class="{'active':showSottosquadra == 'sottosquadra-2'}" @click="showSottosquadra='sottosquadra-2'" class="box-color">
+					<setup-sottosquadra
+						:numSottoSq="2"
+						status="ON"
+						modalita="Label modalità"
+						quota="230"
+						ritardoAtt="2"
+						ritardoDisatt="7"
+					></setup-sottosquadra>
+				</button>
+				<button :class="{'active':showSottosquadra == 'sottosquadra-3'}" @click="showSottosquadra='sottosquadra-3'">
+					<setup-sottosquadra
+						:numSottoSq="3"
+						status="ON"
+						modalita="Label modalità"
+						quota="230"
+						ritardoAtt="2"
+						ritardoDisatt="7"
+					></setup-sottosquadra>
+				</button>
+				<button :class="{'active':showSottosquadra == 'sottosquadra-4'}" @click="showSottosquadra='sottosquadra-4'" class="box-color">
+					<setup-sottosquadra
+						:numSottoSq="4"
+						status="ON"
+						modalita="Label modalità"
+						quota="230"
+						ritardoAtt="2"
+						ritardoDisatt="7"
+					></setup-sottosquadra>
+				</button>
+				<button :class="{'active':showSottosquadra == 'sottosquadra-5'}" @click="showSottosquadra='sottosquadra-5'">
+					<setup-sottosquadra
+						:numSottoSq="5"
+						status="ON"
+						modalita="Label modalità"
+						quota="230"
+						ritardoAtt="2"
+						ritardoDisatt="7"
+					></setup-sottosquadra>
+				</button>
+			</div>
+
+			<hr>
+			
+			<div class="specific">
+				<div v-if="showSottosquadra=='sottosquadra-1'">
+					<input-sottosquadra />
+				</div>
+				<div v-if="showSottosquadra=='sottosquadra-2'">
+					<input-sottosquadra />
+				</div>
+				<div v-if="showSottosquadra=='sottosquadra-3'">
+					<input-sottosquadra />
+				</div>
+				<div v-if="showSottosquadra=='sottosquadra-4'">
+					<input-sottosquadra />
+				</div>
+				<div v-if="showSottosquadra=='sottosquadra-5'">
+					<input-sottosquadra />
+				</div>
+			</div>
+    </div>
+</template>
+
+<script lang="ts" src="./sottosquadra-stampo.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts
new file mode 100644
index 00000000..bf7421ac
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts
@@ -0,0 +1,15 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+import SetupTermo from "./base-components/setupTermo.vue";
+import InputTermo from "./base-components/inputTermo.vue";
+
+@Component({name:'termoregolatori',
+    components: {
+    setupTermo: SetupTermo,
+    inputTermo: InputTermo
+    }
+})
+export default class Termoragolatori extends Vue {
+    showTermo: string = "termo-1";
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue
new file mode 100644
index 00000000..2c68e051
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue
@@ -0,0 +1,113 @@
+<template>
+    <div class="section">
+        <div class="specific">
+				<button :class="{'active':showTermo == 'termo-1'}" @click="showTermo='termo-1'">
+					<setup-termo
+						:numTermo="1"
+						status="ON"
+						setpoint="280"
+					></setup-termo>
+				</button>
+				<button :class="{'active':showTermo == 'termo-2'}" @click="showTermo='termo-2'" class="box-color">
+					<setup-termo
+						:numTermo="2"
+						status="ON"
+						setpoint="280"
+					></setup-termo>
+				</button>
+				<button :class="{'active':showTermo == 'termo-3'}" @click="showTermo='termo-3'">
+					<setup-termo
+						:numTermo="3"
+						status="ON"
+						setpoint="280"
+					></setup-termo>
+				</button>
+				<button :class="{'active':showTermo == 'termo-4'}" @click="showTermo='termo-4'" class="box-color">
+					<setup-termo
+						:numTermo="4"
+						status="ON"
+						setpoint="280"
+					></setup-termo>
+				</button>
+				<button :class="{'active':showTermo == 'termo-5'}" @click="showTermo='termo-5'">
+					<setup-termo
+						:numTermo="5"
+						status="ON"
+						setpoint="280"
+					></setup-termo>
+				</button>
+				<button :class="{'active':showTermo == 'termo-6'}" @click="showTermo='termo-6'" class="box-color">
+					<setup-termo
+						:numTermo="6"
+						status="ON"
+						setpoint="280"
+					></setup-termo>
+				</button>
+				<button :class="{'active':showTermo == 'termo-7'}" @click="showTermo='termo-7'">
+					<setup-termo
+						:numTermo="7"
+						status="ON"
+						setpoint="280"
+					></setup-termo>
+				</button>
+				<button :class="{'active':showTermo == 'termo-8'}" @click="showTermo='termo-8'" class="box-color">
+					<setup-termo
+						:numTermo="8"
+						status="ON"
+						setpoint="280"
+					></setup-termo>
+				</button>
+				<button :class="{'active':showTermo == 'termo-9'}" @click="showTermo='termo-9'">
+					<setup-termo
+						:numTermo="9"
+						status="ON"
+						setpoint="280"
+					></setup-termo>
+				</button>
+				<button :class="{'active':showTermo == 'termo-10'}" @click="showTermo='termo-10'" class="box-color">
+					<setup-termo
+						:numTermo="10"
+						status="ON"
+						setpoint="280"
+					></setup-termo>
+				</button>								
+			</div>
+
+			<hr>
+
+			<div class="specific">
+				<div v-if="showTermo=='termo-1'">
+					<input-termo />
+				</div>
+				<div v-if="showTermo=='termo-2'">
+					<input-termo />
+				</div>
+				<div v-if="showTermo=='termo-3'">
+					<input-termo />
+				</div>
+				<div v-if="showTermo=='termo-4'">
+					<input-termo />
+				</div>
+				<div v-if="showTermo=='termo-5'">
+					<input-termo />
+				</div>
+				<div v-if="showTermo=='termo-6'">
+					<input-termo />
+				</div>
+				<div v-if="showTermo=='termo-7'">
+					<input-termo />
+				</div>
+				<div v-if="showTermo=='termo-8'">
+					<input-termo />
+				</div>
+				<div v-if="showTermo=='termo-9'">
+					<input-termo />
+				</div>
+				<div v-if="showTermo=='termo-10'">
+					<input-termo />
+				</div>
+			</div>
+    </div>
+</template>
+
+<script lang="ts" src="./termoregolatori.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts
new file mode 100644
index 00000000..af68e837
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts
@@ -0,0 +1,45 @@
+import Vue from "vue";
+import { Modal, ModalHelper } from "@/components/modals";
+import { Factory, messageService, awaiter } from "@/_base";
+import Component from "vue-class-component";
+import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue";
+import SottosquadraStampo from "./components/sottosquadra-stampo.vue";
+import Termoregolatori from "./components/termoregolatori.vue";
+
+@Component({
+  components: {
+    modal: Modal,
+    sottosquadrastampo:SottosquadraStampo,
+    termoregolatori:Termoregolatori,
+    stepfooter: StepFooter
+  }
+})
+export default class ShowQuoteVelocitaInfo extends Vue {
+
+  showOpzioni: string = "TR";
+
+  annulla() {
+    ModalHelper.HideModal();
+  };
+
+  conferma() {
+    ModalHelper.HideModal();
+  };
+
+  async beforeMount() {
+    // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
+    messageService.subscribeToChannel("esc_pressed", args => {
+      this.close();
+    });
+  }
+
+  beforeDestroy() {
+    messageService.deleteChannel("esc_pressed");
+  }
+
+  close() {
+    messageService.deleteChannel("esc_pressed");
+    ModalHelper.HideModal();
+  }
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue
new file mode 100644
index 00000000..b37545b9
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue
@@ -0,0 +1,28 @@
+<template>
+	<div class="setup">
+		<modal type="opzioni-info" :title="'opzioniinfo_lbl_title' | localize('Opzioni di lavorazione')">
+			<div slot="header-buttons">
+				<button class="modal-close" @click="close()">
+					<i class="fa fa-remove"></i>
+				</button>
+			</div>
+			<div class="section">
+				<aside class="scrollable">
+					<button :class="{'active':showOpzioni == 'TR'}" @click="showOpzioni='TR'">Termoregolatori</button>
+					<button :class="{'active':showOpzioni == 'SS'}" @click="showOpzioni='SS'">Sottosquadra stampo</button>
+					<button :class="{'active':showOpzioni == 'SC'}" @click="showOpzioni='SC'">Sottosquadra controstampo</button>
+				</aside>
+				<hr>
+				<sottosquadrastampo v-if="showOpzioni=='SS'"></sottosquadrastampo>
+				<termoregolatori v-if="showOpzioni=='TR'"></termoregolatori>
+			</div>
+			<footer>
+				<button class="btn" @click="annulla()">Annulla</button>
+				<button class="btn btn-success" @click="conferma()">Conferma</button>
+			</footer>
+		</modal>
+		<stepfooter></stepfooter>
+	</div>
+</template>
+
+<script lang="ts" src="./show-opzioni-info.ts"></script>
\ No newline at end of file

From 21d3d7d036d23fb727f1938673ba11dc8c0477a0 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Mon, 20 Apr 2020 15:58:25 +0200
Subject: [PATCH 31/42] general fixes

---
 .../wwwroot/assets/styles/base/ciclo.less     | 153 +++++++-------
 .../wwwroot/assets/styles/base/opzioni.less   |   1 -
 .../assets/styles/base/quote-velocita.less    | 199 ++++++++++--------
 .../wwwroot/assets/styles/base/setup.less     |  18 +-
 Thermo.Active/wwwroot/assets/styles/style.css |  73 ++++---
 .../components/base-components/caricatore.vue |   2 +-
 .../base-components/ciclo-formatura.vue       |   4 +-
 .../base-components/aria-controstampo.vue     |   3 +-
 .../base-components/estrazione-principale.vue |   3 +-
 .../setup/imbutitura/show-imbutitura-info.vue |   3 +-
 .../base-components/termo-superiore.vue       |   2 +-
 .../components/discesa-cornice.vue            |   1 +
 .../base-components/vuoto-principale.vue      |   3 +-
 13 files changed, 261 insertions(+), 204 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
index e948c830..c0863f3a 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less
@@ -5,90 +5,91 @@
 @modal: modal;
 
 .@{modal}.ciclo-info {
+    
+    section{
 
-  .specific{
-    padding: 0 10px;
+      .specific{
+        padding: 0 10px;
 
-    .caricatore-buttons{
+        .caricatore-buttons{
 
-      button{
-        margin-right: 15px;
-        margin-left: 5px;
-        width: 48px;
-        height: 48px;
-        object-fit: contain;
-        border-radius: 2px;
-        box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5);
-        border: none;
-        background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
+          button{
+            margin-right: 15px;
+            margin-left: 5px;
+            width: 48px;
+            height: 48px;
+            object-fit: contain;
+            border-radius: 2px;
+            box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5);
+            border: none;
+            background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
+
+            &:last-of-type{
+              border: solid 1px #001e48;
+              background-image: linear-gradient(to bottom, #1756ad, #002680);
+            }
+
+          }
+
+        }
+
+        .svg-area{
+
+          .disegnoCaricatore{
+            flex-shrink: 0;
+            width: 1137px;
+            height: 707px;   
+          }
+
+          .input-circles{
+
+            label{
+              object-fit: contain;
+              background-color: #979797;
+            }
+
+            .circle1{
+              position: relative;
+              top: 130px;
+              right: 25px;
+            }
+
+            .circle2{
+              position: relative;
+              top: 180px;
+              right: 25px;
+            }
+
+            .circle3{
+              position: relative;
+              top: 175px;
+              right: 410px;
+            }
+
+            .circle4{
+              position: relative;
+              top: 60px;
+              right: 180px;
+            }
+
+          }
+
+        }
+
+        .box {
+          margin-bottom: 10px;
+          width: 500px;
+
+          .body{
+            padding: 5px 10px;
+          }
 
-        &:last-of-type{
-          border: solid 1px #001e48;
-          background-image: linear-gradient(to bottom, #1756ad, #002680);
         }
 
       }
 
     }
+    
+}
 
-    .svg-area{
 
-      .disegnoCaricatore{
-        flex-shrink: 0;
-        width: 1137px;
-        height: 707px;   
-      }
-
-      .input-circles{
-
-        label{
-          object-fit: contain;
-          background-color: #979797;
-        }
-
-        .circle1{
-          position: relative;
-          top: 130px;
-          right: 25px;
-        }
-
-        .circle2{
-          position: relative;
-          top: 180px;
-          right: 25px;
-        }
-
-        .circle3{
-          position: relative;
-          top: 175px;
-          right: 410px;
-        }
-
-        .circle4{
-          position: relative;
-          top: 60px;
-          right: 180px;
-        }
-
-      }
-
-    }
-
-    .box {
-      margin-bottom: 10px;
-      width: 500px;
-
-      .body{
-        padding: 5px 10px;
-      }
-
-    }
-
-  }
-
-  // .presenter {
-  //   display: flex;
-  //   flex-flow: column;
-  //   padding: 0 10px;
-  // }
-}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less
index 02a2a5c5..8259cb30 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less
@@ -12,7 +12,6 @@
       width: 2px;
       height: 830px;
       background-color: #979797;
-      float: left;
       margin: 0;
     }
 
diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
index 9e96cdf2..25576f17 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
@@ -9,106 +9,127 @@
     width: 1820px;
     height: 980px;
 
-    .specific{
+    section{
 
-        .svg-area{
-            width: 750px;
-            height: 750px;
+        aside{
 
-            .disegnoQuoteVelocita{
-                flex-shrink: 0;
-                margin-left: 500px;
-                width: 800px;
-                height: 800px;
-            }
+            .box{
 
-            .input-circles{
-
-                span{
-                    object-fit: contain;
-                    font-size: 22px;
-                    font-weight: 500;
-                    font-stretch: normal;
-                    font-style: normal;
-                    line-height: normal;
-                    letter-spacing: normal;
-                    text-align: center;
-                    color: white;
-                    background-color: #979797;
-                }
-
-                .circle{
-                    flex-direction: column;
-
-                    div{
-                        margin: auto;
-                        display: flex;
-                        flex-direction: row;
+                .body{
+                    padding:4.5px;
+                    
+                    .input-area{
+                        margin: 5px auto;
                     }
 
                 }
 
-                .circle1{
-                    position: relative;
-                    top: 120px;
-                    right: 500px;
-                }
-
-                .circle2{
-                    position: relative;
-                    top: 140px;
-                    right: 750px;
-                }
-
-                .circle3{
-                    position: relative;
-                    top: 140px;
-                    right: 300px;
-                }
-
-                .circle4{
-                    position: relative;
-                    top: 395px;
-                    right: 400px;
-                }
-
-                .circle5{
-                    position: relative;
-                    top: 240px;
-                    right: 650px;
-                }
-
-                .circle6{
-                    position: relative;
-                    top: 305px;
-                    right: 550px;
-                }
-
-                .circle7{
-                    position: relative;
-                    bottom: 380px;
-                    right: 250px;
-                }
-
-                .circle8{
-                    position: relative;
-                    top: 320px;
-                    right: 220px;
-                }
-
             }
 
         }
 
-        button{
-            margin-left: 10px;
-            width: 48px;
-            height: 48px;
-            object-fit: contain;
-            border-radius: 2px;
-            box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
-            border: solid 1px #001e48;
-            background-image: linear-gradient(to bottom, #1756ad, @color-darkish-blue);
+        .specific{
+
+            .svg-area{
+                width: 750px;
+                height: 750px;
+
+                .disegnoQuoteVelocita{
+                    flex-shrink: 0;
+                    margin-left: 500px;
+                    width: 800px;
+                    height: 800px;
+                }
+
+                .input-circles{
+
+                    span{
+                        object-fit: contain;
+                        font-size: 22px;
+                        font-weight: 500;
+                        font-stretch: normal;
+                        font-style: normal;
+                        line-height: normal;
+                        letter-spacing: normal;
+                        text-align: center;
+                        color: white;
+                        background-color: #979797;
+                    }
+
+                    .circle{
+                        flex-direction: column;
+
+                        div{
+                            margin: auto;
+                            display: flex;
+                            flex-direction: row;
+                        }
+
+                    }
+
+                    .circle1{
+                        position: relative;
+                        top: 120px;
+                        right: 500px;
+                    }
+
+                    .circle2{
+                        position: relative;
+                        top: 140px;
+                        right: 750px;
+                    }
+
+                    .circle3{
+                        position: relative;
+                        top: 140px;
+                        right: 300px;
+                    }
+
+                    .circle4{
+                        position: relative;
+                        top: 395px;
+                        right: 400px;
+                    }
+
+                    .circle5{
+                        position: relative;
+                        top: 240px;
+                        right: 650px;
+                    }
+
+                    .circle6{
+                        position: relative;
+                        top: 305px;
+                        right: 550px;
+                    }
+
+                    .circle7{
+                        position: relative;
+                        bottom: 380px;
+                        right: 250px;
+                    }
+
+                    .circle8{
+                        position: relative;
+                        top: 320px;
+                        right: 220px;
+                    }
+
+                }
+
+            }
+
+            button{
+                margin-left: 10px;
+                width: 48px;
+                height: 48px;
+                object-fit: contain;
+                border-radius: 2px;
+                box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
+                border: solid 1px #001e48;
+                background-image: linear-gradient(to bottom, #1756ad, @color-darkish-blue);
+            }
+
         }
 
     }
diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less
index 5fb0c383..df275470 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/setup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less
@@ -16,8 +16,10 @@
   hr {
     flex-shrink: 0;
     background-color: #979797;
-    width: 100%;
-    height: 2px;
+    width: 2px;
+    height: 100%;
+    margin: 0;
+    margin-left: 5px;
   }
 
   .modal {
@@ -36,6 +38,10 @@
         justify-content: flex-start;
         width: calc(~'100% - 28px');
         height: calc(~'100% - 28px - 82px');
+  
+        .auto{
+          overflow-y: auto;
+        }
 
         aside {
           display: flex;
@@ -47,6 +53,14 @@
           overflow-y: scroll;
           padding-right: 10px;
 
+          hr {
+            flex-shrink: 0;
+            background-color: #979797;
+            width: 100%;
+            height: 2px;
+            margin-left: 0px;
+          }
+
         }
 
         .specific {
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 23ebc1bb..74f1be2b 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4084,8 +4084,10 @@
 .setup hr {
   flex-shrink: 0;
   background-color: #979797;
-  width: 100%;
-  height: 2px;
+  width: 2px;
+  height: 100%;
+  margin: 0;
+  margin-left: 5px;
 }
 .setup .modal {
   width: 1820px;
@@ -4103,6 +4105,9 @@
   width: calc(100% - 28px);
   height: calc(100% - 28px - 82px);
 }
+.setup .modal section.body section .auto {
+  overflow-y: auto;
+}
 .setup .modal section.body section aside {
   display: flex;
   justify-content: start;
@@ -4113,6 +4118,13 @@
   overflow-y: scroll;
   padding-right: 10px;
 }
+.setup .modal section.body section aside hr {
+  flex-shrink: 0;
+  background-color: #979797;
+  width: 100%;
+  height: 2px;
+  margin-left: 0px;
+}
 .setup .modal section.body section .specific {
   display: flex;
   flex-direction: column;
@@ -4395,10 +4407,10 @@
   margin: auto;
   display: flex;
 }
-.modal.ciclo-info .specific {
+.modal.ciclo-info section .specific {
   padding: 0 10px;
 }
-.modal.ciclo-info .specific .caricatore-buttons button {
+.modal.ciclo-info section .specific .caricatore-buttons button {
   margin-right: 15px;
   margin-left: 5px;
   width: 48px;
@@ -4409,44 +4421,44 @@
   border: none;
   background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
 }
-.modal.ciclo-info .specific .caricatore-buttons button:last-of-type {
+.modal.ciclo-info section .specific .caricatore-buttons button:last-of-type {
   border: solid 1px #001e48;
   background-image: linear-gradient(to bottom, #1756ad, #002680);
 }
-.modal.ciclo-info .specific .svg-area .disegnoCaricatore {
+.modal.ciclo-info section .specific .svg-area .disegnoCaricatore {
   flex-shrink: 0;
   width: 1137px;
   height: 707px;
 }
-.modal.ciclo-info .specific .svg-area .input-circles label {
+.modal.ciclo-info section .specific .svg-area .input-circles label {
   object-fit: contain;
   background-color: #979797;
 }
-.modal.ciclo-info .specific .svg-area .input-circles .circle1 {
+.modal.ciclo-info section .specific .svg-area .input-circles .circle1 {
   position: relative;
   top: 130px;
   right: 25px;
 }
-.modal.ciclo-info .specific .svg-area .input-circles .circle2 {
+.modal.ciclo-info section .specific .svg-area .input-circles .circle2 {
   position: relative;
   top: 180px;
   right: 25px;
 }
-.modal.ciclo-info .specific .svg-area .input-circles .circle3 {
+.modal.ciclo-info section .specific .svg-area .input-circles .circle3 {
   position: relative;
   top: 175px;
   right: 410px;
 }
-.modal.ciclo-info .specific .svg-area .input-circles .circle4 {
+.modal.ciclo-info section .specific .svg-area .input-circles .circle4 {
   position: relative;
   top: 60px;
   right: 180px;
 }
-.modal.ciclo-info .specific .box {
+.modal.ciclo-info section .specific .box {
   margin-bottom: 10px;
   width: 500px;
 }
-.modal.ciclo-info .specific .box .body {
+.modal.ciclo-info section .specific .box .body {
   padding: 5px 10px;
 }
 .modal.raffreddamento-info {
@@ -4485,17 +4497,23 @@
   width: 1820px;
   height: 980px;
 }
-.modal.quote-velocita-info .specific .svg-area {
+.modal.quote-velocita-info section aside .box .body {
+  padding: 4.5px;
+}
+.modal.quote-velocita-info section aside .box .body .input-area {
+  margin: 5px auto;
+}
+.modal.quote-velocita-info section .specific .svg-area {
   width: 750px;
   height: 750px;
 }
-.modal.quote-velocita-info .specific .svg-area .disegnoQuoteVelocita {
+.modal.quote-velocita-info section .specific .svg-area .disegnoQuoteVelocita {
   flex-shrink: 0;
   margin-left: 500px;
   width: 800px;
   height: 800px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles span {
+.modal.quote-velocita-info section .specific .svg-area .input-circles span {
   object-fit: contain;
   font-size: 22px;
   font-weight: 500;
@@ -4507,55 +4525,55 @@
   color: white;
   background-color: #979797;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle {
   flex-direction: column;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle div {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle div {
   margin: auto;
   display: flex;
   flex-direction: row;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle1 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle1 {
   position: relative;
   top: 120px;
   right: 500px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle2 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle2 {
   position: relative;
   top: 140px;
   right: 750px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle3 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle3 {
   position: relative;
   top: 140px;
   right: 300px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle4 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle4 {
   position: relative;
   top: 395px;
   right: 400px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle5 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle5 {
   position: relative;
   top: 240px;
   right: 650px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle6 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle6 {
   position: relative;
   top: 305px;
   right: 550px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle7 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle7 {
   position: relative;
   bottom: 380px;
   right: 250px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle8 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle8 {
   position: relative;
   top: 320px;
   right: 220px;
 }
-.modal.quote-velocita-info .specific button {
+.modal.quote-velocita-info section .specific button {
   margin-left: 10px;
   width: 48px;
   height: 48px;
@@ -4573,7 +4591,6 @@
   width: 2px;
   height: 830px;
   background-color: #979797;
-  float: left;
   margin: 0;
 }
 .modal.opzioni-info .section {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
index bab3849c..0e692bcb 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue
@@ -32,7 +32,7 @@
 			</div>
 			<slider :min="0" :max="300" v-model="altbanc" unit-of-measure="mm"></slider>
 		</aside>
-
+		<hr>
 		<div class="specific">
 			<svgcaricatore></svgcaricatore>
 			<div class="caricatore-buttons">
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue
index 63275983..11aaf3fc 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<aside class="scrollable">
+		<aside class="scrollable auto">
 			<div class="input-area">
 				<label>Tipo</label>
 				<select>
@@ -20,7 +20,7 @@
 				<toggle-button v-model="vent"></toggle-button>
 			</div>
 		</aside>
-
+		<hr>
 		<div class="specific">
 			<acrilico></acrilico>
 			<riscaldo></riscaldo>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue
index 38df8420..058ae816 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue
@@ -1,6 +1,6 @@
 <template>
     <section>
-        <aside class="scrollable">
+        <aside class="scrollable auto">
             <div class="input-area">
                 <img src="assets/icons/png/clessidra.png">
                 <label>Ritardo</label>
@@ -8,6 +8,7 @@
             </div>
             <slider :min="0" :max="10" v-model="mockR" :unit-of-measure="s"></slider>
         </aside>
+        <hr>
         <div class="specific">
             <scheda></scheda>
             <scheda></scheda>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
index c864c6d5..02fc3944 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
@@ -1,6 +1,6 @@
 <template>
     <section>
-        <aside class ="scrollable">
+        <aside class ="scrollable auto">
                 <div class="input-area">
                     <img src="assets/icons/png/clessidra.png">
                     <label>Ritardo</label>
@@ -19,6 +19,7 @@
                 </select>
             </div>
         </aside>
+        <hr>
         <div class="specific">
         <scheda></scheda>
         </div>   
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue
index 4826ee44..9904ca5e 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue
@@ -7,7 +7,7 @@
 				</button>
 			</div>
         <section>
-            <aside class="scrollable">
+            <aside class="scrollable auto">
                     <div class="input-area">
                         <img src="assets/icons/png/clessidra.png">
                         <label>Ritardo</label>
@@ -45,6 +45,7 @@
                     </div>
                     <slider :min="0" :max="100" v-model="portManuale"></slider>
             </aside>
+            <hr>
             <div class="specific">
                 <scheda></scheda>
             </div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue
index 2b2421a0..d71828db 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue
@@ -46,8 +46,8 @@
                 </div>
             </div>
             <slider :min="0" :max="100" v-model="finereg" unit-of-measure="%"></slider>
-
         </aside>
+        <hr>
         <div class="specific termospecific">
             <svgtermosuperiore></svgtermosuperiore>
             <button>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
index af2c7bfd..de3be696 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
@@ -45,6 +45,7 @@
 				</div>
 			</div>
 		</aside>
+		<hr />
 		<div class="specific">
 			<quoteVelocitaSVG></quoteVelocitaSVG>
 			<button>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
index 0d47f552..d0268b5b 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
@@ -1,6 +1,6 @@
 <template>
     <section>
-        <aside class="scrollable">
+        <aside class="scrollable auto">
     		<div class="input-area">
 				<label>Partenza</label>
 				<select>
@@ -29,6 +29,7 @@
             </div>
             <slider :min="0" :max="100" v-model="percentuale" unit-of-measure="%"></slider>
         </aside>
+        <hr>
 		<div class="specific">
 			<scheda></scheda>
 			<scheda></scheda>

From 0a53017ee6aa02f1daee76256e082c10fd7afb55 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Mon, 20 Apr 2020 16:32:09 +0200
Subject: [PATCH 32/42] add arretramento riscaldi modal

---
 .../styles/base/arretramento-riscaldi.less    | 10 +++++
 .../wwwroot/assets/styles/base/layout.less    |  1 +
 Thermo.Active/wwwroot/assets/styles/style.css |  4 ++
 .../wwwroot/src/app.business-logic.ts         |  2 +
 .../show-arretramento-riscladi-info.ts        | 39 +++++++++++++++++++
 .../show-arretramento-riscladi-info.vue       | 31 +++++++++++++++
 6 files changed, 87 insertions(+)
 create mode 100644 Thermo.Active/wwwroot/assets/styles/base/arretramento-riscaldi.less
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.vue

diff --git a/Thermo.Active/wwwroot/assets/styles/base/arretramento-riscaldi.less b/Thermo.Active/wwwroot/assets/styles/base/arretramento-riscaldi.less
new file mode 100644
index 00000000..34dc22c6
--- /dev/null
+++ b/Thermo.Active/wwwroot/assets/styles/base/arretramento-riscaldi.less
@@ -0,0 +1,10 @@
+// out: false, sourceMap: false, main: ../style.less
+@import "grid-system.less";
+@import "colors.less";
+@import "fonts.less";
+@modal: modal;
+
+.@{modal}.estrazione-info {
+    width: 560px;
+    height: 411px;
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less
index 23a58891..f98f8283 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/layout.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less
@@ -6,6 +6,7 @@
 @import "formato.less";
 @import "slider.less";
 @import "tastierino.less";
+@import "arretramento-riscaldi.less";
 @import "setup.less";
 @import "ciclo.less";
 @import "raffreddamento.less";
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 74f1be2b..73fc614d 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4072,6 +4072,10 @@
   grid-column: 0.8;
   grid-row: 0.5;
 }
+.modal.estrazione-info {
+  width: 560px;
+  height: 411px;
+}
 .setup {
   padding-top: 50px;
   display: flex;
diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index 83ae1eb7..40cd4c9b 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -16,6 +16,7 @@ import ShowEstrazioneInfo from "@/app_modules_thermo/setup/estrazione/components
 import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue";
 import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue";
 import ShowOpzioniInfo from "@/app_modules_thermo/setup/opzioni/show-opzioni-info.vue";
+import ShowArretramentoRiscaldiInfo from "@/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscaldi-info.vue";
 // import { DataService } from "./services/dataService";
 // import { ToolingService } from "./services/toolingService";
 // import { DepotService } from "./services/depotService";
@@ -50,6 +51,7 @@ let HMIScreenshotInterval;
 let HMIprodTimeout;
 let RerenderInterval;
 
+messageService.subscribeToChannel("show-arretramento-riscaldi-info", () => { ModalHelper.ShowModal(ShowOpzioniInfo); });
 messageService.subscribeToChannel("show-opzioni-info", () => { ModalHelper.ShowModal(ShowOpzioniInfo); });
 messageService.subscribeToChannel("show-vuoto-info", () => { ModalHelper.ShowModal(ShowVuotoInfo); });
 messageService.subscribeToChannel("show-estrazione-info", () => { ModalHelper.ShowModal(ShowEstrazioneInfo); });
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.ts
new file mode 100644
index 00000000..f683ddf8
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.ts
@@ -0,0 +1,39 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+import Slider from "../components/slider.vue"
+import { Modal, ModalHelper } from "@/components/modals";
+import { Factory, messageService, awaiter } from "@/_base";
+
+@Component({components:{slider:Slider,modal:Modal}})
+export default class ArretramentoRiscaldi extends Vue{
+
+    @Prop({default:0})
+    ritardo:number
+
+    annulla(){
+        ModalHelper.HideModal();
+      };
+  
+      conferma(){
+        ModalHelper.HideModal();
+      };
+  
+      async beforeMount() {
+          // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
+          messageService.subscribeToChannel("esc_pressed", args => {
+            this.close();
+          });
+        }
+      
+        beforeDestroy() {
+          messageService.deleteChannel("esc_pressed");
+        }
+      
+        close() {
+          messageService.deleteChannel("esc_pressed");
+          ModalHelper.HideModal();
+        }
+  
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.vue
new file mode 100644
index 00000000..429bca6d
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.vue
@@ -0,0 +1,31 @@
+<template>
+    <div class="setup">
+		<modal type="arretramento-riscaldi-info" :title="'arretramentoriscaldiinfo_lbl_title' | localize('Arretramento riscaldi')">
+			<div slot="header-buttons">
+				<button class="modal-close" @click="close()">
+					<i class="fa fa-remove"></i>
+				</button>
+			</div>
+            <section>
+                <div class="specific">
+                    <div class="input-area">
+                        <img src="assets/icons/png/clessidra.png" />
+                        <label>Ritardo</label>
+                        <span class="rect">{{ritardo}} s</span>
+                    </div>
+                    <slider :min="0" :max="10" v-model="ritardo"></slider>
+                </div>
+            </section>
+            <footer>
+				<button class="btn" @click="annulla()">
+					Annulla
+				</button>
+				<button class="btn btn-success" @click="conferma()">
+					Conferma
+				</button>
+			</footer>
+		</modal>
+	</div>
+</template>
+
+<script lang="ts" src="./show-arretramento-riscladi-info.ts"></script>
\ No newline at end of file

From d3f2b8830adb1c30c0cf60947ca251756f4163a0 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Mon, 20 Apr 2020 16:57:13 +0200
Subject: [PATCH 33/42] add processo modal to the footer

---
 .../wwwroot/assets/styles/base/layout.less       |  1 +
 .../wwwroot/assets/styles/base/processo.less     | 11 +++++++++++
 Thermo.Active/wwwroot/assets/styles/style.css    |  5 +++++
 Thermo.Active/wwwroot/src/app.business-logic.ts  |  4 ++--
 Thermo.Active/wwwroot/src/app.routes.ts          |  4 ++--
 .../show-arretramento-riscladi-info.ts           |  2 +-
 .../show-arretramento-riscladi-info.vue          |  0
 .../processo/components/processo.ts              | 16 ++++++++++++++++
 .../processo/components/processo.vue             |  9 +++++++++
 .../src/app_modules_thermo/processo/route.js     |  8 ++++++++
 10 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 Thermo.Active/wwwroot/assets/styles/base/processo.less
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => processo}/arretramento-riscaldi/show-arretramento-riscladi-info.ts (93%)
 rename Thermo.Active/wwwroot/src/app_modules_thermo/{ => processo}/arretramento-riscaldi/show-arretramento-riscladi-info.vue (100%)
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js

diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less
index f98f8283..b2f1a151 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/layout.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less
@@ -10,6 +10,7 @@
 @import "setup.less";
 @import "ciclo.less";
 @import "raffreddamento.less";
+@import "processo.less";
 @import "controstamposetup.less";
 @import "quote-velocita.less";
 @import "opzioni.less";
diff --git a/Thermo.Active/wwwroot/assets/styles/base/processo.less b/Thermo.Active/wwwroot/assets/styles/base/processo.less
new file mode 100644
index 00000000..83652a1c
--- /dev/null
+++ b/Thermo.Active/wwwroot/assets/styles/base/processo.less
@@ -0,0 +1,11 @@
+// out: false, sourceMap: false, main: ../style.less
+@import "grid-system.less";
+@import "colors.less";
+@import "fonts.less";
+@modal: modal;
+
+.@{modal}.processo-info {
+    width: 1820px;
+    height: 980px;
+    margin: 150px 193px;
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 73fc614d..6e59be8d 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4474,6 +4474,11 @@
   margin-left: 50px;
   width: 480px;
 }
+.modal.processo-info {
+  width: 1820px;
+  height: 980px;
+  margin: 150px 193px;
+}
 .modal.controstamposetup-info {
   width: 1820px;
   height: 980px;
diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts
index 40cd4c9b..0ea51ce9 100644
--- a/Thermo.Active/wwwroot/src/app.business-logic.ts
+++ b/Thermo.Active/wwwroot/src/app.business-logic.ts
@@ -16,7 +16,7 @@ import ShowEstrazioneInfo from "@/app_modules_thermo/setup/estrazione/components
 import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue";
 import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue";
 import ShowOpzioniInfo from "@/app_modules_thermo/setup/opzioni/show-opzioni-info.vue";
-import ShowArretramentoRiscaldiInfo from "@/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscaldi-info.vue";
+import ShowArretramentoRiscaldiInfo from "@/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue";
 // import { DataService } from "./services/dataService";
 // import { ToolingService } from "./services/toolingService";
 // import { DepotService } from "./services/depotService";
@@ -51,7 +51,7 @@ let HMIScreenshotInterval;
 let HMIprodTimeout;
 let RerenderInterval;
 
-messageService.subscribeToChannel("show-arretramento-riscaldi-info", () => { ModalHelper.ShowModal(ShowOpzioniInfo); });
+messageService.subscribeToChannel("show-arretramento-riscaldi-info", () => { ModalHelper.ShowModal(ShowArretramentoRiscaldiInfo); });
 messageService.subscribeToChannel("show-opzioni-info", () => { ModalHelper.ShowModal(ShowOpzioniInfo); });
 messageService.subscribeToChannel("show-vuoto-info", () => { ModalHelper.ShowModal(ShowVuotoInfo); });
 messageService.subscribeToChannel("show-estrazione-info", () => { ModalHelper.ShowModal(ShowEstrazioneInfo); });
diff --git a/Thermo.Active/wwwroot/src/app.routes.ts b/Thermo.Active/wwwroot/src/app.routes.ts
index e38f562d..75594578 100644
--- a/Thermo.Active/wwwroot/src/app.routes.ts
+++ b/Thermo.Active/wwwroot/src/app.routes.ts
@@ -60,7 +60,7 @@ export let routes = [
 
 
 import { routes as alarmRoutes } from "@/app_modules/alarms/route.js";
-// import { routes as productionRoutes } from "./app_modules/production/route";
+import { routes as productionRoutes } from "./app_modules_thermo/processo/route.js";
 import { routes as SetupRoutes } from "@/app_modules_thermo/setup/route.js";
 // import { routes as toolingRoutes} from "./app_modules/tooling/route";
 // import { routes as maintenance } from "./app_modules/maintenance/route";
@@ -69,7 +69,7 @@ import { routes as SetupRoutes } from "@/app_modules_thermo/setup/route.js";
 // import { routes as users } from "./app_modules/users/route";
 
 injectRoutes(routes, alarmRoutes);
-// injectRoutes(routes, productionRoutes);
+injectRoutes(routes, productionRoutes);
 injectRoutes(routes, SetupRoutes);
 // injectRoutes(routes, toolingRoutes);
 // injectRoutes(routes, maintenance);
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.ts
similarity index 93%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.ts
rename to Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.ts
index f683ddf8..5d29892e 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import Component from 'vue-class-component';
 import {Prop} from 'vue-property-decorator';
-import Slider from "../components/slider.vue"
+import Slider from "@/app_modules_thermo/components/slider.vue";
 import { Modal, ModalHelper } from "@/components/modals";
 import { Factory, messageService, awaiter } from "@/_base";
 
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue
similarity index 100%
rename from Thermo.Active/wwwroot/src/app_modules_thermo/arretramento-riscaldi/show-arretramento-riscladi-info.vue
rename to Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
new file mode 100644
index 00000000..68009a2c
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
@@ -0,0 +1,16 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+import { messageService } from "@/_base/messageService";
+import { Modal, ModalHelper } from "@/components/modals"
+
+@Component({
+    components: {
+        modal: Modal
+    }
+})
+export default class Processo extends Vue{
+    public sendMessage(name: string) {
+        messageService.publishToChannel(name);
+    }
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue
new file mode 100644
index 00000000..d50267ba
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue
@@ -0,0 +1,9 @@
+<template>
+    <div class="container">
+        <modal type="processo-info" :title="'processo_lbl_title' | localize('Processo')">
+
+        </modal>
+    </div>
+</template>
+
+<script lang="ts" src="./processo.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js
new file mode 100644
index 00000000..64468b07
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js
@@ -0,0 +1,8 @@
+import  Setup  from "./components/processo.vue"
+
+export const routes = [
+  {
+    name: 'production', path: "/production",
+    meta: { title: "Production", area: "production" },
+    component: Setup
+  }];
\ No newline at end of file

From 50873adeb719aa18457fc31a2f29fe9907ac23b5 Mon Sep 17 00:00:00 2001
From: "francesco.guerrieri" <fraguerr1987@gmail.com>
Date: Mon, 20 Apr 2020 18:37:50 +0200
Subject: [PATCH 34/42] add tab stampo in modal quote-velocita

---
 .../svg/disegno-quote-velocita-stampo.svg     | 397 ++++++++++++++++++
 .../components/SVG_Components/stampo.ts       |  14 +
 .../components/SVG_Components/stampo.vue      |  67 +++
 .../components/salita-stampo.ts               |  20 +
 .../components/salita-stampo.vue              |  63 +++
 .../components/show-quote-velocita-info.ts    |   2 +
 .../components/show-quote-velocita-info.vue   |   1 +
 7 files changed, 564 insertions(+)
 create mode 100644 Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue

diff --git a/Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg b/Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg
new file mode 100644
index 00000000..60b38a87
--- /dev/null
+++ b/Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 297 210"
+   height="210mm"
+   width="297mm">
+  <defs
+     id="defs2">
+    <marker
+       style="overflow:visible"
+       id="TriangleOutL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.8)"
+         style="fill-rule:evenodd;stroke:#bbbcbc;stroke-width:1pt;stroke-opacity:1;fill:#bbbcbc;fill-opacity:1"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         id="path1162" />
+    </marker>
+    <marker
+       orient="auto-start-reverse"
+       refY="3.0"
+       refX="5.0"
+       id="marker4178">
+      <path
+         id="path4176"
+         d="m 10,3 -10,3 0,-6 z"
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1" />
+    </marker>
+    <marker
+       orient="auto-start-reverse"
+       refY="3.0"
+       refX="5.0"
+       id="marker4066">
+      <path
+         id="path4064"
+         d="m 10,3 -10,3 0,-6 z"
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1" />
+    </marker>
+    <marker
+       orient="auto-start-reverse"
+       refY="3.0"
+       refX="5.0"
+       id="marker3448">
+      <path
+         id="path3446"
+         d="m 10,3 -10,3 0,-6 z"
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1" />
+    </marker>
+    <marker
+       id="marker3312"
+       refX="5.0"
+       refY="3.0"
+       orient="auto-start-reverse">
+      <path
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1"
+         d="m 10,3 -10,3 0,-6 z"
+         id="path3310" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="StopL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.8)"
+         style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bbbcbc;stroke-width:1pt;stroke-opacity:1"
+         d="M 0.0,5.65 L 0.0,-5.65"
+         id="path1189" />
+    </marker>
+    <marker
+       orient="auto-start-reverse"
+       refY="3.0"
+       refX="5.0"
+       id="marker1984">
+      <path
+         id="path1982"
+         d="m 10,3 -10,3 0,-6 z"
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1" />
+    </marker>
+    <marker
+       orient="auto-start-reverse"
+       refY="3.0"
+       refX="5.0"
+       id="marker1920">
+      <path
+         id="path1918"
+         d="m 10,3 -10,3 0,-6 z"
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="marker1502"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.6) translate(0,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path1500" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Arrow2Sstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.3) translate(-2.3,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#bbbcbc;stroke-opacity:1;fill:#bbbcbc;fill-opacity:1"
+         id="path1050" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="marker1406"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.4) translate(10,0)"
+         style="fill-rule:evenodd;stroke:#bbbcbc;stroke-width:1pt;stroke-opacity:1;fill:#bbbcbc;fill-opacity:1"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path1404" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow2Mend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.6) rotate(180) translate(0,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#bbbcbc;stroke-opacity:1;fill:#bbbcbc;fill-opacity:1"
+         id="path1047" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Arrow2Mstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.6) translate(0,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#bbbcbc;stroke-opacity:1;fill:#bbbcbc;fill-opacity:1"
+         id="path1044" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Arrow1Mstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.4) translate(10,0)"
+         style="fill-rule:evenodd;stroke:#bbbcbc;stroke-width:1pt;stroke-opacity:1;fill:#bbbcbc;fill-opacity:1"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path1026" />
+    </marker>
+    <marker
+       id="ExperimentalArrow"
+       refX="5.0"
+       refY="3.0"
+       orient="auto-start-reverse">
+      <path
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1"
+         d="m 10,3 -10,3 0,-6 z"
+         id="path1273" />
+    </marker>
+    <marker
+       orient="auto-start-reverse"
+       refY="3"
+       refX="5"
+       id="ExperimentalArrow-5">
+      <path
+         id="path1273-2"
+         d="M 10,3 0,6 V 0 Z"
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1" />
+    </marker>
+    <marker
+       orient="auto-start-reverse"
+       refY="3"
+       refX="5"
+       id="ExperimentalArrow-2">
+      <path
+         id="path1273-1"
+         d="M 10,3 0,6 V 0 Z"
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1" />
+    </marker>
+    <marker
+       orient="auto-start-reverse"
+       refY="3"
+       refX="5"
+       id="ExperimentalArrow-3">
+      <path
+         id="path1273-6"
+         d="M 10,3 0,6 V 0 Z"
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <path
+       id="path963"
+       d="M 153.3124,209.28528 152.49594,0.54430501"
+       style="fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path965"
+       d="M 146.1459,0.54430501 Z"
+       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path967"
+       d="m 19.050677,101.51288 101.609593,0.0638 v 0 0 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 20.412138,114.21333 26.766659,0.0328 v 0 0 0"
+       id="path967-2" />
+    <g
+       style="fill:#99cfff;fill-rule:evenodd;stroke:#002680;stroke-width:4;stroke-linejoin:round"
+       id="g842"
+       transform="matrix(0.26458333,0,0,0.26458333,29.379024,62.682969)">
+      <rect
+         id="Rectangle-Copy"
+         x="11"
+         y="147"
+         width="334"
+         height="48" />
+      <rect
+         id="Rectangle-Copy-2"
+         x="0"
+         y="199"
+         width="356"
+         height="4" />
+      <polygon
+         id="Rectangle"
+         points="257.62107,0 287.62107,147 68,147 98,0 " />
+      <polygon
+         id="polygon840"
+         transform="matrix(1,0,0,-1,0,326)"
+         points="257.62107,147 287.62107,179 68,179 98,147 " />
+    </g>
+    <path
+       id="path1002"
+       d="M 21.772202,101.78503 21.500048,20.955744 v 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path1004"
+       d="m 120.66149,97.333739 -0.94916,-76.580337 v 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.495984;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker3312)" />
+    <path
+       id="path1006"
+       d="M 6.2590363,20.955471 148.32359,20.41171 v 0 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.515813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path1012"
+       d="M 74.297634,22.588657 V 32.658299"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#ExperimentalArrow);marker-end:url(#ExperimentalArrow)" />
+    <path
+       id="path1014"
+       d="m 23.949928,117.40058 -5.26e-4,66.76812 v 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.499017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker3448)" />
+    <path
+       id="path1016"
+       d="M 7.0759652,184.5194 134.44334,184.24725"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       id="path1018"
+       d="m 162.20368,100.69655 32.94825,0.0636 v 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.530934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.420779;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#ExperimentalArrow-5)"
+       d="M 129.27244,20.275362 V 31.418383"
+       id="path1012-1" />
+    <path
+       id="path1012-1-6"
+       d="m 8.7088804,22.479905 v 5.473956"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.29492;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1984);marker-end:url(#StopL)" />
+    <path
+       id="path3838"
+       d="m 202.75362,109.94961 h -40.55073 v 0"
+       style="fill:none;stroke:#bbbcbd;stroke-width:0.525286;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path4058"
+       d="m 268.07022,100.96858 h 16.60132"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.517246;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path4060"
+       d="m 271.33605,114.84836 h 13.06331"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.505291;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.374447;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#ExperimentalArrow-2);marker-end:url(#ExperimentalArrow-2)"
+       d="m 283.85507,103.22423 v 8.8242"
+       id="path1012-9" />
+    <g
+       style="fill:#99cfff;fill-rule:evenodd;stroke:#002680;stroke-width:4;stroke-linejoin:round"
+       id="g918"
+       transform="matrix(0.26458333,0,0,0.26458333,177.42999,62.410816)">
+      <rect
+         id="Rectangle-Copy-5"
+         x="11"
+         y="147"
+         width="334"
+         height="48" />
+      <rect
+         id="Rectangle-Copy-2-3"
+         x="0"
+         y="199"
+         width="356"
+         height="4" />
+      <polygon
+         id="Rectangle-1"
+         points="98,0 257.62107,0 287.62107,147 68,147 " />
+      <polygon
+         id="polygon916"
+         transform="matrix(1,0,0,-1,0,326)"
+         points="98,147 257.62107,147 287.62107,179 68,179 " />
+    </g>
+    <path
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#ExperimentalArrow-3);marker-end:url(#ExperimentalArrow-3)"
+       d="M 172.00039,65.116252 V 97.086645"
+       id="path1012-5" />
+    <path
+       id="path6954"
+       d="M 203.02577,62.050773 H 171.18393"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       id="path7676"
+       d="m 283.85508,115.10538 v 4.08228 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path7678"
+       d="M 165.19657,96.971722 V 109.67746"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.585901;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#TriangleOutL)" />
+    <path
+       id="path7680"
+       d="m 165.19657,112.39898 v 5.98736"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4178)" />
+    <rect
+       y="13.879778"
+       x="119.47496"
+       height="5.9873552"
+       width="28.848167"
+       id="rect10284"
+       style="fill:#979797;fill-opacity:1;stroke:none;stroke-width:0.490824;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke" />
+    <text
+       id="text8340"
+       y="19.322828"
+       x="119.20281"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.99722000000000044px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1;"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.99722000000000044px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1;"
+         y="19.322828"
+         x="119.20281"
+         id="tspan8338">1059 mm</tspan></text>
+    <rect
+       style="fill:#979797;fill-opacity:1;stroke:none;stroke-width:0.39886;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+       id="rect10284-2"
+       width="19.050678"
+       height="5.9873552"
+       x="115.12051"
+       y="177.71559" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.99723px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
+       x="116.48128"
+       y="183.15865"
+       id="text8340-0"><tspan
+         id="tspan8338-1"
+         x="116.48128"
+         y="183.15865"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.99723px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1">0 mm</tspan></text>
+  </g>
+</svg>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts
new file mode 100644
index 00000000..b2739e23
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts
@@ -0,0 +1,14 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+
+@Component({})
+export default class QuoteVelocita extends Vue{
+    @Prop({default:0})
+    x:number;
+    @Prop({default:0})
+    y:number;
+    @Prop({default:0})
+    spes:number;
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
new file mode 100644
index 00000000..c79cdca7
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
@@ -0,0 +1,67 @@
+<template>
+    <div class="svg-area">
+        <img class="disegnoQuoteVelocita" src="assets/icons/svg/disegno-quote-velocita-stampo.svg">
+        <div class="input-circles">
+            <div class="circle circle1">
+                <div>
+                    <img src="assets/icons/png/salita.png">
+                    <label>{{spes}} mm</label>
+                </div>
+                <div>
+                    <img src="assets/icons/png/bassa.png">
+                    <label>30 mm/s</label>
+                </div>
+            </div>
+            <div class="circle circle2">
+                <div>
+                    <img src="assets/icons/png/salita.png">
+                    <label>{{x}} mm</label>
+                </div>
+                <div>
+                    <img src="assets/icons/png/alta.png">
+                    <label>100 mm/s</label>
+                </div>
+            </div>
+            <div class="circle circle3">
+                <div>
+                    <img src="assets/icons/png/discesa.png">
+                    <label>{{y}} mm</label>
+                </div>
+                <div>
+                    <img src="assets/icons/png/alta.png">
+                    <label>100 mm/s</label>
+                </div>
+            </div>
+            <div class="circle circle4">
+                <div>
+                    <img src="assets/icons/png/quota.png">
+                    <label>{{y}} mm</label>
+                </div>
+            </div>
+            <div class="circle circle5">
+                <div>
+                    <img src="assets/icons/png/discesa.png">
+                    <label>{{y}} mm</label>
+                </div>
+                <div>
+                    <img src="assets/icons/png/alta.png">
+                    <label>8 mm/s</label>
+                </div>
+            </div>
+            <div class="circle circle6">
+                <div>
+                    <img src="assets/icons/png/discesa.png">
+                    <label>{{y}} mm</label>
+                </div>
+                <div>
+                    <img src="assets/icons/png/bassa.png">
+                    <label>30 mm/s</label>
+                </div>
+            </div>
+            <span class="circle7">123 mm</span>
+            <span class="circle8">0 mm</span>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" src="./quote-velocita.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts
new file mode 100644
index 00000000..7837688e
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts
@@ -0,0 +1,20 @@
+import Vue from "vue";
+import Component from "vue-class-component";
+import { Prop } from 'vue-property-decorator';
+import Slider from "@/app_modules_thermo/components/slider.vue"
+// import QuoteVelocitaSVG from "./SVG_Components/quote-velocita.vue";
+
+@Component({name:"salitastampo", components:{slider:Slider}})
+export default class DiscesaCornice extends Vue {
+
+    @Prop({default:0})
+    ritardo:number;
+    @Prop({default:0})
+    corsa:number;
+    @Prop({default:0})
+    velSalita:number;
+    @Prop({default:0})
+    ralSalita:number;
+    @Prop({default:0})
+    velSalitaLenta:number;
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue
new file mode 100644
index 00000000..9c427109
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue
@@ -0,0 +1,63 @@
+<template>
+	<section>
+		<aside class="scrollable">
+			<div class="box">
+				<div class="header">
+					<label>Salita stampo</label>
+				</div>
+				<div class="body">
+					<div class="input-area">
+						<img src="assets/icons/png/clessidra.png" />
+						<label>Ritardo</label>
+						<span class="rect">{{ritardo}} s</span>
+					</div>
+					<slider :min="0" :max="10" v-model="ritardo" :left="'0'" :middle="'5'" :right="'10'"></slider>
+
+					<hr />
+
+					<div class="input-area">
+						<img src="assets/icons/png/salita.png" />
+						<label>Corsa</label>
+						<span class="rect">{{corsa}} mm</span>
+					</div>
+					<slider :min="0" :max="1059" v-model="corsa" :left="'0'" :middle="'530'" :right="'1059'"></slider>
+					<div class="input-area">
+						<img src="assets/icons/png/alta.png" />
+						<label>Velocità salita</label>
+						<span class="rect">{{velSalita}} mm/s</span>
+					</div>
+					<slider :min="0" :max="200" v-model="velSalita" :left="'0'" :middle="'100'" :right="'200'"></slider>
+
+					<hr />
+
+					<div class="input-area">
+						<img src="assets/icons/png/salita.png" />
+						<label>Rallentamento salita</label>
+						<span class="rect">{{ralSalita}} mm</span>
+					</div>
+					<slider :min="0" :max="1059" v-model="ralSalita" :left="'0'" :middle="'530'" :right="'1059'"></slider>
+					<div class="input-area">
+						<img src="assets/icons/png/bassa.png" />
+						<label>Velocità salita lenta</label>
+						<span class="rect">{{velSalitaLenta}} mm/s</span>
+					</div>
+					<slider
+						:min="0"
+						:max="200"
+						v-model="velSalitaLenta"
+						:left="'0'"
+						:middle="'100'"
+						:right="'200'"
+					></slider>
+				</div>
+			</div>
+		</aside>
+		<div class="specific">
+			<button>
+				<img src="assets/icons/png/w.png" />
+			</button>
+		</div>
+	</section>
+</template>
+
+<script lang="ts" src="./salita-stampo.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts
index 291d0a3f..8a5cf7cf 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts
@@ -3,12 +3,14 @@ import { Modal, ModalHelper } from "@/components/modals";
 import { Factory, messageService, awaiter } from "@/_base";
 import Component from "vue-class-component";
 import DiscesaCornice from "./discesa-cornice.vue";
+import SalitaStampo from "./salita-stampo.vue";
 import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"
 
 @Component({
   components: {
     modal: Modal,
     discesacornice: DiscesaCornice,
+    salitaStampo: SalitaStampo,
     stepfooter: StepFooter
   }
 })
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue
index 44206b9c..709801d3 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue
@@ -12,6 +12,7 @@
 				</button>
 			</div>
 			<discesacornice v-if="show=='QC'"></discesacornice>
+			<salitastampo v-if="show=='QS'"></salitastampo>
 			<footer>
 				<button class="btn" @click="annulla()">Annulla</button>
 				<button class="btn btn-success" @click="conferma()">Conferma</button>

From 8f51ac0db76378597f57dc9f98c24c05cb09be6a Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 21 Apr 2020 10:17:38 +0200
Subject: [PATCH 35/42] add programmazione preriscaldo modal

---
 .../wwwroot/assets/styles/base/layout.less    |  1 +
 .../assets/styles/base/progrprerisc.less      | 47 +++++++++++++++++++
 Thermo.Active/wwwroot/assets/styles/style.css | 30 ++++++++++++
 Thermo.Active/wwwroot/src/app.routes.ts       |  2 +
 .../processo/components/processo.ts           |  2 +-
 .../src/app_modules_thermo/processo/route.js  |  4 +-
 .../components/programmazione-preriscaldo.ts  | 26 ++++++++++
 .../components/programmazione-preriscaldo.vue | 33 +++++++++++++
 .../programmazione-preriscaldo/route.js       |  8 ++++
 .../wwwroot/src/modules/app-footer.vue        | 16 ++++---
 10 files changed, 160 insertions(+), 9 deletions(-)
 create mode 100644 Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/route.js

diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less
index b2f1a151..f04c8c32 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/layout.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less
@@ -11,6 +11,7 @@
 @import "ciclo.less";
 @import "raffreddamento.less";
 @import "processo.less";
+@import "progrprerisc.less";
 @import "controstamposetup.less";
 @import "quote-velocita.less";
 @import "opzioni.less";
diff --git a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
new file mode 100644
index 00000000..6084ef32
--- /dev/null
+++ b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
@@ -0,0 +1,47 @@
+// out: false, sourceMap: false, main: ../style.less
+@import "grid-system.less";
+@import "colors.less";
+@import "fonts.less";
+@modal: modal;
+
+.@{modal}.progr-preriscaldo-info {
+    width: 1639px;
+    height: 565px;
+    margin: 200px 250px;
+
+    header {
+        padding-left: 31px;
+        display: flex;
+        align-items: center;
+        font-size: 20px;
+        font-weight: bold;
+        color: darkblue;
+    }
+
+    section{
+
+        aside{
+
+            button{
+                width: 197px;
+                height: 48px;
+                object-fit: contain;
+                border-radius: 2px;
+                box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
+                border: solid 1px #001e48;
+                background-image: linear-gradient(to bottom, #1756ad, #002680);
+                font-size: 18px;
+                font-weight: 500;
+                font-stretch: normal;
+                font-style: normal;
+                line-height: normal;
+                letter-spacing: normal;
+                text-align: center;
+                color: white;
+            }
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 6e59be8d..c12b3eeb 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4479,6 +4479,36 @@
   height: 980px;
   margin: 150px 193px;
 }
+.modal.progr-preriscaldo-info {
+  width: 1639px;
+  height: 565px;
+  margin: 200px 250px;
+}
+.modal.progr-preriscaldo-info header {
+  padding-left: 31px;
+  display: flex;
+  align-items: center;
+  font-size: 20px;
+  font-weight: bold;
+  color: darkblue;
+}
+.modal.progr-preriscaldo-info section aside button {
+  width: 197px;
+  height: 48px;
+  object-fit: contain;
+  border-radius: 2px;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
+  border: solid 1px #001e48;
+  background-image: linear-gradient(to bottom, #1756ad, #002680);
+  font-size: 18px;
+  font-weight: 500;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  text-align: center;
+  color: white;
+}
 .modal.controstamposetup-info {
   width: 1820px;
   height: 980px;
diff --git a/Thermo.Active/wwwroot/src/app.routes.ts b/Thermo.Active/wwwroot/src/app.routes.ts
index 75594578..0d15bf8e 100644
--- a/Thermo.Active/wwwroot/src/app.routes.ts
+++ b/Thermo.Active/wwwroot/src/app.routes.ts
@@ -62,6 +62,7 @@ export let routes = [
 import { routes as alarmRoutes } from "@/app_modules/alarms/route.js";
 import { routes as productionRoutes } from "./app_modules_thermo/processo/route.js";
 import { routes as SetupRoutes } from "@/app_modules_thermo/setup/route.js";
+import { routes as ProgrPreriscaldoRoutes } from "@/app_modules_thermo/programmazione-preriscaldo/route.js";
 // import { routes as toolingRoutes} from "./app_modules/tooling/route";
 // import { routes as maintenance } from "./app_modules/maintenance/route";
 // import { routes as scada} from "./app_modules/scada/route";
@@ -71,6 +72,7 @@ import { routes as SetupRoutes } from "@/app_modules_thermo/setup/route.js";
 injectRoutes(routes, alarmRoutes);
 injectRoutes(routes, productionRoutes);
 injectRoutes(routes, SetupRoutes);
+injectRoutes(routes,ProgrPreriscaldoRoutes);
 // injectRoutes(routes, toolingRoutes);
 // injectRoutes(routes, maintenance);
 // injectRoutes(routes, scada);
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
index 68009a2c..7ffb8c95 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
@@ -2,7 +2,7 @@ import Vue from 'vue';
 import Component from 'vue-class-component';
 import {Prop} from 'vue-property-decorator';
 import { messageService } from "@/_base/messageService";
-import { Modal, ModalHelper } from "@/components/modals"
+import { Modal, ModalHelper } from "@/components/modals";
 
 @Component({
     components: {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js
index 64468b07..5341564c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js
@@ -1,8 +1,8 @@
-import  Setup  from "./components/processo.vue"
+import  Processo  from "./components/processo.vue"
 
 export const routes = [
   {
     name: 'production', path: "/production",
     meta: { title: "Production", area: "production" },
-    component: Setup
+    component: Processo
   }];
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts
new file mode 100644
index 00000000..67bf8ddf
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts
@@ -0,0 +1,26 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+import { messageService } from "@/_base/messageService";
+import { Modal, ModalHelper } from "@/components/modals";
+import ToggleButton from "@/components/toggleButton.vue";
+
+@Component({
+    components: {
+        modal: Modal,
+        ToggleButton
+    }
+})
+export default class ProgrammazionePreriscaldo extends Vue{
+    
+    enabling:boolean=true;
+    risc:boolean=true;
+    termo:boolean=true;
+    block:boolean=false;
+
+    
+    public sendMessage(name: string) {
+        messageService.publishToChannel(name);
+    }
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue
new file mode 100644
index 00000000..0bc4b6a4
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="container">
+        <modal type="progr-preriscaldo-info" :title="'progr-preriscaldo_lbl_title' | localize('Programmazione preriscaldo')">
+            <section>
+                <aside class="scrollable auto">
+                    <div class="input-area">
+                        <label>Abilitazione</label>
+                        <toggle-button v-model="enabling"></toggle-button>
+                    </div>
+                    <hr>
+                    <div class="input-area">
+                        <label>Riscaldi</label>
+                        <toggle-button v-model="risc"></toggle-button>
+                    </div>
+                    <div class="input-area">
+                        <label>Termoregolatore</label>
+                        <toggle-button v-model="termo"></toggle-button>
+                    </div>                                        
+                    <div class="input-area">
+                        <label>Blocca schermo</label>
+                        <toggle-button v-model="block"></toggle-button>
+                    </div>
+                    <button>Mostra countdown</button>
+                </aside>
+                <div class="specific">
+
+                </div>    
+            </section>
+        </modal>
+    </div>
+</template>
+
+<script lang="ts" src="./programmazione-preriscaldo.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/route.js b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/route.js
new file mode 100644
index 00000000..9e1c0c70
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/route.js
@@ -0,0 +1,8 @@
+import  ProgrammazionePreriscaldo  from "./components/programmazione-preriscaldo.vue"
+
+export const routes = [
+  {
+    name: 'progrprerisc', path: "/progrprerisc",
+    meta: { title: "Progrprerisc", area: "progrprerisc" },
+    component: ProgrammazionePreriscaldo
+  }];
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/modules/app-footer.vue b/Thermo.Active/wwwroot/src/modules/app-footer.vue
index d3ee335d..0323165d 100644
--- a/Thermo.Active/wwwroot/src/modules/app-footer.vue
+++ b/Thermo.Active/wwwroot/src/modules/app-footer.vue
@@ -80,9 +80,11 @@
         
        <button @click="openProgram('/ricetta')" :title="'footer_tooltip_ricetta' | localize('Apertura Ricetta')"
               :disabled="!isAreaEnabled('ricetta')" v-if="isAreaVisible('ricetta')" class="oval ricetta" :class="{ big:isInPath('ricetta') && !state.isMainViewLiftedUp}"></button> 
-        <button @click="openProgram('/setup')" :title="'footer_tooltip_setup' | localize('Setup')"
+        
+		<button @click="openProgram('/setup')" :title="'footer_tooltip_setup' | localize('Setup')"
               :disabled="!isAreaEnabled('jobeditor')" v-if="isAreaVisible('jobeditor')" class="oval jobeditor" :class="{ big:isInPath('setup') && !state.isMainViewLiftedUp}"></button>
-      <button @click="openProgram('/production')" :title="'footer_tooltip_production' | localize('Production')"
+      	
+		<button @click="openProgram('/production')" :title="'footer_tooltip_production' | localize('Production')"
               :disabled="!isAreaEnabled('production')" v-if="isAreaVisible('production')" class="oval main-production" :class="{ big:isInPath('production') && !state.isMainViewLiftedUp}"> </button>
       
       <!-- <button @click="openProgram('/tooling')" :title="'footer_tooltip_tooling' | localize('Tooling')"
@@ -90,7 +92,8 @@
       
       <button @click="openProgram('/report')" :title="'footer_tooltip_report' | localize('Report')"
               :disabled="!isAreaEnabled('report')" v-if="isAreaVisible('report')" class="oval report-manager" :class="{ big:isInPath('report') && !state.isMainViewLiftedUp}"></button>
-      <button @click="openProgram('/alarms')" :title="'footer_tooltip_alarms' | localize('Alarms')"
+      
+	  <button @click="openProgram('/alarms')" :title="'footer_tooltip_alarms' | localize('Alarms')"
               :disabled="!isAreaEnabled('alarms')" v-if="isAreaVisible('alarms')" class="oval alarms-manager" :class="{ big:isInPath('alarms') && !state.isMainViewLiftedUp}"></button>
      
       <!-- <button @click="openProgram('/maintenance')" :title="'footer_tooltip_maintenance' | localize('Maintenance')"
@@ -103,9 +106,10 @@
               :disabled="!isAreaEnabled('utilities')" v-if="isAreaVisible('utilities')" class="oval utilities" :class="{ big:isInPath('utilities') && !state.isMainViewLiftedUp}"></button> -->
          
          
-        <button @click="openProgram('/progr-prerisc')" :title="'footer_tooltip_progr_prerisc' | localize('Programmazione Preriscaldo')"
-              :disabled="!isAreaEnabled('progrprerisc')" v-if="isAreaVisible('progrprerisc')" class="oval progrprerisc" :class="{ big:isInPath('progr-prerisc') && !state.isMainViewLiftedUp}"></button> 
-        <button @click="openProgram('/clock')" :title="'footer_tooltip_clock' | localize('Clock')"
+        <button @click="openProgram('/progrprerisc')" :title="'footer_tooltip_progr_prerisc' | localize('Programmazione Preriscaldo')"
+              :disabled="!isAreaEnabled('progrprerisc')" v-if="isAreaVisible('progrprerisc')" class="oval progrprerisc" :class="{ big:isInPath('progrprerisc') && !state.isMainViewLiftedUp}"></button> 
+        
+		<button @click="openProgram('/clock')" :title="'footer_tooltip_clock' | localize('Clock')"
               :disabled="!isAreaEnabled('clock')" v-if="isAreaVisible('clock')" class="oval clock" :class="{ big:isInPath('clock') && !state.isMainViewLiftedUp}"></button>
       
       <!-- <div v-if="isAreaVisible('utilities') && getUtilities().length > 0" class="divider"><i class="fa fa-circle"></i></div>  

From 7ad369f97f82d59e8d109248b8b8da612368cfc3 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 21 Apr 2020 15:04:08 +0200
Subject: [PATCH 36/42] fix programmazione preriscaldo modal

---
 .../assets/styles/base/progrprerisc.less      | 116 +++++++++++++++---
 Thermo.Active/wwwroot/assets/styles/style.css |  70 ++++++++++-
 .../components/programmazione-preriscaldo.ts  |   4 +
 .../components/programmazione-preriscaldo.vue |  20 ++-
 4 files changed, 188 insertions(+), 22 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
index 6084ef32..d832a091 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
@@ -7,7 +7,7 @@
 .@{modal}.progr-preriscaldo-info {
     width: 1639px;
     height: 565px;
-    margin: 200px 250px;
+    margin-top: 100px;
 
     header {
         padding-left: 31px;
@@ -18,26 +18,104 @@
         color: darkblue;
     }
 
-    section{
+    section.body{
+        overflow: hidden;
 
-        aside{
+        section{
+            padding: 0px;
+            width: 100%;
+            height: 100%;
+
+            hr{
+                border: none;
+            }
+
+            aside{
+                margin: 14px;
+
+                button{
+                    width: 197px;
+                    height: 48px;
+                    object-fit: contain;
+                    border-radius: 2px;
+                    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
+                    border: solid 1px #001e48;
+                    background-image: linear-gradient(to bottom, #1756ad, #002680);
+                    font-size: 18px;
+                    font-weight: 500;
+                    font-stretch: normal;
+                    font-style: normal;
+                    line-height: normal;
+                    letter-spacing: normal;
+                    text-align: center;
+                    color: white;
+                    margin: auto;
+                }
+
+            }
+
+            .specific{
+                margin: 0;
+                padding: 20px;
+                width: 100%;
+                height: 100%;
+                background-color: #bbbcbc;
+
+                div{
+                    margin-bottom: 20px;
+
+                    div{
+
+                        &:first-of-type{
+                            width: 150px;
+                            height: 282px;
+                            background-image: linear-gradient(to bottom, #1756ad, @color-darkish-blue);
+                        }
+                    
+                    }
+                    
+                    button{
+                        border: none;
+                        width: 130px;
+                        height: 45px;
+                        border-radius: 22.5px;
+                        box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
+                        background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%);
+                        font-size: 18px;
+                        font-weight: 500;
+                        font-stretch: normal;
+                        font-style: normal;
+                        line-height: normal;
+                        letter-spacing: normal;
+                        text-align: center;
+                        color: white;
+                    }
+
+                    .active{
+                        box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.43);
+                        background-image: linear-gradient(to bottom, #42494e 0%, #818a8f 98%);
+                    }
+
+                }
+
+                label{
+                    margin-bottom: 20px;
+                    font-size: 24px;
+                    font-weight: 500;
+                    font-stretch: normal;
+                    font-style: normal;
+                    line-height: normal;
+                    letter-spacing: normal;
+                    color: @color-darkish-blue;
+                }
+
+                .clock {
+                    border-radius: 50%;
+                    background-color: white;
+                    height: 20em;
+                    width: 20em;
+                  }
 
-            button{
-                width: 197px;
-                height: 48px;
-                object-fit: contain;
-                border-radius: 2px;
-                box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
-                border: solid 1px #001e48;
-                background-image: linear-gradient(to bottom, #1756ad, #002680);
-                font-size: 18px;
-                font-weight: 500;
-                font-stretch: normal;
-                font-style: normal;
-                line-height: normal;
-                letter-spacing: normal;
-                text-align: center;
-                color: white;
             }
 
         }
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index c12b3eeb..d017625d 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4482,7 +4482,7 @@
 .modal.progr-preriscaldo-info {
   width: 1639px;
   height: 565px;
-  margin: 200px 250px;
+  margin-top: 100px;
 }
 .modal.progr-preriscaldo-info header {
   padding-left: 31px;
@@ -4492,7 +4492,21 @@
   font-weight: bold;
   color: darkblue;
 }
-.modal.progr-preriscaldo-info section aside button {
+.modal.progr-preriscaldo-info section.body {
+  overflow: hidden;
+}
+.modal.progr-preriscaldo-info section.body section {
+  padding: 0px;
+  width: 100%;
+  height: 100%;
+}
+.modal.progr-preriscaldo-info section.body section hr {
+  border: none;
+}
+.modal.progr-preriscaldo-info section.body section aside {
+  margin: 14px;
+}
+.modal.progr-preriscaldo-info section.body section aside button {
   width: 197px;
   height: 48px;
   object-fit: contain;
@@ -4508,6 +4522,58 @@
   letter-spacing: normal;
   text-align: center;
   color: white;
+  margin: auto;
+}
+.modal.progr-preriscaldo-info section.body section .specific {
+  margin: 0;
+  padding: 20px;
+  width: 100%;
+  height: 100%;
+  background-color: #bbbcbc;
+}
+.modal.progr-preriscaldo-info section.body section .specific div {
+  margin-bottom: 20px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div div:first-of-type {
+  width: 150px;
+  height: 282px;
+  background-image: linear-gradient(to bottom, #1756ad, #002680);
+}
+.modal.progr-preriscaldo-info section.body section .specific div button {
+  border: none;
+  width: 130px;
+  height: 45px;
+  border-radius: 22.5px;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
+  background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%);
+  font-size: 18px;
+  font-weight: 500;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  text-align: center;
+  color: white;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .active {
+  box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.43);
+  background-image: linear-gradient(to bottom, #42494e 0%, #818a8f 98%);
+}
+.modal.progr-preriscaldo-info section.body section .specific label {
+  margin-bottom: 20px;
+  font-size: 24px;
+  font-weight: 500;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  color: #002680;
+}
+.modal.progr-preriscaldo-info section.body section .specific .clock {
+  border-radius: 50%;
+  background-color: white;
+  height: 20em;
+  width: 20em;
 }
 .modal.controstamposetup-info {
   width: 1820px;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts
index 67bf8ddf..5768b62e 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts
@@ -17,6 +17,10 @@ export default class ProgrammazionePreriscaldo extends Vue{
     risc:boolean=true;
     termo:boolean=true;
     block:boolean=false;
+    
+    active:string="";
+
+    
 
     
     public sendMessage(name: string) {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue
index 0bc4b6a4..8b064520 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="container">
+    <div class="setup">
         <modal type="progr-preriscaldo-info" :title="'progr-preriscaldo_lbl_title' | localize('Programmazione preriscaldo')">
             <section>
                 <aside class="scrollable auto">
@@ -22,8 +22,26 @@
                     </div>
                     <button>Mostra countdown</button>
                 </aside>
+                <hr>
                 <div class="specific">
+                    <label>Ciao!</label>
+                    <div>
+                        <button :class="{'active':active=='lunedi'}" @click="active='lunedi'">Lunedì</button>
+                        <button :class="{'active':active=='martedi'}" @click="active='martedi'">Martedì</button>
+                        <button :class="{'active':active=='mercoledi'}" @click="active='mercoledi'">Mercoledì</button>
+                        <button :class="{'active':active=='giovedi'}" @click="active='giovedi'">Giovedì</button>
+                        <button :class="{'active':active=='venerdi'}" @click="active='venerdi'">Venerdì</button>
+                        <button :class="{'active':active=='sabato'}" @click="active='sabato'">Sabato</button>
+                        <button :class="{'active':active=='domenica'}" @click="active='domenica'">Domenica</button>
+                    </div>
+                    <div>
+                        <div>
 
+                        </div>
+                        <div class="clock">
+                            
+                        </div>
+                    </div>
                 </div>    
             </section>
         </modal>

From 2b68925057de025144f5734e614aad504179f79b Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 21 Apr 2020 16:17:22 +0200
Subject: [PATCH 37/42] fix programmazione preriscaldo modal

---
 .../wwwroot/assets/styles/base/progrprerisc.less     | 12 +++++++-----
 Thermo.Active/wwwroot/assets/styles/style.css        | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
index d832a091..cd2a5071 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
@@ -62,13 +62,15 @@
                 background-color: #bbbcbc;
 
                 div{
-                    margin-bottom: 20px;
+                    display: flex;
+                    margin-bottom: 50px;
 
                     div{
 
                         &:first-of-type{
-                            width: 150px;
-                            height: 282px;
+                            margin-right: 20px;
+                            width: 180px;
+                            height: 300px;
                             background-image: linear-gradient(to bottom, #1756ad, @color-darkish-blue);
                         }
                     
@@ -112,8 +114,8 @@
                 .clock {
                     border-radius: 50%;
                     background-color: white;
-                    height: 20em;
-                    width: 20em;
+                    height: 300px;
+                    width: 300px;
                   }
 
             }
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index d017625d..4b79d880 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4532,11 +4532,13 @@
   background-color: #bbbcbc;
 }
 .modal.progr-preriscaldo-info section.body section .specific div {
-  margin-bottom: 20px;
+  display: flex;
+  margin-bottom: 50px;
 }
 .modal.progr-preriscaldo-info section.body section .specific div div:first-of-type {
-  width: 150px;
-  height: 282px;
+  margin-right: 20px;
+  width: 180px;
+  height: 300px;
   background-image: linear-gradient(to bottom, #1756ad, #002680);
 }
 .modal.progr-preriscaldo-info section.body section .specific div button {
@@ -4572,8 +4574,8 @@
 .modal.progr-preriscaldo-info section.body section .specific .clock {
   border-radius: 50%;
   background-color: white;
-  height: 20em;
-  width: 20em;
+  height: 300px;
+  width: 300px;
 }
 .modal.controstamposetup-info {
   width: 1820px;

From 689c98f18a5d98007b3d20521e85b5b1496c8dd4 Mon Sep 17 00:00:00 2001
From: "francesco.guerrieri" <fraguerr1987@gmail.com>
Date: Tue, 21 Apr 2020 16:23:22 +0200
Subject: [PATCH 38/42] fix styles tab stampo in modal quote velocita

---
 .../svg/disegno-quote-velocita-stampo.svg     | 328 +++++++++++++-----
 .../assets/styles/base/quote-velocita.less    |  74 +++-
 .../wwwroot/assets/styles/base/setup.less     |   2 +-
 Thermo.Active/wwwroot/assets/styles/style.css |  65 +++-
 .../components/SVG_Components/stampo.vue      |  60 ++--
 .../components/salita-stampo.ts               |   4 +-
 .../components/salita-stampo.vue              |   1 +
 .../components/show-quote-velocita-info.vue   |   2 +-
 8 files changed, 418 insertions(+), 118 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg b/Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg
index 60b38a87..d3cde82c 100644
--- a/Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg
+++ b/Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg
@@ -5,13 +5,84 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0beta2 (2b71d25, 2019-12-03)"
+   sodipodi:docname="disegno-quote-velocita-stampo.svg"
    id="svg8"
    version="1.1"
    viewBox="0 0 297 210"
    height="210mm"
    width="297mm">
+  <sodipodi:namedview
+     inkscape:object-nodes="false"
+     inkscape:current-layer="layer1"
+     inkscape:window-maximized="1"
+     inkscape:window-y="23"
+     inkscape:window-x="1280"
+     inkscape:cy="394.22754"
+     inkscape:cx="520.21224"
+     inkscape:zoom="1.4623514"
+     showgrid="false"
+     id="namedview907"
+     inkscape:window-height="1311"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     inkscape:document-rotation="0"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
   <defs
      id="defs2">
+    <inkscape:perspective
+       id="perspective32764"
+       inkscape:persp3d-origin="148.5 : 70 : 1"
+       inkscape:vp_z="297 : 105 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 105 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:isstock="true"
+       id="marker1181"
+       refX="5.0"
+       refY="3.0"
+       orient="auto-start-reverse"
+       inkscape:stockid="ExperimentalArrow">
+      <path
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1"
+         d="m 10,3 -10,3 0,-6 z"
+         id="path1179" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="fill-rule:evenodd;stroke:#bbbcbc;stroke-width:1pt;stroke-opacity:1;fill:#bbbcbc;fill-opacity:1"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path912" />
+    </marker>
+    <marker
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker1176"
+       style="overflow:visible">
+      <path
+         id="path1055"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#bbbcbc;stroke-width:1pt;stroke-opacity:1;fill:#bbbcbc;fill-opacity:1"
+         transform="scale(0.8)" />
+    </marker>
     <marker
        style="overflow:visible"
        id="TriangleOutL"
@@ -208,6 +279,30 @@
          d="M 10,3 0,6 V 0 Z"
          style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1" />
     </marker>
+    <marker
+       id="marker1984-1"
+       refX="5"
+       refY="3"
+       orient="auto-start-reverse">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:context-stroke;stroke:#bbbcbc;stroke-opacity:1"
+         d="M 10,3 0,6 V 0 Z"
+         id="path1982-1" />
+    </marker>
+    <marker
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="StopL-8"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1189-1"
+         d="M 0,5.65 V -5.65"
+         style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bbbcbc;stroke-width:1pt;stroke-opacity:1"
+         transform="scale(0.8)" />
+    </marker>
   </defs>
   <metadata
      id="metadata5">
@@ -217,32 +312,35 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      id="layer1">
     <path
+       inkscape:connector-curvature="0"
        id="path963"
-       d="M 153.3124,209.28528 152.49594,0.54430501"
+       d="M 156.931,209.46621 156.11454,0.72523508"
        style="fill:#979797;fill-opacity:1;stroke:#979797;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
        id="path965"
        d="M 146.1459,0.54430501 Z"
        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
+       inkscape:connector-curvature="0"
        id="path967"
-       d="m 19.050677,101.51288 101.609593,0.0638 v 0 0 0"
+       d="m 26.520225,102.56968 101.609595,0.0638 v 0 0 0"
        style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
+       inkscape:connector-curvature="0"
        style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 20.412138,114.21333 26.766659,0.0328 v 0 0 0"
+       d="m 27.881686,115.27013 26.766659,0.0328 v 0 0 0"
        id="path967-2" />
     <g
        style="fill:#99cfff;fill-rule:evenodd;stroke:#002680;stroke-width:4;stroke-linejoin:round"
        id="g842"
-       transform="matrix(0.26458333,0,0,0.26458333,29.379024,62.682969)">
+       transform="matrix(0.26458333,0,0,0.26458333,36.848572,63.739768)">
       <rect
          id="Rectangle-Copy"
          x="11"
@@ -257,68 +355,76 @@
          height="4" />
       <polygon
          id="Rectangle"
-         points="257.62107,0 287.62107,147 68,147 98,0 " />
+         points="68,147 98,0 257.62107,0 287.62107,147 " />
       <polygon
          id="polygon840"
          transform="matrix(1,0,0,-1,0,326)"
-         points="257.62107,147 287.62107,179 68,179 98,147 " />
+         points="68,179 98,147 257.62107,147 287.62107,179 " />
     </g>
     <path
-       id="path1002"
-       d="M 21.772202,101.78503 21.500048,20.955744 v 0"
+       inkscape:connector-curvature="0"
+       id="path1004"
+       d="m 128.13064,101.64777 -0.94836,-79.838053 v 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.506214;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1006"
+       d="M 7.7467941,22.012593 144.96042,21.468186 v 0 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.507232;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1012"
+       d="M 81.767182,22.017085 V 32.086727"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1014"
+       d="m 31.419476,115.38155 -5.26e-4,69.84397 v 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.510365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1016"
+       d="M 14.545513,185.5762 141.91289,185.30405"
        style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       id="path1004"
-       d="m 120.66149,97.333739 -0.94916,-76.580337 v 0"
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.495984;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker3312)" />
-    <path
-       id="path1006"
-       d="M 6.2590363,20.955471 148.32359,20.41171 v 0 0"
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.515813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path1012"
-       d="M 74.297634,22.588657 V 32.658299"
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#ExperimentalArrow);marker-end:url(#ExperimentalArrow)" />
-    <path
-       id="path1014"
-       d="m 23.949928,117.40058 -5.26e-4,66.76812 v 0"
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.499017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker3448)" />
-    <path
-       id="path1016"
-       d="M 7.0759652,184.5194 134.44334,184.24725"
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
-    <path
+       inkscape:connector-curvature="0"
        id="path1018"
-       d="m 162.20368,100.69655 32.94825,0.0636 v 0"
+       d="m 169.07902,100.69655 32.94825,0.0636 v 0"
        style="fill:none;stroke:#bbbcbc;stroke-width:0.530934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.420779;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#ExperimentalArrow-5)"
-       d="M 129.27244,20.275362 V 31.418383"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.420779;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:"
+       d="M 136.74199,21.332161 V 32.475182"
        id="path1012-1" />
     <path
+       inkscape:connector-curvature="0"
        id="path1012-1-6"
-       d="m 8.7088804,22.479905 v 5.473956"
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.29492;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1984);marker-end:url(#StopL)" />
+       d="m 8.1373094,22.089263 v 7.19921"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.573405;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#StopL)" />
     <path
+       inkscape:connector-curvature="0"
        id="path3838"
-       d="m 202.75362,109.94961 h -40.55073 v 0"
+       d="m 209.62896,109.94961 h -40.55073 v 0"
        style="fill:none;stroke:#bbbcbd;stroke-width:0.525286;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
+       inkscape:connector-curvature="0"
        id="path4058"
-       d="m 268.07022,100.96858 h 16.60132"
+       d="m 274.94556,100.96858 h 16.60132"
        style="fill:none;stroke:#bbbcbc;stroke-width:0.517246;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
+       inkscape:connector-curvature="0"
        id="path4060"
-       d="m 271.33605,114.84836 h 13.06331"
+       d="M 278.21139,114.84836 H 291.2747"
        style="fill:none;stroke:#bbbcbc;stroke-width:0.505291;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.374447;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#ExperimentalArrow-2);marker-end:url(#ExperimentalArrow-2)"
-       d="m 283.85507,103.22423 v 8.8242"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.5132;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 290.73041,100.87214 v 14.2521"
        id="path1012-9" />
     <g
        style="fill:#99cfff;fill-rule:evenodd;stroke:#002680;stroke-width:4;stroke-linejoin:round"
        id="g918"
-       transform="matrix(0.26458333,0,0,0.26458333,177.42999,62.410816)">
+       transform="matrix(0.26458333,0,0,0.26458333,184.30533,62.410816)">
       <rect
          id="Rectangle-Copy-5"
          x="11"
@@ -333,65 +439,111 @@
          height="4" />
       <polygon
          id="Rectangle-1"
-         points="98,0 257.62107,0 287.62107,147 68,147 " />
+         points="257.62107,0 287.62107,147 68,147 98,0 " />
       <polygon
          id="polygon916"
          transform="matrix(1,0,0,-1,0,326)"
-         points="98,147 257.62107,147 287.62107,179 68,179 " />
+         points="257.62107,147 287.62107,179 68,179 98,147 " />
     </g>
     <path
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#ExperimentalArrow-3);marker-end:url(#ExperimentalArrow-3)"
-       d="M 172.00039,65.116252 V 97.086645"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.544692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 178.87573,62.402301 V 100.34339"
        id="path1012-5" />
     <path
+       inkscape:connector-curvature="0"
        id="path6954"
-       d="M 203.02577,62.050773 H 171.18393"
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
-    <path
-       id="path7676"
-       d="m 283.85508,115.10538 v 4.08228 0"
+       d="M 209.90111,62.050773 H 178.05927"
        style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       id="path7678"
-       d="M 165.19657,96.971722 V 109.67746"
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.585901;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#TriangleOutL)" />
+       inkscape:connector-curvature="0"
+       id="path7676"
+       d="m 290.73042,115.10538 v 4.08228 0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
+       inkscape:connector-curvature="0"
+       id="path7678"
+       d="M 172.07191,96.971722 V 109.67746"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.585901;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:" />
+    <path
+       inkscape:connector-curvature="0"
        id="path7680"
-       d="m 165.19657,112.39898 v 5.98736"
-       style="fill:none;stroke:#bbbcbc;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4178)" />
-    <rect
-       y="13.879778"
-       x="119.47496"
-       height="5.9873552"
-       width="28.848167"
-       id="rect10284"
-       style="fill:#979797;fill-opacity:1;stroke:none;stroke-width:0.490824;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke" />
-    <text
-       id="text8340"
-       y="19.322828"
-       x="119.20281"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.99722000000000044px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1;"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.99722000000000044px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1;"
-         y="19.322828"
-         x="119.20281"
-         id="tspan8338">1059 mm</tspan></text>
-    <rect
-       style="fill:#979797;fill-opacity:1;stroke:none;stroke-width:0.39886;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
-       id="rect10284-2"
-       width="19.050678"
-       height="5.9873552"
-       x="115.12051"
-       y="177.71559" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.99723px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
-       x="116.48128"
-       y="183.15865"
-       id="text8340-0"><tspan
-         id="tspan8338-1"
-         x="116.48128"
-         y="183.15865"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.99723px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1">0 mm</tspan></text>
+       d="m 172.07191,110.04689 v 8.33945"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#bbbcbc;stroke-width:0.510445;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 28.871798,21.809207 V 102.21125"
+       id="path1012-1-6-1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path32784"
+       d="m 178.74528,61.891705 -1.99023,4.161391 h 3.98046 z"
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.299082px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.299082px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 81.78039,21.621142 -1.99023,4.16139 h 3.98046 z"
+       id="path32784-2"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.299082px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 28.948815,21.983004 -1.99023,4.16139 h 3.98046 z"
+       id="path32784-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.299082px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.1418572,21.802077 -1.99023,4.16139 h 3.9804598 z"
+       id="path32784-5"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.299082px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 31.481832,115.52385 -1.99023,4.16139 h 3.98046 z"
+       id="path32784-57"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.299082px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 290.75461,101.04944 -1.99023,4.16139 h 3.98046 z"
+       id="path32784-51"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.299082px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 172.0645,109.91501 -1.99023,4.16139 h 3.98046 z"
+       id="path32784-23"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.278896px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 81.961325,35.733683 -1.99023,-3.6186 h 3.98046 z"
+       id="path32784-3"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path32784-3-7"
+       d="m 136.96407,35.643226 -1.99023,-3.6186 h 3.98046 z"
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.278897px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path32784-3-73"
+       d="m 172.24542,100.41618 -1.99023,-3.618595 h 3.98046 z"
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.278897px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path32784-3-2"
+       d="m 178.93983,100.41619 -1.99023,-3.6186 h 3.98046 z"
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.278897px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path32784-3-70"
+       d="m 290.75462,114.89059 -1.99023,-3.6186 h 3.98046 z"
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.278897px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path32784-3-5"
+       d="m 127.93118,102.04456 -1.99023,-3.618604 h 3.98046 z"
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.278897px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path32784-3-24"
+       d="m 31.481836,185.27239 -1.99023,-3.6186 h 3.98046 z"
+       style="fill:#bbbcbc;fill-opacity:1;stroke:none;stroke-width:0.278897px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
index 2c723b5d..6334f4b4 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
@@ -22,6 +22,13 @@
                 height: 800px;
             }
 
+            .disegnoStampo{
+                flex-shrink: 0;
+                margin-left: 680px;
+                width: 1200px;
+                height: 795px;
+            }
+
             .input-circles{
 
                 span{
@@ -38,7 +45,7 @@
                 }
 
                 .circle{
-                    width: 141px;
+                    width: 147px;
                     height: 60px;
                     flex-direction: column;
 
@@ -98,6 +105,71 @@
                     right: 220px;
                 }
 
+                .circle-stampo-1{
+                    position: relative;
+                    top: 115px;
+                    right: 1212px;
+                }
+
+                .circle-stampo-2{
+                    position: relative;
+                    top: 140px;
+                    right: 1130px;  
+                }
+
+                .circle-stampo-3{
+                    position: relative;
+                    top: 4px;
+                    right: 730px;
+                }
+
+                .circle-stampo-4{
+                    position: relative;
+                    top: -64px;
+                    right: 925px;
+                }
+
+                .circle-stampo-5{
+                    position: relative;
+                    top: -10px;
+                    right: 740px;
+                }
+
+                .circle-stampo-6{
+                    position: relative;
+                    top: 205px;
+                    right: 1115px;
+                }
+
+                .circle-stampo-7{
+                    position: relative;
+                    top: 50px;
+                    right: 125px;
+                }
+
+                .circle-stampo-8{
+                    position: relative;
+                    top: -210px;
+                    right: 550px;
+                }
+
+                .circle-stampo-9{
+                    position: relative;
+                    top: -90px;
+                    right: 560px;
+                }
+
+                .circle-stampo-10{
+                    position: relative;
+                    bottom: 557px;
+                    right: 769px;
+                }
+
+                .circle-stampo-11{
+                    position: relative;
+                    top: 38px;
+                    right: 781px;                  
+                }
             }
 
         }
diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less
index 368b1ade..1e31fe0d 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/setup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less
@@ -76,7 +76,7 @@
                 width: 89px;
                 height: 25px;
                 object-fit: contain;
-                font-size: 22px;
+                font-size: 20px;
                 font-weight: 500;
                 font-stretch: normal;
                 font-style: normal;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 67b40d55..0767f742 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4239,7 +4239,7 @@ img {
   width: 89px;
   height: 25px;
   object-fit: contain;
-  font-size: 22px;
+  font-size: 20px;
   font-weight: 500;
   font-stretch: normal;
   font-style: normal;
@@ -4643,6 +4643,12 @@ img {
   width: 800px;
   height: 800px;
 }
+.modal.quote-velocita-info .specific .svg-area .disegnoStampo {
+  flex-shrink: 0;
+  margin-left: 680px;
+  width: 1200px;
+  height: 795px;
+}
 .modal.quote-velocita-info .specific .svg-area .input-circles span {
   object-fit: contain;
   font-size: 22px;
@@ -4656,7 +4662,7 @@ img {
   background-color: #979797;
 }
 .modal.quote-velocita-info .specific .svg-area .input-circles .circle {
-  width: 141px;
+  width: 147px;
   height: 60px;
   flex-direction: column;
 }
@@ -4705,6 +4711,61 @@ img {
   top: 320px;
   right: 220px;
 }
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-1 {
+  position: relative;
+  top: 115px;
+  right: 1212px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-2 {
+  position: relative;
+  top: 140px;
+  right: 1130px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-3 {
+  position: relative;
+  top: 4px;
+  right: 730px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-4 {
+  position: relative;
+  top: -64px;
+  right: 925px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-5 {
+  position: relative;
+  top: -10px;
+  right: 740px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-6 {
+  position: relative;
+  top: 205px;
+  right: 1115px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-7 {
+  position: relative;
+  top: 50px;
+  right: 125px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-8 {
+  position: relative;
+  top: -210px;
+  right: 550px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-9 {
+  position: relative;
+  top: -90px;
+  right: 560px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-10 {
+  position: relative;
+  bottom: 557px;
+  right: 769px;
+}
+.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-11 {
+  position: relative;
+  top: 38px;
+  right: 781px;
+}
 .modal.quote-velocita-info .specific button {
   margin-left: 10px;
   width: 48px;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
index c79cdca7..fee6eb5c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="svg-area">
-        <img class="disegnoQuoteVelocita" src="assets/icons/svg/disegno-quote-velocita-stampo.svg">
+        <img class="disegnoStampo" src="assets/icons/svg/disegno-quote-velocita-stampo.svg">
         <div class="input-circles">
-            <div class="circle circle1">
+            <div class="circle circle-stampo-1">
                 <div>
                     <img src="assets/icons/png/salita.png">
                     <label>{{spes}} mm</label>
@@ -12,7 +12,7 @@
                     <label>30 mm/s</label>
                 </div>
             </div>
-            <div class="circle circle2">
+            <div class="circle circle-stampo-2">
                 <div>
                     <img src="assets/icons/png/salita.png">
                     <label>{{x}} mm</label>
@@ -22,7 +22,23 @@
                     <label>100 mm/s</label>
                 </div>
             </div>
-            <div class="circle circle3">
+            <div class="circle circle-stampo-3">
+                <div>
+                    <img src="assets/icons/png/discesa.png">
+                    <label>{{y}} mm</label>
+                </div>
+                <div>
+                    <img src="assets/icons/png/alta.png">
+                    <label>30 mm/s</label>
+                </div>
+            </div>
+            <div class="circle circle-stampo-4">
+                <div>
+                    <img src="assets/icons/png/quota.png">
+                    <label>64 mm</label>
+                </div>
+            </div>
+            <div class="circle circle-stampo-5">
                 <div>
                     <img src="assets/icons/png/discesa.png">
                     <label>{{y}} mm</label>
@@ -32,36 +48,34 @@
                     <label>100 mm/s</label>
                 </div>
             </div>
-            <div class="circle circle4">
+            <div class="circle circle-stampo-6">
                 <div>
                     <img src="assets/icons/png/quota.png">
-                    <label>{{y}} mm</label>
+                    <label>486 mm</label>
                 </div>
             </div>
-            <div class="circle circle5">
+            <div class="circle circle-stampo-7">
                 <div>
-                    <img src="assets/icons/png/discesa.png">
-                    <label>{{y}} mm</label>
-                </div>
-                <div>
-                    <img src="assets/icons/png/alta.png">
-                    <label>8 mm/s</label>
+                    <img src="assets/icons/png/quota.png">
+                    <label>70 mm</label>
                 </div>
             </div>
-            <div class="circle circle6">
+            <div class="circle circle-stampo-8">
                 <div>
-                    <img src="assets/icons/png/discesa.png">
-                    <label>{{y}} mm</label>
-                </div>
-                <div>
-                    <img src="assets/icons/png/bassa.png">
-                    <label>30 mm/s</label>
+                    <img src="assets/icons/png/quota.png">
+                    <label>214 mm</label>
                 </div>
             </div>
-            <span class="circle7">123 mm</span>
-            <span class="circle8">0 mm</span>
+            <div class="circle circle-stampo-9">
+                <div>
+                    <img src="assets/icons/png/quota.png">
+                    <label>50 mm</label>
+                </div>
+            </div>
+            <span class="circle-stampo-10">1059 mm</span>
+            <span class="circle-stampo-11">0 mm</span>
         </div>
     </div>
 </template>
 
-<script lang="ts" src="./quote-velocita.ts"></script>
\ No newline at end of file
+<script lang="ts" src="./stampo.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts
index 7837688e..7fe81e7e 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts
@@ -2,9 +2,9 @@ import Vue from "vue";
 import Component from "vue-class-component";
 import { Prop } from 'vue-property-decorator';
 import Slider from "@/app_modules_thermo/components/slider.vue"
-// import QuoteVelocitaSVG from "./SVG_Components/quote-velocita.vue";
+import StampoSVG from "./SVG_Components/stampo.vue";
 
-@Component({name:"salitastampo", components:{slider:Slider}})
+@Component({name:"salita-stampo", components:{slider:Slider, stampoSVG: StampoSVG}})
 export default class DiscesaCornice extends Vue {
 
     @Prop({default:0})
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue
index 9c427109..71b2341f 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue
@@ -53,6 +53,7 @@
 			</div>
 		</aside>
 		<div class="specific">
+			<stampoSVG></stampoSVG>
 			<button>
 				<img src="assets/icons/png/w.png" />
 			</button>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue
index 709801d3..22175c5d 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue
@@ -11,8 +11,8 @@
 					<i class="fa fa-remove"></i>
 				</button>
 			</div>
+			<salita-stampo v-if="show=='QS'"></salita-stampo>
 			<discesacornice v-if="show=='QC'"></discesacornice>
-			<salitastampo v-if="show=='QS'"></salitastampo>
 			<footer>
 				<button class="btn" @click="annulla()">Annulla</button>
 				<button class="btn btn-success" @click="conferma()">Conferma</button>

From 67522379a9c72bb656d77575084b358616a29523 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Tue, 21 Apr 2020 16:52:45 +0200
Subject: [PATCH 39/42] fix quotevelocita

---
 .../quote-velocita/components/discesa-cornice.vue      | 10 +++++-----
 .../setup/quote-velocita/components/salita-stampo.vue  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
index de3be696..72a3a901 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
@@ -9,7 +9,7 @@
 					<div class="input-area">
 						<img src="assets/icons/png/clessidra.png" />
 						<label>Ritardo</label>
-						<span class="rect">{{ritardo}} s</span>
+						<div class="rect">{{ritardo}} s</div>
 					</div>
 					<slider :min="0" :max="10" v-model="ritardo"></slider>
 
@@ -18,13 +18,13 @@
 					<div class="input-area">
 						<img src="assets/icons/png/salita.png" />
 						<label>Corsa</label>
-						<span class="rect">{{corsa}} mm</span>
+						<div class="rect">{{corsa}} mm</div>
 					</div>
 					<slider :min="0" :max="1059" v-model="corsa"></slider>
 					<div class="input-area">
 						<img src="assets/icons/png/alta.png" />
 						<label>Velocità salita</label>
-						<span class="rect">{{velSalita}} mm/s</span>
+						<div class="rect">{{velSalita}} mm/s</div>
 					</div>
 					<slider :min="0" :max="200" v-model="velSalita"></slider>
 
@@ -33,13 +33,13 @@
 					<div class="input-area">
 						<img src="assets/icons/png/salita.png" />
 						<label>Rallentamento salita</label>
-						<span class="rect">{{ralSalita}} mm</span>
+						<div class="rect">{{ralSalita}} mm</div>
 					</div>
 					<slider :min="0" :max="1059" v-model="ralSalita"></slider>
 					<div class="input-area">
 						<img src="assets/icons/png/bassa.png" />
 						<label>Velocità salita lenta</label>
-						<span class="rect">{{velSalitaLenta}} mm/s</span>
+						<div class="rect">{{velSalitaLenta}} mm/s</div>
 					</div>
 					<slider :min="0" :max="200" v-model="velSalitaLenta"></slider>
 				</div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue
index 71b2341f..b58a2246 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue
@@ -9,7 +9,7 @@
 					<div class="input-area">
 						<img src="assets/icons/png/clessidra.png" />
 						<label>Ritardo</label>
-						<span class="rect">{{ritardo}} s</span>
+						<div class="rect">{{ritardo}} s</div>
 					</div>
 					<slider :min="0" :max="10" v-model="ritardo" :left="'0'" :middle="'5'" :right="'10'"></slider>
 
@@ -18,13 +18,13 @@
 					<div class="input-area">
 						<img src="assets/icons/png/salita.png" />
 						<label>Corsa</label>
-						<span class="rect">{{corsa}} mm</span>
+						<div class="rect">{{corsa}} mm</div>
 					</div>
 					<slider :min="0" :max="1059" v-model="corsa" :left="'0'" :middle="'530'" :right="'1059'"></slider>
 					<div class="input-area">
 						<img src="assets/icons/png/alta.png" />
 						<label>Velocità salita</label>
-						<span class="rect">{{velSalita}} mm/s</span>
+						<div class="rect">{{velSalita}} mm/s</div>
 					</div>
 					<slider :min="0" :max="200" v-model="velSalita" :left="'0'" :middle="'100'" :right="'200'"></slider>
 
@@ -33,13 +33,13 @@
 					<div class="input-area">
 						<img src="assets/icons/png/salita.png" />
 						<label>Rallentamento salita</label>
-						<span class="rect">{{ralSalita}} mm</span>
+						<div class="rect">{{ralSalita}} mm</div>
 					</div>
 					<slider :min="0" :max="1059" v-model="ralSalita" :left="'0'" :middle="'530'" :right="'1059'"></slider>
 					<div class="input-area">
 						<img src="assets/icons/png/bassa.png" />
 						<label>Velocità salita lenta</label>
-						<span class="rect">{{velSalitaLenta}} mm/s</span>
+						<div class="rect">{{velSalitaLenta}} mm/s</div>
 					</div>
 					<slider
 						:min="0"

From 29258013028acb25587a39925e9d1fcf3de852c7 Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Wed, 22 Apr 2020 15:24:46 +0200
Subject: [PATCH 40/42] fix the clock of programmazione preriscaldo modal

---
 .../assets/styles/base/progrprerisc.less      | 159 +++++++++++++++++-
 .../assets/styles/base/quote-velocita.less    | 141 ++++++++--------
 Thermo.Active/wwwroot/assets/styles/style.css | 155 ++++++++++++++---
 .../components/programmazione-preriscaldo.ts  |   4 +-
 .../components/programmazione-preriscaldo.vue |  37 ++--
 5 files changed, 384 insertions(+), 112 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
index cd2a5071..99043cca 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
@@ -3,6 +3,7 @@
 @import "colors.less";
 @import "fonts.less";
 @modal: modal;
+@heightmeridian:300px;
 
 .@{modal}.progr-preriscaldo-info {
     width: 1639px;
@@ -65,17 +66,164 @@
                     display: flex;
                     margin-bottom: 50px;
 
+                    .clock{
+                        border-radius: 50%;
+                        background-color: white;
+                        height: @heightmeridian;
+                        width: @heightmeridian;
+
+                        span{
+                            flex-shrink: 0;
+                            border-radius: 50%;
+                            width: 20px;
+                            height: 20px;
+                            background-color: @color-darkish-blue;
+                            position: relative;
+                            top: 140px;
+                            right: 460px;
+                        }
+
+                        button{
+                            flex-shrink: 0;
+                            border-radius: 50%;
+                            width: 50px;
+                            height: 50px;
+                            background-image: none;
+                            box-shadow: none;
+                            background-color: white;
+                            color: black;
+                            font-size: 20px;
+                        }
+
+                        .selected{
+                            background-color: @color-darkish-blue;
+                            color:white;
+                        }
+
+                        .btn1{
+                            position: relative;
+                            top: 22px;
+                            right: -188px;
+                        }
+
+                        .btn2{
+                            position: relative;
+                            top: 68px;
+                            right: -179px;
+                        }
+
+                        .btn3{
+                            position: relative;
+                            top: 125px;
+                            right: -149px;
+                        }
+
+                        .btn4{
+                            position: relative;
+                            top: 182px;
+                            right: -79px;
+                        }
+
+                        .btn5{
+                            position: relative;
+                            top: 227px;
+                            right: 12px;
+                        }
+
+                        .btn6{
+                            position: relative;
+                            top: 248.5px;
+                            right: 125px;
+                        }
+
+                        .btn7{
+                            position: relative;
+                            top: 227px;
+                            right: 238px;
+                        }
+
+                        .btn8{
+                            position: relative;
+                            top: 182px;
+                            right: 329px;
+                        }
+
+                        .btn9{
+                            position: relative;
+                            top: 125px;
+                            right: 399px;
+                        }
+
+                        .btn10{
+                            position: relative;
+                            top: 68px;
+                            right: 429px;
+                        }
+
+                        .btn11{
+                            position: relative;
+                            top: 22px;
+                            right: 438px;
+                        }
+
+                        .btn12{
+                            position: relative;
+                            top: 0.5px;
+                            right: 425px;
+                        }
+
+
+                    }
+
                     div{
 
                         &:first-of-type{
+                            flex-direction: column;
                             margin-right: 20px;
                             width: 180px;
-                            height: 300px;
+                            height: @heightmeridian;
                             background-image: linear-gradient(to bottom, #1756ad, @color-darkish-blue);
+
+                            label{
+                                color: #ADD8E6;
+                                margin: auto;
+
+                                &:first-of-type{
+                                    font-size: 67px;
+                                }
+
+                                &:last-of-type{
+                                    font-size: 20px;
+                                    margin-top: -50px;
+                                }
+
+                            }
+
                         }
+
+                        &:last-child{
+                            margin-left: -50px;
+                            height: @heightmeridian;
+                            flex-direction: column;
+
+                            button{
+                                width: 50px;
+                                background-image: none;
+                                box-shadow: none;
+                                background-color: #bbbcbc;
+                                color: @color-darkish-blue;
+                                font-size: 20px;
+
+                                &:first-of-type{
+                                    margin-bottom: @heightmeridian - 50px;
+                                }
+
+                            }
+
+                        } 
                     
                     }
-                    
+
                     button{
                         border: none;
                         width: 130px;
@@ -111,13 +259,6 @@
                     color: @color-darkish-blue;
                 }
 
-                .clock {
-                    border-radius: 50%;
-                    background-color: white;
-                    height: 300px;
-                    width: 300px;
-                  }
-
             }
 
         }
diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
index 0a987645..ac2d1a58 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less
@@ -26,7 +26,7 @@
 
             }
 
-
+        }
 
         .specific{
 
@@ -41,12 +41,12 @@
                     height: 800px;
                 }
 
-                            .disegnoStampo{
-                flex-shrink: 0;
-                margin-left: 680px;
-                width: 1200px;
-                height: 795px;
-            }
+                .disegnoStampo{
+                    flex-shrink: 0;
+                    margin-left: 680px;
+                    width: 1200px;
+                    height: 795px;
+                }
 
                 .input-circles{
 
@@ -65,8 +65,8 @@
                     }
 
                     .circle{
-                                            width: 147px;
-                    height: 60px;
+                        width: 147px;
+                        height: 60px;
                         flex-direction: column;
 
                         div{
@@ -124,74 +124,75 @@
                         top: 320px;
                         right: 220px;
                     }
+                    
+                    .circle-stampo-1{
+                        position: relative;
+                        top: 115px;
+                        right: 1212px;
+                    }
 
-                }
+                    .circle-stampo-2{
+                        position: relative;
+                        top: 140px;
+                        right: 1130px;  
+                    }
 
-                .circle-stampo-1{
-                    position: relative;
-                    top: 115px;
-                    right: 1212px;
-                }
+                    .circle-stampo-3{
+                        position: relative;
+                        top: 4px;
+                        right: 730px;
+                    }
 
-                .circle-stampo-2{
-                    position: relative;
-                    top: 140px;
-                    right: 1130px;  
-                }
+                    .circle-stampo-4{
+                        position: relative;
+                        top: -64px;
+                        right: 925px;
+                    }
 
-                .circle-stampo-3{
-                    position: relative;
-                    top: 4px;
-                    right: 730px;
-                }
+                    .circle-stampo-5{
+                        position: relative;
+                        top: -10px;
+                        right: 740px;
+                    }
 
-                .circle-stampo-4{
-                    position: relative;
-                    top: -64px;
-                    right: 925px;
-                }
+                    .circle-stampo-6{
+                        position: relative;
+                        top: 205px;
+                        right: 1115px;
+                    }
 
-                .circle-stampo-5{
-                    position: relative;
-                    top: -10px;
-                    right: 740px;
-                }
+                    .circle-stampo-7{
+                        position: relative;
+                        top: 50px;
+                        right: 125px;
+                    }
 
-                .circle-stampo-6{
-                    position: relative;
-                    top: 205px;
-                    right: 1115px;
-                }
+                    .circle-stampo-8{
+                        position: relative;
+                        top: -210px;
+                        right: 550px;
+                    }
 
-                .circle-stampo-7{
-                    position: relative;
-                    top: 50px;
-                    right: 125px;
-                }
+                    .circle-stampo-9{
+                        position: relative;
+                        top: -90px;
+                        right: 560px;
+                    }
 
-                .circle-stampo-8{
-                    position: relative;
-                    top: -210px;
-                    right: 550px;
-                }
+                    .circle-stampo-10{
+                        position: relative;
+                        bottom: 557px;
+                        right: 769px;
+                    }
 
-                .circle-stampo-9{
-                    position: relative;
-                    top: -90px;
-                    right: 560px;
-                }
+                    .circle-stampo-11{
+                        position: relative;
+                        top: 38px;
+                        right: 781px;                  
+                    }
 
-                .circle-stampo-10{
-                    position: relative;
-                    bottom: 557px;
-                    right: 769px;
-                }
-
-                .circle-stampo-11{
-                    position: relative;
-                    top: 38px;
-                    right: 781px;                  
-                }
+                }    
+                
             }
 
             button{
@@ -204,9 +205,9 @@
                 border: solid 1px #001e48;
                 background-image: linear-gradient(to bottom, #1756ad, @color-darkish-blue);
             }
-
-        }
-
-    }
     
+        }
+    
+    }
+
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 6beef1c2..15c59a7a 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4535,12 +4535,131 @@
   display: flex;
   margin-bottom: 50px;
 }
+.modal.progr-preriscaldo-info section.body section .specific div .clock {
+  border-radius: 50%;
+  background-color: white;
+  height: 300px;
+  width: 300px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock span {
+  flex-shrink: 0;
+  border-radius: 50%;
+  width: 20px;
+  height: 20px;
+  background-color: #002680;
+  position: relative;
+  top: 140px;
+  right: 460px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock button {
+  flex-shrink: 0;
+  border-radius: 50%;
+  width: 50px;
+  height: 50px;
+  background-image: none;
+  box-shadow: none;
+  background-color: white;
+  color: black;
+  font-size: 20px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .selected {
+  background-color: #002680;
+  color: white;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn1 {
+  position: relative;
+  top: 22px;
+  right: -188px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn2 {
+  position: relative;
+  top: 68px;
+  right: -179px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn3 {
+  position: relative;
+  top: 125px;
+  right: -149px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn4 {
+  position: relative;
+  top: 182px;
+  right: -79px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn5 {
+  position: relative;
+  top: 227px;
+  right: 12px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn6 {
+  position: relative;
+  top: 248.5px;
+  right: 125px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn7 {
+  position: relative;
+  top: 227px;
+  right: 238px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn8 {
+  position: relative;
+  top: 182px;
+  right: 329px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn9 {
+  position: relative;
+  top: 125px;
+  right: 399px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn10 {
+  position: relative;
+  top: 68px;
+  right: 429px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn11 {
+  position: relative;
+  top: 22px;
+  right: 438px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div .clock .btn12 {
+  position: relative;
+  top: 0.5px;
+  right: 425px;
+}
 .modal.progr-preriscaldo-info section.body section .specific div div:first-of-type {
+  flex-direction: column;
   margin-right: 20px;
   width: 180px;
   height: 300px;
   background-image: linear-gradient(to bottom, #1756ad, #002680);
 }
+.modal.progr-preriscaldo-info section.body section .specific div div:first-of-type label {
+  color: #ADD8E6;
+  margin: auto;
+}
+.modal.progr-preriscaldo-info section.body section .specific div div:first-of-type label:first-of-type {
+  font-size: 67px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div div:first-of-type label:last-of-type {
+  font-size: 20px;
+  margin-top: -50px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div div:last-child {
+  margin-left: -50px;
+  height: 300px;
+  flex-direction: column;
+}
+.modal.progr-preriscaldo-info section.body section .specific div div:last-child button {
+  width: 50px;
+  background-image: none;
+  box-shadow: none;
+  background-color: #bbbcbc;
+  color: #002680;
+  font-size: 20px;
+}
+.modal.progr-preriscaldo-info section.body section .specific div div:last-child button:first-of-type {
+  margin-bottom: 250px;
+}
 .modal.progr-preriscaldo-info section.body section .specific div button {
   border: none;
   width: 130px;
@@ -4571,12 +4690,6 @@
   letter-spacing: normal;
   color: #002680;
 }
-.modal.progr-preriscaldo-info section.body section .specific .clock {
-  border-radius: 50%;
-  background-color: white;
-  height: 300px;
-  width: 300px;
-}
 .modal.controstamposetup-info {
   width: 1820px;
   height: 980px;
@@ -4620,13 +4733,13 @@
   width: 800px;
   height: 800px;
 }
-.modal.quote-velocita-info .specific .svg-area .disegnoStampo {
+.modal.quote-velocita-info section .specific .svg-area .disegnoStampo {
   flex-shrink: 0;
   margin-left: 680px;
   width: 1200px;
   height: 795px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles span {
+.modal.quote-velocita-info section .specific .svg-area .input-circles span {
   object-fit: contain;
   font-size: 22px;
   font-weight: 500;
@@ -4638,7 +4751,7 @@
   color: white;
   background-color: #979797;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle {
   width: 147px;
   height: 60px;
   flex-direction: column;
@@ -4688,62 +4801,62 @@
   top: 320px;
   right: 220px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-1 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-1 {
   position: relative;
   top: 115px;
   right: 1212px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-2 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-2 {
   position: relative;
   top: 140px;
   right: 1130px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-3 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-3 {
   position: relative;
   top: 4px;
   right: 730px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-4 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-4 {
   position: relative;
   top: -64px;
   right: 925px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-5 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-5 {
   position: relative;
   top: -10px;
   right: 740px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-6 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-6 {
   position: relative;
   top: 205px;
   right: 1115px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-7 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-7 {
   position: relative;
   top: 50px;
   right: 125px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-8 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-8 {
   position: relative;
   top: -210px;
   right: 550px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-9 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-9 {
   position: relative;
   top: -90px;
   right: 560px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-10 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-10 {
   position: relative;
   bottom: 557px;
   right: 769px;
 }
-.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-11 {
+.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-11 {
   position: relative;
   top: 38px;
   right: 781px;
 }
-.modal.quote-velocita-info .specific button {
+.modal.quote-velocita-info section .specific button {
   margin-left: 10px;
   width: 48px;
   height: 48px;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts
index 5768b62e..20fe1982 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts
@@ -19,8 +19,8 @@ export default class ProgrammazionePreriscaldo extends Vue{
     block:boolean=false;
     
     active:string="";
-
-    
+    meridian:string="--";
+    hours:string="00";
 
     
     public sendMessage(name: string) {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue
index 8b064520..d771058f 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue
@@ -24,22 +24,39 @@
                 </aside>
                 <hr>
                 <div class="specific">
-                    <label>Ciao!</label>
+                    <label>{{active}} alle ore {{hours}}:00 {{meridian}}</label>
                     <div>
-                        <button :class="{'active':active=='lunedi'}" @click="active='lunedi'">Lunedì</button>
-                        <button :class="{'active':active=='martedi'}" @click="active='martedi'">Martedì</button>
-                        <button :class="{'active':active=='mercoledi'}" @click="active='mercoledi'">Mercoledì</button>
-                        <button :class="{'active':active=='giovedi'}" @click="active='giovedi'">Giovedì</button>
-                        <button :class="{'active':active=='venerdi'}" @click="active='venerdi'">Venerdì</button>
-                        <button :class="{'active':active=='sabato'}" @click="active='sabato'">Sabato</button>
-                        <button :class="{'active':active=='domenica'}" @click="active='domenica'">Domenica</button>
+                        <button :class="{'active':active=='Lunedì'}" @click="active='Lunedì'">Lunedì</button>
+                        <button :class="{'active':active=='Martedì'}" @click="active='Martedì'">Martedì</button>
+                        <button :class="{'active':active=='Mercoledì'}" @click="active='Mercoledì'">Mercoledì</button>
+                        <button :class="{'active':active=='Giovedì'}" @click="active='Giovedì'">Giovedì</button>
+                        <button :class="{'active':active=='Venerdì'}" @click="active='Venerdì'">Venerdì</button>
+                        <button :class="{'active':active=='Sabato'}" @click="active='Sabato'">Sabato</button>
+                        <button :class="{'active':active=='Domenica'}" @click="active='Domenica'">Domenica</button>
                     </div>
                     <div>
                         <div>
-
+                            <label>{{hours}}:00</label>
+                            <label>{{meridian}}</label>
                         </div>
                         <div class="clock">
-                            
+                            <button class="btn1" :class="{'selected':hours=='1'}" @click="hours='1'">1</button>
+                            <button class="btn2" :class="{'selected':hours=='2'}" @click="hours='2'">2</button>
+                            <button class="btn3" :class="{'selected':hours=='3'}" @click="hours='3'">3</button>
+                            <button class="btn4" :class="{'selected':hours=='4'}" @click="hours='4'">4</button>
+                            <button class="btn5" :class="{'selected':hours=='5'}" @click="hours='5'">5</button>
+                            <button class="btn6" :class="{'selected':hours=='6'}" @click="hours='6'">6</button>
+                            <button class="btn7" :class="{'selected':hours=='7'}" @click="hours='7'">7</button>
+                            <button class="btn8" :class="{'selected':hours=='8'}" @click="hours='8'">8</button>
+                            <button class="btn9" :class="{'selected':hours=='9'}" @click="hours='9'">9</button>
+                            <button class="btn10" :class="{'selected':hours=='10'}" @click="hours='10'">10</button>
+                            <button class="btn11" :class="{'selected':hours=='11'}" @click="hours='11'">11</button>
+                            <button class="btn12" :class="{'selected':hours=='12'}" @click="hours='12'">12</button>
+                            <span></span>
+                        </div>
+                        <div>
+                            <button @click="meridian='AM'">AM</button>
+                            <button @click="meridian='PM'">PM</button>
                         </div>
                     </div>
                 </div>    

From 9d33757013cd0c9c3f3b607b3160c124acca2a0e Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Wed, 22 Apr 2020 15:32:58 +0200
Subject: [PATCH 41/42] fix position

---
 Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less | 2 +-
 Thermo.Active/wwwroot/assets/styles/style.css              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
index 99043cca..934b1348 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less
@@ -8,7 +8,7 @@
 .@{modal}.progr-preriscaldo-info {
     width: 1639px;
     height: 565px;
-    margin-top: 100px;
+    margin-top: 220px;
 
     header {
         padding-left: 31px;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 15c59a7a..9802d2cd 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4482,7 +4482,7 @@
 .modal.progr-preriscaldo-info {
   width: 1639px;
   height: 565px;
-  margin-top: 100px;
+  margin-top: 220px;
 }
 .modal.progr-preriscaldo-info header {
   padding-left: 31px;

From 8e9dfab29dc0f549aecdd17196cb3cedeadbdea4 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.local.net>
Date: Wed, 22 Apr 2020 17:52:52 +0200
Subject: [PATCH 42/42] Merge branch 'feature/removal/toolMan'

---
 Thermo.Active.Config/Config/areasConfig.xml   |    5 -
 .../Config/areasConfigValidator.xsd           |   10 -
 .../Config/toolManagerConfig.xml              |  923 ---------------
 .../Config/toolManagerConfigValidator.xsd     |  175 ---
 .../Config/userSoftKeyConfig.xml              |   24 +-
 Thermo.Active.Config/ServerConfig.cs          |    2 -
 .../ServerConfigController.cs                 |   99 --
 .../Thermo.Active.Config.csproj               |    7 -
 Thermo.Active.Core/ThreadsFunctions.cs        |  164 ---
 Thermo.Active.Core/ThreadsHandler.cs          |    3 -
 .../Controllers/NcToolManagerController.cs    |  685 -----------
 Thermo.Active.Database/DatabaseContext.cs     |    1 -
 .../Migrations/Configuration.cs               |    4 +-
 .../Thermo.Active.Database.csproj             |    1 -
 .../ConfigModels/MagazineNamesModel.cs        |   17 -
 .../ConfigModels/ToolManagerConfigModel.cs    |   46 -
 .../ConfigModels/ToolTypeConfigModel.cs       |   17 -
 Thermo.Active.Model/Constants.cs              |   17 +-
 Thermo.Active.Model/DTOModels/DTOHeadModel.cs |   60 -
 .../DTOModels/DTOStartupConfigurationModel.cs |    1 -
 .../JobModels/DTOMetadataFieldsModel.cs       |    2 -
 .../DTOModels/JobModels/DTOMetadataModel.cs   |    2 -
 .../ToolModels/DTOAssistedToolingModel.cs     |   58 -
 .../DTOModels/ToolModels/DTOEdgeModel.cs      |   30 -
 .../ToolModels/DTOExportToolTableModel.cs     |   31 -
 .../ToolModels/DTOMagazineStatusModel.cs      |   46 -
 .../DTOModels/ToolModels/DTONcFamilyModel.cs  |  242 ----
 .../ToolModels/DTONcMagazinePositionModel.cs  |   47 -
 .../ToolModels/DTONcMountedShankModel.cs      |   15 -
 .../DTOModels/ToolModels/DTONcShankModel.cs   |   93 --
 .../DTOModels/ToolModels/DTONcToolModel.cs    |  209 ----
 .../ToolModels/DTONewToolDataModel.cs         |   14 -
 .../ToolModels/DTONewToolWithFamilyModel.cs   |  138 ---
 .../ToolModels/DTOSelfAdaptiveModel.cs        |   11 -
 .../DTOModels/ToolModels/DTOShankModel.cs     |   69 --
 .../ToolModels/DTOSiemensToolModel.cs         |  128 --
 .../ToolModels/DTOUpdateMagazineModel.cs      |   16 -
 .../DatabaseModels/NcFamilyModel.cs           |    8 -
 .../DatabaseModels/NcShankModel.cs            |    5 -
 .../DatabaseModels/NcToolModel.cs             |   91 --
 .../Thermo.Active.Model.csproj                |   19 -
 Thermo.Active.NC/NcAdapter.cs                 |   37 +-
 Thermo.Active.NC/NcToolTableAdapter.cs        |  911 --------------
 Thermo.Active.NC/SiemensToolTableAdapter.cs   |  272 -----
 Thermo.Active.NC/Thermo.Active.NC.csproj      |    2 -
 Thermo.Active.Utils/supportFunctions.cs       |    2 -
 .../WebApi/ConfigurationController.cs         |   15 -
 .../Controllers/WebApi/LanguageController.cs  |   93 --
 .../WebApi/NcToolManagerController.cs         | 1052 -----------------
 .../WebApi/SiemensToolManagerController.cs    |  449 -------
 .../Database/SignalRDatabaseHandler.cs        |  123 --
 Thermo.Active/Listeners/ListenersHandler.cs   |   17 +-
 .../Listeners/SignalR/SignalRListener.cs      |   45 -
 .../Listeners/SignalRStaticObjects.cs         |    8 +-
 Thermo.Active/Thermo.Active.csproj            |    2 -
 55 files changed, 26 insertions(+), 6537 deletions(-)
 delete mode 100644 Thermo.Active.Config/Config/toolManagerConfig.xml
 delete mode 100644 Thermo.Active.Config/Config/toolManagerConfigValidator.xsd
 delete mode 100644 Thermo.Active.Database/Controllers/NcToolManagerController.cs
 delete mode 100644 Thermo.Active.Model/ConfigModels/MagazineNamesModel.cs
 delete mode 100644 Thermo.Active.Model/ConfigModels/ToolManagerConfigModel.cs
 delete mode 100644 Thermo.Active.Model/ConfigModels/ToolTypeConfigModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTOAssistedToolingModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTOEdgeModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTOExportToolTableModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTONcFamilyModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTONcMountedShankModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTONcShankModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTONcToolModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTONewToolDataModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTONewToolWithFamilyModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTOSelfAdaptiveModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTOShankModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs
 delete mode 100644 Thermo.Active.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs
 delete mode 100644 Thermo.Active.Model/DatabaseModels/NcToolModel.cs
 delete mode 100644 Thermo.Active.NC/NcToolTableAdapter.cs
 delete mode 100644 Thermo.Active.NC/SiemensToolTableAdapter.cs
 delete mode 100644 Thermo.Active/Controllers/WebApi/NcToolManagerController.cs
 delete mode 100644 Thermo.Active/Controllers/WebApi/SiemensToolManagerController.cs

diff --git a/Thermo.Active.Config/Config/areasConfig.xml b/Thermo.Active.Config/Config/areasConfig.xml
index 242d2df5..ae8abc83 100644
--- a/Thermo.Active.Config/Config/areasConfig.xml
+++ b/Thermo.Active.Config/Config/areasConfig.xml
@@ -5,11 +5,6 @@
     <allowExternalBrowser>false</allowExternalBrowser>
     <ncNeeded>true</ncNeeded>
   </production>
-  <tooling>
-    <enabled>true</enabled>
-    <allowExternalBrowser>false</allowExternalBrowser>
-    <ncNeeded>true</ncNeeded>
-  </tooling>
   <report>
     <enabled>false</enabled>
     <allowExternalBrowser>true</allowExternalBrowser>
diff --git a/Thermo.Active.Config/Config/areasConfigValidator.xsd b/Thermo.Active.Config/Config/areasConfigValidator.xsd
index d3ed43d6..f63495a7 100644
--- a/Thermo.Active.Config/Config/areasConfigValidator.xsd
+++ b/Thermo.Active.Config/Config/areasConfigValidator.xsd
@@ -13,16 +13,6 @@
           </xs:complexType>
         </xs:element>
 
-        <xs:element name="tooling">
-          <xs:complexType>
-            <xs:all>
-              <xs:element name="enabled" type="xs:boolean" />
-              <xs:element name="allowExternalBrowser" />
-              <xs:element name="ncNeeded" type="xs:boolean" />
-            </xs:all>
-          </xs:complexType>
-        </xs:element>
-
         <xs:element name="report">
           <xs:complexType>
             <xs:all>
diff --git a/Thermo.Active.Config/Config/toolManagerConfig.xml b/Thermo.Active.Config/Config/toolManagerConfig.xml
deleted file mode 100644
index 16c8352e..00000000
--- a/Thermo.Active.Config/Config/toolManagerConfig.xml
+++ /dev/null
@@ -1,923 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<root>
-  <toolManagerConfig>
-    <toolMetricType>DIAMETER</toolMetricType> <!-- RADIUS/DIAMETER -->
-    <familyOpt>true</familyOpt>
-    <shankOpt>true</shankOpt>
-    <magPositionOpt>true</magPositionOpt>
-    <offsetOpt>true</offsetOpt>
-    <reviveOpt>true</reviveOpt>
-    <gammaOpt>true</gammaOpt>
-    <lifeOpt>true</lifeOpt>
-    <tcpOpt>true</tcpOpt>
-    <coolingOpt>true</coolingOpt>
-    <multidimensionalShankOpt>true</multidimensionalShankOpt>
-    <selfAdaptivePathOpt>true</selfAdaptivePathOpt>
-    <dynamicCompensationOpt>true</dynamicCompensationOpt>
-    <ballufOpt>true</ballufOpt>
-    <integrityCheckOpt>true</integrityCheckOpt>
-  </toolManagerConfig>
-  <coolingLocalizedNames>
-    <cooling>
-      <lang langKey="en">Cooling</lang>
-      <lang langKey="it">Raffreddamento</lang>
-    </cooling>
-    <cooling1>
-      <lang langKey="en">Cooling 1</lang>
-      <lang langKey="it">Raffreddamento 1</lang>
-    </cooling1>
-    <cooling2>
-      <lang langKey="en">Cooling 2</lang>
-      <lang langKey="it">Raffreddamento 2</lang>
-    </cooling2>
-    <cooling3>
-      <lang langKey="en">Cooling 3</lang>
-      <lang langKey="it">Raffreddamento 3</lang>
-    </cooling3>
-    <cooling4>
-      <lang langKey="en">Cooling 4</lang>
-      <lang langKey="it">Raffreddamento 4</lang>
-    </cooling4>
-    <cooling5>
-      <lang langKey="en">Cooling 5</lang>
-      <lang langKey="it">Raffreddamento 5</lang>
-    </cooling5>
-    <cooling6>
-      <lang langKey="en">Cooling 6</lang>
-      <lang langKey="it">Raffreddamento 6</lang>
-    </cooling6>
-    <cooling7>
-      <lang langKey="en">Cooling 7</lang>
-      <lang langKey="it">Raffreddamento 7</lang>
-    </cooling7>
-  </coolingLocalizedNames>
-  <magazineNames>
-    <magazine>
-      <id>1</id>
-      <assistedTooling>true</assistedTooling>
-      <localizedNames>  
-        <lang langKey="en">Magazine 1</lang>
-        <lang langKey="it">Magazzino 1</lang>
-      </localizedNames>
-    </magazine>
-    <magazine>
-      <id>2</id>
-      <assistedTooling>false</assistedTooling>
-      <localizedNames>
-        <lang langKey="en">Magazine 2</lang>
-        <lang langKey="it">Magazzino 2</lang>
-      </localizedNames>
-    </magazine>
-    <magazine>
-      <id>3</id>
-      <assistedTooling>false</assistedTooling>
-      <localizedNames>
-        <lang langKey="en">Magazine 3</lang>
-        <lang langKey="it">Magazzino 3</lang>
-      </localizedNames>
-    </magazine>
-  </magazineNames>
-  
-  <toolTypes>
-    <toolType>
-      <id>0</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Generic</lang>
-        <lang langKey="it">Generico</lang>
-        <lang langKey="fr">Générique</lang>
-        <lang langKey="de">Allgemein</lang>
-        <lang langKey="hr">Opće</lang>
-        <lang langKey="ro">Generic</lang>
-        <lang langKey="nl">Algemeen</lang>
-        <lang langKey="el">Γενικό</lang>
-        <lang langKey="ru">Общий</lang>
-        <lang langKey="pl">Ogólny</lang>
-        <lang langKey="sv">Generisk</lang>
-        <lang langKey="da">Generel</lang>
-        <lang langKey="pt">Genérico</lang>
-        <lang langKey="es">Genérico</lang>  
-      </localizedNames>
-    </toolType>
-    
-    <toolType>
-      <id>10</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Angular Transmission</lang>
-        <lang langKey="it">Rinvio Angolare</lang>
-        <lang langKey="fr">Transmission Angulaire</lang>
-        <lang langKey="de">Scheibe</lang>
-        <lang langKey="hr">Disk</lang>
-        <lang langKey="ro">Transmisie unghiulară</lang>
-        <lang langKey="nl">Hoekige transmissie</lang>
-        <lang langKey="el">Γωνιακή μετάδοση</lang>
-        <lang langKey="ru">Угловой контрпривод</lang>
-        <lang langKey="pl">Przekładnia kątowa</lang>
-        <lang langKey="sv">Vinkelöverföring</lang>
-        <lang langKey="da">Vinkel mellemarm</lang>
-        <lang langKey="pt">Transmissão Angular</lang>
-        <lang langKey="es">Reenvío Angular</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>70</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound disk amplitude 15%%</lang>
-        <lang langKey="it">Disco ultrasuoni amplitude 15%%</lang>
-        <lang langKey="fr">Disque à ultrasons, amplitude 15%%</lang>
-        <lang langKey="de">Ultraschallscheibenamplitude 15%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučnog diska 15%%</lang>
-        <lang langKey="ro">Disc de ultrasunete, amplitudine 15%%</lang>
-        <lang langKey="nl">Ultrasoon schijf amplitude 15%%</lang>
-        <lang langKey="el">Δίσκος υπερήχων πλάτους 15%%</lang>
-        <lang langKey="ru">Ультразвуковой диск амплитуда 15%%</lang>
-        <lang langKey="pl">Tarcza ultradźwiękowa amplituda 15%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsskiva 15%%</lang>
-        <lang langKey="da">Ultralydsskive amplitude 15%%</lang>
-        <lang langKey="pt">Disco ultrassom amplitude 15%%</lang>
-        <lang langKey="es">Disco ultrasonidos amplitud 15%%</lang>
-      </localizedNames>
-    </toolType>
-    
-    <toolType>
-      <id>71</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound disk amplitude 20%%</lang>
-        <lang langKey="it">Disco ultrasuoni amplitude 20%%</lang>
-        <lang langKey="fr">Disque à ultrasons, amplitude 20%%</lang>
-        <lang langKey="de">Ultraschallscheibenamplitude 20%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučnog diska 20%%</lang>
-        <lang langKey="ro">Disc de ultrasunete, amplitudine 20%%</lang>
-        <lang langKey="nl">Ultrasoon schijf amplitude 20%%</lang>
-        <lang langKey="el">Δίσκος υπερήχων πλάτους 20%%</lang>
-        <lang langKey="ru">Ультразвуковой диск амплитуда 20%%</lang>
-        <lang langKey="pl">Tarcza ultradźwiękowa amplituda 20%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsskiva 20%%</lang>
-        <lang langKey="da">Ultralydsskive amplitude 20%%</lang>
-        <lang langKey="pt">Disco ultrassom amplitude 20%%</lang>
-        <lang langKey="es">Disco ultrasonidos amplitud 20%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>72</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound disk amplitude 30%%</lang>
-        <lang langKey="it">Disco ultrasuoni amplitude 30%%</lang>
-        <lang langKey="fr">Disque à ultrasons, amplitude 30%%</lang>
-        <lang langKey="de">Ultraschallscheibenamplitude 30%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučnog diska 30%%</lang>
-        <lang langKey="ro">Disc de ultrasunete, amplitudine 30%%</lang>
-        <lang langKey="nl">Ultrasoon schijf amplitude 30%%</lang>
-        <lang langKey="el">Δίσκος υπερήχων πλάτους 30%%</lang>
-        <lang langKey="ru">Ультразвуковой диск амплитуда 30%%</lang>
-        <lang langKey="pl">Tarcza ultradźwiękowa amplituda 30%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsskiva 30%%</lang>
-        <lang langKey="da">Ultralydsskive amplitude 30%%</lang>
-        <lang langKey="pt">Disco ultrassom amplitude 30%%</lang>
-        <lang langKey="es">Disco ultrasonidos amplitud 30%%</lang>
-      </localizedNames>
-    </toolType>
-    
-    <toolType>
-      <id>73</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound disk amplitude 40%%</lang>
-        <lang langKey="it">Disco ultrasuoni amplitude 40%%</lang>
-        <lang langKey="fr">Disque à ultrasons, amplitude 40%%</lang>
-        <lang langKey="de">Ultraschallscheibenamplitude 40%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučnog diska 40%%</lang>
-        <lang langKey="ro">Disc de ultrasunete, amplitudine 40%%</lang>
-        <lang langKey="nl">Ultrasoon schijf amplitude 40%%</lang>
-        <lang langKey="el">Δίσκος υπερήχων πλάτους 40%%</lang>
-        <lang langKey="ru">Ультразвуковой диск амплитуда 40%%</lang>
-        <lang langKey="pl">Tarcza ultradźwiękowa amplituda 40%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsskiva 40%%</lang>
-        <lang langKey="da">Ultralydsskive amplitude 40%%</lang>
-        <lang langKey="pt">Disco ultrassom amplitude 40%%</lang>
-        <lang langKey="es">Disco ultrasonidos amplitud 40%%</lang>
-      </localizedNames>
-    </toolType>
-    
-    <toolType>
-      <id>74</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound disk amplitude 50%%</lang>
-        <lang langKey="it">Disco ultrasuoni amplitude 50%%</lang>
-        <lang langKey="fr">Disque à ultrasons, amplitude 50%%</lang>
-        <lang langKey="de">Ultraschallscheibenamplitude 50%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučnog diska 50%%</lang>
-        <lang langKey="ro">Disc de ultrasunete, amplitudine 50%%</lang>
-        <lang langKey="nl">Ultrasoon schijf amplitude 50%%</lang>
-        <lang langKey="el">Δίσκος υπερήχων πλάτους 50%%</lang>
-        <lang langKey="ru">Ультразвуковой диск амплитуда 50%%</lang>
-        <lang langKey="pl">Tarcza ultradźwiękowa amplituda 50%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsskiva 50%%</lang>
-        <lang langKey="da">Ultralydsskive amplitude 50%%</lang>
-        <lang langKey="pt">Disco ultrassom amplitude 50%%</lang>
-        <lang langKey="es">Disco ultrasonidos amplitud 50%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>75</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound disk amplitude 60%%</lang>
-        <lang langKey="it">Disco ultrasuoni amplitude 60%%</lang>
-        <lang langKey="fr">Disque à ultrasons, amplitude 60%%</lang>
-        <lang langKey="de">Ultraschallscheibenamplitude 60%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučnog diska 60%%</lang>
-        <lang langKey="ro">Disc de ultrasunete, amplitudine 60%%</lang>
-        <lang langKey="nl">Ultrasoon schijf amplitude 60%%</lang>
-        <lang langKey="el">Δίσκος υπερήχων πλάτους 60%%</lang>
-        <lang langKey="ru">Ультразвуковой диск амплитуда 60%%</lang>
-        <lang langKey="pl">Tarcza ultradźwiękowa amplituda 60%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsskiva 60%%</lang>
-        <lang langKey="da">Ultralydsskive amplitude 60%%</lang>
-        <lang langKey="pt">Disco ultrassom amplitude 60%%</lang>
-        <lang langKey="es">Disco ultrasonidos amplitud 60%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>76</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound disk amplitude 70%%</lang>
-        <lang langKey="it">Disco ultrasuoni amplitude 70%%</lang>
-        <lang langKey="fr">Disque à ultrasons, amplitude 70%%</lang>
-        <lang langKey="de">Ultraschallscheibenamplitude 70%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučnog diska 70%%</lang>
-        <lang langKey="ro">Disc de ultrasunete, amplitudine 70%%</lang>
-        <lang langKey="nl">Ultrasoon schijf amplitude 70%%</lang>
-        <lang langKey="el">Δίσκος υπερήχων πλάτους 70%%</lang>
-        <lang langKey="ru">Ультразвуковой диск амплитуда 70%%</lang>
-        <lang langKey="pl">Tarcza ultradźwiękowa amplituda 70%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsskiva 70%%</lang>
-        <lang langKey="da">Ultralydsskive amplitude 70%%</lang>
-        <lang langKey="pt">Disco ultrassom amplitude 70%%</lang>
-        <lang langKey="es">Disco ultrasonidos amplitud 70%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>77</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound disk amplitude 80%%</lang>
-        <lang langKey="it">Disco ultrasuoni amplitude 80%%</lang>
-        <lang langKey="fr">Disque à ultrasons, amplitude 80%%</lang>
-        <lang langKey="de">Ultraschallscheibenamplitude 80%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučnog diska 80%%</lang>
-        <lang langKey="ro">Disc de ultrasunete, amplitudine 80%%</lang>
-        <lang langKey="nl">Ultrasoon schijf amplitude 80%%</lang>
-        <lang langKey="el">Δίσκος υπερήχων πλάτους 80%%</lang>
-        <lang langKey="ru">Ультразвуковой диск амплитуда 80%%</lang>
-        <lang langKey="pl">Tarcza ultradźwiękowa amplituda 80%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsskiva 80%%</lang>
-        <lang langKey="da">Ultralydsskive amplitude 80%%</lang>
-        <lang langKey="pt">Disco ultrassom amplitude 80%%</lang>
-        <lang langKey="es">Disco ultrasonidos amplitud 80%%</lang>
-      </localizedNames>
-    </toolType>
-    
-    <toolType>
-      <id>78</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound disk amplitude 90%%</lang>
-        <lang langKey="it">Disco ultrasuoni amplitude 90%%</lang>
-        <lang langKey="fr">Disque à ultrasons, amplitude 90%%</lang>
-        <lang langKey="de">Ultraschallscheibenamplitude 90%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučnog diska 90%%</lang>
-        <lang langKey="ro">Disc de ultrasunete, amplitudine 90%%</lang>
-        <lang langKey="nl">Ultrasoon schijf amplitude 90%%</lang>
-        <lang langKey="el">Δίσκος υπερήχων πλάτους 90%%</lang>
-        <lang langKey="ru">Ультразвуковой диск амплитуда 90%%</lang>
-        <lang langKey="pl">Tarcza ultradźwiękowa amplituda 90%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsskiva 90%%</lang>
-        <lang langKey="da">Ultralydsskive amplitude 90%%</lang>
-        <lang langKey="pt">Disco ultrassom amplitude 90%%</lang>
-        <lang langKey="es">Disco ultrasonidos amplitud 90%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>79</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound disk amplitude 100%%</lang>
-        <lang langKey="it">Disco ultrasuoni amplitude 100%%</lang>
-        <lang langKey="fr">Disque à ultrasons, amplitude 100%%</lang>
-        <lang langKey="de">Ultraschallscheibenamplitude 100%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučnog diska 100%%</lang>
-        <lang langKey="ro">Disc de ultrasunete, amplitudine 100%%</lang>
-        <lang langKey="nl">Ultrasoon schijf amplitude 100%%</lang>
-        <lang langKey="el">Δίσκος υπερήχων πλάτους 100%%</lang>
-        <lang langKey="ru">Ультразвуковой диск амплитуда 100%%</lang>
-        <lang langKey="pl">Tarcza ultradźwiękowa amplituda 100%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsskiva 100%%</lang>
-        <lang langKey="da">Ultralydsskive amplitude 100%%</lang>
-        <lang langKey="pt">Disco ultrassom amplitude 100%%</lang>
-        <lang langKey="es">Disco ultrasonidos amplitud 100%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>80</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound blade amplitude 10%%</lang>
-        <lang langKey="it">Lama ultrasuoni amplitude 10%%</lang>
-        <lang langKey="fr">Lame à ultrasons, amplitude 10%%</lang>
-        <lang langKey="de">Ultraschallklingenamplitude 10%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučne oštrice 10%%</lang>
-        <lang langKey="ro">Lama cu ultrasunete, amplitudine 10%%</lang>
-        <lang langKey="nl">Ultrasoon mes amplitude 10%%</lang>
-        <lang langKey="el">Λεπίδα υπερήχων πλάτους 10%%</lang>
-        <lang langKey="ru">Ультразвуковой резец амплитуда 10%%</lang>
-        <lang langKey="pl">Ostrze ultradźwiękowe amplituda 10%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsblad 10%%</lang>
-        <lang langKey="da">Ultralydsklinge amplitude 10%%</lang>
-        <lang langKey="pt">Lâmina ultrassom amplitude 10%%</lang>
-        <lang langKey="es">Cuchilla ultrasonidos amplitud 10%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>81</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound blade amplitude 20%%</lang>
-        <lang langKey="it">Lama ultrasuoni amplitude 20%%</lang>
-        <lang langKey="fr">Lame à ultrasons, amplitude 20%%</lang>
-        <lang langKey="de">Ultraschallklingenamplitude 20%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučne oštrice 20%%</lang>
-        <lang langKey="ro">Lama cu ultrasunete, amplitudine 20%%</lang>
-        <lang langKey="nl">Ultrasoon mes amplitude 20%%</lang>
-        <lang langKey="el">Λεπίδα υπερήχων πλάτους 20%%</lang>
-        <lang langKey="ru">Ультразвуковой резец амплитуда 20%%</lang>
-        <lang langKey="pl">Ostrze ultradźwiękowe amplituda 20%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsblad 20%%</lang>
-        <lang langKey="da">Ultralydsklinge amplitude 20%%</lang>
-        <lang langKey="pt">Lâmina ultrassom amplitude 20%%</lang>
-        <lang langKey="es">Cuchilla ultrasonidos amplitud 20%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>82</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound blade amplitude 30%%</lang>
-        <lang langKey="it">Lama ultrasuoni amplitude 30%%</lang>
-        <lang langKey="fr">Lame à ultrasons, amplitude 30%%</lang>
-        <lang langKey="de">Ultraschallklingenamplitude 30%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučne oštrice 30%%</lang>
-        <lang langKey="ro">Lama cu ultrasunete, amplitudine 30%%</lang>
-        <lang langKey="nl">Ultrasoon mes amplitude 30%%</lang>
-        <lang langKey="el">Λεπίδα υπερήχων πλάτους 30%%</lang>
-        <lang langKey="ru">Ультразвуковой резец амплитуда 30%%</lang>
-        <lang langKey="pl">Ostrze ultradźwiękowe amplituda 30%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsblad 30%%</lang>
-        <lang langKey="da">Ultralydsklinge amplitude 30%%</lang>
-        <lang langKey="pt">Lâmina ultrassom amplitude 30%%</lang>
-        <lang langKey="es">Cuchilla ultrasonidos amplitud 30%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>83</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound blade amplitude 40%%</lang>
-        <lang langKey="it">Lama ultrasuoni amplitude 40%%</lang>
-        <lang langKey="fr">Lame à ultrasons, amplitude 40%%</lang>
-        <lang langKey="de">Ultraschallklingenamplitude 40%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučne oštrice 40%%</lang>
-        <lang langKey="ro">Lama cu ultrasunete, amplitudine 40%%</lang>
-        <lang langKey="nl">Ultrasoon mes amplitude 40%%</lang>
-        <lang langKey="el">Λεπίδα υπερήχων πλάτους 40%%</lang>
-        <lang langKey="ru">Ультразвуковой резец амплитуда 40%%</lang>
-        <lang langKey="pl">Ostrze ultradźwiękowe amplituda 40%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsblad 40%%</lang>
-        <lang langKey="da">Ultralydsklinge amplitude 40%%</lang>
-        <lang langKey="pt">Lâmina ultrassom amplitude 40%%</lang>
-        <lang langKey="es">Cuchilla ultrasonidos amplitud 40%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>84</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound blade amplitude 50%%</lang>
-        <lang langKey="it">Lama ultrasuoni amplitude 50%%</lang>
-        <lang langKey="fr">Lame à ultrasons, amplitude 50%%</lang>
-        <lang langKey="de">Ultraschallklingenamplitude 50%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučne oštrice 50%%</lang>
-        <lang langKey="ro">Lama cu ultrasunete, amplitudine 50%%</lang>
-        <lang langKey="nl">Ultrasoon mes amplitude 50%%</lang>
-        <lang langKey="el">Λεπίδα υπερήχων πλάτους 50%%</lang>
-        <lang langKey="ru">Ультразвуковой резец амплитуда 50%%</lang>
-        <lang langKey="pl">Ostrze ultradźwiękowe amplituda 50%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsblad 50%%</lang>
-        <lang langKey="da">Ultralydsklinge amplitude 50%%</lang>
-        <lang langKey="pt">Lâmina ultrassom amplitude 50%%</lang>
-        <lang langKey="es">Cuchilla ultrasonidos amplitud 50%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>85</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound blade amplitude 60%%</lang>
-        <lang langKey="it">Lama ultrasuoni amplitude 60%%</lang>
-        <lang langKey="fr">Lame à ultrasons, amplitude 60%%</lang>
-        <lang langKey="de">Ultraschallklingenamplitude 60%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučne oštrice 60%%</lang>
-        <lang langKey="ro">Lama cu ultrasunete, amplitudine 60%%</lang>
-        <lang langKey="nl">Ultrasoon mes amplitude 60%%</lang>
-        <lang langKey="el">Λεπίδα υπερήχων πλάτους 60%%</lang>
-        <lang langKey="ru">Ультразвуковой резец амплитуда 60%%</lang>
-        <lang langKey="pl">Ostrze ultradźwiękowe amplituda 60%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsblad 60%%</lang>
-        <lang langKey="da">Ultralydsklinge amplitude 60%%</lang>
-        <lang langKey="pt">Lâmina ultrassom amplitude 60%%</lang>
-        <lang langKey="es">Cuchilla ultrasonidos amplitud 60%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>86</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound blade amplitude 70%%</lang>
-        <lang langKey="it">Lama ultrasuoni amplitude 70%%</lang>
-        <lang langKey="fr">Lame à ultrasons, amplitude 70%%</lang>
-        <lang langKey="de">Ultraschallklingenamplitude 70%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučne oštrice 70%%</lang>
-        <lang langKey="ro">Lama cu ultrasunete, amplitudine 70%%</lang>
-        <lang langKey="nl">Ultrasoon mes amplitude 70%%</lang>
-        <lang langKey="el">Λεπίδα υπερήχων πλάτους 70%%</lang>
-        <lang langKey="ru">Ультразвуковой резец амплитуда 70%%</lang>
-        <lang langKey="pl">Ostrze ultradźwiękowe amplituda 70%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsblad 70%%</lang>
-        <lang langKey="da">Ultralydsklinge amplitude 70%%</lang>
-        <lang langKey="pt">Lâmina ultrassom amplitude 70%%</lang>
-        <lang langKey="es">Cuchilla ultrasonidos amplitud 70%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>87</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound blade amplitude 80%%</lang>
-        <lang langKey="it">Lama ultrasuoni amplitude 80%%</lang>
-        <lang langKey="fr">Lame à ultrasons, amplitude 80%%</lang>
-        <lang langKey="de">Ultraschallklingenamplitude 80%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučne oštrice 80%%</lang>
-        <lang langKey="ro">Lama cu ultrasunete, amplitudine 80%%</lang>
-        <lang langKey="nl">Ultrasoon mes amplitude 80%%</lang>
-        <lang langKey="el">Λεπίδα υπερήχων πλάτους 80%%</lang>
-        <lang langKey="ru">Ультразвуковой резец амплитуда 80%%</lang>
-        <lang langKey="pl">Ostrze ultradźwiękowe amplituda 80%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsblad 80%%</lang>
-        <lang langKey="da">Ultralydsklinge amplitude 80%%</lang>
-        <lang langKey="pt">Lâmina ultrassom amplitude 80%%</lang>
-        <lang langKey="es">Cuchilla ultrasonidos amplitud 80%%</lang>
-      </localizedNames>
-    </toolType>
-    
-    <toolType>
-      <id>88</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound blade amplitude 90%%</lang>
-        <lang langKey="it">Lama ultrasuoni amplitude 90%%</lang>
-        <lang langKey="fr">Lame à ultrasons, amplitude 90%%</lang>
-        <lang langKey="de">Ultraschallklingenamplitude 90%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučne oštrice 90%%</lang>
-        <lang langKey="ro">Lama cu ultrasunete, amplitudine 90%%</lang>
-        <lang langKey="nl">Ultrasoon mes amplitude 90%%</lang>
-        <lang langKey="el">Λεπίδα υπερήχων πλάτους 90%%</lang>
-        <lang langKey="ru">Ультразвуковой резец амплитуда 90%%</lang>
-        <lang langKey="pl">Ostrze ultradźwiękowe amplituda 90%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsblad 90%%</lang>
-        <lang langKey="da">Ultralydsklinge amplitude 90%%</lang>
-        <lang langKey="pt">Lâmina ultrassom amplitude 90%%</lang>
-        <lang langKey="es">Cuchilla ultrasonidos amplitud 90%%</lang>
-      </localizedNames>
-    </toolType>
-    
-    <toolType>
-      <id>89</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Ultrasound blade amplitude 100%%</lang>
-        <lang langKey="it">Lama ultrasuoni amplitude 100%%</lang>
-        <lang langKey="fr">Lame à ultrasons, amplitude 100%%</lang>
-        <lang langKey="de">Ultraschallklingenamplitude 100%%</lang>
-        <lang langKey="hr">Amplituda ultrazvučne oštrice 100%%</lang>
-        <lang langKey="ro">Lama cu ultrasunete, amplitudine 100%%</lang>
-        <lang langKey="nl">Ultrasoon mes amplitude 100%%</lang>
-        <lang langKey="el">Λεπίδα υπερήχων πλάτους 100%%</lang>
-        <lang langKey="ru">Ультразвуковой резец амплитуда 100%%</lang>
-        <lang langKey="pl">Ostrze ultradźwiękowe amplituda 100%%</lang>
-        <lang langKey="sv">Amplitud ultraljudsblad 100%%</lang>
-        <lang langKey="da">Ultralydsklinge amplitude 100%%</lang>
-        <lang langKey="pt">Lâmina ultrassom amplitude 100%%</lang>
-        <lang langKey="es">Cuchilla ultrasonidos amplitud 100%%</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>90</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Blade 1</lang>
-        <lang langKey="it">Lama 1</lang>
-        <lang langKey="fr">Lame 1</lang>
-        <lang langKey="de">Klinge 1</lang>
-        <lang langKey="hr">List pile 1</lang>
-        <lang langKey="ro">Lama 1</lang>
-        <lang langKey="nl">Mes 1</lang>
-        <lang langKey="el">Λάμα 1</lang>
-        <lang langKey="ru">Резец 1</lang>
-        <lang langKey="pl">Ostrze 1</lang>
-        <lang langKey="sv">Blad 1</lang>
-        <lang langKey="da">Klinge 1</lang>
-        <lang langKey="pt">Lâmina 1</lang>
-        <lang langKey="es">Cuchilla 1</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>91</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Blade 2</lang>
-        <lang langKey="it">Lama 2</lang>
-        <lang langKey="fr">Lame 2</lang>
-        <lang langKey="de">Klinge 2</lang>
-        <lang langKey="hr">List pile 2</lang>
-        <lang langKey="ro">Lama 2</lang>
-        <lang langKey="nl">Mes 2</lang>
-        <lang langKey="el">Λάμα 2</lang>
-        <lang langKey="ru">Резец 2</lang>
-        <lang langKey="pl">Ostrze 2</lang>
-        <lang langKey="sv">Blad 2</lang>
-        <lang langKey="da">Klinge 2</lang>
-        <lang langKey="pt">Lâmina 2</lang>
-        <lang langKey="es">Cuchilla 2</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>92</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Blade 3</lang>
-        <lang langKey="it">Lama 3</lang>
-        <lang langKey="fr">Lame 3</lang>
-        <lang langKey="de">Klinge 3</lang>
-        <lang langKey="hr">List pile 3</lang>
-        <lang langKey="ro">Lama 3</lang>
-        <lang langKey="nl">Mes 3</lang>
-        <lang langKey="el">Λάμα 3</lang>
-        <lang langKey="ru">Резец 3</lang>
-        <lang langKey="pl">Ostrze 3</lang>
-        <lang langKey="sv">Blad 3</lang>
-        <lang langKey="da">Klinge 3</lang>
-        <lang langKey="pt">Lâmina 3</lang>
-        <lang langKey="es">Cuchilla 3</lang>
-      </localizedNames>
-    </toolType>
-    
-    <toolType>
-      <id>93</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Blade 4</lang>
-        <lang langKey="it">Lama 4</lang>
-        <lang langKey="fr">Lame 4</lang>
-        <lang langKey="de">Klinge 4</lang>
-        <lang langKey="hr">List pile 4</lang>
-        <lang langKey="ro">Lama 4</lang>
-        <lang langKey="nl">Mes 4</lang>
-        <lang langKey="el">Λάμα 4</lang>
-        <lang langKey="ru">Резец 4</lang>
-        <lang langKey="pl">Ostrze 4</lang>
-        <lang langKey="sv">Blad 4</lang>
-        <lang langKey="da">Klinge 4</lang>
-        <lang langKey="pt">Lâmina 4</lang>
-        <lang langKey="es">Cuchilla 4</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>94</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Blade 5</lang>
-        <lang langKey="it">Lama 5</lang>
-        <lang langKey="fr">Lame 5</lang>
-        <lang langKey="de">Klinge 5</lang>
-        <lang langKey="hr">List pile 5</lang>
-        <lang langKey="ro">Lama 5</lang>
-        <lang langKey="nl">Mes 5</lang>
-        <lang langKey="el">Λάμα 5</lang>
-        <lang langKey="ru">Резец 5</lang>
-        <lang langKey="pl">Ostrze 5</lang>
-        <lang langKey="sv">Blad 5</lang>
-        <lang langKey="da">Klinge 5</lang>
-        <lang langKey="pt">Lâmina 5</lang>
-        <lang langKey="es">Cuchilla 5</lang>
-      </localizedNames>
-    </toolType>
-    
-    <toolType>
-      <id>95</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Blade 6</lang>
-        <lang langKey="it">Lama 6</lang>
-        <lang langKey="fr">Lame 6</lang>
-        <lang langKey="de">Klinge 6</lang>
-        <lang langKey="hr">List pile 6</lang>
-        <lang langKey="ro">Lama 6</lang>
-        <lang langKey="nl">Mes 6</lang>
-        <lang langKey="el">Λάμα 6</lang>
-        <lang langKey="ru">Резец 6</lang>
-        <lang langKey="pl">Ostrze 6</lang>
-        <lang langKey="sv">Blad 6</lang>
-        <lang langKey="da">Klinge 6</lang>
-        <lang langKey="pt">Lâmina 6</lang>
-        <lang langKey="es">Cuchilla 6</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>96</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Blade 7</lang>
-        <lang langKey="it">Lama 7</lang>
-        <lang langKey="fr">Lame 7</lang>
-        <lang langKey="de">Klinge 7</lang>
-        <lang langKey="hr">List pile 7</lang>
-        <lang langKey="ro">Lama 7</lang>
-        <lang langKey="nl">Mes 7</lang>
-        <lang langKey="el">Λάμα 7</lang>
-        <lang langKey="ru">Резец 7</lang>
-        <lang langKey="pl">Ostrze 7</lang>
-        <lang langKey="sv">Blad 7</lang>
-        <lang langKey="da">Klinge 7</lang>
-        <lang langKey="pt">Lâmina 7</lang>
-        <lang langKey="es">Cuchilla 7</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>97</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Blade ⌀300</lang>
-        <lang langKey="it">Lama ⌀300</lang>
-        <lang langKey="fr">Lame ⌀300</lang>
-        <lang langKey="de">Klinge ⌀300</lang>
-        <lang langKey="hr">List pile ⌀300</lang>
-        <lang langKey="ro">Lama ⌀300</lang>
-        <lang langKey="nl">Mes ⌀300</lang>
-        <lang langKey="el">Λάμα ⌀300</lang>
-        <lang langKey="ru">Резец ⌀300</lang>
-        <lang langKey="pl">Ostrze ⌀300</lang>
-        <lang langKey="sv">Blad ⌀300</lang>
-        <lang langKey="da">Klinge ⌀300</lang>
-        <lang langKey="pt">Lâmina ⌀300</lang>
-        <lang langKey="es">Cuchilla ⌀300</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>98</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Blade ⌀400</lang>
-        <lang langKey="it">Lama ⌀400</lang>
-        <lang langKey="fr">Lame ⌀400</lang>
-        <lang langKey="de">Klinge ⌀400</lang>
-        <lang langKey="hr">List pile ⌀400</lang>
-        <lang langKey="ro">Lama ⌀400</lang>
-        <lang langKey="nl">Mes ⌀400</lang>
-        <lang langKey="el">Λάμα ⌀400</lang>
-        <lang langKey="ru">Резец ⌀400</lang>
-        <lang langKey="pl">Ostrze ⌀400</lang>
-        <lang langKey="sv">Blad ⌀400</lang>
-        <lang langKey="da">Klinge ⌀400</lang>
-        <lang langKey="pt">Lâmina ⌀400</lang>
-        <lang langKey="es">Cuchilla ⌀400</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>99</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Blade ⌀500</lang>
-        <lang langKey="it">Lama ⌀500</lang>
-        <lang langKey="fr">Lame ⌀500</lang>
-        <lang langKey="de">Klinge ⌀500</lang>
-        <lang langKey="hr">List pile ⌀500</lang>
-        <lang langKey="ro">Lama ⌀500</lang>
-        <lang langKey="nl">Mes ⌀500</lang>
-        <lang langKey="el">Λάμα ⌀500</lang>
-        <lang langKey="ru">Резец ⌀500</lang>
-        <lang langKey="pl">Ostrze ⌀500</lang>
-        <lang langKey="sv">Blad ⌀500</lang>
-        <lang langKey="da">Klinge ⌀500</lang>
-        <lang langKey="pt">Lâmina ⌀500</lang>
-        <lang langKey="es">Cuchilla ⌀500</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>101</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Radio Probe 1 - Reciever 1</lang>
-        <lang langKey="it">Radio Probe 1 - Ricevitore 1</lang>
-        <lang langKey="fr">Radio Probe 1 - Récepteur 1</lang>
-        <lang langKey="de">Radio Probe 1 - Empfänger 1</lang>
-        <lang langKey="hr">Radio Probe 1 - Prijemnik 1</lang>
-        <lang langKey="ro">Probe Radio 1 - Receptor 1</lang>
-        <lang langKey="nl">Radio Probe 1 - Ontvanger 1</lang>
-        <lang langKey="el">Ραδιο-ανιχνευτής 1 - Δέκτης 1</lang>
-        <lang langKey="ru">Радиодатчик 1 - Приемник 1</lang>
-        <lang langKey="pl">Sonda radiowa 1 - Odbiornik 1</lang>
-        <lang langKey="sv">Radiosond 1 - Mottagare 1</lang>
-        <lang langKey="da">Radio Sonde 1 - Modtager 1</lang>
-        <lang langKey="pt">Sonda Probe 1 - Receptor 1</lang>
-        <lang langKey="es">Radio Probe 1 - Receptor 1</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>102</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Radio Probe 2 - Reciever 1</lang>
-        <lang langKey="it">Radio Probe 2 - Ricevitore 1</lang>
-        <lang langKey="fr">Radio Probe 2 - Récepteur 1</lang>
-        <lang langKey="de">Radio Probe 2 - Empfänger 1</lang>
-        <lang langKey="hr">Radio Probe 2 - Prijemnik 1</lang>
-        <lang langKey="ro">Probe Radio 2 - Receptor 1</lang>
-        <lang langKey="nl">Radio Probe 2 - Ontvanger 1</lang>
-        <lang langKey="el">Ραδιο-ανιχνευτής 2 - Δέκτης 1</lang>
-        <lang langKey="ru">Радиодатчик 2 - Приемник 1</lang>
-        <lang langKey="pl">Sonda radiowa 2 - Odbiornik 1</lang>
-        <lang langKey="sv">Radiosond 2 - Mottagare 1</lang>
-        <lang langKey="da">Radio Sonde 2 - Modtager 1</lang>
-        <lang langKey="pt">Sonda Probe 2 - Receptor 1</lang>
-        <lang langKey="es">Radio Probe 2 - Receptor 1</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>103</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Radio Probe 3 - Reciever 1</lang>
-        <lang langKey="it">Radio Probe 3 - Ricevitore 1</lang>
-        <lang langKey="fr">Radio Probe 3 - Récepteur 1</lang>
-        <lang langKey="de">Radio Probe 3 - Empfänger 1</lang>
-        <lang langKey="hr">Radio Probe 3 - Prijemnik 1</lang>
-        <lang langKey="ro">Probe Radio 3 - Receptor 1</lang>
-        <lang langKey="nl">Radio Probe 3 - Ontvanger 1</lang>
-        <lang langKey="el">Ραδιο-ανιχνευτής 3 - Δέκτης 1</lang>
-        <lang langKey="ru">Радиодатчик 3 - Приемник 1</lang>
-        <lang langKey="pl">Sonda radiowa 3 - Odbiornik 1</lang>
-        <lang langKey="sv">Radiosond 3 - Mottagare 1</lang>
-        <lang langKey="da">Radio Sonde 3 - Modtager 1</lang>
-        <lang langKey="pt">Sonda Probe 3 - Receptor 1</lang>
-        <lang langKey="es">Radio Probe 3 - Receptor 1</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>104</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Radio Probe 4 - Reciever 1</lang>
-        <lang langKey="it">Radio Probe 4 - Ricevitore 1</lang>
-        <lang langKey="fr">Radio Probe 4 - Récepteur 1</lang>
-        <lang langKey="de">Radio Probe 4 - Empfänger 1</lang>
-        <lang langKey="hr">Radio Probe 4 - Prijemnik 1</lang>
-        <lang langKey="ro">Probe Radio 4 - Receptor 1</lang>
-        <lang langKey="nl">Radio Probe 4 - Ontvanger 1</lang>
-        <lang langKey="el">Ραδιο-ανιχνευτής 4 - Δέκτης 1</lang>
-        <lang langKey="ru">Радиодатчик 4 - Приемник 1</lang>
-        <lang langKey="pl">Sonda radiowa 4 - Odbiornik 1</lang>
-        <lang langKey="sv">Radiosond 4 - Mottagare 1</lang>
-        <lang langKey="da">Radio Sonde 4 - Modtager 1</lang>
-        <lang langKey="pt">Sonda Probe 4 - Receptor 1</lang>
-        <lang langKey="es">Radio Probe 4 - Receptor 1</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>105</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Radio Probe 1 - Reciever 2</lang>
-        <lang langKey="it">Radio Probe 1 - Ricevitore 2</lang>
-        <lang langKey="fr">Radio Probe 1 - Récepteur 2</lang>
-        <lang langKey="de">Radio Probe 1 - Empfänger 2</lang>
-        <lang langKey="hr">Radio Probe 1 - Prijemnik 2</lang>
-        <lang langKey="ro">Probe Radio 1 - Receptor 2</lang>
-        <lang langKey="nl">Radio Probe 1 - Ontvanger 2</lang>
-        <lang langKey="el">Ραδιο-ανιχνευτής 1 - Δέκτης 2</lang>
-        <lang langKey="ru">Радиодатчик 1 - Приемник 2</lang>
-        <lang langKey="pl">Sonda radiowa 1 - Odbiornik 2</lang>
-        <lang langKey="sv">Radiosond 1 - Mottagare 2</lang>
-        <lang langKey="da">Radio Sonde 1 - Modtager 2</lang>
-        <lang langKey="pt">Sonda Probe 1 - Receptor 2</lang>
-        <lang langKey="es">Radio Probe 1 - Receptor 2</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>106</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Radio Probe 2 - Reciever 2</lang>
-        <lang langKey="it">Radio Probe 2 - Ricevitore 2</lang>
-        <lang langKey="fr">Radio Probe 2 - Récepteur 2</lang>
-        <lang langKey="de">Radio Probe 2 - Empfänger 2</lang>
-        <lang langKey="hr">Radio Probe 2 - Prijemnik 2</lang>
-        <lang langKey="ro">Probe Radio 2 - Receptor 2</lang>
-        <lang langKey="nl">Radio Probe 2 - Ontvanger 2</lang>
-        <lang langKey="el">Ραδιο-ανιχνευτής 2 - Δέκτης 2</lang>
-        <lang langKey="ru">Радиодатчик 2 - Приемник 2</lang>
-        <lang langKey="pl">Sonda radiowa 2 - Odbiornik 2</lang>
-        <lang langKey="sv">Radiosond 2 - Mottagare 2</lang>
-        <lang langKey="da">Radio Sonde 2 - Modtager 2</lang>
-        <lang langKey="pt">Sonda Probe 2 - Receptor 2</lang>
-        <lang langKey="es">Radio Probe 2 - Receptor 2</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>107</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Radio Probe 3 - Reciever 2</lang>
-        <lang langKey="it">Radio Probe 3 - Ricevitore 2</lang>
-        <lang langKey="fr">Radio Probe 3 - Récepteur 2</lang>
-        <lang langKey="de">Radio Probe 3 - Empfänger 2</lang>
-        <lang langKey="hr">Radio Probe 3 - Prijemnik 2</lang>
-        <lang langKey="ro">Probe Radio 3 - Receptor 2</lang>
-        <lang langKey="nl">Radio Probe 3 - Ontvanger 2</lang>
-        <lang langKey="el">Ραδιο-ανιχνευτής 3 - Δέκτης 2</lang>
-        <lang langKey="ru">Радиодатчик 3 - Приемник 2</lang>
-        <lang langKey="pl">Sonda radiowa 3 - Odbiornik 2</lang>
-        <lang langKey="sv">Radiosond 3 - Mottagare 2</lang>
-        <lang langKey="da">Radio Sonde 3 - Modtager 2</lang>
-        <lang langKey="pt">Sonda Probe 3 - Receptor 2</lang>
-        <lang langKey="es">Radio Probe 3 - Receptor 2</lang>
-      </localizedNames>
-    </toolType>
-
-    <toolType>
-      <id>108</id>
-      <disabled>false</disabled>
-      <localizedNames>
-        <lang langKey="en">Radio Probe 4 - Reciever 2</lang>
-        <lang langKey="it">Radio Probe 4 - Ricevitore 2</lang>
-        <lang langKey="fr">Radio Probe 4 - Récepteur 2</lang>
-        <lang langKey="de">Radio Probe 4 - Empfänger 2</lang>
-        <lang langKey="hr">Radio Probe 4 - Prijemnik 2</lang>
-        <lang langKey="ro">Probe Radio 4 - Receptor 2</lang>
-        <lang langKey="nl">Radio Probe 4 - Ontvanger 2</lang>
-        <lang langKey="el">Ραδιο-ανιχνευτής 4 - Δέκτης 2</lang>
-        <lang langKey="ru">Радиодатчик 4 - Приемник 2</lang>
-        <lang langKey="pl">Sonda radiowa 4 - Odbiornik 2</lang>
-        <lang langKey="sv">Radiosond 4 - Mottagare 2</lang>
-        <lang langKey="da">Radio Sonde 4 - Modtager 2</lang>
-        <lang langKey="pt">Sonda Probe 4 - Receptor 2</lang>
-        <lang langKey="es">Radio Probe 4 - Receptor 2</lang>
-      </localizedNames>
-    </toolType>
-    
-  </toolTypes>
-</root>
\ No newline at end of file
diff --git a/Thermo.Active.Config/Config/toolManagerConfigValidator.xsd b/Thermo.Active.Config/Config/toolManagerConfigValidator.xsd
deleted file mode 100644
index 6be1591d..00000000
--- a/Thermo.Active.Config/Config/toolManagerConfigValidator.xsd
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:element name="root">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="toolManagerConfig">
-          <xs:complexType>
-            <xs:all>
-              <xs:element name="toolMetricType" type="tmType" minOccurs='1' maxOccurs='1'/>
-              <xs:element name="familyOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-              <xs:element name="shankOpt" type="xs:boolean" minOccurs="1" maxOccurs="1" />
-              <xs:element name="magPositionOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-              <xs:element name="offsetOpt" type="xs:boolean"  minOccurs='1' maxOccurs='1' />
-              <xs:element name="reviveOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-              <xs:element name="gammaOpt" type="xs:boolean"  minOccurs='1' maxOccurs='1' />
-              <xs:element name="lifeOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-              <xs:element name="tcpOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-              <xs:element name="coolingOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-              <xs:element name="multidimensionalShankOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-              <xs:element name="selfAdaptivePathOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-              <xs:element name="dynamicCompensationOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-              <xs:element name="ballufOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-              <xs:element name="integrityCheckOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
-            </xs:all>
-          </xs:complexType>
-        </xs:element>
-        
-        <xs:element name="coolingLocalizedNames">
-          <xs:complexType>
-            <xs:all>
-
-              <xs:element name="cooling">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
-                    </xs:element>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
-              
-              <xs:element name="cooling1">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
-                    </xs:element>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
-
-              <xs:element name="cooling2">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
-                    </xs:element>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
-              
-              <xs:element name="cooling3">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
-                    </xs:element>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
-
-              <xs:element name="cooling4">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
-                    </xs:element>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
-
-              <xs:element name="cooling5">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
-                    </xs:element>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
-              
-              <xs:element name="cooling6">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
-                    </xs:element>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
-
-              <xs:element name="cooling7">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
-                    </xs:element>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
-              
-            </xs:all>
-          </xs:complexType>
-        </xs:element>
-
-        <xs:element name="magazineNames">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="magazine" minOccurs="1" maxOccurs="unbounded">
-                <xs:complexType>
-                  <xs:all>
-                    <xs:element name="id" type="xs:int"/>
-                    <xs:element name="assistedTooling" type="xs:boolean"/>
-                    <xs:element name="localizedNames">
-                    <xs:complexType>
-                      <xs:sequence>
-                        <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded">
-                        </xs:element>
-                      </xs:sequence>
-                    </xs:complexType>
-                    </xs:element>
-                  </xs:all> 
-                  </xs:complexType>
-              </xs:element>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        
-        <!-- ToolTypes -->
-        <xs:element name="toolTypes">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="toolType" type="toolTypeType" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        
-      </xs:all>
-    </xs:complexType>
-  </xs:element>
-  
-  
-  <xs:simpleType name="tmType" final="restriction" >
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="RADIUS" />
-      <xs:enumeration value="DIAMETER" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <!-- Language Type -->
-  <xs:complexType name="langType">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute name="langKey" use="required" type="xs:string" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  
-  <!-- Language Type -->
-  <xs:complexType name="toolTypeType">
-    <xs:all>
-      <xs:element name="id" minOccurs='1' maxOccurs='1'/>
-      <xs:element name="disabled" minOccurs='1' maxOccurs='1'/>
-      <xs:element name="localizedNames">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="lang" type="langType" minOccurs="0" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-    </xs:all>
-  </xs:complexType>
-</xs:schema>
\ No newline at end of file
diff --git a/Thermo.Active.Config/Config/userSoftKeyConfig.xml b/Thermo.Active.Config/Config/userSoftKeyConfig.xml
index 0ecfd008..e89c7c77 100644
--- a/Thermo.Active.Config/Config/userSoftKeyConfig.xml
+++ b/Thermo.Active.Config/Config/userSoftKeyConfig.xml
@@ -205,7 +205,7 @@
 	<visible>true</visible>
   </softKey_procedure>
   
-  <softKey_toggle>
+  <!--<softKey_toggle>
     <active>false</active>
     <category>6</category>
     <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -227,7 +227,7 @@
       <lang langKey="it">Protezione magazzino 2</lang>
     </localizedNames>
 	<visible>true</visible>
-  </softKey_toggle>
+  </softKey_toggle>-->
   
   <softKey_group>
     <active>true</active>
@@ -348,7 +348,7 @@
 	<visible>true</visible>
   </softKey_procedure> 
   
-  <softKey_procedure>
+  <!--<softKey_procedure>
     <active>false</active>
     <category>6</category>
     <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -358,9 +358,9 @@
       <lang langKey="it">Attrezzaggio macchina</lang>
     </localizedNames>
 	<visible>true</visible>
-  </softKey_procedure> 
+  </softKey_procedure>--> 
 
-  <softKey_procedure>
+  <!--<softKey_procedure>
     <active>true</active>
     <category>5</category>
     <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -370,7 +370,7 @@
       <lang langKey="it">Ripristino cambio utensile</lang>
     </localizedNames>
 	<visible>true</visible>
-  </softKey_procedure> 
+  </softKey_procedure>--> 
   
   <softKey_toggle>
     <active>false</active>
@@ -399,7 +399,7 @@
 	<visible>true</visible>
   </softKey_group>
 
-  <softKey_toggle>
+  <!--<softKey_toggle>
     <active>true</active>
     <category>3</category>
     <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -409,9 +409,9 @@
       <lang langKey="it">Soffiatore esterno utensile</lang>
     </localizedNames>
 	<visible>true</visible>
-  </softKey_toggle>
+  </softKey_toggle>-->
 
-  <softKey_toggle>
+  <!--<softKey_toggle>
     <active>false</active>
     <category>3</category>
     <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -421,7 +421,7 @@
       <lang langKey="it">Soffiatore interno utensile</lang>
     </localizedNames>
 	<visible>true</visible>
-  </softKey_toggle>
+  </softKey_toggle>-->
   
   <softKey_toggle>
     <active>false</active>
@@ -435,7 +435,7 @@
 	<visible>true</visible>
   </softKey_toggle>
   
-  <softKey_toggle>
+  <!--<softKey_toggle>
     <active>false</active>
     <category>3</category>
     <operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -457,7 +457,7 @@
       <lang langKey="it">Nebulizzatore interno utensile</lang>
     </localizedNames>
 	<visible>true</visible>
-  </softKey_toggle>
+  </softKey_toggle>-->
   
   <softKey_toggle>
     <active>false</active>
diff --git a/Thermo.Active.Config/ServerConfig.cs b/Thermo.Active.Config/ServerConfig.cs
index 24e5a0fd..139f5caf 100644
--- a/Thermo.Active.Config/ServerConfig.cs
+++ b/Thermo.Active.Config/ServerConfig.cs
@@ -32,11 +32,9 @@ namespace Thermo.Active.Config
         public static List<NcSoftKeysModel> NcSoftKeysConfig;
         public static List<AlarmsConfigModel> InitialAlarmsConfig;
         public static List<HeadsConfigModel> HeadsConfig;
-        public static ToolManagerConfigModel ToolManagerConfig;
         public static CmsConnectConfigModel CmsConnectConfig;
 
         public static AreasConfigModel ProductionConfig;
-        public static AreasConfigModel ToolingConfig;
         public static AreasConfigModel ReportConfig;
         public static AreasConfigModel AlarmsConfig;
         public static AreasConfigModel MaintenanceConfig;
diff --git a/Thermo.Active.Config/ServerConfigController.cs b/Thermo.Active.Config/ServerConfigController.cs
index 0db2f861..cea82bdd 100644
--- a/Thermo.Active.Config/ServerConfigController.cs
+++ b/Thermo.Active.Config/ServerConfigController.cs
@@ -33,7 +33,6 @@ namespace Thermo.Active.Config
                 ReadUserSoftKeysConfig();
                 ReadAlarmsConfig();
                 ReadHeadsConfig();
-                ReadToolManagerConfig();
                 // ReadCMSConnectConfig();
                 ReadMacros();
                 ReadScadaFile();
@@ -113,10 +112,6 @@ namespace Thermo.Active.Config
                     SetAreaValue(ref ProductionConfig, element);
                     break;
 
-                case AREAS.TOOLING_KEY:
-                    SetAreaValue(ref ToolingConfig, element);
-                    break;
-
                 case AREAS.REPORT_KEY:
                     SetAreaValue(ref ReportConfig, element);
                     break;
@@ -181,9 +176,6 @@ namespace Thermo.Active.Config
             {
                 case AREAS.PRODUCTION_KEY:
                     return ProductionConfig.Enabled;
-                     
-                case AREAS.TOOLING_KEY:
-                    return ToolingConfig.Enabled;
 
                 case AREAS.REPORT_KEY:
                     return ProductionConfig.Enabled;
@@ -580,97 +572,6 @@ namespace Thermo.Active.Config
                 .ToList();
         }
 
-        private static void ReadToolManagerConfig()
-        {
-            XDocument xmlConfigFile = GetXmlHandlerWithValidator(TOOL_MANAGER_CONFIG_SCHEMA_PATH, TOOL_MANAGER_CONFIG_PATH);
-
-            // Read config from XML file
-            ToolManagerConfig = xmlConfigFile
-                .Root
-                .Descendants("toolManagerConfig")
-                .Select(x => new ToolManagerConfigModel()
-                {
-                    ToolMetricType = x.Element("toolMetricType").Value,
-                    FamilyOpt = Convert.ToBoolean(x.Element("familyOpt").Value),
-                    ShankOpt = Convert.ToBoolean(x.Element("shankOpt").Value),
-                    MagPosTypeOpt = Convert.ToBoolean(x.Element("magPositionOpt").Value),
-                    OffsetOpt = Convert.ToBoolean(x.Element("offsetOpt").Value),
-                    ReviveOpt = Convert.ToBoolean(x.Element("reviveOpt").Value),
-                    GammaOpt = Convert.ToBoolean(x.Element("gammaOpt").Value),
-                    LifeOpt = Convert.ToBoolean(x.Element("lifeOpt").Value),
-                    TcpOpt = Convert.ToBoolean(x.Element("tcpOpt").Value),
-                    CoolingOpt = Convert.ToBoolean(x.Element("coolingOpt").Value),
-                    MultidimensionalShankOpt = Convert.ToBoolean(x.Element("multidimensionalShankOpt").Value),
-                    SelfAdaptivePathOpt = Convert.ToBoolean(x.Element("selfAdaptivePathOpt").Value),
-                    DynamicCompensationOpt = Convert.ToBoolean(x.Element("dynamicCompensationOpt").Value),
-                    BallufOpt = Convert.ToBoolean(x.Element("ballufOpt").Value),
-                    IntegrityCheckOpt = Convert.ToBoolean(x.Element("integrityCheckOpt").Value)  
-                })
-                .FirstOrDefault();
-
-            
-            ToolManagerConfig.CooligsTranslations = xmlConfigFile
-                .Root
-                .Descendants("coolingLocalizedNames")
-                .Select(x => new CooligTranslations()
-                {
-                    Cooling = x.Element("cooling").Elements().ToDictionary( // Read localized names of cooling and convert into a dictionary
-                           y => y.Attribute("langKey").Value, y => y.Value
-                        ),
-                    Cooling1 = x.Element("cooling1").Elements().ToDictionary(
-                           y => y.Attribute("langKey").Value, y => y.Value
-                        ),
-                    Cooling2 = x.Element("cooling2").Elements().ToDictionary(
-                           y => y.Attribute("langKey").Value, y => y.Value
-                        ),
-                    Cooling3 = x.Element("cooling3").Elements().ToDictionary(
-                           y => y.Attribute("langKey").Value, y => y.Value
-                        ),
-                    Cooling4 = x.Element("cooling4").Elements().ToDictionary(
-                           y => y.Attribute("langKey").Value, y => y.Value
-                        ),
-                    Cooling5 = x.Element("cooling5").Elements().ToDictionary(
-                           y => y.Attribute("langKey").Value, y => y.Value
-                        ),
-                    Cooling6 = x.Element("cooling6").Elements().ToDictionary(
-                           y => y.Attribute("langKey").Value, y => y.Value
-                        ),
-                    Cooling7 = x.Element("cooling7").Elements().ToDictionary(
-                           y => y.Attribute("langKey").Value, y => y.Value
-                        )
-
-                })
-                .FirstOrDefault();
-
-            ToolManagerConfig.MagazineNames = xmlConfigFile
-                .Root
-                .Descendants("magazineNames")
-                .Elements()
-                .Select(x => new MagazineNamesModel()
-                {
-                   MagazineId = Convert.ToInt32(x.Element("id").Value),
-                   AssistedTooling = Convert.ToBoolean(x.Element("assistedTooling").Value), 
-                   LocalizedNames = x.Element("localizedNames").Elements().ToDictionary( // Read localized names and convert into a dictionary
-                            y => y.Attribute("langKey").Value, y => y.Value
-                        ),
-                })
-                .ToList();
-
-            ToolManagerConfig.ToolTypes = xmlConfigFile
-                .Root
-                .Descendants("toolTypes")
-                .Elements()
-                .Select(x => new ToolTypeConfigModel()
-                {
-                    Id = Convert.ToInt32(x.Element("id").Value),
-                    Disabled = Convert.ToBoolean(x.Element("disabled").Value),
-                    LocalizedNames = x.Element("localizedNames").Elements().ToDictionary( // Read localized names and convert into a dictionary
-                            y => y.Attribute("langKey").Value, y => y.Value
-                        ),
-                })
-                .ToList();
-        }
-
 
         private static void ReadCMSConnectConfig()
         {
diff --git a/Thermo.Active.Config/Thermo.Active.Config.csproj b/Thermo.Active.Config/Thermo.Active.Config.csproj
index 62ecc67b..e77793e6 100644
--- a/Thermo.Active.Config/Thermo.Active.Config.csproj
+++ b/Thermo.Active.Config/Thermo.Active.Config.csproj
@@ -69,10 +69,6 @@
     <Content Include="Config\customMainProgram.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Config\toolManagerConfig.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="Config\userSoftKeyConfig.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
@@ -113,9 +109,6 @@
     <EmbeddedResource Include="Config\ncSoftKeyConfigValidator.xsd">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Config\toolManagerConfigValidator.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Thermo.Active.Model\Thermo.Active.Model.csproj">
diff --git a/Thermo.Active.Core/ThreadsFunctions.cs b/Thermo.Active.Core/ThreadsFunctions.cs
index 35555f59..9ff2113c 100644
--- a/Thermo.Active.Core/ThreadsFunctions.cs
+++ b/Thermo.Active.Core/ThreadsFunctions.cs
@@ -5,7 +5,6 @@ using Thermo.Active.Database.Controllers;
 using Thermo.Active.Model.DTOModels;
 using Thermo.Active.Model.DTOModels.AlarmModels;
 using Thermo.Active.Model.DTOModels.Scada;
-using Thermo.Active.Model.DTOModels.ToolModels;
 using Thermo.Active.NC;
 using Thermo.Active.Utils;
 using System;
@@ -508,50 +507,6 @@ public static class ThreadsFunctions
         }
     }
 
-    public static void ReadMagazinesStatus()
-    {
-        SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter();
-        Stopwatch sw = new Stopwatch();
-
-        try
-        {
-            // Try connection
-            CmsError libraryError = ncAdapter.Connect();
-            if (libraryError.errorCode != 0)
-                ManageLibraryError(libraryError);
-
-            while (true)
-            {
-                sw.Restart();
-
-                if (ncAdapter.numericalControl.NC_IsConnected())
-                {
-                    // Get Data from config and PLC
-                    libraryError = ncAdapter.GetMagazineStatus(out DTOMagazineActionModel magazineStatus);
-                    if (libraryError.errorCode != 0)
-                        ManageLibraryError(libraryError);
-                    else
-                        // Send through signalR
-                        MessageServices.Current.Publish(SEND_MAGAZINES_STATUS, null, magazineStatus);
-                }
-                else
-                    RestoreConnection();
-
-                sw.Stop();
-
-                //Update thread timer
-                UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
-
-                // Wait
-                Thread.Sleep(CalcSleepTime(1000, (int)sw.ElapsedMilliseconds));
-            }
-        }
-        catch (ThreadAbortException)
-        {
-            ncAdapter.Dispose();
-        }
-    }
-
     public static void ReadActiveProgramData()
     {
         NcFileAdapter ncAdapter = new NcFileAdapter();
@@ -597,108 +552,6 @@ public static class ThreadsFunctions
         }
     }
 
-    public static void UpdateToolsData()
-    {
-        NcToolTableAdapter ncAdapter = new NcToolTableAdapter();
-        Stopwatch sw = new Stopwatch();
-
-        if(NcConfig.NcVendor != NC_VENDOR.SIEMENS)
-        {
-            try
-            {
-                // Try connection
-                CmsError libraryError = ncAdapter.Connect();
-                if (libraryError.errorCode != 0)
-                    ManageLibraryError(libraryError);
-
-                while (true)
-                {
-                    sw.Restart();
-
-                    // Check if client is connected
-                    if (ncAdapter.numericalControl.NC_IsConnected())
-                    {
-                        // Get new data from PLC
-                        libraryError = ncAdapter.GetUpdatedToolsData(out Dictionary<int, byte> updatedStatus, out Dictionary<int, uint> updatedLives);
-                        if (libraryError.IsError())
-                            ManageLibraryError(libraryError);
-
-                        MessageServices.Current.Publish(UPDATE_TOOLS_DATA, null,
-                        new DTONewToolDataModel
-                        {
-                            UpdatedStatus = updatedStatus,
-                            UpdatedLives = updatedLives
-                        });
-                    }
-                    else
-                        RestoreConnection();
-                    sw.Stop();
-
-                    //Update thread timer
-                    UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
-
-                    // Wait
-                    Thread.Sleep(CalcSleepTime(1000, (int)sw.ElapsedMilliseconds));
-                }
-            }
-            catch (ThreadAbortException)
-            {
-                ncAdapter.Dispose();
-            }
-        }
-    }
-
-    public static void ReadNcMagazineActive()
-    {
-        if (NcConfig.NcVendor != NC_VENDOR.SIEMENS)
-        {
-            NcToolTableAdapter ncAdapter = new NcToolTableAdapter();
-            Stopwatch sw = new Stopwatch();
-            try
-            {
-                // Try connection
-                CmsError libraryError = ncAdapter.Connect();
-                if (libraryError.errorCode != 0)
-                    ManageLibraryError(libraryError);
-
-                while (true)
-                {
-                    sw.Restart();
-
-                    // Check if client is connected
-                    if (ncAdapter.numericalControl.NC_IsConnected())
-                    {
-                        // Get new data from PLC
-                        libraryError = ncAdapter.GetNcMagazineStatus(out Dictionary<int, bool> status);
-                        if (libraryError.IsError())
-                            ManageLibraryError(libraryError);
-
-                        MessageServices.Current.Publish(NC_MAGAZINE_IS_ACTIVE, null, status);
-
-                        libraryError = ncAdapter.ReadAssistedToolingProcedure(out DTOAssistedToolingEndValueModel data);
-                        if (libraryError.IsError())
-                            ManageLibraryError(libraryError);
-
-                        MessageServices.Current.Publish(ASSISTED_TOOLING_DATA, null, data);
-                    }
-                    else
-                        RestoreConnection();
-                    sw.Stop();
-
-                    //Update thread timer
-                    UpdateStat(MethodBase.GetCurrentMethod().Name, sw.ElapsedMilliseconds);
-
-                    // Wait
-                    Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds));
-                }
-            }
-            catch (ThreadAbortException)
-            {
-                ncAdapter.Dispose();
-            }
-        }
-    }
-
     public static void ReadPartProgramQueueData()
     {
         NcFileAdapter ncAdapter = new NcFileAdapter();
@@ -1053,28 +906,12 @@ public static class ThreadsFunctions
                 ncAdapter.Dispose();
             }
 
-            if (cmsError.errorCode == CMS_ERROR_CODES.SIEMENS_TOOL_TABLE_ERROR)
-                ManageLibraryError(cmsError);
-
             // Send status to UI
             MessageServices.Current.Publish(SEND_NC_STATUS, null, ncAdapter.numericalControl.NC_IsConnected());
 
             Thread.Sleep(1000);
         }
 
-
-        if(NcConfig.NcVendor == NC_VENDOR.FANUC || NcConfig.NcVendor == NC_VENDOR.OSAI)
-        {
-            using (NcToolTableAdapter toolTable = new NcToolTableAdapter())
-            {
-                toolTable.Connect();
-                // After reconecction write option
-                cmsError = toolTable.SetupNcToolManager();
-                if (cmsError.IsError())
-                    ManageLibraryError(cmsError);
-                // cmsError = toolTable.RestoreTableLock();
-            }
-        }
         if (!cmsError.IsError())
         {
             if (ServerStartupConfig.AutoOpenCmsClient)
@@ -1122,7 +959,6 @@ public static class ThreadsFunctions
             case CMS_ERROR_CODES.SIEMENS_ENVIRONMENT_NOT_FOUND:
             case CMS_ERROR_CODES.OSAI_TT_FOLDER_NOT_FOUND:
             case CMS_ERROR_CODES.OPTION_NOT_CONSISTENT:
-            case CMS_ERROR_CODES.SIEMENS_TOOL_TABLE_ERROR:
                 ManageError(ERROR_LEVEL.FATAL, cmsError.localizationKey);
                 break;
 
diff --git a/Thermo.Active.Core/ThreadsHandler.cs b/Thermo.Active.Core/ThreadsHandler.cs
index 2bea030d..490c24b5 100644
--- a/Thermo.Active.Core/ThreadsHandler.cs
+++ b/Thermo.Active.Core/ThreadsHandler.cs
@@ -18,13 +18,10 @@ namespace Thermo.Active.Core
                 ThreadsFunctions.ReadEnabledFunctionality,
                 ThreadsFunctions.ReadExpiredMaintenances,
                 ThreadsFunctions.ReadAxesPositionsData,
-                ThreadsFunctions.ReadMagazinesStatus,
                 ThreadsFunctions.ReadUserSoftKeysData,
                 ThreadsFunctions.ReadHeadsData,
                 ThreadsFunctions.ReadAxesNamesData,
                 ThreadsFunctions.ReadActiveProgramData,
-                ThreadsFunctions.UpdateToolsData,
-                ThreadsFunctions.ReadNcMagazineActive,
                 //ThreadsFunctions.ReadPartProgramQueueData,
                 ThreadsFunctions.ReadScadaData,
                 ThreadsFunctions.ReadM154Data
diff --git a/Thermo.Active.Database/Controllers/NcToolManagerController.cs b/Thermo.Active.Database/Controllers/NcToolManagerController.cs
deleted file mode 100644
index c1816182..00000000
--- a/Thermo.Active.Database/Controllers/NcToolManagerController.cs
+++ /dev/null
@@ -1,685 +0,0 @@
-using Thermo.Active.Model.DatabaseModels;
-using Thermo.Active.Model.DTOModels.ToolModels;
-using Thermo.Active.Utils;
-using System;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Linq;
-using static Thermo.Active.Utils.SupportFunctions;
-using static Thermo.Active.Model.Constants;
-
-namespace Thermo.Active.Database.Controllers
-{
-    public class NcToolManagerController : IDisposable
-    {
-        public DatabaseContext dbCtx;
-
-        public NcToolManagerController()
-        {
-            // Initialize database context
-            dbCtx = new DatabaseContext();
-        }
-
-        public void Dispose()
-        {
-            // Clear database context
-            dbCtx.Dispose();
-        }
-
-        public List<DbNcFamilyModel> FindFamilies()
-        {
-            List<DbNcFamilyModel> families = dbCtx
-                .Families
-                .Include("Tools")
-                .ToList();
-
-            return families;
-        }
-
-        public List<DTONcFamilyModel> GetFamilies()
-        {
-            List<DbNcFamilyModel> dbFamilies = FindFamilies();
-
-            return dbFamilies
-                .Select(x => (DTONcFamilyModel)x)
-                .ToList();
-        }
-
-        public List<DbNcFamilyModel> FindFamiliesByShankId(int shankId)
-        {
-            DbNcShankModel shank = FindShankWithTools(shankId);
-            // Get only families id
-            short[] ids = shank.Tools.Select(x => x.FamilyId).ToArray();
-
-            return FindFamilies() // Get Families
-                .Where(x => ids.Contains(x.FamilyId)) // Filter by ids
-                .ToList();
-        }
-
-        public DbNcToolModel FindTool(int toolId)
-        {
-            return dbCtx.Tools
-                .Where(x => x.ToolId == toolId)
-                .FirstOrDefault();
-        }
-
-        public DbNcToolModel FindToolWithDependencies(int toolId)
-        {
-            return dbCtx.Tools
-                .Where(x => x.ToolId == toolId)
-                .Include("Family")
-                .Include("Shank")
-                .FirstOrDefault();
-        } 
-
-        public DbNcShankModel FindShankWithTools(int shankId) 
-        {
-            return dbCtx.Shanks
-                .Include("Tools")
-                .Where(x => x.ShankId == shankId)
-                .FirstOrDefault();
-        }
-
-        public DbNcFamilyModel FindFamily(int familyId)
-        {
-            return dbCtx
-                .Families
-                .Where(x => x.FamilyId == familyId)
-                .Include("Tools")
-                .FirstOrDefault();
-        }
-
-        public List<DbNcToolModel> FindToolsWithDependencies()
-        {
-            List<DbNcToolModel> tools = dbCtx
-                .Tools
-                .Include("Family")
-                .Include("Shank")
-                .ToList();
-
-            return tools;
-        }
-
-        public List<DbNcToolModel> FindToolsByShankIdWithDependencies(int shankId)
-        {
-            List<DbNcToolModel> tools = FindToolsWithDependencies()
-                .Where(x => x.ShankId == shankId)
-                .ToList();
-
-            return tools;
-        }
-
-        public List<DbNcToolModel> FindTools()
-        {
-            List<DbNcToolModel> tools = dbCtx
-                .Tools
-                .ToList();
-
-            return tools;
-        }
-
-        public List<DTONcToolModel> GetTools()
-        {
-            List<DbNcToolModel> dbTools = FindToolsWithDependencies();
-
-            return dbTools
-                .Select(x => (DTONcToolModel)x)
-                .ToList();
-        }
-
-        public List<DbNcShankModel> FindShanks()
-        {
-            List<DbNcShankModel> shanks = dbCtx
-                .Shanks
-                .Include("MagazinePosition")
-                .ToList();
-
-            return shanks;
-        }
-
-        public DbNcShankModel FindShank(int shankId)
-        {
-            return dbCtx.Shanks
-                .Where(x => x.ShankId == shankId)
-                .FirstOrDefault();
-        }
-
-        public DbNcShankModel FindShanksByPositions(int magazineId, int positionId)
-        {
-            DbNcShankModel shank = FindShanks()
-                    .Where(x => x.MagazineId == magazineId && x.PositionId == positionId)
-                    .FirstOrDefault();
-
-            return shank;
-        }
-
-        public List<DbNcShankModel> FindShanksByFamilyId(int familyId)
-        {
-            return dbCtx
-                .Tools
-                .Include("Shank")
-                .Where(x => x.FamilyId == familyId && x.ShankId != null)
-                .Select(x => x.Shank)
-                .ToList();
-        }
-
-        public DbNcShankModel FindShankByToolId(int toolId)
-        {
-            return dbCtx
-                .Tools
-                .Include("Shank")
-                .Where(x => x.ToolId == toolId && x.ShankId != null)
-                .Select(x => x.Shank)
-                .FirstOrDefault();
-        }
-
-        public List<DTONcShankModel> GetShanks()
-        {
-            // Get shank from database
-            List<DbNcShankModel> dbShanks = dbCtx
-                .Shanks
-                .Include("Tools")
-                .ToList();
-            
-            // Populate dto shanks
-            List<DTONcShankModel> dtoShanks = dbShanks
-                .Select(x => (DTONcShankModel)x)
-                .ToList();
-
-            return dtoShanks;
-        }
-
-        public List<DTONcShankModel> GetShanksWithSpace()
-        {
-            // Populate nks
-            List<DTONcShankModel> dtoShanks = GetShanks();
-
-            List<DTONcFamilyModel> dtoFamilies = GetFamilies();
-
-            // Calculate & set space occupied for each shank
-            foreach(var shank in dtoShanks)
-            {
-                // Get only families id
-                short[] ids = shank.ChildsTools.Select(x => x.FamilyId).ToArray();
-
-                // Get Families data
-                List<DTONcFamilyModel> families = dtoFamilies
-                    .Where(x => ids.Contains(x.Id))
-                    .ToList();
-
-                if (families.Count() > 0)
-                {
-                    // Find max between families
-                    shank.MaxRight = families.Max(x => x.RightSize);
-                    shank.MaxLeft = families.Max(x => x.LeftSize);
-                }
-            }
-
-            return dtoShanks;
-        }
-
-        public DTONcShankModel GetShank(int shankId)
-        {
-            // Get shank from database
-            DTONcShankModel dtoShanks = GetShanksWithSpace()
-                .Where(x => x.Id == shankId)
-                .FirstOrDefault();
-
-            return dtoShanks;
-        }
-
-        public List<DbNcMagazinePositionModel> FindMagazinesPositions()
-        {
-            List<DbNcMagazinePositionModel> positions = dbCtx
-                .MagazinePositions
-                .ToList();
-
-            return positions;
-        }
-
-        public List<DbNcMagazinePositionModel> FindMagazinePositions(byte magId)
-        {
-            return dbCtx
-                .MagazinePositions
-                .Where(x => x.MagazineId == magId)
-                .ToList();
-        }
-        
-        public void GetShankMaxSpaceOccupied(int shankId, out int maxRight, out int maxLeft)
-        {
-            // Get families
-            List<DbNcFamilyModel> families = FindFamiliesByShankId(shankId);
-            // Find max
-            maxRight = families.Max(x => x.RightSize);
-            maxLeft = families.Max(x => x.LeftSize);
-        }
-
-        public List<DTONcMagazinePositionModel> GetMagazinePositions(byte magId)
-        {
-            // Get only magazine positions that match with magazineId
-            List<DTONcMagazinePositionModel> magPos = FindMagazinePositions(magId).Select(x => (DTONcMagazinePositionModel)x).ToList();
-            // Get&filter shanks by magazineId in order to get only mounted shanks in the current magazineId
-            List<DbNcShankModel> shanks = dbCtx.Shanks.Where(x => x.MagazineId == magId).ToList();
-            
-            foreach(DbNcShankModel shank in shanks)
-            {
-                // Populate magazinePosition shank Id
-               var pos = magPos
-                    .FirstOrDefault(x => x.PositionId == shank.PositionId);
-
-               if(pos != null)
-                    pos.ShankId = shank.ShankId;
-            }
-            // Convert in DTOModel and return
-            return magPos;
-        }
-
-        public DbNcMagazinePositionModel FindMagazinePosition(byte magId, byte posId)
-        {
-            DbNcMagazinePositionModel positions = dbCtx
-                .MagazinePositions
-                .FirstOrDefault(x => x.MagazineId == magId && x.PositionId == posId);
-
-            return positions;
-        }
-
-        public List<DTONcShankModel> GetMountedShanks(int magazineId)
-        {
-            List<DTONcShankModel> dtoShanks = GetShanksWithSpace()
-                 .Where(x => x.MagazineId != null && x.MagazineId == magazineId)
-                 .ToList();
-
-            return dtoShanks;
-        }
-
-        public List<DbNcToolModel> GetMountedTools() 
-        {
-            List<DbNcToolModel> tools = FindToolsWithDependencies()
-                .Where(x => x.Shank != null && x.Shank.MagazineId != null)
-                .ToList();
-
-            return tools;
-        }
-        
-        public List<DTONcShankModel> GetAvailableShanksWithChilds()
-        {
-            List<DTONcShankModel> dtoShanks = GetShanksWithSpace()
-                .Where(x => x.MagazineId == null && x.ChildsTools.Count > 0)
-                .ToList();
-
-            return dtoShanks;
-        }
-
-        public List<DTONcToolModel> GetAvailableTools()
-        {
-            List<DTONcToolModel> dtoTools = GetTools()
-                .Where(x => x.ShankId == null || x.ShankId == 0)
-                .ToList();
-
-            return dtoTools; 
-        } 
-
-        public DbNcToolModel AddTool(DTONewNcToolModel dtoTool, short toolId)
-        {
-            // Copy data
-            DbNcToolModel dbTool = (DbNcToolModel)dtoTool;
-
-            if (toolId == 0)
-                // Get next id
-                dbTool.ToolId = GetFirstFreeId(dbCtx.Tools.Select(x => x.ToolId).ToList());
-            else
-                dbTool.ToolId = toolId;
-
-            dbCtx.Tools.Add(dbTool);
-             
-            dbCtx.SaveChanges();
-            // Get foreign key data
-            dbCtx.Entry(dbTool).Reference(x => x.Family).Load();
-            dbCtx.Entry(dbTool).Reference(x => x.Shank).Load();
-            
-            return dbTool;
-        }
-
-        public DbNcToolModel UpdateTool(int toolId, DTONewNcToolModel dtoTool)
-        {
-            DbNcToolModel tool = FindTool(toolId);
-
-            tool.Status = ((DbNcToolModel)dtoTool).Status;
-            var shankId = tool.ShankId;
-
-            // Update db model
-            SupportFunctions.CopyProperties(dtoTool, tool);
-            tool.ShankId = shankId;
-
-            // Save
-            dbCtx.SaveChanges();
-
-            return tool;
-        }
-
-        public DbNcToolModel UpdateToolOffset(int toolId, int position, short offsetId)
-        {
-            DbNcToolModel tool = FindTool(toolId);
-
-            switch (position)
-            {
-                case 1:
-                        tool.OffsetId1 = offsetId;
-                    break;
-                case 2:
-                        tool.OffsetId2 = offsetId;
-                    break;
-                case 3:
-                        tool.OffsetId3 = offsetId;
-                    break;
-            }
-
-            // Save
-            dbCtx.SaveChanges();
-
-            return tool;
-        }
-
-        public void DeleteTool(int toolId)
-        {
-            DbNcToolModel tool = FindTool(toolId);
-            if(tool != null)
-                DeleteTool(tool);
-        }
-
-        public void DeleteTool(DbNcToolModel tool)
-        {
-            dbCtx.Tools.Remove(tool);
-
-            dbCtx.SaveChanges();
-        }
-
-        public DbNcFamilyModel AddFamily(DTONcFamilyModel family)
-        {
-            DbNcFamilyModel dbFamily = (DbNcFamilyModel)family;
-
-            // Get next free id if id is 0
-            if (dbFamily.FamilyId == 0)
-                dbFamily.FamilyId = GetFirstFreeId(dbCtx.Families.Select(x => x.FamilyId).ToList());
-
-            dbFamily.Name = DEFAULT_FAM_NAME + dbFamily.FamilyId;
-            dbCtx.Families.Add(dbFamily);
-
-            dbCtx.SaveChanges();
-            
-            return dbFamily;
-        }
-
-        public DbNcFamilyModel UpdateFamily(int familyId, DTONewNcFamilyModel family)
-        {
-            DbNcFamilyModel dbFamily = FindFamily(familyId);
-            // Copy data from NewModel to DbModel
-            SupportFunctions.CopyProperties(family, dbFamily);
-            // Set cooling byte
-            dbFamily.CoolingByte = ((DbNcFamilyModel)family).CoolingByte;
-
-            dbCtx.SaveChanges();
-            // Connect tools data
-            dbCtx.Entry(dbFamily).Collection(x => x.Tools).Load();
-
-            return dbFamily;
-        }
-        
-        public void DeleteFamily(int famId)
-        {
-            var family = FindFamily(famId);
-
-            dbCtx.Families.Remove(family);
-
-            dbCtx.SaveChanges();
-        }
-        
-        public DbNcShankModel AddShank(DTONewNcShankModel shank, short shankId = 0)
-        {
-            DbNcShankModel dbShank = (DbNcShankModel)shank;
-
-            if (shankId == 0)
-                // Get next id
-                dbShank.ShankId = GetFirstFreeId(dbCtx.Shanks.Select(x => x.ShankId).ToList());
-            else
-                dbShank.ShankId = shankId;
-
-            dbCtx.Shanks.Add(dbShank);
-
-            dbCtx.SaveChanges();
-           
-
-            return dbShank;
-        }
-
-        public DbNcShankModel UpdateShank(int shankId, DTONewNcShankModel dtoShank)
-        {
-            DbNcShankModel ncShank = FindShankWithTools(shankId);
-
-            return UpdateShank(ncShank, dtoShank);
-        }
-
-        public DbNcShankModel UpdateShank(DbNcShankModel dbShank, DTONewNcShankModel dtoShank)
-        {
-            dbShank.Balluf = dtoShank.Balluf;
-            dbShank.MagazinePositionType = dtoShank.MagazinePositionType;
-
-            dbCtx.SaveChanges();
-
-            dbCtx.Entry(dbShank).Collection(x => x.Tools).Load();
-
-            return dbShank;
-        }
-        
-        public DbNcShankModel DeleteNcShank(int shankId)
-        {
-            DbNcShankModel shank = FindShankWithTools(shankId);
-            DeleteNcShank(shank);
-
-            return shank;
-        }
-        
-        public void DeleteNcShank(DbNcShankModel shank)
-        {
-            dbCtx.Shanks.Remove(shank);
-
-            dbCtx.SaveChanges();
-        }
-
-        public DbNcMagazinePositionModel UpdatePosition(DbNcMagazinePositionModel dbPos, DTONcMagazinePositionModel dtoPos)
-        {
-            dbCtx.MagazinePositions.Attach(dbPos);
-            dbPos.Type = dtoPos.Type;
-            dbPos.Disabled = dtoPos.Disabled;
-
-            dbCtx.SaveChanges();
-
-            return dbPos;
-        }
-
-        public DbNcMagazinePositionModel LoadShankInMagazine(byte magazineId, byte positionId, DbNcShankModel shank)
-        {
-            dbCtx.Shanks.Attach(shank);
-            // Set ids with new positions
-            shank.MagazineId = magazineId;
-            shank.PositionId = positionId;
-            
-            // Set original Ids
-            shank.OriginMagazineId = magazineId;
-            shank.OriginPositionId = positionId;
-            
-            dbCtx.SaveChanges();
-
-            return FindMagazinePosition(magazineId, positionId);
-        }
-
-        public DbNcMagazinePositionModel UnloadShankInMagazine(byte magazineId, byte positionId, DbNcShankModel shank)
-        {
-            dbCtx.Shanks.Attach(shank);
-            // set id to null
-            shank.MagazineId = null;
-            shank.PositionId = null;
-            
-            shank.OriginMagazineId = null;
-            shank.OriginPositionId = null;
-
-            dbCtx.SaveChanges();
-
-            return FindMagazinePosition(magazineId, positionId);
-        }
-
-        public DTONcShankModel LoadToolIntoShank(DbNcToolModel tool, short shankId)
-        {
-            dbCtx.Tools.Attach(tool);
-            // Set tool shankId
-            tool.ShankId = shankId;
-
-            dbCtx.SaveChanges();
-
-            return GetShank(shankId);
-        }
-
-        public DTONcShankModel UnloadToolFromShank(DbNcToolModel tool) 
-        {
-            dbCtx.Tools.Attach(tool);
-            int? shankId = tool.ShankId;
-            // Set to null shankId
-            tool.ShankId = null;
-
-            dbCtx.SaveChanges();
-
-            return GetShank(shankId.Value);
-        }
-
-        public void SetupMagazinePositions(List<DbNcMagazinePositionModel> config)
-        {
-            dbCtx.MagazinePositions.AddRange(config);
-            dbCtx.SaveChanges();
-        }
-
-        public void UpdateToolsData(List<DbNcToolModel> tools)
-        {
-            foreach (var tool in tools)
-            {
-                DbNcToolModel tmpTool = dbCtx.Tools.Where(x => x.ToolId == tool.ToolId).FirstOrDefault();
-                tmpTool = tool;
-            }
-
-            dbCtx.SaveChanges();
-        }
-
-        public DTOExportToolTableModel GetExportData()
-        {
-            return new DTOExportToolTableModel
-            {
-                Tools = FindTools(),
-                Families = FindFamilies(),
-                Shanks = FindShanks()
-                .Select(x => {
-                    // Reset positional Data
-                    x.MagazineId = null;
-                    x.PositionId = null;
-                    x.OriginMagazineId = null;
-                    x.OriginPositionId = null;
-
-                    return x; })
-                .ToList()
-            };
-        }
-
-        public List<DTOImportStatusModel> ImportData(DTOExportToolTableModel data)
-        {
-            List<DTOImportStatusModel> importStatus = new List<DTOImportStatusModel>();
-
-            List<DbNcToolModel> tools = FindTools();
-            List<DbNcFamilyModel> families = FindFamilies();
-            List<DbNcShankModel> shanks = FindShanks();
-
-            if(data.Families != null)
-                // loop thought new families
-                foreach (var family in data.Families)
-                {
-                    // Check if not exist
-                    if (families.FirstOrDefault(x => x.FamilyId == family.FamilyId) == null)
-                    {
-                        dbCtx.Families.Add(family);
-                        // Set status
-                        importStatus.Add(new DTOImportStatusModel()
-                        {
-                            Id = family.FamilyId,
-                            Status = IMPORT_STATUS.OK.ToString(),
-                            Type = "FAMILY"
-                        });
-                    }
-                    else
-                    {
-                        // Set duplicated status
-                        importStatus.Add(new DTOImportStatusModel()
-                        {
-                            Id = family.FamilyId,
-                            Status = IMPORT_STATUS.EXIST.ToString(),
-                            Type = "FAMILY"
-                        });
-                    }
-                }
-
-            if(data.Shanks != null)
-                // loop thought new shanks
-                foreach (var shank in data.Shanks)
-                {
-                    // Check if not exist
-                    if (shanks.FirstOrDefault(x => x.ShankId == shank.ShankId) == null)
-                    {
-                        dbCtx.Shanks.Add(shank);
-                        importStatus.Add(new DTOImportStatusModel()
-                        {
-                            Id = shank.ShankId,
-                            Status = IMPORT_STATUS.OK.ToString(),
-                            Type = "SHANK"
-                        });
-                    }
-                    else
-                    {
-                        importStatus.Add(new DTOImportStatusModel()
-                        {
-                            Id = shank.ShankId,
-                            Status = IMPORT_STATUS.EXIST.ToString(),
-                            Type = "SHANK"
-                        });
-                    }
-                }
-
-            if(data.Tools != null)
-                // loop thought new tools
-                foreach (var tool in data.Tools)
-                {
-                    // Check if not exist
-                    if (tools.FirstOrDefault(x => x.ToolId == tool.ToolId) == null)
-                    {
-                        dbCtx.Tools.Add(tool);
-                        importStatus.Add(new DTOImportStatusModel()
-                        {
-                            Id = tool.ToolId,
-                            Status = IMPORT_STATUS.EXIST.ToString(),
-                            Type = "TOOL"
-                        });
-                    }
-                    else
-                    {
-                        importStatus.Add(new DTOImportStatusModel()
-                        {
-                            Id = tool.ToolId,
-                            Status = IMPORT_STATUS.EXIST.ToString(),
-                            Type = "TOOL"
-                        });
-                    }
-                }
-            
-            // Save 
-            dbCtx.SaveChanges();
-
-            return importStatus;
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active.Database/DatabaseContext.cs b/Thermo.Active.Database/DatabaseContext.cs
index ca40fcc0..f2ca59d6 100644
--- a/Thermo.Active.Database/DatabaseContext.cs
+++ b/Thermo.Active.Database/DatabaseContext.cs
@@ -35,7 +35,6 @@ namespace Thermo.Active.Database
 		// Tool tables
 		public DbSet<DbNcFamilyModel> Families { get; set; }
 		public DbSet<DbNcShankModel> Shanks { get; set; }
-		public DbSet<DbNcToolModel> Tools { get; set; }
 		public DbSet<DbNcMagazinePositionModel> MagazinePositions { get; set; }
 		public DbSet<QueueItemsModel> Queue { get; set; }
 		// Alarms
diff --git a/Thermo.Active.Database/Migrations/Configuration.cs b/Thermo.Active.Database/Migrations/Configuration.cs
index a001cdc6..442b8348 100644
--- a/Thermo.Active.Database/Migrations/Configuration.cs
+++ b/Thermo.Active.Database/Migrations/Configuration.cs
@@ -42,7 +42,9 @@ namespace Thermo.Active.Database.Migrations
                new FunctionAccessModel() { Name = HEADS_CMD, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 6},
                new FunctionAccessModel() { Name = AXES_SELECTION, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 7},
 
-               new FunctionAccessModel() { Name = TOOL_MANAGER, Area = TOOLING_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 8},
+#if false
+        new FunctionAccessModel() { Name = TOOL_MANAGER, Area = TOOLING_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 8 }, 
+#endif
                new FunctionAccessModel() { Name = MAINTENANCE, Area = MAINTENANCE_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 9},
 
 
diff --git a/Thermo.Active.Database/Thermo.Active.Database.csproj b/Thermo.Active.Database/Thermo.Active.Database.csproj
index 8bb4ffd8..5b8a67ae 100644
--- a/Thermo.Active.Database/Thermo.Active.Database.csproj
+++ b/Thermo.Active.Database/Thermo.Active.Database.csproj
@@ -115,7 +115,6 @@
     <Compile Include="Controllers\MachinesController.cs" />
     <Compile Include="Controllers\MaintenancesController.cs" />
     <Compile Include="Controllers\QueueController.cs" />
-    <Compile Include="Controllers\NcToolManagerController.cs" />
     <Compile Include="Controllers\RedisController.cs" />
     <Compile Include="Controllers\SessionsController.cs" />
     <Compile Include="Controllers\UsersController.cs" />
diff --git a/Thermo.Active.Model/ConfigModels/MagazineNamesModel.cs b/Thermo.Active.Model/ConfigModels/MagazineNamesModel.cs
deleted file mode 100644
index 2d6e6e03..00000000
--- a/Thermo.Active.Model/ConfigModels/MagazineNamesModel.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Thermo.Active.Model.ConfigModels
-{
-   public class MagazineNamesModel
-    {
-        public int MagazineId { get; set; }
-
-        public bool AssistedTooling { get; set; } 
-
-        public Dictionary<string, string> LocalizedNames { get; set; }
-    }
-}
diff --git a/Thermo.Active.Model/ConfigModels/ToolManagerConfigModel.cs b/Thermo.Active.Model/ConfigModels/ToolManagerConfigModel.cs
deleted file mode 100644
index 61f5e328..00000000
--- a/Thermo.Active.Model/ConfigModels/ToolManagerConfigModel.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Thermo.Active.Model.ConfigModels
-{
-    public class ToolManagerConfigModel
-    {
-        
-        public string ToolMetricType { get; set; }
-        public bool FamilyOpt { get; set; }
-        public bool ShankOpt { get; set; }
-        public bool MagPosTypeOpt { get; set; }
-        public bool OffsetOpt { get; set; }
-        public bool ReviveOpt { get; set; }
-        public bool GammaOpt { get; set; }
-        public bool LifeOpt { get; set; }
-        public bool TcpOpt { get; set; }
-        public bool CoolingOpt { get; set; }
-        public bool MultidimensionalShankOpt { get; set; }
-        public bool SelfAdaptivePathOpt { get; set; }
-        public bool DynamicCompensationOpt { get; set; }
-        public bool BallufOpt { get; set; }
-        public bool IntegrityCheckOpt { get; set; }
-
-        public CooligTranslations CooligsTranslations { get; set; }
-
-        public List<MagazineNamesModel> MagazineNames { get; set; }
-
-        public List<ToolTypeConfigModel> ToolTypes { get; set; }
-    } 
-
-    public class CooligTranslations
-    {
-        public Dictionary<string, string> Cooling { get; set; }
-        public Dictionary<string, string> Cooling1 { get; set; }
-        public Dictionary<string, string> Cooling2 { get; set; }
-        public Dictionary<string, string> Cooling3 { get; set; }
-        public Dictionary<string, string> Cooling4 { get; set; }
-        public Dictionary<string, string> Cooling5 { get; set; }
-        public Dictionary<string, string> Cooling6 { get; set; }
-        public Dictionary<string, string> Cooling7 { get; set; }
-    }
-}
diff --git a/Thermo.Active.Model/ConfigModels/ToolTypeConfigModel.cs b/Thermo.Active.Model/ConfigModels/ToolTypeConfigModel.cs
deleted file mode 100644
index 7e4d8976..00000000
--- a/Thermo.Active.Model/ConfigModels/ToolTypeConfigModel.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Thermo.Active.Model.ConfigModels
-{
-    public class ToolTypeConfigModel
-    {
-        public int Id { get; set; }
-
-        public bool Disabled { get; set; }
-
-        public Dictionary<string, string> LocalizedNames { get; set; }        
-    }
-}
diff --git a/Thermo.Active.Model/Constants.cs b/Thermo.Active.Model/Constants.cs
index c1dc190f..24cde93b 100644
--- a/Thermo.Active.Model/Constants.cs
+++ b/Thermo.Active.Model/Constants.cs
@@ -148,7 +148,6 @@ namespace Thermo.Active.Model
         public class AREAS
         {
             public const string PRODUCTION_KEY = "production";
-            public const string TOOLING_KEY = "tooling";
             public const string REPORT_KEY = "report";
             public const string ALARMS_KEY = "alarms";
             public const string MAINTENANCE_KEY = "maintenance";
@@ -158,6 +157,8 @@ namespace Thermo.Active.Model
             public const string UNDER_HOOD = "underHood";
             public const string JOBEDITOR_KEY = "jobeditor";
             public const string USERS_KEY = "users";
+            public const string THERMO_KEY = "tooling";
+            public const string RISC_KEY = "risc";
         }
 
         // Config File Names
@@ -198,9 +199,6 @@ namespace Thermo.Active.Model
         public const string NC_SOFTKEYS_CONFIG_SCHEMA_PATH = RESOURCE_DIRECTORY + "ncSoftKeyConfigValidator.xsd";
         public const string NC_SOFTKEYS_CONFIG_PATH = CONFIG_DIRECTORY + "ncSoftKeyConfig.xml";
 
-        public const string TOOL_MANAGER_CONFIG_SCHEMA_PATH = RESOURCE_DIRECTORY + "toolManagerConfigValidator.xsd";
-        public const string TOOL_MANAGER_CONFIG_PATH = CONFIG_DIRECTORY + "toolManagerConfig.xml";
-
         public const string CMS_CONNECT_CONFIG_SCHEMA_PATH = RESOURCE_DIRECTORY + "cmsConnectConfigValidator.xsd";
         public const string CMS_CONNECT_CONFIG_PATH = CONFIG_DIRECTORY + "cmsConnectConfig.xml";
 
@@ -241,14 +239,11 @@ namespace Thermo.Active.Model
         public const string SEND_NC_SOFTKEYS_DATA = "SEND_NC_SOFTKEYS_DATA";
         public const string SEND_HEADS_DATA = "SEND_HEADS_DATA";
         public const string SEND_AXIS_NAMES_DATA = "SEND_AXIS_NAMES_DATA";
-        public const string SEND_MAGAZINES_STATUS = "SEND_MAGAZINES_STATUS";
         public const string SEND_ACTIVE_PROGRAM_DATA = "SEND_ACTIVE_PROGRAM_DATA";
-        public const string UPDATE_TOOLS_DATA = "UPDATE_TOOLS_DATA";
-        public const string NC_MAGAZINE_IS_ACTIVE = "UPDATE_NC_MAGAZINE_STATUS";
         public const string SEND_QUEUE_DATA = "SEND_QUEUE_DATA";
         public const string SEND_M155_DATA = "SEND_M155_DATA";
         public const string SEND_SCADA_DATA = "SEND_SCADA_DATA";
-        public const string ASSISTED_TOOLING_DATA = "ASSISTED_TOOLING_DATA";
+        public const string SEND_RECIPE_STATUS = "SEND_RECIPE_STATUS";
 
         public const string BROADCAST_DATA = "BROADCAST_DATA";
 
@@ -271,18 +266,16 @@ namespace Thermo.Active.Model
             public const string NC_SOFTKEY = "ncSoftkeys";
             public const string USER_SOFTKEY = "userSoftkeys";
             public const string HEADS_CMD = "headsCmd";
-            public const string TOOL_MANAGER = "toolManager";
             public const string MAINTENANCE = "maintenance";
             public const string AXES_SELECTION = "axesSoftkeys";
+            public const string THERMO_MANAGER = "thermoManager";
+            public const string RISC_MANAGER = "riscManager";
         }
 
         public static class API_ERROR_KEYS
         {
             public const string INCORRECT_PARAMETERS = "error_incorrect_parameters";
-            public const string MAGAZINE_POSITION_OCCUPIED = "error_magazine_position_occupied";
-            public const string TOOL_IS_MOUNTED = "error_tool_mounted";
             public const string OPTION_NOT_ACTIVE = "error_option_not_active";
-            public const string MAG_POS_DISABLED = "error_mag_pos_disabled";
             public const string ID_ALREADY_EXIST = "error_id_already_exist";
             public const string PASSWORD_IS_INVALID = "error_password_is_invalid";
             public const string IMPORT_FILE_NOT_VALID = "error_import_file_not_valid";
diff --git a/Thermo.Active.Model/DTOModels/DTOHeadModel.cs b/Thermo.Active.Model/DTOModels/DTOHeadModel.cs
index 44591fc0..8ac417f3 100644
--- a/Thermo.Active.Model/DTOModels/DTOHeadModel.cs
+++ b/Thermo.Active.Model/DTOModels/DTOHeadModel.cs
@@ -57,67 +57,13 @@ namespace Thermo.Active.Model.DTOModels
         }
     }
 
-    public class DTOToolInSpindleModel
-    {
-        // Siemens data
-        public string ToolName;
-        public int ChildId;
-        // Fanuc-Osai
-        public int FamilyId;
-        public int ShankId;
-
-        public bool Disabled { get; set; }
-        public bool Broken { get; set; }
-        public bool Measured { get; set; }
-        public int ResidualLife { get; set; }
-
-        public int MaxSpeed { get; set; }
-        public byte MaxLoad { get; set; }
-
-        public override bool Equals(object obj)
-        {
-            // Object is not a DTOSpindleModel
-            if (!(obj is DTOToolInSpindleModel item))
-                return false;
-
-            // Compare the fields
-            if (ToolName != item.ToolName)
-                return false;
-
-            if (ChildId != item.ChildId)
-                return false;
-
-            if (Disabled != item.Disabled)
-                return false;
-
-            if (Broken != item.Broken)
-                return false;
-
-            if (Measured != item.Measured)
-                return false;
-
-            if (ResidualLife != item.ResidualLife)
-                return false;
-
-            if (MaxSpeed != item.MaxSpeed)
-                return false;
-
-            if (MaxLoad != item.MaxLoad)
-                return false;
-
-            return true;
-        }
-    }
-
     public class DTOSpindleModel : DTOHeadModel
     {
         public int ActualSpeed;
         public short Load;
-        public ushort MountedTool;
         public bool Configured;
         public ROTATION Rotation;
         public bool FixedHead;
-        public DTOToolInSpindleModel ToolData;
 
         public override bool Equals(object obj)
         {
@@ -132,18 +78,12 @@ namespace Thermo.Active.Model.DTOModels
             if (Load != item.Load)
                 return false;
 
-            if (MountedTool != item.MountedTool)
-                return false;
-
             if (Configured != item.Configured)
                 return false;
 
             if (Rotation != item.Rotation)
                 return false;
 
-            if (ToolData != null && !ToolData.Equals(item.ToolData))
-                return false;
-
             // Call Parent equals
             return base.Equals(item);
         }
diff --git a/Thermo.Active.Model/DTOModels/DTOStartupConfigurationModel.cs b/Thermo.Active.Model/DTOModels/DTOStartupConfigurationModel.cs
index e325d831..d7a2dc51 100644
--- a/Thermo.Active.Model/DTOModels/DTOStartupConfigurationModel.cs
+++ b/Thermo.Active.Model/DTOModels/DTOStartupConfigurationModel.cs
@@ -10,7 +10,6 @@ namespace Thermo.Active.Model.DTOModels
     public class DTOStartupConfigurationModel
     {
         public AreasConfigModel ProductionConfig;
-        public AreasConfigModel ToolingConfig;
         public AreasConfigModel ReportConfig;
         public AreasConfigModel AlarmsConfig;
         public AreasConfigModel MaintenanceConfig;
diff --git a/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataFieldsModel.cs b/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataFieldsModel.cs
index add26fd4..d185ff58 100644
--- a/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataFieldsModel.cs
+++ b/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataFieldsModel.cs
@@ -7,12 +7,10 @@ namespace Thermo.Active.Model.DTOModels.JobModels
     {
         public string Description;
         public TimeSpan ExecutionTime;
-        public List<int> Tools;
         public List<DTOJobCustomParamModel> Customs;
 
         public DTOMetadataFieldsModel()
         {
-            Tools = new List<int>();
             Customs = new List<DTOJobCustomParamModel>();
         }
     }
diff --git a/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataModel.cs b/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataModel.cs
index d4bcda06..37edce0e 100644
--- a/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataModel.cs
+++ b/Thermo.Active.Model/DTOModels/JobModels/DTOMetadataModel.cs
@@ -5,13 +5,11 @@ namespace Thermo.Active.Model.DTOModels.JobModels
     public class DTOMetadataModel
     {
         public DTOGenericParamModel Generics;
-        public List<int> Tools;
         public List<DTOJobCustomParamModel> Customs;
 
         public DTOMetadataModel()
         {
             Generics = new DTOGenericParamModel();
-            Tools = new List<int>();
             Customs = new List<DTOJobCustomParamModel>();
         }
     }
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTOAssistedToolingModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTOAssistedToolingModel.cs
deleted file mode 100644
index 60fdbeac..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTOAssistedToolingModel.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using static CMS_CORE_Library.Models.DataStructures;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTOAssistedToolingModel
-    {
-        public ushort ToolId { get; set; }
-        public ushort MagazineId { get; set; }
-        public ushort PositionId { get; set; }
-        public ASSISTED_TOOLING_ACTION Action { get; set; }
-    }
-
-    public class DTOAssistedToolingEndValueModel : AssistedToolingModel
-    {
-        public DTOAssistedToolingEndValueModel()
-        {
-
-        }
-
-        public DTOAssistedToolingEndValueModel(AssistedToolingModel data)
-        {
-            Action = data.Action;
-            IsActive = data.IsActive;
-            MagazineId = data.MagazineId;
-            PositionId = data.PositionId;
-            ToolId = data.ToolId;
-        }
-
-        public override bool Equals(object obj)
-        {
-
-            if (!(obj is DTOAssistedToolingEndValueModel item))
-                return false;
-
-            if (IsActive != item.IsActive)
-                return false;
-
-            if (ToolId != item.ToolId)
-                return false;
-
-            if (MagazineId != item.MagazineId)
-                return false;
-
-            if (PositionId != item.PositionId)
-                return false;
-
-            if (Action != item.Action)
-                return false;
-
-            return true;
-        }
-
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTOEdgeModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTOEdgeModel.cs
deleted file mode 100644
index 8c3c3e7c..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTOEdgeModel.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using CMS_CORE_Library.Models;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTOEdgeModel
-    {
-        public double ResidualLife { get; set; }
-
-        public double NominalLife { get; set; }
-
-        public double PreAlmLife { get; set; }
-
-        [Required]
-        public Dictionary<string, double> EdgeAdditionalParams { get; set; }
-
-        public static explicit operator EdgeModel(DTOEdgeModel obj)
-        {
-            return new EdgeModel()
-            {
-                Id = 0,
-                NominalLife = obj.NominalLife,
-                ResidualLife = obj.ResidualLife,
-                PreAlmLife = obj.PreAlmLife,
-                EdgeAdditionalParams = obj.EdgeAdditionalParams
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTOExportToolTableModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTOExportToolTableModel.cs
deleted file mode 100644
index ac88d8a9..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTOExportToolTableModel.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Thermo.Active.Model.DatabaseModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTOExportToolTableModel
-    {
-        public List<DbNcToolModel> Tools { get; set; } 
-        public List<DbNcFamilyModel> Families { get; set; } 
-        public List<DbNcShankModel> Shanks { get; set; }
-    }
-
-    public class DTOImportStatusModel
-    {
-        public int Id { get; set; }
-
-        public string Status { get; set; }
-
-        public string Type { get; set; }
-    }
-
-    public enum IMPORT_STATUS
-    {
-        OK = 0,
-        EXIST = 1
-    }
-}
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs
deleted file mode 100644
index 7aebcdc9..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using CMS_CORE_Library.Models;
-using static CMS_CORE_Library.Models.DataStructures;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTOMagazineActionModel
-    {
-        public MAGAZINE_ACTIONS action;
-        public int OriginMagazine;
-        public int OriginPosition;
-        public int DestinationMagazine;
-        public int DestinationPosition;
-        public MagazineActionToolModel Tool;
-        
-        public static explicit operator DTOMagazineActionModel(MagazineActionModel magazineStatus)
-        {
-            return new DTOMagazineActionModel()
-            {
-                action = magazineStatus.Action,
-                OriginMagazine = magazineStatus.OriginMagazine,
-                OriginPosition = magazineStatus.OriginPosition,
-                DestinationMagazine = magazineStatus.DestinationMagazine,
-                DestinationPosition = magazineStatus.DestinationPosition,
-                Tool = magazineStatus.Tool
-            };
-        }
-
-        public override bool Equals(object obj)
-        {
-
-            // Object is not a DTOMagazineStatusModel instance
-            if (!(obj is DTOMagazineActionModel item))
-                return false;
-
-            if (item.action != action)
-                return false;
-
-            return true;
-        }
-
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
-    }
-}
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTONcFamilyModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTONcFamilyModel.cs
deleted file mode 100644
index 018f138f..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTONcFamilyModel.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-using Thermo.Active.Model.DatabaseModels;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTONewNcFamilyModel
-    {
-        [Required]
-        public string Name { get; set; }
-
-        [Required]
-        public byte ToolType { get; set; }
-
-        [Required]
-        public byte RightSize { get; set; }
-
-        [Required]
-        public byte LeftSize { get; set; }
-
-        [Required]
-        public byte TcpTable { get; set; }
-
-        [Required]
-        public byte Gamma { get; set; }
-
-        [Required]
-        public byte RotationType { get; set; }
-
-        [Required]
-        public bool Cooling { get; set; }
-        [Required]
-        public bool Cooling1 { get; set; }
-        [Required]
-        public bool Cooling2 { get; set; }
-        [Required]
-        public bool Cooling3 { get; set; }
-        [Required]
-        public bool Cooling4 { get; set; }
-        [Required]
-        public bool Cooling5 { get; set; }
-        [Required]
-        public bool Cooling6 { get; set; }
-        [Required]
-        public bool Cooling7 { get; set; }
-
-        [Required]
-        public int MaxSpeed { get; set; }
-
-        [Required]
-        public byte MaxLoad { get; set; }
-
-        [Required]
-        public byte MinLoadPctAutoload { get; set; }
-
-        [Required]
-        public byte MaxLoadPctAutoload { get; set; }
-
-        [Required]
-        public byte DynamicCompensation { get; set; }
-
-        [Required]
-        public byte MinLoadDynamicCompensation { get; set; }
-
-        [Required]
-        public byte MaxLoadDynamicCompensation { get; set; }
-
-        [Required]
-        public byte LifeType { get; set; }
-
-        [Required]
-        public int NominalLife { get; set; }
-
-        [Required]
-        public int ReviveDelta { get; set; }
-        
-        public static explicit operator DTONewNcFamilyModel(DbNcFamilyModel obj)
-        {
-            // Get bit values
-            BitArray coolingByte = new BitArray(new byte[] { obj.CoolingByte });
-            bool[] bits = new bool[8];
-            coolingByte.CopyTo(bits, 0);
-
-            return new DTONcFamilyModel()
-            {
-                Id = obj.FamilyId,
-                Name = obj.Name,
-                ToolType = obj.ToolType,
-                RightSize = obj.RightSize,
-                LeftSize = obj.LeftSize,
-                TcpTable = obj.TcpTable,
-                Gamma = obj.Gamma,
-                RotationType = obj.RotationType,
-                Cooling = bits[0],
-                Cooling1 = bits[1],
-                Cooling2 = bits[2],
-                Cooling3 = bits[3],
-                Cooling4 = bits[4],
-                Cooling5 = bits[5],
-                Cooling6 = bits[6],
-                Cooling7 = bits[7],
-                MaxSpeed = obj.MaxSpeed,
-                MaxLoad = obj.MaxLoad,
-                MinLoadDynamicCompensation = obj.MinLoadDynamicCompensation,
-                MaxLoadDynamicCompensation = obj.MaxLoadDynamicCompensation,
-                MaxLoadPctAutoload = obj.MaxLoadPctAutoload,
-                MinLoadPctAutoload = obj.MinLoadPctAutoload,
-                DynamicCompensation = obj.DynamicCompensation,
-                LifeType = obj.LifeType,
-                NominalLife = obj.NominalLife,
-                ReviveDelta = obj.ReviveDelta
-            };
-        }
-
-        public static explicit operator DbNcFamilyModel(DTONewNcFamilyModel obj)
-        {            
-            // Prepare status byte
-            bool[] result = new bool[8] { obj.Cooling, obj.Cooling1, obj.Cooling2, obj.Cooling3, obj.Cooling4, obj.Cooling5, obj.Cooling6, obj.Cooling7 };
-            byte coolingByte = ConvertArrayToByte(result);
-
-            return new DbNcFamilyModel()
-            {
-                Name = obj.Name,
-                ToolType = obj.ToolType,
-                RightSize = obj.RightSize,
-                LeftSize = obj.LeftSize,
-                TcpTable = obj.TcpTable,
-                Gamma = obj.Gamma,
-                RotationType = obj.RotationType,
-                CoolingByte = coolingByte,
-                MaxSpeed = obj.MaxSpeed,
-                MaxLoad = obj.MaxLoad,
-                MinLoadDynamicCompensation = obj.MinLoadDynamicCompensation,
-                MaxLoadDynamicCompensation = obj.MaxLoadDynamicCompensation,
-                MaxLoadPctAutoload = obj.MaxLoadPctAutoload,
-                MinLoadPctAutoload = obj.MinLoadPctAutoload,
-                DynamicCompensation = obj.DynamicCompensation,
-                LifeType = obj.LifeType,
-                NominalLife = obj.NominalLife,
-                ReviveDelta = obj.ReviveDelta,
-            };
-        }
-
-        protected static byte ConvertArrayToByte(bool[] bits)
-        {
-            BitArray bitField = new BitArray(bits); //BitArray takes a bool[]
-            byte[] bytes = new byte[1];
-            bitField.CopyTo(bytes, 0);
-
-            return bytes[0];
-        }
-    }
-
-    public class DTONcFamilyModel : DTONewNcFamilyModel
-    {
-        public short Id { get; set; }
-
-        public List<DTONcToolModel> ChildTools { get; set; }
-
-        public static explicit operator DTONcFamilyModel(DbNcFamilyModel obj)
-        {
-            List<DTONcToolModel> tools = new List<DTONcToolModel>();
-
-            if (obj.Tools != null)
-                foreach (DbNcToolModel tool in obj.Tools)
-                {
-                    tools.Add((DTONcToolModel)tool);
-                }
-
-            // Get bit values
-            BitArray coolingByte = new BitArray(new byte[] { obj.CoolingByte });
-            bool[] bits = new bool[8];
-            coolingByte.CopyTo(bits, 0);
-
-            return new DTONcFamilyModel()
-            {
-                Id = obj.FamilyId,
-                Name = obj.Name,
-                ToolType = obj.ToolType,
-                RightSize = obj.RightSize,
-                LeftSize = obj.LeftSize,
-                TcpTable = obj.TcpTable,
-                Gamma = obj.Gamma,
-                RotationType = obj.RotationType,
-                Cooling = bits[0],
-                Cooling1 = bits[1],
-                Cooling2 = bits[2],
-                Cooling3 = bits[3],
-                Cooling4 = bits[4],
-                Cooling5 = bits[5],
-                Cooling6 = bits[6],
-                Cooling7 = bits[7],
-                MaxSpeed = obj.MaxSpeed,
-                MaxLoad = obj.MaxLoad,
-                MinLoadDynamicCompensation = obj.MinLoadDynamicCompensation,
-                MaxLoadDynamicCompensation = obj.MaxLoadDynamicCompensation,
-                MaxLoadPctAutoload = obj.MaxLoadPctAutoload,
-                MinLoadPctAutoload = obj.MinLoadPctAutoload,
-                DynamicCompensation = obj.DynamicCompensation,
-                LifeType = obj.LifeType,
-                NominalLife = obj.NominalLife,
-                ReviveDelta = obj.ReviveDelta,
-                ChildTools = tools
-            };
-        }
-
-        public static explicit operator DbNcFamilyModel(DTONcFamilyModel obj)
-        {            
-            // Prepare status byte
-            bool[] result = new bool[8] { obj.Cooling, obj.Cooling1, obj.Cooling2, obj.Cooling3, obj.Cooling4, obj.Cooling5, obj.Cooling6, obj.Cooling7 };
-            byte coolingByte = ConvertArrayToByte(result);
-
-            return new DbNcFamilyModel()
-            {
-                FamilyId = obj.Id,
-                Name = obj.Name,
-                ToolType = obj.ToolType,
-                RightSize = obj.RightSize,
-                LeftSize = obj.LeftSize,
-                TcpTable = obj.TcpTable,
-                Gamma = obj.Gamma,
-                RotationType = obj.RotationType,
-                CoolingByte = coolingByte,
-                MaxSpeed = obj.MaxSpeed,
-                MaxLoad = obj.MaxLoad,
-                MinLoadDynamicCompensation = obj.MinLoadDynamicCompensation,
-                MaxLoadDynamicCompensation = obj.MaxLoadDynamicCompensation,
-                MaxLoadPctAutoload = obj.MaxLoadPctAutoload,
-                MinLoadPctAutoload = obj.MinLoadPctAutoload,
-                DynamicCompensation = obj.DynamicCompensation,
-                LifeType = obj.LifeType,
-                NominalLife = obj.NominalLife,
-                ReviveDelta = obj.ReviveDelta,
-            };
-        }
-    }
-}
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs
deleted file mode 100644
index 50af1469..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Thermo.Active.Model.DatabaseModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTONcMagazinePositionModel
-    {
-        public byte MagazineId { get; set; }
-
-        public int PositionId { get; set; }
-
-        [Required]
-        public bool Disabled { get; set; }
-
-        [Required]
-        public byte Type { get; set; }
-
-        public int? ShankId { get; set; }
-
-        public static explicit operator DTONcMagazinePositionModel(DbNcMagazinePositionModel obj)
-        {
-            return new DTONcMagazinePositionModel()
-            {
-                MagazineId = obj.MagazineId,
-                PositionId = obj.PositionId,
-                Disabled = obj.Disabled,
-                Type = obj.Type
-            };
-        }
-
-        public static explicit operator DbNcMagazinePositionModel(DTONcMagazinePositionModel obj)
-        {
-            return new DbNcMagazinePositionModel()
-            {
-                MagazineId = obj.MagazineId,
-                PositionId = obj.PositionId,
-                Disabled = obj.Disabled,
-                Type = obj.Type
-            };
-        }
-    }
-}
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTONcMountedShankModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTONcMountedShankModel.cs
deleted file mode 100644
index 306401d2..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTONcMountedShankModel.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTONcMountedShankModel
-    {
-        public byte PositionId;
-        public byte MagazineId;
-        public int ShankId;
-    }
-}
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTONcShankModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTONcShankModel.cs
deleted file mode 100644
index 58696241..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTONcShankModel.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using Thermo.Active.Model.DatabaseModels;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTONewNcShankModel
-    {
-        [Required]
-        public ushort? Balluf { get; set; }
-
-        [Required]
-        public byte MagazinePositionType { get; set; }
-
-        public static explicit operator DTONewNcShankModel(DbNcShankModel obj)
-        {
-            return new DTONewNcShankModel()
-            {
-                Balluf = (ushort)obj.Balluf,
-                MagazinePositionType = obj.MagazinePositionType
-            };
-        }
-
-        public static explicit operator DbNcShankModel(DTONewNcShankModel obj)
-        {
-            return new DbNcShankModel()
-            {
-                Balluf = obj.Balluf,
-                MagazinePositionType = obj.MagazinePositionType
-            };
-        }
-    }
-
-    public class DTONcShankModel : DTONewNcShankModel
-    {
-        public short Id { get; set; }
-
-        [Range(1, byte.MaxValue)]
-        public byte? MagazineId { get; set; }
-
-        [Range(1, ushort.MaxValue)]
-        public int? PositionId { get; set; }
-        
-        [Range(1, byte.MaxValue)]
-        public byte? OriginMagazineId { get; set; }
-
-        [Range(1, ushort.MaxValue)]
-        public int? OriginPositionId { get; set; }
-
-        public int MaxLeft { get; set; }
-
-        public int MaxRight { get; set; }
-        
-        public List<DTONcToolModel> ChildsTools { get; set; }
-
-        public static explicit operator DTONcShankModel(DbNcShankModel obj)
-        {
-            List<DTONcToolModel> tools = new List<DTONcToolModel>();
-
-            if (obj.Tools != null)
-                foreach (DbNcToolModel tool in obj.Tools)
-                {
-                    tools.Add((DTONcToolModel)tool);
-                }
-
-            return new DTONcShankModel()
-            {
-                Id = obj.ShankId,
-                Balluf = (ushort?)obj.Balluf,
-                MagazinePositionType = obj.MagazinePositionType,
-                MagazineId = obj.MagazineId,
-                PositionId = obj.PositionId,
-                OriginMagazineId = obj.OriginMagazineId, 
-                OriginPositionId = obj.OriginPositionId,
-                ChildsTools = tools
-            };
-        }
-
-        public static explicit operator DbNcShankModel(DTONcShankModel obj)
-        {
-            return new DbNcShankModel()
-            {
-                ShankId = obj.Id,
-                Balluf = obj.Balluf,
-                MagazinePositionType = obj.MagazinePositionType,
-                MagazineId = obj.MagazineId,
-                PositionId = obj.PositionId,
-                OriginMagazineId = obj.OriginMagazineId,
-                OriginPositionId = obj.OriginPositionId,
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTONcToolModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTONcToolModel.cs
deleted file mode 100644
index b2cf2f65..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTONcToolModel.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-using CMS_CORE_Library.Models;
-using Thermo.Active.Model.DatabaseModels;
-using System.Collections;
-using System.ComponentModel.DataAnnotations;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-
-    public class DTONcTool
-    {
-        [Required]
-        public short OffsetLength { get; set; }
-
-        [Required]
-        public int ResidualLife { get; set; }
-
-        [Required]
-        public int ResidualRevive { get; set; }
-
-        [Required]
-        // Foreign keys
-        public short FamilyId { get; set; }
-        
-        [Required]
-        public bool Disabled { get; set; }
-        
-        [Required]
-        public bool Broken { get; set; }
-
-        [Required]
-        public bool Measured { get; set; }
-
-        [Required]
-        public bool IntegrityCheck { get; set; }
-
-        [Required]
-        public bool ClockwiseRotation { get; set; }
-
-        [Required]
-        public bool CounterClockwiseRotation { get; set; }
-
-        public short? ShankId { get; set; } = null;
-
-        public static explicit operator DTONcTool(DbNcToolModel obj)
-        {
-            // Get bit values
-            BitArray statusBits = new BitArray(obj.Status);
-            bool[] bits = new bool[8];
-            statusBits.CopyTo(bits, 0);
-
-            return new DTONcTool()
-            {
-                FamilyId = obj.FamilyId,
-                ShankId = (short)(obj.ShankId == null ? 0 : obj.ShankId.Value),
-                OffsetLength = obj.OffsetLength,
-                ResidualLife = obj.ResidualLife,
-                ResidualRevive = obj.ResidualRevive,
-                Disabled = bits[0],
-                Broken = bits[1],
-                Measured = bits[2],
-                IntegrityCheck = bits[3],
-                ClockwiseRotation = bits[4],
-                CounterClockwiseRotation = bits[5],
-            };
-        }
-
-        public static explicit operator DbNcToolModel(DTONcTool obj)
-        {
-            // Prepare status byte
-            bool[] result = new bool[8] { obj.Disabled, obj.Broken, obj.Measured, obj.IntegrityCheck, obj.ClockwiseRotation, obj.CounterClockwiseRotation, false, false };
-            byte status = ConvertArrayToByte(result);
-
-            return new DbNcToolModel()
-            {
-                FamilyId = obj.FamilyId,
-                ShankId = obj.ShankId,
-                OffsetLength = obj.OffsetLength,
-                ResidualLife = obj.ResidualLife,
-                ResidualRevive = obj.ResidualRevive,
-                Status = status
-            };
-        }
-        
-        protected static byte ConvertArrayToByte(bool[] bits)
-        {
-            BitArray bitField = new BitArray(bits); //BitArray takes a bool[]
-            byte[] bytes = new byte[1];
-            bitField.CopyTo(bytes, 0);
-
-            return bytes[0];
-        }
-    }
-
-    public class DTONcToolModel : DTONewNcToolModel
-    {
-        public short Id { get; set; }
-
-        public OffsetModel Offset1 { get; set; }
-
-        public OffsetModel Offset2 { get; set; }
-
-        public OffsetModel Offset3 { get; set; }
-        
-
-        public static explicit operator DTONcToolModel(DbNcToolModel obj)
-        {
-            // Get bit values
-            BitArray statusBits = new BitArray(new byte[] { obj.Status });
-            bool[] bits = new bool[8];
-            statusBits.CopyTo(bits, 0);
-
-            return new DTONcToolModel()
-            {
-                Id = obj.ToolId,
-                FamilyId = obj.FamilyId,
-                ShankId = obj.ShankId,
-                OffsetLength = obj.OffsetLength,
-                ResidualLife = obj.ResidualLife,
-                ResidualRevive = obj.ResidualRevive,
-                Disabled = bits[0],
-                Broken = bits[1],
-                Measured = bits[2],
-                IntegrityCheck = bits[3],
-                ClockwiseRotation = bits[4],
-                CounterClockwiseRotation = bits[5],
-                OffsetId1 = obj.OffsetId1,
-                OffsetId2 = obj.OffsetId2,
-                OffsetId3 = obj.OffsetId3
-            };
-        }
-
-        public static explicit operator DbNcToolModel(DTONcToolModel obj)
-        {           
-            // Prepare status byte
-            bool[] result = new bool[8] { obj.Disabled, obj.Broken, obj.Measured, obj.IntegrityCheck, obj.ClockwiseRotation, obj.CounterClockwiseRotation, false, false };
-            byte status = ConvertArrayToByte(result);
-
-            return new DbNcToolModel()
-            {
-                ToolId = obj.Id,
-                FamilyId = obj.FamilyId,
-                ShankId = obj.ShankId,
-                OffsetLength = obj.OffsetLength,
-                ResidualLife = obj.ResidualLife,
-                ResidualRevive = obj.ResidualRevive,
-                Status = status,
-                OffsetId1 = obj.OffsetId1,
-                OffsetId2 = obj.OffsetId2,
-                OffsetId3 = obj.OffsetId3
-            };
-        }
-    }
-
-    public class DTONewNcToolModel : DTONcTool
-    {
-        public short? OffsetId1 { get; set; }
-
-        public short? OffsetId2 { get; set; }
-
-        public short? OffsetId3 { get; set; }
-
-
-        public static explicit operator DTONewNcToolModel(DbNcToolModel obj)
-        {
-            // Get bit values
-            BitArray statusBits = new BitArray(obj.Status);
-            bool[] bits = new bool[8];
-            statusBits.CopyTo(bits, 0);
-
-            return new DTONewNcToolModel()
-            {
-                FamilyId = obj.FamilyId,
-                ShankId = (short)(obj.ShankId == null ? 0 : obj.ShankId.Value),
-                OffsetLength = obj.OffsetLength,
-                ResidualLife = obj.ResidualLife,
-                ResidualRevive = obj.ResidualRevive,
-                Disabled = bits[0],
-                Broken = bits[1],
-                Measured = bits[2],
-                IntegrityCheck = bits[3],
-                ClockwiseRotation = bits[4],
-                CounterClockwiseRotation = bits[5],
-                OffsetId1 = obj.OffsetId1,
-                OffsetId2 = obj.OffsetId2,
-                OffsetId3 = obj.OffsetId3
-            };
-        }
-
-        public static explicit operator DbNcToolModel(DTONewNcToolModel obj)
-        {
-            // Prepare status byte
-            bool[] result = new bool[8] { obj.Disabled, obj.Broken, obj.Measured, obj.IntegrityCheck, obj.ClockwiseRotation, obj.CounterClockwiseRotation, false, false};
-            byte status = ConvertArrayToByte(result);
-
-            return new DbNcToolModel()
-            {
-                FamilyId = obj.FamilyId,
-                ShankId = obj.ShankId,
-                OffsetLength = obj.OffsetLength,
-                ResidualLife = obj.ResidualLife,
-                ResidualRevive = obj.ResidualRevive,
-                Status = status,
-                OffsetId1 = obj.OffsetId1,
-                OffsetId2 = obj.OffsetId2,
-                OffsetId3 = obj.OffsetId3
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTONewToolDataModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTONewToolDataModel.cs
deleted file mode 100644
index 071e997a..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTONewToolDataModel.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTONewToolDataModel
-    {
-        public Dictionary<int, byte> UpdatedStatus;
-        public Dictionary<int, uint> UpdatedLives;
-    }
-}
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTONewToolWithFamilyModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTONewToolWithFamilyModel.cs
deleted file mode 100644
index 386facf8..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTONewToolWithFamilyModel.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    // Tool with family data
-
-    public class DTONewNcToolWithFamilyModel : DTONewNcToolModel
-    {
-        // Family fields
-        public string Name { get; set; }
-
-        public byte ToolType { get; set; }
-
-        public byte RightSize { get; set; }
-
-        public byte LeftSize { get; set; }
-
-        public byte TcpTable { get; set; }
-
-        public byte Gamma { get; set; }
-
-        public byte RotationType { get; set; }
-
-        public bool Cooling { get; set; }
-
-        public bool Cooling1 { get; set; }
-
-        public bool Cooling2 { get; set; }
-
-        public bool Cooling3 { get; set; }
-
-        public bool Cooling4 { get; set; }
-
-        public bool Cooling5 { get; set; }
-
-        public bool Cooling6 { get; set; }
-
-        public bool Cooling7 { get; set; }
-
-        public int MaxSpeed { get; set; }
-
-        public byte MaxLoad { get; set; }
-
-        public byte MinLoadPctAutoload { get; set; }
-
-        public byte MaxLoadPctAutoload { get; set; }
-
-        public byte DynamicCompensation { get; set; }
-
-        public byte MinLoadDynamicCompensation { get; set; }
-
-        public byte MaxLoadDynamicCompensation { get; set; }
-
-        public byte LifeType { get; set; }
-
-        public int NominalLife { get; set; }
-
-        public int ReviveDelta { get; set; }
-    }
-
-
-    public class DTONcToolWithFamilyModel : DTONcToolModel
-    {
-        // Family fields
-        [Required]
-        public string Name { get; set; }
-
-        [Required]
-        public byte ToolType { get; set; }
-
-        [Required]
-        public byte RightSize { get; set; }
-
-        [Required]
-        public byte LeftSize { get; set; }
-
-        [Required]
-        public byte TcpTable { get; set; }
-
-        [Required]
-        public byte Gamma { get; set; }
-
-        [Required]
-        public byte RotationType { get; set; }
-
-        [Required]
-        public bool Cooling { get; set; }
-        [Required]
-        public bool Cooling1 { get; set; }
-        [Required]
-        public bool Cooling2 { get; set; }
-        [Required]
-        public bool Cooling3 { get; set; }
-        [Required]
-        public bool Cooling4 { get; set; }
-        [Required]
-        public bool Cooling5 { get; set; }
-        [Required]
-        public bool Cooling6 { get; set; }
-        [Required]
-        public bool Cooling7 { get; set; }
-
-        [Required]
-        public int MaxSpeed { get; set; }
-
-        [Required]
-        public byte MaxLoad { get; set; }
-
-        [Required]
-        public byte MinLoadPctAutoload { get; set; }
-
-        [Required]
-        public byte MaxLoadPctAutoload { get; set; }
-
-        [Required]
-        public byte DynamicCompensation { get; set; }
-
-        [Required]
-        public byte MinLoadDynamicCompensation { get; set; }
-
-        [Required]
-        public byte MaxLoadDynamicCompensation { get; set; }
-
-        [Required]
-        public byte LifeType { get; set; }
-
-        [Required]
-        public int NominalLife { get; set; }
-
-        [Required]
-        public int ReviveDelta { get; set; }
-    }
-}
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTOSelfAdaptiveModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTOSelfAdaptiveModel.cs
deleted file mode 100644
index 99f94d3c..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTOSelfAdaptiveModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using CMS_CORE_Library.Models;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTOSelfAdaptiveModel
-    {
-        public byte Step { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTOShankModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTOShankModel.cs
deleted file mode 100644
index 0aec9f04..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTOShankModel.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using CMS_CORE_Library.Models;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTOShankModel
-    {
-        public int Id;
-        [Required]
-        public string Name { get; set; }
-        [Required]
-        public bool IsEnabled { get; set; }
-        [Required]
-        public bool IsInhibited { get; set; }
-        [Required]
-        public bool InChangeTool { get; set; }
-        [Required]
-        public bool InFixedPlace { get; set; }
-        [Required]
-        public bool InUse { get; set; }
-        [Required]
-        public int LeftSize { get; set; }
-        [Required]
-        public int RightSize { get; set; }
-        [Required]
-        public int MagazinePositionType { get; set; }
-
-        public List<DTOShankChildModel> ChildsTools { get; set; }
-
-        public static explicit operator ShankModel(DTOShankModel obj)
-        {
-            List<ShankChildModel> childs = obj.ChildsTools?.Select(x => new ShankChildModel
-            {
-                Id = x.Id,
-                FamilyName = x.FamilyName,
-                MultitoolId = x.MultitoolId,
-                ToolType = x.ToolType
-            }).ToList();
-
-
-            return new ShankModel()
-            {
-                Id = 0,
-                Name = obj.Name,
-                IsEnabled = obj.IsEnabled,
-                IsInhibited = obj.IsInhibited,
-                InChangeTool = obj.InChangeTool,
-                InFixedPlace = obj.InFixedPlace,
-                InUse = obj.InUse,
-                LeftSize = obj.LeftSize,
-                RightSize = obj.RightSize,
-                MagazinePositionType = obj.MagazinePositionType,
-                ChildsTools = childs
-            };
-        }
-    }
-    public class DTOShankChildModel
-    {
-        public int Id;
-        [Required]
-        public int MultitoolId;
-        [Required]
-        public string FamilyName;
-        [Required]
-        public int ToolType;
-    }
-}
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs
deleted file mode 100644
index f9d1d8a2..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using CMS_CORE_Library.Models;
-using System.ComponentModel.DataAnnotations;
-using static CMS_CORE_Library.Models.DataStructures;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTOSiemensToolModel
-    {
-        [Required]
-        public string FamilyName { get; set; }
-
-        [Required]
-        public int MagazinePositionType { get; set; }
-
-        [Required]
-        public int ToolType { get; set; }
-
-        public SIEMENS_LIFE_TYPE LifeType { get; set; }
-
-        [Required]
-        public int LeftSize { get; set; }
-
-        [Required]
-        public int RightSize { get; set; }
-
-        [Required]
-        public double MaxSpeed { get; set; }
-
-        [Required]
-        public double MaxAcceleration { get; set; }
-
-        [Required]
-        public ROTATION Rotation { get; set; }
-
-        [Required]
-        public bool Cooling1 { get; set; }
-
-        [Required]
-        public bool Cooling2 { get; set; }
-
-        [Required]
-        public bool IsEnabled { get; set; }
-
-        [Required]
-        public bool IsActive { get; set; }
-
-        [Required]
-        public bool InFixedPlace { get; set; }
-
-        [Required]
-        public bool IsInhibited { get; set; }
-
-        [Required]
-        public bool IsMeasured { get; set; }
-
-        [Required]
-        public bool InChangeTool { get; set; }
-
-        [Required]
-        public bool IsInUse { get; set; }
-
-        [Required]
-        public bool PreAlarm { get; set; }
-        // Custom fields
-        [Required]
-        public int Load { get; set; }
-
-        [Required]
-        public int Gamma { get; set; }
-
-        [Required]
-        public int MaxLoadPctAutoload { get; set; }
-
-        [Required]
-        public int MinLoadPctAutoload { get; set; }
-
-        [Required]
-        public int ToolTypeCode { get; set; }
-
-        public DTONcShankModel Shank { get; set; }
-
-        public static explicit operator SiemensToolModel(DTOSiemensToolModel dtoModel)
-        {
-            return new SiemensToolModel()
-            {
-                MagazinePositionType = dtoModel.MagazinePositionType,
-                ToolType = dtoModel.ToolType,
-                LifeType = dtoModel.LifeType,
-                FamilyName = dtoModel.FamilyName,
-                MaxSpeed = dtoModel.MaxSpeed,
-                //MaxAcceleration = dtoModel.MaxAcceleration,
-                IsEnabled = dtoModel.IsEnabled,
-                IsActive = dtoModel.IsActive,
-                IsInhibited = dtoModel.IsInhibited,
-                IsInUse = dtoModel.IsInUse,
-                IsMeasured = dtoModel.IsMeasured,
-                InChangeTool = dtoModel.InChangeTool,
-                InFixedPlace = dtoModel.InFixedPlace,
-                PreAlarm = dtoModel.PreAlarm,
-
-                Cooling1 = dtoModel.Cooling1,
-                Cooling2 = dtoModel.Cooling2,
-                LeftSize = dtoModel.LeftSize,
-                RightSize = dtoModel.RightSize,
-                Rotation = dtoModel.Rotation,
-
-                Load = dtoModel.Load,
-                Gamma = dtoModel.Gamma,
-                MaxLoadPctAutoload = dtoModel.MaxLoadPctAutoload,
-                MinLoadPctAutoload = dtoModel.MinLoadPctAutoload,
-                ToolTypeCode = dtoModel.ToolTypeCode
-            };
-        }
-    }
-
-    public class DTOMagazinesPositionsModel
-    {
-        [Required]
-        public bool Disabled { get; set; }
-    }
-
-    public class DTOFamilyModel
-    {
-        [Required]
-        public string Name { get; set; }
-    }
-
-}
\ No newline at end of file
diff --git a/Thermo.Active.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs b/Thermo.Active.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs
deleted file mode 100644
index addd6019..00000000
--- a/Thermo.Active.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Thermo.Active.Model.DTOModels.ToolModels
-{
-    public class DTOSiemensUpdateMagazineModel
-    {
-        [Required]
-        public int ToolId { get; set; }
-    }
-
-    public class DTONcUpdateMagazineModel
-    {
-        [Required]
-        public int ShankId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active.Model/DatabaseModels/NcFamilyModel.cs b/Thermo.Active.Model/DatabaseModels/NcFamilyModel.cs
index 7344453b..2336f030 100644
--- a/Thermo.Active.Model/DatabaseModels/NcFamilyModel.cs
+++ b/Thermo.Active.Model/DatabaseModels/NcFamilyModel.cs
@@ -18,9 +18,6 @@ namespace Thermo.Active.Model.DatabaseModels
         [Column("name")]
         public string Name { get; set; }
 
-        [Column("type")]
-        public byte ToolType { get; set; }
-
         [Column("right_size")]
         public byte RightSize { get; set; }
 
@@ -69,16 +66,12 @@ namespace Thermo.Active.Model.DatabaseModels
         [Column("revive_delta")]
         public int ReviveDelta { get; set; }
 
-        [JsonIgnore]
-        [IgnoreDataMember]
-        public List<DbNcToolModel> Tools { get; set; }
 
         public static explicit operator NcFamilyModel(DbNcFamilyModel obj)
         {
             return new NcFamilyModel()
             {
                 FamilyId = (ushort)obj.FamilyId,
-                ToolType = obj.ToolType,
                 RightSize = obj.RightSize,
                 LeftSize = obj.LeftSize,
                 TcpTable = obj.TcpTable,
@@ -103,7 +96,6 @@ namespace Thermo.Active.Model.DatabaseModels
             return new DbNcFamilyModel()
             {
                 FamilyId = (short)obj.FamilyId,
-                ToolType = obj.ToolType,
                 RightSize = obj.RightSize,
                 LeftSize = obj.LeftSize,
                 TcpTable = obj.TcpTable,
diff --git a/Thermo.Active.Model/DatabaseModels/NcShankModel.cs b/Thermo.Active.Model/DatabaseModels/NcShankModel.cs
index 36b44a60..b305dd7c 100644
--- a/Thermo.Active.Model/DatabaseModels/NcShankModel.cs
+++ b/Thermo.Active.Model/DatabaseModels/NcShankModel.cs
@@ -39,11 +39,6 @@ namespace Thermo.Active.Model.DatabaseModels
         [IgnoreDataMember]
         public DbNcMagazinePositionModel MagazinePosition { get; set; }
 
-
-        [JsonIgnore]
-        [IgnoreDataMember]
-        public List<DbNcToolModel> Tools { get; set; } 
-
         public static explicit operator NcShankModel(DbNcShankModel obj)
         {
             return new NcShankModel()
diff --git a/Thermo.Active.Model/DatabaseModels/NcToolModel.cs b/Thermo.Active.Model/DatabaseModels/NcToolModel.cs
deleted file mode 100644
index 0038799a..00000000
--- a/Thermo.Active.Model/DatabaseModels/NcToolModel.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using CMS_CORE_Library.Models;
-using Newtonsoft.Json;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Runtime.Serialization;
-
-namespace Thermo.Active.Model.DatabaseModels
-{
-    [Table("tool")]
-    public class DbNcToolModel
-    {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        [Column("id")]
-        public short ToolId { get; set; }
-
-        [Column("offset_length")]
-        public short OffsetLength { get; set; }
-
-        [Column("residual_life")]
-        public int ResidualLife { get; set; }
-
-        [Column("residual_revive")]
-        public int ResidualRevive { get; set; }
-
-        [Column("status")]
-        public byte Status { get; set; }
-
-        // Foreign keys
-        [Column("family_id")]
-        [ForeignKey("Family")]
-        public short FamilyId { get; set; }
-       
-        [Column("shank_id")]
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-
-        [ForeignKey("Shank")]
-        public short? ShankId { get; set; }
-
-        [Column("offsetId1")]
-        public short? OffsetId1 { get; set; }
-
-        [Column("offsetId2")]
-        public short? OffsetId2 { get; set; }
-
-        [Column("offsetId3")]
-        public short? OffsetId3 { get; set; }
-
-        [JsonIgnore]
-        [IgnoreDataMember]
-        public virtual DbNcFamilyModel Family { get; set; }
-
-        [JsonIgnore]
-        [IgnoreDataMember]
-        public virtual DbNcShankModel Shank { get; set; }
-
-        public static explicit operator NcToolModel(DbNcToolModel obj)
-        {
-            return new NcToolModel()
-            {
-                ToolId = obj.ToolId,
-                FamilyId = obj.FamilyId,
-                OffsetLength = obj.OffsetLength,
-                ResidualLife = (ushort)obj.ResidualLife,
-                Status = obj.Status,
-                ResidualRevive = (ushort)obj.ResidualRevive, 
-                ShankId = (short)(obj.ShankId == null ? 0 : obj.ShankId.Value),
-                OffsetId1 = (ushort)(obj.OffsetId1 == null ? 0 : obj.OffsetId1.Value), 
-                OffsetId2 = (ushort)(obj.OffsetId2 == null ? 0 : obj.OffsetId2.Value),
-                OffsetId3 = (ushort)(obj.OffsetId3 == null ? 0 : obj.OffsetId3.Value)
-            };
-        }
-
-        public static explicit operator DbNcToolModel(NcToolModel obj)
-        {
-            return new DbNcToolModel()
-            {
-                ToolId = obj.ToolId,
-                FamilyId = obj.FamilyId,
-                OffsetLength = obj.OffsetLength,
-                ResidualLife = (ushort)obj.ResidualLife,
-                Status = obj.Status,
-                ResidualRevive = (ushort)obj.ResidualRevive,
-                ShankId = obj.ShankId == 0 ? null : (short?)obj.ShankId,
-                OffsetId1 = obj.OffsetId1 == 0 ? null : (short?)obj.OffsetId1,
-                OffsetId2 = obj.OffsetId2 == 0 ? null : (short?)obj.OffsetId2,
-                OffsetId3 = obj.OffsetId3 == 0 ? null : (short?)obj.OffsetId3
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active.Model/Thermo.Active.Model.csproj b/Thermo.Active.Model/Thermo.Active.Model.csproj
index b5572c5c..8f58bf38 100644
--- a/Thermo.Active.Model/Thermo.Active.Model.csproj
+++ b/Thermo.Active.Model/Thermo.Active.Model.csproj
@@ -67,15 +67,12 @@
     <Compile Include="ConfigModels\CmsConnectConfigModel.cs" />
     <Compile Include="ConfigModels\ExtSoftwareModel.cs" />
     <Compile Include="ConfigModels\HeadsConfigModel.cs" />
-    <Compile Include="ConfigModels\MagazineNamesModel.cs" />
     <Compile Include="ConfigModels\MaintenanceConfigModel.cs" />
     <Compile Include="ConfigModels\NcSoftKeysModel.cs" />
     <Compile Include="ConfigModels\ServerConfigModel.cs" />
     <Compile Include="ConfigModels\AreasConfigModel.cs" />
     <Compile Include="ConfigModels\NcConfigModel.cs" />
     <Compile Include="ConfigModels\SoftwareProdConfigModel.cs" />
-    <Compile Include="ConfigModels\ToolManagerConfigModel.cs" />
-    <Compile Include="ConfigModels\ToolTypeConfigModel.cs" />
     <Compile Include="ConfigModels\UserSoftKeyConfigModel.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="DatabaseModels\AlarmFileModel.cs" />
@@ -93,7 +90,6 @@
     <Compile Include="DatabaseModels\NcFamilyModel.cs" />
     <Compile Include="DatabaseModels\NcMagazinePositionModel.cs" />
     <Compile Include="DatabaseModels\NcShankModel.cs" />
-    <Compile Include="DatabaseModels\NcToolModel.cs" />
     <Compile Include="DatabaseModels\PerformedMaintenanceModel.cs" />
     <Compile Include="DatabaseModels\QueueItemsModel.cs" />
     <Compile Include="DatabaseModels\RoleModel.cs">
@@ -120,10 +116,6 @@
     <Compile Include="DTOModels\JobModels\DTOMetadataModel.cs" />
     <Compile Include="DTOModels\Scada\DTOScadaModel.cs" />
     <Compile Include="DTOModels\Scada\ScadaSchemaModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTOAssistedToolingModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTOSelfAdaptiveModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTOExportToolTableModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTONewToolDataModel.cs" />
     <Compile Include="DTOModels\MaintenanceModels\DTOExpiredMaintenanceModel.cs" />
     <Compile Include="DTOModels\DTOHeadModel.cs" />
     <Compile Include="DTOModels\DTOHeadsConfigModel.cs" />
@@ -144,17 +136,6 @@
     <Compile Include="DTOModels\MaintenanceModels\DTOMaintenanceNoteModel.cs" />
     <Compile Include="DTOModels\MaintenanceModels\DTONewMaintenanceModel.cs" />
     <Compile Include="DatabaseModels\MaintenanceNoteModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTOEdgeModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTOMagazineStatusModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTONcFamilyModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTONcMagazinePositionModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTONcMountedShankModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTONcShankModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTONcToolModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTONewToolWithFamilyModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTOShankModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTOSiemensToolModel.cs" />
-    <Compile Include="DTOModels\ToolModels\DTOUpdateMagazineModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DatabaseModels\UserModel.cs">
       <Generator>DtsGenerator</Generator>
diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs
index b0654fa0..474b973e 100644
--- a/Thermo.Active.NC/NcAdapter.cs
+++ b/Thermo.Active.NC/NcAdapter.cs
@@ -870,53 +870,18 @@ namespace Thermo.Active.NC
                                 OverrideEditable = head.OverrideEditable,
                                 ActualSpeed = head.ActualSpeed_Pressure,
                                 Load = head.Load_Abrasive, 
-                                MountedTool = (ushort)head.MountedTool_Vacum,
                                 Override = head.Override,
                                 IsActive = head.IsActive,
                                 IsSelected = head.IsSelected,
                                 AbrasiveIsActive = head.AbrasiveIsActive,
                                 Configured = head.Configured,
                                 Rotation = head.Rotation,
-                                WorkedTime = head.WorkedTime,
-                                ToolData = head.Tool == null ? null : new DTOToolInSpindleModel()
-                                {
-                                    ChildId = head.Tool.ChildId,
-                                    ToolName = head.Tool.ToolName,
-                                    Disabled = head.Tool.Disabled,
-                                    Measured = head.Tool.Measured,
-                                    Broken = head.Tool.Broken,
-                                    MaxSpeed = (int)head.Tool.MaxSpeed,
-                                    MaxLoad = (byte)head.Tool.MaxLoad,
-                                    ResidualLife = (int)head.Tool.ResidualLife
-                                }
-                            });
-                        }
-                        break;
-
-                    case HEAD_TYPE.AWJ:
-                        {
-                            float vacumValue = (float)head.MountedTool_Vacum / 100;
-                            heads.Add(new DTOAbrasiveWaterJet()
-                            {
-                                Id = head.Id,
-                                Process = head.Process,
-                                Type = configuredHead.Type.ToString(),
-                                FixedHead = configuredHead.FixedHead,
-                                inWarning = vacumValue >= configuredHead.WarningLimit,
-                                inAlarm = vacumValue >= configuredHead.AlarmLimit,
-                                OverrideEditable = head.OverrideEditable,
-                                ActualPressure = head.ActualSpeed_Pressure,
-                                Abrasive = Convert.ToUInt16(head.Load_Abrasive),
-                                Vacum = vacumValue,
-                                Override = head.Override,
-                                IsActive = head.IsActive,
-                                IsSelected = head.IsSelected,
-                                AbrasiveIsActive = head.AbrasiveIsActive,
                                 WorkedTime = head.WorkedTime
                             });
                         }
                         break;
 
+
                     case HEAD_TYPE.WJ:
                         {
                             heads.Add(new DTOWaterJet()
diff --git a/Thermo.Active.NC/NcToolTableAdapter.cs b/Thermo.Active.NC/NcToolTableAdapter.cs
deleted file mode 100644
index 763b81bb..00000000
--- a/Thermo.Active.NC/NcToolTableAdapter.cs
+++ /dev/null
@@ -1,911 +0,0 @@
-using CMS_CORE_Library.Models;
-using Thermo.Active.Database.Controllers;
-using Thermo.Active.Model.DatabaseModels;
-using Thermo.Active.Model.DTOModels.ToolModels;
-using Thermo.Active.Utils;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Linq;
-using static CMS_CORE_Library.Models.DataStructures;
-using static Thermo.Active.Config.ServerConfig;
-using static Thermo.Active.Model.Constants;
- 
-namespace Thermo.Active.NC
-{
-    public class NcToolTableAdapter : NcAdapter
-    {
-        public CmsError GetToolsData(out List<DTONcToolModel> dtoTools) 
-        {
-            dtoTools = new List<DTONcToolModel>();
-
-            CmsError cmsError = NO_ERROR;
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                List<DbNcToolModel> tools = toolsManager.FindToolsWithDependencies();
-
-                foreach (DbNcToolModel tool in tools)
-                {
-                    DTONcToolModel dtoTool = (DTONcToolModel)tool;
-
-                    cmsError = GetToolData(tool, ref dtoTool);
-
-                    dtoTools.Add(dtoTool);
-                }
-
-                return cmsError;
-            }
-        }
-
-        public CmsError GetToolData(DbNcToolModel tool, ref DTONcToolModel dtoTool)
-        {
-            dtoTool = (DTONcToolModel)tool;
-
-            OffsetModel offset = new OffsetModel();
-            CmsError cmsError = NO_ERROR;
-
-            if (tool.OffsetId1 != null && tool.OffsetId1 != 0)
-            {
-                // Read first offset data
-                cmsError = numericalControl.TOOLS_ROffset((short)tool.OffsetId1, ref offset);
-                if (cmsError.IsError())
-                    return cmsError;
-
-                dtoTool.Offset1 = offset;
-            }
-            if (tool.OffsetId2 != null && tool.OffsetId2 != 0)
-            {
-                // Read second offset data
-                cmsError = numericalControl.TOOLS_ROffset((short)tool.OffsetId2, ref offset);
-                if (cmsError.IsError())
-                    return cmsError;
-
-                dtoTool.Offset2 = offset;
-            }
-            if (tool.OffsetId3 != null && tool.OffsetId3 != 0)
-            {
-                // Read third offset data
-                cmsError = numericalControl.TOOLS_ROffset((short)tool.OffsetId3, ref offset);
-                if (cmsError.IsError())
-                    return cmsError;
-
-                dtoTool.Offset3 = offset;
-            }
-
-            return cmsError;
-        }
-
-        public CmsError AddTool(DTONewNcToolModel tool, out DTONcToolModel dtoTool, short toolId)
-        {
-            dtoTool = new DTONcToolModel();
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                DbNcToolModel ncTool = toolsManager.AddTool(tool, toolId);
-
-                if (!ToolManagerConfig.OffsetOpt)
-                {
-                    CmsError cmsError = UpdateToolOffsetId(ncTool.ToolId, 1, ncTool.ToolId, out DTONcToolModel toolWithOffset);
-                    if (cmsError.IsError())
-                        return cmsError;
-
-                    ncTool.OffsetId1 = ncTool.ToolId;
-                }
-
-                GetToolData(ncTool, ref dtoTool);
-
-                return NO_ERROR;
-            }
-        }
-
-        public CmsError UpdateTool(int toolId, DTONewNcToolModel newTool, out DTONcToolModel toolWithOffsets, DTONewNcToolWithFamilyModel dtoToolWithFamily)
-        {
-            toolWithOffsets = new DTONcToolModel();
-            CmsError cmsError = NO_ERROR;
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                using (var dbContextTransaction = toolsManager.dbCtx.Database.BeginTransaction())
-                {
-                    // If family option is not active, update family data
-                    if (!ToolManagerConfig.FamilyOpt)
-                    {
-                        // Copy only family
-                        DTONewNcFamilyModel newFamily = new DTONewNcFamilyModel();
-                        SupportFunctions.CopyProperties(dtoToolWithFamily, newFamily);
-                        // Update only family data
-                        newFamily = (DTONcFamilyModel)toolsManager.UpdateFamily(dtoToolWithFamily.FamilyId, newFamily); 
-                    }
-
-                    // Update database tool Tool
-                    DbNcToolModel dbTool = toolsManager.UpdateTool(toolId, newTool);
-
-                    // Populate updated tool with offset data
-                    cmsError = GetToolData(dbTool, ref toolWithOffsets);
-                    if (cmsError.IsError())
-                    {
-                        dbContextTransaction.Rollback();
-                        return cmsError;
-                    }
-
-                    bool startIsActive = false;
-
-                    // Check if tool is loaded into a shank
-                    if (dbTool.ShankId != null)
-                    {
-                        // Check if shank is loaded into magazine
-                        DbNcShankModel shank = toolsManager.FindShankWithTools(dbTool.ShankId.Value);
-                        if (shank.MagazineId != null)
-                        {
-                            startIsActive = true;
-                            // Create backup of data stored on the NC and block memory/files accesses
-                            cmsError = numericalControl.TOOLS_WStartEditData();
-                            if (cmsError.IsError())
-                            {
-                                ManageErrorAndTransaction(cmsError, dbContextTransaction, startIsActive);
-                                return cmsError;
-                            }
-
-                            // If family option is not active, update NC data
-                            //if (!ToolManagerConfig.FamilyOpt)
-                            //{
-                            // Update Nc families
-                            cmsError = UpdateNcFamily(toolsManager);
-                            if (cmsError.IsError())
-                                ManageErrorAndTransaction(cmsError, dbContextTransaction, true);
-                            //}
-
-                            // Update tool
-                            cmsError = UpdateNcTools(toolsManager);
-                        }
-                    }
-
-                    ManageErrorAndTransaction(cmsError, dbContextTransaction, startIsActive);
-
-                    return NO_ERROR;
-                }
-            }
-        }
-
-        public CmsError UpdateNcTools(NcToolManagerController toolsManager = null)
-        {
-            if (toolsManager == null)
-                toolsManager = new NcToolManagerController();
-
-            List<NcShankModel> shanks = toolsManager
-                           .FindShanks()
-                           .Where(x => x.MagazineId != null)
-                           .Select(x => (NcShankModel)x)
-                           .ToList();
-
-            // Get tools
-            List<NcToolModel> tools = toolsManager
-                .FindTools()
-                .Select(x => (NcToolModel)x)
-                .Where(x => shanks.Any(y => y.ShankId == x.ShankId))  // Find only mounted tools
-                .ToList(); 
-
-            // Update tools
-            return numericalControl.TOOLS_WUpdateTools(tools);
-        }
-
-        public CmsError UpdateOffset(short offsetId, OffsetModel offsetData)
-        {
-            return numericalControl.TOOLS_WOffset(offsetId, ref offsetData);
-        }
-
-        public CmsError UpdateToolOffsetId(int toolId, int positionId, short offsetId, out DTONcToolModel toolWithOffsets)      
-        {
-            toolWithOffsets = new DTONcToolModel();
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                using (var dbContextTransaction = toolsManager.dbCtx.Database.BeginTransaction())
-                {
-                    // Update database tool Tool
-                    DbNcToolModel dbTool = toolsManager.UpdateToolOffset(toolId, positionId, offsetId);
-
-                    // Populate updated tool with offset data
-                    CmsError cmsError = GetToolData(dbTool, ref toolWithOffsets);
-                    if (cmsError.IsError())
-                    {
-                        dbContextTransaction.Rollback();
-                        return cmsError;
-                    }
-
-                    bool startIsActive = false;
-
-                    // Check if tool is loaded into a shank
-                    if (dbTool.ShankId != null)
-                    {
-                        // Check if shank is loaded into magazine
-                        DbNcShankModel shank = toolsManager.FindShankWithTools(dbTool.ShankId.Value);
-                        if (shank.MagazineId != null)
-                        {
-                            startIsActive = true;
-                            // Create backup of data stored on the NC and block file accesses
-                            cmsError = numericalControl.TOOLS_WStartEditData();
-                            if (cmsError.IsError())
-                            {
-                                ManageErrorAndTransaction(cmsError, dbContextTransaction, startIsActive);
-                                return cmsError;
-                            }
-
-                            // R tool
-                            cmsError = UpdateNcTools(toolsManager);
-                        }
-                    }
-
-                    ManageErrorAndTransaction(cmsError, dbContextTransaction, startIsActive);
-
-                    return NO_ERROR;
-                }
-            }
-        }
-
-        public CmsError DeleteNcTool(DbNcToolModel tool)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                using (var dbContextTransaction = toolsManager.dbCtx.Database.BeginTransaction())
-                {
-                    if (!ToolManagerConfig.FamilyOpt)
-                    {
-                        DbNcFamilyModel fam = toolsManager.FindFamily(tool.FamilyId);
-                        // Check if family is connected to other tools
-                        if (fam != null && fam.Tools.Count() == 1)
-                        {
-                            toolsManager.DeleteFamily(fam.FamilyId);
-                        }
-                    }
-
-                    DbNcShankModel shank = null;
-                    if (!ToolManagerConfig.ShankOpt && tool.ShankId != null)
-                    {
-                        // If option is active find & delete tool shank
-                        shank = toolsManager.FindShankWithTools(tool.ShankId.Value);
-
-                        toolsManager.DeleteNcShank(shank.ShankId);
-                    }
-
-                    // Delete db tool
-                    toolsManager.DeleteTool(tool.ToolId);
-
-                    bool startIsActive = false;
-                    CmsError cmsError = NO_ERROR;
-
-                    if (tool.ShankId != null && shank != null)
-                    {  
-                        if (shank.MagazineId != null)
-                        {
-                            startIsActive = true; 
-                            // Create backup of data stored on the NC and block file accesses
-                            cmsError = numericalControl.TOOLS_WStartEditData();
-                            if (cmsError.IsError())
-                            {
-                                ManageErrorAndTransaction(cmsError, dbContextTransaction, startIsActive); 
-                                return cmsError;
-                            }
-
-                            // Update Nc data
-                            cmsError = UpdateNcTools(toolsManager); 
-                        }
-                    }
-
-                    ManageErrorAndTransaction(cmsError, dbContextTransaction, startIsActive);
-
-                    return cmsError;
-                }
-            }
-        }
-
-        public CmsError UpdateShank(int shankId, DTONewNcShankModel dtoShank, out DTONcShankModel shank)
-        {
-            shank = new DTONcShankModel();
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                using (var dbContextTransaction = toolsManager.dbCtx.Database.BeginTransaction())
-                {
-                    bool startIsActive = false;
-                    CmsError cmsError = NO_ERROR;
-
-                    // Update db data
-                    shank = (DTONcShankModel)toolsManager.UpdateShank(shankId, dtoShank);
-                    if (shank.MagazineId != null)
-                    {
-                        startIsActive = true;
-                        // Create backup of data stored on the NC and block file accesses
-                        cmsError = numericalControl.TOOLS_WStartEditData();
-                        if (cmsError.IsError())
-                        {
-                            ManageErrorAndTransaction(cmsError, dbContextTransaction, startIsActive);
-                            return cmsError;
-                        }
-
-                        // Update nc data
-                        cmsError = UpdateNcShanks(toolsManager);
-                    }
-
-                    ManageErrorAndTransaction(cmsError, dbContextTransaction, startIsActive);
-
-                    return cmsError;
-                }
-            }
-        }
-
-        public CmsError DeleteNcShank(int shankId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                CmsError cmsError = NO_ERROR;
-                using (var dbContextTransaction = toolsManager.dbCtx.Database.BeginTransaction())
-                {
-                    // Delete database shank
-                    DbNcShankModel deletedShank = toolsManager.DeleteNcShank(shankId);
-                    bool startIsActive = false;
-                    if (deletedShank.MagazineId != null)
-                    {
-                        startIsActive = true;
-                        // Create backup of data stored on the NC and block file accesses
-                        cmsError = numericalControl.TOOLS_WStartEditData();
-                        if (cmsError.IsError())
-                        {
-                            ManageErrorAndTransaction(cmsError, dbContextTransaction, startIsActive);
-                            return cmsError;
-                        }
-
-                        // Update nc data
-                        cmsError = UpdateNcShanks(toolsManager);
-                    }
-
-                    ManageErrorAndTransaction(cmsError, dbContextTransaction, startIsActive);
-
-                    return cmsError;
-                }
-            }
-        }
-
-        private CmsError UpdateNcShanks(NcToolManagerController toolsManager)
-        {
-            // Get mounted shanks
-            List<NcShankModel> shanks = toolsManager
-                .FindShanks()
-                .Where(x => x.MagazineId != null)
-                .Select(x => (NcShankModel)x)
-                .ToList();
-
-            // Update nc data
-            return numericalControl.TOOLS_WUpdateShanks(shanks);
-        }
-
-        public DTONcFamilyModel AddFamily(DTONcFamilyModel family)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                return (DTONcFamilyModel)toolsManager.AddFamily(family);
-            }
-        }
-
-        public CmsError UpdateFamily(int familyId, DTONewNcFamilyModel family, out DTONcFamilyModel newFamily)
-        {
-            newFamily = new DTONcFamilyModel();
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                using (var dbContextTransaction = toolsManager.dbCtx.Database.BeginTransaction())
-                {
-                    // Update db family
-                    newFamily = (DTONcFamilyModel)toolsManager.UpdateFamily(familyId, family);
-
-                    // Create backup of data stored on the NC and block file accesses
-                    CmsError cmsError = numericalControl.TOOLS_WStartEditData();
-                    if (cmsError.IsError())
-                    {
-                        ManageErrorAndTransaction(cmsError, dbContextTransaction, true);
-                        return cmsError;
-                    }
-
-                    // Update Nc families
-                    cmsError = UpdateNcFamily(toolsManager);
-
-                    ManageErrorAndTransaction(cmsError, dbContextTransaction, true);
-
-                    return cmsError;
-                }
-            }
-        }
-
-        public CmsError DeleteNcFamily(int famId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                using (var dbContextTransaction = toolsManager.dbCtx.Database.BeginTransaction())
-                {
-                    // Create backup of data stored on the NC and block file accesses
-                    CmsError cmsError = numericalControl.TOOLS_WStartEditData();
-                    if (cmsError.IsError())
-                        return cmsError;
-
-                    // Check if shank opt is disabled
-                    if (!ToolManagerConfig.ShankOpt)
-                    {
-                        // If the relationship is 1:1 (tool:shank) i have to remove shanks manually
-                        // Tools are deleted thanks to foreign keys constraint
-                        List<DbNcShankModel> shanks = toolsManager.FindShanksByFamilyId(famId);
-                        foreach (var shank in shanks)
-                        {
-                            if (shank != null)
-                                toolsManager.DeleteNcShank(shank.ShankId);
-                        }
-                    }
-
-                    toolsManager.DeleteFamily(famId);
-
-                    // Update Nc families
-                    cmsError = UpdateNcFamily(toolsManager);
-
-                    ManageErrorAndTransaction(cmsError, dbContextTransaction, true);
-
-                    return cmsError;
-                }
-            }
-        }
-
-        private CmsError UpdateNcFamily(NcToolManagerController toolsManager)
-        {
-            // Get mounted shanks
-            List<NcShankModel> shanks = toolsManager
-                .FindShanks()
-                .Where(x => x.MagazineId != null)
-                .Select(x => (NcShankModel)x)
-                .ToList();
-
-            // Get tools
-            List<NcToolModel> tools = toolsManager
-                .FindTools()
-                .Select(x => (NcToolModel)x)
-                .Where(x => shanks.Any(y => y.ShankId == x.ShankId))  // Find only mounted tools
-                .ToList();
-
-            List<NcFamilyModel> families = toolsManager
-               .FindFamilies()
-               .Select(x => (NcFamilyModel)x)
-               .Where(x => tools.Any(y => y.FamilyId == x.FamilyId)) // Find only families of mounted tools
-               .ToList();
-
-            // Update nc families
-            return numericalControl.TOOLS_WUpdateFamilies(families);
-        }
-
-        public CmsError UpdateMagazinePosition(DbNcMagazinePositionModel dbPos, DTONcMagazinePositionModel dtoPos, out DTONcMagazinePositionModel magPos)
-        {
-            magPos = new DTONcMagazinePositionModel();
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                using (DbContextTransaction dbContextTransaction = toolsManager.dbCtx.Database.BeginTransaction())
-                {
-                    // Create backup of data stored on the NC and block file accesses
-                    CmsError cmsError = StartEditData();
-                    if (cmsError.IsError())
-                    {
-                        ManageErrorAndTransaction(cmsError, dbContextTransaction, true);
-                        return cmsError;
-                    }
-
-                    // Update database data
-                    magPos = (DTONcMagazinePositionModel)toolsManager.UpdatePosition(dbPos, dtoPos);
-
-                    // Get magazines positions
-                    List<NcMagazinePositionModel> positions = toolsManager.FindMagazinesPositions()
-                        .Select(x => (NcMagazinePositionModel)x)
-                        .ToList();
-                    // Update Nc data
-                    cmsError = numericalControl.TOOLS_WUpdateMagazinePositions(positions);
-
-                    ManageErrorAndTransaction(cmsError, dbContextTransaction, true);
-
-                    return cmsError;
-                }
-            }
-        }
-
-        private void ManageErrorAndTransaction(CmsError cmsError, DbContextTransaction dbContextTransaction, bool ncStartIsActive)
-        {
-            // Check cmsError, manage transaction and if startIsActive = true manage Nc backup created with TOOLS_WStartEditData()
-            if (cmsError.IsError())
-            {
-                // Close transaction
-                dbContextTransaction.Rollback();
-                // Restore backup
-                if (ncStartIsActive)
-                    numericalControl.TOOLS_WRestoreBackup();
-            }
-            else
-            {
-                // Close transaction
-                dbContextTransaction.Commit();
-                // Stop editing ncData
-                if (ncStartIsActive)
-                    numericalControl.TOOLS_WStopEditData();
-            }
-        }
-
-        public DTONcShankModel LoadIntoShank(DbNcToolModel tool, short shankId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                return toolsManager.LoadToolIntoShank(tool, shankId);
-            }
-        }
-
-        public DTONcShankModel UnloadFromShank(DbNcToolModel tool)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                return toolsManager.UnloadToolFromShank(tool);
-            }
-        }
-
-        public CmsError SetupNcToolManager()
-        {
-            CmsError cmsError = UpdateMagazinePositionConf(out bool newDb);
-            if (cmsError.IsError())
-                return cmsError;
-
-            cmsError = WriteOption();
-            if (cmsError.IsError())
-                return cmsError;
-
-            using (NcToolManagerController toolManager = new NcToolManagerController())
-            {
-                // If database was empty read data from NC and update database
-                if (newDb)
-                {
-                    List<NcToolModel> tools = new List<NcToolModel>();
-                    List<NcFamilyModel> families = new List<NcFamilyModel>();
-                    List<NcShankModel> shanks = new List<NcShankModel>();
-
-                    // Read data from Nc memory
-                    cmsError = numericalControl.TOOLS_RStoredData(ref tools, ref families, ref shanks);
-                    if (cmsError.IsError())
-                        return cmsError;
-
-                    // Check if there are data
-                    if (tools.Count() > 0 || families.Count() > 0 || shanks.Count() > 0)
-                    {
-                        // Populate import object
-                        DTOExportToolTableModel exp = new DTOExportToolTableModel()
-                        {
-                            Tools = tools.Select(x => (DbNcToolModel)x).ToList(),
-                            Families = families.Select(x =>
-                            {
-                                var fam = (DbNcFamilyModel)x;
-                                fam.Name = "Fam" + fam.FamilyId.ToString();
-                                return fam;
-                            }).ToList(),
-                            Shanks = shanks.Select(x => (DbNcShankModel)x).ToList()
-                        };
-
-                        // Import
-                        toolManager.ImportData(exp);
-                    }
-                }
-                
-                List<DTONcToolModel> databaseTool = toolManager.GetTools();
-                bool exist = false;
-                if (databaseTool != null && databaseTool.Count() > 0)
-                    // Check options consistency with database data
-                    exist = databaseTool.Exists(x =>
-                        (!ToolManagerConfig.FamilyOpt && x.FamilyId != x.Id) || // Check family
-                        (!ToolManagerConfig.ShankOpt && x.ShankId != x.Id) || // Check shanks
-                        (!ToolManagerConfig.OffsetOpt && x.OffsetId1 != x.Id && x.OffsetId2 != null && x.OffsetId3 != null) // Check offsets
-                    );
-
-                if (exist)
-                    return OPTION_NOT_CONSISTENT_ERROR;
-
-                // Check if there are blocked magazines, and release them
-                cmsError = RestoreTableLock();
-                if (cmsError.IsError())
-                    return cmsError;
-
-            }
-
-            return NO_ERROR;
-        }
-
-        public CmsError UpdateMagazinePositionConf(out bool newDb)
-        {
-            newDb = false;
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Get database configured positions
-                List<DbNcMagazinePositionModel> dbPositions = toolsManager.FindMagazinesPositions();
-                if (dbPositions.Count <= 0)
-                {
-                    // THe software is using a new database
-                    newDb = true;
-
-                    CmsError cmsError = GetMagazineConfiguration(out List<NcMagazineConfigModel> config);
-                    if (cmsError.IsError())
-                        return cmsError;
-
-                    // Setup new positions list in order to be saved in the database
-                    List<DbNcMagazinePositionModel> fromConfigPosition = new List<DbNcMagazinePositionModel>();
-                    foreach (var conf in config)
-                    {
-                        for (byte i = 1; i <= conf.MaxPositions; i++)
-                        {
-                            // Create new position
-                            fromConfigPosition.Add(new DbNcMagazinePositionModel()
-                            {
-                                MagazineId = conf.Id,
-                                PositionId = i,
-                                Disabled = false,
-                                Type = 0
-                            });
-                        }
-                    }
-
-                    // Update database
-                    toolsManager.SetupMagazinePositions(fromConfigPosition);
-
-                    return cmsError;
-                }
-
-                return NO_ERROR;
-            }
-        }
-
-        public CmsError WriteOption()
-        {
-            ToolManagerOptionsModel options = new ToolManagerOptionsModel();
-            SupportFunctions.CopyProperties(ToolManagerConfig, options);
-
-            return numericalControl.TOOLS_WOptions(options);
-        }
-
-        public CmsError GetMagazineConfiguration(out List<NcMagazineConfigModel> config)
-        {
-            config = new List<NcMagazineConfigModel>();
-            // Read configuration
-            return numericalControl.TOOLS_RMagazineConfig(ref config);
-        }
-
-        public CmsError StartEditData()
-        {
-            return numericalControl.TOOLS_WStartEditData();
-        }
-
-        public CmsError StopEditData()
-        {
-            return numericalControl.TOOLS_WStopEditData();
-        }
-
-        public CmsError StartEditTooling(int magazineId)
-        {
-            return numericalControl.TOOLS_WStartEditTooling(magazineId);
-        }
-
-        public CmsError StopEditTooling(int magazineId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Get mounted shanks
-                List<NcShankModel> shanks = toolsManager
-                    .FindShanks()
-                    .Where(x => x.MagazineId != null)
-                    .Select(x => (NcShankModel)x)
-                    .ToList();
-                // Update shanks
-                CmsError cmsError = numericalControl.TOOLS_WUpdateShanks(shanks);
-                if (cmsError.IsError())
-                    return cmsError;
-
-                // Get magazine positions
-                List<NcMagazinePositionModel> positions = toolsManager.FindMagazinesPositions()
-                    .Select(x => (NcMagazinePositionModel)x)
-                    .ToList();
-                // Update positions
-                cmsError = numericalControl.TOOLS_WUpdateMagazinePositions(positions);
-                if (cmsError.IsError())
-                    return cmsError;
-
-                // Get tools
-                List<NcToolModel> tools = toolsManager
-                    .FindTools()
-                    .Select(x => (NcToolModel)x)
-                    .Where(x => shanks.Any(y => y.ShankId == x.ShankId))  // Find only mounted tools
-                    .ToList();
-
-                // Update tools
-                cmsError = numericalControl.TOOLS_WUpdateTools(tools);
-                if (cmsError.IsError())
-                    return cmsError;
-
-                // Get families
-                List<NcFamilyModel> families = toolsManager
-                    .FindFamilies()
-                    .Select(x => (NcFamilyModel)x)
-                    .Where(x => tools.Any(y => y.FamilyId == x.FamilyId)) // Find only families of mounted tools
-                    .ToList();
-
-                // Update families
-                cmsError = numericalControl.TOOLS_WUpdateFamilies(families);
-                if (cmsError.IsError())
-                    return cmsError;
-            }
-
-            return numericalControl.TOOLS_WStopEditTooling(magazineId);
-        }
-
-        public CmsError GetUpdatedToolsData(out Dictionary<int, byte> updatedStatus, out Dictionary<int, uint> updatedLives)
-        {
-            updatedStatus = new Dictionary<int, byte>();
-            updatedLives = new Dictionary<int, uint>();
-            return numericalControl.TOOLS_RUpdatedToolsData(ref updatedStatus, ref updatedLives);
-        }
-
-        public CmsError CheckIfShankCanFit(int magazineId, int positionId, DbNcShankModel shankToBeLoaded)
-        {
-            CmsError cmsError = GetMagazineConfiguration(out List<NcMagazineConfigModel> magazinesConfig);
-            if (cmsError.IsError())
-                return cmsError;
-
-            NcMagazineConfigModel magConfig = magazinesConfig.FirstOrDefault(x => x.Id == magazineId);// Get only current magazine config
-            if (magConfig == null)
-                return INCORRECT_PARAMETERS_ERROR;
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                List<DbNcToolModel> magazineMountedTools = toolsManager.GetMountedTools();
-
-                // Check if there is a tool already mounted the selected position (magazineId, positionId)
-                var toolAlreadyMounted = magazineMountedTools.FirstOrDefault(x => x.Shank.MagazineId == magazineId && x.Shank.PositionId == positionId);
-                if (toolAlreadyMounted != null)
-                    return MAGAZINE_POSITION_OCCUPIED_ERROR;
-
-                // Get shank occupied space
-                toolsManager.GetShankMaxSpaceOccupied(shankToBeLoaded.ShankId, out int maxRight, out int maxLeft);
-
-                // Check if tool can fit in the position considering other tools
-                foreach (var mountedTool in magazineMountedTools)
-                {
-                    // Check if is not the same position && if is different check if the position is on the same magazine
-                    if (mountedTool.Shank.PositionId != positionId && mountedTool.Shank.MagazineId == magazineId)
-                    {
-                        int decPosition, incPosition;
-                        decPosition = incPosition = mountedTool.Shank.PositionId.Value;
-                        // if it is a circular magazine move position before ( for left case ) or after ( right case ) the location you want to mount the tool
-                        if (magConfig.Type != NC_MAGAZINE_TYPE.BOX_MAGAZINE)
-                        {
-                            decPosition = decPosition < positionId ? decPosition + magConfig.MaxPositions : decPosition;
-                            incPosition = incPosition > positionId ? incPosition - magConfig.MaxPositions : incPosition;
-                        }
-
-                        // Right check
-                        if (positionId < decPosition)
-                        {
-                            if (!(magConfig.Type == NC_MAGAZINE_TYPE.BOX_MAGAZINE && mountedTool.Shank.PositionId == 1))
-                            {
-                                // Calculate left space occupied (with mounted shank)
-                                double leftMounted = decPosition - (mountedTool.Family.LeftSize / 2.0);
-                                // Calculate right space needed (with shank to be loaded)
-                                double rightToBeMount = positionId + (maxRight / 2.0);
-                                if (leftMounted < rightToBeMount)
-                                    return MAGAZINE_POSITION_OCCUPIED_ERROR;
-                            }
-                        }
-
-                        // Left check
-                        if (positionId > incPosition)
-                        {
-                            if (!(magConfig.Type == NC_MAGAZINE_TYPE.BOX_MAGAZINE && mountedTool.Shank.PositionId == magConfig.MaxPositions))
-                            {
-                                // Calculate right space occupied (with mounted shank)
-                                double rightMounted = incPosition + (mountedTool.Family.RightSize / 2.0);
-                                // Calculate left space needed (with shank to be loaded)
-                                double leftToBeMounted = positionId - (maxLeft / 2.0);
-                                if (rightMounted > leftToBeMounted)
-                                    return MAGAZINE_POSITION_OCCUPIED_ERROR;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return NO_ERROR;
-        }
-
-        public CmsError GetNcMagazineStatus(out Dictionary<int, bool> status) 
-        {
-            status = new Dictionary<int, bool>();
-            return numericalControl.TOOLS_RMagazineStatus(ref status);
-        }
-
-        public CmsError StartAssistedToolingProcedure(ushort toolId, ushort familyId, ushort shankId, ushort magazineId, ushort positionId, ASSISTED_TOOLING_ACTION action)
-        {
-            return numericalControl.PLC_WAssistedToolingCmd(toolId, familyId, shankId, magazineId, positionId, action);
-        }
-
-        public CmsError ReadAssistedToolingProcedure(out DTOAssistedToolingEndValueModel data)
-        {
-            data = new DTOAssistedToolingEndValueModel();
-            AssistedToolingModel tmpData = new AssistedToolingModel();
-            CmsError cmsError = numericalControl.PLC_RAssistedToolingData(ref tmpData);
-            if (cmsError.IsError())
-                return cmsError;
-
-            data = new DTOAssistedToolingEndValueModel(tmpData);
-
-            return cmsError;
-        }
-
-        public CmsError TerminateAssistedProcedure(int magazineId, bool writeData)
-        {
-            if (writeData)
-            {
-                CmsError cmsError = StartEditTooling(magazineId);
-                if (!cmsError.IsError())
-                {
-                    // Write tool table new data
-                    cmsError = StopEditTooling(magazineId);
-                    if (!cmsError.IsError())
-                    {
-                        // Close procedure
-                        return numericalControl.PLC_WTerminateAssistedToolingProcedure();
-                    }
-                }
-                return cmsError;
-            }
-            else
-            {
-                return numericalControl.PLC_WTerminateAssistedToolingProcedure();
-            }
-        }
-
-        public CmsError GetSelfAdaptiveStep(out DTOSelfAdaptiveModel step)
-        {
-            step = new DTOSelfAdaptiveModel();
-            byte intStep = 0;
-
-            //Get the value
-            CmsError cmsError = numericalControl.TOOLS_RAdatpivePathStep(ref intStep);
-            step.Step = intStep;
-            return cmsError;
-        }
-
-        public CmsError SetSelfAdaptiveStep(DTOSelfAdaptiveModel step)
-        {
-            //Limit Value
-            if (step.Step > 100)
-                step.Step = 100;
-            if (step.Step < 0)
-                step.Step = 0;
-
-            //Set the value
-            return numericalControl.TOOLS_WAdatpivePathStep(step.Step);
-        }
-
-        public CmsError RestoreTableLock()
-        {
-            List<int> ids = new List<int>();
-            // check if there are magazines blocked by Active previously
-            CmsError cmsError = numericalControl.TOOLS_RMagazineBlock(ref ids);
-            if (cmsError.IsError())
-                return cmsError;
-
-            if (ids.Count() > 0)
-            {
-                // Update tables
-                cmsError = StopEditTooling(ids.FirstOrDefault());
-                if (cmsError.IsError())
-                    return cmsError;
-                // Free magazines
-                return numericalControl.TOOLS_WFreeMagazines();
-            }
-
-            return NO_ERROR;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active.NC/SiemensToolTableAdapter.cs b/Thermo.Active.NC/SiemensToolTableAdapter.cs
deleted file mode 100644
index 4e3cc91c..00000000
--- a/Thermo.Active.NC/SiemensToolTableAdapter.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-using CMS_CORE_Library.Models;
-using Thermo.Active.Model.DTOModels.ToolModels;
-using System.Collections.Generic;
-using System.Linq;
-using static Thermo.Active.Config.ServerConfig;
-using static Thermo.Active.Model.Constants;
-
-namespace Thermo.Active.NC
-{
-    public class SiemensToolTableAdapter : NcAdapter
-    {
-        public CmsError GetToolTableConfiguration(out ToolTableConfiguration config)
-        {
-            config = new ToolTableConfiguration();
-            CmsError cmsError = numericalControl.TOOLS_RConfiguration(ref config);
-            if (cmsError.IsError())
-                return cmsError;
-
-            // Set magazine assisted tooling from config
-            foreach (var magConfig in ToolManagerConfig.MagazineNames)
-            {
-                var mag = config.Magazines.FirstOrDefault(x => magConfig.MagazineId == x.Id);
-                if (mag != null)
-                    mag.AssistedToolingIsActive = magConfig.AssistedTooling;
-            }
-
-            config.RadiusMetricType = (ToolManagerConfig.ToolMetricType == RADIUS_METRIC);
-
-            config.SelfAdaptivePathOptionActive = true;
-            if (!ToolManagerConfig.SelfAdaptivePathOpt)
-                config.SelfAdaptivePathOptionActive = false;
-            
-            if (NcConfig.NcVendor != NC_VENDOR.SIEMENS && NcConfig.NcVendor != NC_VENDOR.DEMO)
-            {
-                // Setup options
-                config.FamilyOptionActive = true;
-                config.MultitoolOptionActive = true;
-                config.OffsetOptionActive = true;
-                config.LifeOption = true;
-                
-                // Add categories to be removed
-                List<string> categories = new List<string>();
-                if (!ToolManagerConfig.ShankOpt)
-                {
-                    config.MultitoolOptionActive = false;
-                    categories.Add("shankType");
-                    config.ToolsConfiguration = config.ToolsConfiguration.Where(x => !(x.Name == "shankId")).ToList();
-                }
-
-                if (!ToolManagerConfig.FamilyOpt)
-                {
-                    config.FamilyOptionActive = false;
-                    categories.Add("family");
-                    config.ToolsConfiguration = config.ToolsConfiguration.Where(x => !(x.Name == "familyId")).ToList();
-                    config.ToolsConfiguration = config.FamiliesConfiguration.FamilyConfiguration.Concat(config.ToolsConfiguration).ToList();
-                }
-
-                if (!ToolManagerConfig.OffsetOpt)
-                    config.OffsetOptionActive = false;
-
-                categories.Add("offset");
-
-                if (!ToolManagerConfig.TcpOpt)
-                    categories.Add("tcp");
-
-                if (!ToolManagerConfig.CoolingOpt)
-                    categories.Add("cooling");
-
-                if (!ToolManagerConfig.DynamicCompensationOpt)
-                    categories.Add("dynamicCompensation");
-
-                if (!ToolManagerConfig.GammaOpt)
-                    categories.Add("gamma");
-
-                if (!ToolManagerConfig.LifeOpt)
-                {
-                    categories.Add("life");
-                    config.LifeOption = false;
-                }
-
-                if (!ToolManagerConfig.MagPosTypeOpt)
-                    categories.Add("magPos");
-
-                if (!ToolManagerConfig.MultidimensionalShankOpt)
-                    categories.Add("shankOpt");
-
-                if (!ToolManagerConfig.SelfAdaptivePathOpt)
-                    categories.Add("selfAdaptive");
-
-                if (!ToolManagerConfig.BallufOpt)
-                    categories.Add("balluf");
-
-                if (!ToolManagerConfig.ReviveOpt)
-                    categories.Add("revive");
-
-                if (!ToolManagerConfig.IntegrityCheckOpt)
-                    categories.Add("integrityCheck");
-
-                // Remove category from configurations
-                config.ToolsConfiguration = config.ToolsConfiguration.Where(x => !categories.Contains(x.Category) && !categories.Contains(x.SubCategory)).ToList();
-
-                // Remove categories from familyConfig
-                config.FamiliesConfiguration.FamilyConfiguration = config.FamiliesConfiguration.FamilyConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
-                // Remove also SUBCATEGORIES because "ReadOnlyFamily" configuration has category field not populated
-                config.FamiliesConfiguration.FamilyReadOnlyConfiguration = config.FamiliesConfiguration.FamilyReadOnlyConfiguration.Where(x => !categories.Contains(x.SubCategory)).ToList();
-
-                config.ShanksConfiguration.ShankConfiguration = config.ShanksConfiguration.ShankConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
-                config.MagazinePosConfiguration = config.MagazinePosConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
-
-                // Update tool types list
-                config.FamiliesConfiguration.FamilyConfiguration.Where(x => x.Name == "toolType").FirstOrDefault().SelectValues = GetToolTypeList();
-            }
-            else if (NcConfig.NcVendor == NC_VENDOR.SIEMENS) // IF == SIEMENS
-            {
-                // Update Tool types list
-                config.ToolsConfiguration.Where(x => x.Name == "toolTypeCode").FirstOrDefault().SelectValues = GetToolTypeList();
-            }
-
-            return cmsError;
-        }
-
-        private Dictionary<int, string> GetToolTypeList()
-        {
-            return ToolManagerConfig
-                    .ToolTypes.Where(x => !x.Disabled)
-                    .ToDictionary(x => x.Id, x => x.Id.ToString());
-        }
-
-        public CmsError GetToolTableData(out List<SiemensToolModel> config)
-        {
-            config = new List<SiemensToolModel>();
-            return numericalControl.TOOLS_RToolsData(ref config);
-        }
-
-        public CmsError GetShanksData(out List<ShankModel> shanks)
-        {
-            shanks = new List<ShankModel>();
-            return numericalControl.TOOLS_RShanksData(ref shanks);
-        }
-
-        public CmsError GetFamiliesData(out List<FamilyModel> families)
-        {
-            families = new List<FamilyModel>();
-            return numericalControl.TOOLS_RFamilyData(ref families);
-        }
-
-        public CmsError GetMagazinesPositionsData(out List<PositionModel> magazinesPositions)
-        {
-            magazinesPositions = new List<PositionModel>();
-            return numericalControl.TOOLS_RMagazinePositions(ref magazinesPositions);
-        }
-
-        public CmsError GetMagazineStatus(out DTOMagazineActionModel magazineStatus)
-        {
-            // Set up models
-            magazineStatus = new DTOMagazineActionModel();
-            MagazineActionModel libModel = new MagazineActionModel();
-            // Read status from NC
-            CmsError cmsError = numericalControl.TOOLS_RMagazineAction(ref libModel);
-            if (cmsError.IsError())
-                return cmsError;
-
-            magazineStatus = (DTOMagazineActionModel)libModel;
-
-            return cmsError;
-        }
-
-        public CmsError AddTool(ref SiemensToolModel tool)
-        {
-            return numericalControl.TOOLS_WAddTool(ref tool);
-        }
-
-        public CmsError UpdateTool(ref SiemensToolModel tool)
-        {
-            return numericalControl.TOOLS_WUpdateTool(ref tool);
-        }
-
-        public CmsError AddFamily(string name, out FamilyModel family)
-        {
-            family = new FamilyModel()
-            {
-                Name = name
-            };
-
-            return numericalControl.TOOLS_WAddFamily(ref family);
-        }
-
-        public CmsError AddShank(ref ShankModel shank)
-        {
-            return numericalControl.TOOLS_WAddShank(ref shank);
-        }
-
-        public CmsError UpdateShank(ref ShankModel shank)
-        {
-            return numericalControl.TOOLS_WUpdateShank(ref shank);
-        }
-
-        public CmsError UpdateFamilyName(string oldName, string newName)
-        {
-            return numericalControl.TOOLS_WUpdateFamilyData(oldName, newName);
-        }
-
-        public CmsError UpdateMagazinePosition(PositionModel magazinePosition)
-        {
-            return numericalControl.TOOLS_WUpdatePosition(magazinePosition);
-        }
-
-        public CmsError DeleteTool(int id)
-        {
-            return numericalControl.TOOLS_WDeleteTool(id);
-        }
-
-        public CmsError DeleteShank(int id)
-        {
-            return numericalControl.TOOLS_WDeleteShank(id);
-        }
-
-        public CmsError DeleteFamily(string name)
-        {
-            return numericalControl.TOOLS_WDeleteFamily(name);
-        }
-
-        public CmsError AddEdge(int toolId, ref EdgeModel edge)
-        {
-            return numericalControl.TOOLS_WAddEdge(toolId, ref edge);
-        }
-
-        public CmsError UpdateEdge(int toolId, ref EdgeModel edge)
-        {
-            return numericalControl.TOOLS_WUpdateEdge(toolId, ref edge);
-        }
-
-        public CmsError DeleteEdge(int toolId, int edgeId)
-        {
-            return numericalControl.TOOLS_WDeleteEdge(toolId, edgeId);
-        }
-
-        public CmsError GetMagazinePositionsAndTools(int magazineId, out List<MountedToolModel> magazinePos)
-        {
-            magazinePos = new List<MountedToolModel>();
-            return numericalControl.TOOLS_RMountedTools(magazineId, ref magazinePos);
-        }
-
-        public CmsError GetNotInMagazinesTools(out List<ShankModel> multiTools, out List<SiemensToolModel> tools)
-        {
-            multiTools = new List<ShankModel>();
-            tools = new List<SiemensToolModel>();
-            return numericalControl.TOOLS_RAvailableTools(ref multiTools, ref tools);
-        }
-
-        public CmsError LoadToolInMagazine(int magazineId, NewToolInMagazineModel newMag, out MountedToolModel mounted)
-        {
-            mounted = new MountedToolModel();
-            return numericalControl.TOOLS_WLoadToolInMagazine(magazineId, newMag, ref mounted);
-        }
-
-        public CmsError UnloadToolInMagazine(int magazineId, int positionId)
-        {
-            return numericalControl.TOOLS_WUnloadToolFromMagazine(magazineId, positionId);
-        }
-
-        public CmsError LoadTooolIntoShank(int shankId, int positionId, int toolId)
-        {
-            return numericalControl.TOOLS_WLoadToolIntoShank(shankId, positionId, toolId);
-        }
-
-        public CmsError UnloadTooolFromShank(int shankId, int positionId)
-        {
-            return numericalControl.TOOLS_WUnloadToolFromShank(shankId, positionId);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active.NC/Thermo.Active.NC.csproj b/Thermo.Active.NC/Thermo.Active.NC.csproj
index 6403ab16..77bfb046 100644
--- a/Thermo.Active.NC/Thermo.Active.NC.csproj
+++ b/Thermo.Active.NC/Thermo.Active.NC.csproj
@@ -49,9 +49,7 @@
   <ItemGroup>
     <Compile Include="NcFileAdapter.cs" />
     <Compile Include="NcAdapter.cs" />
-    <Compile Include="NcToolTableAdapter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SiemensToolTableAdapter.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/Thermo.Active.Utils/supportFunctions.cs b/Thermo.Active.Utils/supportFunctions.cs
index bf12feed..f8762885 100644
--- a/Thermo.Active.Utils/supportFunctions.cs
+++ b/Thermo.Active.Utils/supportFunctions.cs
@@ -249,7 +249,6 @@ namespace Thermo.Active.Utils
                             {
                                 job.Metadata.Generics.Description = metasFromFile.Description;
                                 job.Metadata.Generics.ExecutionTime = metasFromFile.ExecutionTime;
-                                job.Metadata.Tools = metasFromFile.Tools;
                                 job.Metadata.Customs = metasFromFile.Customs;
                             }
                         }
@@ -349,7 +348,6 @@ namespace Thermo.Active.Utils
                     {
                         jobData.Metadata.Generics.Description = metasFromFile.Description;
                         jobData.Metadata.Generics.ExecutionTime = metasFromFile.ExecutionTime;
-                        jobData.Metadata.Tools = metasFromFile.Tools;
                         jobData.Metadata.Customs = metasFromFile.Customs;
                     }
                 }
diff --git a/Thermo.Active/Controllers/WebApi/ConfigurationController.cs b/Thermo.Active/Controllers/WebApi/ConfigurationController.cs
index 49e93f0c..b43b9117 100644
--- a/Thermo.Active/Controllers/WebApi/ConfigurationController.cs
+++ b/Thermo.Active/Controllers/WebApi/ConfigurationController.cs
@@ -24,7 +24,6 @@ namespace Thermo.Active.Controllers.WebApi
                 ScadaConfig = ScadaConfig,
                 MaintenanceConfig = MaintenanceConfig,
                 ReportConfig = ReportConfig,
-                ToolingConfig = ToolingConfig,
                 UtilitiesConfig = UtilitiesConfig,
                 JobEditorConfig = JobEditorConfig,
                 UsersConfig = UsersConfig
@@ -127,20 +126,6 @@ namespace Thermo.Active.Controllers.WebApi
             return Ok(alarmsConfig);
         }
 
-        [Route("tool_manager"), HttpGet]
-        public IHttpActionResult GetToolTableConfiguration()
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter()) 
-            {
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.GetToolTableConfiguration(out ToolTableConfiguration toolTableConfiguration);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(toolTableConfiguration);
-            }
-        }
-
         [Route("cmscontact"), HttpGet]
         public IHttpActionResult GetCmsContact()
         {
diff --git a/Thermo.Active/Controllers/WebApi/LanguageController.cs b/Thermo.Active/Controllers/WebApi/LanguageController.cs
index 9ff377aa..3cfebb08 100644
--- a/Thermo.Active/Controllers/WebApi/LanguageController.cs
+++ b/Thermo.Active/Controllers/WebApi/LanguageController.cs
@@ -54,20 +54,9 @@ namespace Thermo.Active.Controllers.WebApi
             Dictionary<string, string> alarmsNames = GetPlcAlarmsTranslations(language);
             Dictionary<string, string> headsNames = GetLocalizedHeadsNames(language);
             
-            Dictionary<string, string> magazinesNames = GetToolManagerTranslations(language);
 
             Dictionary<string, string> scadaTranslations = GetScadaTranslations(language);
 
-            // Cooling
-            if (NcConfig.NcVendor != NC_VENDOR.SIEMENS)
-            {
-                Dictionary<string, string> coolingNames = GetCoolingTranslations(language);
-                foreach (var coolingItem in coolingNames)
-                {
-                    translations[coolingItem.Key] = coolingItem.Value;
-                }
-            }
-
             // Concat maintenances dictionary with translations dictionary
             translations = translations.Concat(maintenanceNames).ToDictionary(x => x.Key, x => x.Value);
             // Softkeys
@@ -76,8 +65,6 @@ namespace Thermo.Active.Controllers.WebApi
             translations = translations.Concat(alarmsNames).ToDictionary(x => x.Key, x => x.Value);
             // Heads
             translations = translations.Concat(headsNames).ToDictionary(x => x.Key, x => x.Value);
-            // Magazines
-            translations = translations.Concat(magazinesNames).ToDictionary(x => x.Key, x => x.Value);
             // Scada
             translations = translations.Concat(scadaTranslations).ToDictionary(x => x.Key, x => x.Value);
 
@@ -173,86 +160,6 @@ namespace Thermo.Active.Controllers.WebApi
             }
         }
 
-        private static Dictionary<string, string> GetCoolingTranslations(string language)
-        {
-            Dictionary<string, string> dictionary = new Dictionary<string, string>();
-
-            // Find translated key
-            var key = ToolManagerConfig.CooligsTranslations.Cooling.Where(x => x.Key == language).FirstOrDefault();
-            if (key.Value != null)
-            {
-                // Add translated value \   
-                dictionary.Add("tooling_family_param_cooling", key.Value);
-                dictionary.Add("tooling_equipment_param_cooling", key.Value);
-            }
-            key = ToolManagerConfig.CooligsTranslations.Cooling1.Where(x => x.Key == language).FirstOrDefault();
-            if (key.Value != null)
-            {
-                dictionary.Add("tooling_family_param_cooling1", key.Value);
-                dictionary.Add("tooling_equipment_param_cooling1", key.Value);
-            }
-            key = ToolManagerConfig.CooligsTranslations.Cooling2.Where(x => x.Key == language).FirstOrDefault();
-            if (key.Value != null)
-            {
-                dictionary.Add("tooling_family_param_cooling2", key.Value);
-                dictionary.Add("tooling_equipment_param_cooling2", key.Value);
-            }
-            key = ToolManagerConfig.CooligsTranslations.Cooling3.Where(x => x.Key == language).FirstOrDefault();
-            if (key.Value != null)
-            {
-                dictionary.Add("tooling_family_param_cooling3", key.Value);
-                dictionary.Add("tooling_equipment_param_cooling3", key.Value);
-            }
-            key = ToolManagerConfig.CooligsTranslations.Cooling4.Where(x => x.Key == language).FirstOrDefault();
-            if (key.Value != null)
-            {
-                dictionary.Add("tooling_family_param_cooling4", key.Value);
-                dictionary.Add("tooling_equipment_param_cooling4", key.Value);
-            }
-            key = ToolManagerConfig.CooligsTranslations.Cooling5.Where(x => x.Key == language).FirstOrDefault();
-            if (key.Value != null)
-            {
-                dictionary.Add("tooling_family_param_cooling5", key.Value);
-                dictionary.Add("tooling_equipment_param_cooling5", key.Value);
-            }
-            key = ToolManagerConfig.CooligsTranslations.Cooling6.Where(x => x.Key == language).FirstOrDefault();
-            if (key.Value != null)
-            {
-                dictionary.Add("tooling_family_param_cooling6", key.Value);
-                dictionary.Add("tooling_equipment_param_cooling6", key.Value);
-            }
-            key = ToolManagerConfig.CooligsTranslations.Cooling7.Where(x => x.Key == language).FirstOrDefault();
-            if (key.Value != null)
-            {
-                dictionary.Add("tooling_family_param_cooling7", key.Value);
-                dictionary.Add("tooling_equipment_param_cooling7", key.Value);
-            }
-            return dictionary;
-        }
-
-        private static Dictionary<string, string> GetToolManagerTranslations(string language)
-        {
-            Dictionary<string, string> translatedNames = new Dictionary<string, string>();
-
-            foreach (var mag in ToolManagerConfig.MagazineNames)
-            {
-                translatedNames.Add(
-                    "magazine_name_" + mag.MagazineId,
-                    GetValueFromLocalizationList(mag.LocalizedNames, language, "Magazine_" + mag.MagazineId)
-                    );
-            }
-
-            foreach(var toolType in ToolManagerConfig.ToolTypes)
-            {
-                translatedNames.Add(
-                       "tooling_equipment_list_select_" + toolType.Id,
-                       GetValueFromLocalizationList(toolType.LocalizedNames, language, "Magazine_" + toolType.Id)
-                       );
-            }
-
-            return translatedNames;
-        }
-
         private static Dictionary<string, string> GetScadaTranslations(string language)
         {
             Dictionary<string, string> translatedNames = new Dictionary<string, string>();
diff --git a/Thermo.Active/Controllers/WebApi/NcToolManagerController.cs b/Thermo.Active/Controllers/WebApi/NcToolManagerController.cs
deleted file mode 100644
index 45e25a29..00000000
--- a/Thermo.Active/Controllers/WebApi/NcToolManagerController.cs
+++ /dev/null
@@ -1,1052 +0,0 @@
-using CMS_CORE_Library.Models;
-using Newtonsoft.Json;
-using Thermo.Active.Database.Controllers;
-using Thermo.Active.Model.DatabaseModels;
-using Thermo.Active.Model.DTOModels;
-using Thermo.Active.Model.DTOModels.ToolModels;
-using Thermo.Active.NC;
-using Thermo.Active.Utils;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web;
-using System.Web.Http;
-using static Thermo.Active.Config.ServerConfig;
-using static Thermo.Active.Listeners.SignalRStaticObjects;
-using static Thermo.Active.Model.Constants;
-
-namespace Thermo.Active.Controllers.WebApi
-{
-    [RoutePrefix("api/tool_manager/nc")]
-    public class NcToolManagerApiController : ApiController
-    {
-        #region Tools
-
-        [Route("tools"), HttpGet]
-        public IHttpActionResult GetNcToolTable()
-        {
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                CmsError cmsError = ncAdapter.GetToolsData(out List<DTONcToolModel> tools);
-                if (cmsError.IsError())
-                    return BadRequest(cmsError.localizationKey);
-
-                // Add family data to tools
-                using (NcToolManagerController toolsManager = new NcToolManagerController())
-                {
-                    // Get families
-                    List<DTONcFamilyModel> families = toolsManager.GetFamilies();
-
-                    List<DTONcToolWithFamilyModel> toolsWithFamilies = new List<DTONcToolWithFamilyModel>();
-                    // Create tool&family return objecs
-                    foreach (var tool in tools)
-                    {
-                        toolsWithFamilies.Add
-                            (
-                                CreateToolAndFamilyObj( // Create return model with family data & tool data
-                                    tool,
-                                    families.Where(x => x.Id == tool.FamilyId).FirstOrDefault() // Find matching family
-                                    )
-                            );
-                    }
-
-                    return Ok(toolsWithFamilies);
-                }
-            }
-        }
-        
-        [Route("tool/{toolId:int}/{familyId:int}"), HttpPost]
-        public IHttpActionResult AddToolWithId(short toolId, short familyId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if exists a tool with the same id
-                DbNcToolModel dbTool = toolsManager.FindTool(toolId);
-                if (dbTool != null)
-                    return BadRequest(API_ERROR_KEYS.ID_ALREADY_EXIST);
-
-                // Create default family
-                DTONcFamilyModel defaultFamily = new DTONcFamilyModel();
-                // Copy data from static obj preconfigured
-                SupportFunctions.CopyProperties(DTO_TOOL_WITH_FAM, defaultFamily);
-
-                // Overwrite the custom model id
-                defaultFamily.Id = familyId;
-
-                // Check if FAMILY option is active
-                if (ToolManagerConfig.FamilyOpt)
-                {
-                    // Check if id is already occupied
-                    DbNcFamilyModel dbFam = null;
-
-                    // Check Family id
-                    // 0 : Create new family
-                    // N : Set tool familyId with input id
-
-                    if (familyId == 0)
-                        // Add new family
-                        dbFam = toolsManager.AddFamily(defaultFamily);
-                    else
-                    {
-                        // check if family exist & set da
-                        dbFam = toolsManager.FindFamily(familyId);
-                        if (dbFam == null)
-                            return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-                    }
-
-                    // Set return value
-                    //DTO_TOOL_WITH_FAM.FamilyId = dbFam.FamilyId;
-                    //DTO_TOOL_WITH_FAM.Name = dbFam.Name;
-
-                    SupportFunctions.CopyProperties(dbFam, DTO_TOOL_WITH_FAM);
-                }
-                else
-                {
-                    defaultFamily.Id = toolId;
-                    // Add new family
-                    DbNcFamilyModel dbFam = toolsManager.AddFamily(defaultFamily);
-
-                    // Set return value
-                    DTO_TOOL_WITH_FAM.FamilyId = dbFam.FamilyId;
-                    DTO_TOOL_WITH_FAM.Name = dbFam.Name;
-                }
-
-                // Check if  option is active
-                if (!ToolManagerConfig.ShankOpt)
-                {
-                    // If option is not active create a shank
-                    DTONewNcShankModel newShank = new DTONewNcShankModel()
-                    {
-                        Balluf = 0,
-                        MagazinePositionType = 0
-                    };
-
-                    // Create a new shank
-                    DbNcShankModel ncShank = toolsManager.AddShank(newShank, toolId);
-                    // Connect tool to new shank
-                    DTO_TOOL_WITH_FAM.ShankId = ncShank.ShankId;
-                }
-                else
-                    DTO_TOOL_WITH_FAM.ShankId = null;
-            }
-
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                // Add tool
-                CmsError cmsError = ncAdapter.AddTool(DTO_TOOL_WITH_FAM, out DTONcToolModel newTool, toolId);
-                if (cmsError.IsError())
-                    return BadRequest(cmsError.localizationKey);
-
-                // if offset option is disabled set first offset id equal to toolId
-                if (!ToolManagerConfig.OffsetOpt)
-                {
-                    ncAdapter.UpdateToolOffsetId(newTool.Id, 1, newTool.Id, out DTONcToolModel toolWithOffset);
-                    newTool.OffsetId1 = newTool.Id;
-                    newTool.Offset1 = toolWithOffset.Offset1;
-                }
-
-                return Ok(CreateToolAndFamilyObj(newTool, DTO_TOOL_WITH_FAM));
-            }
-        }
-
-        [Route("tool/{toolId:int}"), HttpPut]
-        public IHttpActionResult PutTool(int toolId, [FromBody][Required]DTONewNcToolWithFamilyModel dtoToolWithFamily)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState); 
-
-            DbNcToolModel tool = null;
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if tool exists
-                tool = toolsManager.FindTool(toolId);
-                if (tool == null)
-                    return NotFound();
-
-                // Check if tool is mounted in spindle
-                if (ToolIsInSpindle(toolId))
-                    return BadRequest(API_ERROR_KEYS.TOOL_IS_MOUNTED);
-
-                if (tool.FamilyId != dtoToolWithFamily.FamilyId)
-                {
-                    // Check if family exists
-                    DbNcFamilyModel fam = toolsManager.FindFamily(dtoToolWithFamily.FamilyId);
-                    if (fam == null)
-                        return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-
-                    // Change return fam data
-                    if (ToolManagerConfig.FamilyOpt)
-                    {
-                        dtoToolWithFamily.Name = fam.Name;
-                    }
-                }
-
-                using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-                {
-                    ncAdapter.Connect();
-
-                    // Update
-                    CmsError cmsError = ncAdapter.UpdateTool(toolId, dtoToolWithFamily, out DTONcToolModel newTool, dtoToolWithFamily);
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    return Ok(CreateToolAndFamilyObj(newTool, dtoToolWithFamily));
-                }
-            }
-        }
-
-        [Route("tool/{toolId:int}"), HttpDelete]
-        public IHttpActionResult DeleteTool(int toolId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                DbNcToolModel tool = toolsManager.FindToolWithDependencies(toolId);
-                if (tool == null)
-                    return NotFound();
-
-                // Check if tool is mounted in magazine (a tool to be mounted in spindle must be in magazine)
-                if(tool.Shank != null && tool.Shank.MagazineId != null && tool.Shank.PositionId != null)
-                    return BadRequest(API_ERROR_KEYS.TOOL_IS_MOUNTED);
-
-                // Check if tool is mounted in spindle
-                //if (ToolIsInSpindle(toolId))
-                //    return BadRequest(API_ERROR_KEYS.TOOL_IS_MOUNTED);
-
-                using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-                {
-                    ncAdapter.Connect();
-
-                    CmsError cmsError;
-                    cmsError = ncAdapter.DeleteNcTool(tool);
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    return Ok();
-                }
-            }
-        }
-
-        #endregion Tools
-
-        #region Offsets
-
-        [Route("offset/{offsetId:int}"), HttpPut]
-        public IHttpActionResult UpdateOffset(short offsetId, OffsetModel offsetData)
-        {
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                CmsError cmsError = ncAdapter.UpdateOffset(offsetId, offsetData);
-                if (cmsError.IsError())
-                    return BadRequest(cmsError.localizationKey);
-
-                offsetData.Id = offsetId;
-
-                return Ok(offsetData); 
-            }
-        }
-
-        [Route("tool/{toolId:int}/position/{positionId:int}/offset/{offsetId:int}"), HttpPut]
-        public IHttpActionResult UpdateToolOffset(int toolId, int positionId, short offsetId)
-        {
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                CmsError cmsError = ncAdapter.UpdateToolOffsetId(toolId, positionId, offsetId, out DTONcToolModel tool);
-                if (cmsError.IsError())
-                    return BadRequest(cmsError.localizationKey);
-
-                return Ok(tool);
-            }
-        }
-
-        #endregion Offsets
-
-        #region Shanks
-
-        [Route("shanks"), HttpGet]
-        public IHttpActionResult GetShanks()
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                return Ok(toolsManager.GetShanks());
-            }
-        }
-
-        [Route("shank/{shankId:int}"), HttpPost]
-        public IHttpActionResult AddShank(short shankId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if exists a tool with the same id
-                DbNcShankModel dbShank = toolsManager.FindShank(shankId);
-                if (dbShank != null)
-                    return BadRequest(API_ERROR_KEYS.ID_ALREADY_EXIST);
-            }
-
-            if (!ToolManagerConfig.ShankOpt)
-                return BadRequest(API_ERROR_KEYS.OPTION_NOT_ACTIVE);
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                DTONewNcShankModel dtoShank = new DTONewNcShankModel()
-                {
-                    Balluf = 0,
-                    MagazinePositionType = 0
-                };
-                DTONcShankModel shank = (DTONcShankModel)toolsManager.AddShank(dtoShank, shankId);
-
-                return Ok(shank);
-            }
-        }
-
-        [Route("shank/{shankId:int}"), HttpPut]
-        public IHttpActionResult PutShank(int shankId, [FromBody][Required]DTONewNcShankModel dtoShank)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if shank exists
-                DbNcShankModel shank = toolsManager.FindShankWithTools(shankId);
-                if (shank == null)
-                    return NotFound();
-
-                // Check if tools are mounted in spindle
-                foreach (var tool in shank.Tools)
-                {
-                    if (ToolIsInSpindle(tool.ToolId))
-                        return BadRequest(API_ERROR_KEYS.TOOL_IS_MOUNTED);
-                }
-
-                using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-                {
-                    CmsError cmsError = ncAdapter.Connect();
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    // Update shank
-                    cmsError = ncAdapter.UpdateShank(shankId, dtoShank, out DTONcShankModel newShank);
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    return Ok(newShank);
-                }
-            }
-        }
-
-        [Route("shank/{shankId:int}"), HttpDelete]
-        public IHttpActionResult DeleteShank(int shankId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if shank exists
-                DbNcShankModel shank = toolsManager.FindShankWithTools(shankId);
-                if (shank == null)
-                    return NotFound();
-
-                // Check if tools are mounted in spindle
-                foreach (var tool in shank.Tools)
-                {
-                    if (ToolIsInSpindle(tool.ToolId))
-                        return BadRequest(API_ERROR_KEYS.TOOL_IS_MOUNTED);
-                }
-
-                using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-                {
-                    CmsError cmsError = ncAdapter.Connect();
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    cmsError = ncAdapter.DeleteNcShank(shank.ShankId);
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    return Ok();
-                }
-            }
-        }
-
-        #endregion Shanks
-
-        #region Families
-
-        [Route("families"), HttpGet]
-        public IHttpActionResult GetFamilies()
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                List<DTONcFamilyModel> families = toolsManager.GetFamilies();
-
-                return Ok(families);
-            }
-        }
-
-        [Route("family/{familyId:int}"), HttpPost]
-        public IHttpActionResult AddFamily(short familyId)
-        {
-            // Create default family
-            DTONcFamilyModel defaultFamily = new DTONcFamilyModel();
-            // Copy data from static obj configured
-            SupportFunctions.CopyProperties(DTO_TOOL_WITH_FAM, defaultFamily);
-            defaultFamily.Id = familyId;
-
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                DTONcFamilyModel newFamily = ncAdapter.AddFamily(defaultFamily);
-
-                return Ok(newFamily);
-            }
-        }
-
-        [Route("family/{familyId:int}"), HttpPut]
-        public IHttpActionResult PutFamily(int familyId, [FromBody][Required]DTONewNcFamilyModel dtoFamily)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if family exists
-                DbNcFamilyModel family = toolsManager.FindFamily(familyId);
-                if (family == null)
-                    return NotFound();
-
-                // Check if tools are mounted in spindle
-                foreach (var tool in family.Tools)
-                {
-                    if (ToolIsInSpindle(tool.ToolId))
-                        return BadRequest(API_ERROR_KEYS.TOOL_IS_MOUNTED);
-                }
-
-                using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-                {
-                    CmsError cmsError = ncAdapter.Connect();
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    // Update into db and NC
-                    cmsError = ncAdapter.UpdateFamily(familyId, dtoFamily, out DTONcFamilyModel newFamily);
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    return Ok(newFamily);
-                }
-            }
-        }
-
-        [Route("family/{familyId:int}"), HttpDelete]
-        public IHttpActionResult DeleteFamily(int familyId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Find if exists
-                DbNcFamilyModel family = toolsManager.FindFamily(familyId);
-                if (family == null)
-                    return NotFound();
-
-                // Check if tools are mounted in spindle
-                foreach (var tool in family.Tools)
-                {
-                    // 
-                    var t = toolsManager.FindToolWithDependencies(tool.ToolId);
-                    if(t.Shank != null && t.Shank.MagazineId != null && t.Shank.PositionId != null)
-                        return BadRequest(API_ERROR_KEYS.TOOL_IS_MOUNTED);
-
-                    //if (ToolIsInSpindle(tool.ToolId))
-                    //    return BadRequest(API_ERROR_KEYS.TOOL_IS_MOUNTED);
-                }
-
-                using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-                { 
-                    CmsError cmsError = ncAdapter.Connect();
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    //Delete
-                    cmsError = ncAdapter.DeleteNcFamily(familyId);
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    return Ok();
-                }
-            }
-        }
-
-        #endregion Families
-
-        #region Magazine positions
-
-        [Route("magazines_positions"), HttpGet]
-        public IHttpActionResult GetMagazinesPositions()
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                List<DbNcMagazinePositionModel> magazines = toolsManager.FindMagazinesPositions();
-
-                return Ok(magazines);
-            }
-        }
-
-        [Route("magazine/{magazineId:int}/positions"), HttpGet]
-        public IHttpActionResult GetMagazinesPositions(byte magazineId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                List<DTONcMagazinePositionModel> magazine = toolsManager.GetMagazinePositions(magazineId);
-
-                return Ok(magazine);
-            }
-        }
-
-        [Route("magazine/{magazineId}/position/{positionId}"), HttpPut]
-        public IHttpActionResult PutMagazinePosition([Required]byte magazineId, [Required]byte positionId, [FromBody]DTONcMagazinePositionModel dtoPos)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if magazine&position exists
-                DbNcMagazinePositionModel pos = toolsManager.FindMagazinePosition(magazineId, positionId);
-                if (pos == null)
-                    return NotFound();
-
-                using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-                {
-                    ncAdapter.Connect();
-                    CmsError cmsError = ncAdapter.UpdateMagazinePosition(pos, dtoPos, out DTONcMagazinePositionModel newPos);
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    return Ok(newPos);
-                }
-            }
-        }
-
-        #endregion Magazine positions
-
-
-        [Route("magazine/{magazineId:int}/mounted_shanks"), HttpGet]
-        public IHttpActionResult GetMagazineTools(byte magazineId)
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if magazine exists
-                List<DbNcMagazinePositionModel> pos = toolsManager.FindMagazinePositions(magazineId);
-                if (pos.Count <= 0)
-                    return NotFound();
-
-                List<DTONcShankModel> mountedShank = toolsManager.GetMountedShanks(magazineId);
-
-                return Ok(mountedShank);
-            }
-        }
-
-        [Route("magazine/available_shanks"), HttpGet]
-        public IHttpActionResult GetAvailableShanks()
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                List<DTONcShankModel> shanks = new List<DTONcShankModel>();
-
-                shanks = toolsManager.GetAvailableShanksWithChilds();
-
-                return Ok(shanks);
-            }
-        }
-
-        [Route("magazine/available_tools"), HttpGet]
-        public IHttpActionResult GetAvailableTools()
-        {
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                List<DTONcToolModel> tools = toolsManager.GetAvailableTools();
-
-                return Ok(tools);
-            }
-        }
-
-        [Route("magazine/{magazineId:int}/load/position/{positionId:int}"), HttpPut]
-        public IHttpActionResult LoadToolInToMagazine(byte magazineId, byte positionId, [FromBody][Required] DTONcUpdateMagazineModel shankId)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-            if (shankId.ShankId == 0)
-                return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-
-            DTONcShankModel dtoShank = new DTONcShankModel();
-
-            // Check data
-            DbNcShankModel shank;
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if shank exists
-                shank = toolsManager.FindShankWithTools(shankId.ShankId);
-                if (shank == null)
-                    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-
-                // Check if shank is already loaded somewhere
-                if (shank.MagazineId != null)
-                    return BadRequest(API_ERROR_KEYS.TOOL_IS_MOUNTED);
-
-                // Check if magazine position exists
-                DbNcMagazinePositionModel magPos = toolsManager.FindMagazinePosition(magazineId, positionId);
-                if (magPos == null)
-                    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-                // Check position type
-                //if (shank.Tools.FirstOrDefault().Family.ToolType != magPos.Type)
-                //    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-                
-                // Check if the mag pos is disabled
-                if (magPos.Disabled == true)
-                    return BadRequest(API_ERROR_KEYS.MAG_POS_DISABLED);
-                
-                using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-                {
-                    // Get Configuration
-                    ncAdapter.Connect();
-
-                    // Check if shank can fit
-                    CmsError cmsError = ncAdapter.CheckIfShankCanFit(
-                        magazineId,
-                        positionId,
-                        shank // mounted tools
-                        );
-
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-
-                    dtoShank = toolsManager.GetShank(shank.ShankId);
-                }
-
-                // Update shank data
-                DTONcMagazinePositionModel magazinePos = (DTONcMagazinePositionModel)toolsManager.LoadShankInMagazine(magazineId, positionId, shank);
-                // Set shankId
-                magazinePos.ShankId = shank.ShankId;
-
-                dtoShank.MagazineId = magazineId;
-                dtoShank.PositionId = positionId;
-
-                return Ok(dtoShank);
-            }
-        }
-
-        [Route("magazine/{magazineId:int}/unload/position/{positionId:int}"), HttpPut]
-        public IHttpActionResult UnloadToolInToMagazine(byte magazineId, byte positionId, [FromBody][Required] DTONcUpdateMagazineModel shankId)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-            if (shankId.ShankId == 0)
-                return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-
-            // Check data
-            DbNcShankModel shank;
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if shank exists
-                shank = toolsManager.FindShankWithTools(shankId.ShankId);
-                if (shank == null)
-                    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-
-                // Check if tools are mounted in spindle
-                foreach (var tool in shank.Tools)
-                {
-                    if (ToolIsInSpindle(tool.ToolId))
-                        return BadRequest(API_ERROR_KEYS.TOOL_IS_MOUNTED);
-                }
-
-                // Check if magazine position exists
-                DbNcMagazinePositionModel magPos = toolsManager.FindMagazinePosition(magazineId, positionId);
-                if (magPos == null)
-                    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-                //// Check if the mag pos is disabled
-                //if (magPos.Disabled == true)
-                //    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-
-                // Check if magazine position is not occupied
-                DbNcShankModel shankMounted = toolsManager.FindShanksByPositions(magazineId, positionId);
-                if (shankMounted == null)
-                    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-
-                DTONcMagazinePositionModel magazinePos = (DTONcMagazinePositionModel)toolsManager.UnloadShankInMagazine(magazineId, positionId, shank);
-
-                return Ok(magazinePos);
-            }
-        }
-
-        [Route("shank/{shankId:int}/load/tool/{toolId:int}"), HttpPut]
-        public IHttpActionResult LoadToolIntoShank(short shankId, int toolId)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            DbNcToolModel tool;
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Check if shank exists
-                DbNcShankModel shank = toolsManager.FindShankWithTools(shankId);
-                if (shank == null)
-                    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-
-                tool = toolsManager.FindTool(toolId);
-                if (tool == null)
-                    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-            }
-
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                DTONcShankModel shank = ncAdapter.LoadIntoShank(tool, shankId);
-
-                return Ok(shank);
-            }
-        }
-
-        [Route("shank/{shankId:int}/unload/tool/{toolId:int}"), HttpPut]
-        public IHttpActionResult UnloadToolIntoShank(int shankId, int toolId)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            DbNcToolModel tool;
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            { 
-                // Check if shank exists 
-                DbNcShankModel shank = toolsManager.FindShankWithTools(shankId);
-                if (shank == null)
-                    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-
-                tool = toolsManager.FindTool(toolId);
-                if (tool == null)
-                    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-            }
-
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                DTONcShankModel shank = ncAdapter.UnloadFromShank(tool);
-
-                return Ok(shank);
-            }
-        }
-
-        [Route("start_edit_tooling/{magazineId:int}"), HttpPut]
-        public IHttpActionResult StartEditTooling(int magazineId)
-        {
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                 
-                CmsError cmsError = ncAdapter.StartEditTooling(magazineId);
-                if (cmsError.IsError())
-                    return BadRequest(cmsError.localizationKey);
-
-                return Ok();
-            }
-        }
-
-        [Route("stop_edit_tooling/{magazineId:int}"), HttpPut]
-        public IHttpActionResult StopEditTooling(int magazineId)
-        {
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                Stopwatch st = new Stopwatch();
-                st.Restart();
-                CmsError cmsError = ncAdapter.StopEditTooling(magazineId);
-                Console.WriteLine("TOOL TABLE WRITE TIME " + st.ElapsedMilliseconds);
-                if (cmsError.IsError())
-                    return BadRequest(cmsError.localizationKey);
-
-                return Ok();
-            }
-        }
-
-        [Route("assisted_tooling/"), HttpPost]
-        public IHttpActionResult StartAssistedTooling(DTOAssistedToolingModel data)
-        {
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                using (NcToolManagerController toolsManager = new NcToolManagerController())
-                {
-                    var tool = toolsManager.FindTool(data.ToolId);
-                    if (tool == null)
-                        return BadRequest();
-
-                    CmsError cmsError = ncAdapter.StartAssistedToolingProcedure(data.ToolId, (ushort)tool.FamilyId, (ushort)tool.ShankId, data.MagazineId, data.PositionId, data.Action);
-                    if (cmsError.IsError())
-                        return BadRequest(cmsError.localizationKey);
-                }
-
-                return Ok();
-            }
-        }
-
-        [Route("export"), HttpPost]
-        public IHttpActionResult ExportToolTable()
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                DTOExportToolTableModel expData = toolsManager.GetExportData();
-
-                return Ok(expData);
-            }
-        }
-
-        [Route("import"), HttpPost]
-        public async Task<IHttpActionResult> ImportToolTable()
-        {
-            // Check whether the POST operation is MultiPart?
-            if (!Request.Content.IsMimeMultipartContent())
-                throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType);
-
-            var filesReadToProvider = await Request.Content.ReadAsMultipartAsync();
-
-            var stream = filesReadToProvider.Contents.FirstOrDefault();
-            if (stream == null)
-                return BadRequest();
-
-            var fileBytes = await stream.ReadAsByteArrayAsync();
-
-            // Convert bytes into json string
-            string jsonString = Encoding.UTF8.GetString(fileBytes);
-
-            bool val = IsValidJson(jsonString, out DTOExportToolTableModel importData);
-            if (!val)
-                return BadRequest(API_ERROR_KEYS.IMPORT_FILE_NOT_VALID);
-
-            if(importData.Families == null || importData.Shanks == null || importData.Tools == null)
-                return BadRequest(API_ERROR_KEYS.IMPORT_FILE_NOT_VALID);
-
-            using (NcToolManagerController toolsManager = new NcToolManagerController())
-            {
-                // Import data in the database
-                List <DTOImportStatusModel> importStatus = toolsManager.ImportData(importData);
-
-                return Ok(importStatus);
-            }
-        }
-
-        [Route("selfadaptivepathstep"), HttpGet]
-        public IHttpActionResult GetSelfAdaptivePathStep()
-        {
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                DTOSelfAdaptiveModel sam;
-
-                CmsError cmsError = ncAdapter.Connect();
-                if (cmsError.IsError())
-                    return BadRequest(cmsError.localizationKey);
-
-                cmsError = ncAdapter.GetSelfAdaptiveStep(out sam);
-                if (cmsError.IsError())
-                    return BadRequest(cmsError.localizationKey);
-
-                return Ok(sam);
-            }
-        }
-
-        [Route("selfadaptivepathstep"), HttpPut]
-        public IHttpActionResult SetSelfAdaptivePathStep([FromBody][Required]DTOSelfAdaptiveModel dtoSelfAdaptiveModel)
-        {
-            using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-            {
-                CmsError cmsError = ncAdapter.Connect();
-                if (cmsError.IsError())
-                    return BadRequest(cmsError.localizationKey);
-
-                cmsError = ncAdapter.SetSelfAdaptiveStep(dtoSelfAdaptiveModel);
-                if (cmsError.IsError())
-                    return BadRequest(cmsError.localizationKey);
-
-                return Ok();
-            }
-        }
-        #region Private Functions
-
-        private static DTONcToolWithFamilyModel DTO_TOOL_WITH_FAM = new DTONcToolWithFamilyModel()
-        {
-            Id = 0,
-            Name = DEFAULT_FAM_NAME,
-            OffsetId1 = null,
-            OffsetId2 = null,
-            OffsetId3 = null,
-            LeftSize = 1,
-            RightSize = 1
-        };
-
-        private bool IsValidJson(string jsonString, out DTOExportToolTableModel data)
-        {
-            data = new DTOExportToolTableModel();
-            if (string.IsNullOrWhiteSpace(jsonString))
-                return false;
-           
-            try
-            {
-                // Deserialize the string into DTO object
-                data = JsonConvert.DeserializeObject<DTOExportToolTableModel>(jsonString);
-                return true;
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-        }
-
-        private DTONcToolWithFamilyModel CreateToolAndFamilyObj(DTONcToolModel tool, DTONewNcToolWithFamilyModel familyData)
-        {
-            DTONcToolWithFamilyModel familyTool = new DTONcToolWithFamilyModel();
-            // Copy family fields
-            SupportFunctions.CopyProperties(familyData, familyTool);
-            // Copy tool fields
-            SupportFunctions.CopyProperties(tool, familyTool);
-
-            return familyTool;
-        }
-
-        private DTONcToolWithFamilyModel CreateToolAndFamilyObj(DTONcToolModel tool, DTONcToolWithFamilyModel familyData)
-        {
-            DTONcToolWithFamilyModel familyTool = new DTONcToolWithFamilyModel();
-            // Copy family fields
-            SupportFunctions.CopyProperties(familyData, familyTool);
-            // Copy tool fields
-            SupportFunctions.CopyProperties(tool, familyTool);
-
-            return familyTool;
-        }
-
-        private DTONcToolWithFamilyModel CreateToolAndFamilyObj(DTONcToolModel tool, DTONcFamilyModel familyData)
-        {
-            DTONcToolWithFamilyModel familyTool = new DTONcToolWithFamilyModel();
-            // Copy family fields
-            SupportFunctions.CopyProperties(familyData, familyTool);
-            // Copy tool fields
-            SupportFunctions.CopyProperties(tool, familyTool);
-
-            return familyTool;
-        }
-
-        private bool ToolIsInSpindle(int toolId)
-        {
-            foreach (var head in LastHeadsData.ToList())
-            {
-                if (head is DTOSpindleModel)
-                {
-                    var spindle = head as DTOSpindleModel;
-                    if (!spindle.FixedHead && spindle.MountedTool == toolId)
-                        return true;
-                }
-            }
-
-            return false;
-        }
-
-        #endregion
-    }
-
-    //[Route("tool_old"), HttpPost]
-    //public IHttpActionResult AddTool([FromBody][Required]DTONewNcToolWithFamilyModel dtoToolWithFamily)
-    //{
-    //    if (!ModelState.IsValid)
-    //        return BadRequest(ModelState);
-
-    //    short familyId = 0;
-    //    using (NcToolManagerController toolsManager = new NcToolManagerController())
-    //    {
-    //        // Check if option is active
-    //        if (ToolManagerConfig.FamilyOpt)
-    //        {
-    //            if (dtoToolWithFamily.FamilyId == 0)
-    //            {
-    //                // If param equal to 0 create a new family
-    //                DTONcFamilyModel newFamily = new DTONcFamilyModel() { Name = "NewFamily", LeftSize = 1, RightSize = 1 };
-    //                // Add new family & update family id
-    //                DbNcFamilyModel newFam = toolsManager.AddFamily(newFamily);
-    //                dtoToolWithFamily.FamilyId = newFam.FamilyId;
-    //                dtoToolWithFamily.Name = newFam.Name;
-    //            }
-    //            else
-    //            {
-    //                // Check if family exists
-    //                DbNcFamilyModel fam = toolsManager.FindFamily(dtoToolWithFamily.FamilyId);
-    //                if (fam == null)
-    //                    return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-
-    //                // Update return data
-    //                if (ToolManagerConfig.FamilyOpt)
-    //                {
-    //                    dtoToolWithFamily.Name = fam.Name;
-    //                }
-    //            }
-    //        }
-    //        else
-    //        {
-    //            // Copy only family data from tool&fam model
-    //            DTONcFamilyModel newFamily = new DTONcFamilyModel();
-    //            SupportFunctions.CopyProperties(dtoToolWithFamily, newFamily);
-
-    //            // Add new family
-    //            DbNcFamilyModel dbFam = toolsManager.AddFamily(newFamily);
-    //            if (dbFam == null)
-    //                return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
-    //            dtoToolWithFamily.FamilyId = dbFam.FamilyId;
-
-    //            // Set common id
-    //            familyId = dbFam.FamilyId;
-    //        }
-
-    //        // Check if  option is active
-    //        if (!ToolManagerConfig.ShankOpt)
-    //        {
-    //            // If option is not active create a shank
-    //            DTONewNcShankModel newShank = new DTONewNcShankModel()
-    //            {
-    //                Balluf = 0,
-    //                MagazinePositionType = 0
-    //            };
-
-    //            // Create a new shank
-    //            DbNcShankModel ncShank = toolsManager.AddShank(newShank, familyId);
-    //            // Connect tool to new shank
-    //            dtoToolWithFamily.ShankId = ncShank.ShankId;
-    //        }
-    //        else
-    //            dtoToolWithFamily.ShankId = null;
-    //    }
-
-    //    using (ncAdapter ncAdapter = new ncAdapter())
-    //    {
-    //        ncAdapter.Connect();
-
-    //        // Add tool
-    //        CmsError cmsError = ncAdapter.AddTool(dtoToolWithFamily, out DTONcToolModel newTool, familyId);
-    //        if (cmsError.IsError())
-    //            return BadRequest(cmsError.localizationKey);
-
-    //        return Ok(CreateToolAndFamilyObj(newTool, dtoToolWithFamily));
-    //    }
-    //}
-
-}
\ No newline at end of file
diff --git a/Thermo.Active/Controllers/WebApi/SiemensToolManagerController.cs b/Thermo.Active/Controllers/WebApi/SiemensToolManagerController.cs
deleted file mode 100644
index 68e49411..00000000
--- a/Thermo.Active/Controllers/WebApi/SiemensToolManagerController.cs
+++ /dev/null
@@ -1,449 +0,0 @@
-using CMS_CORE_Library.Models;
-using Thermo.Active.Model.DatabaseModels;
-using Thermo.Active.Model.DTOModels.ToolModels;
-using Thermo.Active.NC;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Web.Http;
-
-namespace Thermo.Active.Controllers.WebApi
-{
-    [RoutePrefix("api/tool_manager")]
-    public class SiemensToolManagerController : ApiController
-    {
-        [Route("tools"), HttpGet]
-        public IHttpActionResult GetToolTable()
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.GetToolTableData(out List<SiemensToolModel> tools);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(tools);
-            }
-        }
-
-        [Route("siemens/tool"), HttpPost]
-        public IHttpActionResult AddTool([FromBody][Required]DTOSiemensToolModel tool)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                // Convert from DTOModel to library model
-                SiemensToolModel siemensModel = (SiemensToolModel)tool; ;
-
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.AddTool(ref siemensModel);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(siemensModel);
-            }
-        }
-
-        [Route("siemens/tool/{id}"), HttpPut]
-        public IHttpActionResult UpdateTool(int id, [FromBody][Required]DTOSiemensToolModel tool)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                // Convert from DTOModel to library model
-                SiemensToolModel siemensModel = (SiemensToolModel)tool;
-                siemensModel.Id = id;
-
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.UpdateTool(ref siemensModel);
-
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(siemensModel);
-            }
-        }
-
-        [Route("tool/{id:int}"), HttpDelete]
-        public IHttpActionResult DeleteTool(int id)
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                // Call delete library function
-                CmsError libraryError = ncAdapter.DeleteTool(id);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok();
-            }
-        }
-
-        [Route("families"), HttpGet]
-        public IHttpActionResult GetFamilies()
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.GetFamiliesData(out List<FamilyModel> families);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(families);
-            }
-        }
-
-        [Route("family"), HttpPost]
-        public IHttpActionResult AddFamily([FromBody] DTOFamilyModel family)
-        {
-            if (String.IsNullOrEmpty(family.Name))
-                return BadRequest();
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.AddFamily(family.Name, out FamilyModel newFamily);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(newFamily);
-            }
-        }
-
-        [Route("family/{oldName}"), HttpPut]
-        public IHttpActionResult PutFamily(string oldName, [FromBody]DTOFamilyModel family)
-        {
-            if (string.IsNullOrEmpty(family.Name))
-                return BadRequest();
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                CmsError libraryError = ncAdapter.UpdateFamilyName(oldName, family.Name);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(family);
-            }
-        }
-
-        [Route("family/{name}"), HttpDelete]
-        public IHttpActionResult DeleteFamily(string name)
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                // Call delete library function
-                CmsError libraryError = ncAdapter.DeleteFamily(name);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok();
-            }
-        }
-
-        [Route("magazines_positions"), HttpGet]
-        public IHttpActionResult GetMagazinesPositions()
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.GetMagazinesPositionsData(out List<PositionModel> magazines);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(magazines);
-            }
-        }
-
-        [Route("magazine/{magazineId:int}/positions"), HttpGet]
-        public IHttpActionResult GetMagazinePositions(int magazineId)
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.GetMagazinesPositionsData(out List<PositionModel> magazines);
-                // Filter by magazine id
-                magazines = magazines.Where(x => x.MagazineId == magazineId).ToList();
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(magazines);
-            }
-        }
-
-        [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 (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                // Create Library model
-                PositionModel pos = new PositionModel()
-                {
-                    PositionId = positionId,
-                    MagazineId = magazineId,
-                    Disabled = magazinesPos.Disabled
-                };
-                // Update
-                CmsError libraryError = ncAdapter.UpdateMagazinePosition(pos);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok();
-            }
-        }
-
-        [Route("shanks"), HttpGet]
-        public IHttpActionResult GetShanks()
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.GetShanksData(out List<ShankModel> shanks);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(shanks);
-            }
-        }
-
-        [Route("shank"), HttpPost]
-        public IHttpActionResult AddShank([FromBody][Required] DTOShankModel dtoShank)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ShankModel shank = (ShankModel)dtoShank;
-
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.AddShank(ref shank);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(shank);
-            }
-        }
-
-        [Route("shank/{shankId:int}"), HttpPut]
-        public IHttpActionResult UpdateShank(int shankId, [FromBody][Required] DTOShankModel dtoShank)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ShankModel shank = (ShankModel)dtoShank;
-                shank.Id = shankId;
-
-                ncAdapter.Connect();
-                CmsError libraryError = ncAdapter.UpdateShank(ref shank);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(shank);
-            }
-        }
-
-        [Route("shank/{id:int}"), HttpDelete]
-        public IHttpActionResult DeleteShank(int id)
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                // Call delete library function
-                CmsError libraryError = ncAdapter.DeleteShank(id);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok();
-            }
-        }
-
-        [Route("tool/{toolId:int}/edge"), HttpPost]
-        public IHttpActionResult AddEdge(int toolId, [FromBody][Required]DTOEdgeModel dtoEdge)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (SiemensToolTableAdapter siemensHandler = new SiemensToolTableAdapter()) 
-            { 
-                siemensHandler.Connect();
-
-                EdgeModel edge = (EdgeModel)dtoEdge;
-                 
-                // Call library add methods
-                CmsError libraryError = siemensHandler.AddEdge(toolId, ref edge);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(edge);
-            }
-        }
-
-        [Route("tool/{toolId:int}/edge/{edgeId:int}"), HttpPut]
-        public IHttpActionResult UpdateEdge(int toolId, int edgeId, [FromBody][Required]DTOEdgeModel dtoEdge)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                EdgeModel edge = (EdgeModel)dtoEdge;
-                edge.Id = edgeId;
-
-                // Call library add methods
-                CmsError libraryError = ncAdapter.UpdateEdge(toolId, ref edge);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(edge);
-            }
-        }
-
-        [Route("tool/{toolId:int}/edge/{edgeId:int}"), HttpDelete]
-        public IHttpActionResult DeleteEdge(int toolId, int edgeId)
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                // Call delete library function
-                CmsError libraryError = ncAdapter.DeleteEdge(toolId, edgeId);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok();
-            }
-        }
-
-        [Route("magazine/{magazineId:int}/mounted_tools"), HttpGet]
-        public IHttpActionResult GetMagazineTools(int magazineId)
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                // Call delete library function
-                CmsError libraryError = ncAdapter.GetMagazinePositionsAndTools(magazineId, out List<MountedToolModel> magazinePos);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(magazinePos);
-            }
-        }
-
-        [Route("magazine/available_tools"), HttpGet]
-        public IHttpActionResult GetAvailableTools()
-        {
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-                // Call delete library function
-                CmsError libraryError = ncAdapter.GetNotInMagazinesTools(out List<ShankModel> multiTools, out List<SiemensToolModel> tools);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(new
-                {
-                    MultiTools = multiTools,
-                    Tools = tools
-                });
-            }
-        }
-
-        [Route("magazine/{magazineId:int}/load/position/{positionId:int}"), HttpPut]
-        public IHttpActionResult LoadToolInToMagazine(int magazineId, int positionId, [FromBody][Required] DTOSiemensUpdateMagazineModel toolId)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-            if (toolId.ToolId == 0)
-                return BadRequest("error_incorrect_parameters");
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                NewToolInMagazineModel libraryMag = new NewToolInMagazineModel { PositionId = positionId, ToolId = toolId.ToolId };
-                // Call delete library function
-                CmsError libraryError = ncAdapter.LoadToolInMagazine(magazineId, libraryMag, out MountedToolModel mounted);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(mounted);
-            }
-        }
-
-        [Route("magazine/{magazineId:int}/unload/position/{positionId:int}"), HttpPut]
-        public IHttpActionResult UnloadToolFromMagazine(int magazineId, int positionId)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                // Call delete library function
-                CmsError libraryError = ncAdapter.UnloadToolInMagazine(magazineId, positionId);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok(new
-                {
-                    magazineId,
-                    positionId,
-                    toolId = 0
-                });
-            }
-        }
-
-        [Route("shank/{shankId:int}/load/{positionId:int}/tool/{toolId:int}"), HttpPut]
-        public IHttpActionResult LoadToolIntoShank(int shankId, int positionId, int toolId)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                CmsError libraryError = ncAdapter.LoadTooolIntoShank(shankId, positionId, toolId);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok();
-            }
-        }
-
-        [Route("shank/{shankId:int}/unload/{positionId:int}"), HttpPut]
-        public IHttpActionResult UnloadToolFromShank(int shankId, int positionId)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            using (SiemensToolTableAdapter ncAdapter = new SiemensToolTableAdapter())
-            {
-                ncAdapter.Connect();
-
-                CmsError libraryError = ncAdapter.UnloadTooolFromShank(shankId, positionId);
-                if (libraryError.IsError())
-                    return BadRequest(libraryError.localizationKey);
-
-                return Ok();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Thermo.Active/Listeners/Database/SignalRDatabaseHandler.cs b/Thermo.Active/Listeners/Database/SignalRDatabaseHandler.cs
index 70e6dca6..98d4876b 100644
--- a/Thermo.Active/Listeners/Database/SignalRDatabaseHandler.cs
+++ b/Thermo.Active/Listeners/Database/SignalRDatabaseHandler.cs
@@ -2,7 +2,6 @@
 using Thermo.Active.Model.DatabaseModels;
 using Thermo.Active.Model.DTOModels;
 using Thermo.Active.Model.DTOModels.AlarmModels;
-using Thermo.Active.Model.DTOModels.ToolModels;
 using Thermo.Active.NC;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,71 +13,6 @@ namespace Thermo.Active.Listeners.Database
 {
     public static class SignalRDatabaseHandler
     {
-        public static void UpdateToolsData(object newData) 
-        {
-            using (NcToolManagerController controller = new NcToolManagerController())
-            {
-                // Convert input parameter
-                DTONewToolDataModel data = newData as DTONewToolDataModel;
-                if(data == null)
-                    return; 
-
-                List<DbNcToolModel> updatedTools = new List<DbNcToolModel>();
-                // Check if there are new data
-                if (data.UpdatedLives.Count != 0 || data.UpdatedStatus.Count != 0)
-                {
-                    List<DbNcToolModel> dbTools = controller.FindTools();
-                    if (dbTools.Count > 0)
-                    {
-                        // Loop through new data
-                        foreach (var live in data.UpdatedLives)
-                        {
-                            // Find tool and update residual life
-                            var tmp = dbTools
-                                    .Where(x => x.ToolId == live.Key) // Get tool by id
-                                    ?.Select(x =>
-                                    {
-                                        x.ResidualLife = (int)live.Value; // Update data
-                                        return x;
-                                    })
-                                    .FirstOrDefault();
-
-                            if (tmp != null)
-                                updatedTools.Add(tmp);   
-                        }
-
-                        foreach (var status in data.UpdatedStatus)
-                        {
-                            var tmp = dbTools
-                                       .Where(x => x.ToolId == status.Key) // Get tool by id
-                                       ?.Select(x =>
-                                       {
-                                           x.Status = UpdateStatus(x.Status, status.Value);
-                                           return x;
-                                       })
-                                       .FirstOrDefault();
-
-                            if (tmp != null)
-                                updatedTools.Add(tmp);
-                        }
-                    }
-
-                    // Update database
-                    controller.UpdateToolsData(updatedTools);
-
-                    using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter())
-                    {
-                        ncAdapter.Connect();
-                        // Update nc data
-                        ncAdapter.UpdateNcTools(controller);
-                    }
-
-                    // I need to update tool in spindle data
-                    // Clean the heads cache, so the heads thread will be sent to the next cycle
-                    LastHeadsData = new List<DTOHeadModel>();
-                }
-            }
-        }
 
         private static byte UpdateStatus(byte oldValue, byte newValue)
         {
@@ -234,62 +168,5 @@ namespace Thermo.Active.Listeners.Database
             }
         }
 
-        public static void ManageAssistedToolingProcedure(object assTool)
-        {
-            DTOAssistedToolingEndValueModel assToolingData = assTool as DTOAssistedToolingEndValueModel;
-            if (!LastToolingData.Equals(assToolingData))
-            {
-                LastToolingData = assToolingData;
-                if (assToolingData != null && assToolingData.IsActive)
-                {
-                    using (NcToolManagerController toolManager = new NcToolManagerController())
-                    {
-                        switch (assToolingData.Action)
-                        {
-                            case ASSISTED_TOOLING_ACTION.UNLOAD:
-                                {
-                                    // Find shank loaded in the position
-                                    var shank = toolManager.FindShanksByPositions(assToolingData.MagazineId, assToolingData.PositionId);
-                                    if (shank != null)
-                                    {
-                                        // Unload Tool from magazine
-                                        var pos = toolManager.UnloadShankInMagazine((byte)assToolingData.MagazineId, (byte)assToolingData.PositionId, shank);
-                                    } 
-                                }
-                                break;
-
-                            case ASSISTED_TOOLING_ACTION.EXCHANGE:
-                                {
-                                    // Find shank loaded in the position
-                                    var shankToUnload = toolManager.FindShanksByPositions(assToolingData.MagazineId, assToolingData.PositionId);
-                                    if (shankToUnload != null)
-                                    {
-                                        // Unload Tool from magazine
-                                        var pos = toolManager.UnloadShankInMagazine((byte)assToolingData.MagazineId, (byte)assToolingData.PositionId, shankToUnload);
-                                    }
-
-                                    // Find shank by toolId
-                                    var shankToLoad = toolManager.FindShankByToolId(assToolingData.ToolId);
-                                    if (shankToLoad != null)
-                                    {
-                                        // Load shank in magazine
-                                        var pos = toolManager.LoadShankInMagazine((byte)assToolingData.MagazineId, (byte)assToolingData.PositionId, shankToLoad);
-                                    }
-                                }
-                                break;
-                        }
-
-                        using (NcToolTableAdapter ncAdapter = new NcToolTableAdapter()) 
-                        {
-                            ncAdapter.Connect();
-                            // Close procedure
-                            ncAdapter.TerminateAssistedProcedure(assToolingData.MagazineId,
-                                assToolingData.Action != ASSISTED_TOOLING_ACTION.NONE
-                                );
-                        }
-                    }
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/Thermo.Active/Listeners/ListenersHandler.cs b/Thermo.Active/Listeners/ListenersHandler.cs
index 0b86959b..5a440f41 100644
--- a/Thermo.Active/Listeners/ListenersHandler.cs
+++ b/Thermo.Active/Listeners/ListenersHandler.cs
@@ -69,18 +69,10 @@ namespace Thermo.Active.Listeners
             {
                 SignalRListener.SendAxesToClient(a);
             }));
-            infos.Add(MessageServices.Current.Subscribe(SEND_MAGAZINES_STATUS, (a, b) =>
-            {
-                SignalRListener.SendMagazinesStatus(a);
-            }));
             infos.Add(MessageServices.Current.Subscribe(SEND_ACTIVE_PROGRAM_DATA, (a, b) =>
             {
                 SignalRListener.SendActiveProgramData(a);
             }));
-            infos.Add(MessageServices.Current.Subscribe(NC_MAGAZINE_IS_ACTIVE, (a, b) =>
-            {
-                SignalRListener.SendNcMagazineIsActive(a);
-            }));
 
             infos.Add(MessageServices.Current.Subscribe(SEND_QUEUE_DATA, (a, b) =>
             {
@@ -101,14 +93,7 @@ namespace Thermo.Active.Listeners
             }));            
 
             //////////////////////////// Database
-            infos.Add(MessageServices.Current.Subscribe(UPDATE_TOOLS_DATA, (a, b) =>
-            {
-                SignalRDatabaseHandler.UpdateToolsData(a);
-            }));
-            infos.Add(MessageServices.Current.Subscribe(ASSISTED_TOOLING_DATA, (a, b) =>
-            {
-                SignalRDatabaseHandler.ManageAssistedToolingProcedure(a);
-            }));
+            ///// erano tooling...
 
             // Broadcast
             infos.Add(MessageServices.Current.Subscribe(BROADCAST_DATA, (a, b) =>
diff --git a/Thermo.Active/Listeners/SignalR/SignalRListener.cs b/Thermo.Active/Listeners/SignalR/SignalRListener.cs
index 1c18362f..f98376b0 100644
--- a/Thermo.Active/Listeners/SignalR/SignalRListener.cs
+++ b/Thermo.Active/Listeners/SignalR/SignalRListener.cs
@@ -5,7 +5,6 @@ using Thermo.Active.Database.Controllers;
 using Thermo.Active.Model.DTOModels;
 using Thermo.Active.Model.DTOModels.AlarmModels;
 using Thermo.Active.Model.DTOModels.Scada;
-using Thermo.Active.Model.DTOModels.ToolModels;
 using Thermo.Active.Utils;
 using System;
 using System.Collections.Generic;
@@ -164,37 +163,6 @@ namespace Thermo.Active.Listeners.SignalR
             {
                 LastHeadsData = newData;
 
-                using(NcToolManagerController controller = new NcToolManagerController())
-                {
-                    foreach(var head in LastHeadsData)
-                    {
-                        // Check if head is a spindle
-                        if (head.Type == HEAD_TYPE.SPINDLE.ToString())
-                        {
-                            if (NcConfig.NcVendor.ToUpper() != NC_VENDOR.SIEMENS)
-                            {
-                                // Convert head into child model
-                                var spindle = (head as DTOSpindleModel);
-                                // Get tool data
-                                var tool = controller.FindToolWithDependencies(spindle.MountedTool);
-                                if (tool != null)
-                                    spindle.ToolData = new DTOToolInSpindleModel()
-                                    {
-                                        FamilyId = tool.FamilyId,
-                                        ShankId = tool.ShankId ?? 0,
-                                        Broken = ((DTONcToolModel)tool).Broken,
-                                        Disabled = ((DTONcToolModel)tool).Disabled,
-                                        Measured = ((DTONcToolModel)tool).Measured,
-                                        MaxLoad = tool.Family.MaxLoad,
-                                        MaxSpeed = tool.Family.MaxSpeed,
-                                        ResidualLife = tool.ResidualLife
-                                    };
-                            }
-                        }
-
-                    }
-                }
-
                 // Send data to clients
                 context.Clients.Group("ncData").headsData(heads);
             }
@@ -214,17 +182,6 @@ namespace Thermo.Active.Listeners.SignalR
             }
         }
 
-        public static void SendMagazinesStatus(object magazinesStatus)
-        {
-            var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
-            if (!LastMagazineStatus.Equals(magazinesStatus))
-            {
-                LastMagazineStatus = magazinesStatus as DTOMagazineActionModel;
-
-                context.Clients.Group("ncData").magazinesStatus(magazinesStatus);
-            }
-        }
-
         public static void SendActiveProgramData(object programData)
         {
             var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
@@ -343,8 +300,6 @@ namespace Thermo.Active.Listeners.SignalR
             context.Clients.Group("ncData").headsData(LastHeadsData);
             // Send axesNames data
             context.Clients.Group("ncData").axesNames(LastAxesNamesData);
-            // Send magazine status
-            context.Clients.Group("ncData").magazinesStatus(LastMagazineStatus);
             // Send positions
             context.Clients.Group("ncData").axesPositions(LastAxesPositions);
             // Send active program data
diff --git a/Thermo.Active/Listeners/SignalRStaticObjects.cs b/Thermo.Active/Listeners/SignalRStaticObjects.cs
index 7b6c1ab5..9edb263d 100644
--- a/Thermo.Active/Listeners/SignalRStaticObjects.cs
+++ b/Thermo.Active/Listeners/SignalRStaticObjects.cs
@@ -1,7 +1,6 @@
 using Thermo.Active.Model.DTOModels;
 using Thermo.Active.Model.DTOModels.AlarmModels;
 using Thermo.Active.Model.DTOModels.Scada;
-using Thermo.Active.Model.DTOModels.ToolModels;
 using System.Collections.Generic;
 
 namespace Thermo.Active.Listeners
@@ -20,14 +19,15 @@ namespace Thermo.Active.Listeners
         public static List<DTOHeadModel> LastHeadsData = new List<DTOHeadModel>();
         public static DTOAxesModel LastAxesPositions = new DTOAxesModel();
         public static List<DTOAxisNameModel> LastAxesNamesData = new List<DTOAxisNameModel>();
-        public static DTOMagazineActionModel LastMagazineStatus = new DTOMagazineActionModel();
         public static DTOActiveProgramDataModel LastProgramData = new DTOActiveProgramDataModel();
         public static Dictionary<int, bool> LastNcMagazineIsActive = new Dictionary<int, bool>();
         public static List<DTOQueueModel> LastPartProgramQueue = new List<DTOQueueModel>();
         public static List<DTOM155InputModel> LastM155Data = new List<DTOM155InputModel>();
-        public static List<DTOScadaModel> LastScadaData = new List<DTOScadaModel>();
-        public static DTOAssistedToolingEndValueModel LastToolingData = new DTOAssistedToolingEndValueModel(); 
+        public static List<DTOScadaModel> LastScadaData = new List<DTOScadaModel>(); 
 
         public static bool LastIsNcConnected = false;
+
+
+        // aggiugere oggetti nuovi e levare quelli che non servono +...
     }
 }
\ No newline at end of file
diff --git a/Thermo.Active/Thermo.Active.csproj b/Thermo.Active/Thermo.Active.csproj
index 58781720..202aa333 100644
--- a/Thermo.Active/Thermo.Active.csproj
+++ b/Thermo.Active/Thermo.Active.csproj
@@ -225,10 +225,8 @@
     <Compile Include="Controllers\WebApi\LanguageController.cs" />
     <Compile Include="Controllers\WebApi\ApiMaintenanceController.cs" />
     <Compile Include="Controllers\WebApi\NcFileController.cs" />
-    <Compile Include="Controllers\WebApi\NcToolManagerController.cs" />
     <Compile Include="Controllers\WebApi\ReportController.cs" />
     <Compile Include="Controllers\WebApi\ScadaController.cs" />
-    <Compile Include="Controllers\WebApi\SiemensToolManagerController.cs" />
     <Compile Include="Controllers\WebApi\UserController.cs" />
     <Compile Include="Controllers\WebApi\NcApiController.cs" />
     <Compile Include="Listeners\Database\SignalRDatabaseHandler.cs" />