diff --git a/FruitBank.Common.Server/FruitBank.Common.Server.csproj b/FruitBank.Common.Server/FruitBank.Common.Server.csproj index ac31d20..32ad8ef 100644 --- a/FruitBank.Common.Server/FruitBank.Common.Server.csproj +++ b/FruitBank.Common.Server/FruitBank.Common.Server.csproj @@ -35,7 +35,8 @@ ..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Services.Server.dll - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\9.0.9\ref\net9.0\Microsoft.AspNetCore.SignalR.Core.dll + + C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\9.0.10\ref\net9.0\Microsoft.AspNetCore.SignalR.Core.dll ..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\bin\FruitBank\Debug\net9.0\Mango.Nop.Core.dll diff --git a/FruitBankHybrid.Shared/Extensions/DevextremeComponentExtension.cs b/FruitBankHybrid.Shared/Extensions/DevextremeComponentExtension.cs index 131842d..a2f971d 100644 --- a/FruitBankHybrid.Shared/Extensions/DevextremeComponentExtension.cs +++ b/FruitBankHybrid.Shared/Extensions/DevextremeComponentExtension.cs @@ -5,16 +5,29 @@ namespace FruitBankHybrid.Shared.Extensions; public static class DevextremeComponentExtension { - public static async Task ShowMessageBoxAsync(this IDialogService messageBox, string title, string text, MessageBoxRenderStyle messageBoxRenderStyle, MessageBoxType messageBoxType = MessageBoxType.Alert) + public static async Task ShowMessageBoxAsync(this IDialogService messageBox, string title, string text, MessageBoxRenderStyle messageBoxRenderStyle) + { + var messageBoxOptions = CreateMessageBoxOptions(title, text, messageBoxRenderStyle); + + await messageBox.AlertAsync(messageBoxOptions); + } + + public static async Task ShowConfirmBoxAsync(this IDialogService messageBox, string title, string text, MessageBoxRenderStyle messageBoxRenderStyle) + { + var messageBoxOptions = CreateMessageBoxOptions(title, text, messageBoxRenderStyle); + + return await messageBox.ConfirmAsync(messageBoxOptions); + } + + private static MessageBoxOptions CreateMessageBoxOptions(string title, string text, MessageBoxRenderStyle messageBoxRenderStyle) { var messageBoxOptions = new MessageBoxOptions { Title = title, Text = text, RenderStyle = messageBoxRenderStyle, + ShowIcon = false }; - - if (messageBoxType == MessageBoxType.Alert) await messageBox.AlertAsync(messageBoxOptions); - else await messageBox.ConfirmAsync(messageBoxOptions); + return messageBoxOptions; } } \ No newline at end of file diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor index 0fc442b..79e8e03 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor +++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor @@ -11,51 +11,59 @@

Bejövő mérés

