Compare commits

..

No commits in common. "c431c8d2ba8710b42a43ceb0f574283f0172cc9d" and "5ef6de08db046fa1c0dc64629ef5058b7bf3f82a" have entirely different histories.

5 changed files with 44 additions and 48 deletions

View File

@ -19,8 +19,8 @@
<PageTitle>User permissions</PageTitle> <PageTitle>User permissions</PageTitle>
<div class="text-center m-5"> <div class="text-center m-5">
<h1>Partner prices</h1> <h1>User permissions</h1>
<h2 style="font-size:small">Set partner prices here!</h2> <h2 style="font-size:small">Manage transfers here!</h2>
</div> </div>
@ -30,7 +30,13 @@
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
<div class="align-self-end pl-2 pb-2">
<DxButton Text="Column Chooser"
RenderStyle="ButtonRenderStyle.Secondary"
IconCssClass="btn-column-chooser"
Click="ColumnChooserButton_Click" />
</div>
<TransferDestinationToProductGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto"></TransferDestinationToProductGridComponent> <TransferDestinationToProductGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto"></TransferDestinationToProductGridComponent>
</div> </div>
@ -52,9 +58,19 @@
bool PopupVisible { get; set; } bool PopupVisible { get; set; }
IGrid Grid { get; set; }
//object? MasterGridData { get; set; }
bool AutoCollapseDetailRow { get; set; } bool AutoCollapseDetailRow { get; set; }
public List<string> IgnoreList =
[
"ReceiverEmailAddress",
"ReceiverId",
"SenderEmailAddress",
"SenderId",
"ContextId"
];
void Grid_CustomizeElement(GridCustomizeElementEventArgs e) void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
@ -143,6 +159,10 @@
base.OnInitialized(); base.OnInitialized();
} }
void ColumnChooserButton_Click()
{
Grid.ShowColumnChooser();
}
} }

View File

@ -30,6 +30,7 @@
</div> </div>
<TransferDestinationGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" GetAllTag="SignalRTags.GetAllTransferDestinations"></TransferDestinationGridComponent> <TransferDestinationGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" GetAllTag="SignalRTags.GetAllTransferDestinations"></TransferDestinationGridComponent>
</div> </div>
</Animation> </Animation>
</div> </div>

View File

@ -47,7 +47,7 @@
<DxTabs> <DxTabs>
<DxTabPage Text="Partner"> <DxTabPage Text="Partner">
<ProductDetailGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" GetAllTag="SignalRTags.GetProductsById" ContextId="((TransferDestinationToProduct)context.DataItem).ProductId" ParentData="(Company)context.DataItem" KeyboardNavigationEnabled="true" />
</DxTabPage> </DxTabPage>
</DxTabs> </DxTabs>

View File

