diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index d0bfd422..6fd06ba4 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -70,6 +70,7 @@ namespace TIAM.Database.DataLayers.Admins #endregion Transfer #region TransferDestination + public List? GetTransferDestinations() => Session(ctx=>ctx.GetTransferDestinations().ToList()); public TransferDestination? GetTransferDestinationById(Guid transferDestinationId) => Session(ctx=>ctx.GetTransferDestinationById(transferDestinationId)); public Task GetTransferDestinationByIdAsync(Guid transferDestinationId) => SessionAsync(ctx=>ctx.GetTransferDestinationById(transferDestinationId)); public string? GetTransferDestinationJsonById(Guid transferDestinationId) => Session(ctx => ctx.GetTransferDestinationById(transferDestinationId)?.ToJson()); diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor index 7f55c274..6eb2ce13 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor @@ -41,12 +41,14 @@ } - - - + + + + + @@ -64,13 +66,22 @@ @EditFormContext.GetEditor("AddressString") - - - @EditFormContext.GetEditor("PriceType") - + @EditFormContext.GetEditor("Price") + + @EditFormContext.GetEditor("Price2") + + + @EditFormContext.GetEditor("Price3") + + + @EditFormContext.GetEditor("ProductCommis") + + + @EditFormContext.GetEditor("ExtraPrice") + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor index 6fabca76..a618c137 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor @@ -78,7 +78,7 @@ [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; [Parameter] public Guid? ContextId { get; set; } - [Parameter] public Guid[]? ContextIds { get; set; } = new Guid[1]; + [Parameter] public Guid[]? ContextIds { get; set; } = new Guid[0]; [Parameter] public int GetAllTag { get; set; } private LoggerClient _logger = null!; @@ -98,6 +98,7 @@ { if(ContextId.HasValue) { + ContextIds = new Guid[1]; ContextIds[0] = (Guid)ContextId!; } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor index 10f2533e..e0e851f7 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor @@ -71,6 +71,7 @@ [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; [Parameter] public Guid? ContextId { get; set; } + private Guid[] ContextIds = new Guid[0]; private LoggerClient _logger = null!; protected override void OnInitialized() @@ -84,6 +85,7 @@ { if(ContextId.HasValue) { + ContextIds = new Guid[1]; ContextIds[0] = (Guid)ContextId!; } diff --git a/TIAMSharedUI/Shared/Components/Grids/TransferDestinationGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TransferDestinationGrid.cs index 668be035..9bd75531 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TransferDestinationGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TransferDestinationGrid.cs @@ -1,11 +1,12 @@ using Microsoft.AspNetCore.Components; using TIAM.Entities.Profiles; +using TIAM.Entities.Transfers; using TIAM.Services; namespace TIAMSharedUI.Shared.Components.Grids; -public class TransferDestinationGrid : TiamGrid +public class TransferDestinationGrid : TiamGrid { public TransferDestinationGrid() : base() { diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index 4da08af2..fbfacfd6 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -26,7 +26,6 @@ - diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index a9cabb51..88363119 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -20,6 +20,7 @@ using TIAMWebApp.Server.Services; using TIAMWebApp.Shared.Application.Models.ClientSide; using AyCode.Core.Extensions; using TIAM.Entities.Users; +using TIAMSharedUI.Shared.Components.Grids; namespace TIAMWebApp.Server.Controllers { @@ -48,9 +49,10 @@ namespace TIAMWebApp.Server.Controllers [AllowAnonymous] [HttpGet] [Route(APIUrls.GetTransferDestinationsRouteName)] - public async Task> GetTransferDestinations() + [SignalR(SignalRTags.GetAllTransferDestinations)] + public List GetTransferDestinations() { - return await _adminDal.Context.TransferDestinations.ToListAsync(); + return _adminDal.GetTransferDestinations(); } //[Authorize]