Merge branch 'develop' into feature/recipe

Conflicts:
	Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
	Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue

.gitignore

@@ -20,3 +20,4 @@ Output/
 *.ntvs*
 *.njsproj
 /ConsoleApp1
+/WindowsFormsApp1

.history/Thermo.Active/wwwroot/src/@types/recipe-current.d_20200503231334.ts

@@ -0,0 +1,57 @@
+declare module Recipe{
+
+    interface IRange{
+        min: number;
+        max: number;
+    }
+
+    interface IStatus{
+        visible: boolean;
+        enabled: boolean;
+        hasError: boolean;
+    }
+
+    interface IValue{
+        range:IRange,
+        status:IStatus,
+        unitMeasure:string,
+        valueAct: number
+    }
+
+        interface IRecipe{
+            vacuum_main_start?:IValue,
+            vacuum_main_delay?:IValue,
+            vacuum_main_max_time?:IValue,  
+            vacuum_main_1_chart_setpointx?:IValue,  
+            vacuum_main_1_chart_setpointy?:IValue,
+            vacuum_main_2_chart_setpointx?:IValue,
+            vacuum_main_2_chart_setpointy?:IValue,
+            vacuum_main_3_chart_setpointx?:IValue,  
+            vacuum_main_3_chart_setpointy?:IValue,
+            vacuum_main_manual?:IValue,
+            vacuum_direct_enabled?:IValue,
+            vacuum_direct_delay?:IValue,
+            vacuum_direct_time?:IValue,
+            vacuum_aux_enabled?:IValue,
+            vacuum_aux_delay?:IValue,
+            vacuum_aux_max_time?:IValue,
+            vacuum_aux_1_chart_setpointx?:IValue,  
+            vacuum_aux_1_chart_setpointy?:IValue,
+            vacuum_aux_2_chart_setpointx?:IValue, 
+            vacuum_aux_2_chart_setpointy?:IValue,
+            vacuum_aux_3_chart_setpointx?:IValue, 
+            vacuum_aux_3_chart_setpointy?:IValue,
+            vacuum_aux_manual?:IValue,
+            vacuum_pre_enabled?:IValue,
+            vacuum_pre_delay?:IValue,
+            vacuum_pre_max_time?:IValue,
+            vacuum_pre_1_chart_setpointx?:IValue,  
+            vacuum_pre_1_chart_setpointy?:IValue,
+            vacuum_pre_2_chart_setpointx?:IValue,   
+            vacuum_pre_2_chart_setpointy?:IValue,
+            vacuum_pre_3_chart_setpointx?:IValue,  
+            vacuum_pre_3_chart_setpointy?:IValue             
+        }
+
+
+}

.history/Thermo.Active/wwwroot/src/@types/recipe-current.d_20200504112349.ts

@@ -0,0 +1,57 @@
+declare module Recipe{
+
+    interface IRange{
+        min: number;
+        max: number;
+    }
+
+    interface IStatus{
+        visible: boolean;
+        enabled: boolean;
+        hasError: boolean;
+    }
+
+    interface IValue{
+        range:IRange,
+        status:IStatus,
+        unitMeasure:string,
+        valueAct: number
+    }
+
+        interface IRecipe{
+            vacuum_main_start?:IValue,
+            vacuum_main_delay?:IValue,
+            vacuum_main_max_time?:IValue,  
+            vacuum_main_1_chart_setpointx?:IValue,  
+            vacuum_main_1_chart_setpointy?:IValue,
+            vacuum_main_2_chart_setpointx?:IValue,
+            vacuum_main_2_chart_setpointy?:IValue,
+            vacuum_main_3_chart_setpointx?:IValue,  
+            vacuum_main_3_chart_setpointy?:IValue,
+            vacuum_main_manual?:IValue,
+            vacuum_direct_enabled?:IValue, 
+            vacuum_direct_delay?:IValue,
+            vacuum_direct_time?:IValue,
+            vacuum_aux_enabled?:IValue,
+            vacuum_aux_delay?:IValue,
+            vacuum_aux_max_time?:IValue,
+            vacuum_aux_1_chart_setpointx?:IValue,  
+            vacuum_aux_1_chart_setpointy?:IValue,
+            vacuum_aux_2_chart_setpointx?:IValue, 
+            vacuum_aux_2_chart_setpointy?:IValue,
+            vacuum_aux_3_chart_setpointx?:IValue, 
+            vacuum_aux_3_chart_setpointy?:IValue,
+            vacuum_aux_manual?:IValue,
+            vacuum_pre_enabled?:IValue,
+            vacuum_pre_delay?:IValue,
+            vacuum_pre_max_time?:IValue,
+            vacuum_pre_1_chart_setpointx?:IValue,  
+            vacuum_pre_1_chart_setpointy?:IValue,
+            vacuum_pre_2_chart_setpointx?:IValue,   
+            vacuum_pre_2_chart_setpointy?:IValue,
+            vacuum_pre_3_chart_setpointx?:IValue,  
+            vacuum_pre_3_chart_setpointy?:IValue             
+        }
+
+
+}

