From 956abfcc036ee4d99fbd24e6c57eebec4266bdb7 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 8 Apr 2025 17:08:45 +0200 Subject: [PATCH] SMall fixes, driver name in transfer grid --- .../DriverDisplayNameComponent.razor | 49 +++++++++ TIAMSharedUI/Pages/EditTransfers.razor | 5 +- .../User/SysAdmins/ManageTransfers.razor | 102 +++++++++++------- .../Controllers/TransferDataAPIController.cs | 6 +- 4 files changed, 120 insertions(+), 42 deletions(-) create mode 100644 TIAMSharedUI/Pages/Components/DriverDisplayNameComponent.razor diff --git a/TIAMSharedUI/Pages/Components/DriverDisplayNameComponent.razor b/TIAMSharedUI/Pages/Components/DriverDisplayNameComponent.razor new file mode 100644 index 00000000..17e9c07a --- /dev/null +++ b/TIAMSharedUI/Pages/Components/DriverDisplayNameComponent.razor @@ -0,0 +1,49 @@ +@using System.Text +@using TIAM.Entities.Transfers +@using TIAM.Services +@using TIAMWebApp.Shared.Application.Services +@inject AdminSignalRClient _adminSignalRClient; + +

@DriverName

+ +@code { + [Parameter] public Guid TransferId { get; set; } + private string DriverName = ""; + + protected override async Task OnParametersSetAsync() + { + + var keyItemTransferToDriver = await _adminSignalRClient.GetByIdAsync>(SignalRTags.GetTransferDriversByTransferId, TransferId); + if(keyItemTransferToDriver != null && keyItemTransferToDriver.Count > 0) + { + foreach (var driver in keyItemTransferToDriver) + { + if (driver.UserProductMapping != null) + { + + if(driver.UserProductMapping.User != null) + { + + if (driver.UserProductMapping.User.Profile != null) + { + if(!string.IsNullOrEmpty(driver.UserProductMapping.User.Profile.Name)) + { + DriverName = driver.UserProductMapping.User.Profile.Name; + } + else + { + DriverName = driver.LicencePlate; + } + } + } + + } + } + + } + else + { + DriverName = "No driver assigned yet"; + } + } +} diff --git a/TIAMSharedUI/Pages/EditTransfers.razor b/TIAMSharedUI/Pages/EditTransfers.razor index 0e4232b9..c1fc7554 100644 --- a/TIAMSharedUI/Pages/EditTransfers.razor +++ b/TIAMSharedUI/Pages/EditTransfers.razor @@ -155,7 +155,7 @@ else

Status on: @DateTime.Now.ToString("hh:mm tt"), @DateTime.Today.ToString("MMMM dd, yyyy")

-
@TransferStatusModel.GetStatusModel(_transfer.TransferStatusType);
+
@TransferStatusModel.GetStatusModel(_transfer.TransferStatusType).StatusName;
@@ -524,8 +524,9 @@ else private async Task UpdateTransferEventHandler(MouseEventArgs e, bool shouldRedirect = false) { var result = await UpdateTransfer(shouldRedirect); + _editMode = false; if (result != null && shouldRedirect) - navManager.NavigateTo("/mytransfers"); // Redirect to a list or another page after successful update + navManager.NavigateTo($"/mytransfers/{_transfer.Id}"); // Redirect to a list or another page after successful update } private async Task CancelTransferEventHandler(MouseEventArgs e, bool shouldRedirect = false) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 81cb097d..1db9241f 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -4,6 +4,7 @@ @using TIAM.Core.Enums @using TIAM.Entities.Emails @using TIAM.Entities.Transfers +@using TIAM.Entities.Users @using TIAM.Resources @using TIAMSharedUI.Pages.Components @using TIAMSharedUI.Shared @@ -22,6 +23,7 @@ @using DevExpress.Data.Filtering @using TIAM.Entities.Emails @using TIAMSharedUI.Shared.Components.BaseComponents +@using TIAM.Services @inherits UserBasePageComponent @layout AdminLayout @inject IWizardProcessor wizardProcessor @@ -36,21 +38,21 @@ +@bind-Visible="@_popupVisible" +ShowFooter="true" +CloseOnEscape="true" +CloseOnOutsideClick="false" +ShowCloseButton="false" +HeaderText="MessageBox" +Closing="EulaPopupClosing" +Closed="EulaPopupClosed"> + OnSubmit="SubmitForm" + IgnoreReflection=@IgnoreList + TitleResourceString="NewMessage" + SubtitleResourceString="NewMessageSubtitle" + SubmitButtonText="@_localizer.GetString("ButtonSend")">
@@ -73,26 +75,26 @@
+ RenderStyle="ButtonRenderStyle.Secondary" + IconCssClass="btn-column-chooser" + Click="ColumnChooserButton_Click" />
+ Logger="_logger" + SignalRClient="AdminSignalRClient" + FilterText="@_filterText" + OnDataSourceChanged="DataSourceChanged" + OnGridItemChanging="DataSourceItemChanging" + OnGridItemChanged="DataSourceItemChanged" + OnGridItemDeleting="DataItemDeleting" + OnGridEditModelSaving="DataItemSaving" + CustomizeElement="Grid_CustomizeElement" + CustomizeEditModel="Grid_CustomizeEditModel" + EditMode="GridEditMode.EditForm" + ColumnResizeMode="GridColumnResizeMode.NextColumn" + PageSize="13" + ShowFilterRow="true"> @@ -117,8 +119,19 @@ + + + @{ + var keyField = context.Value; + var keyItem = (Transfer)context.DataItem; + + } + + + + @{ @@ -178,8 +191,8 @@ + TimeSectionVisible="true" + TimeSectionScrollPickerFormat="tt h m"> @@ -198,6 +211,9 @@ @editFormContext.GetEditor("Price") + + @editFormContext.GetEditor("Revenue") + @@ -205,9 +221,9 @@
+ ValuesChanged="(IEnumerable values) => TagBox_ValuesChanged(values)" + ValueFieldName="StatusValue" TextFieldName="StatusName" NullText="Select status type..." + ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" aria-label="Select status type" />
@@ -217,8 +233,8 @@
+ DataStorage="@_dataStorage" + CssClass="w-100"> @@ -273,6 +289,7 @@ DxSchedulerDataStorage _dataStorage = new(); + void SendMail(Transfer item) { _logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}"); @@ -317,7 +334,7 @@ CancelCreateClick(); } - void Grid_CustomizeElement(GridCustomizeElementEventArgs e) + async void Grid_CustomizeElement(GridCustomizeElementEventArgs e) { try { @@ -327,6 +344,8 @@ e.CssClass = "header-bold"; } + + if (e.ElementType != GridElementType.DataRow) return; var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType"); @@ -349,11 +368,16 @@ e.CssClass = "bg-cancel"; break; } + + + + } catch (Exception ex) { _logger.Error($"Grid_CustomizeElement; {ex.Message}", ex); } + } void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e) @@ -435,7 +459,7 @@ protected override Task OnInitializedAsync() { _logger = new LoggerClient(_logWriters.ToArray()); - + return base.OnInitializedAsync(); } diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index ea8eb0a9..c857ee4b 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -766,7 +766,11 @@ namespace TIAMWebApp.Server.Controllers _logger.Debug($"GetTransferDrivers called; transferId: {transferId}"); var result = await _adminDal.GetTransferToDriversByTransferIdAsync(transferId); - return result; + if(result == null) + { + _logger.Warning("Null result", "GetTransferDrivers"); + } + return result; } //[Authorize]