From 7522d18a7be66e6c05f11bb5ece974876e4da125 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 31 Mar 2023 12:11:26 +0200
Subject: [PATCH] Update nuget + fix calcolo decimali valori counters in ore

---
 MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj  | 2 +-
 MP.MONO.ANALYZER/Resources/ChangeLog.html | 2 +-
 MP.MONO.ANALYZER/Resources/VersNum.txt    | 2 +-
 MP.MONO.ANALYZER/Resources/manifest.xml   | 2 +-
 MP.MONO.DECODER/MP.MONO.DECODER.csproj    | 2 +-
 MP.MONO.DECODER/Program.cs                | 9 +++++----
 MP.MONO.DECODER/Resources/ChangeLog.html  | 2 +-
 MP.MONO.DECODER/Resources/VersNum.txt     | 2 +-
 MP.MONO.DECODER/Resources/manifest.xml    | 2 +-
 MP.MONO.DECODER/lua/CountersDecoder.lua   | 8 ++++----
 MP.MONO.SIM/MP.MONO.SIM.csproj            | 2 +-
 MP.MONO.SIM/Resources/ChangeLog.html      | 2 +-
 MP.MONO.SIM/Resources/VersNum.txt         | 2 +-
 MP.MONO.SIM/Resources/manifest.xml        | 2 +-
 MP.MONO.UI/MP.MONO.UI.csproj              | 4 ++--
 MP.MONO.UI/Resources/ChangeLog.html       | 2 +-
 MP.MONO.UI/Resources/VersNum.txt          | 2 +-
 MP.MONO.UI/Resources/manifest.xml         | 2 +-
 18 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index e179064..433c145 100644
--- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.2.2303.3111</Version>
+    <Version>1.2.2303.3112</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index dff69bc..2a7c25e 100644
--- a/MP.MONO.ANALYZER/Resources/ChangeLog.html
+++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.2.2303.3111</h4>
+    <h4>Version: 1.2.2303.3112</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index ee43d05..be2a2bf 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.3111
+1.2.2303.3112
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index 8916719..252e63d 100644
--- a/MP.MONO.ANALYZER/Resources/manifest.xml
+++ b/MP.MONO.ANALYZER/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.2.2303.3111</version>
+  <version>1.2.2303.3112</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index 43d2283..f233458 100644
--- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj
+++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.2.2303.3111</Version>
+    <Version>1.2.2303.3112</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs
index cbb382c..7ad2525 100644
--- a/MP.MONO.DECODER/Program.cs
+++ b/MP.MONO.DECODER/Program.cs
@@ -1606,20 +1606,21 @@ void CounterRecvPipe_EA_NewMessage(object? sender, EventArgs e)
             //int valInt = 0;
             if (dataList != null)
             {
-                // chiamo metodo CounterManager...
+                // chiamo metodo CounterManager... incrementi in MINUTI!!!
                 var incrSet = counterMan.processData(dataList);
                 if (incrSet != null)
                 {
                     foreach (var item in incrSet)
                     {
-                        // verifico i valori > soglia 1/2 minuto...
-                        if (item.Value > 0.5)
+                        // verifico i valori > soglia 1 minuto...
+                        if (item.Value > 1)
                         {
                             // salvo
                             var countRec = countStatus.Where(x => x.CCode == item.Key || x.CodAlias == item.Key).FirstOrDefault();
                             if (countRec != null)
                             {
-                                countRec.ActualVal = countRec.ActualVal + item.Value;
+                                // attenzione valori in ore, incrementi in minuti!
+                                countRec.ActualVal = Math.Round(countRec.ActualVal + item.Value/60, 3);
                                 // resetto
                                 counterMan.resetAccum(item.Key);
                             }
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index dff69bc..2a7c25e 100644
--- a/MP.MONO.DECODER/Resources/ChangeLog.html
+++ b/MP.MONO.DECODER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.2.2303.3111</h4>
+    <h4>Version: 1.2.2303.3112</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index ee43d05..be2a2bf 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.3111
+1.2.2303.3112
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index 1315ff4..a8dd62f 100644
--- a/MP.MONO.DECODER/Resources/manifest.xml
+++ b/MP.MONO.DECODER/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.2.2303.3111</version>
+  <version>1.2.2303.3112</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.MONO.DECODER/lua/CountersDecoder.lua b/MP.MONO.DECODER/lua/CountersDecoder.lua
index 3f70806..4492938 100644
--- a/MP.MONO.DECODER/lua/CountersDecoder.lua
+++ b/MP.MONO.DECODER/lua/CountersDecoder.lua
@@ -2,12 +2,12 @@
 Procedura calcolo STATUS:
 
 Variabili IN:
-- lastMode
-- valList(<double>):  elenco VALORI double da processare
-- numRec(int):        conteggio numero recorda da processare
+- delta(double):            delta-time (minuti)
+- dataList(string,string):  tab stati (previus)
+- countAcc(string,double):  tab accumulatori
 
 Variabili OUT: 
-- calcVal(double):      valore calcolato finale
+- countAcc(string,double):  tab accumulatori
 -----------------------------------------------------]]
 
 
diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj
index cf00fc7..5a5e267 100644
--- a/MP.MONO.SIM/MP.MONO.SIM.csproj
+++ b/MP.MONO.SIM/MP.MONO.SIM.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.2.2303.3111</Version>
+    <Version>1.2.2303.3112</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index dff69bc..2a7c25e 100644
--- a/MP.MONO.SIM/Resources/ChangeLog.html
+++ b/MP.MONO.SIM/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.2.2303.3111</h4>
+    <h4>Version: 1.2.2303.3112</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index ee43d05..be2a2bf 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.3111
+1.2.2303.3112
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index 0ec254f..d03f3d4 100644
--- a/MP.MONO.SIM/Resources/manifest.xml
+++ b/MP.MONO.SIM/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.2.2303.3111</version>
+  <version>1.2.2303.3112</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index f04382a..52d8c92 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.2.2303.3111</Version>
+    <Version>1.2.2303.3112</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EgwCoreLib.Razor" Version="1.3.2302-beta.312" />
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2303.215" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index dff69bc..2a7c25e 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.2.2303.3111</h4>
+    <h4>Version: 1.2.2303.3112</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index ee43d05..be2a2bf 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.3111
+1.2.2303.3112
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index 0bfe927..458abbd 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.2.2303.3111</version>
+  <version>1.2.2303.3112</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
