From a46a82b46654422655d3d90cbd014fd07a95a3a4 Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Sat, 1 Jun 2024 22:22:11 +0200 Subject: [PATCH] TransferToDriverGridComponent improvements, fixes.. --- .../User/SysAdmins/DriverGridComponent.razor | 89 ------------------- .../User/SysAdmins/ManageTransfers.razor | 2 +- .../TransferToDriverGridComponent.razor | 84 +++++++++++++++++ .../Grids/TransferToDriversDetailGrid.cs | 17 ++++ .../Components/Grids/TransferToDriversGrid.cs | 2 +- 5 files changed, 103 insertions(+), 91 deletions(-) delete mode 100644 TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor create mode 100644 TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor create mode 100644 TIAMSharedUI/Shared/Components/Grids/TransferToDriversDetailGrid.cs diff --git a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor deleted file mode 100644 index e687580f..00000000 --- a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor +++ /dev/null @@ -1,89 +0,0 @@ -@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 -@using AyCode.Core.Loggers -@using AyCode.Services.Loggers -@inject IUserDataService UserDataService -@inject IEnumerable LogWriters - - - - - - - - - - - - -@code { - [Parameter] - public bool KeyboardNavigationEnabled { get; set; } - [Parameter] - public Transfer Transfer { get; set; } - - private LoggerClient _logger; - List DetailGridData { get; set; } - - protected override async Task OnInitializedAsync() - { - _logger = new LoggerClient(LogWriters.ToArray()); - - DetailGridData = Transfer.TransferToDrivers; - - _logger.Info($"DetailGridData: {DetailGridData.Count}"); - } - - void CustomizeEditModel(GridCustomizeEditModelEventArgs e) - { - if (!e.IsNew) return; - - var newDriver = (TransferToDriver)e.EditModel; - newDriver.Id = Guid.NewGuid(); - newDriver.CarId = Guid.Empty; - newDriver.LicencePlate = ""; - newDriver.Car = new Car(); - newDriver.Price = 0; - newDriver.TransferId = Transfer.Id; - } - - async Task EditModelSaving(GridEditModelSavingEventArgs e) - { - if (e.IsNew) - //add new orderData to orderData array - _logger.Info("New driver added"); - else - _logger.Info("Driver updated"); - - await UpdateDataAsync(); - } - - async Task DataItemDeleting(GridDataItemDeletingEventArgs e) - { - //remove orderData from orderData array - _logger.Info("driver deleted"); - //await UpdateDataAsync(); - } - - async Task UpdateDataAsync() - { - //refresh grid - _logger.Info("orderData grid refreshed"); - } -} \ No newline at end of file diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index a9c52128..f9e72014 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -147,7 +147,7 @@ - + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor new file mode 100644 index 00000000..28450cad --- /dev/null +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor @@ -0,0 +1,84 @@ +@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 +@using AyCode.Core.Loggers +@using AyCode.Services.Loggers +@using TIAMWebApp.Shared.Application.Services +@inject IUserDataService UserDataService +@inject IEnumerable LogWriters +@inject AdminSignalRClient AdminSignalRClient; + + + + + + + + + + + + +@code { + [Parameter] public bool KeyboardNavigationEnabled { get; set; } + + [Parameter] public Transfer Transfer { get; set; } = null!; + [Parameter] public EventCallback OnTransferToDriverChanged { get; set; } + + private TransferToDriversDetailGrid _transferToDriversGrid = null!; + private LoggerClient _logger = null!; + + protected override void OnInitialized() + { + _logger = new LoggerClient(LogWriters.ToArray()); + + _logger.Info($"DetailGridData: {Transfer.TransferToDrivers.Count}"); + } + + private void DataItemChanged(TransferToDriver transferToDriver) + { + OnTransferToDriverChanged.InvokeAsync(transferToDriver); + } + + private void DataItemSaving(GridEditModelSavingEventArgs obj) + { + _logger.Debug($"DataItemSaving"); + } + + private void DataItemDeleting(GridDataItemDeletingEventArgs obj) + { + _logger.Debug($"DataItemDeleting"); + } + + void CustomizeEditModel(GridCustomizeEditModelEventArgs e) + { + if (!e.IsNew) return; + + var newDriver = (TransferToDriver)e.EditModel; + newDriver.Id = Guid.NewGuid(); + newDriver.CarId = Guid.Empty; + newDriver.LicencePlate = ""; + newDriver.Car = new Car(); + newDriver.Price = 0; + newDriver.TransferId = Transfer.Id; + } +} \ No newline at end of file diff --git a/TIAMSharedUI/Shared/Components/Grids/TransferToDriversDetailGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversDetailGrid.cs new file mode 100644 index 00000000..347e59ec --- /dev/null +++ b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversDetailGrid.cs @@ -0,0 +1,17 @@ +using Microsoft.AspNetCore.Components; + +namespace TIAMSharedUI.Shared.Components.Grids; + +public class TransferToDriversDetailGrid : TransferToDriversGrid +{ + protected override Task SetParametersAsyncCore(ParameterView parameters) + { + var isFirst = IsFirstInitializeParameters; + + return base.SetParametersAsyncCore(parameters); + + if (isFirst) + { + } + } +} \ No newline at end of file diff --git a/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs index 0c85790c..32150964 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs @@ -8,7 +8,7 @@ public class TransferToDriversGrid : TiamGrid { public TransferToDriversGrid() : base() { - GetAllMessageTag = SignalRTags.GetTransferToDrivers; + //GetAllMessageTag = SignalRTags.GetTransferToDrivers; AddMessageTag = SignalRTags.AddTransferToDrivers; UpdateMessageTag = SignalRTags.UpdateTransferToDrivers; RemoveMessageTag = SignalRTags.RemoveTransferToDrivers;