TIAMSharedUI/Pages/Components/DriverDisplayNameComponent.razor

@@ -1,49 +0,0 @@
-@using System.Text
-@using TIAM.Entities.Transfers
-@using TIAM.Services
-@using TIAMWebApp.Shared.Application.Services
-@inject AdminSignalRClient _adminSignalRClient;
-
-<p>@DriverName</p>
-
-@code {
-    [Parameter] public Guid TransferId { get; set; }
-    private string DriverName = "";
-
-    protected override async Task OnParametersSetAsync()
-    {
-
-        var keyItemTransferToDriver = await _adminSignalRClient.GetByIdAsync<List<TransferToDriver>>(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";
-        }
-    }
-}

TIAMSharedUI/Pages/EditTransfers.razor

@@ -155,7 +155,7 @@ else
 
                                                     <hr />
                                                     <p class="text-muted">Status on: <span class="text-body">@DateTime.Now.ToString("hh:mm tt"), @DateTime.Today.ToString("MMMM dd, yyyy")</span></p>
-                                                    <h5 class="text-muted">@TransferStatusModel.GetStatusModel(_transfer.TransferStatusType).StatusName;</h5>
+                                                    <h5 class="text-muted">@TransferStatusModel.GetStatusModel(_transfer.TransferStatusType);</h5>
 
                                                 </div>
                                             </div>
@@ -524,9 +524,8 @@ else
     private async Task UpdateTransferEventHandler(MouseEventArgs e, bool shouldRedirect = false)
     {
         var result = await UpdateTransfer(shouldRedirect);
-        _editMode = false;
         if (result != null && shouldRedirect)
-            navManager.NavigateTo($"/mytransfers/{_transfer.Id}"); // Redirect to a list or another page after successful update
+            navManager.NavigateTo("/mytransfers"); // Redirect to a list or another page after successful update
     }
 
     private async Task CancelTransferEventHandler(MouseEventArgs e, bool shouldRedirect = false)

TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor

@@ -4,7 +4,6 @@
 @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
@@ -23,7 +22,6 @@
 @using DevExpress.Data.Filtering
 @using TIAM.Entities.Emails
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@using TIAM.Services
 @inherits UserBasePageComponent
 @layout AdminLayout
 @inject IWizardProcessor wizardProcessor
@@ -119,19 +117,8 @@ Closed="EulaPopupClosed">
                                         <DxGridDataColumn FieldName="Price" Caption="Price" Width="70" CaptionAlignment="GridTextAlignment.Center" />
                                         <DxGridDataColumn FieldName="Revenue" Caption="Revenue" Width="70" CaptionAlignment="GridTextAlignment.Center" />
                                         <DxGridDataColumn FieldName="FullName" />
-                                        <DxGridDataColumn Caption="Driver" Width="120">
-                                            <CellDisplayTemplate>
-                                                @{
-                                                    var keyField = context.Value;
-                                                    var keyItem = (Transfer)context.DataItem;
-                                                    <DriverDisplayNameComponent TransferId="@keyItem.Id"></DriverDisplayNameComponent>
-                                                }
-                                            </CellDisplayTemplate>
-
-                                        </DxGridDataColumn>
                                         <DxGridDataColumn FieldName="ContactPhone" Width="120" />
                                         <DxGridDataColumn FieldName="ContactEmail" Width="120" />
-
                                         <DxGridDataColumn FieldName="ContactEmail" Width="120">
                                             <CellDisplayTemplate>
                                                 @{
@@ -211,9 +198,6 @@ Closed="EulaPopupClosed">
                                             <DxFormLayoutItem Caption="Price:" ColSpanMd="3">
                                                 @editFormContext.GetEditor("Price")
                                             </DxFormLayoutItem>
-                                            <DxFormLayoutItem Caption="Revenue:" ColSpanMd="3">
-                                                @editFormContext.GetEditor("Revenue")
-                                            </DxFormLayoutItem>
 
                                         </DxFormLayout>
                                     </EditFormTemplate>
@@ -289,7 +273,6 @@ Closed="EulaPopupClosed">
     DxSchedulerDataStorage _dataStorage = new();
 
 
-
     void SendMail(Transfer item)
     {
         _logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}");
@@ -334,7 +317,7 @@ Closed="EulaPopupClosed">
         CancelCreateClick();
     }
 
-    async void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
+    void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
     {
         try
         {
@@ -344,8 +327,6 @@ Closed="EulaPopupClosed">
                 e.CssClass = "header-bold";
             }
 
-            
-
             if (e.ElementType != GridElementType.DataRow) return;
 
             var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType");
@@ -368,16 +349,11 @@ Closed="EulaPopupClosed">
                     e.CssClass = "bg-cancel";
                     break;
             }
-
-            
-            
-
         }
         catch (Exception ex)
         {
             _logger.Error($"Grid_CustomizeElement; {ex.Message}", ex);
         }
-
     }
 
     void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)

TIAMWebApp/Server/Controllers/TransferDataAPIController.cs

@@ -766,10 +766,6 @@ namespace TIAMWebApp.Server.Controllers
             _logger.Debug($"GetTransferDrivers called; transferId: {transferId}");
 
             var result = await _adminDal.GetTransferToDriversByTransferIdAsync(transferId);
-            if(result == null)
-            {
-                _logger.Warning("Null result", "GetTransferDrivers");
-            }
             return result;
         }