From 676a4951240aeabfa92e75153fa2e5e3c95a388e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 May 2023 15:05:35 +0200 Subject: [PATCH 1/4] Cache tab stati (durata) a 5 sec --- MP-Site/WebUserControls/mod_statoMacchina.ascx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs index 44ea1f0a..68d50afe 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs @@ -339,7 +339,7 @@ namespace MP_SITE.WebUserControls { answ = DataLayerObj.taDatiStatoMacch.GetData(IdxMacchina, 0.1)[0]; rawData = JsonConvert.SerializeObject(answ); - memLayer.ML.setRSV(redKey, rawData, 30); + memLayer.ML.setRSV(redKey, rawData, 5); } return answ; } From a0c234acc41428d28ce8d31291b79ff0e863b299 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 May 2023 15:09:56 +0200 Subject: [PATCH 2/4] Ancora update MP-SITE --- MP-Site/WebUserControls/mod_statoMacchina.ascx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs index 68d50afe..7c535ef9 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs @@ -401,7 +401,7 @@ namespace MP_SITE.WebUserControls try { var rigaStatoCurr = rigaStato(); - idxStato = rigaStatoCurr.idxStato; + idxStato = tabMSE[0].idxStato; oreTot = Convert.ToInt32(Math.Floor(rigaStatoCurr.Minuti / 60)); minuti = (float)rigaStatoCurr.Minuti - 60 * oreTot; } From fe0b742281ac4a2899ab6ad20285eb4d55829032 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 May 2023 15:40:15 +0200 Subject: [PATCH 3/4] MP-STATS: Spostamento funzione calcolo stato da MSE a resoconti --- MP-Site/WebUserControls/mod_statoMacchina.ascx.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs index 7c535ef9..cfa2a285 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs @@ -401,7 +401,9 @@ namespace MP_SITE.WebUserControls try { var rigaStatoCurr = rigaStato(); - idxStato = tabMSE[0].idxStato; + //idxStato = rigaStatoCurr.idxStato; + //idxStato = tabMSE[0].idxStato; + idxStato = resoconti.mngr.statoMacchina(_IdxMacchina); oreTot = Convert.ToInt32(Math.Floor(rigaStatoCurr.Minuti / 60)); minuti = (float)rigaStatoCurr.Minuti - 60 * oreTot; } @@ -413,7 +415,9 @@ namespace MP_SITE.WebUserControls minuti = (int)tabMSE[0].durata - 60 * oreTot; } // 2018.02.05 cambio x fix nuovi impianti - valStato.Text = tabMSE[0].DescrizioneStato; + //valStato.Text = tabMSE[0].DescrizioneStato; + //2023.05.06 fix da resoconti + valStato.Text = resoconti.mngr.statoDaIdx(idxStato); valDurata.Text = $"{oreTot}h {minuti:N2}min"; // solo se in stato NON di run... if (idxStato != 13) From cf26f4c1c30ef107a6d9ec27807de2b6a1d5bacc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 May 2023 15:53:27 +0200 Subject: [PATCH 4/4] Fix: ritorno a MSE --- .../WebUserControls/mod_statoMacchina.ascx.cs | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs index cfa2a285..a424c639 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs @@ -398,26 +398,28 @@ namespace MP_SITE.WebUserControls int idxStato = 0; int oreTot = 0; float minuti = 0; +#if false try { var rigaStatoCurr = rigaStato(); //idxStato = rigaStatoCurr.idxStato; - //idxStato = tabMSE[0].idxStato; - idxStato = resoconti.mngr.statoMacchina(_IdxMacchina); + //idxStato = resoconti.mngr.statoMacchina(_IdxMacchina); + idxStato = tabMSE[0].idxStato; oreTot = Convert.ToInt32(Math.Floor(rigaStatoCurr.Minuti / 60)); minuti = (float)rigaStatoCurr.Minuti - 60 * oreTot; } catch - { - // 2018.02.05 cambio x fix nuovi impianti - idxStato = tabMSE[0].idxStato; - oreTot = (int)tabMSE[0].durata / 60; - minuti = (int)tabMSE[0].durata - 60 * oreTot; - } + { +#endif // 2018.02.05 cambio x fix nuovi impianti - //valStato.Text = tabMSE[0].DescrizioneStato; - //2023.05.06 fix da resoconti - valStato.Text = resoconti.mngr.statoDaIdx(idxStato); + idxStato = tabMSE[0].idxStato; + oreTot = (int)tabMSE[0].durata / 60; + minuti = (int)tabMSE[0].durata - 60 * oreTot; +#if false + } +#endif + // 2018.02.05 cambio x fix nuovi impianti + valStato.Text = tabMSE[0].DescrizioneStato; valDurata.Text = $"{oreTot}h {minuti:N2}min"; // solo se in stato NON di run... if (idxStato != 13)