From cbd3561cb59dc093d84333be29b4cba2ba5b26be Mon Sep 17 00:00:00 2001
From: = <paolo@teamdev.it>
Date: Mon, 22 Feb 2021 18:20:08 +0100
Subject: [PATCH 1/9] layout

---
 .../riscaldi/components/base-components/thermoProphet-modal.css  | 1 +
 .../riscaldi/components/base-components/thermoProphet-modal.less | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.css b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.css
index c22cb4dc..b4e9ae63 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.css
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.css
@@ -73,6 +73,7 @@
   height: 140px;
   transform: translateX(-100px);
   bottom: 70px;
+  box-shadow: 0 2px 8px 0 rga(0, 0, 0, 0.5);
 }
 .modal.prophetimages section .color-bar {
   display: grid;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less
index 545c385b..3e88190e 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less
@@ -76,6 +76,7 @@
         height: 140px;
         transform: translateX(-100px);
         bottom: 70px;
+        box-shadow: 0 2px 8px 0 rga(0, 0, 0, 0.5);
       }
     }
 

From 0ba2c8305ca91b232ab0935433dce7d0f05c3a02 Mon Sep 17 00:00:00 2001
From: = <paolo@teamdev.it>
Date: Tue, 23 Feb 2021 16:31:13 +0100
Subject: [PATCH 2/9] modal show & get tcamdata

---
 Thermo.Active/wwwroot/src/App.vue                |  1 +
 .../base-components/thermoProphet-modal.ts       | 12 ++++++++----
 .../components/base-components/thermocamera.ts   |  8 +++++++-
 .../wwwroot/src/services/warmersService.ts       | 16 ++++++++++++----
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/App.vue b/Thermo.Active/wwwroot/src/App.vue
index 9730b272..32fdca0f 100644
--- a/Thermo.Active/wwwroot/src/App.vue
+++ b/Thermo.Active/wwwroot/src/App.vue
@@ -31,6 +31,7 @@
 			<button class="gray square close" @click="sendMessage('close')">&times;</button>
 		</div>
 		<modal-container name="modal" :class="{'blur':applyBlurNc}"></modal-container>
+		<modal-container container-name="modal2" :class="{'blur':applyBlurNc}"></modal-container>
 		<modal-nc-container name="modal-nc"></modal-nc-container>
 	</div>
 </template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
index 83b8bb75..4033d93b 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
@@ -1,12 +1,19 @@
 import Component from "vue-class-component";
 import Vue from "vue";
 import { ModalHelper, Modal } from "@/components/modals";
