From f9cb10556aa82d7fb90eab5dab53b14462b058cd Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Sat, 1 Nov 2025 00:42:54 +0100
Subject: [PATCH] improvements, fixes

---
 .../OrderClientTests.cs                        |  3 ++-
 .../Components/GridDetailOrderDto.razor        |  2 +-
 .../Components/GridDetailOrderItemDto.razor    |  2 +-
 .../GridDetailOrderItemPallets.razor           |  2 +-
 .../Components/GridProductDtoTemplate.razor    |  2 +-
 .../Components/GridShippingDocument.razor      |  2 +-
 .../Components/GridShippingItem.razor          |  2 +-
 FruitBankHybrid.Shared/Pages/MeasuringIn.razor |  7 ++++++-
 .../Pages/MeasuringIn.razor.cs                 | 18 +++++++++++++++---
 9 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/FruitBankHybrid.Shared.Tests/OrderClientTests.cs b/FruitBankHybrid.Shared.Tests/OrderClientTests.cs
index ba4827a..6ee7a7c 100644
--- a/FruitBankHybrid.Shared.Tests/OrderClientTests.cs
+++ b/FruitBankHybrid.Shared.Tests/OrderClientTests.cs
@@ -4,6 +4,7 @@ using FruitBank.Common;
 using FruitBank.Common.Loggers;
 using FruitBankHybrid.Shared.Services.SignalRs;
 using Nop.Core.Domain.Orders;
+using Nop.Core.Domain.Payments;
 
 namespace FruitBankHybrid.Shared.Tests;
 
@@ -70,7 +71,7 @@ public sealed class OrderClientTests
 
         Assert.IsNotNull(orderDtosForMeasuring);
         //Assert.IsTrue(orderDtosForMeasuring.Any(x=>x.Id ==51));
-        Assert.IsTrue(orderDtosForMeasuring.All(o => o.OrderStatus == OrderStatus.Pending));
+        Assert.IsTrue(orderDtosForMeasuring.All(o => o.PaymentStatus < PaymentStatus.Paid));
         Assert.IsTrue(orderDtosForMeasuring.Count != 0);
     }
 
diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
index efe5382..96f4831 100644
--- a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
+++ b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
@@ -21,7 +21,7 @@
 		<DxGridDataColumn FieldName="MeasurementOwnerId" />
 		<DxGridDataColumn FieldName="DateOfReceipt" />
 		<DxGridDataColumn FieldName="CreatedOnUtc" />
-		<DxGridCommandColumn Visible="!IsMasterGrid" Width="110"></DxGridCommandColumn>
+		<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
 	</Columns>
 	<DetailRowTemplate>
 		@if (IsMasterGrid)
diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
index d899940..135eb2b 100644
--- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
+++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
@@ -35,7 +35,7 @@
 		<DxGridDataColumn FieldName="IsMeasurable" />
 		<DxGridDataColumn FieldName="IsMeasured" />
 		<DxGridDataColumn FieldName="IsAudited" />
-		<DxGridCommandColumn Visible="IsMasterGrid" Width="120"></DxGridCommandColumn>
+		<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
 	</Columns>
 	<DetailRowTemplate>
 		<GridDetailOrderItemPallets OrderItemPallets="((OrderItemDto)context.DataItem).OrderItemPallets" />
diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor
index 16a5530..f0a1c4d 100644
--- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor
+++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor
@@ -25,7 +25,7 @@
 
 		<DxGridDataColumn FieldName="IsMeasured" />
 		<DxGridDataColumn FieldName="IsAudited" />
-		<DxGridCommandColumn Visible="!IsMasterGrid" Width="110"></DxGridCommandColumn>
+		<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
 	</Columns>
 	<GroupSummary>
 		<DxGridSummaryItem SummaryType="GridSummaryItemType.Sum"
diff --git a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor
index 6da01bb..33e9b3b 100644
--- a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor
+++ b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor
@@ -19,7 +19,7 @@
 		<DxGridDataColumn FieldName="IncomingQuantity" />
 		<DxGridDataColumn FieldName="NetWeight" />
 		<DxGridDataColumn FieldName="IsMeasurable" />
-		<DxGridCommandColumn Visible="!IsMasterGrid"></DxGridCommandColumn>
+		<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
 	</Columns>
 	<DetailRowTemplate>
 		@if (IsMasterGrid)
diff --git a/FruitBankHybrid.Shared/Components/GridShippingDocument.razor b/FruitBankHybrid.Shared/Components/GridShippingDocument.razor
index 8e6ff5a..fdc76b2 100644
--- a/FruitBankHybrid.Shared/Components/GridShippingDocument.razor
+++ b/FruitBankHybrid.Shared/Components/GridShippingDocument.razor
@@ -22,7 +22,7 @@
 		<DxGridDataColumn FieldName="Comment" />
 		<DxGridDataColumn FieldName="Created" />
 		<DxGridDataColumn FieldName="Modified" />
