diff --git a/MP.AppAuth/Controllers/MPUserController.cs b/MP.AppAuth/Controllers/AppUserController.cs
similarity index 90%
rename from MP.AppAuth/Controllers/MPUserController.cs
rename to MP.AppAuth/Controllers/AppUserController.cs
index ab42c488..dde09586 100644
--- a/MP.AppAuth/Controllers/MPUserController.cs
+++ b/MP.AppAuth/Controllers/AppUserController.cs
@@ -9,14 +9,14 @@ using System.Threading.Tasks;
namespace MP.AppAuth.Controllers
{
- public class MPUserController : IDisposable
+ public class AppUserController : IDisposable
{
#region Public Constructors
- public MPUserController(IConfiguration configuration)
+ public AppUserController(IConfiguration configuration)
{
_configuration = configuration;
- Log.Info("Avviata classe MPUserController");
+ Log.Info("Avviata classe AppUserController");
}
#endregion Public Constructors
diff --git a/MP.AppAuth/Models/UserDirittiModel.cs b/MP.AppAuth/Models/UserDirittiModel.cs
index f097342e..a5c5f7b4 100644
--- a/MP.AppAuth/Models/UserDirittiModel.cs
+++ b/MP.AppAuth/Models/UserDirittiModel.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
namespace MP.AppAuth.Models
{
-
//
// This is here so CodeMaid doesn't reorganize this document
//
diff --git a/MP.Land/Components/CompareAnagKeyVal.razor.cs b/MP.Land/Components/CompareAnagKeyVal.razor.cs
index b77f97a1..c8fb5150 100644
--- a/MP.Land/Components/CompareAnagKeyVal.razor.cs
+++ b/MP.Land/Components/CompareAnagKeyVal.razor.cs
@@ -46,6 +46,13 @@ namespace MP.Land.Components
[Inject]
protected AppAuthService DataService { get; set; }
+ [Inject]
+ protected MessageService AppMServ { get; set; } = null!;
+
+ public string searchVal
+ {
+ get => AppMServ.SearchVal;
+ }
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
@@ -266,6 +273,14 @@ namespace MP.Land.Components
}
}
}
+ // filtro sui dati chiave e note
+ if (!string.IsNullOrEmpty(searchVal))
+ {
+ ListCompareAll = ListCompareAll
+ .Where(x => x.Source.NomeVar.Contains(searchVal, StringComparison.InvariantCultureIgnoreCase) ||
+ x.Source.Descrizione.Contains(searchVal, StringComparison.InvariantCultureIgnoreCase))
+ .ToList();
+ }
totalCount = ListCompareAll.Count;
// riordino...
ListCompareAll = ListCompareAll.OrderBy(x => x.NomeVar).ToList();
diff --git a/MP.Land/Components/CompareConfig.razor.cs b/MP.Land/Components/CompareConfig.razor.cs
index 7bdf3f56..6851ec30 100644
--- a/MP.Land/Components/CompareConfig.razor.cs
+++ b/MP.Land/Components/CompareConfig.razor.cs
@@ -3,6 +3,7 @@ using Microsoft.JSInterop;
using MP.AppAuth.DTO;
using MP.AppAuth.Models;
using MP.Land.Data;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -267,6 +268,14 @@ namespace MP.Land.Components
}
}
}
+ // filtro sui dati chiave e note
+ if (!string.IsNullOrEmpty(searchVal))
+ {
+ ListCompareAll = ListCompareAll
+ .Where(x => x.Source.Chiave.Contains(searchVal, StringComparison.InvariantCultureIgnoreCase) ||
+ x.Source.Note.Contains(searchVal, StringComparison.InvariantCultureIgnoreCase))
+ .ToList();
+ }
totalCount = ListCompareAll.Count;
// riordino...
ListCompareAll = ListCompareAll.OrderBy(x => x.NomeVar).ToList();
@@ -274,6 +283,15 @@ namespace MP.Land.Components
UpdPaging();
}
+
+ [Inject]
+ protected MessageService AppMServ { get; set; } = null!;
+
+ public string searchVal
+ {
+ get => AppMServ.SearchVal;
+ }
+
private void UpdPaging()
{
ListCompare = ListCompareAll.Skip((currPage - 1) * numRecord).Take(numRecord).ToList();
diff --git a/MP.Land/Components/CompareVocabolario.razor.cs b/MP.Land/Components/CompareVocabolario.razor.cs
index 180c2c23..33fa227d 100644
--- a/MP.Land/Components/CompareVocabolario.razor.cs
+++ b/MP.Land/Components/CompareVocabolario.razor.cs
@@ -3,6 +3,7 @@ using Microsoft.JSInterop;
using MP.AppAuth.DTO;
using MP.AppAuth.Models;
using MP.Land.Data;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -46,7 +47,13 @@ namespace MP.Land.Components
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
+ [Inject]
+ protected MessageService AppMServ { get; set; } = null!;
+ public string searchVal
+ {
+ get => AppMServ.SearchVal;
+ }
protected int numLoc { get; set; } = 0;
protected int numRem { get; set; } = 0;
@@ -263,6 +270,14 @@ namespace MP.Land.Components
}
}
}
+ // filtro sui dati chiave e note
+ if (!string.IsNullOrEmpty(searchVal))
+ {
+ ListCompareAll = ListCompareAll
+ .Where(x => x.Source.Lemma.Contains(searchVal, StringComparison.InvariantCultureIgnoreCase) ||
+ x.Source.Traduzione.Contains(searchVal, StringComparison.InvariantCultureIgnoreCase))
+ .ToList();
+ }
totalCount = ListCompareAll.Count;
// riordino...
ListCompareAll = ListCompareAll.OrderBy(x => x.NomeVar).ToList();
diff --git a/MP.Land/Data/AppAuthService.cs b/MP.Land/Data/AppAuthService.cs
index 0ce151e2..f21253da 100644
--- a/MP.Land/Data/AppAuthService.cs
+++ b/MP.Land/Data/AppAuthService.cs
@@ -22,7 +22,7 @@ namespace MP.Land.Data
public static AppAuthController dbController;
public static MPController MpDbController;
- public static MPUserController userController;
+ public static AppUserController userController;
#endregion Public Fields
@@ -57,7 +57,7 @@ namespace MP.Land.Data
{
dbController = new AppAuthController(configuration);
MpDbController = new MPController(configuration);
- userController = new MPUserController(configuration);
+ userController = new AppUserController(configuration);
_logger.LogInformation("DbController OK");
}
}
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index b6a88f90..9cf91011 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
net6.0
MP.Land
- 6.16.2409.0319
+ 6.16.2409.1212
diff --git a/MP.Land/Pages/ConfSync.razor.cs b/MP.Land/Pages/ConfSync.razor.cs
index 00b6cbfe..eecae5c4 100644
--- a/MP.Land/Pages/ConfSync.razor.cs
+++ b/MP.Land/Pages/ConfSync.razor.cs
@@ -82,7 +82,7 @@ namespace MP.Land.Pages
protected override async Task OnInitializedAsync()
{
- AppMService.ShowSearch = false;
+ AppMService.ShowSearch = true;
AppMService.PageName = "Config Sync";
AppMService.PageIcon = "fas fa-file-import pe-2";
await RefreshData();
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index 4c7a6cea..e51289da 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo Tablet MAPO - DotNet6
- Versione: 6.16.2409.0319
+ Versione: 6.16.2409.1212
Note di rilascio:
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index efc29a77..aa071951 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2409.0319
+6.16.2409.1212
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index d1c57c73..c61f05d5 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2409.0319
+ 6.16.2409.1212
https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip
https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html
false