+import { Prop } from "vue-property-decorator";
 
 @Component({
   components: { modal: Modal },
 })
 export default class ThermoModal extends Vue {
 
+  @Prop()
+  TCamData: {
+    imageSize: { x: number, y: number },
+    rangeTemperature: { max: number, min: number },
+  }
+
   showPreview = 0;
   selectedImage: number = 0;
   serverPath = "/thermoprophet/colored";
@@ -127,12 +134,9 @@ export default class ThermoModal extends Vue {
     '20201116-110618.jpg'];
 
   close() {
-    ModalHelper.HideModal();
+    ModalHelper.HideModal("modal2");
   }
 
   mounted() {
-    for (const iterator of this.images) {
-
-    }
   }
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts
index 2fb88a2c..ba96d595 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts
@@ -29,6 +29,11 @@ export default class Thermocamera extends Vue {
   thermoImageOpacity: number = 0;
   resistanceMode = 0;
 
+  TCamData: {
+    imageSize: { x: number, y: number },
+    rangeTemperature: { max: number, min: number },
+  } = null;
+
   @Watch("warmers", { deep: true })
   async ChangedTemps() {
 
@@ -47,6 +52,7 @@ export default class Thermocamera extends Vue {
   }
   async mounted() {
     this.ChangedTemps();
+    this.TCamData = await warmersService.GetTCamData();
   }
 
   get selectedChannels(): Warmers.IChannel[] {
@@ -169,6 +175,6 @@ export default class Thermocamera extends Vue {
   }
 
   async openThermoModal() {
-    ModalHelper.ShowModal(termoModal);
+    ModalHelper.ShowModal(termoModal, "modal2");
   }
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/services/warmersService.ts b/Thermo.Active/wwwroot/src/services/warmersService.ts
index 9e6af3d0..e335190a 100644
--- a/Thermo.Active/wwwroot/src/services/warmersService.ts
+++ b/Thermo.Active/wwwroot/src/services/warmersService.ts
@@ -10,7 +10,7 @@ export class WarmersService extends baseRestService {
 
   async GetThermocameraStatus() {
     let result = await this.Get((await this.BASE_URL()) + "TCamData");
-    warmersActions.setTcamStatus(store, result as Warmers.ICamStatus );
+    warmersActions.setTcamStatus(store, result as Warmers.ICamStatus);
     return result;
   }
 
@@ -42,12 +42,12 @@ export class WarmersService extends baseRestService {
   }
 
   async setTCamMode(model: boolean) {
-    let result = await this.Put<any>((await this.BASE_URL()) + "setTCamMode?enableTCam="+model, {}, true);
+    let result = await this.Put<any>((await this.BASE_URL()) + "setTCamMode?enableTCam=" + model, {}, true);
     return result;
   }
-  
+
   async setTCamOn(model: boolean) {
-    let result = await this.Put<any>((await this.BASE_URL()) + "setTCamOn?setTCamOn="+model,{}, true);
+    let result = await this.Put<any>((await this.BASE_URL()) + "setTCamOn?setTCamOn=" + model, {}, true);
     return result;
   }
 
@@ -66,5 +66,13 @@ export class WarmersService extends baseRestService {
     return result;
   }
 
+  async GetTCamData() {
+    let result = await this.Get<{
+      imageSize: { x: number, y: number },
+      rangeTemperature: { max: number, min: number },
+    }>((await this.BASE_URL()) + "TCamData", true);
+    return result;
+  }
+
 }
 export const warmersService = new WarmersService();
\ No newline at end of file

From 9c54f3aaa9cfb79f9808eb68b39b2b7895ee44d8 Mon Sep 17 00:00:00 2001
From: = <paolo@teamdev.it>
Date: Tue, 23 Feb 2021 17:37:13 +0100
Subject: [PATCH 3/9] layout termo - manca storico immagini da leggere
 correttamente per fare prove

---
 .../base-components/thermoProphet-modal.ts    | 137 ++++--------------
 .../base-components/thermoProphet-modal.vue   |  25 ++--
 .../wwwroot/src/services/warmersService.ts    |  12 ++
 3 files changed, 56 insertions(+), 118 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
index 4033d93b..af7d9a35 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
@@ -1,126 +1,34 @@
 import Component from "vue-class-component";
 import Vue from "vue";
 import { ModalHelper, Modal } from "@/components/modals";
-import { Prop } from "vue-property-decorator";
+import { Prop, Watch } from "vue-property-decorator";
+import { warmersService } from "@/services/warmersService";
 
 @Component({
   components: { modal: Modal },
 })
 export default class ThermoModal extends Vue {
 
-  @Prop()
+
   TCamData: {
     imageSize: { x: number, y: number },
     rangeTemperature: { max: number, min: number },
+  } = {
+      imageSize: { x: 1024, y: 768 },
+      rangeTemperature: { max: 100, min: 0 }
+    }
+  get tstep() {
+    return (this.TCamData.rangeTemperature.max - this.TCamData.rangeTemperature.min) / 6;
   }
 
+  measurePoints: {
+    x: number, y: number, temp: number
+  }[] = [];
+
   showPreview = 0;
   selectedImage: number = 0;
   serverPath = "/thermoprophet/colored";
   images = ['20201104-163047.jpg',
-    '20201104-163309.jpg',
-    '20201104-163547.jpg',
-    '20201104-163826.jpg',
-    '20201104-164544.jpg',
-    '20201104-164850.jpg',
-    '20201104-165142.jpg',
-    '20201104-165418.jpg',
-    '20201104-165658.jpg',
-    '20201104-170154.jpg',
-    '20201104-170504.jpg',
-    '20201104-170741.jpg',
-    '20201104-171015.jpg',
-    '20201104-171256.jpg',
-    '20201110-141036.jpg',
-    '20201110-141318.jpg',
-    '20201110-141600.jpg',
-    '20201110-141842.jpg',
-    '20201110-142125.jpg',
-    '20201110-142333.jpg',
-    '20201110-142610.jpg',
-    '20201110-142852.jpg',
-    '20201110-143132.jpg',
-    '20201110-143434.jpg',
-    '20201110-155540.jpg',
-    '20201112-161151.jpg',
-    '20201112-161427.jpg',
-    '20201112-161701.jpg',
-    '20201112-161935.jpg',
-    '20201112-162221.jpg',
-    '20201112-163046.jpg',
-    '20201112-163107.jpg',
-    '20201112-163134.jpg',
-    '20201112-163141.jpg',
-    '20201112-163152.jpg',
-    '20201112-163235.jpg',
-    '20201112-163249.jpg',
-    '20201112-163313.jpg',
-    '20201112-163355.jpg',
-    '20201112-163435.jpg',
-    '20201112-163946.jpg',
-    '20201112-165438.jpg',
-    '20201112-165908.jpg',
-    '20201112-165931.jpg',
-    '20201112-165952.jpg',
-    '20201112-170518.jpg',
-    '20201112-170531.jpg',
-    '20201112-170604.jpg',
-    '20201112-170654.jpg',
-    '20201112-171322.jpg',
-    '20201112-171842.jpg',
-    '20201112-171946.jpg',
-    '20201112-172249.jpg',
-    '20201112-172440.jpg',
-    '20201112-172636.jpg',
-    '20201112-172834.jpg',
-    '20201112-173642.jpg',
-    '20201112-174108.jpg',
-    '20201112-174216.jpg',
-    '20201112-175159.jpg',
-    '20201113-141151.jpg',
-    '20201113-145345.jpg',
-    '20201113-145524.jpg',
-    '20201113-145707.jpg',
-    '20201113-145915.jpg',
-    '20201113-150118.jpg',
-    '20201113-150321.jpg',
-    '20201113-150527.jpg',
-    '20201113-150740.jpg',
-    '20201113-150959.jpg',
-    '20201113-153100.jpg',
-    '20201113-153143.jpg',
-    '20201113-153302.jpg',
-    '20201113-162158.jpg',
-    '20201113-162335.jpg',
-    '20201116-091043.jpg',
-    '20201116-091230.jpg',
-    '20201116-091419.jpg',
-    '20201116-091615.jpg',
-    '20201116-091828.jpg',
-    '20201116-092041.jpg',
-    '20201116-092301.jpg',
-    '20201116-092528.jpg',
-    '20201116-092802.jpg',
-    '20201116-093040.jpg',
-    '20201116-093327.jpg',
-    '20201116-093616.jpg',
-    '20201116-093914.jpg',
-    '20201116-100141.jpg',
-    '20201116-100404.jpg',
-    '20201116-100632.jpg',
-    '20201116-100858.jpg',
-    '20201116-101125.jpg',
-    '20201116-101403.jpg',
-    '20201116-101629.jpg',
-    '20201116-101858.jpg',
-    '20201116-102128.jpg',
-    '20201116-102356.jpg',
-    '20201116-102623.jpg',
-    '20201116-102847.jpg',
-    '20201116-103108.jpg',
-    '20201116-103332.jpg',
-    '20201116-103557.jpg',
-    '20201116-103819.jpg',
     '20201116-104042.jpg',
     '20201116-104305.jpg',
     '20201116-104529.jpg',
@@ -137,6 +45,23 @@ export default class ThermoModal extends Vue {
     ModalHelper.HideModal("modal2");
   }
 
-  mounted() {
+  async mounted() {
+    this.TCamData = await warmersService.GetTCamData();
+    await warmersService.ResetMeasurePoints();
+  }
+
+  async imageclick(evt: MouseEvent) {
+
+    let t = evt.target as HTMLImageElement;
+    let x = (evt.offsetX / t.clientWidth) * t.naturalWidth;
+    let y = (evt.offsetY / t.clientHeight) * t.naturalHeight;
+
+    await warmersService.SetMeasurePoints(x, y);
+    await this.ReloadMeasures();
+  }
+
+  @Watch("selectedImage")
+  async ReloadMeasures() {
+    this.measurePoints = await warmersService.GetMeasurePoints(this.images[this.selectedImage])
   }
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue
index bc26cbc5..5bae8103 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue
@@ -4,31 +4,32 @@
 			<i class="fa fa-remove"></i>
 		</button>
 		<div class="imagecontainer">
-			<img :src="`${serverPath}/${images[parseInt(selectedImage)]}`" />
+			<img :src="`${serverPath}/${images[parseInt(selectedImage)]}`" @click="imageclick" />
 			<span>{{'thermo-long-tap-info' | localize("Long tap on image to add temperature inspectors")}}</span>
+
+			<div
+				class="measure"
+				:style="`left:${m.x}px; top:${m.y}px`"
+				v-for="(m,idx) in measurePoints"
+				:key="idx"
+			>{{m.temp}} °C</div>
 		</div>
 		<div class="color-bar">
 			<div class="color-line"></div>
 			<div class="legend">
-				<span>300° C</span>
-				<span>270° C</span>
-				<span>240° C</span>
-				<span>210° C</span>
-				<span>180° C</span>
-				<span>150° C</span>
-				<span>120° C</span>
+				<span v-for="c in 7" :key="c">{{Math.round(TCamData.rangeTemperature.max - tstep*(c-1))}}° C</span>
 			</div>
 		</div>
 		<div class="image-selector">
 			<div class="timeseries">
-				<time>{{'first-image' | localize("First image")}}</time>
-				<time>{{'last-image' | localize("Last image")}}</time>
+				<!-- <time>{{'first-image' | localize("First image")}}</time>
+				<time>{{'last-image' | localize("Last image")}}</time>-->
 			</div>
 			<img
 				:src="`${serverPath}/${images[parseInt(selectedImage)]}`"
 				v-if="showPreview"
 				class="selector"
-				:style="`left:${(parseInt(selectedImage) / images.length) * 858}px`"
+				:style="`left:${(parseInt(selectedImage) / (images.length-1)) * 858}px`"
 			/>
 			<input
 				type="range"
@@ -41,7 +42,7 @@
 			<div class="selectorarea">
 				<span
 					class="selector"
-					:style="`left:${(parseInt(selectedImage) / images.length) * 858}px`"
+					:style="`left:${(parseInt(selectedImage) / (images.length-1)) * 858}px`"
 				>{{'thermo-cycle' | localize("Cycle")}} {{selectedImage}}</span>
 			</div>
 		</div>
diff --git a/Thermo.Active/wwwroot/src/services/warmersService.ts b/Thermo.Active/wwwroot/src/services/warmersService.ts
index e335190a..6648a066 100644
--- a/Thermo.Active/wwwroot/src/services/warmersService.ts
+++ b/Thermo.Active/wwwroot/src/services/warmersService.ts
@@ -3,6 +3,7 @@ import { CONFIGURATION } from "@/config";
 import { warmersActions } from "@/store/warmers.store";
 import { store } from "@/store";
 import Warmers from "@/app_modules_thermo/setup/riscaldi/components/base-components/warmers";
+import Numeric from "@/app_modules_thermo/components/numeric";
 
 export class WarmersService extends baseRestService {
 
@@ -74,5 +75,16 @@ export class WarmersService extends baseRestService {
     return result;
   }
 
+  async GetMeasurePoints(setname: string): Promise<any> {
+    return await this.Get<any>((await this.BASE_URL()) + `getMeasurePoints?setName=${setname}`, true);
+  }
+
+  async SetMeasurePoints(x: number, y: number) {
+    return await this.Put((await this.BASE_URL()) + `addMeasurePoint?posX=${Math.round(x)}&posY=${Math.round(y)}`, null, true);
+  }
+
+  async ResetMeasurePoints() {
+    return this.Put((await this.BASE_URL()) + `resetMeasurePoint`, null, true);
+  }
 }
 export const warmersService = new WarmersService();
\ No newline at end of file

From 7ebf5013b3c04ec525abddde85d23dd4686033e9 Mon Sep 17 00:00:00 2001
From: Thermo_SIM <fbolis@SIMPRDWINCMS>
Date: Thu, 25 Feb 2021 10:26:37 +0100
Subject: [PATCH 4/9] Fix Resistances Watt

---
 .../setup/riscaldi/components/base-components/resistance.ts   | 4 ++++
 .../setup/riscaldi/components/base-components/resistance.vue  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.ts
index 848a3dc0..58b9c5a6 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.ts
@@ -122,4 +122,8 @@ export default class Resistance extends Vue {
   }
 
 
+  get Watt() {
+    return (this.channel.maxPower * this.channel.setpointHMI) / 100;
+  }
+
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.vue
index b5910ca1..82494cad 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.vue
@@ -24,7 +24,7 @@
 		@click="click"
 		v-on:touchend="click"
 		:style="{backgroundColor:`rgba(${currentColor})`}"
-	>{{channel.actualCurrent}}&nbsp;W</div>
+	>{{Watt}}&nbsp;W</div>
 	<div
 		class="resistance id"
 		:class="{'disabled':!editable}"

From 9a87ddee9fbc732b53309c5eb6158ffa35a869a5 Mon Sep 17 00:00:00 2001
From: Thermo_SIM <fbolis@SIMPRDWINCMS>
Date: Thu, 25 Feb 2021 10:51:48 +0100
Subject: [PATCH 5/9] Fix IO visible

---
 .../sotto-cofano/InputOutput/components/io/io.ts   | 13 +++++++++++++
 .../sotto-cofano/InputOutput/components/io/io.vue  |  2 ++
 .../components/tables/inputTab/input-row-item.vue  |  2 +-
 .../components/tables/inputTab/input.ts            | 14 ++++++++++++++
 .../components/tables/inputTab/input.vue           |  2 +-
 .../tables/outputTab/output-row-item.vue           |  2 +-
 .../components/tables/outputTab/output.ts          | 13 +++++++++++++
 .../components/tables/outputTab/output.vue         |  4 ++--
 8 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.ts
index 338de28f..4ff40f0c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.ts
@@ -41,4 +41,17 @@ export default class IO extends Vue {
 
   }
 
+  isConfigVisible(group,bankid){
+    var vis = false;
+    var it = this.items[group].filter(i => i.bank == bankid);
+
+    for (let index = 0; index < it.length; index++) {
+      if(it[index].visible){
+          vis = true;
+          break;
+      }      
+    }
+    return vis
+  }
+  
 }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue
index b918884a..c01f8768 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue
@@ -9,6 +9,7 @@
 						@click="scrollto(true,`input-${group}-${inputid}`)"
 						class="upper"
 						v-for="(inputid, idx2) in config[group]"
+						v-if="isConfigVisible(group,inputid)" 
 						:key="`h-${idx}-${idx2}`"
 					>{{`${group} ${inputid}`}}</a>
 				</template>
@@ -24,6 +25,7 @@
 						@click="scrollto(false,`output-${group}-${inputid}`)"
 						class="upper"
 						v-for="(inputid, idx2) in config[group]"
+						v-if="isConfigVisible(group,inputid)" 
 						:key="`h-${idx}-${idx2}`"
 					>{{`${group} ${inputid}`}}</a>
 				</template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input-row-item.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input-row-item.vue
index 15155b20..b9cd4a70 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input-row-item.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input-row-item.vue
@@ -1,5 +1,5 @@
 <template>
-	<tr>
+	<tr v-if="item.visible">
 		<td class="pointer">
 			<button class="pointer" @click="$emit('click')">
 				<img
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.ts
index e87c6d7e..a8d5e20b 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.ts
@@ -32,4 +32,18 @@ export default class InputTable extends Vue {
   get config(): { [id: string]: number[] } {
     return store.state.underTheHood.ioChannelsConfig;
   }
+  
+  isConfigVisible(group,bankid){
+    var vis = false;
+    var it = this.items[group].filter(i => i.bank == bankid);
+
+    for (let index = 0; index < it.length; index++) {
+      if(it[index].visible){
+          vis = true;
+          break;
+      }      
+    }
+    return vis
+  }
+
 }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.vue
index 27b50856..7c951629 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.vue
@@ -29,7 +29,7 @@
 
 				<template v-for="(group, idx) in ['di','ai']">
 					<template v-for="(bankid, idx2) in config[group]">
-						<tr class="group-row" :key="`h-${idx}-${idx2}`" :id="`input-${group}-${bankid}`" >
+						<tr class="group-row" :key="`h-${idx}-${idx2}`" :id="`input-${group}-${bankid}`"  v-if="isConfigVisible(group,bankid)" >
 							<td colspan="6">{{ `${group} ${bankid}`}}</td>
 						</tr>
 						<input-row
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output-row-item.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output-row-item.vue
index c928fc12..80a3bc48 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output-row-item.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output-row-item.vue
@@ -1,5 +1,5 @@
 <template>
-	<tr>
+	<tr v-if="item.visible">
 		<td class="pointer">
 			<button class="pointer" @click="$emit('click')">
 				<img
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.ts
index d376d964..b48bcfe7 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.ts
@@ -31,4 +31,17 @@ export default class OutputTable extends Vue {
   get config(): { [id: string]: number[] } {
     return store.state.underTheHood.ioChannelsConfig;
   }
+
+  isConfigVisible(group,bankid){
+    var vis = false;
+    var it = this.items[group].filter(i => i.bank == bankid);
+
+    for (let index = 0; index < it.length; index++) {
+      if(it[index].visible){
+          vis = true;
+          break;
+      }      
+    }
+    return vis
+  }
 }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.vue
index bc2a4f39..b454b245 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.vue
@@ -29,9 +29,9 @@
 				</template>
 
 				<template v-for="(group, idx) in ['do','ao']">
-					<template v-for="(bankid, idx2) in config[group]">
+					<template v-for="(bankid, idx2) in config[group]" >
 						<tr class="group-row" :key="`h-${idx}-${idx2}`" 
-							:id="`output-${group}-${bankid}`">
+							:id="`output-${group}-${bankid}`" v-if="isConfigVisible(group,bankid)">
 							<td colspan="7">{{ `${group} ${bankid}`}}</td>
 						</tr>
 						<output-row

From 1f04efa0eec300d571f350c071426ab1dd7fc735 Mon Sep 17 00:00:00 2001
From: Thermo_SIM <fbolis@SIMPRDWINCMS>
Date: Thu, 25 Feb 2021 11:34:48 +0100
Subject: [PATCH 6/9] Fix charts

---
 .../components/svgChart.vue                   |  1 +
 .../base-components/aria-controstampo.ts      |  6 +--
 .../estrazione-controstampo.ts                |  2 +-
 .../base-components/vuoto-controstampo.ts     |  8 ++--
 .../base-components/estrazione-principale.ts  |  2 +-
 .../base-components/estrazione-secondaria.ts  |  2 +-
 .../setup/imbutitura/show-imbutitura-info.ts  |  2 +-
 .../SVG_Components/SVG-termo-inferiore.vue    |  3 +-
 .../SVG_Components/SVG-termo-superiore.vue    |  3 +-
 .../SVG_Components/termoChart.vue             | 43 +++++++++++++++----
 .../setup/vuoto/base-components/prevuoto.ts   |  8 ++--
 .../vuoto/base-components/vuoto-ausiliario.ts |  8 ++--
 .../vuoto/base-components/vuoto-principale.ts |  8 ++--
 13 files changed, 60 insertions(+), 36 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue
index 13d5b1e7..0e6e9a0b 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue
@@ -81,6 +81,7 @@
 				:height="scaleY(b.height)"
 				:fill="b.backgroundColor"
 				:stroke="b.borderColor"
+				stroke-width="6"
 			/>
 
 			<line
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts
index 3eb35c15..f439d126 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts
@@ -13,19 +13,19 @@ export default class AriaControstampo extends Vue {
     return [
       {
         backgroundColor: "#fff",
-        borderColor: "#848484",
+        borderColor: "#9e9e9e",
         height: this.recipe.upperplate_air_1_chart_setpointy.setpointHMI,
         width: this.recipe.upperplate_air_1_chart_setpointx.setpointHMI
       },
       {
         backgroundColor: "#e5f3ff",
-        borderColor: "#848484",
+        borderColor: "#79a9d2",
         height: this.recipe.upperplate_air_2_chart_setpointy.setpointHMI,
         width: this.recipe.upperplate_air_2_chart_setpointx.setpointHMI
       },
       {
         backgroundColor: "#b3dbff",
-        borderColor: "#848484",
+        borderColor: "#538fc6",
         height: this.recipe.upperplate_air_3_chart_setpointy.setpointHMI,
         width: this.recipe.upperplate_air_3_chart_setpointx.setpointHMI
       }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts
index f06c46c0..16237c65 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts
@@ -15,7 +15,7 @@ export default class EstrazioneControstampo extends Vue {
     return [
       {
         backgroundColor: "#b3dbff",
-        borderColor: "#848484",
+        borderColor: "#9e9e9e",
         height: this.recipe.upperplate_extraction_1_chart_setpointy.setpointHMI,
         width: this.recipe.upperplate_extraction_1_chart_setpointx.setpointHMI
       }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts
index 5e9a6a2f..6f92da94 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts
@@ -14,20 +14,20 @@ export default class VuotoControstampo extends Vue {
   get bars() {
     return [
       {
-        backgroundColor: "#fff",
-        borderColor: "#848484",
+        backgroundColor: "#ededed",
+        borderColor: "#9e9e9e",
         height: this.recipe.upperplate_vacuum_1_chart_setpointy.setpointHMI,
         width: this.recipe.upperplate_vacuum_1_chart_setpointx.setpointHMI
       },
       {
         backgroundColor: "#e5f3ff",
-        borderColor: "#848484",
+        borderColor: "#79a9d2",
         height: this.recipe.upperplate_vacuum_2_chart_setpointy.setpointHMI,
         width: this.recipe.upperplate_vacuum_2_chart_setpointx.setpointHMI
       },
       {
         backgroundColor: "#b3dbff",
-        borderColor: "#848484",
+        borderColor: "#538fc6",
         height: this.recipe.upperplate_vacuum_3_chart_setpointy.setpointHMI,
         width: this.recipe.upperplate_vacuum_3_chart_setpointx.setpointHMI
       }
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 133b99d6..9dcc8f5a 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
@@ -23,7 +23,7 @@ export default class EstrazionePrincipale extends Vue {
     return [
       {
         backgroundColor: "#b3dbff",
-        borderColor: "#848484",
+        borderColor: "#538fc6",
         height: this.recipe.extraction_main_1_chart_setpointy.setpointHMI,
         width: this.recipe.extraction_main_1_chart_setpointx.setpointHMI
       }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.ts
index 2e3ec00b..2c632e95 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.ts
@@ -23,7 +23,7 @@ export default class EstrazioneSecondaria extends Vue {
     return [
       {
         backgroundColor: "#b3dbff",
-        borderColor: "#848484",
+        borderColor: "#538fc6",
         height: this.recipe.extraction_aux_1_chart_setpointy.setpointHMI,
         width: this.recipe.extraction_aux_1_chart_setpointx.setpointHMI
       }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts
index 426ff6ce..2633b997 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts
@@ -30,7 +30,7 @@ export default class ShowImbutituraInfo extends Vue {
     return [
       {
         backgroundColor: "#b3dbff",
-        borderColor: "#848484",
+        borderColor: "#538fc6",
         height: this.recipe.drawing_1_chart_setpointy.setpointHMI,
         width: this.recipe.drawing_1_chart_setpointx.setpointHMI
       }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-inferiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-inferiore.vue
index 86b68da9..bcd441f6 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-inferiore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-inferiore.vue
@@ -52,8 +52,7 @@
 </template>
 <style scoped>
 .svg-area.pirometro {
-	padding: 50px;
-	width: calc(100% - 100px) !important;
+	width: 100% !important;
 }
 </style>
 <script lang="ts" src="./SVG-termo-inferiore.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
index c037a3ab..50b7d0b3 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
@@ -52,8 +52,7 @@
 </template>
 <style scoped>
 .svg-area.pirometro {
-	padding: 50px;
-	width: calc(100% - 100px) !important;
+	width: 100% !important;
 }
 </style>
 <script lang="ts" src="./SVG-termo-superiore.ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/termoChart.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/termoChart.vue
index a3483f80..4ed808a5 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/termoChart.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/termoChart.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="chart">
-		<svg :viewBox="`${-2*step} ${-step} ${scaleX(MaxX) *1.2 + step} ${scaleY(MaxY) * 1.2 + step} `">
+		<svg :viewBox="`${-2*step} ${-step} ${scaleX(MaxX) *1.2 + step} ${scaleY(MaxY) * 1.2 + step +90} `">
 			<g>
 				<line
 					:x1="0"
@@ -30,6 +30,15 @@
 					:y2="scaleY(MaxY) - scaleY(y2)"
 					:stroke="lineBarColor"
 				/>
+				<line
+					x1="-100"
+					:x2="0"
+					:y1="scaleY(MaxY)  - scaleY(y2)"
+					:y2="scaleY(MaxY) - scaleY(y2)"
+					:stroke="lineBarColor"
+					stroke-dasharray="4"
+				/>
+
 
 				<!-- line-v-1: prima riga verticale da sinistra -->
 				<line
@@ -44,18 +53,34 @@
 				<line
 					:x1="scaleX(x2)"
 					:x2="scaleX(x2)"
-					:y1="scaleY(MaxY) "
-					:y2="scaleY(MaxY) - scaleY(y3)"
+					:y1="scaleY(MaxY) - scaleY(y3)"
+					:y2="scaleY(MaxY)"
 					:stroke="lineBarColor"
+				/>				
+				<line
+					:x1="scaleX(x2)"
+					:x2="scaleX(x2)"
+					:y1="scaleY(MaxY)"
+					:y2="scaleY(MaxY) + 70"
+					:stroke="lineBarColor"
+					stroke-dasharray="4"
 				/>
 
 				<!-- line-v-3 -->
 				<line
 					:x1="scaleX(x3)"
 					:x2="scaleX(x3)"
-					:y1="scaleY(MaxY) "
-					:y2="scaleY(MaxY)  - scaleY(y2)"
+					:y1="scaleY(MaxY)  - scaleY(y2)"
+					:y2="scaleY(MaxY)"
 					:stroke="lineBarColor"
+				/>			
+				<line
+					:x1="scaleX(x3)"
+					:x2="scaleX(x3)"
+					:y1="scaleY(MaxY)"
+					:y2="scaleY(MaxY) + 140"
+					:stroke="lineBarColor"
+					stroke-dasharray="4"
 				/>
 
 				
@@ -94,7 +119,7 @@
 					class="foreignControlBox"
 					:width="controlWidth"
 					:height="controlHeight"
-					:x="-step"
+					:x="-step -100"
 					:y="scaleY(MaxY)  - scaleY(y2) - controlHeight/2"
 				>
 					<slot name="y2" />
@@ -113,7 +138,7 @@
 					class="foreignControlBox"
 					:width="controlWidth"
 					:height="controlHeight"
-					:y="scaleY(MaxY) "
+					:y="scaleY(MaxY) +70 "
 					:x="scaleX(x2) - controlWidth/2"
 				>
 					<slot name="x2" />
@@ -122,7 +147,7 @@
 					class="foreignControlBox"
 					:width="controlWidth"
 					:height="controlHeight"
-					:y="scaleY(MaxY) "
+					:y="scaleY(MaxY) + 140 "
 					:x="scaleX(x3) - controlWidth/2"
 				>
 					<slot name="x3" />
@@ -131,7 +156,7 @@
 					class="foreignControlBox"
 					:width="controlWidth"
 					:height="controlHeight"
-					:y="scaleY(MaxY) "
+					:y="scaleY(MaxY)"
 					:x="scaleX(x4) - controlWidth/2"
 				>
 					<slot name="x4" />
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts
index 9c9f8d54..7a426863 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts
@@ -14,20 +14,20 @@ export default class Prevuoto extends Vue {
   get bars() {
     return [
       {
-        backgroundColor: "#fff",
-        borderColor: "#848484",
+        backgroundColor: "#ededed",
+        borderColor: "#9e9e9e",
         height: this.recipe.vacuum_pre_1_chart_setpointy.setpointHMI,
         width: this.recipe.vacuum_pre_1_chart_setpointx.setpointHMI
       },
       {
         backgroundColor: "#e5f3ff",
-        borderColor: "#848484",
+        borderColor: "#79a9d2",
         height: this.recipe.vacuum_pre_2_chart_setpointy.setpointHMI,
         width: this.recipe.vacuum_pre_2_chart_setpointx.setpointHMI
       },
       {
         backgroundColor: "#b3dbff",
-        borderColor: "#848484",
+        borderColor: "#538fc6",
         height: this.recipe.vacuum_pre_3_chart_setpointy.setpointHMI,
         width: this.recipe.vacuum_pre_3_chart_setpointx.setpointHMI
       }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.ts
index 15f9d3ad..da36b078 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.ts
@@ -14,20 +14,20 @@ export default class VuotoAusiliario extends Vue {
   get bars() {
     return [
       {
-        backgroundColor: "#fff",
-        borderColor: "#848484",
+        backgroundColor: "#ededed",
+        borderColor: "#9e9e9e",
         height: this.recipe.vacuum_aux_1_chart_setpointy.setpointHMI,
         width: this.recipe.vacuum_aux_1_chart_setpointx.setpointHMI
       },
       {
         backgroundColor: "#e5f3ff",
-        borderColor: "#848484",
+        borderColor: "#79a9d2",
         height: this.recipe.vacuum_aux_2_chart_setpointy.setpointHMI,
         width: this.recipe.vacuum_aux_2_chart_setpointx.setpointHMI
       },
       {
         backgroundColor: "#b3dbff",
-        borderColor: "#848484",
+        borderColor: "#538fc6",
         height: this.recipe.vacuum_aux_3_chart_setpointy.setpointHMI,
         width: this.recipe.vacuum_aux_3_chart_setpointx.setpointHMI
       }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts
index fe39acea..432acb58 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts
@@ -163,20 +163,20 @@ export default class VuotoPrincipale extends Vue {
   get bars() {
     return [
       {
-        backgroundColor: "#fff",
-        borderColor: "#848484",
+        backgroundColor: "#ededed",
+        borderColor: "#9e9e9e",
         height: this.recipe.vacuum_main_1_chart_setpointy.setpointHMI,
         width: this.recipe.vacuum_main_1_chart_setpointx.setpointHMI
       },
       {
         backgroundColor: "#e5f3ff",
-        borderColor: "#848484",
+        borderColor: "#79a9d2",
         height: this.recipe.vacuum_main_2_chart_setpointy.setpointHMI,
         width: this.recipe.vacuum_main_2_chart_setpointx.setpointHMI
       },
       {
         backgroundColor: "#b3dbff",
-        borderColor: "#848484",
+        borderColor: "#538fc6",
         height: this.recipe.vacuum_main_3_chart_setpointy.setpointHMI,
         width: this.recipe.vacuum_main_3_chart_setpointx.setpointHMI
       }

From 12a3bde77009d9447e10639b93808a9b08f26151 Mon Sep 17 00:00:00 2001
From: Thermo_SIM <fbolis@SIMPRDWINCMS>
Date: Thu, 25 Feb 2021 12:16:46 +0100
Subject: [PATCH 7/9] Fix Cursor pointer & input Focus

---
 .../src/app_modules_thermo/components/scheda.ts    |  2 ++
 .../src/app_modules_thermo/components/scheda.vue   |  2 +-
 .../src/app_modules_thermo/components/svgChart.ts  | 14 +++++++++++++-
 .../src/app_modules_thermo/components/svgChart.vue |  5 +++++
 .../base-components/aria-controstampo.vue          |  4 ++++
 .../base-components/estrazione-controstampo.vue    |  2 ++
 .../base-components/vuoto-controstampo.vue         |  4 ++++
 .../base-components/estrazione-principale.vue      |  2 ++
 .../base-components/estrazione-secondaria.vue      |  2 ++
 .../setup/imbutitura/show-imbutitura-info.vue      |  2 ++
 .../setup/vuoto/base-components/prevuoto.vue       |  4 ++++
 .../vuoto/base-components/vuoto-ausiliario.vue     |  4 ++++
 .../vuoto/base-components/vuoto-principale.vue     |  4 ++++
 13 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts
index 4eb274f3..daae7f41 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts
@@ -6,6 +6,8 @@ import Slider from "@/app_modules_thermo/components/slider.vue";
 @Component({name:"scheda",components: { slider:Slider} })
 export default class Scheda extends Vue{
 
+    @Prop({})
+    id:string;
     @Prop({})
     portata:Recipe.IValue;
     @Prop({})
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
index a10c278b..c79e3966 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue
@@ -4,7 +4,7 @@
       <template v-if="portata.status.visible">
         <div class="input-area">
           <label>{{portata.key | localize(portata.key)}}</label>
-          <numeric v-model="portata" />
+          <numeric v-model="portata" :id="id" />
         </div>
         <slider v-model="portata"></slider>
       </template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts
index d0cacea4..8b15a75a 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts
@@ -27,7 +27,19 @@ export default class SVGChart extends Vue {
   @Prop({ default: null })
   maxY: number;
 
-  step: number = 50;
+  step: number = 50;  
+
+  @Prop({ default: function () { return [] } })
+  ids: string[]
+
+  click(idx){
+    if(idx > this.ids.length -1 )
+      return
+    var elem = document.getElementById(this.ids[idx]);
+    if(elem){
+      elem.focus();
+    }
+  }
 
   startXOf(barindex: number) {
     return this.bars.slice(0, barindex).reduce((p, c) => c.width + p, 0);
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue
index 0e6e9a0b..9fc51e3c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue
@@ -82,6 +82,8 @@
 				:fill="b.backgroundColor"
 				:stroke="b.borderColor"
 				stroke-width="6"
+				@click="click(idx)"
+				class="pointer"
 			/>
 
 			<line
@@ -100,6 +102,9 @@
 .chart {
 	overflow: hidden;
 }
+.pointer {
+	cursor: pointer;
+}
 
 .chart svg {
 	width: 100%;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue
index 1b5c6320..e52324af 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue
@@ -36,16 +36,19 @@
 				class="box-500 mb-10"
 				:portata="recipe.upperplate_air_1_chart_setpointy"
 				:durata="recipe.upperplate_air_1_chart_setpointx"
+				id="upperplate_air_1_chart_setpointy"
 			></scheda>
 			<scheda
 				class="box-500 mb-10 color_2"
 				:portata="recipe.upperplate_air_2_chart_setpointy"
 				:durata="recipe.upperplate_air_2_chart_setpointx"
+				id="upperplate_air_2_chart_setpointy"
 			></scheda>
 			<scheda
 				class="box-500 mb-10 color_3"
 				:portata="recipe.upperplate_air_3_chart_setpointy"
 				:durata="recipe.upperplate_air_3_chart_setpointx"
+				id="upperplate_air_3_chart_setpointy"
 			></scheda>
 		</article>
 		<article>
@@ -54,6 +57,7 @@
 				:bars="bars"
 				:lines="lines"
 				:unitx="'s'"
+				:ids="['upperplate_air_1_chart_setpointy','upperplate_air_2_chart_setpointy','upperplate_air_3_chart_setpointy']"
 				:max-y="Math.max(recipe.upperplate_air_1_chart_setpointy.range.max , recipe.upperplate_air_2_chart_setpointy.range.max ,recipe.upperplate_air_3_chart_setpointy.range.max)"
 				:max-x="Math.max(recipe.upperplate_air_1_chart_setpointx.setpointHMI+ recipe.upperplate_air_2_chart_setpointx.setpointHMI+recipe.upperplate_air_3_chart_setpointx.setpointHMI, recipe.upperplate_air_max_time.setpointHMI)"
 			></svg-chart>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.vue
index 126ff520..7f4c30e6 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.vue
@@ -36,12 +36,14 @@
 				class="box-500 color_3"
 				:portata="recipe.upperplate_extraction_1_chart_setpointy"
 				:durata="recipe.upperplate_extraction_1_chart_setpointx"
+				id="upperplate_extraction_1_chart_setpointy"
 			></scheda>
 		</article>
 		<article>
 			<svg-chart
 				line-bar-color="#848484"
 				:bars="bars"
+				:ids="['upperplate_extraction_1_chart_setpointy']"
 				:max-y="recipe.upperplate_extraction_1_chart_setpointy.range.max"
 				:max-x="recipe.upperplate_extraction_1_chart_setpointx.range.max"
 			></svg-chart>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.vue
index 968e3dfb..e0dea441 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.vue
@@ -36,16 +36,19 @@
 				class="box-500 mb-10"
 				:portata="recipe.upperplate_vacuum_1_chart_setpointy"
 				:durata="recipe.upperplate_vacuum_1_chart_setpointx"
+				id="upperplate_vacuum_1_chart_setpointy"
 			></scheda>
 			<scheda
 				class="box-500 mb-10 color_2"
 				:portata="recipe.upperplate_vacuum_2_chart_setpointy"
 				:durata="recipe.upperplate_vacuum_2_chart_setpointx"
+				id="upperplate_vacuum_2_chart_setpointy"
 			></scheda>
 			<scheda
 				class="box-500 mb-10 color_3"
 				:portata="recipe.upperplate_vacuum_3_chart_setpointy"
 				:durata="recipe.upperplate_vacuum_3_chart_setpointx"
+				id="upperplate_vacuum_3_chart_setpointy"
 			></scheda>
 		</article>
 		<article>
@@ -53,6 +56,7 @@
 				line-bar-color="#848484"
 				:bars="bars"
 				:lines="lines"
+				:ids="['upperplate_vacuum_1_chart_setpointy','upperplate_vacuum_2_chart_setpointy','upperplate_vacuum_3_chart_setpointy']"
 				:max-y="Math.max(recipe.upperplate_vacuum_1_chart_setpointy.range.max, recipe.upperplate_vacuum_2_chart_setpointy.range.max,recipe.upperplate_vacuum_3_chart_setpointy.range.max)"
 				:max-x="Math.max(recipe.upperplate_vacuum_1_chart_setpointx.setpointHMI +recipe.upperplate_vacuum_2_chart_setpointx.setpointHMI +recipe.upperplate_vacuum_3_chart_setpointx.setpointHMI,recipe.upperplate_vacuum_max_time.setpointHMI)"
 			></svg-chart>
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 b2f23f22..70a0d850 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
@@ -40,12 +40,14 @@
 				class="box-500 color_3"
 				:portata="recipe.extraction_main_1_chart_setpointy"
 				:durata="recipe.extraction_main_1_chart_setpointx"
+				id="extraction_main_1_chart_setpointy"
 			></scheda>
 		</article>
 		<article>
 			<svg-chart
 				line-bar-color="#848484"
 				:bars="bars"
+				:ids="['extraction_main_1_chart_setpointy']"
 				:max-y="recipe.extraction_main_1_chart_setpointy.range.max"
 				:max-x="recipe.extraction_main_1_chart_setpointx.range.max"
 			></svg-chart>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue
index c85cf350..db224179 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue
@@ -36,12 +36,14 @@
 				class="box-500 color_3"
 				:portata="recipe.extraction_aux_1_chart_setpointy"
 				:durata="recipe.extraction_aux_1_chart_setpointx"
+				id="extraction_aux_1_chart_setpointy"
 			></scheda>
 		</article>
 		<article>
 			<svg-chart
 				line-bar-color="#848484"
 				:bars="bars"
+				:ids="['extraction_aux_1_chart_setpointy']"
 				:max-y="recipe.extraction_aux_1_chart_setpointy.range.max"
 				:max-x="recipe.extraction_aux_1_chart_setpointx.range.max"
 			></svg-chart>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue
index ec52ad4e..fcd37fc2 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue
@@ -71,12 +71,14 @@
 						class="box-500 color_3"
 						:portata="recipe.drawing_1_chart_setpointy"
 						:durata="recipe.drawing_1_chart_setpointx"
+						id="drawing_1_chart_setpointy"
 					></scheda>
 				</article>
 				<article>
 					<svg-chart
 						line-bar-color="#848484"
 						:bars="bars"
+						:ids="['drawing_1_chart_setpointy']"
 						:max-x="recipe.drawing_1_chart_setpointx.range.max"
 						:max-y="recipe.drawing_1_chart_setpointy.range.max"
 					></svg-chart>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue
index b4f98b76..28f22c5d 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue
@@ -28,16 +28,19 @@
 		<article class="shrink ml-10">
 			<scheda
 				class="box-500 mb-10"
+				id="vacuum_pre_1_chart_setpointy"
 				:portata="recipe.vacuum_pre_1_chart_setpointy"
 				:durata="recipe.vacuum_pre_1_chart_setpointx"
 			></scheda>
 			<scheda
 				class="box-500 mb-10 color_2"
+				id="vacuum_pre_2_chart_setpointy"
 				:portata="recipe.vacuum_pre_2_chart_setpointy"
 				:durata="recipe.vacuum_pre_2_chart_setpointx"
 			></scheda>
 			<scheda
 				class="box-500 mb-10 color_3"
+				id="vacuum_pre_3_chart_setpointy"
 				:portata="recipe.vacuum_pre_3_chart_setpointy"
 				:durata="recipe.vacuum_pre_3_chart_setpointx"
 			></scheda>
@@ -47,6 +50,7 @@
 				line-bar-color="#848484"
 				:bars="bars"
 				:lines="lines"
+				:ids="['vacuum_pre_1_chart_setpointy','vacuum_pre_2_chart_setpointy','vacuum_pre_3_chart_setpointy']"
 				:max-y="Math.max(recipe.vacuum_pre_1_chart_setpointy.range.max , recipe.vacuum_pre_2_chart_setpointy.range.max ,recipe.vacuum_pre_3_chart_setpointy.range.max)"
 				:max-x="Math.max(recipe.vacuum_pre_1_chart_setpointx.setpointHMI +recipe.vacuum_pre_2_chart_setpointx.setpointHMI+recipe.vacuum_pre_3_chart_setpointx.setpointHMI,recipe.vacuum_pre_max_time.setpointHMI)"
 			></svg-chart>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue
index a8d58a37..a5171b81 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue
@@ -36,16 +36,19 @@
 		<article class="shrink ml-10">
 			<scheda
 				class="box-500 mb-10"
+				id="vacuum_aux_1_chart_setpointy"
 				:portata="recipe.vacuum_aux_1_chart_setpointy"
 				:durata="recipe.vacuum_aux_1_chart_setpointx"
 			></scheda>
 			<scheda
 				class="box-500 mb-10 color_2"
+				id="vacuum_aux_2_chart_setpointy"
 				:portata="recipe.vacuum_aux_2_chart_setpointy"
 				:durata="recipe.vacuum_aux_2_chart_setpointx"
 			></scheda>
 			<scheda
 				class="box-500 mb-10 color_3"
+				id="vacuum_aux_3_chart_setpointy"
 				:portata="recipe.vacuum_aux_3_chart_setpointy"
 				:durata="recipe.vacuum_aux_3_chart_setpointx"
 			></scheda>
@@ -55,6 +58,7 @@
 				line-bar-color="#848484"
 				:bars="bars"
 				:lines="lines"
+				:ids="['vacuum_aux_1_chart_setpointy','vacuum_aux_2_chart_setpointy','vacuum_aux_3_chart_setpointy']"
 				:max-y="Math.max(recipe.vacuum_aux_1_chart_setpointy.range.max , recipe.vacuum_aux_2_chart_setpointy.range.max ,recipe.vacuum_aux_3_chart_setpointy.range.max)"
 				:max-x="Math.max(recipe.vacuum_aux_1_chart_setpointx.setpointHMI+recipe.vacuum_aux_2_chart_setpointx.setpointHMI+recipe.vacuum_aux_3_chart_setpointx.setpointHMI, recipe.vacuum_aux_max_time.setpointHMI)"
 			></svg-chart>
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 4f1b5fb2..9d7d89e0 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
@@ -33,16 +33,19 @@
 		<article class="shrink ml-10">
 			<scheda
 				class="box-500 mb-10"
+				id="vacuum_main_1_chart_setpointy"
 				:portata="recipe.vacuum_main_1_chart_setpointy"
 				:durata="recipe.vacuum_main_1_chart_setpointx"
 			></scheda>
 			<scheda
 				class="box-500 mb-10 color_2"
+				id="vacuum_main_2_chart_setpointy"
 				:portata="recipe.vacuum_main_2_chart_setpointy"
 				:durata="recipe.vacuum_main_2_chart_setpointx"
 			></scheda>
 			<scheda
 				class="box-500 mb-10 color_3"
+				id="vacuum_main_3_chart_setpointy"
 				:portata="recipe.vacuum_main_3_chart_setpointy"
 				:durata="recipe.vacuum_main_3_chart_setpointx"
 			></scheda>
@@ -52,6 +55,7 @@
 				line-bar-color="#848484"
 				:bars="bars"
 				:lines="lines"
+				:ids="['vacuum_main_1_chart_setpointy','vacuum_main_2_chart_setpointy','vacuum_main_3_chart_setpointy']"
 				:max-y="Math.max(recipe.vacuum_main_1_chart_setpointy.range.max , recipe.vacuum_main_2_chart_setpointy.range.max ,recipe.vacuum_main_3_chart_setpointy.range.max)"
 				:max-x="Math.max(recipe.vacuum_main_1_chart_setpointx.setpointHMI+recipe.vacuum_main_2_chart_setpointx.setpointHMI+recipe.vacuum_main_3_chart_setpointx.setpointHMI,recipe.vacuum_main_max_time.setpointHMI)"
 			></svg-chart>

From 9fe9ffa736c5bd4b027522149e38f5061c7e2edd Mon Sep 17 00:00:00 2001
From: Thermo_SIM <fbolis@SIMPRDWINCMS>
Date: Thu, 25 Feb 2021 15:22:57 +0100
Subject: [PATCH 8/9] Fix users Area + Process softkey

---
 .../Migrations/Configuration.cs               |  7 ++-
 .../wwwroot/assets/styles/base/processo.less  |  6 ++-
 Thermo.Active/wwwroot/assets/styles/style.css |  6 ++-
 .../app_modules/machine/components/login.ts   | 11 ++---
 .../InputOutput/components/io/io.vue          | 30 +++++++------
 Thermo.Active/wwwroot/src/components/Home.ts  | 45 -------------------
 Thermo.Active/wwwroot/src/components/Home.vue | 44 +++++++++++++++++-
 .../wwwroot/src/modules/app-footer.vue        | 25 ++---------
 .../wwwroot/src/store/machineStatus.store.ts  |  5 ++-
 9 files changed, 84 insertions(+), 95 deletions(-)
 delete mode 100644 Thermo.Active/wwwroot/src/components/Home.ts

diff --git a/Thermo.Active.Database/Migrations/Configuration.cs b/Thermo.Active.Database/Migrations/Configuration.cs
index 18c06c93..1324a84c 100644
--- a/Thermo.Active.Database/Migrations/Configuration.cs
+++ b/Thermo.Active.Database/Migrations/Configuration.cs
@@ -45,14 +45,17 @@ namespace Thermo.Active.Database.Migrations
 
                // Main Areas
                new FunctionAccessModel() { Name = "productionArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
-               new FunctionAccessModel() { Name = "reportArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, ReadLevelMin = 1, PlcId = 0 },
                new FunctionAccessModel() { Name = "alarmsArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 },
                new FunctionAccessModel() { Name = "maintenanceArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 },
                new FunctionAccessModel() { Name = "scadaArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 },
                new FunctionAccessModel() { Name = "usersArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, ReadLevelMin = 1, PlcId = 0 },
-               new FunctionAccessModel() { Name = "jobeditorArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
                new FunctionAccessModel() { Name = "utilitiesArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 },
+               new FunctionAccessModel() { Name = "setupArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
+               new FunctionAccessModel() { Name = "progrpreriscArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
                new FunctionAccessModel() { Name = "thermoHoodArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, ReadLevelMin = 1, PlcId = 0 },
+               new FunctionAccessModel() { Name = "modal-load-programArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
+               
+
 
                // thermo functions
                new FunctionAccessModel() { Name = RECIPE_MANAGER, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 }
diff --git a/Thermo.Active/wwwroot/assets/styles/base/processo.less b/Thermo.Active/wwwroot/assets/styles/base/processo.less
index ea18b250..a212516d 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/processo.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/processo.less
@@ -22,10 +22,9 @@
     .tab-header {
       width: 70%;
       display: grid;
-      grid-template-columns: repeat(auto-fit, minmax(160px, 200px));
+      display: flex;
       align-items: center;
       justify-content: flex-end;
-      grid-column-gap: 10px;
 
       .totp{
         margin-right: 10px;
@@ -36,6 +35,7 @@
         border-radius: 2px;
         background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
         height: 48px;
+        width: 150px;
         
         span {
           margin: auto;
@@ -54,6 +54,8 @@
         justify-self: flex-end;
         font-size: 32px;
         line-height: 1;
+        width: 150px;
+        margin-left: 30px;
         div{          
           display: flex;
           justify-content: center;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 0b51d290..6e9f8bef 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -5463,10 +5463,9 @@ article .box .body {
 .modal.processo-info header .tab-header {
   width: 70%;
   display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(160px, 200px));
+  display: flex;
   align-items: center;
   justify-content: flex-end;
-  grid-column-gap: 10px;
 }
 .modal.processo-info header .tab-header .totp {
   margin-right: 10px;
@@ -5476,6 +5475,7 @@ article .box .body {
   border-radius: 2px;
   background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%);
   height: 48px;
+  width: 150px;
 }
 .modal.processo-info header .tab-header button span {
   margin: auto;
@@ -5491,6 +5491,8 @@ article .box .body {
   justify-self: flex-end;
   font-size: 32px;
   line-height: 1;
+  width: 150px;
+  margin-left: 30px;
 }
 .modal.processo-info header .tab-header label div {
   display: flex;
diff --git a/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts b/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts
index 1cc8fed6..2c9899d2 100644
--- a/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts
+++ b/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts
@@ -67,7 +67,7 @@ export default class Login extends Vue {
     })
   }
 
-  checkIfUserIsAuthorized(): boolean {      
+  checkIfUserIsAuthorized(): boolean {  
     return machineStatusActions.isAreaVisible(store, this.URLS_TO_FUNCTIONS_BINDING[this.$route.path]);
   }
 
@@ -75,17 +75,14 @@ export default class Login extends Vue {
     return machineStatusActions.isAreaVisible(store, "thermoHood");
   }
   
-
   URLS_TO_FUNCTIONS_BINDING = {
     "/production": "production",
-    "/tooling": "tooling",
-    "/report": "report",
     "/alarms": "alarms",
     "/maintenance": "maintenance",
-    "/scada": "scada",
     "/users": "users",
-    "/jobeditor": "job-editor",
-    "/utilities": "utilities"
+    "/setup": "setup",
+    "/progrprerisc": "progrprerisc",
+    "/modal-load-program": "modal-load-program",
   }
 }
 
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue
index c01f8768..e98935fa 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/io/io.vue
@@ -5,13 +5,14 @@
 			<div class="row-list">
 				<a @click="scrollto(true,`input-pinned`)">Pinned</a>
 				<template v-for="(group, idx) in ['di','ai']">
-					<a
-						@click="scrollto(true,`input-${group}-${inputid}`)"
-						class="upper"
-						v-for="(inputid, idx2) in config[group]"
-						v-if="isConfigVisible(group,inputid)" 
-						:key="`h-${idx}-${idx2}`"
-					>{{`${group} ${inputid}`}}</a>
+					<template v-for="(inputid, idx2) in config[group]">
+						<a
+							@click="scrollto(true,`input-${group}-${inputid}`)"
+							class="upper"						
+							v-if="isConfigVisible(group,inputid)" 
+							:key="`h-${idx}-${idx2}`"
+						>{{`${group} ${inputid}`}}</a>
+				</template>
 				</template>
 			</div>
 			<InputTable></InputTable>
@@ -21,13 +22,14 @@
 			<div class="row-list">
 				<a @click="scrollto(false,`output-pinned`)">Pinned</a>
 				<template v-for="(group, idx) in ['do','ao']">
-					<a
-						@click="scrollto(false,`output-${group}-${inputid}`)"
-						class="upper"
-						v-for="(inputid, idx2) in config[group]"
-						v-if="isConfigVisible(group,inputid)" 
-						:key="`h-${idx}-${idx2}`"
-					>{{`${group} ${inputid}`}}</a>
+					<template v-for="(inputid, idx2) in config[group]">
+						<a
+							@click="scrollto(false,`output-${group}-${inputid}`)"
+							class="upper"							
+							v-if="isConfigVisible(group,inputid)" 
+							:key="`h-${idx}-${idx2}`"
+						>{{`${group} ${inputid}`}}</a>
+					</template>
 				</template>
 			</div>
 			<OutputTable></OutputTable>
diff --git a/Thermo.Active/wwwroot/src/components/Home.ts b/Thermo.Active/wwwroot/src/components/Home.ts
deleted file mode 100644
index 9bc4eb10..00000000
--- a/Thermo.Active/wwwroot/src/components/Home.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-
-import { store, machineStatusActions } from "@/store";
-
-import { machineService } from "@/services/machineService";
-import { loginService } from "@/services/loginService";
-import Vue from "vue";
-import Component from "vue-class-component";
-
-@Component({})
-export default class Home extends Vue{
-
-
-    URLS_TO_FUNCTIONS_BINDING : {
-        "/production": "production",
-        "/tooling": "tooling",
-        "/report": "report",
-        "/alarms": "alarms",
-        "/maintenance": "maintenance",
-        "/scada": "scada",
-        "/users": "users",
-        "/jobeditor": "job-editor",
-        "/utilities": "utilities"
-      };
-
-
-  mounted(){
-    let machine = new machineService();
-
-    loginService.getAuthorizationFunction()
-      .then(() => {
-          // If not authorized redirect to the first available page
-          if(!machineStatusActions.userCanAccessToArea(store, this.URLS_TO_FUNCTIONS_BINDING["/production"])) {
-            for(var k in this.URLS_TO_FUNCTIONS_BINDING) {
-              if(machineStatusActions.userCanAccessToArea(store, this.URLS_TO_FUNCTIONS_BINDING[k])) {   
-                this.$router.push(this.URLS_TO_FUNCTIONS_BINDING[k])
-                break;
-              }
-            }
-          }
-          else {
-            this.$router.push("production")
-          }
-      });     
-  }
-};
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/components/Home.vue b/Thermo.Active/wwwroot/src/components/Home.vue
index 2f0ffd00..7c66bd21 100644
--- a/Thermo.Active/wwwroot/src/components/Home.vue
+++ b/Thermo.Active/wwwroot/src/components/Home.vue
@@ -1,4 +1,46 @@
 <template>
 </template>
 
-<script src="./Home.ts" lang="ts" />
+<script>
+
+import { store, machineStatusActions } from "src/store";
+
+import { machineService } from "src/services/machineService";
+import { loginService } from "src/services/loginService";
+
+export default {
+  components: {  },
+  data() {
+    return {
+      URLS_TO_FUNCTIONS_BINDING : {
+        "/production": "production",
+        "/modal-load-program": "modal-load-program",
+        "/setup": "setup",
+        "/alarms": "alarms",
+        "/maintenance": "maintenance",
+        "/progrprerisc": "progrprerisc",
+        "/users": "users",
+      }
+    };
+  },
+  mounted: function(){
+    let machine = new machineService();
+
+    loginService.getAuthorizationFunction()
+      .then(() => {
+          // If not authorized redirect to the first available page
+          if(!machineStatusActions.userCanAccessToArea(store, this.URLS_TO_FUNCTIONS_BINDING["/production"])) {
+            for(var k in this.URLS_TO_FUNCTIONS_BINDING) {
+              if(machineStatusActions.userCanAccessToArea(store, this.URLS_TO_FUNCTIONS_BINDING[k])) {   
+                this.$router.push(this.URLS_TO_FUNCTIONS_BINDING[k])
+                break;
+              }
+            }
+          }
+          else {
+            this.$router.push("production")
+          }
+      });     
+  }
+};
+</script>
\ 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 d3cff980..d2860f9f 100644
--- a/Thermo.Active/wwwroot/src/modules/app-footer.vue
+++ b/Thermo.Active/wwwroot/src/modules/app-footer.vue
@@ -5,7 +5,7 @@
 				@click="openProgram('/modal-load-program')"
 				:title="'footer_tooltip_ricetta' | localize('Apertura Ricetta')"
 				:disabled="false"
-				v-if="true"
+				v-if="isAreaVisible('modal-load-program')"
 				class="oval ricetta"
 				:class="{ big:isInPath('modal-load-program') && !state.isMainViewLiftedUp}"
 			></button>
@@ -14,7 +14,7 @@
 				@click="openProgram('/setup')"
 				:title="'footer_tooltip_setup' | localize('Setup')"
 				:disabled="false"
-				v-if="true"
+				v-if="isAreaVisible('setup')"
 				class="oval jobeditor"
 				:class="{ big:isInPath('setup') && !state.isMainViewLiftedUp}"
 			></button>
@@ -23,7 +23,7 @@
 				@click="openProgram('/production')"
 				:title="'footer_tooltip_production' | localize('Production')"
 				:disabled="false"
-				v-if="true"
+				v-if="isAreaVisible('production')"
 				class="oval main-production"
 				:class="{ big:(isInPath('production') || isInMainPage()) && !state.isMainViewLiftedUp}"
 			></button>
@@ -42,7 +42,7 @@
 				@click="openProgram('/progrprerisc')"
 				:title="'footer_tooltip_progr_prerisc' | localize('Programmazione Preriscaldo')"
 				:disabled="false"
-				v-if="true"
+				v-if="isAreaVisible('progrprerisc')"
 				class="oval progrprerisc"
 				:class="{ big:isInPath('progrprerisc') && !state.isMainViewLiftedUp}"
 			></button>
@@ -119,22 +119,5 @@
 			><img src="assets/icons/png/auto.png" />{{'run_auto' | localize("Auto")}}</button>
 		</div>
 	</footer>
-
-	<!--
-		<div class="machine-area">
-			<button
-				class="under"
-				@mouseup="toggleMainView()"
-				:class="{'pressed':state.isMainViewLiftedUp}"
-				:title="'footer_tooltip_under_hood' | localize('Open/Close Under-the-hood area')"
-			>
-				<img src="assets/icons/png/siemens-logo.png" v-if="isSiemens()" />
-				<img src="assets/icons/png/fanuc-logo.png" v-if="isFanuc()" />
-				<img src="assets/icons/png/osai-logo.png" v-if="isOsai()" />
-				<span v-if="isDemo()" class="btn-demo">DEMO</span>
-			</button>
-		</div>
-	</footer>
-	-->
 </template>
 <script lang="ts" src="./app-footer.ts"></script>
diff --git a/Thermo.Active/wwwroot/src/store/machineStatus.store.ts b/Thermo.Active/wwwroot/src/store/machineStatus.store.ts
index 94005915..a88b51c5 100644
--- a/Thermo.Active/wwwroot/src/store/machineStatus.store.ts
+++ b/Thermo.Active/wwwroot/src/store/machineStatus.store.ts
@@ -364,10 +364,13 @@ export const machineStatusStore = {
         }
       }
 
+      //Patch per Thermoactive N.C.
+      if(areaname == 'setup' || areaname == 'modal-load-program')
+        return areaUserEnabled;
+
       for (const key in areaconfig) {
         if (areaconfig.hasOwnProperty(key)) {
           const config = areaconfig[key];
-
           if (config && config.name && config.name == areaname) {
             if (inBrowser) return config.allowExternalBrowser && config.enabled && areaUserEnabled;
             return config.enabled && areaUserEnabled;

From 5205593f9fe9748e98087c20e4b1afe8047cf3e8 Mon Sep 17 00:00:00 2001
From: = <paolo@teamdev.it>
Date: Thu, 25 Feb 2021 15:53:35 +0100
Subject: [PATCH 9/9] fix modale dettaglio thermo - mancano misure reali

---
 .../assets/icons/png/termo-inspection.png     | Bin 0 -> 6381 bytes
 Thermo.Active/wwwroot/src/@types/prod.cs.d.ts |   1 +
 .../base-components/thermoProphet-modal.css   |  21 +++++++++-
 .../base-components/thermoProphet-modal.less  |  22 +++++++++-
 .../base-components/thermoProphet-modal.ts    |  39 ++++++++++--------
 .../base-components/thermoProphet-modal.vue   |  16 +++++--
 6 files changed, 76 insertions(+), 23 deletions(-)
 create mode 100644 Thermo.Active/wwwroot/assets/icons/png/termo-inspection.png

diff --git a/Thermo.Active/wwwroot/assets/icons/png/termo-inspection.png b/Thermo.Active/wwwroot/assets/icons/png/termo-inspection.png
new file mode 100644
index 0000000000000000000000000000000000000000..af8d440d6d2b91904e62f679eb94320744cc5d24
GIT binary patch
literal 6381
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

literal 0
HcmV?d00001

diff --git a/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts b/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts
index a89fae0f..e174c3a9 100644
--- a/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts
+++ b/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts
@@ -14,6 +14,7 @@ declare module Prod {
     vacuumReadVal: number;
     mouldEnergyOUT: number;// Generated by https://quicktype.io
     isScrap: boolean;
+    thermoImage: string;
   }
 
   interface IProdPanel {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.css b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.css
index b4e9ae63..94a0aa56 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.css
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.css
@@ -2,6 +2,25 @@
   width: 990px;
   height: 835px;
 }
+.modal.prophetimages .measure {
+  position: absolute;
+  background-image: url(/assets//icons/png/termo-inspection.png);
+  width: 72px;
+  height: 56px;
+  background-size: cover;
+  transform: translateX(-36px) translateY(-12px);
+}
+.modal.prophetimages .measure > span {
+  font-size: 18px;
+  font-weight: bold;
+  color: #002680;
+  position: absolute;
+  height: 21px;
+  bottom: 3px;
+  left: 6px;
+  right: 6px;
+  text-align: right;
+}
 .modal.prophetimages header {
   padding: 0 16px;
   display: flex;
@@ -26,7 +45,7 @@
   width: 100%;
   height: 100%;
 }
-.modal.prophetimages section .imagecontainer span {
+.modal.prophetimages section .imagecontainer > span {
   position: absolute;
   bottom: -20px;
   width: 400px;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less
index 3e88190e..83303f15 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less
@@ -1,4 +1,24 @@
 .modal.prophetimages {
+  .measure {
+    position: absolute;
+    background-image: url(/assets//icons/png/termo-inspection.png);
+    width: 72px;
+    height: 56px;
+    background-size: cover;
+    transform: translateX(-36px) translateY(-12px);
+    > span {
+      font-size: 18px;
+      font-weight: bold;
+      color: #002680;
+      position: absolute;
+      height: 21px;
+      bottom: 3px;
+      left: 6px;
+      right: 6px;
+      text-align: right;
+    }
+  }
+
   header {
     padding: 0 16px;
     display: flex;
@@ -24,7 +44,7 @@
         width: 100%;
         height: 100%;
       }
-      span {
+      > span {
         position: absolute;
         bottom: -20px;
         width: 400px;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
index af7d9a35..1be49a38 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
@@ -3,6 +3,9 @@ import Vue from "vue";
 import { ModalHelper, Modal } from "@/components/modals";
 import { Prop, Watch } from "vue-property-decorator";
 import { warmersService } from "@/services/warmersService";
+import { prodService } from "@/services/prodService";
+import { AppModel } from "@/store";
+import { debounce } from "@/_base/debounce";
 
 @Component({
   components: { modal: Modal },
@@ -22,32 +25,31 @@ export default class ThermoModal extends Vue {
   }
 
   measurePoints: {
-    x: number, y: number, temp: number
+    x: number, y: number, temperature: number
   }[] = [];
 
   showPreview = 0;
   selectedImage: number = 0;
   serverPath = "/thermoprophet/colored";
-  images = ['20201104-163047.jpg',
-    '20201116-104042.jpg',
-    '20201116-104305.jpg',
-    '20201116-104529.jpg',
-    '20201116-104756.jpg',
-    '20201116-105023.jpg',
-    '20201116-105251.jpg',
-    '20201116-105520.jpg',
-    '20201116-105751.jpg',
-    '20201116-110020.jpg',
-    '20201116-110349.jpg',
-    '20201116-110618.jpg'];
+  items: Prod.IProd[] = [];
+  get images() {
+    return this.items.map(i => i.thermoImage)
+  }
 
   close() {
     ModalHelper.HideModal("modal2");
   }
 
+  get lastItem() {
+    return (this.$store.state as AppModel).prod.prod;
+  }
+
   async mounted() {
     this.TCamData = await warmersService.GetTCamData();
     await warmersService.ResetMeasurePoints();
+
+    let min = Math.min(this.lastItem.numDone);
+    this.items.push(...await prodService.History(min - 1, min - 1))
   }
 
   async imageclick(evt: MouseEvent) {
@@ -57,11 +59,14 @@ export default class ThermoModal extends Vue {
     let y = (evt.offsetY / t.clientHeight) * t.naturalHeight;
 
     await warmersService.SetMeasurePoints(x, y);
-    await this.ReloadMeasures();
+    this.measurePoints.push({ x, y, temperature: 0 })
+    this.reloadMeasuresDelayed();
   }
 
   @Watch("selectedImage")
-  async ReloadMeasures() {
-    this.measurePoints = await warmersService.GetMeasurePoints(this.images[this.selectedImage])
-  }
+  reloadMeasuresDelayed = debounce(async () => this.measurePoints = await warmersService.GetMeasurePoints(this.images[this.selectedImage]), 500);
+
+
+
+
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue
index 5bae8103..13145b32 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue
@@ -4,15 +4,22 @@
 			<i class="fa fa-remove"></i>
 		</button>
 		<div class="imagecontainer">
-			<img :src="`${serverPath}/${images[parseInt(selectedImage)]}`" @click="imageclick" />
+			<img
+				:src="`${serverPath}/${images[parseInt(selectedImage)]}.jpg`"
+				@click="imageclick"
+				v-if="images.length"
+				ref="mainimage"
+			/>
 			<span>{{'thermo-long-tap-info' | localize("Long tap on image to add temperature inspectors")}}</span>
 
 			<div
 				class="measure"
-				:style="`left:${m.x}px; top:${m.y}px`"
+				:style="`left:${m.x / $refs.mainimage.naturalWidth * $refs.mainimage.clientWidth }px; top:${m.y/ $refs.mainimage.naturalHeight * $refs.mainimage.clientHeight}px`"
 				v-for="(m,idx) in measurePoints"
 				:key="idx"
-			>{{m.temp}} °C</div>
+			>
+				<span>{{m.temperature}} °C</span>
+			</div>
 		</div>
 		<div class="color-bar">
 			<div class="color-line"></div>
@@ -26,12 +33,13 @@
 				<time>{{'last-image' | localize("Last image")}}</time>-->
 			</div>
 			<img
-				:src="`${serverPath}/${images[parseInt(selectedImage)]}`"
+				:src="`${serverPath}/${images[parseInt(selectedImage)]}.jpg`"
 				v-if="showPreview"
 				class="selector"
 				:style="`left:${(parseInt(selectedImage) / (images.length-1)) * 858}px`"
 			/>
 			<input
+				v-if="images.length"
 				type="range"
 				:min="0"
 				:max="images.length-1"