diff --git a/TIAM.Services/SignalRTags.cs b/TIAM.Services/SignalRTags.cs index 3ff10de9..688b29da 100644 --- a/TIAM.Services/SignalRTags.cs +++ b/TIAM.Services/SignalRTags.cs @@ -5,8 +5,9 @@ namespace TIAM.Services; public class SignalRTags : AcSignalRTags { - public const int GetTransfers = 5; - public const int GetPropertiesByOwnerId = 6; + //[SignalMessageTag(null, typeof(SignalResponseMessage), null, null)] + 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; @@ -15,4 +16,15 @@ public class SignalRTags : AcSignalRTags 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/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/Grid_MasterDetail_NestedGrid_DetailContent.razor b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor similarity index 76% rename from TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor rename to TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor index d9bdb817..e687580f 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.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] 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,16 +60,16 @@ newDriver.LicencePlate = ""; newDriver.Car = new Car(); newDriver.Price = 0; - newDriver.TransferId = Customer.Id; + newDriver.TransferId = Transfer.Id; } async Task EditModelSaving(GridEditModelSavingEventArgs e) { 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(); } @@ -82,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 6bcf0b21..a9c52128 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..dfb0e78e --- /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.GetAddressesByContextId; + AddMessageTag = SignalRTags.AddAddressToContextId; + UpdateMessageTag = SignalRTags.UpdateAddressByContextId; + RemoveMessageTag = SignalRTags.RemoveAddressByContextId; + } + + 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..233741e7 --- /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.GetTransferToDrivers; + AddMessageTag = SignalRTags.AddTransferToDrivers; + UpdateMessageTag = SignalRTags.UpdateTransferToDrivers; + RemoveMessageTag = SignalRTags.RemoveTransferToDrivers; + } + + 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/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"> + +