From 7c45e078997481038b88f126a17cd1de2d030255 Mon Sep 17 00:00:00 2001 From: Loretta Date: Thu, 27 Jun 2024 08:39:40 +0200 Subject: [PATCH] fixes, improvements, etc... --- TIAM.Entities/Transfers/TransferToDriver.cs | 3 ++ TIAMSharedUI/Pages/EditTransfers.razor | 3 -- .../Pages/User/MyServiceProviders.razor | 4 +- TIAMSharedUI/Pages/User/ServiceProvider.razor | 13 ++--- .../AddressDetailGridComponent.razor | 5 -- .../User/SysAdmins/AddressGridComponent.razor | 11 +--- .../SysAdmins/CarDetailGridComponent.razor | 6 +-- .../User/SysAdmins/CarGridComponent.razor | 6 +-- .../CompaniesNestedUserProductMapping.razor | 8 +-- .../User/SysAdmins/DriverGridComponent.razor | 8 +-- .../Pages/User/SysAdmins/ManageCars.razor | 1 - .../Pages/User/SysAdmins/ManageDrivers.razor | 2 - .../SysAdmins/ManageServiceProviders.razor | 24 ++------- .../ManageTransferDestinationToProducts.razor | 6 +-- .../User/SysAdmins/ManageTransfers.razor | 25 ++------- .../SysAdmins/ManageUserProductMappings.razor | 1 - .../Pages/User/SysAdmins/ManageUsers.razor | 23 ++------ .../MessageDetailGridComponent.razor | 5 +- .../User/SysAdmins/MessageGridComponent.razor | 5 -- .../ProductDetailGridComponent.razor | 6 +-- .../User/SysAdmins/ProductGridComponent.razor | 8 +-- .../User/SysAdmins/ProfileGridComponent.razor | 7 +-- .../ServiceProviderGridComponent.razor | 6 +-- .../TransferDestinationGridComponent.razor | 5 +- ...tinationToProductDetailGridComponent.razor | 5 +- ...ferDestinationToProductGridComponent.razor | 3 -- .../TransferToDriverGridComponent.razor | 54 ++++++++++++++++--- .../UserProductMappingGridComponent.razor | 8 +-- .../Shared/Components/Grids/TiamGrid.cs | 6 +++ 29 files changed, 92 insertions(+), 175 deletions(-) diff --git a/TIAM.Entities/Transfers/TransferToDriver.cs b/TIAM.Entities/Transfers/TransferToDriver.cs index 6ee48ded..894ef5f4 100644 --- a/TIAM.Entities/Transfers/TransferToDriver.cs +++ b/TIAM.Entities/Transfers/TransferToDriver.cs @@ -21,6 +21,9 @@ public class TransferToDriver : IEntityGuid, ITimeStampInfo, IUserProductMapping public virtual Transfer Transfer { get; set; } public virtual UserProductMapping UserProductMapping { get; set; } + /// + /// History LicencePlate! + /// public string LicencePlate { get; set; } public double Price { get; set; } diff --git a/TIAMSharedUI/Pages/EditTransfers.razor b/TIAMSharedUI/Pages/EditTransfers.razor index b03e0d26..2f9a568a 100644 --- a/TIAMSharedUI/Pages/EditTransfers.razor +++ b/TIAMSharedUI/Pages/EditTransfers.razor @@ -257,9 +257,6 @@ else private MessageWizardModel _messageWizardModel = new(); private bool _popupVisible; - private bool _autoCollapseDetailRow; - - public List IgnoreList = [ "ReceiverEmailAddress", diff --git a/TIAMSharedUI/Pages/User/MyServiceProviders.razor b/TIAMSharedUI/Pages/User/MyServiceProviders.razor index d3ecd46e..e3e1f7b8 100644 --- a/TIAMSharedUI/Pages/User/MyServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/MyServiceProviders.razor @@ -67,12 +67,10 @@ SignalRClient="AdminSignalRClient" PageSize="12" - KeyFieldName="Id" ValidationEnabled="false" DetailRowDisplayMode="GridDetailRowDisplayMode.Always" CustomizeEditModel="Grid_CustomizeEditModel" - EditMode="GridEditMode.EditRow" - KeyboardNavigationEnabled="true"> + EditMode="GridEditMode.EditRow"> diff --git a/TIAMSharedUI/Pages/User/ServiceProvider.razor b/TIAMSharedUI/Pages/User/ServiceProvider.razor index 3ce5902a..a63e8369 100644 --- a/TIAMSharedUI/Pages/User/ServiceProvider.razor +++ b/TIAMSharedUI/Pages/User/ServiceProvider.razor @@ -32,14 +32,11 @@ ContextIds="@CompanyId" Logger="_logger" SignalRClient="AdminSignalRClient" - AutoCollapseDetailRow="false" - KeyboardNavigationEnabled="true" CustomizeElement="Grid_CustomizeElement" CustomizeEditModel="Grid_CustomizeEditModel" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" - ShowFilterRow="true" - KeyFieldName="Id"> + ShowFilterRow="true"> @@ -56,18 +53,18 @@ @* - + *@ - + - + - + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor index e4726e65..9962f20d 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor @@ -29,11 +29,7 @@ OnGridEditModelSaving="DataItemSaving" OnGridItemDeleting="DataItemDeleting" OnGridItemChanged="DataItemChanged" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" - TextWrapEnabled="false" - AutoExpandAllGroupRows="true" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"> @@ -58,7 +54,6 @@ @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public IAcAddressRelation
ParentData { get; set; } = null!; [Parameter] public IList
? DataSource { get; set; } [Parameter] public EventCallback
OnAddressChanged { get; set; } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor index f73a7ac8..e86b6c57 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor @@ -20,9 +20,6 @@ @code { - [Parameter] - public bool KeyboardNavigationEnabled { get; set; } - [Parameter] - public object AddressContext { get; set; } - [Parameter] - public string ContextIdType { get; set; } + [Parameter]public object AddressContext { get; set; } + [Parameter]public string ContextIdType { get; set; } IGrid Grid { get; set; } List _detailGridData = new List
(); diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor index 8327e80e..449320c1 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor @@ -23,9 +23,6 @@ GetAllMessageTag="GetAllTag" SignalRClient="AdminSignalRClient" PageSize="10" - AutoExpandAllGroupRows="true" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" CustomizeEditModel="CustomizeEditModel" EditMode="GridEditMode.EditForm" @@ -54,7 +51,7 @@ - + @@ -98,7 +95,6 @@ @code { [Parameter] public Guid ContextId { get; set; } - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public ICarRelation ParentData { get; set; } = null!; [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllCars; [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor index d8c3c7c3..75dd745e 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor @@ -22,9 +22,6 @@ GetAllMessageTag="GetAllTag" SignalRClient="AdminSignalRClient" PageSize="10" - AutoExpandAllGroupRows="true" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" CustomizeEditModel="CustomizeEditModel" EditMode="GridEditMode.EditForm" @@ -53,7 +50,7 @@ - + @@ -95,7 +92,6 @@ @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public ICarRelation ParentData { get; set; } = null!; [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllCars; [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor index 33cbad92..a3825a5d 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor @@ -13,9 +13,6 @@ @code { - [Parameter] - public bool KeyboardNavigationEnabled { get; set; } - [Parameter] - public Company CurrentCompany { get; set; } + [Parameter]public Company CurrentCompany { get; set; } List _detailGridData; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor index e83f15c0..d818974f 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor @@ -62,9 +62,6 @@ GetAllMessageTag="GetAllTag" SignalRClient="AdminSignalRClient" PageSize="10" - AutoExpandAllGroupRows="true" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" CustomizeElement="Grid_CustomizeElement" CustomizeEditModel="CustomizeEditModel" @@ -91,10 +88,10 @@ - + - + } @@ -130,7 +127,6 @@ @code { [Parameter] public Guid ContextId { get; set; } - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public IProductRelation ParentData { get; set; } = null!; [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllUserProductMappings; [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor index 77a379fb..a43ab4bd 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor @@ -60,7 +60,6 @@ IGrid Grid { get; set; } //object? MasterGridData { get; set; } - bool AutoCollapseDetailRow { get; set; } public List IgnoreList = [ diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor index b687457b..b8ec745d 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor @@ -60,8 +60,6 @@ IGrid Grid { get; set; } //object? MasterGridData { get; set; } - bool AutoCollapseDetailRow { get; set; } - protected override async Task OnInitializedAsync() { diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor index 8cc7d486..9ced0c36 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor @@ -87,14 +87,11 @@ Logger="_logger" SignalRClient="AdminSignalRClient" - AutoCollapseDetailRow="_autoCollapseDetailRow" - KeyboardNavigationEnabled="true" CustomizeElement="Grid_CustomizeElement" CustomizeEditModel="Grid_CustomizeEditModel" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" - ShowFilterRow="true" - KeyFieldName="Id"> + ShowFilterRow="true"> @@ -126,18 +123,18 @@ @* - + *@ - + - + - + @@ -177,7 +174,6 @@ private bool _setOwnerPopupVisible; private CompanyGrid _gridCompany; - private bool _autoCollapseDetailRow; private Company _companyToSetOwner = null; @@ -351,16 +347,6 @@ _gridCompany.ExpandDetailRow(0); } } - void AutoCollapseDetailRow_Changed(bool newValue) - { - _autoCollapseDetailRow = newValue; - if (!newValue) return; - - _gridCompany.BeginUpdate(); - _gridCompany.CollapseAllDetailRows(); - _gridCompany.ExpandDetailRow(0); - _gridCompany.EndUpdate(); - } private void ActiveTabIndexChanged(int index) { diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor index e2b40758..46cd6546 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor @@ -52,11 +52,7 @@ bool PopupVisible { get; set; } - - bool AutoCollapseDetailRow { get; set; } - - - + void Grid_CustomizeElement(GridCustomizeElementEventArgs e) { if (e.ElementType == GridElementType.DataRow && e.VisibleIndex % 2 == 1) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 331d7d18..9517bbcb 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -90,13 +90,10 @@ CustomizeElement="Grid_CustomizeElement" CustomizeEditModel="Grid_CustomizeEditModel" - AutoCollapseDetailRow="_autoCollapseDetailRow" - KeyboardNavigationEnabled="true" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" AllowSelectRowByClick="false" - ShowFilterRow="true" - KeyFieldName="Id"> + ShowFilterRow="true"> @@ -112,8 +109,6 @@ } - - @@ -130,6 +125,8 @@ + + @{ @@ -144,10 +141,10 @@ - + - + @@ -235,7 +232,6 @@ private LoggerClient _logger; private bool _popupVisible; - private bool _autoCollapseDetailRow; private TransferGrid _gridTransfer; private DxTagBox _filterTag; @@ -489,15 +485,4 @@ //_gridTransfer.ExpandDetailRow(0); } } - - void AutoCollapseDetailRow_Changed(bool newValue) - { - _autoCollapseDetailRow = newValue; - if (!newValue) return; - - _gridTransfer.BeginUpdate(); - _gridTransfer.CollapseAllDetailRows(); - _gridTransfer.ExpandDetailRow(0); - _gridTransfer.EndUpdate(); - } } \ No newline at end of file diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor index f5062278..1cf46d1b 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor @@ -60,7 +60,6 @@ IGrid Grid { get; set; } //object? MasterGridData { get; set; } - bool AutoCollapseDetailRow { get; set; } public List IgnoreList = [ diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor index 62716782..89e11fda 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor @@ -65,16 +65,13 @@ + ShowFilterRow="true"> @@ -100,16 +97,16 @@ - + - + - + @@ -166,7 +163,6 @@ IGrid Grid { get; set; } //object? MasterGridData { get; set; } - bool AutoCollapseDetailRow { get; set; } public List IgnoreList = [ @@ -338,15 +334,4 @@ Grid.ExpandDetailRow(0); } } - void AutoCollapseDetailRow_Changed(bool newValue) - { - AutoCollapseDetailRow = newValue; - - if (!newValue) return; - - Grid.BeginUpdate(); - Grid.CollapseAllDetailRows(); - Grid.ExpandDetailRow(0); - Grid.EndUpdate(); - } } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor index 48da4ea1..d68a8750 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor @@ -26,9 +26,7 @@ Logger="_logger" SignalRClient="AdminSignalRClient" ContextIds="@(ContextId.IsNullOrEmpty() ? throw new InvalidDataException($"ContextId.IsNullOrEmpty(); ContextId: {ContextId}") : [ContextId.Value])" - KeyFieldName="Id" - CustomizeElement="CustomizeElement" - TextWrapEnabled="false"> + CustomizeElement="CustomizeElement"> @@ -61,7 +59,6 @@ @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public Guid? ContextId { get; set; } //[Parameter] public IEmailMessageRelation ParentData { get; set; } = null!; [Parameter] public bool IsSubjectVisible { get; set; } = true; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor index 7ba77bd3..53b98ef8 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor @@ -25,9 +25,6 @@ Logger="_logger" SignalRClient="AdminSignalRClient" PageSize="5" - AutoExpandAllGroupRows="true" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" @@ -51,8 +48,6 @@ @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } - private MessageGrid _messageGrid = null!; private LoggerClient _logger = null!; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor index 410092d2..700ca7b2 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor @@ -32,9 +32,6 @@ OnGridEditModelSaving="DataItemSaving" OnGridItemDeleting="DataItemDeleting" OnGridItemChanged="DataItemChanged" - TextWrapEnabled="false" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" @@ -56,7 +53,7 @@ - + @@ -85,7 +82,6 @@ @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public Guid? ContextId { get; set; } [Parameter] public IProductsRelation? ParentData { get; set; } = null!; [Parameter] public EventCallback OnGridEditModelSaving { get; set; } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor index 4ef79978..5e90bc41 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor @@ -28,9 +28,6 @@ OnGridEditModelSaving="DataItemSaving" OnGridItemDeleting="DataItemDeleting" OnGridItemChanged="DataItemChanged" - TextWrapEnabled="false" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" @@ -49,14 +46,14 @@ - + - + @@ -85,7 +82,6 @@ @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public EventCallback OnGridEditModelSaving { get; set; } [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor index 1b54e0b5..f8293b8b 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor @@ -20,11 +20,7 @@ ContextIds="@(ParentData.ProfileId.IsNullOrEmpty() ? throw new InvalidDataException($"ParentData.ProfileId.IsNullOrEmpty(); ParentData.ProfileId: {ParentData.ProfileId}") : [ParentData.ProfileId])" Logger="_logger" SignalRClient="AdminSignalRClient" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" - TextWrapEnabled="false" - AutoExpandAllGroupRows="true" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"> @@ -39,7 +35,7 @@ - + @@ -48,7 +44,6 @@ @code { [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public IProfileForeignKey ParentData { get; set; } = null!; private ProfileDetailGrid _profileGrid = null!; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor index 416564c4..f6370d10 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor @@ -20,9 +20,6 @@ SignalRClient="AdminSignalRClient" ContextIds="ContextIds" PageSize="5" - AutoExpandAllGroupRows="true" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" @@ -39,7 +36,7 @@ - + @@ -67,7 +64,6 @@ @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public UserModelDtoDetail UserModelDtoDetail { get; set; } [Parameter] public Guid? ContextId { get; set; } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor index 23d33e45..62f31019 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor @@ -23,12 +23,10 @@ SignalRClient="AdminSignalRClient" PageSize="8" GetAllMessageTag="GetAllTag" - KeyFieldName="Id" ValidationEnabled="false" CustomizeEditModel="CustomizeEditModel" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.ColumnsContainer" - KeyboardNavigationEnabled="true" ShowFilterRow="true"> @@ -54,7 +52,7 @@ - + @@ -94,7 +92,6 @@ @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public Guid? ContextId { get; set; } [Parameter] public int GetAllTag { get; set; } [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor index cf8919b4..1a100aad 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor @@ -22,8 +22,6 @@ ContextIds="ContextIds" GetAllMessageTag="GetAllTag" PageSize="10" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn"> @@ -47,7 +45,7 @@ - + @@ -81,7 +79,6 @@ @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; [Parameter] public Guid[]? ContextIds { get; set; } = null!; [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllTransferDestinationToProducts; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor index dc093870..74a76004 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor @@ -20,8 +20,6 @@ Logger="_logger" SignalRClient="AdminSignalRClient" PageSize="10" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn"> @@ -71,7 +69,6 @@ @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; private LoggerClient _logger = null!; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor index 6e9869ea..bf0121e7 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor @@ -11,6 +11,10 @@ @using AyCode.Core.Enums @using AyCode.Core.Extensions @using AyCode.Core +@using AyCode.Core.Helpers +@using AyCode.Services.SignalRs +@using TIAM.Entities.Users +@using TIAM.Services @inject IUserDataService UserDataService @inject IEnumerable LogWriters @inject AdminSignalRClient AdminSignalRClient; @@ -23,23 +27,31 @@ OnGridEditModelSaving="DataItemSaving" OnGridItemDeleting="DataItemDeleting" OnGridItemChanged="DataItemChanged" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" CustomizeEditModel="CustomizeEditModel" EditMode="GridEditMode.EditRow" ColumnResizeMode="GridColumnResizeMode.NextColumn"> - - - - + + + @* + + + + *@ + + @{ + var userEmailFieldName = $"{nameof(TransferToDriver.UserProductMapping)}.{nameof(UserProductMapping.User)}.{nameof(User.EmailAddress)}"; + } + + @code { - [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public Guid? ContextId { get; set; } [Parameter] public ITransferToDriversRelation ParentData { get; set; } = null!; [Parameter] public EventCallback OnTransferToDriverChanged { get; set; } @@ -47,11 +59,37 @@ private TransferToDriversDetailGrid _transferToDriversGrid = null!; private LoggerClient _logger = null!; - protected override void OnInitialized() + private List _cars = []; + + protected override async Task OnInitializedAsync() { _logger = new LoggerClient(LogWriters.ToArray()); _logger.Info($"DetailGridData: {ParentData.TransferToDrivers.Count}"); + + //_cars.AddRange((await AdminSignalRClient.GetAllAsync>(SignalRTags.GetAllCars))!); + + await base.OnInitializedAsync(); + } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + // _transferToDriversGrid.BeginUpdate(); + // _cars.AddRange((await AdminSignalRClient.GetAllAsync>(SignalRTags.GetAllCars))!); + // _transferToDriversGrid.EndUpdate(); + + // AdminSignalRClient.GetAllAsync>(SignalRTags.GetAllCars, response => + // { + // if (response is { Status: SignalResponseStatus.Success, ResponseData: not null }) + // _cars.AddRange(response.ResponseData); + + // return Task.CompletedTask; + // }).Forget(); + } + + await base.OnAfterRenderAsync(firstRender); } private void DataItemChanged(GridDataItemChangedEventArgs args) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor index db0de7f7..c4ef4f26 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor @@ -22,9 +22,6 @@ GetAllMessageTag="GetAllTag" SignalRClient="AdminSignalRClient" PageSize="10" - AutoExpandAllGroupRows="true" - KeyboardNavigationEnabled="KeyboardNavigationEnabled" - KeyFieldName="Id" ValidationEnabled="false" CustomizeEditModel="CustomizeEditModel" EditMode="GridEditMode.EditForm" @@ -55,7 +52,7 @@ @{ - + } @@ -82,9 +79,6 @@ @code { - [Parameter] - public bool KeyboardNavigationEnabled { get; set; } - [Parameter] public IProductRelation ParentData { get; set; } = null!; [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllUserProductMappings; diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs index 9f918536..1069bf6a 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs @@ -230,6 +230,9 @@ namespace TIAMSharedUI.Shared.Components.Grids { if (!IsFirstInitializeParameters) { + //if (typeof(TDataItem) is IId || typeof(TDataItem) is IId) + KeyFieldName = "Id"; + base.DataItemDeleting = EventCallback.Factory.Create(this, OnItemDeleting); base.EditModelSaving = EventCallback.Factory.Create(this, OnItemSaving); @@ -243,6 +246,9 @@ namespace TIAMSharedUI.Shared.Components.Grids TextWrapEnabled = false; AllowSelectRowByClick = true; HighlightRowOnHover = true; + AutoCollapseDetailRow = true; + AutoExpandAllGroupRows = false; + //KeyboardNavigationEnabled = true; //var dataColumns = GetDataColumns();