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")">