.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504095105.ts

@@ -0,0 +1,48 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+import Slider from "@/app_modules_thermo/components/slider.vue"
+import Scheda from "@/app_modules_thermo/components/scheda.vue"
+
+@Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}})
+export default class VuotoPrincipale extends Vue{
+
+    Recipe:Recipe.IRecipe={
+        vacuum_main_delay:{
+            range:{
+                min:8,
+                max:105
+            },
+            status:{
+                visible:true,
+                enabled:true,
+                hasError:false
+            },
+            unitMeasure:"",
+            valueAct:57
+        },
+        vacuum_main_max_time:{
+            range:{
+                min:9,
+                max:127
+            },
+            status:{
+                visible:true,
+                enabled:true,
+                hasError:false
+            },
+            unitMeasure:"",
+            valueAct:30
+        },
+    };
+
+    @Prop({default:0})
+    ritardo:number;
+
+    @Prop({default:0})
+    percentuale:number;
+
+    @Prop({default:0})
+    durata:number;
+
+}

.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504101519.vue

@@ -0,0 +1,50 @@
+<template>
+    <section>
+        <aside class="scrollable auto">
+    		<div class="input-area">
+				<label>Partenza</label>
+				<select>
+					<option value="Label partenza">Label partenza</option>
+				</select>
+			</div>
+
+            <hr />
+            
+            <div class="input-area">
+                <img src="assets/icons/png/clessidra.png" />
+                <label>Ritardo</label>
+                <div class="rect">
+                    {{ritardo}} s
+                </div>
+            </div>
+            <slider :min="0" :max="10" v-model="ritardo" unit-of-measure="s"></slider>
+
+            <hr />
+
+            <div class="input-area">
+                <label>Portata in manuale</label>
+                <div class="rect">
+                    {{Recipe.vacuum_main_delay.valueAct}} %
+                </div>
+            </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>
+        </aside>
+        <hr>
+		<div class="specific">
+			<scheda></scheda>
+			<scheda></scheda>
+			<scheda></scheda>
+		</div>
+        <div class="specific">
+            <div class="input-area">
+				<label>Durata massima</label>
+				<div class="rect">
+                    {{Recipe.vacuum_main_max_time.valueAct}} s
+                </div>
+			</div>
+		    <slider :min="Recipe.vacuum_main_max_time.range.min" :max="Recipe.vacuum_main_max_time.range.max" v-model="Recipe.vacuum_main_max_time.valueAct" :unit-of-measure="Recipe.vacuum_main_max_time.unitMeasure"></slider>
+        </div>
+    </section>
+</template>
+
+<script lang="ts" src="./vuoto-principale.ts"></script>

.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.ts

@@ -0,0 +1,50 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+import Slider from "@/app_modules_thermo/components/slider.vue"
+import Scheda from "@/app_modules_thermo/components/scheda.vue"
+
+@Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}})
+export default class VuotoPrincipale extends Vue{
+
+    Recipe:Recipe.IRecipe={
+        vacuum_main_delay:{
+            range:{
+                min:8,
+                max:105
+            },
+            status:{
+                visible:true,
+                enabled:true,
+                hasError:false
+            },
+            unitMeasure:"",
+            valueAct:57
+        },
+        vacuum_main_max_time:{
+            range:{
+                min:9,
+                max:127
+            },
+            status:{
+                visible:true,
+                enabled:true,
+                hasError:false
+            },
+            unitMeasure:"",
+            valueAct:30
+        },
+    };
+
+    @Prop({default:0})
+    ritardo:number;
+    @Prop({default:0})
+    percentuale:number;
+    @Prop({default:0})
+    durata:number;
+
+    mock_ritardo:number=this.ritardo;
+    mock_percentuale:number=this.percentuale;
+    mock_durata:number=this.durata;
+
+}

