Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: Adam:b421cae6212caea01ed75350d9ce2c70f41d949c
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
..
compare: Adam:491b7a9669b24c80e20a297d30173d4ff8516daa
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

No commits in common. "b421cae6212caea01ed75350d9ce2c70f41d949c" and "491b7a9669b24c80e20a297d30173d4ff8516daa" have entirely different histories.
b421cae621 ... 491b7a9669

2 changed files with 11 additions and 12 deletions
Show Stats Expand all files Collapse all files

11
TIAM.Models/PageViewModels/DriverManageTransfersPageModel.cs
View File

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

12
TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
View File

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