TIAM.Services/SignalRTags.cs

@@ -5,7 +5,6 @@ namespace TIAM.Services;
 
 public class SignalRTags : AcSignalRTags
 {
-    //[SignalMessageTag(null, typeof(SignalResponseMessage<string>), null, null)]
     public const int GetTransfers = 5;
     public const int GetPropertiesByOwnerId = 6;
     public const int UpdateTransfer = 7;
@@ -16,15 +15,4 @@ public class SignalRTags : AcSignalRTags
     public const int UpdateCompany = 11;
     public const int AddCompany = 12;
     public const int RemoveCompany = 13;
-
-    public const int GetTransferToDrivers = 14;
-    public const int AddTransferToDrivers = 15;
-    public const int UpdateTransferToDrivers = 16;
-    public const int RemoveTransferToDrivers = 17;
-
-    public const int GetAddressesByContextId = 18;
-    public const int AddAddressToContextId = 19;
-    public const int UpdateAddressByContextId = 20;
-    public const int RemoveAddressByContextId = 21;
-
 }

TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor

@@ -9,7 +9,6 @@
 @using AyCode.Services.Loggers
 @using TIAM.Core.Loggers
 @using TIAM.Entities.Addresses
-@using TIAMSharedUI.Shared.Components.Grids
 @using TIAMSharedUI.Pages.Components.EditComponents
 @inject IServiceProviderDataService serviceProviderDataService
 @inject IUserDataService userDataService
@@ -17,7 +16,7 @@
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 
 
-<AddressGrid @ref="Grid" Data="_detailGridData"
+<DxGrid @ref="Grid" Data="_detailGridData"
         PageSize="5"
         AutoExpandAllGroupRows="true"
         KeyboardNavigationEnabled="KeyboardNavigationEnabled"
@@ -48,7 +47,7 @@
         <EditAddressComponent Model="@((Address)context.EditModel)" OnAddressChanged="@((Address model) => SaveAddress(model))" />
     </EditFormTemplate>
 
