diff --git a/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts
index c3591087..b060daf4 100644
--- a/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts
+++ b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts
@@ -178,25 +178,25 @@ declare module Recipe{
options_undercutupperplate_10_delay_acti?:IValue,
options_undercutupperplate_10_delay_dis?:IValue,
- options_thermoregulator_1_enabled?:IStatus,
+ options_thermoregulator_1_enabled?:IValue,
options_thermoregulator_1_setpoint?:IValue,
- options_thermoregulator_2_enabled?:IStatus,
+ options_thermoregulator_2_enabled?:IValue,
options_thermoregulator_2_setpoint?:IValue,
- options_thermoregulator_3_enabled?:IStatus,
+ options_thermoregulator_3_enabled?:IValue,
options_thermoregulator_3_setpoint?:IValue,
- options_thermoregulator_4_enabled?:IStatus,
+ options_thermoregulator_4_enabled?:IValue,
options_thermoregulator_4_setpoint?:IValue,
- options_thermoregulator_5_enabled?:IStatus,
+ options_thermoregulator_5_enabled?:IValue,
options_thermoregulator_5_setpoint?:IValue,
- options_thermoregulator_6_enabled?:IStatus,
+ options_thermoregulator_6_enabled?:IValue,
options_thermoregulator_6_setpoint?:IValue,
- options_thermoregulator_7_enabled?:IStatus,
+ options_thermoregulator_7_enabled?:IValue,
options_thermoregulator_7_setpoint?:IValue,
- options_thermoregulator_8_enabled?:IStatus,
+ options_thermoregulator_8_enabled?:IValue,
options_thermoregulator_8_setpoint?:IValue,
- options_thermoregulator_9_enabled?:IStatus,
+ options_thermoregulator_9_enabled?:IValue,
options_thermoregulator_9_setpoint?:IValue,
- options_thermoregulator_10_enabled?:IStatus,
+ options_thermoregulator_10_enabled?:IValue,
options_thermoregulator_10_setpoint?:IValue,
}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts
index 59a89181..35719c0e 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts
@@ -18,10 +18,12 @@ export default class ShowEstrazioneInfo extends Vue{
annulla(){
ModalHelper.HideModal();
+ messageService.publishToChannel('show-vuoto-info');
};
conferma(){
ModalHelper.HideModal();
+ messageService.publishToChannel('show-opzioni-info');
};
async beforeMount() {
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 1fae4ba0..cc44eef2 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
@@ -9,28 +9,33 @@ export default class inputTermo extends Vue{
@Prop()
value:number;
- @Prop({default:0})
- min:number;
- @Prop({default:0})
- max:number;
+ // @Prop({default:0})
+ // min:number;
+ // @Prop({default:0})
+ // max:number;
@Prop({default:""})
unitMeasure:string;
- @Prop({default:false})
- visible_abilitazione: boolean;
- @Prop({default:false})
- enabled_abilitazione: boolean;
- @Prop({default:false})
- hasError_abilitazione: boolean;
+ @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;
+
+ // abilit:boolean=this.enabled_abilitazione;
+ // // mockSet:number=this.setpoint;
- get mockSet() {
- return this.value;
- };
+ // get mockSet() {
+ // return this.value;
+ // };
- set mockSet(v: number) {
- this.$emit('input', v);
- };
+ // 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 c62939cf..0d070230 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
@@ -2,13 +2,13 @@
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts
index 5e21aac7..aff147ed 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts
@@ -8,9 +8,9 @@ export default class setupTermo extends Vue {
@Prop({default:""})
numTermo: string;
- @Prop({default:false})
- status: boolean;
+ @Prop()
+ status: Recipe.IValue;
- @Prop({default:0})
- setpoint: number;
+ @Prop()
+ setpoint: Recipe.IValue;
}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue
index 84d5281a..e826a19c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue
@@ -1,8 +1,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts
index 495aa7bf..34d31368 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts
@@ -15,9 +15,17 @@ export default class Termoragolatori extends Vue {
recipe:Recipe.IRecipe={
options_thermoregulator_1_enabled:{
- visible:true,
- enabled:true,
- hasError:false
+ range:{
+ min:5,
+ max:171
+ },
+ status:{
+ visible:true,
+ enabled:true,
+ hasError:false
+ },
+ unitMeasure:"",
+ valueAct:132
},
options_thermoregulator_1_setpoint:{
range:{
@@ -34,9 +42,17 @@ export default class Termoragolatori extends Vue {
},
options_thermoregulator_2_enabled:{
- visible:true,
- enabled:true,
- hasError:false
+ range:{
+ min:8,
+ max:107
+ },
+ status:{
+ visible:true,
+ enabled:true,
+ hasError:false
+ },
+ unitMeasure:"",
+ valueAct:53
},
options_thermoregulator_2_setpoint:{
range:{
@@ -53,9 +69,17 @@ export default class Termoragolatori extends Vue {
},
options_thermoregulator_3_enabled:{
- visible:true,
- enabled:true,
- hasError:false
+ range:{
+ min:7,
+ max:112
+ },
+ status:{
+ visible:true,
+ enabled:true,
+ hasError:false
+ },
+ unitMeasure:"",
+ valueAct:30
},
options_thermoregulator_3_setpoint:{
range:{
@@ -72,9 +96,17 @@ export default class Termoragolatori extends Vue {
},
options_thermoregulator_4_enabled:{
- visible:true,
- enabled:true,
- hasError:false
+ range:{
+ min:1,
+ max:166
+ },
+ status:{
+ visible:true,
+ enabled:true,
+ hasError:false
+ },
+ unitMeasure:"",
+ valueAct:148
},
options_thermoregulator_4_setpoint:{
range:{
@@ -91,9 +123,17 @@ export default class Termoragolatori extends Vue {
},
options_thermoregulator_5_enabled:{
- visible:true,
- enabled:true,
- hasError:false
+ range:{
+ min:3,
+ max:134
+ },
+ status:{
+ visible:true,
+ enabled:true,
+ hasError:false
+ },
+ unitMeasure:"",
+ valueAct:42
},
options_thermoregulator_5_setpoint:{
range:{
@@ -110,9 +150,17 @@ export default class Termoragolatori extends Vue {
},
options_thermoregulator_6_enabled:{
- visible:true,
- enabled:true,
- hasError:false
+ range:{
+ min:0,
+ max:178
+ },
+ status:{
+ visible:true,
+ enabled:true,
+ hasError:false
+ },
+ unitMeasure:"",
+ valueAct:130
},
options_thermoregulator_6_setpoint:{
range:{
@@ -129,9 +177,17 @@ export default class Termoragolatori extends Vue {
},
options_thermoregulator_7_enabled:{
- visible:true,
- enabled:true,
- hasError:false
+ range:{
+ min:3,
+ max:163
+ },
+ status:{
+ visible:true,
+ enabled:true,
+ hasError:false
+ },
+ unitMeasure:"",
+ valueAct:120
},
options_thermoregulator_7_setpoint:{
range:{
@@ -148,9 +204,17 @@ export default class Termoragolatori extends Vue {
},
options_thermoregulator_8_enabled:{
- visible:true,
- enabled:true,
- hasError:false
+ range:{
+ min:9,
+ max:158
+ },
+ status:{
+ visible:true,
+ enabled:true,
+ hasError:false
+ },
+ unitMeasure:"",
+ valueAct:101
},
options_thermoregulator_8_setpoint:{
range:{
@@ -167,9 +231,17 @@ export default class Termoragolatori extends Vue {
},
options_thermoregulator_9_enabled:{
- visible:true,
- enabled:true,
- hasError:false
+ range:{
+ min:6,
+ max:112
+ },
+ status:{
+ visible:true,
+ enabled:true,
+ hasError:false
+ },
+ unitMeasure:"",
+ valueAct:43
},
options_thermoregulator_9_setpoint:{
range:{
@@ -186,9 +258,17 @@ export default class Termoragolatori extends Vue {
},
options_thermoregulator_10_enabled:{
- visible:true,
- enabled:true,
- hasError:false
+ range:{
+ min:7,
+ max:147
+ },
+ status:{
+ visible:true,
+ enabled:true,
+ hasError:false
+ },
+ unitMeasure:"",
+ valueAct:8
},
options_thermoregulator_10_setpoint:{
range:{
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 a19c25a2..7d158e54 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
@@ -4,71 +4,71 @@
@@ -78,111 +78,81 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts
index ef52de5b..6e4bff73 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts
@@ -20,6 +20,7 @@ export default class ShowOpzioniInfo extends Vue {
annulla() {
ModalHelper.HideModal();
+ messageService.publishToChannel('show-estrazione-info');
};
conferma() {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts
index 9d3608cc..f6c3c7a8 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts
@@ -18,11 +18,13 @@ export default class Raffreddamento extends Vue{
show: string = "ventilatori";
annulla(){
- ModalHelper.HideModal();
+ ModalHelper.HideModal();
+ messageService.publishToChannel('show-controstampo-info');
};
conferma(){
ModalHelper.HideModal();
+ messageService.publishToChannel('show-vuoto-info');
};
async beforeMount() {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts
index 2c8b84e1..d3f396c2 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts
@@ -13,10 +13,12 @@ export default class ShowVuotoInfo extends Vue {
annulla(){
ModalHelper.HideModal();
+ messageService.publishToChannel('show-raffreddamento-info');
};
conferma(){
ModalHelper.HideModal();
+ messageService.publishToChannel('show-estrazione-info');
};
async beforeMount() {