diff --git a/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor b/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor index cb56f7c..c2118fa 100644 --- a/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor +++ b/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor @@ -48,7 +48,7 @@ @if (IsMasterGrid) { - + } @* diff --git a/FruitBankHybrid.Shared/Components/Grids/StockTakingItems/GridStockTakingItem.razor b/FruitBankHybrid.Shared/Components/Grids/StockTakingItems/GridStockTakingItem.razor index 951bae9..868288d 100644 --- a/FruitBankHybrid.Shared/Components/Grids/StockTakingItems/GridStockTakingItem.razor +++ b/FruitBankHybrid.Shared/Components/Grids/StockTakingItems/GridStockTakingItem.razor @@ -48,7 +48,7 @@ @if (IsMasterGrid) { - + } diff --git a/FruitBankHybrid.Shared/Components/StockTakings/StockTakingTemplate.razor b/FruitBankHybrid.Shared/Components/StockTakings/StockTakingTemplate.razor index b76731d..92504c8 100644 --- a/FruitBankHybrid.Shared/Components/StockTakings/StockTakingTemplate.razor +++ b/FruitBankHybrid.Shared/Components/StockTakings/StockTakingTemplate.razor @@ -12,10 +12,19 @@ @using FruitBankHybrid.Shared.Services.SignalRs @using Mango.Nop.Core.Entities + + @* CaptionCssClass="@(SelectedProductDto?.IsMeasured == true ? "text-success" : "")"> *@ - + InputId="cbProduct2" + SearchMode="ListSearchMode.AutoSearch" + SearchFilterCondition="ListSearchFilterCondition.Contains" + SearchTextParseMode="ListSearchTextParseMode.Default" + ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" + DropDownTriggerMode="DropDownTriggerMode.Click" + @ref="cbStockTakingItems"> @* TextFieldName="StockTakingItem.Product.Name" *@ - + - +@* - - + *@ + @@ -95,6 +110,7 @@ } + @code { @@ -103,6 +119,12 @@ [Inject] public required IDialogService DialogService { get; set; } = null!; [Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; } + bool _btnDisabled = false; + bool LoadingPanelVisible = false; + + DxComboBox cbStockTakings; + DxComboBox cbStockTakingItems; + List _stockTakings { get; set; } = []; List _stockTakingItems { get; set; } = []; List _stockTakingItemPallets { get; set; } = []; @@ -116,25 +138,44 @@ public async Task ReloadDataFromDb(bool forceReload) { - LoadingPanelVisibility.Visible = true; + LoadingPanelVisible = true; _stockTakings = await FruitBankSignalRClient.GetStockTakings(false) ?? []; await StockTakingComboValueChanged(_stockTakings.FirstOrDefault()); - LoadingPanelVisibility.Visible = false; + LoadingPanelVisible = false; } private async Task NewStockTakingClick() { - var stockTaking = new StockTaking(); - stockTaking.StartDateTime = DateTime.Now; - stockTaking.Creator = LoggedInModel.CustomerDto!.Id; + _btnDisabled = true; - var resultStockTakings = await FruitBankSignalRClient.AddStockTaking(stockTaking); - if (resultStockTakings == null) return; + try + { + LoadingPanelVisible = true; - _stockTakings.UpdateCollection(resultStockTakings, false); - await StockTakingComboValueChanged(_stockTakings.FirstOrDefault(x => x.Id == stockTaking.Id)); + var stockTaking = new StockTaking(); + stockTaking.StartDateTime = DateTime.Now; + stockTaking.Creator = LoggedInModel.CustomerDto!.Id; + + var resultStockTakings = await FruitBankSignalRClient.AddStockTaking(stockTaking); + if (resultStockTakings == null) + { + await DialogService.ShowMessageBoxAsync("Hiba", "Új leltár létrehozása sikertelen volt!", MessageBoxRenderStyle.Danger); + return; + } + + _stockTakings.UpdateCollection(resultStockTakings, false); + await StockTakingComboValueChanged(_stockTakings.FirstOrDefault(x => x.Id == resultStockTakings.Id)); + } + finally + { + _btnDisabled = false; + LoadingPanelVisible = false; + } + + //cbStockTakings.Reload(); + await InvokeAsync(StateHasChanged); } private async Task UpdateStockTakingClick() @@ -148,11 +189,27 @@ private async Task StockTakingCloseClick(int stockTakingId) { - var resultStockTaking = await FruitBankSignalRClient.CloseStockTaking(stockTakingId); - if (resultStockTaking == null) return; + _btnDisabled = true; - _stockTakings.UpdateCollection(resultStockTaking, false); - await StockTakingComboValueChanged(_stockTakings.FirstOrDefault(x => x.Id == resultStockTaking.Id)); + try + { + LoadingPanelVisible = true; + + var resultStockTaking = await FruitBankSignalRClient.CloseStockTaking(stockTakingId); + if (resultStockTaking == null) + { + await DialogService.ShowMessageBoxAsync("Hiba", "A leltár lezárása sikertelen volt, ellenőrizze a leltár adatait!", MessageBoxRenderStyle.Danger); + return; + } + + _stockTakings.UpdateCollection(resultStockTaking, false); + await StockTakingComboValueChanged(_stockTakings.FirstOrDefault(x => x.Id == resultStockTaking.Id)); + } + finally + { + _btnDisabled = false; + LoadingPanelVisible = false; + } await InvokeAsync(StateHasChanged); } @@ -161,7 +218,7 @@ { SelectedStockTaking = newValue; SelectedStockTaking?.StockTakingItems = await FruitBankSignalRClient.GetStockTakingItemsByStockTakingId(SelectedStockTaking.Id); - + PrepareStockTakingItems(SelectedStockTaking); SelectedStockTakingItem = _stockTakingItems.FirstOrDefault(); @@ -194,19 +251,22 @@ } } - private Task OnStockTakingItemPalletValueChanged(StockTakingItemPallet stockTakingItemPallet, StockTakingItem stockTakingItem) + private async Task OnStockTakingItemPalletValueChanged(StockTakingItemPallet stockTakingItemPallet, StockTakingItem stockTakingItem) { // MeasuringValuesHelper.SetShippingItemTotalMeasuringValues(stockTakingItem); // BtnSaveEnabled = stockTakingItem.IsValidMeasuringValues() && stockTakingItemPallet.IsValidMeasuringValues(stockTakingItem.IsMeasurable); - StateHasChanged(); - return Task.CompletedTask; + //cbStockTakingItems.Reload(); + await InvokeAsync(StateHasChanged); + //return Task.CompletedTask; } private async Task OnStockTakingItemPalletSaved(StockTakingItemPallet? responseStockTakingItemPallet) { if (responseStockTakingItemPallet != null) { + //responseStockTakingItemPallet.IsMeasured = true; + responseStockTakingItemPallet.StockTakingItem = SelectedStockTakingItem; SelectedStockTakingItem!.MeasuredStockQuantity = responseStockTakingItemPallet.TrayQuantity; @@ -219,7 +279,10 @@ } else await DialogService.ShowMessageBoxAsync("Hiba", "Adatok mentése sikertelen volt, ellenőrizze a mérés adatait!", MessageBoxRenderStyle.Danger); + //cbStockTakingItems.Reload(); await InvokeAsync(StateHasChanged); + + await cbStockTakingItems.FocusAsync(); } } diff --git a/FruitBankHybrid.Shared/Pages/StockTaking.razor b/FruitBankHybrid.Shared/Pages/StockTaking.razor index 19e1c0c..5073160 100644 --- a/FruitBankHybrid.Shared/Pages/StockTaking.razor +++ b/FruitBankHybrid.Shared/Pages/StockTaking.razor @@ -10,12 +10,6 @@
- - @@ -31,6 +25,4 @@ } - -
\ No newline at end of file