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

fixes

This commit is contained in:
Loretta 2025-10-20 17:08:13 +02:00
parent 35e71cb75c
commit 153a639ba2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs
View File

@ -56,7 +56,7 @@ namespace FruitBankHybrid.Shared.Pages
private async Task RefreshOrdersFromDb(DateTime dateTime) private async Task RefreshOrdersFromDb(DateTime dateTime)
{ {
LoadingPanelVisible = true; 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(); _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)); : SelectedDayOrders.FirstOrDefault(o => o.MeasurementOwnerId == 0 || (o.MeasurementOwnerId == (LoggedInModel.CustomerDto?.Id ?? 0) && !o.IsMeasured));
SelectedOrder ??= SelectedDayOrders.FirstOrDefault(); SelectedOrder ??= SelectedDayOrders.FirstOrDefault();
LoadingPanelVisible = false; LoadingPanelVisible = SelectedOrder != null; //Lefut a change és ott lesz false! - J.
} }
private async Task OnMeasuringDateChanged(DateTime selectedDateTime) 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); //else MessageBox.ShowMessageBox("Hiba", "Az adatok letöltése sikertelen!", MessageBoxRenderStyle.Danger);
var orderDto = eventArgs.DataItem; var orderDto = eventArgs.DataItem;
if (orderDto != null) if (orderDto != null && !LoadingPanelVisible)
{ {
//LoadingPanelVisible = true;
var orderFromDb = await FruitBankSignalRClient.GetOrderDtoById(orderDto.Id); var orderFromDb = await FruitBankSignalRClient.GetOrderDtoById(orderDto.Id);
if (orderFromDb != null) if (orderFromDb != null)
{ {
orderDto.OrderStatus = orderFromDb.OrderStatus; orderDto.OrderStatus = orderFromDb.OrderStatus;
@ -104,6 +106,8 @@ namespace FruitBankHybrid.Shared.Pages
if (LoggedInModel.IsRevisor) 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); var orderItemPalletsByOrderId = orderFromDb.OrderItemDtos.Where(o => o.OrderItemPallets.Count > 0).ToDictionary(k => k.Id, v => v.OrderItemPallets);
foreach (var orderItemDto in orderDto.OrderItemDtos) 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; 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) private Task OnOrderItemPalletValueChanged(OrderItemPallet orderItemPallet, OrderItemDto selectedOrderItemDto)