TIAM.Models/PageViewModels/DriverManageTransfersPageModel.cs

@@ -8,14 +8,13 @@ namespace TIAM.Models.PageViewModels;
 public class DriverManageTransfersPageModel : AcPageViewModelBase
 {
     private readonly object _forLock = new();
-    private const int AppointmentWaitingHours = 3;
 
     public int UnreadedMessagesCount { get; set; }
     public List<Transfer> Transfers { get; set; } = [];
 
     private readonly List<Transfer> _upcomings = [];
     private readonly List<Transfer> _problems = [];
-
+    
 
     /// <summary>
     /// Value set on the client side!
@@ -30,9 +29,7 @@ public class DriverManageTransfersPageModel : AcPageViewModelBase
                 if (_upcomings.Count > 0) return _upcomings;
 
                 var localNow = DateTime.Now;
-                var localNowSubstractWaitingHour = localNow.AddHours(-1 * AppointmentWaitingHours);
-
-                _upcomings.AddRange(Transfers.Where(x => x.Appointment >= localNowSubstractWaitingHour));
+                _upcomings.AddRange(Transfers.Where(x => x.Appointment >= localNow));
             }
 
             return _upcomings;
@@ -52,9 +49,9 @@ public class DriverManageTransfersPageModel : AcPageViewModelBase
                 if (_problems.Count > 0) return _problems;
 
                 var localNow = DateTime.Now;
-                var localNowAddedWaitingHour = localNow.AddHours(AppointmentWaitingHours);
+                var localNowAddedThreeHour = localNow.AddHours(3);
 
-                _problems.AddRange(Transfers.Where(x => x.Appointment < localNowAddedWaitingHour && x.TransferStatusType != TransferStatusType.Finished));
+                _problems.AddRange(Transfers.Where(x => x.Appointment < localNowAddedThreeHour && x.TransferStatusType != TransferStatusType.Finished));
             }
 
             return _problems;

TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor

@@ -388,26 +388,28 @@
     {
         _logger = new LoggerClient<DriverManageTransfers>(LogWriters.ToArray());
 
-        InitializePageAsync(DriverId).Forget();
+        InitializePage(DriverId);
         
         await base.OnInitializedAsync();
     }
 
-    private Task InitializePageAsync(Guid driverId2)
+    private void InitializePage(Guid driverId2)
     {
-        return AdminSignalRClient.GetByIdAsync<DriverManageTransfersPageModel>(SignalRTags.GetDriverManageTransfersPageModelByDriverId, response =>
+        AdminSignalRClient.GetByIdAsync<DriverManageTransfersPageModel>(SignalRTags.GetDriverManageTransfersPageModelByDriverId, response=>
         {
             if (response.Status == SignalResponseStatus.Error || response.ResponseData == null)
             {
                 _logger.Error("response.Status == SignalResponseStatus.Error || response.ResponseData == null");
+                return Task.CompletedTask;
             }
-            else PageModel.Initialize(response.ResponseData);
 
+            PageModel.Initialize(response.ResponseData);
+            
             InitializeAppointments(PageModel.Transfers);
             StateHasChanged();
 
             return Task.CompletedTask;
-        }, driverId2);
+        }, driverId2).Forget();
     }
 
     private void GroupTransfers(List<Transfer> transferDataList)