From cad2c393890d3dbe56795d1253803903f0a67ddd Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 26 Jun 2024 18:21:45 +0200 Subject: [PATCH 1/3] bleh --- TIAM.Database/DataLayers/Admins/AdminDal.cs | 4 ++++ .../Transfers/TransferDbSetExtensions.cs | 8 +++++++- .../Controllers/TransferDataAPIController.cs | 19 +++++++++++++++++++ TIAMWebApp/Shared/Models/APIUrls.cs | 6 ++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index 6fd06ba4..0cb37b5c 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -95,6 +95,10 @@ namespace TIAM.Database.DataLayers.Admins public string? GetTransferDestinationToProductJsonById(Guid transferDestinationToProductId) => Session(ctx => ctx.GetTransferDestinationToProductById(transferDestinationToProductId)?.ToJson()); public TransferDestinationToProduct? GetTransferDestinationToProduct(Guid productId, Guid transferDestinationId) => Session(ctx=>ctx.GetTransferDestinationToProduct(productId, transferDestinationId)); + + public List? GetTransferDestinationToProductsByProductId(Guid productId) => Session(ctx => ctx.GetTransferDestinationToProductsByProductId(productId)); + public List? GetTransferDestinationToProductsByTransferDestinationId(Guid transferDestinationId) => Session(ctx => ctx.GetTransferDestinationToProductsByTransferDestinationId(transferDestinationId)); + public string? GetTransferDestinationToProductJson(Guid productId, Guid transferDestinationId) => Session(ctx => ctx.GetTransferDestinationToProduct(productId, transferDestinationId)?.ToJson()); public Task AddTransferDestinationToProductAsync(TransferDestinationToProduct transferDestinationToProduct) => TransactionAsync(ctx => ctx.AddTransferDestinationToProduct(transferDestinationToProduct)); diff --git a/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs b/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs index 408ce2fc..912b2861 100644 --- a/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs +++ b/TIAM.Database/DbSets/Transfers/TransferDbSetExtensions.cs @@ -63,7 +63,13 @@ public static class TransferDbSetExtensions => ctx.TransferDestinationToProducts.FirstOrDefault(x => x.Id == transferDestinationToProductId); public static TransferDestinationToProduct? GetTransferDestinationToProduct(this ITransferDestinationToProductDbSet ctx, Guid productId, Guid transferDestinationId) - => ctx.TransferDestinationToProducts.FirstOrDefault(x => x.ProductId == productId && x.TransferDestinationId == transferDestinationId); + => ctx.TransferDestinationToProducts.FirstOrDefault(x => x.ProductId == productId && x.TransferDestinationId == transferDestinationId); + + public static List? GetTransferDestinationToProductsByProductId(this ITransferDestinationToProductDbSet ctx, Guid productId) + => ctx.TransferDestinationToProducts.Where(x => x.ProductId == productId).ToList(); + + public static List? GetTransferDestinationToProductsByTransferDestinationId(this ITransferDestinationToProductDbSet ctx, Guid transferDestinationId) + => ctx.TransferDestinationToProducts.Where(x => x.TransferDestinationId == transferDestinationId).ToList(); public static bool AddTransferDestinationToProduct(this ITransferDestinationToProductDbSet ctx, TransferDestinationToProduct transferDestinationToProduct) => ctx.TransferDestinationToProducts.Add(transferDestinationToProduct).State == EntityState.Added; diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index 88363119..28c94518 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -136,6 +136,25 @@ namespace TIAMWebApp.Server.Controllers return result ? transferDestination : null; } + [AllowAnonymous] + [HttpPost] + [Route(APIUrls.GetTransferDestinationToProductByProductIdRouteName)] + [SignalR(SignalRTags.GetTransferDestinationToProductByProductId)] + public List GetTransferDestinationToProductByProductId(Guid productId) + { + if + return _adminDal.GetTransferDestinationToProductsByProductId(productId); + } + + [AllowAnonymous] + [HttpPost] + [Route(APIUrls.GetTransferDestinationToProductByTransferDestinationId)] + [SignalR(SignalRTags.GetTransferDestinationToProductByTransferDestinationId)] + public List GetTransferDestinationToProductByTransferDestinationId(Guid transferDestinationId) + { + return _adminDal.GetTransferDestinationToProductsByTransferDestinationId(transferDestinationId); + } + //[AllowAnonymous] //[HttpPost] diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs index 2c0fec58..6da72d46 100644 --- a/TIAMWebApp/Shared/Models/APIUrls.cs +++ b/TIAMWebApp/Shared/Models/APIUrls.cs @@ -81,6 +81,12 @@ namespace TIAMWebApp.Shared.Application.Models public const string CreateTransferDestinationRouteName = "CreateTransferDestination"; public const string CreateTransferDestination = TransferDataAPI + CreateTransferDestinationRouteName; + public const string GetTransferDestinationToProductByProductIdRouteName = "GetTransferDestinationToProductByProductId"; + public const string GetTransferDestinationToProductByProductId = TransferDataAPI + GetTransferDestinationToProductByProductIdRouteName; + + public const string GetTransferDestinationToProductByTransferDestinationIdRouteName = "GetTransferDestinationToProductByTransferDestinationId"; + public const string GetTransferDestinationToProductByTransferDestinationId = TransferDataAPI + GetTransferDestinationToProductByTransferDestinationIdRouteName; + public const string GetTransfersRouteName = "GetTransfers"; public const string GetTransfers = TransferDataAPI + GetTransfersRouteName; From 125ee917a09a21d97dfab72de299069c49ca7f90 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 26 Jun 2024 19:56:37 +0200 Subject: [PATCH 2/3] sdhkggfhdsg ghdg js hdk --- .../ManageTransferDestinationToProducts.razor | 31 ++-------- ...tinationToProductDetailGridComponent.razor | 2 +- ...ferDestinationToProductGridComponent.razor | 7 ++- .../Controllers/TransferDataAPIController.cs | 60 ++++++++----------- TIAMWebApp/Shared/Models/APIUrls.cs | 20 +++++-- 5 files changed, 52 insertions(+), 68 deletions(-) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor index 66f0d67f..d299b28a 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor @@ -19,8 +19,8 @@ User permissions
-

