From d8de723141457f4792e820d4bd00bd1579085523 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 1 Jun 2024 10:25:56 +0200 Subject: [PATCH 1/3] Driver grid rename --- ...ilContent.razor => DriverGridComponent.razor} | 16 +++++----------- TIAMSharedUI/Shared/Users/AdminNavMenu.razor | 2 ++ 2 files changed, 7 insertions(+), 11 deletions(-) rename TIAMSharedUI/Pages/User/SysAdmins/{Grid_MasterDetail_NestedGrid_DetailContent.razor => DriverGridComponent.razor} (82%) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor similarity index 82% rename from TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor rename to TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor index d9bdb817..1beb089e 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor @@ -35,22 +35,16 @@ [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] - public Transfer Customer { get; set; } + public Transfer Transfer { get; set; } - private LoggerClient _logger; + private LoggerClient _logger; List DetailGridData { get; set; } - public UserModelDtoDetail? UserModelDtoDetail; - protected override async Task OnInitializedAsync() { - _logger = new LoggerClient(LogWriters.ToArray()); + _logger = new LoggerClient(LogWriters.ToArray()); - UserModelDtoDetail = await UserDataService.GetUserDetailByIdAsync(Customer.UserId); - - if (UserModelDtoDetail == null) return; - - DetailGridData = Customer.TransferToDrivers; + DetailGridData = Transfer.TransferToDrivers; _logger.Info($"DetailGridData: {DetailGridData.Count}"); } @@ -65,7 +59,7 @@ newDriver.LicencePlate = ""; newDriver.Car = new Car(); newDriver.Price = 0; - newDriver.TransferId = Customer.Id; + newDriver.TransferId = Transfer.Id; } async Task EditModelSaving(GridEditModelSavingEventArgs e) diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index ff6082a3..3c2c8c95 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -9,6 +9,8 @@ DisplayMode="DisplayMode"> + + From 30c5e8382d87c3795db6a911aba39d889f29a748 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 1 Jun 2024 16:02:48 +0200 Subject: [PATCH 2/3] Test grids: address grid, driver grid.. cast error onEditmodelSaving --- TIAM.Services/SignalRTags.cs | 9 +++++ .../User/SysAdmins/AddressGridComponent.razor | 5 +-- .../User/SysAdmins/DriverGridComponent.razor | 11 ++++--- .../User/SysAdmins/ManageTransfers.razor | 2 +- .../Pages/User/SysAdmins/ManageUsers.razor | 1 + .../Shared/Components/Grids/AdressGrid.cs | 33 +++++++++++++++++++ .../Components/Grids/TransferToDriversGrid.cs | 32 ++++++++++++++++++ 7 files changed, 85 insertions(+), 8 deletions(-) create mode 100644 TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs create mode 100644 TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs diff --git a/TIAM.Services/SignalRTags.cs b/TIAM.Services/SignalRTags.cs index d55f0f33..cfa7d3c8 100644 --- a/TIAM.Services/SignalRTags.cs +++ b/TIAM.Services/SignalRTags.cs @@ -18,4 +18,13 @@ public class SignalRTags : AcSignalRTags public const int UpdateCompanyAsync = 11; public const int AddCompanyAsync = 12; public const int RemoveCompanyAsync = 13; + public const int GetTransferToDriversAsync = 14; + public const int AddTransferToDriversAsync = 15; + public const int UpdateTransferToDriversAsync = 16; + public const int RemoveTransferToDriversAsync = 17; + public const int GetAddressesByContextIdAsync = 18; + public const int AddAddressToContextIdAsync = 19; + public const int UpdateAddressByContextIdAsync = 20; + public const int RemoveAddressByContextIdAsync = 21; + } \ No newline at end of file diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor index 98411287..0168bab4 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor @@ -9,6 +9,7 @@ @using AyCode.Services.Loggers @using TIAM.Core.Loggers @using TIAM.Entities.Addresses +@using TIAMSharedUI.Shared.Components.Grids @using TIAMSharedUI.Pages.Components.EditComponents @inject IServiceProviderDataService serviceProviderDataService @inject IUserDataService userDataService @@ -16,7 +17,7 @@ @inject IEnumerable LogWriters - - + @code { [Parameter] diff --git a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor index 1beb089e..e687580f 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor @@ -1,6 +1,7 @@ @using TIAM.Entities.Transfers @using TIAM.Entities.Drivers @using TIAM.Models.Dtos.Users +@using TIAMSharedUI.Shared.Components.Grids @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Utility @using TIAM.Core.Loggers @@ -11,7 +12,7 @@ - - + @code { [Parameter] @@ -66,9 +67,9 @@ { if (e.IsNew) //add new orderData to orderData array - _logger.Info("New orderData added"); + _logger.Info("New driver added"); else - _logger.Info("orderData updated"); + _logger.Info("Driver updated"); await UpdateDataAsync(); } @@ -76,7 +77,7 @@ async Task DataItemDeleting(GridDataItemDeletingEventArgs e) { //remove orderData from orderData array - _logger.Info("orderData deleted"); + _logger.Info("driver deleted"); //await UpdateDataAsync(); } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 3dd18d81..e2c4c5f2 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -147,7 +147,7 @@ - + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor index 9fcf207c..f752a382 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor @@ -21,6 +21,7 @@ @using AyCode.Services.Loggers @using TIAM.Core.Loggers @using TIAM.Entities.Addresses +@using TIAMSharedUI.Shared.Components.Grids @layout AdminLayout @inject IEnumerable LogWriters @inject IStringLocalizer Localizer diff --git a/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs b/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs new file mode 100644 index 00000000..b1fe32c4 --- /dev/null +++ b/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs @@ -0,0 +1,33 @@ +using Microsoft.AspNetCore.Components; +using TIAM.Entities.Addresses; +using TIAM.Entities.Transfers; +using TIAM.Services; + +namespace TIAMSharedUI.Shared.Components.Grids; + +public class AddressGrid : TiamGrid
+{ + public AddressGrid() : base() + { + GridName = nameof(Address); + + GetAllMessageTag = SignalRTags.GetAddressesByContextIdAsync; + AddMessageTag = SignalRTags.AddAddressToContextIdAsync; + UpdateMessageTag = SignalRTags.UpdateAddressByContextIdAsync; + RemoveMessageTag = SignalRTags.RemoveAddressByContextIdAsync; + } + + protected override Task SetParametersAsyncCore(ParameterView parameters) + { + if (!IsFirstInitializeParameters) + { + //ShowFilterRow = true; + //ShowGroupPanel = true; + //AllowSort = false; + + //etc... + } + + return base.SetParametersAsyncCore(parameters); + } +} \ No newline at end of file diff --git a/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs new file mode 100644 index 00000000..7b87cb92 --- /dev/null +++ b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs @@ -0,0 +1,32 @@ +using Microsoft.AspNetCore.Components; +using TIAM.Entities.Transfers; +using TIAM.Services; + +namespace TIAMSharedUI.Shared.Components.Grids; + +public class TransferToDriversGrid : TiamGrid +{ + public TransferToDriversGrid() : base() + { + GridName = nameof(TransferToDriver); + + GetAllMessageTag = SignalRTags.GetTransferToDriversAsync; + AddMessageTag = SignalRTags.AddTransferToDriversAsync; + UpdateMessageTag = SignalRTags.UpdateTransferToDriversAsync; + RemoveMessageTag = SignalRTags.RemoveTransferToDriversAsync; + } + + protected override Task SetParametersAsyncCore(ParameterView parameters) + { + if (!IsFirstInitializeParameters) + { + //ShowFilterRow = true; + //ShowGroupPanel = true; + //AllowSort = false; + + //etc... + } + + return base.SetParametersAsyncCore(parameters); + } +} \ No newline at end of file From a1dc60b94a525c49c7536aa76a6d8bb13edca316 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 1 Jun 2024 16:20:17 +0200 Subject: [PATCH 3/3] merge --- TIAM.Services/SignalRTags.cs | 40 +++++++++---------- .../Shared/Components/Grids/AdressGrid.cs | 8 ++-- .../Components/Grids/TransferToDriversGrid.cs | 8 ++-- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/TIAM.Services/SignalRTags.cs b/TIAM.Services/SignalRTags.cs index cfa7d3c8..688b29da 100644 --- a/TIAM.Services/SignalRTags.cs +++ b/TIAM.Services/SignalRTags.cs @@ -6,25 +6,25 @@ namespace TIAM.Services; public class SignalRTags : AcSignalRTags { //[SignalMessageTag(null, typeof(SignalResponseMessage), null, null)] - public const int GetTransfersAsync = 5; - - public const int GetPropertiesByOwnerIdAsync = 6; - - [SignalMessageTag(typeof(SignalPostJsonDataMessage), typeof(SignalResponseMessage), null, null)] - public const int UpdateTransferAsync = 7; - public const int AddTransferAsync = 8; - public const int RemoveTransferAsync = 9; - public const int GetCompaniesAsync = 10; - public const int UpdateCompanyAsync = 11; - public const int AddCompanyAsync = 12; - public const int RemoveCompanyAsync = 13; - public const int GetTransferToDriversAsync = 14; - public const int AddTransferToDriversAsync = 15; - public const int UpdateTransferToDriversAsync = 16; - public const int RemoveTransferToDriversAsync = 17; - public const int GetAddressesByContextIdAsync = 18; - public const int AddAddressToContextIdAsync = 19; - public const int UpdateAddressByContextIdAsync = 20; - public const int RemoveAddressByContextIdAsync = 21; + public const int GetTransfers = 5; + public const int GetPropertiesByOwnerId = 6; + public const int UpdateTransfer = 7; + public const int AddTransfer = 8; + public const int RemoveTransfer = 9; + + public const int GetCompanies = 10; + public const int UpdateCompany = 11; + public const int AddCompany = 12; + public const int RemoveCompany = 13; + + public const int GetTransferToDrivers = 14; + public const int AddTransferToDrivers = 15; + public const int UpdateTransferToDrivers = 16; + public const int RemoveTransferToDrivers = 17; + + public const int GetAddressesByContextId = 18; + public const int AddAddressToContextId = 19; + public const int UpdateAddressByContextId = 20; + public const int RemoveAddressByContextId = 21; } \ No newline at end of file diff --git a/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs b/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs index b1fe32c4..dfb0e78e 100644 --- a/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs @@ -11,10 +11,10 @@ public class AddressGrid : TiamGrid
{ GridName = nameof(Address); - GetAllMessageTag = SignalRTags.GetAddressesByContextIdAsync; - AddMessageTag = SignalRTags.AddAddressToContextIdAsync; - UpdateMessageTag = SignalRTags.UpdateAddressByContextIdAsync; - RemoveMessageTag = SignalRTags.RemoveAddressByContextIdAsync; + GetAllMessageTag = SignalRTags.GetAddressesByContextId; + AddMessageTag = SignalRTags.AddAddressToContextId; + UpdateMessageTag = SignalRTags.UpdateAddressByContextId; + RemoveMessageTag = SignalRTags.RemoveAddressByContextId; } protected override Task SetParametersAsyncCore(ParameterView parameters) diff --git a/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs index 7b87cb92..233741e7 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs @@ -10,10 +10,10 @@ public class TransferToDriversGrid : TiamGrid { GridName = nameof(TransferToDriver); - GetAllMessageTag = SignalRTags.GetTransferToDriversAsync; - AddMessageTag = SignalRTags.AddTransferToDriversAsync; - UpdateMessageTag = SignalRTags.UpdateTransferToDriversAsync; - RemoveMessageTag = SignalRTags.RemoveTransferToDriversAsync; + GetAllMessageTag = SignalRTags.GetTransferToDrivers; + AddMessageTag = SignalRTags.AddTransferToDrivers; + UpdateMessageTag = SignalRTags.UpdateTransferToDrivers; + RemoveMessageTag = SignalRTags.RemoveTransferToDrivers; } protected override Task SetParametersAsyncCore(ParameterView parameters)