-</AddressGrid>
+</DxGrid>
 
 @code {
     [Parameter]

TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor

@@ -1,7 +1,6 @@
 @using TIAM.Entities.Transfers
 @using TIAM.Entities.Drivers
 @using TIAM.Models.Dtos.Users
-@using TIAMSharedUI.Shared.Components.Grids
 @using TIAMWebApp.Shared.Application.Interfaces
 @using TIAMWebApp.Shared.Application.Utility
 @using TIAM.Core.Loggers
@@ -12,7 +11,7 @@
 
 
 
-<TransferToDriversGrid Data="DetailGridData"
+<DxGrid Data="DetailGridData"
         PageSize="5"
         AutoExpandAllGroupRows="true" 
         KeyboardNavigationEnabled="KeyboardNavigationEnabled"
@@ -30,22 +29,28 @@
         <DxGridDataColumn FieldName="CarId" Width="40%" />
         <DxGridDataColumn FieldName="LicencePlate" />
     </Columns>
-</TransferToDriversGrid>
+</DxGrid>
 
 @code {
     [Parameter]
     public bool KeyboardNavigationEnabled { get; set; }
     [Parameter]
-    public Transfer Transfer { get; set; }
+    public Transfer Customer { get; set; }
 
-    private LoggerClient<DriverGridComponent> _logger;
+    private LoggerClient<Grid_MasterDetail_NestedGrid_DetailContent> _logger;
     List<TransferToDriver> DetailGridData { get; set; }
 
+    public UserModelDtoDetail? UserModelDtoDetail;
+
     protected override async Task OnInitializedAsync()
     {
-        _logger = new LoggerClient<DriverGridComponent>(LogWriters.ToArray());
+        _logger = new LoggerClient<Grid_MasterDetail_NestedGrid_DetailContent>(LogWriters.ToArray());
 
-        DetailGridData = Transfer.TransferToDrivers;
+        UserModelDtoDetail = await UserDataService.GetUserDetailByIdAsync(Customer.UserId);
+
+        if (UserModelDtoDetail == null) return;
+
+        DetailGridData = Customer.TransferToDrivers;
 
         _logger.Info($"DetailGridData: {DetailGridData.Count}");
     }
@@ -60,16 +65,16 @@
         newDriver.LicencePlate = "";
         newDriver.Car = new Car();
         newDriver.Price = 0;
-        newDriver.TransferId = Transfer.Id;
+        newDriver.TransferId = Customer.Id;
     }
 
     async Task EditModelSaving(GridEditModelSavingEventArgs e)
     {
         if (e.IsNew)
             //add new orderData to orderData array
-            _logger.Info("New driver added");
+            _logger.Info("New orderData added");
         else
-            _logger.Info("Driver updated");
+            _logger.Info("orderData updated");
         
         await UpdateDataAsync();
     }
@@ -77,7 +82,7 @@
     async Task DataItemDeleting(GridDataItemDeletingEventArgs e)
     {
         //remove orderData from orderData array
-        _logger.Info("driver deleted");
+        _logger.Info("orderData deleted");
         //await UpdateDataAsync();
     }
 

TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor

@@ -147,7 +147,7 @@
 
                                         <DxTabs>
                                             <DxTabPage Text="Driver">
-                                                <DriverGridComponent Transfer="(TIAM.Entities.Transfers.Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
+                                                <Grid_MasterDetail_NestedGrid_DetailContent Customer="(TIAM.Entities.Transfers.Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
                                             </DxTabPage>                                            
                                         </DxTabs>
                                         

TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor

@@ -21,7 +21,6 @@
 @using AyCode.Services.Loggers
 @using TIAM.Core.Loggers
 @using TIAM.Entities.Addresses
-@using TIAMSharedUI.Shared.Components.Grids
 @layout AdminLayout
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject IStringLocalizer<TIAMResources> Localizer

TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs

@@ -1,33 +0,0 @@
-using Microsoft.AspNetCore.Components;
-using TIAM.Entities.Addresses;
-using TIAM.Entities.Transfers;
-using TIAM.Services;
-
-namespace TIAMSharedUI.Shared.Components.Grids;
-
-public class AddressGrid : TiamGrid<Address>
-{
-    public AddressGrid() : base()
-    {
-        GridName = nameof(Address);
-
-        GetAllMessageTag = SignalRTags.GetAddressesByContextId;
-        AddMessageTag = SignalRTags.AddAddressToContextId;
-        UpdateMessageTag = SignalRTags.UpdateAddressByContextId;
-        RemoveMessageTag = SignalRTags.RemoveAddressByContextId;
-    }
-
-    protected override Task SetParametersAsyncCore(ParameterView parameters)
-    {
-        if (!IsFirstInitializeParameters)
-        {
-            //ShowFilterRow = true;
-            //ShowGroupPanel = true;
-            //AllowSort = false;
-
-            //etc...
-        }
-
-        return base.SetParametersAsyncCore(parameters);
-    }
-}

TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs

@@ -1,32 +0,0 @@
-using Microsoft.AspNetCore.Components;
-using TIAM.Entities.Transfers;
-using TIAM.Services;
-
-namespace TIAMSharedUI.Shared.Components.Grids;
-
-public class TransferToDriversGrid : TiamGrid<TransferToDriver>
-{
-    public TransferToDriversGrid() : base()
-    {
-        GridName = nameof(TransferToDriver);
-
-        GetAllMessageTag = SignalRTags.GetTransferToDrivers;
-        AddMessageTag = SignalRTags.AddTransferToDrivers;
-        UpdateMessageTag = SignalRTags.UpdateTransferToDrivers;
-        RemoveMessageTag = SignalRTags.RemoveTransferToDrivers;
-    }
-
-    protected override Task SetParametersAsyncCore(ParameterView parameters)
-    {
-        if (!IsFirstInitializeParameters)
-        {
-            //ShowFilterRow = true;
-            //ShowGroupPanel = true;
-            //AllowSort = false;
-
-            //etc...
-        }
-
-        return base.SetParametersAsyncCore(parameters);
-    }
-}

TIAMSharedUI/Shared/Users/AdminNavMenu.razor

@@ -9,8 +9,6 @@
                 DisplayMode="DisplayMode">
             <Items>
                 <DxMenuItem NavigateUrl="/" Text="Home" IconCssClass="menu-icon-home menu-icon" />
-                <DxMenuItem NavigateUrl="user/properties" Text="My companies" IconCssClass="menu-icon-home menu-icon" />
-                <DxMenuItem NavigateUrl="user/media" Text="Media" IconCssClass="menu-icon-home menu-icon" />
                                    
                 <DxMenuItem Text="SysAdmin" IconCssClass="menu-icon-products menu-icon">
                     <Items>