- - - - - @{ - var cssClass = GetMeasuringDateCssClassNames(ctxShippingDate); - if (!cssClass.IsNullOrWhiteSpace()) - { - @ctxShippingDate.Day.ToString() - } - else - { - @ctxShippingDate.Day.ToString() - } - } + - - - + + + + + @{ + var cssClass = GetMeasuringDateCssClassNames(ctxShippingDate); + if (!cssClass.IsNullOrWhiteSpace()) + { + @ctxShippingDate.Day.ToString() + } + else + { + @ctxShippingDate.Day.ToString() + } + } - - - - @ctxShipping.DisplayText - - - - -@* + + + + + + + + @ctxShipping.DisplayText + + + + + @* *@ - - - - @*
+ + + + @*
@@ -100,76 +108,77 @@
*@ @ctxShippingitem.DisplayText) - - - - - - @{ - var sd = SelectedShippingItem?.ShippingDocument; - if (sd != null) - { - var partnerName = sd.Partner?.Name; - - - @($"{partnerName}, {sd.ShippingItems?.Count(si => si.IsMeasured) ?? 0}/{sd.ShippingItems?.Count ?? 0} kész.") - - } - } - - - -
- -
- @if (SelectedShippingItem is { ProductId: > 0 }) - { -

- @SelectedShippingItem.Name -

- - - - @for (var index = 0; index < (SelectedShippingItem?.ShippingItemPallets?.Count ?? 0); index++) - { - var localI = index + 1; - var currentShippingItemPallet = SelectedShippingItem!.ShippingItemPallets![index]; - - - - } + + - - - TOTAL: - - - - @(SelectedShippingItem.MeasuredQuantity) db - @(SelectedShippingItem.MeasuredGrossWeight) kg - @(SelectedShippingItem.MeasuredNetWeight) kg - - - + + @{ + var sd = SelectedShippingItem?.ShippingDocument; + if (sd != null) + { + var partnerName = sd.Partner?.Name; - @* + + @($"{partnerName}, {sd.ShippingItems?.Count(si => si.IsMeasured) ?? 0}/{sd.ShippingItems?.Count ?? 0} kész.") + + } + } + + + + +
+ @if (SelectedShippingItem is { ProductId: > 0 }) + { +

+ @SelectedShippingItem.Name +

+ + + + @for (var index = 0; index < (SelectedShippingItem?.ShippingItemPallets?.Count ?? 0); index++) + { + var localI = index + 1; + var currentShippingItemPallet = SelectedShippingItem!.ShippingItemPallets![index]; + + + + } + + + + + TOTAL: + + + + @(SelectedShippingItem.MeasuredQuantity) db + @(SelectedShippingItem.MeasuredGrossWeight) kg + @(SelectedShippingItem.MeasuredNetWeight) kg + + + + + @* *@ - @if (!_errorText.IsNullOrWhiteSpace()) - { - - HIBA! @_errorText - - //_errorText = string.Empty; + @if (!_errorText.IsNullOrWhiteSpace()) + { + + HIBA! @_errorText + + //_errorText = string.Empty; + } + } - - } +
+
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs index 093b7b8..1d5d7a3 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs +++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs @@ -29,6 +29,7 @@ namespace FruitBankHybrid.Shared.Pages //private ShippingDocument? SelectedShippingDocument { get; set; } private ShippingItem? SelectedShippingItem { get; set; } + public bool LoadingPanelVisible { get; set; } = true; protected bool BtnSaveEnabled { get; set; } private List? _shippingItemsDataSource; @@ -36,6 +37,8 @@ namespace FruitBankHybrid.Shared.Pages protected override async Task OnInitializedAsync() { + LoadingPanelVisible = true; + _logger = new LoggerClient(LogWriters.ToArray()); _logger.Info("OnInitializedAsync"); @@ -51,6 +54,8 @@ namespace FruitBankHybrid.Shared.Pages NotMeasuredShippings = shippings.Where(shipping => MeasuringService.DaysEqual(shipping.ShippingDate.Date, dateTime)).ToList(); SelectedShipping = NotMeasuredShippings.FirstOrDefault(); + + LoadingPanelVisible = false; } private static List? GetShippingItemsDataSource(Shipping? shipping) diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor index b819710..ed7ae38 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor +++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor @@ -12,13 +12,14 @@
+ + Text="Adatok szinkronizálása folyamatban..."> - @if (HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0) + @switch (SelectedOrder) { - - - - } - else - { - - - + case null: + + break; + + case { MeasurementOwnerId: 0, IsComplete: false } when HasMeasuringAccess: + + + + break; + + default: + + + + break; } @@ -96,7 +103,7 @@ } - @if (SelectedOrder == null) + @if (SelectedOrder == null || LoadingPanelVisible) { } else if (!HasMeasuringAccess) @@ -110,9 +117,9 @@ //Átvétel dátuma október 23. [AUDITED] 15:51 - Vegetable Kft. Rendelés azonosító: #8
-

+

Rendelés azonosító: #@(SelectedOrder?.CustomOrderNumber) -

+ 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(); @@ -140,7 +140,7 @@ namespace FruitBankHybrid.Shared.Pages selectedOrderItemDto.OrderItemPallets.UpdateCollection(orderItemPallet, false); //MeasuringValuesHelper.SetShippingItemTotalMeasuringValues(SelectedShippingItem); } - else await DialogService.ShowMessageBoxAsync("Hiba", "Adatok mentése sikertelen volt!", MessageBoxRenderStyle.Danger); + else await DialogService.ShowMessageBoxAsync("Hiba", "Adatok mentése sikertelen volt, ellenőrizze a mérés adatait!", MessageBoxRenderStyle.Danger); StateHasChanged(); } @@ -195,19 +195,22 @@ namespace FruitBankHybrid.Shared.Pages { if (SelectedOrder != null && LoggedInModel.IsRevisor && SelectedOrder.IsMeasured && SelectedOrder.OrderStatus != OrderStatus.Complete) { - var responseOrderDto = await FruitBankSignalRClient.SetOrderStatusToComplete(SelectedOrder.Id, LoggedInModel.CustomerDto!.Id); - if (responseOrderDto != null) + if (await DialogService.ShowConfirmBoxAsync("Megerősítés", "Biztoan jóváhagyja a rendelést? Jóváhagyás után a mérések nem módosíthatóak!", MessageBoxRenderStyle.Danger)) { - PrepareOrderDto(responseOrderDto); + var responseOrderDto = await FruitBankSignalRClient.SetOrderStatusToComplete(SelectedOrder.Id, LoggedInModel.CustomerDto!.Id); + if (responseOrderDto != null) + { + PrepareOrderDto(responseOrderDto); - SelectedDayOrders.UpdateCollection(responseOrderDto, false); - SelectedOrder = responseOrderDto; + SelectedDayOrders.UpdateCollection(responseOrderDto, false); + SelectedOrder = responseOrderDto; - //await DialogService.ShowMessageBoxAsync("Információ", "Adatok mentése sikeres volt!", MessageBoxRenderStyle.Info); + //await DialogService.ShowMessageBoxAsync("Információ", "Adatok mentése sikeres volt!", MessageBoxRenderStyle.Info); + } + else await DialogService.ShowMessageBoxAsync("Hiba", "Rendelés jóváhagyása sikertelen volt, ellenőrizze a mérés adatait!", MessageBoxRenderStyle.Danger); + + StateHasChanged(); } - else await DialogService.ShowMessageBoxAsync("Hiba", "Rendelés jóváhagyása sikertelen volt!", MessageBoxRenderStyle.Danger); - - StateHasChanged(); } } diff --git a/FruitBankHybrid.Shared/wwwroot/app.css b/FruitBankHybrid.Shared/wwwroot/app.css index c6a2a9c..d8a0e89 100644 --- a/FruitBankHybrid.Shared/wwwroot/app.css +++ b/FruitBankHybrid.Shared/wwwroot/app.css @@ -1,5 +1,6 @@ html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + min-height: 100vh; } a, .btn-link {