Merge remote-tracking branch 'origin/develop' into new/ThermoCamManager

Thermo.Active.NC/NcAdapter.cs

@@ -2599,7 +2599,7 @@ namespace Thermo.Active.NC
 
                 using (HistorySheetsController HSC = new HistorySheetsController())
                 {
-                    HSC.Create(NcFileAdapter.RecipeLiveData.RecipeName, prodInfoData.NumDone, (float) sheetRaw.Value1, (float) sheetRaw.Value2, (float) sheetRaw.Value3,sheetRaw.TypeVal);
+                    HSC.Create(NcFileAdapter.RecipeLiveData.RecipeName, sheetRaw.IdPiece, (float) sheetRaw.Value1, (float) sheetRaw.Value2, (float) sheetRaw.Value3,sheetRaw.TypeVal);
 
                     // manage strobe/ack!
                     libraryError = numericalControl.PLC_WAckHistorySheets();

Thermo.Active/Properties/AssemblyInfo.cs

@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.191")]
+[assembly: AssemblyVersion("1.1.192")]

Thermo.Active/wwwroot/assets/styles/base/modals.less

@@ -3578,11 +3578,14 @@
     display: flex;
     justify-content: center;
     align-items: center;
+    &:active{
+      background-image: linear-gradient(to bottom,#002680,  #1756ad);
+
+    }
   }
 
   button:disabled {
     background-color: #002680 !important;
-    ;
     filter: grayscale(100%);
   }
 

Thermo.Active/wwwroot/assets/styles/style.css

@@ -3758,6 +3758,9 @@ article .box .body {
   justify-content: center;
   align-items: center;
 }
+.imageViewerZoom button:active {
+  background-image: linear-gradient(to bottom, #002680, #1756ad);
+}
 .imageViewerZoom button:disabled {
   background-color: #002680 !important;
   filter: grayscale(100%);

Thermo.Active/wwwroot/src/app.business-logic.ts

@@ -67,9 +67,11 @@ async function loadMachineConfig() {
     machineStatusActions.setAreasConfg(store, result);
 
     let mcresult = await machine.getMachineConfiguration();
-    await underTheHoodService.getChannelsConfig();
-    await warmersService.GetResistances();
     machineStatusActions.setWarmersParameters(store, mcresult.additionalParameters);
+    await warmersService.GetResistances();
+
+    await underTheHoodService.getChannels();
+    await underTheHoodService.getChannelsConfig();
 
 
     // load default language

Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="svg-area">			
-		<svg xmlns="http://www.w3.org/2000/svg" width="1057" height="707" viewBox="0 0 1100 707">
+		<svg xmlns="http://www.w3.org/2000/svg" width="1057" height="707" viewBox="-50 0 1150 707">
 			<g fill="none" fill-rule="evenodd">
 				<g>
 					<g>

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts

@@ -35,6 +35,11 @@ export default class Thermocamera extends Vue {
   timeoutLastTakenImage = 0;
   timeCamDiff = " ";
 
+  tcamBTNStatus:{
+    enabled: boolean,
+    visible: boolean
+  } = {enabled : false, visible: true};
+
   TCamData: {
     imageSize: { x: number, y: number },
     rangeTemperature: { max: number, min: number },
@@ -45,12 +50,10 @@ export default class Thermocamera extends Vue {
 
   @Watch("warmers", { deep: true })
   async ChangedTemps() {
-
-
-    this.btnModeEnabled = false;
+    this.tcamBTNStatus.enabled = false;
     for (const ch of store.state.warmers.channels) {
-      if (ch.tCamTempSet > 0) {
-        this.btnModeEnabled = true;
+      if (ch.tCamTempSet > 0 && ch.tCamActive) {
+        this.tcamBTNStatus.enabled = true;
         break;
       }
     }

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.vue

@@ -79,7 +79,7 @@
 
 					<div class="input-area grid left">
 						<label>{{'warmers_thermoprophet_Enabled' | localize('Thermoprophet')}}</label>
-						<toggle-button v-model="thermocameraModeBTN"></toggle-button>
+						<toggle-button v-model="thermocameraModeBTN" :status="tcamBTNStatus"></toggle-button>
 					</div>
 
 					<!-- <div class="input-area left grid">
@@ -125,7 +125,7 @@
 				</div>
 
 				<div class="tm-controls">
-					<button class="btn btn-info square" @click="forceTakeImage()">
+					<button class="btn btn-info square" @click="forceTakeImage()" :disabled="this.thermocameraModeBTN">
 						<img src="/assets/icons/png/takesnap.png" />
 					</button>
 					<button class="btn btn-info square" @click="openImageModal()">
@@ -148,7 +148,7 @@
 				</div>
 
 				<div class="buttons">
-					<button class="btn btn-info square icon" @click="zoomIn()">
+					<button class="btn btn-info square icon" @click="zoomIn()" >
 						<i class="fa fa-search-plus"></i>
 					</button>
 					<button class="btn btn-info square icon" @click="zoomReset()">

Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogMisurazioni/components/tables/log-misurazioni-table/log-misurazioni-table.ts

@@ -24,7 +24,7 @@ export default class LogMisurazioniTable extends Vue {
     else if (item == 1)
       return "PALLET HEIGHT"
     else if (item == 2)
-      return "SHEET TICKNESS"
+      return "SHEET THICKNESS"
     else if (item == 2)
       return "SHEET LENGTH"
     else

Thermo.Active/wwwroot/src/modules/base-components/modal-image.ts

@@ -16,7 +16,7 @@ export default class ModalImage extends Vue {
 
     content: string = "";
     title: string = "";
-
+    
     mounted() {
       this.content = ModalHelper.modalImage.content;
       this.title = ModalHelper.modalImage.title;

Thermo.Active/wwwroot/src/modules/base-components/zoom-image.ts

@@ -1,6 +1,7 @@
 import Vue from "vue";
 import { Prop, Component } from "vue-property-decorator";
 import { warmersService } from "@/services/warmersService";
+import { store } from '@/store';
 
 @Component([])
 export default class ZoomImage extends Vue {
@@ -43,6 +44,10 @@ export default class ZoomImage extends Vue {
   }
 
 
+  get thermocameraModeBTN(): boolean {
+    return (store.state.warmers.tCamStatus.thermoCamOnOff);
+  }
+  
   close() {
     this.$emit("close");
   }

Thermo.Active/wwwroot/src/modules/base-components/zoom-image.vue

@@ -16,7 +16,7 @@
       <button @click="close"><i class="fa fa-chevron-left" ></i></button>
     </div>
     <div class="btngroup2" v-if="true">
-      <button @click="forceTakeImage()">
+      <button @click="forceTakeImage()" :disabled="thermocameraModeBTN">
         <img src="/assets/icons/png/takesnap.png" />
       </button>
     </div>    

Thermo.Active/wwwroot/src/services/hub.ts

@@ -140,20 +140,22 @@ export class Hub {
 
     $.connection.hub.disconnected(() => {
       Hub.manageServerStatus("disconnected");
-      console.log("SERVER CONNECTION: restart-connection")
       setTimeout(function () {
-        $.connection.hub.start();
-        // $.connection.hub.start({ transport: ['serverSentEvents'] });
+        $.connection.hub.start({ transport: ['serverSentEvents'] });
       }, 5000); // Restart connection after 5 seconds.
     });
     $.connection.hub.stateChanged(async (state) => {
       if (state.newState == $.signalR.connectionState.connected) {
+        try {
+          await scadaService.ListScada();
+        }
+        catch (err)
+        { }
         Hub.manageServerStatus("connected");
       }
     })
 
-    $.connection.hub.start();
-    // $.connection.hub.start({ transport: ['serverSentEvents'] });
+    $.connection.hub.start({ transport: ['serverSentEvents'] });
 
     this.checkShowAxes();
 
@@ -242,7 +244,6 @@ export class Hub {
     let authData = JSON.parse(window.localStorage.getItem("authorizationData") || window.sessionStorage.getItem("authorizationData")) as AuthToken;
 
     $.connection.hub.qs = {};
-    console.log(authData);
     if (authData)
       $.connection.hub.qs.Authorization = authData.access_token;
 
@@ -381,7 +382,6 @@ export class Hub {
       var toast = document.querySelector('#serverConnection') as any;
       (iziToast as any).hide(toast);
       Hub._serverConnectionNotificationVisible = false;
-      try { await scadaService.ListScada(); } catch (err) { }
       messageService.publishToChannel("force-ui-update", null);
     }
   }