-		<DxGridCommandColumn Visible="!IsMasterGrid" Width="110"></DxGridCommandColumn>
+		<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
 	</Columns>
 	<DetailRowTemplate>
 		@if (IsMasterGrid)
diff --git a/FruitBankHybrid.Shared/Components/GridShippingItem.razor b/FruitBankHybrid.Shared/Components/GridShippingItem.razor
index 20042de..b2e573b 100644
--- a/FruitBankHybrid.Shared/Components/GridShippingItem.razor
+++ b/FruitBankHybrid.Shared/Components/GridShippingItem.razor
@@ -35,7 +35,7 @@
 
 		<DxGridDataColumn FieldName="Created" />
 		<DxGridDataColumn FieldName="Modified" />
-		<DxGridCommandColumn Visible="!IsMasterGrid" Width="110"></DxGridCommandColumn>
+		<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
 	</Columns>
 	<DetailRowTemplate>
 		@* <GridDetailOrderItemPallets OrderItemPallets="((OrderItemDto)context.DataItem).OrderItemPallets" /> *@
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
index 0340a99..05bee03 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
+++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
@@ -110,6 +110,11 @@
  *@					
 					<span class="@(ctxShippingitem.DataItem.IsMeasured ? "text-success" : "")">@ctxShippingitem.DisplayText)</span>
 					</ItemDisplayTemplate>
+					<Buttons>
+						<DxEditorButton IconCssClass="editor-icon editor-icon-add" Text="R" Tooltip="Adatok frissítése..."
+						                Click="() => OnOrdersRefreshClick()" />
+					</Buttons>
+
 				</DxComboBox>
 			</DxFormLayoutItem>
 
@@ -133,7 +138,7 @@
 			@if (SelectedShippingItem is { ProductId: > 0 })
 			{
 				<h3 style="margin-bottom: 30px;" class="@(SelectedShippingItem.IsMeasured && SelectedShippingItem.ShippingItemPallets!.All(x => x.IsMeasuredAndValid(SelectedShippingItem.IsMeasurable)) ? "text-success" : "")">
-					@SelectedShippingItem.ProductName
+					#@(SelectedShippingItem.ProductId). @(SelectedShippingItem.ProductName)
 				</h3>
 
 				<DxFormLayout Data="@SelectedShippingItem" CaptionPosition="CaptionPosition.Vertical" CssClass="w-100">
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs
index 5a5fe6d..01f6896 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs
+++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs
@@ -57,6 +57,10 @@ namespace FruitBankHybrid.Shared.Pages
             NotMeasuredShippings = shippings.Where(shipping => MeasurementService.DaysEqual(shipping.ShippingDate.Date, dateTime)).ToList();
 
             SelectedShipping = NotMeasuredShippings.FirstOrDefault();
+            //if (SelectedShipping != null && SelectedShippingItem != null && (SelectedShippingItem.ShippingDocument?.ShippingId ?? 0) == SelectedShipping.Id)
+            //{
+            //    SelectedShippingItem = _shippingItemsDataSource.
+            //}
 
             LoadingPanelVisible = false;
         }
@@ -130,6 +134,13 @@ namespace FruitBankHybrid.Shared.Pages
 
             StateHasChanged();
         }
+        private async Task OnOrdersRefreshClick()
+        {
+            LoadingPanelVisible = true;
+
+            await RefreshShippingsFromDb(SelectedShipping?.ShippingDate ?? DateTime.Now);
+            StateHasChanged();
+        }
 
         private Task OnShippingItemPalletValueChanged(ShippingItemPallet shippingItemPallet, ShippingItem shippingItem)
         {
@@ -140,17 +151,18 @@ namespace FruitBankHybrid.Shared.Pages
             return Task.CompletedTask;
         }
 
-        private Task OnShippingItemPalletSaved(ShippingItemPallet? responseShippingItemPallet)
+        private async Task OnShippingItemPalletSaved(ShippingItemPallet? responseShippingItemPallet)
         {
             if (responseShippingItemPallet != null)
             {
                 SelectedShippingItem!.ShippingItemPallets!.UpdateCollection(responseShippingItemPallet, false);
+                SelectedShippingItem.IsMeasured = SelectedShippingItem!.ShippingItemPallets!.All(sip => sip.IsMeasuredAndValid(SelectedShippingItem.IsMeasurable));
+
                 MeasuringValuesHelper.SetShippingItemTotalMeasuringValues(SelectedShippingItem);
             }
             else DisplayErrorText($"Sikertelen volt a raklap adatainak mentése!");
 
-            StateHasChanged();
-            return Task.CompletedTask;
+            await InvokeAsync(StateHasChanged);
         }
         
         private bool IsShippingitemPalletMeasuredAndValid(ShippingItemPallet shippingItemPallet)