From 355de581996f4011ed2e37eb25148a8d3bfa700a Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Mon, 4 Sep 2023 08:38:39 +0200
Subject: [PATCH] ok progress display

---
 Resources/ChangeLog.html                          |  2 +-
 Resources/VersNum.txt                             |  2 +-
 Resources/manifest.xml                            |  2 +-
 .../Components/FilesMan/CompoCompare.razor        |  3 +--
 .../Components/FilesMan/CompoCompare.razor.cs     | 15 ++++++++++++---
 .../Components/FilesMan/DiffView.razor            | 13 ++++++++++---
 WebDoorCreator.UI/WebDoorCreator.UI.csproj        |  2 +-
 7 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index e193df0..dbf7abf 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2308.3117</h4>
+    <h4>Version: 0.9.2309.0408</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 94bcf9c..ac749f0 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2308.3117
+0.9.2309.0408
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 283b9b4..16fdaab 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2308.3117</version>
+  <version>0.9.2309.0408</version>
   <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor
index 5797840..41eafa5 100644
--- a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor
+++ b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor
@@ -26,8 +26,7 @@
 </div>
 @if (isLoading)
 {
-
-    <ProgressDisplay RefreshInterval="100" Title="@titleMsg" MaxVal="@maxVal" CurrVal="@currVal" NextVal="@nextVal" ExpTimeMSec="@expTimeMSec" DisplaySize="ProgressDisplay.ModalSize.Medium" ModalCss="card alert-primary" SlowLimit="0.4"></ProgressDisplay>
+    <ProgressDisplay Title="Salvataggio ed invio richiesta" CurrVal="@sendDataVal" MaxVal="@sendDataMaxVal" ExpTimeMSec="1000"></ProgressDisplay>
 }
 else if (files2Chk != null && files2Chk.Count() > 0)
 {
diff --git a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
index 0e7ef67..cd53b7f 100644
--- a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
+++ b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
@@ -20,6 +20,7 @@ namespace WebDoorCreator.UI.Components.FilesMan
         private Random rnd = new Random();
         private string titleMsg = "Scanning directories";
 
+#if false
         protected async Task StartLongTimer()
         {
             double stdWait = expTime / numSteps;
@@ -49,7 +50,8 @@ namespace WebDoorCreator.UI.Components.FilesMan
             await Task.Delay(1);
             currVal = maxVal;
             await InvokeAsync(StateHasChanged);
-        }
+        } 
+#endif
         [Inject]
         protected IConfiguration configuration { get; set; } = null!;
 
@@ -140,11 +142,16 @@ namespace WebDoorCreator.UI.Components.FilesMan
                 item.Value.action = selUnsel;
             }
         }
-
+        private int sendDataVal = 0;
+        private int sendDataNextVal = 0;
+        private int sendDataMaxVal = 100;
         protected async Task doScan()
         {
             isLoading = true;
-            await StartLongTimer();
+            //await StartLongTimer();
+            //isSendingData = true;
+            sendDataVal = 0;
+            sendDataNextVal = 90;
             files2Chk = new Dictionary<string, FileDTO>();
             tempDOT.Clear();
             await WDCService.populateHws();
@@ -178,6 +185,8 @@ namespace WebDoorCreator.UI.Components.FilesMan
             }
 
             files2Chk = files2Chk.Where(x => x.Value.status > 0).ToDictionary(x => x.Key, x => x.Value);
+            sendDataVal = 100;
+            sendDataNextVal = 100;
             isLoading = false;
         }
         protected async Task changeDoAct(KeyValuePair<string, FileDTO> currObj)
diff --git a/WebDoorCreator.UI/Components/FilesMan/DiffView.razor b/WebDoorCreator.UI/Components/FilesMan/DiffView.razor
index 3908277..3d74bd0 100644
--- a/WebDoorCreator.UI/Components/FilesMan/DiffView.razor
+++ b/WebDoorCreator.UI/Components/FilesMan/DiffView.razor
@@ -5,7 +5,7 @@
     <div class="col-6 table-primary">
         <div class="row">
             <div class="col-4 text-primary">
-                <h4>Archivio</h4>
+                <h4>New text</h4>
             </div>
             <div class="col-4">
             </div>
@@ -17,12 +17,19 @@
     <div class="col-6 table-warning">
         <div class="row">
             <div class="col-4 text-warning">
-                <h4>Attuale</h4>
+                <h4>Current text</h4>
             </div>
             <div class="col-4">
             </div>
             <div class="col-4 text-right p-2">
-                <span class="border border-danger table-danger py-1 px-2"><b>@numChanges</b> modifiche</span>
+                @if (numChanges > 1)
+                {
+                    <span class="border border-danger table-danger py-1 px-2"><b>@numChanges</b> changes</span>
+                }
+                else
+                {
+                    <span class="border border-danger table-danger py-1 px-2"><b>@numChanges</b> change</span>
+                }
             </div>
         </div>
     </div>
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index c30992c..796d96f 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2308.3117</Version>
+        <Version>0.9.2309.0408</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
