@@ -76,4 +73,4 @@
@section Scripts {
- }
+}
diff --git a/WebDoorCreator.UI/Components/FilesMan/FilesRefresh.razor b/WebDoorCreator.UI/Components/FilesMan/FilesRefresh.razor
index 0121451..18a1361 100644
--- a/WebDoorCreator.UI/Components/FilesMan/FilesRefresh.razor
+++ b/WebDoorCreator.UI/Components/FilesMan/FilesRefresh.razor
@@ -3,45 +3,67 @@
-@*@if (vocLemmas != null)
-{
- @foreach (var item in vocLemmas)
- {
- @foreach (var k in item.Value)
- {
- @*
@($"{k.Key} --> {k.Value}")
- @if(vocLemmasTEMP != null)
- {
-
- }
- }
- }
-}*@
-
-
-@result
@if (showList)
{
@if (vocLemmas2Dict != null && vocLemmasTEMP2Dict != null)
{
- @foreach (var item in vocLemmasTEMP2Dict)
- {
- @if (!vocLemmas2Dict.ContainsKey(item.Key))
- {
-
-
@($"{item.Key} --> {vocLemmasTEMP2Dict[item.Key]}")
-
- }
- else if (item.Value != vocLemmas2Dict[item.Key])
- {
-
-
@($"{item.Key} --> {vocLemmas2Dict[item.Key]}")
-
@($"{item.Key} --> {item.Value}")
-
- }
- }
+
+
+ @result
+
+
}
}
diff --git a/WebDoorCreator.UI/Components/FilesMan/FilesRefresh.razor.cs b/WebDoorCreator.UI/Components/FilesMan/FilesRefresh.razor.cs
index 4360573..3d2a813 100644
--- a/WebDoorCreator.UI/Components/FilesMan/FilesRefresh.razor.cs
+++ b/WebDoorCreator.UI/Components/FilesMan/FilesRefresh.razor.cs
@@ -16,21 +16,20 @@ namespace WebDoorCreator.UI.Components.FilesMan
protected Dictionary
>? vocLemmas { get; set; } = null;
protected Dictionary vocLemmas2Dict { get; set; } = new Dictionary();
protected Dictionary>? vocLemmasTEMP { get; set; } = null;
- protected Dictionary vocLemmasTEMP2Dict { get; set; } = new Dictionary();
+ protected Dictionary vocLemmasTEMP2Dict { get; set; } = new Dictionary();
protected bool showList { get; set; } = false;
-
protected async override Task OnParametersSetAsync()
{
var rawVoc = await WDCService.VocLemmaGetAll();
if (rawVoc != null)
{
vocLemmas = rawVoc.Where(x => x.Key == lang).ToDictionary(x => x.Key, x => x.Value);
- if(vocLemmas != null)
+ if (vocLemmas != null)
{
- foreach(var kvp in vocLemmas)
+ foreach (var kvp in vocLemmas)
{
- foreach(var item in kvp.Value)
+ foreach (var item in kvp.Value)
{
vocLemmas2Dict.Add(item.Key, item.Value);
}
@@ -38,6 +37,20 @@ namespace WebDoorCreator.UI.Components.FilesMan
}
}
}
+
+#if false
+ var s = dmp.diff_main(vocLemmas2Dict["11"], newText.Value);
+
+ dmp.diff_cleanupSemantic(s);
+ foreach (var diffes in s)
+ {
+ if (diffes.operation == Operation.DELETE)
+ {
+ diff.Add(diffes);
+ }
+}
+#endif
+ Dictionary> listVocLemmaTemp = new Dictionary>();
protected async Task refreshVoc()
{
vocLemmasTEMP = null;
@@ -46,19 +59,19 @@ namespace WebDoorCreator.UI.Components.FilesMan
if (list2Mod != null)
{
//bool ok = await WDCService.VocLemmaInsert();
- var k = await WDCService.VocLemmaTEMPGetAll();
- if (k != null)
+ listVocLemmaTemp = await WDCService.VocLemmaTEMPGetAll();
+ if (listVocLemmaTemp != null)
{
- vocLemmasTEMP = k.Where(x => x.Key == lang).ToDictionary(x => x.Key, x => x.Value);
+ vocLemmasTEMP = listVocLemmaTemp.Where(x => x.Key == lang).ToDictionary(x => x.Key, x => x.Value);
if (vocLemmasTEMP != null)
{
foreach (var kvp in vocLemmasTEMP)
{
foreach (var item in kvp.Value)
- {
+ {
vocLemmasTEMP2Dict.Add(item.Key, item.Value);
}
- }
+ }
}
}
}
@@ -74,6 +87,29 @@ namespace WebDoorCreator.UI.Components.FilesMan
if (done)
{
result = "Done";
+ vocLemmas2Dict.Clear();
+ vocLemmasTEMP2Dict.Clear();
+ }
+ }
+ protected bool isReady2Save(string lemma)
+ {
+ bool isConf = false;
+
+ var tempModTerm = Task.Run(async () => await WDCService.VocLemmaFindByKeys(lang, lemma)).Result;
+ if (tempModTerm != null)
+ {
+ isConf = tempModTerm.IsConfSave;
+ }
+ return isConf;
+ }
+
+ protected async Task setConf(string lemma, bool isConf)
+ {
+ var tempModTerm = await WDCService.VocLemmaFindByKeys(lang, lemma);
+
+ if (tempModTerm != null)
+ {
+ var done = await WDCService.VocLemmaSetConf(tempModTerm.Lingua, tempModTerm.Lemma, isConf);
}
}
protected string defaultPath { get; set; } = "";
diff --git a/WebDoorCreator.UI/Pages/OrdersHomePage.razor b/WebDoorCreator.UI/Pages/OrdersHomePage.razor
index e93d00b..b3cc4fe 100644
--- a/WebDoorCreator.UI/Pages/OrdersHomePage.razor
+++ b/WebDoorCreator.UI/Pages/OrdersHomePage.razor
@@ -9,7 +9,7 @@
ORDER LIST
- @(translate("OHP_OrderList"))
+ @(translate("Order List"))
diff --git a/WebDoorCreator.UI/Pages/SuperAdmin.razor b/WebDoorCreator.UI/Pages/SuperAdmin.razor
index d8d739f..8198701 100644
--- a/WebDoorCreator.UI/Pages/SuperAdmin.razor
+++ b/WebDoorCreator.UI/Pages/SuperAdmin.razor
@@ -10,17 +10,17 @@
Company management
doShowUser()">
- Users Management
+ Files management
-
-
- @*
*@
-
+ @*
+
+ @*
+
-
+
*@
@@ -34,10 +34,7 @@
}
else
{
-
General Application user list
-
+ General Application files management
}
@if (isCompShow)
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 12ae41e..15aa187 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 0.9.2306.0611
+ 0.9.2306.0617
enable
aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608
@@ -37,6 +37,7 @@
+