fix grafici + fix diff

2023-09-11 14:20:29 +02:00
parent a41ba4ed86
commit afd6dcc415
7 changed files with 23 additions and 20 deletions
@@ -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>
@@ -1 +1 @@
-0.9.2309.1112
+0.9.2309.1114
@@ -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>
@@ -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)
@@ -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";
@@ -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;

@@ -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>