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