diff --git a/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs b/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs index da1a724..f6ecb7c 100644 --- a/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs +++ b/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs @@ -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() diff --git a/FruitBankHybrid.Shared/Pages/Home.razor.cs b/FruitBankHybrid.Shared/Pages/Home.razor.cs index 36eae70..88a401f 100644 --- a/FruitBankHybrid.Shared/Pages/Home.razor.cs +++ b/FruitBankHybrid.Shared/Pages/Home.razor.cs @@ -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"); + } } \ No newline at end of file diff --git a/FruitBankHybrid.Shared/Pages/Login.razor b/FruitBankHybrid.Shared/Pages/Login.razor index 3a5dc65..fe8c60c 100644 --- a/FruitBankHybrid.Shared/Pages/Login.razor +++ b/FruitBankHybrid.Shared/Pages/Login.razor @@ -14,6 +14,7 @@ ValueFieldName="@nameof(CustomerDto.Id)" TextFieldName="@nameof(CustomerDto.FullName)" CssClass="cw-320" + DropDownBodyCssClass="dd-body-class" InputId="cbItemTemplate">
diff --git a/FruitBankHybrid.Shared/Pages/Login.razor.cs b/FruitBankHybrid.Shared/Pages/Login.razor.cs index d2c81d6..d0c0324 100644 --- a/FruitBankHybrid.Shared/Pages/Login.razor.cs +++ b/FruitBankHybrid.Shared/Pages/Login.razor.cs @@ -19,6 +19,7 @@ public partial class Login : ComponentBase [Inject] public required IEnumerable 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 Users { get; set; } @@ -77,6 +78,8 @@ public partial class Login : ComponentBase } await UpdateStyle.InvokeAsync(); + if (LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/"); + StateHasChanged(); } diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs index 2c62c8a..5073c0d 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(); @@ -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)