Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: Adam:c431c8d2ba8710b42a43ceb0f574283f0172cc9d
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
..
compare: Adam:5ef6de08db046fa1c0dc64629ef5058b7bf3f82a
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

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

5 changed files with 44 additions and 48 deletions
Show Stats Expand all files Collapse all files

26
TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor
View File

@ -19,8 +19,8 @@
<PageTitle>User permissions</PageTitle>
<div class="text-center m-5">
<h1>Partner prices</h1>
<h2 style="font-size:small">Set partner prices here!</h2>
<h1>User permissions</h1>
<h2 style="font-size:small">Manage transfers here!</h2>
</div>
@ -30,6 +30,12 @@
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card">
<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>
@ -52,9 +58,19 @@
bool PopupVisible { get; set; }
IGrid Grid { get; set; }
//object? MasterGridData { get; set; }
bool AutoCollapseDetailRow { get; set; }
public List<string> IgnoreList =
[
"ReceiverEmailAddress",
"ReceiverId",
"SenderEmailAddress",
"SenderId",
"ContextId"
];
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
@ -144,5 +160,9 @@
base.OnInitialized();
}
void ColumnChooserButton_Click()
{
Grid.ShowColumnChooser();
}
}

1
TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor
View File

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

2
TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor
View File

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

41
TIAMWebApp/Server/Controllers/TransferDataAPIController.cs
View File

@ -21,7 +21,6 @@ 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
{
@ -138,7 +137,6 @@ namespace TIAMWebApp.Server.Controllers
}
//[AllowAnonymous]
//[HttpPost]
//[Route(APIUrls.CreateTransferDestinationRouteName)]
@ -260,29 +258,27 @@ namespace TIAMWebApp.Server.Controllers
//}
//TransferDestinationToProduct
[AllowAnonymous]
[HttpGet]
[Route(APIUrls.GetAllTransferDestinationToProductsRouteName)]
//[AllowAnonymous]
//[HttpGet]
//[Route(APIUrls.GetTransferDestinationsRouteName)]
[SignalR(SignalRTags.GetAllTransferDestinationToProducts)]
public async Task<List<TransferDestinationToProduct>> GetAllTransferDestinationToProducts()
{
return await _adminDal.GetTransferDestinationToProducts();
}
[AllowAnonymous]
[HttpGet]
[Route(APIUrls.GetTransferDestinationToProductsByProductIdRouteName)]
//[AllowAnonymous]
//[HttpGet]
//[Route(APIUrls.GetTransferDestinationsRouteName)]
[SignalR(SignalRTags.GetTransferDestinationToProductsByProductId)]
public async Task<List<TransferDestinationToProduct>> GetTransferDestinationToProductsByProductId(Guid productId)
{
return await _adminDal.GetTransferDestinationToProductsByProductId(productId);
}
[AllowAnonymous]
[HttpGet]
[Route(APIUrls.GetTransferDestinationToProductsByTransferDestinationIdRouteName)]
//[AllowAnonymous]
//[HttpGet]
//[Route(APIUrls.GetTransferDestinationsRouteName)]
[SignalR(SignalRTags.GetTransferDestinationToProductsByTransferDestinationId)]
public async Task<List<TransferDestinationToProduct>> GetTransferDestinationToProductsByTransferDestinationId(Guid transferDestinationId)
{
@ -291,8 +287,7 @@ namespace TIAMWebApp.Server.Controllers
//[Authorize]
//[HttpGet]
//[Route(APIUrls.GetTransferDestinationToProductById)]
[NonAction]
//[Route(APIUrls.GetTransferDriversByTransferIdRouteName)]
[SignalR(SignalRTags.GetTransferDestinationToProductById)]
public async Task<TransferDestinationToProduct?> GetTransferDestinationToProductById(Guid transferDestinationToProductId)
{
@ -302,7 +297,7 @@ namespace TIAMWebApp.Server.Controllers
[AllowAnonymous]
[HttpPost]
[Route(APIUrls.CreateTransferDestinationToProductRouteName)]
[Route(APIUrls.CreateTransferDestinationRouteName)]
[SignalR(SignalRTags.CreateTransferDestinationToProduct)]
public async Task<TransferDestinationToProduct?> CreateTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct)
{
@ -325,9 +320,9 @@ namespace TIAMWebApp.Server.Controllers
return isSuccess ? transferDestinationToProduct : null;
}
[AllowAnonymous]
[HttpPost]
[Route(APIUrls.UpdateTransferDestinationToProductRouteName)]
//[AllowAnonymous]
//[HttpPost]
//[Route(APIUrls.UpdateTransferDestinationRouteName)]
[SignalR(SignalRTags.UpdateTransferDestinationToProduct)]
public async Task<TransferDestinationToProduct?> UpdateTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct)
{
@ -346,9 +341,9 @@ namespace TIAMWebApp.Server.Controllers
}
[Authorize]
[HttpGet]
[Route(APIUrls.RemoveTransferDestinationToProductRouteName)]
//[Authorize]
//[HttpGet]
//[Route(APIUrls.GetTransferDriversByTransferIdRouteName)]
[SignalR(SignalRTags.RemoveTransferDestinationToProduct)]
public async Task<TransferDestinationToProduct?> RemoveTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct)
{
@ -356,8 +351,6 @@ namespace TIAMWebApp.Server.Controllers
return result ? transferDestinationToProduct : null;
}
//transfer
[AllowAnonymous]
[HttpPost]
[Route(APIUrls.CreateTransferRouteName)]

18
TIAMWebApp/Shared/Models/APIUrls.cs
View File

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