Somnia/SomniaGuestLog
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GuestLog - GuestDocumentList - Added filter for GuestDocuments.

Browse Source
This commit is contained in:
Daniel-Garmig
2026-08-03 21:33:30 +02:00
parent a5eea09eee
commit 2335c223ea
9 changed files with 126 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Somnia.GuestLog/Components/Pages/GuestDocuments/GuestDocList.razor
+55 -28
View File
@@ -13,32 +13,53 @@
<PageTitle>Somnia - Guest Docs</PageTitle>
<MudStack Row="true" Class="my-4">
<MudText Typo="Typo.h4" GutterBottom="true">Guest Documents</MudText>
<MudText Typo="Typo.h4" GutterBottom="true">@LanguageLocale.page_GuestDocList_pageTitle</MudText>
<MudSpacer />
<MudButton Variant="Variant.Filled" Color="Color.Success" Size="Size.Small" StartIcon="@Icons.Material.Filled.Add"
<MudButton Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small"
StartIcon="@Icons.Material.Filled.Search" OnClick="() => SearchDataAsync()">
@LanguageLocale.general_btnSearch
</MudButton>
<MudButton Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small" StartIcon="@Icons.Material.Filled.Add"
OnClick="() => BtnNewGuest()">
@LanguageLocale.page_GuestDocList_btnNewGuest
</MudButton>
</MudStack>
<MudSelect T="string" MultiSelection="true" FullWidth="true" Dense="true" Clearable="true" Margin="@Margin.Dense"
Class="filter-input category-filter" Label="Module" Placeholder="Select Modules"
SelectedValuesChanged="@FilterModuleValuesChanged">
@foreach (var module in _moduleList)
<MudPaper Class="pa-4 my-4" Elevation="2" Height="100%">
<MudForm Model="@docFilter">
<MudStack Row Breakpoint="Breakpoint.LgAndDown" StretchItems="StretchItems.All">
<MudStack Row style="margin-block: 0.2em;">
<MudSelect @bind-Value="docFilter.DocumentType" For="@(() => docFilter.DocumentType)"
Label="@LanguageLocale.dto_GuestDocument_DocumentType">
@foreach (string docType in dataListService.GetDataListByName(GuestConsts.DataList_DocumentTypes))
{
<MudSelectItem T="string" Value="@module">@module</MudSelectItem>
<MudSelectItem Value="docType">
@dataListService.GetLocalizedValue(GuestConsts.DataList_DocumentTypes, docType)
</MudSelectItem>
}
</MudSelect>
</MudSelect>
<MudTextField @bind-Value="docFilter.DocumentNumber" For="@(() => docFilter.DocumentNumber)"
Label="@LanguageLocale.dto_GuestDocument_DocumentNum" />
</MudStack>
<MudStack Row style="margin-block: 0.2em;">
<MudTextField @bind-Value="docFilter.Name" For="@(() => docFilter.Name)"
Label="@LanguageLocale.dto_GuestDocument_Name"
HelperText="@LanguageLocale.general_wildcardHelperText" HelperTextOnFocus="true" />
<MudTextField @bind-Value="docFilter.Surname" For="@(() => docFilter.Surname)"
Label="@LanguageLocale.dto_GuestDocument_Surname"
HelperText="@LanguageLocale.general_wildcardHelperText" HelperTextOnFocus="true" />
</MudStack>
</MudStack>
</MudForm>
</MudPaper>
<MudDataGrid @ref="_dataGrid" T="GuestDocumentDTO" Items="@guestDocList" Loading="@_dataLoading" ReadOnly="true"
Hideable="true" ColumnsPanelReordering="true">
Hideable="true" ColumnsPanelReordering="true" Elevation="2">
<ToolBarContent>
<MudText Typo="Typo.subtitle1">Document List</MudText>
<MudStack Class="ml-auto" Row="true" AlignItems="AlignItems.End">
<MudButton StartIcon="@Icons.Material.Outlined.Refresh" Variant="Variant.Outlined" Size="Size.Small"
OnClick="() => LoadDataAsync()">
@LanguageLocale.general_reloadData
</MudButton>
<MudText Typo="Typo.subtitle1">@LanguageLocale.page_GuestDocList_documentList</MudText>
<MudStack Class="ml-auto" Row="true" AlignItems="AlignItems.Center">
<MudCheckBox @bind-Value="_showAllData" Label="@LanguageLocale.page_GuestDocList_showAllElements"
LabelPlacement="Placement.Start" />
<MudButton StartIcon="@Icons.Material.Outlined.ViewColumn" Variant="Variant.Outlined" Size="Size.Small"
OnClick="(args) => BtnConfigureColumnsClick(args)">
@LanguageLocale.general_ConfigureColumns
@@ -67,9 +88,13 @@
</CellTemplate>
</TemplateColumn>
</Columns>
<PagerContent>
<MudDataGridPager T="GuestDocumentDTO" />
</PagerContent>
</MudDataGrid>
<MudMessageBox @ref="_msgBoxConfirmDelete" Title="Warning" CancelText="Cancel">
<MudMessageBox @ref="_msgBoxConfirmDelete" Title="@LanguageLocale.general_confirmTitle"
CancelText="@LanguageLocale.general_btnCancel">
<MessageContent>
@LanguageLocale.general_confirmDeleteMsg
</MessageContent>
@@ -85,8 +110,10 @@
private IEnumerable<GuestDocumentDTO> guestDocList = [];
private bool _dataLoading = true;
private HashSet<string> _moduleList = [];
private HashSet<string> _selectedModuleList = [];
private bool _showAllData = false;
private const int resultLimit = 200;
private GuestDocFilterDTO docFilter = new GuestDocFilterDTO();
private MudDataGrid<GuestDocumentDTO> _dataGrid = null!;
private MudMessageBox _msgBoxConfirmDelete = null!;
@@ -95,17 +122,24 @@
protected override async Task OnInitializedAsync()
{
await LoadDataAsync(showMsg: false);
@* _moduleList = guestDocList.Select(e => e.Module).ToHashSet(); *@
}
#region Data Loading
private async Task SearchDataAsync()
{
docFilter.Name = docFilter.Name?.ToUpper();
docFilter.Surname = docFilter.Surname?.ToUpper();
await LoadDataAsync();
}
private async Task LoadDataAsync(bool showMsg = true)
{
_dataLoading = true;
guestDocList = await GuestDocService.GetDtoListAsync();
int dataLimit = _showAllData ? 0 : resultLimit;
guestDocList = await GuestDocService.GetDtoListByFilterAsync(filter: docFilter, limit: dataLimit);
if (showMsg)
{
@@ -118,13 +152,6 @@
#region Event Handlers
private async Task FilterModuleValuesChanged(IReadOnlyCollection<string> newValues)
{
_selectedModuleList = [.. newValues];
await LoadDataAsync();
}
private async Task BtnConfigureColumnsClick(MouseEventArgs args)
{
_dataGrid.ShowColumnsPanel(args);
src/Somnia.GuestLog/GuestConsts.cs
-3
View File
@@ -8,9 +8,6 @@ public static class GuestConsts
public const string Page_GuestDocs_Detail = "/guest-documents/d/{docId}";
public const string regexPattern_phoneNum = @"\+?\d{1,4}?[-.\s]?\(?\d{1,3}?\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,9}";
public const string DataList_DocumentTypes = "DocumentType";
public const string DataList_GenderOptions = "GenderOption";
public const string DataList_CountryCodes = "CountryCode";
src/Somnia.GuestLog/Models/DTOs/GuestDocFilterDTO.cs
+13
View File
@@ -0,0 +1,13 @@
namespace Somnia.GuestLog.Models.DTOs;
public class GuestDocFilterDTO
{
public string? DocumentType { get; set; }
public string? DocumentNumber { get; set; }
public string? Name { get; set; }
public string? Surname { get; set; }
public string? PhoneNumber { get; set; }
}
src/Somnia.GuestLog/Resources/LanguageLocale.resx
+5
View File
@@ -147,6 +147,7 @@
<data name="general.inProgressMsg" xml:space="preserve"><value>In Progress...</value></data>
<data name="general.ConfigureColumns" xml:space="preserve"><value>Configure Columns</value></data>
<data name="general.confirmDeleteMsg" xml:space="preserve"><value>Deleting can not be undone!</value></data>
<data name="general.confirmTitle" xml:space="preserve"><value>Confirm?</value></data>
<data name="general.btnDelete" xml:space="preserve"><value>Delete</value></data>
<data name="general.btnCreate" xml:space="preserve"><value>Create</value></data>
<data name="general.btnEdit" xml:space="preserve"><value>Edit</value></data>
@@ -155,8 +156,12 @@
<data name="general.btnSearch" xml:space="preserve"><value>Search</value></data>
<data name="general.btnSave" xml:space="preserve"><value>Save</value></data>
<data name="general.btnCancel" xml:space="preserve"><value>Cancel</value></data>
<data name="general.wildcardHelperText" xml:space="preserve"><value>Use '%' as wildcard</value></data>
<data name="page.GuestDocList.pageTitle" xml:space="preserve"><value>Guest Documents</value></data>
<data name="page.GuestDocList.documentList" xml:space="preserve"><value>Document List</value></data>
<data name="page.GuestDocList.btnNewGuest" xml:space="preserve"><value>New Guest</value></data>
<data name="page.GuestDocList.showAllElements" xml:space="preserve"><value>Show all elements</value></data>
<data name="page.GuestDocNew.msgAlreadyExists" xml:space="preserve"><value>This Guest Document Already exists!!</value></data>
<data name="page.GuestDocNew.btnGoExistingDoc" xml:space="preserve"><value>Go to existing document</value></data>
src/Somnia.GuestLog/Services/GuestDocumentService.cs
+35 -1
View File
@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
using Somnia.GuestLog.Infrastructure;
using Somnia.GuestLog.Models.DTOs;
using Somnia.GuestLog.Models.Entities;
using Somnia.GuestLog.Utils;
namespace Somnia.GuestLog.Services;
@@ -127,6 +128,40 @@ public class GuestDocumentService(
return dbList.Select(x => GetDtoFromDb(x));
}
/// <summary>
/// Get GuestDocumentDTO from DB with the given filters.
/// Result count can be limited for perfomance reasons.
/// </summary>
/// <param name="filter">Filters to use</param>
/// <param name="limit">Result count. Set to 0 for unlimited results</param>
/// <returns>Filtered GuestDocumentDTO result list</returns>
public async Task<IEnumerable<GuestDocumentDTO>> GetDtoListByFilterAsync(GuestDocFilterDTO filter, int limit = 0)
{
using var dbContext = contextFactory.CreateDbContext();
var query = dbContext.GuestDocuments.AsQueryable();
query = query.WhereIf(!string.IsNullOrEmpty(filter.DocumentType),
e => e.DocumentType == filter.DocumentType);
query = query.WhereIf(!string.IsNullOrEmpty(filter.DocumentNumber),
e => e.DocumentNum == filter.DocumentNumber);
query = query.WhereIf(!string.IsNullOrEmpty(filter.Name),
e => EF.Functions.Like(e.Name, filter.Name));
query = query.WhereIf(!string.IsNullOrEmpty(filter.Surname),
e => EF.Functions.Like(e.Surname, filter.Surname));
query = query.OrderByDescending(e => e.UpdateTime);
if (limit > 0)
{
query = query.Take(limit);
}
var dbList = await query.ToListAsync();
return dbList.Select(x => GetDtoFromDb(x));
}
public GuestDocumentDTO GetDtoFromDb(GuestDocument dbItem)
{
@@ -154,5 +189,4 @@ public class GuestDocumentService(
UpdateTime = dbItem.UpdateTime,
};
}
}
src/Somnia.GuestLog/Services/IGuestDocumentService.cs
+1
View File
@@ -10,6 +10,7 @@ public interface IGuestDocumentService
public Task<bool> DeleteDocumentAsync(string docType, string docNum);
public Task<GuestDocumentDTO?> GetDtoByIdAsync(string docType, string docNum);
public Task<IEnumerable<GuestDocumentDTO>> GetDtoListByFilterAsync(GuestDocFilterDTO filter, int limit = 0);
public Task<IEnumerable<GuestDocumentDTO>> GetDtoListAsync();
//TODO: Add Filter
src/Somnia.GuestLog/Utils/QueryExtensions.cs
+11
View File
@@ -0,0 +1,11 @@
using System.Linq.Expressions;
namespace Somnia.GuestLog.Utils;
public static class QueryExtensions
{
public static IQueryable<T> WhereIf<T>(this IQueryable<T> source, bool condition, Expression<Func<T, bool>> predicate)
{
return condition ? source.Where(predicate) : source;
}
}
src/Somnia.GuestLog/Utils/RegexUtils.cs
+3
View File
@@ -12,4 +12,7 @@ public static partial class RegexUtils
[GeneratedRegex("^[A-Z]{3}[0-9]{6}$")]
public static partial Regex RegexGuestDocSuportNumber();
[GeneratedRegex(@"^\+?\d{1,4}?[-.\s]?\(?\d{1,3}?\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,9}$")]
public static partial Regex RegexPhoneNumber();
}
src/Somnia.GuestLog/Validators/GuestDocumentDTOValidator.cs
+1 -1
View File
@@ -55,7 +55,7 @@ public class GuestDocumentDTOValidator : AbstractValidator<GuestDocumentDTO>
.When(x => !string.IsNullOrEmpty(x.EmailAddress));
RuleFor(x => x.PhoneNumber)
.Matches(GuestConsts.regexPattern_phoneNum)
.Matches(RegexUtils.RegexPhoneNumber()).WithMessage("Invalid format")
.When(x => !string.IsNullOrEmpty(x.PhoneNumber));
RuleFor(x => x.AddressCountry)