@@ -26,7 +30,7 @@
@if (isLoading)
{
-
+
}
else if (files2Chk != null && files2Chk.Count() > 0)
{
@@ -103,6 +107,13 @@ else if (files2Chk != null && files2Chk.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 2444f89..2245cee 100644
--- a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
+++ b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
@@ -21,6 +21,7 @@ namespace WebDoorCreator.UI.Components.FilesMan
private int sendDataVal = 0;
private string titleMsg = "Scanning directories";
+ private string scanMsg = "CLICK TO SCAN";
[Parameter]
public CompoSelectFilter actFilter { get; set; } = new CompoSelectFilter();
@@ -198,16 +199,27 @@ namespace WebDoorCreator.UI.Components.FilesMan
protected async Task doScan()
{
- isLoading = true;
//await StartLongTimer();
//isSendingData = true;
+ isLoading = true;
sendDataVal = 0;
- sendDataNextVal = 90;
+ var updTask1 = Task.Run(async () =>
+ await WDCService.populateHws()
+ );
+ await updTask1;
searchRecords = new Dictionary
();
- tempDOT.Clear();
- await WDCService.populateHws();
- var oldFiles = await WDCService.scanSrcDestDir(rootPathOld);
- var newFiles = await WDCService.scanSrcDestDir(rootPathNew);
+ tempDOT.Clear();
+ var updTask2 = Task.Run(async () =>
+ await WDCService.scanSrcDestDir(rootPathOld)
+ );
+ var oldFiles = await updTask2;
+ // ;
+ sendDataVal = 30;
+ var updTask3 = Task.Run(async () =>
+ await WDCService.scanSrcDestDir(rootPathNew)
+ );
+ var newFiles = await updTask3;
+ sendDataVal = 60;
//tempDOT = await WDCService.scanAndCompare();
foreach (var item in newFiles)
@@ -228,6 +240,7 @@ namespace WebDoorCreator.UI.Components.FilesMan
searchRecords.Add(item.Key, item.Value);
}
+ sendDataVal = 90;
foreach (var item in oldFiles)
{
item.Value.status = Core.Enum.fileStatus.rem;
@@ -239,6 +252,10 @@ namespace WebDoorCreator.UI.Components.FilesMan
sendDataVal = 100;
sendDataNextVal = 100;
isLoading = false;
+ if (searchRecords.Count == 0)
+ {
+ scanMsg = "THE DIRECTORIES HAVE NO DIFFERENCES";
+ }
}
protected override async Task OnParametersSetAsync()
diff --git a/WebDoorCreator.UI/Components/FilesMan/VocRefresh.razor b/WebDoorCreator.UI/Components/FilesMan/VocRefresh.razor
index 52f8095..23b03d8 100644
--- a/WebDoorCreator.UI/Components/FilesMan/VocRefresh.razor
+++ b/WebDoorCreator.UI/Components/FilesMan/VocRefresh.razor
@@ -27,8 +27,8 @@ else
| Old text |
- New text |
|
+ New text |
@@ -52,14 +52,14 @@ else
@($"{item.Key} --> {vocLemmas2Dict[item.Key]}")
|
-
- @($"{item.Key} --> {item.Value}")
- |
@if (isReady2Save(item.Key))
{
- setConf(item.Key, false)">
+
+ @*setConf(item.Key, false)">*@
}
else
{
@@ -67,6 +67,10 @@ else
}
|
+
+ @($"{item.Key} --> {item.Value}")
+ |
+
}
diff --git a/WebDoorCreator.UI/Pages/SuperAdmin.razor b/WebDoorCreator.UI/Pages/SuperAdmin.razor
index f35de3f..8d661f2 100644
--- a/WebDoorCreator.UI/Pages/SuperAdmin.razor
+++ b/WebDoorCreator.UI/Pages/SuperAdmin.razor
@@ -15,11 +15,15 @@
@if (CurrMode == AdminMode.Company)
{
-
+
+
+
}
else if (CurrMode == AdminMode.Interface)
{
-
+
+
+
}
else if (CurrMode == AdminMode.Component)
{
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index aa0ad1c..82545c3 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 0.9.2309.0412
+ 0.9.2309.0414
enable
aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608