From 83f6c0eeabf454864b3972cf15b58a270ad08a47 Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Tue, 2 Jul 2024 18:47:07 +0200
Subject: [PATCH] fixes

---
 .../User/SysAdmins/CarGridComponent.razor     |  5 +--
 .../User/SysAdmins/DriverGridComponent.razor  |  5 +--
 ...tinationToProductDetailGridComponent.razor | 32 +++++++++----------
 .../UserProductMappingGridComponent.razor     |  3 +-
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor
index e70e6d19..fba6afde 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor
@@ -29,7 +29,7 @@
          DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"
          ShowFilterRow="true">
     <Columns>
-        <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
+        <DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="false" Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
         <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
         <DxGridDataColumn FieldName="UserProductMappingId" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
         @{
@@ -52,7 +52,8 @@
             <DxTabs>
 
                 <DxTabPage Text="Driving permissions assigned">
-                    <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsById" ContextIds="new[] { ((Car)context.DataItem).UserProductMappingId }" />
+                    <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsById" ContextIds="new[] { ((Car)context.DataItem).UserProductMappingId }"
+                                                     NewButtonVisible="false"/>
                 </DxTabPage>
 
             </DxTabs>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor
index b6d5c431..dda2ea58 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor
@@ -43,9 +43,10 @@
         <DxGrid Data="@FoundUsers" RowClick="@OnRowClick">
             <Columns>
                 <DxGridDataColumn FieldName="Id" Caption="ID" />
-                <DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
+                <DxGridDataColumn FieldName="Id" Caption="ID" />
+@*                 <DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
                 <DxGridDataColumn FieldName="Modified" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
-            </Columns>
+ *@            </Columns>
         </DxGrid>
     </BodyContentTemplate>
     <FooterContentTemplate Context="PopupContext">
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor
index 7566a1b0..0ef37798 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor
@@ -16,16 +16,16 @@
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject AdminSignalRClient AdminSignalRClient;
 
-<TransferDestinationToProductDetailGrid
-    Logger="_logger"
-    SignalRClient="AdminSignalRClient"
-    ContextIds="ContextIds?.Cast<object>().ToArray()"
-    GetAllMessageTag="GetAllTag"
-    PageSize="10"
-    ValidationEnabled="false"       
-    EditMode="GridEditMode.EditForm"
-    ColumnResizeMode="GridColumnResizeMode.NextColumn">
-        
+<TransferDestinationToProductDetailGrid Logger="_logger"
+                                        SignalRClient="AdminSignalRClient"
+                                        ContextIds="ContextIds?.Cast<object>().ToArray()"
+                                        GetAllMessageTag="GetAllTag"
+                                        PageSize="10"
+                                        ValidationEnabled="false"
+                                        EditMode="GridEditMode.EditForm"
+                                        DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"
+                                        ColumnResizeMode="GridColumnResizeMode.NextColumn">
+
     <Columns>
         <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
         <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
@@ -33,7 +33,7 @@
         <DxGridDataColumn FieldName="TransferDestinationId" />
         @*<DxGridDataColumn FieldName="TransferDestinationId" SortIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
         @{
-            var destinationNameFieldName = $"{nameof(TransferDestinationToProduct.TransferDestination.Name)}.{nameof(TransferDestination.Name)}";
+        var destinationNameFieldName = $"{nameof(TransferDestinationToProduct.TransferDestination.Name)}.{nameof(TransferDestination.Name)}";
         }
         <DxGridDataColumn FieldName="@destinationNameFieldName" Caption="TransferDestination name" />*@
         <DxGridDataColumn FieldName="Price" />
@@ -43,20 +43,20 @@
         <DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
         <DxGridDataColumn FieldName="Modified" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
     </Columns>
-        <DetailRowTemplate>
+    <DetailRowTemplate>
 
         <DxTabs>
             <DxTabPage Text="Partner">
-                <ProductDetailGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" GetAllTag="SignalRTags.GetProductsById" ContextId="((TransferDestinationToProduct)context.DataItem).ProductId" ParentData="(Company)context.DataItem" />
+                <ProductDetailGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Never" GetAllTag="SignalRTags.GetProductsById" ContextId="((TransferDestinationToProduct)context.DataItem).ProductId" ParentData="(Company)context.DataItem" />
             </DxTabPage>
-            
+
         </DxTabs>
 
 
     </DetailRowTemplate>
     <EditFormTemplate Context="editFormContext">
         @{
-            var serviceProvider = (Company)editFormContext.EditModel;            
+            var transferDestinationToProduct = (TransferDestinationToProduct)editFormContext.EditModel;
         }
         <DxFormLayout CssClass="w-100">
             <DxFormLayoutItem Caption="Price" ColSpanMd="4">
@@ -68,7 +68,7 @@
             <DxFormLayoutItem Caption="Price3" ColSpanMd="4">
                 @editFormContext.GetEditor("Price3")
             </DxFormLayoutItem>
-            
+
             <DxFormLayoutItem Caption="Commission rate" ColSpanMd="4">
                 @editFormContext.GetEditor("ProductCommis")
             </DxFormLayoutItem>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
index 5e33179f..3902cf96 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
@@ -28,7 +28,7 @@
                         ColumnResizeMode="GridColumnResizeMode.NextColumn"
                         DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode">
     <Columns>
-        <DxGridCommandColumn Width="135" MinWidth="135" DeleteButtonVisible="AcDomain.IsDeveloperVersion" EditButtonVisible="AcDomain.IsDeveloperVersion" FixedPosition="GridColumnFixedPosition.Left" />
+        <DxGridCommandColumn Width="135" MinWidth="135" NewButtonVisible="NewButtonVisible" DeleteButtonVisible="AcDomain.IsDeveloperVersion" EditButtonVisible="AcDomain.IsDeveloperVersion" FixedPosition="GridColumnFixedPosition.Left" />
         <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
         <DxGridDataColumn FieldName="UserId" Caption="UserId" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
         @{
@@ -80,6 +80,7 @@
 </UserProductMappingGrid>
 
 @code {
+    [Parameter] public bool NewButtonVisible { get; set; } = true;
     [Parameter] public IProductRelation ParentData { get; set; } = null!;
 
     [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllUserProductMappings;