diff --git a/TIAMSharedUI/Pages/Components/DriverDisplayNameComponent.razor b/TIAMSharedUI/Pages/Components/DriverDisplayNameComponent.razor index 17e9c07a..8e36a893 100644 --- a/TIAMSharedUI/Pages/Components/DriverDisplayNameComponent.razor +++ b/TIAMSharedUI/Pages/Components/DriverDisplayNameComponent.razor @@ -1,4 +1,5 @@ @using System.Text +@using AyCode.Core.Helpers @using TIAM.Entities.Transfers @using TIAM.Services @using TIAMWebApp.Shared.Application.Services @@ -10,40 +11,45 @@ [Parameter] public Guid TransferId { get; set; } private string DriverName = ""; - protected override async Task OnParametersSetAsync() + protected override void OnParametersSet() { - - var keyItemTransferToDriver = await _adminSignalRClient.GetByIdAsync>(SignalRTags.GetTransferDriversByTransferId, TransferId); - if(keyItemTransferToDriver != null && keyItemTransferToDriver.Count > 0) + _adminSignalRClient.GetByIdAsync>(SignalRTags.GetTransferDriversByTransferId, x => { - foreach (var driver in keyItemTransferToDriver) + //await Task.Delay(1); + var keyItemTransferToDriver = x.ResponseData; + + if (keyItemTransferToDriver != null && keyItemTransferToDriver.Count > 0) { - if (driver.UserProductMapping != null) + foreach (var driver in keyItemTransferToDriver) { - - if(driver.UserProductMapping.User != null) + if (driver != null && driver.UserProductMapping != null) { - - if (driver.UserProductMapping.User.Profile != null) + if (driver.UserProductMapping.User != null) { - if(!string.IsNullOrEmpty(driver.UserProductMapping.User.Profile.Name)) + + if (driver.UserProductMapping.User.Profile != null) { - DriverName = driver.UserProductMapping.User.Profile.Name; - } - else - { - DriverName = driver.LicencePlate; + if (!string.IsNullOrEmpty(driver.UserProductMapping.User.Profile.Name)) + { + DriverName = driver.UserProductMapping.User.Profile.Name; + } + else + { + DriverName = driver.LicencePlate; + } } } - } + } } + } - - } - else - { - DriverName = "No driver assigned yet"; - } + else + { + DriverName = "No driver assigned yet"; + } + + return Task.CompletedTask; + }, TransferId).Forget(); } } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 1db9241f..550a8d91 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -288,6 +288,8 @@ Closed="EulaPopupClosed"> DateTime StartDate { get; set; } = DateTime.Today; DxSchedulerDataStorage _dataStorage = new(); + private Dictionary driverNamesByTransferId = []; + void SendMail(Transfer item) @@ -459,7 +461,7 @@ Closed="EulaPopupClosed"> protected override Task OnInitializedAsync() { _logger = new LoggerClient(_logWriters.ToArray()); - + // var result = AdminSignalRClient.GetTransferDrivers return base.OnInitializedAsync(); }