.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.vue

@@ -0,0 +1,44 @@
+<template>
+    <section>
+        <aside class="scrollable auto">
+    		<div class="input-area">
+				<label>Partenza</label>
+				<select>
+					<option value="Label partenza">Label partenza</option>
+				</select>
+			</div>
+
+            <hr />
+            
+            <div class="input-area">
+                <img src="assets/icons/png/clessidra.png" />
+                <label>Ritardo</label>
+                <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>
+
+            <hr />
+
+            <div class="input-area">
+                <label>Portata in manuale</label>
+			    <input class="rect" v-model="mock_percentuale">
+            </div>
+            <slider :min="0" :max="100" v-model="mock_percentuale" :unit-of-measure="'%'"></slider>
+        </aside>
+        <hr>
+		<div class="specific">
+			<scheda></scheda>
+			<scheda></scheda>
+			<scheda></scheda>
+		</div>
+        <div class="specific">
+            <div class="input-area">
+				<label>Durata massima</label>
+				<input class="rect" v-model="Recipe.vacuum_main_max_time.valueAct">
+			</div>
+		    <slider :min="Recipe.vacuum_main_max_time.range.min" :max="Recipe.vacuum_main_max_time.range.max" v-model="Recipe.vacuum_main_max_time.valueAct" :unit-of-measure="Recipe.vacuum_main_max_time.unitMeasure"></slider>
+        </div>
+    </section>
+</template>
+
+<script lang="ts" src="./vuoto-principale.ts"></script>

.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.ts

@@ -0,0 +1,63 @@
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import {Prop} from 'vue-property-decorator';
+import Slider from "@/app_modules_thermo/components/slider.vue"
+import Scheda from "@/app_modules_thermo/components/scheda.vue"
+
+@Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}})
+export default class VuotoPrincipale extends Vue{
+
+    Recipe:Recipe.IRecipe={
+        vacuum_main_delay:{
+            range:{
+                min:8,
+                max:105
+            },
+            status:{
+                visible:true,
+                enabled:true,
+                hasError:false
+            },
+            unitMeasure:"",
+            valueAct:57
+        },
+        vacuum_main_max_time:{
+            range:{
+                min:9,
+                max:127
+            },
+            status:{
+                visible:true,
+                enabled:true,
+                hasError:false
+            },
+            unitMeasure:"",
+            valueAct:30
+        },
+        vacuum_main_manual:{
+            range:{
+                min:4,
+                max:115
+            },
+            status:{
+                visible:true,
+                enabled:true,
+                hasError:false
+            },
+            unitMeasure:"",
+            valueAct:8
+        },
+    };
+
+    @Prop({default:0})
+    ritardo:number;
+    @Prop({default:0})
+    percentuale:number;
+    @Prop({default:0})
+    durata:number;
+
+    mock_ritardo:number=this.ritardo;
+    mock_percentuale:number=this.percentuale;
+    mock_durata:number=this.durata;
+
+}

.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.vue

@@ -0,0 +1,44 @@
+<template>
+    <section>
+        <aside class="scrollable auto">
+    		<div class="input-area">
+				<label>Partenza</label>
+				<select>
+					<option value="Label partenza">Label partenza</option>
+				</select>
+			</div>
+
+            <hr />
+            
+            <div class="input-area">
+                <img src="assets/icons/png/clessidra.png" />
+                <label>Ritardo</label>
+                <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>
+
+            <hr />
+
+            <div class="input-area">
+                <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>
+        </aside>
+        <hr>
+		<div class="specific">
+			<scheda></scheda>
+			<scheda></scheda>
+			<scheda></scheda>
+		</div>
+        <div class="specific">
+            <div class="input-area">
+				<label>Durata massima</label>
+				<input class="rect" v-model="Recipe.vacuum_main_max_time.valueAct">
+			</div>
+		    <slider :min="Recipe.vacuum_main_max_time.range.min" :max="Recipe.vacuum_main_max_time.range.max" v-model="Recipe.vacuum_main_max_time.valueAct" :unit-of-measure="Recipe.vacuum_main_max_time.unitMeasure"></slider>
+        </div>
+    </section>
+</template>
+
+<script lang="ts" src="./vuoto-principale.ts"></script>