From 6dc778bbf3b7dda86da64be89750521f9557725a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 22 Sep 2020 11:59:27 +0200 Subject: [PATCH 1/3] ricompilazione x refresh vue --- Thermo.Active/Controllers/WebApi/RecipeController.cs | 12 +++++++++++- Thermo.Active/Listeners/SignalR/SignalRListener.cs | 1 - Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Thermo.Active/Controllers/WebApi/RecipeController.cs b/Thermo.Active/Controllers/WebApi/RecipeController.cs index 92dcbbfd..1577360e 100644 --- a/Thermo.Active/Controllers/WebApi/RecipeController.cs +++ b/Thermo.Active/Controllers/WebApi/RecipeController.cs @@ -294,6 +294,16 @@ namespace Thermo.Active.Controllers.WebApi // update current live data! NcFileAdapter.SaveRecipeCurrent(); + + // invio dati! + DTORecipeStatus message = new DTORecipeStatus() + { + recipeName = NcAdapter.RecipeLiveData.RecipeName, + hasChanged = NcAdapter.RecipeLiveData.hasChanged, + forceSend = true + }; + MessageServices.Current.Publish(SEND_THERMO_RECIPE_CHANGED, null, message); + CmsError libraryError = WriteCurrentRecipeToPlc(); if (libraryError.IsError()) { @@ -413,7 +423,7 @@ namespace Thermo.Active.Controllers.WebApi // e salvo su disco NcFileAdapter.SaveRecipe(newName, NcAdapter.RecipeLiveData); - // invio PRIMA invertendo campo modificata (x forzare invio) + // invio dati DTORecipeStatus message = new DTORecipeStatus() { recipeName = NcAdapter.RecipeLiveData.RecipeName, diff --git a/Thermo.Active/Listeners/SignalR/SignalRListener.cs b/Thermo.Active/Listeners/SignalR/SignalRListener.cs index d191e96d..32901e86 100644 --- a/Thermo.Active/Listeners/SignalR/SignalRListener.cs +++ b/Thermo.Active/Listeners/SignalR/SignalRListener.cs @@ -309,7 +309,6 @@ namespace Thermo.Active.Listeners.SignalR public static void SendThermoRecipeChangedData(object message) { DTORecipeStatus currMessage = message as DTORecipeStatus; - if (currMessage.hasChanged != recipeHasChanged || currMessage.forceSend) { // salvo update diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index d4a1d8c9..803f73e6 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/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("0.16.90")] \ No newline at end of file +[assembly: AssemblyVersion("0.16.91")] \ No newline at end of file From bf4487909c902241c483835c90965f8a9a551773 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 22 Sep 2020 12:50:36 +0200 Subject: [PATCH 2/3] event gantt --- .../wwwroot/src/app_modules_thermo/components/numeric.ts | 1 - .../wwwroot/src/app_modules_thermo/dashboard/dashboard.ts | 1 - .../processo/components/gantt/gantt-component.vue | 6 +++++- .../setup/riscaldi/components/base-components/warmers.ts | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.ts index 42dba465..5643cbd6 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/numeric.ts @@ -34,7 +34,6 @@ export default class Numeric extends Vue { } set Value(v: number) { - debugger try { let scale = Math.pow(10, this.value.numDec ?? 0); let result = Math.round(v * scale) / scale; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts index 50588d81..013caf0c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts @@ -159,7 +159,6 @@ export default class Dashboard extends Vue { } sendSoftKey(id: string) { - debugger var sk = this.allSoftKeys.find(s => s.refCallParam == id); if (sk) Hub.Current.sendUserSoftKey(sk.id); diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue index 30efe406..2cce4de9 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue @@ -36,7 +36,11 @@ x="0" y="0" > -
{{value.label | localize(value.label)}}
+
{{value.label | localize(value.label)}}
Date: Tue, 22 Sep 2020 14:09:55 +0200 Subject: [PATCH 3/3] vers 92 --- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index 803f73e6..0d273672 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/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("0.16.91")] \ No newline at end of file +[assembly: AssemblyVersion("0.16.92")] \ No newline at end of file