From 04c70480e59ff00393e3036c01e09c2a250c7fdb Mon Sep 17 00:00:00 2001 From: Loretta Date: Wed, 3 Jul 2024 10:25:04 +0200 Subject: [PATCH] improvements, fixes, etc... --- TIAM.Database/DataLayers/Admins/AdminDal.cs | 12 ++++-------- .../DbSets/Transfers/TransferDbSetExtensions.cs | 13 ++++++++++++- .../Pages/User/SysAdmins/CarGridComponent.razor | 4 ++-- .../User/SysAdmins/LogViewerGridComponent.razor | 4 ++-- .../Pages/User/SysAdmins/ManageTransfers.razor | 1 - .../SysAdmins/UserProductMappingGridComponent.razor | 5 ++++- TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs | 3 +-- 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index 51c6efaa..a585f3b7 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -55,17 +55,13 @@ namespace TIAM.Database.DataLayers.Admins #region Transfer - public Task> GetTransfersByFilterAsync(CriteriaOperator criteriaOperator) => SessionAsync(ctx => (ctx.GetTransfers().AppendWhere(new CriteriaToExpressionConverter(), criteriaOperator) as IQueryable)!.ToList()); - - public Task> GetTransfersByDriverUserIdAsync(Guid driverUserId) - => SessionAsync(ctx => ctx.GetTransfers().Where(x => x.TransferToDrivers.Any(ttd => ttd.UserProductMapping.UserId == driverUserId)).ToList()); - - public Task> GetTransfersByUserProductMappingIdAsync(Guid userProductMappingId) - => SessionAsync(ctx => ctx.GetTransfers().Where(x => x.TransferToDrivers.Any(ttd => ttd.UserProductMappingId == userProductMappingId)).ToList()); + public Task> GetTransfersByFilterAsync(CriteriaOperator criteriaOperator) => SessionAsync(ctx => (ctx.GetTransfers().AppendWhere(new CriteriaToExpressionConverter(), criteriaOperator) as IQueryable)!.OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToList()); + public Task> GetTransfersByDriverUserIdAsync(Guid driverUserId) => SessionAsync(ctx => ctx.GetTransfersByDriverUserId(driverUserId).OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToList()); + public Task> GetTransfersByUserProductMappingIdAsync(Guid userProductMappingId) => SessionAsync(ctx => ctx.GetTransfersByUserProductMappingId(userProductMappingId).OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToList()); public Task> GetTransfersAsync() => SessionAsync(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToList()); public Task GetTransfersJsonAsync() => SessionAsync(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson()); - public Task GetTransfersByUserIdJsonAsync(Guid userId) => SessionAsync(ctx => ctx.GetTransfers().Where(x => x.UserId == userId).OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson()); + public Task GetTransfersByUserIdJsonAsync(Guid userId) => SessionAsync(ctx => ctx.GetTransfersByUserId(userId).OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson()); public string GetTransfersJson() => Session(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson()); public Transfer? GetTransferById(Guid transferId) => Session(ctx => ctx.GetTransferById(transferId)); public string? GetTransferJsonById(Guid transferId) => Session(ctx => ctx.GetTransferById(transferId)?.ToJson()); diff --git a/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs b/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs index ed37f83a..721d5c26 100644 --- a/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs +++ b/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore; +using DevExpress.Utils.Serializing; +using Microsoft.EntityFrameworkCore; using TIAM.Core.Enums; using TIAM.Entities.Transfers; @@ -43,6 +44,16 @@ public static class TransferDbSetExtensions #endregion Add, Update, Remove + public static IQueryable GetTransfersByUserId(this ITransferDbSet ctx, Guid userId) + => ctx.GetTransfers().Where(x => x.UserId == userId); + + public static IQueryable GetTransfersByDriverUserId(this ITransferDbSet ctx, Guid driverUserId) + => ctx.GetTransfers().Where(x => x.TransferToDrivers.Any(ttd => ttd.UserProductMapping.UserId == driverUserId)); + + public static IQueryable GetTransfersByUserProductMappingId(this ITransferDbSet ctx, Guid userProductMappingId) + => ctx.GetTransfers().Where(x => x.TransferToDrivers.Any(ttd => ttd.UserProductMappingId == userProductMappingId)); + + public static Transfer? GetTransferById(this ITransferDbSet ctx, Guid transferId) => ctx.Transfers.FirstOrDefault(x => x.Id == transferId); diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor index fba6afde..8b1160f0 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor @@ -53,7 +53,7 @@ + CommandColumnVisible="false" /> @@ -65,7 +65,7 @@ var car = (Car)userEditFormContext.EditModel; } - + @userEditFormContext.GetEditor("CountryCode") diff --git a/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor index 70841be4..f8209d82 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor @@ -44,12 +44,12 @@ DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" ShowFilterRow="true"> - + - + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 231f37db..54680b78 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -92,7 +92,6 @@ CustomizeEditModel="Grid_CustomizeEditModel" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" - AllowSelectRowByClick="true" PageSize="13" ShowFilterRow="true"> diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor index 3902cf96..c00ec8ba 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor @@ -28,7 +28,7 @@ ColumnResizeMode="GridColumnResizeMode.NextColumn" DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"> - + @{ @@ -80,7 +80,10 @@ @code { + [Parameter] public bool CommandColumnVisible { get; set; } = true; [Parameter] public bool NewButtonVisible { get; set; } = true; + [Parameter] public bool EditButtonVisible { get; set; } = true; + [Parameter] public bool DeleteButtonVisible { get; set; } = true; [Parameter] public IProductRelation ParentData { get; set; } = null!; [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllUserProductMappings; diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs index 34521061..ba8a25f8 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs @@ -104,8 +104,7 @@ namespace TIAMSharedUI.Shared.Components.Grids } var crudTags = new SignalRCrudTags(GetAllMessageTag, GetItemMessageTag, AddMessageTag, UpdateMessageTag, RemoveMessageTag); - _dataSource = new SignalRDataSource(SignalRClient, crudTags, ContextIds); - _dataSource.FilterText = FilterText; + _dataSource = new SignalRDataSource(SignalRClient, crudTags, ContextIds) { FilterText = FilterText }; Data = _dataSource;