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

fix

This commit is contained in:
Loretta 2025-10-20 19:01:24 +02:00
parent 6400278830
commit 2183e8ea66
5 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FruitBankHybrid.Shared/Layout/MainLayout.razor.cs
View File

@ -5,16 +5,23 @@ namespace FruitBankHybrid.Shared.Layout;
public partial class MainLayout : LayoutComponentBase
{
[Inject] public required NavigationManager NavManager{ get; set; }
[Inject] public required LoggedInModel LoggedInModel { get; set; }
private EventCallback RefreshMainLayoutEventCallback => EventCallback.Factory.Create(this, RefreshMainLayout);
private NavMenu _navMenu = null!;
protected override void OnInitialized()
{
if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login");
}
private void OnLogoutClick()
{
LoggedInModel.LogOut();
RefreshMainLayout();
NavManager.NavigateTo("/Login");
}
public void RefreshMainLayout()

5
FruitBankHybrid.Shared/Pages/Home.razor.cs
View File

@ -5,9 +5,14 @@ namespace FruitBankHybrid.Shared.Pages;
public partial class Home : ComponentBase
{
[Inject] public required NavigationManager NavManager{ get; set; }
[Inject] public required LoggedInModel LoggedInModel { get; set; }
private string Factor => FormFactor.GetFormFactor();
private string Platform => FormFactor.GetPlatform();
protected override void OnInitialized()
{
//if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login");
}
}

1
FruitBankHybrid.Shared/Pages/Login.razor
View File

@ -14,6 +14,7 @@
ValueFieldName="@nameof(CustomerDto.Id)"
TextFieldName="@nameof(CustomerDto.FullName)"
CssClass="cw-320"
DropDownBodyCssClass="dd-body-class"
InputId="cbItemTemplate">
<ItemDisplayTemplate Context="ctxCombo">
<div class="combobox-item-template">

3
FruitBankHybrid.Shared/Pages/Login.razor.cs
View File

@ -19,6 +19,7 @@ public partial class Login : ComponentBase
[Inject] public required IEnumerable<IAcLogWriterClientBase> LogWriters { get; set; }
[Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; }
[Inject] public required LoggedInModel LoggedInModel { get; set; }
[Inject] public required NavigationManager NavManager{ get; set; }
private ILogger _logger = null!;
//private List<CustomerDto> Users { get; set; }
@ -77,6 +78,8 @@ public partial class Login : ComponentBase
}
await UpdateStyle.InvokeAsync();
if (LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/");
StateHasChanged();
}

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

@ -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();
@ -98,34 +98,33 @@ namespace FruitBankHybrid.Shared.Pages
{
//LoadingPanelVisible = true;
var orderFromDb = await FruitBankSignalRClient.GetOrderDtoById(orderDto.Id);
if (orderFromDb != null)
{
orderDto.OrderStatus = orderFromDb.OrderStatus;
orderDto.GenericAttributes.UpdateBaseEntityCollection(orderFromDb.GenericAttributes, false);
if (LoggedInModel.IsRevisor)
{
orderDto.OrderItemDtos.UpdateCollection(orderFromDb.OrderItemDtos, false);
//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)
{
if (orderItemPalletsByOrderId.TryGetValue(orderDto.Id, out var orderItemPallets))
orderItemDto.OrderItemPallets.UpdateCollection(orderItemPallets, false);
}
}
// var orderItemPalletsByOrderId = orderFromDb.OrderItemDtos.Where(o => o.OrderItemPallets.Count > 0).ToDictionary(k => k.Id, v => v.OrderItemPallets);
// foreach (var orderItemDto in orderDto.OrderItemDtos)
// {
// if (orderItemPalletsByOrderId.TryGetValue(orderDto.Id, out var orderItemPallets))
// orderItemDto.OrderItemPallets.UpdateCollection(orderItemPallets, false);
// }
//}
}
}
LoadingPanelVisible = false;
HasMeasuringAccess = orderDto?.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor) ?? false;
StateHasChanged();
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)