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 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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 10/10] 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;