From 85a387cc8657d1df65da79c2dd2fb0f7d07d85ca Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Thu, 7 May 2020 12:22:12 +0200
Subject: [PATCH] fix merge

---
 .../wwwroot/assets/styles/base/paddle.css     | 65 -------------------
 .../base-components/estrazione-principale.ts  |  8 ---
 .../base-components/estrazione-principale.vue | 15 +++--
 .../base-components/inputSottosquadra.vue     | 21 +++++-
 .../components/base-components/inputTermo.ts  | 26 +-------
 .../components/base-components/inputTermo.vue |  7 +-
 .../base-components/setupSottosquadra.vue     |  6 +-
 .../components/sottosquadra-stampo.vue        | 35 +++++-----
 .../opzioni/components/termoregolatori.vue    | 13 +---
 .../components/base-components/ventilatori.ts |  6 --
 .../base-components/ventilatori.vue           | 14 +++-
 .../components/show-raffreddamento-info.vue   |  2 +-
 .../base-components/vuoto-principale.vue      | 17 +++--
 13 files changed, 77 insertions(+), 158 deletions(-)
 delete mode 100644 Thermo.Active/wwwroot/assets/styles/base/paddle.css

diff --git a/Thermo.Active/wwwroot/assets/styles/base/paddle.css b/Thermo.Active/wwwroot/assets/styles/base/paddle.css
deleted file mode 100644
index ecc5a8e2..00000000
--- a/Thermo.Active/wwwroot/assets/styles/base/paddle.css
+++ /dev/null
@@ -1,65 +0,0 @@
-.hidden {
-  visibility: hidden;
-}
-button {
-  cursor: pointer;
-}
-/* remove blue outline */
-button:focus {
-  outline: 0;
-}
-.burger-button {
-  position: relative;
-  height: 30px;
-  width: 32px;
-  display: block;
-  z-index: 999;
-  border: 0;
-  border-radius: 0;
-  background-color: transparent;
-  pointer-events: all;
-  transition: transform 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
-}
-.burger-bar {
-  background-color: #130f40;
-  position: absolute;
-  top: 50%;
-  right: 6px;
-  left: 6px;
-  height: 2px;
-  width: auto;
-  margin-top: -1px;
-  transition: transform 0.6s cubic-bezier(0.165, 0.84, 0.44, 1), opacity 0.3s cubic-bezier(0.165, 0.84, 0.44, 1), background-color 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
-}
-.burger-bar--1 {
-  -webkit-transform: translateY(-6px);
-  transform: translateY(-6px);
-}
-.burger-bar--2 {
-  transform-origin: 100% 50%;
-  transform: scaleX(0.8);
-}
-.burger-button:hover .burger-bar--2 {
-  transform: scaleX(1);
-}
-.no-touchevents .burger-bar--2:hover {
-  transform: scaleX(1);
-}
-.burger-bar--3 {
-  transform: translateY(6px);
-}
-#burger.active .burger-button {
-  transform: rotate(-180deg);
-}
-#burger.active .burger-bar {
-  background-color: #fff;
-}
-#burger.active .burger-bar--1 {
-  transform: rotate(45deg);
-}
-#burger.active .burger-bar--2 {
-  opacity: 0;
-}
-#burger.active .burger-bar--3 {
-  transform: rotate(-45deg);
-}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts
index 49a756e9..7a3f942e 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts
@@ -10,11 +10,6 @@ scheda:Scheda,
 slider:Slider}})
 
 export default class EstrazionePrincipale extends Vue{
-recipe:Recipe.IRecipe={
-
-
-}
-
 
     recipe:Recipe.IRecipe={
         extraction_main_delay:{
@@ -58,9 +53,6 @@ recipe:Recipe.IRecipe={
         }
     };
 
-    @Prop({default:0})
-    ritardo:number;
 
-    mockR:number=this.ritardo;
 
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
index eafdf147..8735e2ed 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
@@ -6,7 +6,12 @@
                 <label>Ritardo</label>
 				<input class="rect" v-model="recipe.extraction_main_delay.valueAct">
             </div>
-            <slider :min="recipe.extraction_main_delay.range.min" :max="recipe.extraction_main_delay.range.max" v-model="recipe.extraction_main_delay.valueAct"  :unit-of-measure="recipe.extraction_main_delay.unitMeasure"></slider>
+            <slider 
+                :min="recipe.extraction_main_delay.range.min" 
+                :max="recipe.extraction_main_delay.range.max" 
+                v-model="recipe.extraction_main_delay.valueAct"  
+                :unit-of-measure="recipe.extraction_main_delay.unitMeasure">
+            </slider>
             <div class="input-area">
                 <label>Tipo</label>               
                 <select> 
@@ -19,12 +24,8 @@
         <hr>
         <div class="specific">
             <scheda
-                :portata="recipe.extraction_main_1_chart_setpointx.valueAct"
-                :durata="recipe.extraction_main_1_chart_setpointy.valueAct"
-                :min_portata="recipe.extraction_main_1_chart_setpointx.range.min"
-                :max_portata="recipe.extraction_main_1_chart_setpointx.range.max"
-                :min_durata="recipe.extraction_main_1_chart_setpointy.range.min"
-                :max_durata="recipe.extraction_main_1_chart_setpointy.range.max"
+                :portata="recipe.extraction_main_1_chart_setpointx"
+                :durata="recipe.extraction_main_1_chart_setpointy"
             ></scheda>
         </div>   
     </section>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue
index 0911825f..f8038f4c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue
@@ -11,17 +11,32 @@
 			<label>Quota</label>
 			<input class="rect" v-model="quota.valueAct">
 		</div>
-		<slider :min="quota.range.min" :max="quota.range.max" v-model="quota.valueAct" :unit-of-measure="unitMeasure"></slider>
+		<slider 
+			:min="quota.range.min" 
+			:max="quota.range.max" 
+			v-model="quota.valueAct" 
+			:unit-of-measure="quota.unitMeasure">
+		</slider>
 		<div class="input-area">
 			<label>Ritardo attivazione</label>
 			<input class="rect" v-model="ritardoAtt.valueAct">
 		</div>
-		<slider :min="ritardoAtt.range.min" :max="ritardoAtt.range.max" v-model="ritardoAtt.valueAct" :unit-of-measure="unitMeasure"></slider>
+		<slider 
+			:min="ritardoAtt.range.min" 
+			:max="ritardoAtt.range.max" 
+			v-model="ritardoAtt.valueAct" 
+			:unit-of-measure="ritardoAtt.unitMeasure">
+		</slider>
 		<div class="input-area">
 			<label>Ritardo disattivazione</label>
 			<input class="rect" v-model="ritardoDisatt.valueAct">
 		</div>
-		<slider :min="ritardoDisatt.range.min" :max="ritardoDisatt.range.max" v-model="ritardoDisatt.valueAct" :unit-of-measure="unitMeasure"></slider>
+		<slider 
+			:min="ritardoDisatt.range.min" 
+			:max="ritardoDisatt.range.max" 
+			v-model="ritardoDisatt.valueAct" 
+			:unit-of-measure="ritardoDisatt.unitMeasure">
+		</slider>
 	</div>
 </template>
 <script src="./inputSottosquadra.ts" />
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.ts
index cc44eef2..bb5cca30 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.ts
@@ -7,35 +7,11 @@ import ToggleButton from "@/components/toggleButton.vue";
 @Component({name:"input-termo", components:{slider:Slider, ToggleButton}})
 export default class inputTermo extends Vue{
     
-    @Prop()
-    value:number;
-    // @Prop({default:0})
-    // min:number;
-    // @Prop({default:0})
-    // max:number;
-    @Prop({default:""})
-    unitMeasure:string;
+
     @Prop({})
     abilitazione:Recipe.IValue;
     @Prop({})
     setpoint:Recipe.IValue;
-    // @Prop({default:false})
-    // visible_abilitazione: boolean;
-    // @Prop({default:false})
-    // enabled_abilitazione: boolean;
-    // @Prop({default:false})
-    // hasError_abilitazione: boolean;
-
-
-    // abilit:boolean=this.enabled_abilitazione;
-    // // mockSet:number=this.setpoint;
   
-    // get mockSet() {
-    //     return this.value;
-    // };
-
-    // set mockSet(v: number) {
-    //     this.$emit('input', v);
-    // };
 
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.vue
index 0d070230..43010022 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputTermo.vue
@@ -8,7 +8,12 @@
 			<label>Setpoint</label>
 			<input class="rect" v-model="setpoint.valueAct">
 		</div>
-		<slider :min="setpoint.range.min" :max="setpoint.range.max" v-model="setpoint.valueAct" :unit-of-measure="unitMeasure"></slider>
+		<slider 
+			:min="setpoint.range.min" 
+			:max="setpoint.range.max" 
+			v-model="setpoint.valueAct" 
+			:unit-of-measure="setpoint.unitMeasure">
+		</slider>
 	</div>
 </template>
 <script src="./inputTermo.ts" />
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue
index 4c1eac7e..a9eff3eb 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupSottosquadra.vue
@@ -3,9 +3,9 @@
 		<label>{{numSottoSq}}</label>
 		<label>{{status}}</label>
 		<label>{{modalita}}</label>
-		<label>{{quota}} mm</label>
-		<label>{{ritardoAtt}} s</label>
-		<label>{{ritardoDisatt}} s</label>
+		<label>{{quota.valueAct}} mm</label>
+		<label>{{ritardoAtt.valueAct}} s</label>
+		<label>{{ritardoDisatt.valueAct}} s</label>
 	</div>
 </template>
 <script src="./setupSottosquadra.ts" lang="ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue
index a3e81c01..231ba3e8 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue
@@ -6,9 +6,9 @@
 						:numSottoSq="1"
 						status="On"
 						modalita="Label modalità"
-						:quota="recipe.options_undercutupperplate_1_position.valueAct"
-						:ritardoAtt="recipe.options_undercutupperplate_1_delay_acti.valueAct"
-						:ritardoDisatt="recipe.options_undercutupperplate_1_delay_dis.valueAct"
+						:quota="recipe.options_undercutupperplate_1_position"
+						:ritardoAtt="recipe.options_undercutupperplate_1_delay_acti"
+						:ritardoDisatt="recipe.options_undercutupperplate_1_delay_dis"
 					></setup-sottosquadra>
 				</button>
 				<button :class="{'active':showSottosquadra == 'sottosquadra-2'}" @click="showSottosquadra='sottosquadra-2'" class="box-color">
@@ -16,9 +16,9 @@
 						:numSottoSq="2"
 						status="On"
 						modalita="Label modalità"
-						:quota="recipe.options_undercutupperplate_2_position.valueAct"
-						:ritardoAtt="recipe.options_undercutupperplate_2_delay_acti.valueAct"
-						:ritardoDisatt="recipe.options_undercutupperplate_2_delay_dis.valueAct"
+						:quota="recipe.options_undercutupperplate_2_position"
+						:ritardoAtt="recipe.options_undercutupperplate_2_delay_acti"
+						:ritardoDisatt="recipe.options_undercutupperplate_2_delay_dis"
 					></setup-sottosquadra>
 				</button>
 				<button :class="{'active':showSottosquadra == 'sottosquadra-3'}" @click="showSottosquadra='sottosquadra-3'">
@@ -26,9 +26,9 @@
 						:numSottoSq="3"
 						status="On"
 						modalita="Label modalità"
-						:quota="recipe.options_undercutupperplate_3_position.valueAct"
-						:ritardoAtt="recipe.options_undercutupperplate_3_delay_acti.valueAct"
-						:ritardoDisatt="recipe.options_undercutupperplate_3_delay_dis.valueAct"
+						:quota="recipe.options_undercutupperplate_3_position"
+						:ritardoAtt="recipe.options_undercutupperplate_3_delay_acti"
+						:ritardoDisatt="recipe.options_undercutupperplate_3_delay_dis"
 					></setup-sottosquadra>
 				</button>
 				<button :class="{'active':showSottosquadra == 'sottosquadra-4'}" @click="showSottosquadra='sottosquadra-4'" class="box-color">
@@ -36,9 +36,9 @@
 						:numSottoSq="4"
 						status="Off"
 						modalita="Label modalità"
-						:quota="recipe.options_undercutupperplate_4_position.valueAct"
-						:ritardoAtt="recipe.options_undercutupperplate_4_delay_acti.valueAct"
-						:ritardoDisatt="recipe.options_undercutupperplate_4_delay_dis.valueAct"
+						:quota="recipe.options_undercutupperplate_4_position"
+						:ritardoAtt="recipe.options_undercutupperplate_4_delay_acti"
+						:ritardoDisatt="recipe.options_undercutupperplate_4_delay_dis"
 					></setup-sottosquadra>
 				</button>
 				<button :class="{'active':showSottosquadra == 'sottosquadra-5'}" @click="showSottosquadra='sottosquadra-5'">
@@ -46,9 +46,9 @@
 						:numSottoSq="5"
 						status="Off"
 						modalita="Label modalità"
-						:quota="recipe.options_undercutupperplate_5_position.valueAct"
-						:ritardoAtt="recipe.options_undercutupperplate_5_delay_acti.valueAct"
-						:ritardoDisatt="recipe.options_undercutupperplate_5_delay_dis.valueAct"
+						:quota="recipe.options_undercutupperplate_5_position"
+						:ritardoAtt="recipe.options_undercutupperplate_5_delay_acti"
+						:ritardoDisatt="recipe.options_undercutupperplate_5_delay_dis"
 					></setup-sottosquadra>
 				</button>
 			</div>
@@ -61,7 +61,6 @@
 					:quota="recipe.options_undercutupperplate_1_position"
 					:ritardoAtt="recipe.options_undercutupperplate_1_delay_acti"
 					:ritardoDisatt="recipe.options_undercutupperplate_1_delay_dis"
-					:unitMeasure="recipe.options_undercutupperplate_1_position.unitMeasure"
 					>
 					</input-sottosquadra>
 				</div>
@@ -70,7 +69,6 @@
 					:quota="recipe.options_undercutupperplate_2_position"
 					:ritardoAtt="recipe.options_undercutupperplate_2_delay_acti"
 					:ritardoDisatt="recipe.options_undercutupperplate_2_delay_dis"
-					:unitMeasure="recipe.options_undercutupperplate_2_position.unitMeasure"
 					>
 					</input-sottosquadra>
 				</div>
@@ -79,7 +77,6 @@
 					:quota="recipe.options_undercutupperplate_3_position"
 					:ritardoAtt="recipe.options_undercutupperplate_3_delay_acti"
 					:ritardoDisatt="recipe.options_undercutupperplate_3_delay_dis"
-					:unitMeasure="recipe.options_undercutupperplate_3_position.unitMeasure"
 					>
 					</input-sottosquadra>
 				</div>
@@ -88,7 +85,6 @@
 					:quota="recipe.options_undercutupperplate_4_position"
 					:ritardoAtt="recipe.options_undercutupperplate_4_delay_acti"
 					:ritardoDisatt="recipe.options_undercutupperplate_4_delay_dis"
-					:unitMeasure="recipe.options_undercutupperplate_4_position.unitMeasure"
 					>
 					</input-sottosquadra>
 				</div>
@@ -97,7 +93,6 @@
 					:quota="recipe.options_undercutupperplate_5_position"
 					:ritardoAtt="recipe.options_undercutupperplate_5_delay_acti"
 					:ritardoDisatt="recipe.options_undercutupperplate_5_delay_dis"
-					:unitMeasure="recipe.options_undercutupperplate_5_position.unitMeasure"
 					>
 					</input-sottosquadra>
 				</div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue
index 7d158e54..21a0691a 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue
@@ -80,15 +80,12 @@
 					<input-termo
 					:setpoint="recipe.options_thermoregulator_1_setpoint"
 					:abilitazione="recipe.options_thermoregulator_1_enabled"
-					:unitMeasure="recipe.options_thermoregulator_1_setpoint.unitMeasure"
-					>
-					</input-termo>
+					></input-termo>
 				</div>
 				<div v-if="showTermo=='termo-2'">
 					<input-termo
 					:setpoint="recipe.options_thermoregulator_2_setpoint"
 					:abilitazione="recipe.options_thermoregulator_2_enabled"
-					:unitMeasure="recipe.options_thermoregulator_2_setpoint.unitMeasure"
 					>
 					</input-termo>
 				</div>
@@ -96,7 +93,6 @@
 					<input-termo
 					:setpoint="recipe.options_thermoregulator_3_setpoint"
 					:abilitazione="recipe.options_thermoregulator_3_enabled"
-					:unitMeasure="recipe.options_thermoregulator_3_setpoint.unitMeasure"
 					>
 					</input-termo>
 				</div>
@@ -104,7 +100,6 @@
 					<input-termo
 					:setpoint="recipe.options_thermoregulator_4_setpoint"
 					:abilitazione="recipe.options_thermoregulator_4_enabled"
-					:unitMeasure="recipe.options_thermoregulator_4_setpoint.unitMeasure"
 					>
 					</input-termo>
 				</div>
@@ -112,7 +107,6 @@
 					<input-termo
 					:setpoint="recipe.options_thermoregulator_5_setpoint"
 					:abilitazione="recipe.options_thermoregulator_5_enabled"
-					:unitMeasure="recipe.options_thermoregulator_5_setpoint.unitMeasure"
 					>
 					</input-termo>
 				</div>
@@ -120,7 +114,6 @@
 					<input-termo
 					:setpoint="recipe.options_thermoregulator_6_setpoint"
 					:abilitazione="recipe.options_thermoregulator_6_enabled"
-					:unitMeasure="recipe.options_thermoregulator_6_setpoint.unitMeasure"
 					>
 					</input-termo>
 				</div>
@@ -128,7 +121,6 @@
 					<input-termo
 					:setpoint="recipe.options_thermoregulator_7_setpoint"
 					:abilitazione="recipe.options_thermoregulator_7_enabled"
-					:unitMeasure="recipe.options_thermoregulator_7_setpoint.unitMeasure"
 					>
 					</input-termo>
 				</div>
@@ -136,7 +128,6 @@
 					<input-termo
 					:setpoint="recipe.options_thermoregulator_8_setpoint"
 					:abilitazione="recipe.options_thermoregulator_8_enabled"
-					:unitMeasure="recipe.options_thermoregulator_8_setpoint.unitMeasure"
 					>
 					</input-termo>
 				</div>
@@ -144,7 +135,6 @@
 					<input-termo
 					:setpoint="recipe.options_thermoregulator_9_setpoint"
 					:abilitazione="recipe.options_thermoregulator_9_enabled"
-					:unitMeasure="recipe.options_thermoregulator_9_setpoint.unitMeasure"
 					>
 					</input-termo>
 				</div>
@@ -152,7 +142,6 @@
 					<input-termo
 					:setpoint="recipe.options_thermoregulator_10_setpoint"
 					:abilitazione="recipe.options_thermoregulator_10_enabled"
-					:unitMeasure="recipe.options_thermoregulator_10_setpoint.unitMeasure"
 					>
 					</input-termo>
 				</div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts
index 82d425e3..0b45d876 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts
@@ -39,12 +39,6 @@ export default class Ventilatori extends Vue{
         }
     };
 
-    @Prop({default:0})
-    durata:number;
-    @Prop({default:0})
-    ritardo:number;
 
-    mockD:number=this.durata;
-    mockR:number=this.ritardo;
 
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue
index 56e8fb85..78095f9b 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue
@@ -12,12 +12,22 @@
             <label>Ritardo</label>    
 			<input class="rect" v-model="recipe.cooling_blowing_delay.valueAct">
         </div>
-        <slider :min="recipe.cooling_blowing_delay.range.min" :max="recipe.cooling_blowing_delay.range.max" v-model="recipe.cooling_blowing_delay.valueAct" :unit-of-measure="recipe.cooling_blowing_delay.unitMeasure"></slider>
+        <slider 
+            :min="recipe.cooling_blowing_delay.range.min" 
+            :max="recipe.cooling_blowing_delay.range.max" 
+            v-model="recipe.cooling_blowing_delay.valueAct" 
+            :unit-of-measure="recipe.cooling_blowing_delay.unitMeasure">
+        </slider>
          <div class="input-area">
             <label>Durata</label>
 			<input class="rect" v-model="recipe.cooling_blowing_time.valueAct">
         </div> 
-          <slider :min="recipe.cooling_blowing_time.range.min" :max="recipe.cooling_blowing_time.range.max" v-model="recipe.cooling_blowing_time.valueAct" :unit-of-measure="recipe.cooling_blowing_time.unitMeasure"></slider> 
+          <slider 
+            :min="recipe.cooling_blowing_time.range.min" 
+            :max="recipe.cooling_blowing_time.range.max" 
+            v-model="recipe.cooling_blowing_time.valueAct" 
+            :unit-of-measure="recipe.cooling_blowing_time.unitMeasure">
+        </slider> 
     </div>
 </section>
 </template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue
index 6dd8bf9b..e19c0a5b 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue
@@ -19,7 +19,7 @@
 						Conferma</button>	
 				</footer>
 		</modal>
-		<!-- <stepfooter></stepfooter> -->
+		<stepfooter></stepfooter>
 	</div>		
 </template>
 
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
index 034a30f1..71563151 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
@@ -15,7 +15,12 @@
                 <label>Ritardo</label>
                 <input class="rect" v-model="recipe.vacuum_main_delay.valueAct">
             </div>
-            <slider :min="recipe.vacuum_main_delay.range.min" :max="recipe.vacuum_main_delay.range.max" v-model="recipe.vacuum_main_delay.valueAct" :unit-of-measure="recipe.vacuum_main_delay.unitMeasure"></slider>
+            <slider 
+                :min="recipe.vacuum_main_delay.range.min" 
+                :max="recipe.vacuum_main_delay.range.max" 
+                v-model="recipe.vacuum_main_delay.valueAct" 
+                :unit-of-measure="recipe.vacuum_main_delay.unitMeasure">
+            </slider>
 
             <hr />
 
@@ -23,24 +28,26 @@
                 <label>Portata in manuale</label>
 			    <input class="rect" v-model="recipe.vacuum_main_manual.valueAct">
             </div>
-            <slider :min="recipe.vacuum_main_manual.range.min" :max="recipe.vacuum_main_manual.range.max" v-model="recipe.vacuum_main_manual.valueAct" :unit-of-measure="recipe.vacuum_main_manual.unitMeasure"></slider>
+            <slider 
+                :min="recipe.vacuum_main_manual.range.min" 
+                :max="recipe.vacuum_main_manual.range.max" 
+                v-model="recipe.vacuum_main_manual.valueAct" 
+                :unit-of-measure="recipe.vacuum_main_manual.unitMeasure">
+            </slider>
         </aside>
         <hr>
 		<div class="specific">
 			<scheda 
                 :portata="recipe.vacuum_main_1_chart_setpointx"
                 :durata="recipe.vacuum_main_1_chart_setpointy"
-                :unitMeasure="recipe.vacuum_main_1_chart_setpointx.unitMeasure"
             ></scheda>
 			<scheda
                 :portata="recipe.vacuum_main_2_chart_setpointx"
                 :durata="recipe.vacuum_main_2_chart_setpointy"
-                :unitMeasure="recipe.vacuum_main_2_chart_setpointx.unitMeasure"
             ></scheda>
 			<scheda
                 :portata="recipe.vacuum_main_3_chart_setpointx"
                 :durata="recipe.vacuum_main_3_chart_setpointy"
-                :unitMeasure="recipe.vacuum_main_3_chart_setpointx.unitMeasure"
             ></scheda>
 		</div>
         <div class="specific">