+ @if (files2Chk != null && files2Chk.Count() > 0)
+ {
+ @if (files2Chk.Where(x => x.Value.action).ToList().Count > 0)
+ {
+
+
+
+ }
+ }
@if (searchRecords != null && searchRecords.Count() > 0)
@@ -155,15 +164,7 @@ else if (files2Chk != null && files2Chk.Count() > 0)
}
- @if (files2Chk != null && files2Chk.Count() > 0)
- {
- @if (files2Chk.Where(x => x.Value.action).ToList().Count > 0)
- {
-
-
-
- }
- }
+
}
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
();
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();
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($"{item.text}");
+ sbOld.Append($"{item.text}");
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 @@
net6.0
enable
- 0.9.2309.1112
+ 0.9.2309.1114
enable
aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608