From c655fd5b048f29cb0c1d381e50eade46218db16a Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 31 Mar 2023 14:34:45 +0200
Subject: [PATCH 1/2] fix decimali x calcolo counter in H decoder

---
 MP.MONO.DECODER/MP.MONO.DECODER.csproj   | 2 +-
 MP.MONO.DECODER/Program.cs               | 6 +++---
 MP.MONO.DECODER/Resources/ChangeLog.html | 2 +-
 MP.MONO.DECODER/Resources/VersNum.txt    | 2 +-
 MP.MONO.DECODER/Resources/manifest.xml   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index f233458..6bd0283 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.3112</Version>
+    <Version>1.2.2303.3114</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs
index 7ad2525..e9bf6d1 100644
--- a/MP.MONO.DECODER/Program.cs
+++ b/MP.MONO.DECODER/Program.cs
@@ -1612,15 +1612,15 @@ void CounterRecvPipe_EA_NewMessage(object? sender, EventArgs e)
                 {
                     foreach (var item in incrSet)
                     {
-                        // verifico i valori > soglia 1 minuto...
-                        if (item.Value > 1)
+                        // verifico i valori > soglia 5 minuti...
+                        if (item.Value > 5)
                         {
                             // salvo
                             var countRec = countStatus.Where(x => x.CCode == item.Key || x.CodAlias == item.Key).FirstOrDefault();
                             if (countRec != null)
                             {
                                 // attenzione valori in ore, incrementi in minuti!
-                                countRec.ActualVal = Math.Round(countRec.ActualVal + item.Value/60, 3);
+                                countRec.ActualVal = Math.Round(countRec.ActualVal + item.Value/60, 6);
                                 // resetto
                                 counterMan.resetAccum(item.Key);
                             }
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index 2a7c25e..f9dfae7 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.3112</h4>
+    <h4>Version: 1.2.2303.3114</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index be2a2bf..124a9da 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.3112
+1.2.2303.3114
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index a8dd62f..f45dd23 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.3112</version>
+  <version>1.2.2303.3114</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>

From c3b2e7d0cf407d68520a73d492bc3d1e26cf407e Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 31 Mar 2023 14:58:44 +0200
Subject: [PATCH 2/2] Fix UI x display classi maint rosse

---
 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.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/Components/ProgBar.razor       | 19 +++++++++++++------
 MP.MONO.UI/Components/ProgBar.razor.cs    | 18 +++++++++++++++++-
 MP.MONO.UI/MP.MONO.UI.csproj              |  2 +-
 MP.MONO.UI/Resources/ChangeLog.html       |  2 +-
 MP.MONO.UI/Resources/VersNum.txt          |  2 +-
 MP.MONO.UI/Resources/manifest.xml         |  2 +-
 14 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index 433c145..b88394c 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.3112</Version>
+    <Version>1.2.2303.3114</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index 2a7c25e..f9dfae7 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.3112</h4>
+    <h4>Version: 1.2.2303.3114</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index be2a2bf..124a9da 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.3112
+1.2.2303.3114
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index 252e63d..91c4715 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.3112</version>
+  <version>1.2.2303.3114</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.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj
index 5a5e267..ea49adc 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.3112</Version>
+    <Version>1.2.2303.3114</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index 2a7c25e..f9dfae7 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.3112</h4>
+    <h4>Version: 1.2.2303.3114</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index be2a2bf..124a9da 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.3112
+1.2.2303.3114
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index d03f3d4..9b3a8fa 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.3112</version>
+  <version>1.2.2303.3114</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/Components/ProgBar.razor b/MP.MONO.UI/Components/ProgBar.razor
index 9d62c7b..8b1f617 100644
--- a/MP.MONO.UI/Components/ProgBar.razor
+++ b/MP.MONO.UI/Components/ProgBar.razor
@@ -1,17 +1,24 @@
 ﻿@if (singleLine)
 {
     <div class="progress">
-        <div class="progress-bar @bgStyle" style="width:@(percWidth)%">@($"{currVal:N0} h | {percWidth}%")</div>
+        <div class="progress-bar @bgStyle" style="width:@(percWidthNum)%">@($"{currVal:N0} h | {percWidthNum}%")</div>
     </div>
 }
 else
 {
     <div class="text-center @textStyle">
-        <span class="@warnClass"><i class="bi bi-exclamation-triangle-fill"></i></span> <b>@currVal.ToString("N0")</b> <span class="@warnClass"><i class="bi bi-exclamation-triangle-fill"></i></span>
+        <span class="@warnClass px-1"><i class="bi bi-exclamation-triangle-fill"></i></span> <b>@currVal.ToString("N0")</b> <sup>(@($"{maxVal:N0}"))</sup><span class="@warnClass px-1"><i class="bi bi-exclamation-triangle-fill"></i></span>
     </div>
     <div class="progress">
-        <div class="progress-bar @bgStyle" style="width:@(percWidth)%">@(percWidth)%</div>
+        <div class="progress-bar @bgStyle" style="width:@(percWidh)%;">
+            @if (percWidthNum > yelLim || percWidthNum <= 0)
+            {
+                <div>@(percWidthNum)%</div>
+            }
+        </div>
+        @if (percWidthNum <= yelLim && percWidthNum > 0)
+        {
+            <div>@(percWidthNum)%</div>
+        }
     </div>
-}
-
-
+}
\ No newline at end of file
diff --git a/MP.MONO.UI/Components/ProgBar.razor.cs b/MP.MONO.UI/Components/ProgBar.razor.cs
index bee0f2e..82ad751 100644
--- a/MP.MONO.UI/Components/ProgBar.razor.cs
+++ b/MP.MONO.UI/Components/ProgBar.razor.cs
@@ -53,7 +53,23 @@ namespace MP.MONO.UI.Components
             }
         }
 
-        private int percWidth { get => (int)(100 * currVal / maxVal); }
+        private int percWidthNum { get => (int)(100 * currVal / maxVal); }
+        private int percWidh
+        {
+            get
+            {
+                int answ = percWidthNum;
+                if (answ <= 0)
+                {
+                    answ = 100;
+                }
+                //else if (answ <= redLim)
+                //{
+                //    answ = redLim;
+                //}
+                return answ;
+            }
+        }
 
         private string textStyle
         {
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index 52d8c92..3924bb6 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.3112</Version>
+    <Version>1.2.2303.3114</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 2a7c25e..f9dfae7 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.3112</h4>
+    <h4>Version: 1.2.2303.3114</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index be2a2bf..124a9da 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.3112
+1.2.2303.3114
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index 458abbd..460eb7f 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.3112</version>
+  <version>1.2.2303.3114</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>