@ -21,7 +21,6 @@ using TIAMWebApp.Shared.Application.Models.ClientSide;
using AyCode.Core.Extensions; using AyCode.Core.Extensions;
using TIAM.Entities.Users; using TIAM.Entities.Users;
using TIAMSharedUI.Shared.Components.Grids; using TIAMSharedUI.Shared.Components.Grids;
using AyCode.Core.Helpers;
namespace TIAMWebApp.Server.Controllers namespace TIAMWebApp.Server.Controllers
{ {
@ -137,7 +136,6 @@ namespace TIAMWebApp.Server.Controllers
return result ? transferDestination : null; return result ? transferDestination : null;
} }
//[AllowAnonymous] //[AllowAnonymous]
//[HttpPost] //[HttpPost]
@ -260,29 +258,27 @@ namespace TIAMWebApp.Server.Controllers
//} //}
//TransferDestinationToProduct //[AllowAnonymous]
//[HttpGet]
[AllowAnonymous] //[Route(APIUrls.GetTransferDestinationsRouteName)]
[HttpGet]
[Route(APIUrls.GetAllTransferDestinationToProductsRouteName)]
[SignalR(SignalRTags.GetAllTransferDestinationToProducts)] [SignalR(SignalRTags.GetAllTransferDestinationToProducts)]
public async Task<List<TransferDestinationToProduct>> GetAllTransferDestinationToProducts() public async Task<List<TransferDestinationToProduct>> GetAllTransferDestinationToProducts()
{ {
return await _adminDal.GetTransferDestinationToProducts(); return await _adminDal.GetTransferDestinationToProducts();
} }
[AllowAnonymous] //[AllowAnonymous]
[HttpGet] //[HttpGet]
[Route(APIUrls.GetTransferDestinationToProductsByProductIdRouteName)] //[Route(APIUrls.GetTransferDestinationsRouteName)]
[SignalR(SignalRTags.GetTransferDestinationToProductsByProductId)] [SignalR(SignalRTags.GetTransferDestinationToProductsByProductId)]
public async Task<List<TransferDestinationToProduct>> GetTransferDestinationToProductsByProductId(Guid productId) public async Task<List<TransferDestinationToProduct>> GetTransferDestinationToProductsByProductId(Guid productId)
{ {
return await _adminDal.GetTransferDestinationToProductsByProductId(productId); return await _adminDal.GetTransferDestinationToProductsByProductId(productId);
} }
[AllowAnonymous] //[AllowAnonymous]
[HttpGet] //[HttpGet]
[Route(APIUrls.GetTransferDestinationToProductsByTransferDestinationIdRouteName)] //[Route(APIUrls.GetTransferDestinationsRouteName)]
[SignalR(SignalRTags.GetTransferDestinationToProductsByTransferDestinationId)] [SignalR(SignalRTags.GetTransferDestinationToProductsByTransferDestinationId)]
public async Task<List<TransferDestinationToProduct>> GetTransferDestinationToProductsByTransferDestinationId(Guid transferDestinationId) public async Task<List<TransferDestinationToProduct>> GetTransferDestinationToProductsByTransferDestinationId(Guid transferDestinationId)
{ {
@ -291,8 +287,7 @@ namespace TIAMWebApp.Server.Controllers
//[Authorize] //[Authorize]
//[HttpGet] //[HttpGet]
//[Route(APIUrls.GetTransferDestinationToProductById)] //[Route(APIUrls.GetTransferDriversByTransferIdRouteName)]
[NonAction]
[SignalR(SignalRTags.GetTransferDestinationToProductById)] [SignalR(SignalRTags.GetTransferDestinationToProductById)]
public async Task<TransferDestinationToProduct?> GetTransferDestinationToProductById(Guid transferDestinationToProductId) public async Task<TransferDestinationToProduct?> GetTransferDestinationToProductById(Guid transferDestinationToProductId)
{ {
@ -302,7 +297,7 @@ namespace TIAMWebApp.Server.Controllers
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
[Route(APIUrls.CreateTransferDestinationToProductRouteName)] [Route(APIUrls.CreateTransferDestinationRouteName)]
[SignalR(SignalRTags.CreateTransferDestinationToProduct)] [SignalR(SignalRTags.CreateTransferDestinationToProduct)]
public async Task<TransferDestinationToProduct?> CreateTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct) public async Task<TransferDestinationToProduct?> CreateTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct)
{ {
@ -325,9 +320,9 @@ namespace TIAMWebApp.Server.Controllers
return isSuccess ? transferDestinationToProduct : null; return isSuccess ? transferDestinationToProduct : null;
} }
[AllowAnonymous] //[AllowAnonymous]
[HttpPost] //[HttpPost]
[Route(APIUrls.UpdateTransferDestinationToProductRouteName)] //[Route(APIUrls.UpdateTransferDestinationRouteName)]
[SignalR(SignalRTags.UpdateTransferDestinationToProduct)] [SignalR(SignalRTags.UpdateTransferDestinationToProduct)]
public async Task<TransferDestinationToProduct?> UpdateTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct) public async Task<TransferDestinationToProduct?> UpdateTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct)
{ {
@ -346,9 +341,9 @@ namespace TIAMWebApp.Server.Controllers
} }
[Authorize] //[Authorize]
[HttpGet] //[HttpGet]
[Route(APIUrls.RemoveTransferDestinationToProductRouteName)] //[Route(APIUrls.GetTransferDriversByTransferIdRouteName)]
[SignalR(SignalRTags.RemoveTransferDestinationToProduct)] [SignalR(SignalRTags.RemoveTransferDestinationToProduct)]
public async Task<TransferDestinationToProduct?> RemoveTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct) public async Task<TransferDestinationToProduct?> RemoveTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct)
{ {
@ -356,8 +351,6 @@ namespace TIAMWebApp.Server.Controllers
return result ? transferDestinationToProduct : null; return result ? transferDestinationToProduct : null;
} }
//transfer
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
[Route(APIUrls.CreateTransferRouteName)] [Route(APIUrls.CreateTransferRouteName)]

View File

@ -81,24 +81,6 @@ namespace TIAMWebApp.Shared.Application.Models
public const string CreateTransferDestinationRouteName = "CreateTransferDestination"; public const string CreateTransferDestinationRouteName = "CreateTransferDestination";
public const string CreateTransferDestination = TransferDataAPI + CreateTransferDestinationRouteName; public const string CreateTransferDestination = TransferDataAPI + CreateTransferDestinationRouteName;
public const string GetAllTransferDestinationToProductsRouteName = "GetAllTransferDestinationToProducts";
public const string GetAllTransferDestinationToProducts = TransferDataAPI + GetAllTransferDestinationToProductsRouteName;
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 GetTransfersRouteName = "GetTransfers";
public const string GetTransfers = TransferDataAPI + GetTransfersRouteName; public const string GetTransfers = TransferDataAPI + GetTransfersRouteName;