From ffb018739514ea4cdfb694ee5bbc59ba273abab7 Mon Sep 17 00:00:00 2001 From: Loretta Date: Fri, 28 Jun 2024 16:44:59 +0200 Subject: [PATCH] improvements, fixes, etc... --- TIAM.Database/DataLayers/Admins/AdminDal.cs | 7 +- TIAM.Models/Dtos/Users/UserModelDto.cs | 15 +++- TIAM.Models/Dtos/Users/UserModelDtoDetail.cs | 16 ++-- .../AddressDetailGridComponent.razor | 5 +- .../User/SysAdmins/AddressGridComponent.razor | 44 +++++----- .../SysAdmins/CarDetailGridComponent.razor | 2 + .../User/SysAdmins/CarGridComponent.razor | 2 + .../CompaniesNestedUserProductMapping.razor | 2 + .../User/SysAdmins/DriverGridComponent.razor | 4 +- .../SysAdmins/ManageServiceProviders.razor | 4 +- .../User/SysAdmins/ManageTransfers.razor | 2 + .../Pages/User/SysAdmins/ManageUsers.razor | 30 ++++--- .../MessageDetailGridComponent.razor | 4 +- .../User/SysAdmins/MessageGridComponent.razor | 12 +-- .../ProductDetailGridComponent.razor | 2 + .../User/SysAdmins/ProductGridComponent.razor | 2 + .../User/SysAdmins/ProfileGridComponent.razor | 4 +- .../ServiceProviderGridComponent.razor | 7 +- .../TransferDestinationGridComponent.razor | 2 + ...tinationToProductDetailGridComponent.razor | 2 + ...ferDestinationToProductGridComponent.razor | 2 + .../TransferToDriverGridComponent.razor | 80 +++++++++---------- .../UserProductMappingGridComponent.razor | 5 +- .../Shared/Components/Grids/TiamGrid.cs | 2 + .../TiamErrorBoundaryComponent.razor | 6 ++ 25 files changed, 160 insertions(+), 103 deletions(-) diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index 3690f339..2045cfc0 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -91,18 +91,21 @@ namespace TIAM.Database.DataLayers.Admins public async Task UpdateTransferToDriverAsync(TransferToDriver transferToDriver) { var transferToDriverId = transferToDriver.Id; + TransferToDriver transferToDriver2 = null!; + var result = await TransactionAsync(ctx => { - var transferToDriver2 = ctx.TransferToDrivers.FirstOrDefault(x => x.Id == transferToDriverId)!; + transferToDriver2 = ctx.TransferToDrivers.FirstOrDefault(x => x.Id == transferToDriverId)!; transferToDriver2.CarId = transferToDriver.CarId; transferToDriver2.LicencePlate = transferToDriver.LicencePlate; transferToDriver2.UserProductMappingId = transferToDriver.UserProductMappingId; transferToDriver2.TransferId = transferToDriver.TransferId; + transferToDriver2.Price = transferToDriver.Price; return ctx.TransferToDrivers.Update(transferToDriver2).State == EntityState.Modified; }); - return result ? transferToDriver : null; + return result ? transferToDriver2 : null; } public Task RemoveTransferToDriverAsync(TransferToDriver transferToDriver) => TransactionAsync(ctx => ctx.RemoveTransferToDriver(transferToDriver.Id)); diff --git a/TIAM.Models/Dtos/Users/UserModelDto.cs b/TIAM.Models/Dtos/Users/UserModelDto.cs index c7bc73f1..c50d7bd3 100644 --- a/TIAM.Models/Dtos/Users/UserModelDto.cs +++ b/TIAM.Models/Dtos/Users/UserModelDto.cs @@ -1,4 +1,6 @@ -using AyCode.Interfaces; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text.Json.Serialization; +using AyCode.Interfaces; using AyCode.Models.Users; using TIAM.Entities.Products; using TIAM.Entities.Profiles; @@ -7,11 +9,20 @@ using TIAM.Entities.Users; namespace TIAM.Models.Dtos.Users; -public class UserModelDto : AcUserModelDtoBase, IProductsRelation, IUserModelDtoMinBase, IAcModelDtoBase +public class UserModelDto : AcUserModelDtoBase, IProductsRelation, IUserModelDtoMinBase, IAcModelDtoBase, IProfileForeignKey { public List UserProductMappings { get; set; } public List Products { get; set; } + [NotMapped] + [JsonIgnore] + [Newtonsoft.Json.JsonIgnore] + public Guid ProfileId + { + get => ProfileDto.Id; + set => ProfileDto.Id = value; + } + public UserModelDto(){} public UserModelDto(User user) : base(user) { diff --git a/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs b/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs index c384f334..81492896 100644 --- a/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs +++ b/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs @@ -1,4 +1,7 @@ -using AyCode.Models.Users; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text.Json.Serialization; +using AyCode.Interfaces.TimeStampInfo; +using AyCode.Models.Users; using TIAM.Entities.Addresses; using TIAM.Entities.Products; using TIAM.Entities.Profiles; @@ -9,15 +12,18 @@ namespace TIAM.Models.Dtos.Users { public class UserModelDtoDetail : AcUserModelDtoDetailBase, IProductsRelation, IUserModelDtoMinBase, IProfileForeignKey { + public List UserProductMappings { get; set; } + public List Products { get; set; } + + [NotMapped] + [JsonIgnore] + [Newtonsoft.Json.JsonIgnore] public Guid ProfileId { get => ProfileDto.Id; - set {} + set => ProfileDto.Id = value; } - public List UserProductMappings { get; set; } - public List Products { get; set; } - public UserModelDtoDetail() { } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor index 9962f20d..667a28e5 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor @@ -35,13 +35,14 @@ DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"> - + - + + @{ diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor index e86b6c57..9872a465 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor @@ -14,28 +14,28 @@ @using AyCode.Core @inject IServiceProviderDataService serviceProviderDataService @inject IUserDataService userDataService -@inject ITransferDataService transferDataService +@inject ITransferDataService transferDataService @inject IEnumerable LogWriters + PageSize="5" + ValidationEnabled="false" + CustomizeEditModel="CustomizeEditModel" + EditMode="GridEditMode.EditForm" + ColumnResizeMode="GridColumnResizeMode.NextColumn" + ShowFilterRow="true"> - - - - - + + + + + @{ Address bleh = (Address)context.EditModel; @@ -47,8 +47,8 @@ @code { - [Parameter]public object AddressContext { get; set; } - [Parameter]public string ContextIdType { get; set; } + [Parameter] public object AddressContext { get; set; } + [Parameter] public string ContextIdType { get; set; } IGrid Grid { get; set; } List _detailGridData = new List
(); @@ -59,23 +59,23 @@ public void SaveAddress(object addressOwnerToSave) { - + Grid.SaveChangesAsync(); - + } protected override async Task OnInitializedAsync() { Address myAddress = new Address(); - + _logger = new LoggerClient(LogWriters.ToArray()); - if(ContextIdType == null) + if (ContextIdType == null) { //get all profiles from DB } else - { + { switch (ContextIdType) { case ("userprofile"): @@ -104,13 +104,13 @@ break; case ("transferdestination"): //get address for transferDestination - TransferDestination resultData5 = (TransferDestination)AddressContext; + TransferDestination resultData5 = (TransferDestination)AddressContext; if (resultData5.Address != null) _detailGridData.Add(resultData5.Address); break; - + } - } + } _logger.Info($"DetailGridData: {_detailGridData.Count}"); } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor index 449320c1..5d0aea89 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor @@ -45,6 +45,8 @@ + + @{ diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor index 75dd745e..e70e6d19 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor @@ -44,6 +44,8 @@ + + @{ diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor index a3825a5d..815345f6 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor @@ -25,6 +25,8 @@ + + @* *@ diff --git a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor index d818974f..76791779 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor @@ -42,7 +42,9 @@

User not found, type another email please

- + + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor index 9ced0c36..ba0e4e67 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor @@ -115,8 +115,8 @@ - - + + @* *@ diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 9517bbcb..ee196f41 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -93,6 +93,7 @@ EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" AllowSelectRowByClick="false" + PageSize="13" ShowFilterRow="true"> @@ -137,6 +138,7 @@ } + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor index 89e11fda..bd6392d8 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor @@ -71,28 +71,34 @@ DataItemDeleting="Grid_DataItemDeleting" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" + PageSize="15" + TextWrapEnabled = "false" + AllowSelectRowByClick = "true" + HighlightRowOnHover = "true" + AutoCollapseDetailRow = "true" + AutoExpandAllGroupRows = "false" ShowFilterRow="true"> - - - - - - - - - - + + + + + + + + @{ var keyField = context.Value; var keyItem = (UserModelDtoDetail)context.DataItem; - var buttonText = "Contact"; - + var buttonText = "Contact"; + } + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor index d68a8750..55d18b44 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor @@ -39,8 +39,8 @@ @System.Text.RegularExpressions.Regex.Replace((displayTextContext.Value as string)!, "<(.|\n)*?>", string.Empty) - - + + @{ diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor index 53b98ef8..4bd24fda 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor @@ -14,6 +14,7 @@ @using TIAMWebApp.Shared.Application.Services @using AyCode.Interfaces.Addresses @using TIAM.Entities.Emails +@using AyCode.Core @inject IServiceProviderDataService serviceProviderDataService @inject IUserDataService userDataService @inject ITransferDataService transferDataService @@ -30,16 +31,17 @@ ColumnResizeMode="GridColumnResizeMode.NextColumn" ShowFilterRow="false"> - - + + - - - + + + + @{ @(((EmailMessage)context.DataItem).Text) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor index 700ca7b2..17b6eb23 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor @@ -45,6 +45,8 @@ + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor index 5e90bc41..fcc59ace 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor @@ -42,6 +42,8 @@ + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor index f8293b8b..93e7b0fd 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor @@ -29,8 +29,8 @@ - - + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor index f6370d10..cca7bb45 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor @@ -22,15 +22,16 @@ PageSize="5" ValidationEnabled="false" EditMode="GridEditMode.EditForm" - ColumnResizeMode="GridColumnResizeMode.NextColumn" - ShowFilterRow="true"> + ColumnResizeMode="GridColumnResizeMode.NextColumn"> - + + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor index 62f31019..0f1a2a60 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor @@ -48,6 +48,8 @@ + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor index 1a100aad..b24697c4 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor @@ -40,6 +40,8 @@ + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor index 74a76004..8d9c246a 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor @@ -37,6 +37,8 @@ + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor index 66110c20..15f479c4 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor @@ -38,34 +38,36 @@ @{ var userEmailFieldName = $"{nameof(TransferToDriver.UserProductMapping)}.{nameof(UserProductMapping.User)}.{nameof(User.EmailAddress)}"; - var userEmailFieldName2 = $"{nameof(UserProductMapping.User)}.{nameof(User.EmailAddress)}"; + + var userEmailFieldNameComboItem = $"{nameof(UserProductMapping.User)}.{nameof(User.EmailAddress)}"; + var userNameFieldNameComboItem = $"{nameof(UserProductMapping.User)}.{nameof(User.FullName)}"; } @{ - var transferToDriverDataItem = (TransferToDriver)context.DataItem; var transferToDriverEditModel = (TransferToDriver)context.EditModel; } - @* *@ - + + - - - + + + @{ var transferToDriver = (TransferToDriver)context.DataItem; @_cars.FirstOrDefault(x => x.Id == transferToDriver.CarId)?.LicencePlate @@ -86,7 +88,7 @@ SearchMode="ListSearchMode.AutoSearch"> @* *@ - + @@ -95,34 +97,36 @@ -@* - - @{ - var transferToDriverId = ((TransferToDriver)context.DataItem).Id; - } - - - - - - - - - *@ @* - - - + + @{ + var transferToDriverId = ((TransferToDriver)context.DataItem).Id; + } + + + + + + + + + *@ + @* + + + *@ - - + + @* *@ + + @@ -143,7 +147,6 @@ _logger.Info($"DetailGridData: {ParentData.TransferToDrivers.Count}"); - //EZ NEM JÓ, FILTER-ELNI KELL A PRODUCT-RA!!! - J. _cars.AddRange((await AdminSignalRClient.GetAllAsync>(SignalRTags.GetAllCarsByProductId, TiamConstClient.TransferProductId))!); // AdminSignalRClient.GetAllAsync>(SignalRTags.GetAllCars, response => // { @@ -151,14 +154,7 @@ // return Task.CompletedTask; // }).Forget(); - //EZ NEM JÓ, FILTER-ELNI KELL A PRODUCT-RA!!! - J. _drivers.AddRange(_cars.DistinctBy(x => x.UserProductMappingId).Select(x => x.UserProductMapping)); - //_drivers.AddRange((await AdminSignalRClient.GetAllAsync>(SignalRTags.GetAllDrivers))!); - // AdminSignalRClient.GetAllAsync>(SignalRTags.GetAllDrivers, response => - // { - // _drivers.AddRange(response.ResponseData!); - // return Task.CompletedTask; - // }).Forget(); await base.OnInitializedAsync(); } @@ -185,6 +181,8 @@ private void DataItemChanged(GridDataItemChangedEventArgs args) { + //ParentData?.TransferToDrivers?.UpdateCollection(args.DataItem, args.TrackingState == TrackingState.Remove); + OnTransferToDriverChanged.InvokeAsync(args.DataItem); } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor index c4ef4f26..24992f34 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor @@ -26,8 +26,7 @@ CustomizeEditModel="CustomizeEditModel" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" - DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode" - ShowFilterRow="true"> + DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"> @@ -47,6 +46,8 @@ @* *@ @* *@ + + @{ diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs index 1069bf6a..bff22c58 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs @@ -162,6 +162,8 @@ namespace TIAMSharedUI.Shared.Components.Grids if (e.IsNew) await AddDataItemAsync(dataItem); else await UpdateDataItemAsync(dataItem); + + _dataSource.UpdateCollection(dataItem, false); } private Task SaveChangesToServerAsync() diff --git a/TIAMSharedUI/Shared/Components/TiamErrorBoundaryComponent.razor b/TIAMSharedUI/Shared/Components/TiamErrorBoundaryComponent.razor index d813cd0d..46196286 100644 --- a/TIAMSharedUI/Shared/Components/TiamErrorBoundaryComponent.razor +++ b/TIAMSharedUI/Shared/Components/TiamErrorBoundaryComponent.razor @@ -7,6 +7,11 @@ @inherits ErrorBoundary +@* *@ + +@code { + bool PopupVisible { get; set; } = false; +} @if (_currentError != null) { @@ -23,6 +28,7 @@ else } @code { + //public DxPopup ErrorPopup; private Exception? _currentError; private LoggerClient _logger;