User permissions

-

Manage transfers here!

+

Partner prices

+

Set partner prices here!

@@ -30,14 +30,9 @@
-
- -
+ - +
@@ -58,19 +53,9 @@ bool PopupVisible { get; set; } - IGrid Grid { get; set; } - //object? MasterGridData { get; set; } + bool AutoCollapseDetailRow { get; set; } - public List IgnoreList = - [ - "ReceiverEmailAddress", - "ReceiverId", - "SenderEmailAddress", - "SenderId", - "ContextId" - ]; - void Grid_CustomizeElement(GridCustomizeElementEventArgs e) @@ -159,10 +144,6 @@ base.OnInitialized(); } - - void ColumnChooserButton_Click() - { - Grid.ShowColumnChooser(); - } + } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor index ffc18cbc..07cfb184 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor @@ -42,7 +42,7 @@ - + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor index e0e851f7..4ebff110 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor @@ -4,6 +4,7 @@ @using TIAM.Entities.Drivers @using TIAM.Entities.Users @using TIAM.Models.Dtos.Users +@using TIAM.Services @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Utility @@ -19,6 +20,7 @@ - + @@ -70,6 +72,7 @@ [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; [Parameter] public Guid? ContextId { get; set; } + [Parameter] public int GetAllTag { get; set; } private Guid[] ContextIds = new Guid[0]; private LoggerClient _logger = null!; @@ -83,7 +86,7 @@ protected override void OnParametersSet() { - if(ContextId.HasValue) + if(ContextId != null) { ContextIds = new Guid[1]; ContextIds[0] = (Guid)ContextId!; diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index c0d82c99..9604543a 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -21,6 +21,7 @@ using TIAMWebApp.Shared.Application.Models.ClientSide; using AyCode.Core.Extensions; using TIAM.Entities.Users; using TIAMSharedUI.Shared.Components.Grids; +using AyCode.Core.Helpers; namespace TIAMWebApp.Server.Controllers { @@ -136,25 +137,7 @@ namespace TIAMWebApp.Server.Controllers return result ? transferDestination : null; } - [AllowAnonymous] - [HttpPost] - [Route(APIUrls.GetTransferDestinationToProductByProductIdRouteName)] - [SignalR(SignalRTags.GetTransferDestinationToProductByProductId)] - public List GetTransferDestinationToProductByProductId(Guid productId) - { - if - return _adminDal.GetTransferDestinationToProductsByProductId(productId); - } - - [AllowAnonymous] - [HttpPost] - [Route(APIUrls.GetTransferDestinationToProductByTransferDestinationId)] - [SignalR(SignalRTags.GetTransferDestinationToProductByTransferDestinationId)] - public List GetTransferDestinationToProductByTransferDestinationId(Guid transferDestinationId) - { - return _adminDal.GetTransferDestinationToProductsByTransferDestinationId(transferDestinationId); - } - + //[AllowAnonymous] //[HttpPost] @@ -277,27 +260,29 @@ namespace TIAMWebApp.Server.Controllers //} - //[AllowAnonymous] - //[HttpGet] - //[Route(APIUrls.GetTransferDestinationsRouteName)] + //TransferDestinationToProduct + + [AllowAnonymous] + [HttpGet] + [Route(APIUrls.GetAllTransferDestinationToProductsRouteName)] [SignalR(SignalRTags.GetAllTransferDestinationToProducts)] public async Task> GetAllTransferDestinationToProducts() { return await _adminDal.GetTransferDestinationToProducts(); } - //[AllowAnonymous] - //[HttpGet] - //[Route(APIUrls.GetTransferDestinationsRouteName)] + [AllowAnonymous] + [HttpGet] + [Route(APIUrls.GetTransferDestinationToProductsByProductIdRouteName)] [SignalR(SignalRTags.GetTransferDestinationToProductsByProductId)] public async Task> GetTransferDestinationToProductsByProductId(Guid productId) { return await _adminDal.GetTransferDestinationToProductsByProductId(productId); } - //[AllowAnonymous] - //[HttpGet] - //[Route(APIUrls.GetTransferDestinationsRouteName)] + [AllowAnonymous] + [HttpGet] + [Route(APIUrls.GetTransferDestinationToProductsByTransferDestinationIdRouteName)] [SignalR(SignalRTags.GetTransferDestinationToProductsByTransferDestinationId)] public async Task> GetTransferDestinationToProductsByTransferDestinationId(Guid transferDestinationId) { @@ -306,7 +291,8 @@ namespace TIAMWebApp.Server.Controllers //[Authorize] //[HttpGet] - //[Route(APIUrls.GetTransferDriversByTransferIdRouteName)] + //[Route(APIUrls.GetTransferDestinationToProductById)] + [NonAction] [SignalR(SignalRTags.GetTransferDestinationToProductById)] public async Task GetTransferDestinationToProductById(Guid transferDestinationToProductId) { @@ -316,7 +302,7 @@ namespace TIAMWebApp.Server.Controllers [AllowAnonymous] [HttpPost] - [Route(APIUrls.CreateTransferDestinationRouteName)] + [Route(APIUrls.CreateTransferDestinationToProductRouteName)] [SignalR(SignalRTags.CreateTransferDestinationToProduct)] public async Task CreateTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct) { @@ -339,9 +325,9 @@ namespace TIAMWebApp.Server.Controllers return isSuccess ? transferDestinationToProduct : null; } - //[AllowAnonymous] - //[HttpPost] - //[Route(APIUrls.UpdateTransferDestinationRouteName)] + [AllowAnonymous] + [HttpPost] + [Route(APIUrls.UpdateTransferDestinationToProductRouteName)] [SignalR(SignalRTags.UpdateTransferDestinationToProduct)] public async Task UpdateTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct) { @@ -360,9 +346,9 @@ namespace TIAMWebApp.Server.Controllers } - //[Authorize] - //[HttpGet] - //[Route(APIUrls.GetTransferDriversByTransferIdRouteName)] + [Authorize] + [HttpGet] + [Route(APIUrls.RemoveTransferDestinationToProductRouteName)] [SignalR(SignalRTags.RemoveTransferDestinationToProduct)] public async Task RemoveTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct) { @@ -370,6 +356,8 @@ namespace TIAMWebApp.Server.Controllers return result ? transferDestinationToProduct : null; } + //transfer + [AllowAnonymous] [HttpPost] [Route(APIUrls.CreateTransferRouteName)] diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs index 6da72d46..bf8d9a31 100644 --- a/TIAMWebApp/Shared/Models/APIUrls.cs +++ b/TIAMWebApp/Shared/Models/APIUrls.cs @@ -81,11 +81,23 @@ namespace TIAMWebApp.Shared.Application.Models public const string CreateTransferDestinationRouteName = "CreateTransferDestination"; public const string CreateTransferDestination = TransferDataAPI + CreateTransferDestinationRouteName; - public const string GetTransferDestinationToProductByProductIdRouteName = "GetTransferDestinationToProductByProductId"; - public const string GetTransferDestinationToProductByProductId = TransferDataAPI + GetTransferDestinationToProductByProductIdRouteName; + public const string GetAllTransferDestinationToProductsRouteName = "GetAllTransferDestinationToProducts"; + public const string GetAllTransferDestinationToProducts = TransferDataAPI + GetAllTransferDestinationToProductsRouteName; - public const string GetTransferDestinationToProductByTransferDestinationIdRouteName = "GetTransferDestinationToProductByTransferDestinationId"; - public const string GetTransferDestinationToProductByTransferDestinationId = TransferDataAPI + GetTransferDestinationToProductByTransferDestinationIdRouteName; + public const string GetTransferDestinationToProductsByProductIdRouteName = "GetTransferDestinationToProductsByProductId"; + public const string GetTransferDestinationToProductsByProductId = TransferDataAPI + GetTransferDestinationToProductsByProductIdRouteName; + + public const string GetTransferDestinationToProductsByTransferDestinationIdRouteName = "GetTransferDestinationToProductsByTransferDestinationId"; + public const string GetTransferDestinationToProductsByTransferDestinationId = TransferDataAPI + GetTransferDestinationToProductsByTransferDestinationIdRouteName; + + public const string CreateTransferDestinationToProductRouteName = "CreateTransferDestinationToProduct"; + public const string CreateTransferDestinationToProduct = TransferDataAPI + CreateTransferDestinationToProductRouteName; + + public const string UpdateTransferDestinationToProductRouteName = "UpdateTransferDestinationToProduct"; + public const string UpdateTransferDestinationToProduct = TransferDataAPI + UpdateTransferDestinationToProductRouteName; + + public const string RemoveTransferDestinationToProductRouteName = "RemoveTransferDestinationToProduct"; + public const string RemoveTransferDestinationToProduct = TransferDataAPI + RemoveTransferDestinationToProductRouteName; public const string GetTransfersRouteName = "GetTransfers"; public const string GetTransfers = TransferDataAPI + GetTransfersRouteName; From c431c8d2ba8710b42a43ceb0f574283f0172cc9d Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 26 Jun 2024 20:03:02 +0200 Subject: [PATCH 3/3] dfsf ds fds fsf --- .../User/SysAdmins/ManageTransferDestinationToProducts.razor | 3 +-- .../Pages/User/SysAdmins/ManageTransferDestinations.razor | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor index d299b28a..e2b40758 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor @@ -31,8 +31,7 @@
- - +
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor index cf7cda0c..d2c73c4e 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor @@ -30,7 +30,6 @@
-