diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs index f027787d..5821fa48 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs +++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs @@ -56,7 +56,7 @@ namespace FruitBankHybrid.Shared.Pages private async Task RefreshOrdersFromDb(DateTime dateTime) { LoadingPanelVisible = true; - var orders = (await FruitBankSignalRClient.GetPendingOrderDtos() ?? []).Where(o => o.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor)).ToList(); + var orders = (await FruitBankSignalRClient.GetPendingOrderDtos() ?? []);//.Where(o => o.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor)).ToList(); _measuringDates = orders.Select(order => new MeasuringDateSelectorModel(order.Id, order.DateOfReceiptOrCreated, order.IsMeasured)).ToList(); @@ -69,7 +69,7 @@ namespace FruitBankHybrid.Shared.Pages : SelectedDayOrders.FirstOrDefault(o => o.MeasurementOwnerId == 0 || (o.MeasurementOwnerId == (LoggedInModel.CustomerDto?.Id ?? 0) && !o.IsMeasured)); SelectedOrder ??= SelectedDayOrders.FirstOrDefault(); - LoadingPanelVisible = false; + LoadingPanelVisible = SelectedOrder != null; //Lefut a change és ott lesz false! - J. } private async Task OnMeasuringDateChanged(DateTime selectedDateTime) @@ -94,9 +94,11 @@ namespace FruitBankHybrid.Shared.Pages //else MessageBox.ShowMessageBox("Hiba", "Az adatok letöltése sikertelen!", MessageBoxRenderStyle.Danger); var orderDto = eventArgs.DataItem; - if (orderDto != null) + if (orderDto != null && !LoadingPanelVisible) { + //LoadingPanelVisible = true; var orderFromDb = await FruitBankSignalRClient.GetOrderDtoById(orderDto.Id); + if (orderFromDb != null) { orderDto.OrderStatus = orderFromDb.OrderStatus; @@ -104,6 +106,8 @@ namespace FruitBankHybrid.Shared.Pages if (LoggedInModel.IsRevisor) { + orderDto.OrderItemDtos.UpdateCollection(orderFromDb.OrderItemDtos, false); + var orderItemPalletsByOrderId = orderFromDb.OrderItemDtos.Where(o => o.OrderItemPallets.Count > 0).ToDictionary(k => k.Id, v => v.OrderItemPallets); foreach (var orderItemDto in orderDto.OrderItemDtos) { @@ -114,9 +118,14 @@ namespace FruitBankHybrid.Shared.Pages } } + LoadingPanelVisible = false; HasMeasuringAccess = orderDto?.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor) ?? false; - if (!HasMeasuringAccess) await DialogService.ShowMessageBoxAsync("Információ", "A mérés már folyamatban, válasszon másik rendelést", MessageBoxRenderStyle.Info); + if (!HasMeasuringAccess) + { + //await Task.Delay(250); + await DialogService.ShowMessageBoxAsync("Információ", "A mérés már folyamatban, válasszon másik rendelést!", MessageBoxRenderStyle.Info); + } } private Task OnOrderItemPalletValueChanged(OrderItemPallet orderItemPallet, OrderItemDto selectedOrderItemDto)