Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor

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

TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor

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

TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor

@@ -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>

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

TIAMWebApp/Shared/Models/APIUrls.cs

@@ -81,6 +81,24 @@ 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;