Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release/LAND_AddSearchOnSync'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-09-12 12:55:08 +02:00
parent 708ff42f3a 00273c48b1
commit e6a3e7ebe5
11 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.AppAuth/Controllers/MPUserController.cs → MP.AppAuth/Controllers/AppUserController.cs
+3 -3
View File
@@ -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
MP.AppAuth/Models/UserDirittiModel.cs
-1
View File
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
namespace MP.AppAuth.Models
{
// <Auto-Generated>
// This is here so CodeMaid doesn't reorganize this document
// </Auto-Generated>
MP.Land/Components/CompareAnagKeyVal.razor.cs
+15
View File
@@ -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();
MP.Land/Components/CompareConfig.razor.cs
+18
View File
@@ -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();
MP.Land/Components/CompareVocabolario.razor.cs
+15
View File
@@ -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();
MP.Land/Data/AppAuthService.cs
+2 -2
View File
@@ -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");
}
}
MP.Land/MP.Land.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>MP.Land</RootNamespace>
<Version>6.16.2409.0319</Version>
<Version>6.16.2409.1212</Version>
</PropertyGroup>
<ItemGroup>
MP.Land/Pages/ConfSync.razor.cs
+1 -1
View File
@@ -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();
MP.Land/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo Tablet MAPO - DotNet6</i>
<h4>Versione: 6.16.2409.0319</h4>
<h4>Versione: 6.16.2409.1212</h4>
<br />
Note di rilascio:
<ul>
MP.Land/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2409.0319
6.16.2409.1212
MP.Land/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2409.0319</version>
<version>6.16.2409.1212</version>
<url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>