Merge branch 'main' of https://git.aycode.com/Adam/FruitBankHybridApp
This commit is contained in:
commit
b67759ced4
|
|
@ -59,11 +59,11 @@ namespace FruitBankHybrid.Shared.Pages
|
||||||
private async Task RefreshOrdersFromDb(DateTime dateTime)
|
private async Task RefreshOrdersFromDb(DateTime dateTime)
|
||||||
{
|
{
|
||||||
LoadingPanelVisible = true;
|
LoadingPanelVisible = true;
|
||||||
var orders = (await FruitBankSignalRClient.GetPendingOrderDtosForMeasuring() ?? []).Where(o => o.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor)).ToList();
|
var orders = (await FruitBankSignalRClient.GetPendingOrderDtosForMeasuring() ?? []).Where(o => o.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor)).OrderBy(o => o.DateOfReceipt).ToList();
|
||||||
|
|
||||||
_measuringDates = orders.Select(order => new MeasuringDateSelectorModel(order.Id, order.DateOfReceiptOrCreated, order.IsMeasured)).ToList();
|
_measuringDates = orders.Select(order => new MeasuringDateSelectorModel(order.Id, order.DateOfReceiptOrCreated, order.IsMeasured)).ToList();
|
||||||
|
|
||||||
SelectedDayOrders = orders.Where(order => MeasuringService.DaysEqual(order.DateOfReceiptOrCreated, dateTime)).ToList();
|
SelectedDayOrders = orders.Where(order => MeasuringService.DaysEqual(order.DateOfReceiptOrCreated, dateTime)).OrderBy(x => x.DateOfReceipt).ToList();
|
||||||
|
|
||||||
foreach (var orderDto in SelectedDayOrders) PrepareOrderDto(orderDto);
|
foreach (var orderDto in SelectedDayOrders) PrepareOrderDto(orderDto);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue