diff --git a/FruitBank.Common.Server/FruitBank.Common.Server.csproj b/FruitBank.Common.Server/FruitBank.Common.Server.csproj
index c31b4f30..9caa2d68 100644
--- a/FruitBank.Common.Server/FruitBank.Common.Server.csproj
+++ b/FruitBank.Common.Server/FruitBank.Common.Server.csproj
@@ -41,7 +41,7 @@
..\..\..\..\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.13\ref\net9.0\Microsoft.AspNetCore.SignalR.Core.dll
+ C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\9.0.14\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/Components/Grids/StockTakingItems/GridStockTakingItem.razor b/FruitBankHybrid.Shared/Components/Grids/StockTakingItems/GridStockTakingItem.razor
index 868288d5..15cc8b49 100644
--- a/FruitBankHybrid.Shared/Components/Grids/StockTakingItems/GridStockTakingItem.razor
+++ b/FruitBankHybrid.Shared/Components/Grids/StockTakingItems/GridStockTakingItem.razor
@@ -16,23 +16,21 @@
+ CssClass="@GridCss" ValidationEnabled="false" OnGridFocusedRowChanged="Grid_FocusedRowChanged">
+ @* CustomizeGroupValueDisplayText="Grid_CustomizeGroupValueDisplayText"> *@
-
+
-
-
- @(((StockTakingItem)context.DataItem)?.StockTaking?.StartDateTime.ToString("g") ?? "")
-
-
-
-
+
+
+
+
-
+
-
-
+
+
@@ -41,8 +39,8 @@
-
-
+
+
@@ -103,22 +101,14 @@
EditItemsEnabled = true;
}
- // void Grid_CustomGroup(GridCustomGroupEventArgs e)
+ // static void Grid_CustomizeGroupValueDisplayText(GridCustomizeGroupValueDisplayTextEventArgs e)
// {
- // if (e.FieldName != "StockTaking.StartDateTime") return;
+ // if (e.FieldName != nameof(StockTakingItem.StockTakingId)) return;
- // e.SameGroup = ((StockTakingItem)e.DataItem1).StockTakingId == ((StockTakingItem)e.DataItem2).StockTakingId;
- // e.Handled = true;
- // }
-
- // void Grid_CustomizeGroupValueDisplayText(GridCustomizeGroupValueDisplayTextEventArgs e)
- // {
- // return;
-
- // if (e.FieldName != "StockTaking.StartDateTime") return;
-
- // var startDate = (DateTime)e.Value;
- // e.DisplayText = startDate.ToString("g");
+ // if (e.GetRowValue("StockTaking.StartDateTime") is DateTime startDateTime)
+ // {
+ // e.DisplayText = startDateTime.ToString("g");
+ // }
// }
}
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
index 65ec04bc..302ac3fe 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
+++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
@@ -67,6 +67,13 @@
CssClass="cw-480"
Context="ctxOrder"
DropDownBodyCssClass="dd-body-class"
+ SearchMode="ListSearchMode.AutoSearch"
+ SearchFilterCondition="ListSearchFilterCondition.Contains"
+ SearchTextParseMode="ListSearchTextParseMode.GroupWordsByAnd"
+ ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto"
+ DropDownTriggerMode="DropDownTriggerMode.Click"
+ ListRenderMode="ListRenderMode.Entire"
+ ShowDropDownButton="false"
SelectedDataItemChanged="@((SelectedDataItemChangedEventArgs args) => OnSelectedOrderChanged(args))"
InputId="cbOrders">