From afd6dcc41598b7a754d1475a3fcb245e99e5cf53 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Mon, 11 Sep 2023 14:20:29 +0200
Subject: [PATCH] fix grafici + fix diff

---
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 .../Components/FilesMan/CompoCompare.razor    | 19 ++++++++++---------
 .../Components/FilesMan/CompoCompare.razor.cs | 14 ++++++++------
 .../Components/FilesMan/DiffView.razor.cs     |  2 +-
 WebDoorCreator.UI/WebDoorCreator.UI.csproj    |  2 +-
 7 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index e3e40ca..b88d502 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2309.1112</h4>
+    <h4>Version: 0.9.2309.1114</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 2b986c8..472dcaf 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2309.1112
+0.9.2309.1114
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 2ca7b1a..438f4e8 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2309.1112</version>
+  <version>0.9.2309.1114</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 ddbb903..6d11a81 100644
--- a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor
+++ b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor
@@ -60,6 +60,15 @@
         </div>
     </div>
     <div class="col-4 text-center">
+        @if (files2Chk != null && files2Chk.Count() > 0)
+        {
+            @if (files2Chk.Where(x => x.Value.action).ToList().Count > 0)
+            {
+                <div class="w-100 text-center">
+                    <button @onclick="()=>doSave()" class="btn btn-success btn-lg">Save</button>
+                </div>
+            }
+        }
     </div>
     <div class="col-4 text-end">
         @if (searchRecords != null && searchRecords.Count() > 0)
@@ -155,15 +164,7 @@ else if (files2Chk != null && files2Chk.Count() > 0)
             }
         </tbody>
     </table>
-    @if (files2Chk != null && files2Chk.Count() > 0)
-    {
-        @if (files2Chk.Where(x => x.Value.action).ToList().Count > 0)
-        {
-            <div class="w-100 text-center">
-                <button @onclick="()=>doSave()" class="btn btn-success">Save</button>
-            </div>
-        }
-    }
+    
 
 }
 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 0b21af4..22e81a4 100644
--- a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
+++ b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
@@ -156,6 +156,7 @@ namespace WebDoorCreator.UI.Components.FilesMan
             await Task.Delay(1);
             //var sb = new StringBuilder();
             sendDataVal = 0;
+            isLoading = true;
             var updTask1 = Task.Run(() =>
             {
                 files2Save = searchRecords.Where(x => x.Value.action).ToDictionary(x => x.Key, x => x.Value);
@@ -195,7 +196,6 @@ namespace WebDoorCreator.UI.Components.FilesMan
                 await WDCService.ListValuesLuaNgeInsert(rootPathCur);
             });
             await updTask2;
-            isLoading = true;
             await doScan(true, true);
             sendDataVal = 90;
         }
@@ -212,6 +212,7 @@ namespace WebDoorCreator.UI.Components.FilesMan
             searchRecords.Clear();
             ListType = new List<string>();
             Log.Info($"Component scan started by user {WDCUService.userId}");
+            isDrawing = true;
             isLoading = true;
             sendDataVal = 0;
             var updTask1 = Task.Run(async () =>
@@ -221,14 +222,14 @@ namespace WebDoorCreator.UI.Components.FilesMan
             searchRecords = new Dictionary<string, FileDTO>();
             tempDOT.Clear();
 
-            // gestioen files cur
-            var curFiles = await getCurFiles(rootPathCur, !scanCur);
-            NumFileCur = curFiles.Count;
-            sendDataVal = 30;
-
             // gestione files nuovi
             var newFiles = await getCurFiles(rootPathNew, !scanNew);
             NumFileNew = newFiles.Count;
+            sendDataVal = 30;
+
+            // gestione files cur
+            var curFiles = await getCurFiles(rootPathCur, !scanCur);
+            NumFileCur = curFiles.Count;
             sendDataVal = 60;
 
             foreach (var item in newFiles)
@@ -263,6 +264,7 @@ namespace WebDoorCreator.UI.Components.FilesMan
             await ReloadData();
             sendDataVal = 100;
             isLoading = false;
+            isDrawing = false;
             if (searchRecords.Count == 0)
             {
                 scanMsg = "THE DIRECTORIES HAVE NO DIFFERENCES";
diff --git a/WebDoorCreator.UI/Components/FilesMan/DiffView.razor.cs b/WebDoorCreator.UI/Components/FilesMan/DiffView.razor.cs
index 47e0ac8..d4d2778 100644
--- a/WebDoorCreator.UI/Components/FilesMan/DiffView.razor.cs
+++ b/WebDoorCreator.UI/Components/FilesMan/DiffView.razor.cs
@@ -97,7 +97,7 @@ namespace WebDoorCreator.UI.Components.FilesMan
                 switch (item.operation)
                 {
                     case Operation.DELETE:
-                        sbOld.Append($"<span class=\"border border-success bg-success opacity-50 table-success\">{item.text}</span>");
+                        sbOld.Append($"<span class=\"border border-success table-success\">{item.text}</span>");
                         numChanges++;
                         break;
 
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index f5ffa05..14e2e42 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.2309.1112</Version>
+        <Version>0.9.2309.1114</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
