From 7e4d0a85e8220566053117dd5c46cde883660cfd Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Fri, 28 Nov 2025 08:15:58 +0100
Subject: [PATCH] Upgrade to .net10 and Visual Studio 2026; StockTaking in
 progress...

---
 .../FruitBank.Common.Server.csproj            |  1 +
 .../FruitBankHybrid.Shared.Common.csproj      |  2 +-
 .../FruitBankHybrid.Shared.Tests.csproj       |  2 +-
 .../Components/GridDetailOrderDto.razor       |  8 +++----
 .../Components/GridDetailOrderItemDto.razor   |  2 +-
 .../Components/GridProductDtoTemplate.razor   |  2 +-
 .../FruitBankHybrid.Shared.csproj             |  4 ++--
 FruitBankHybrid.Shared/Layout/NavMenu.razor   |  9 ++++++++
 .../Pages/MeasuringOut.razor.cs               |  4 +++-
 .../Pages/StockTaking.razor                   | 22 +++++++++++++++++++
 .../Pages/StockTaking.razor.cs                | 13 +++++++++++
 .../FruitBankHybrid.Web.Client.csproj         |  2 +-
 .../FruitBankHybrid.Web.csproj                |  2 +-
 FruitBankHybrid/FruitBankHybrid.csproj        | 18 +++++++--------
 14 files changed, 69 insertions(+), 22 deletions(-)
 create mode 100644 FruitBankHybrid.Shared/Pages/StockTaking.razor
 create mode 100644 FruitBankHybrid.Shared/Pages/StockTaking.razor.cs

diff --git a/FruitBank.Common.Server/FruitBank.Common.Server.csproj b/FruitBank.Common.Server/FruitBank.Common.Server.csproj
index 4d7a8d1..a4a0331 100644
--- a/FruitBank.Common.Server/FruitBank.Common.Server.csproj
+++ b/FruitBank.Common.Server/FruitBank.Common.Server.csproj
@@ -13,6 +13,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10" />
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="9.0.10" />
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.10" />
+		<!--<PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.2.0" />-->
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.10" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
 	</ItemGroup>
diff --git a/FruitBankHybrid.Shared.Common/FruitBankHybrid.Shared.Common.csproj b/FruitBankHybrid.Shared.Common/FruitBankHybrid.Shared.Common.csproj
index 8a08473..60d7f74 100644
--- a/FruitBankHybrid.Shared.Common/FruitBankHybrid.Shared.Common.csproj
+++ b/FruitBankHybrid.Shared.Common/FruitBankHybrid.Shared.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj b/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj
index 5117819..2a80cce 100644
--- a/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj
+++ b/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSTest.Sdk/3.6.4">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
index 804dda9..acf03a1 100644
--- a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
+++ b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
@@ -14,7 +14,7 @@
 			ShowFilterRow="IsMasterGrid" ShowGroupPanel="IsMasterGrid"
 			AutoExpandAllGroupRows="false" 
 			CssClass="@GridCss"
-			ColumnResizeMode="GridColumnResizeMode.NextColumn" VirtualScrollingEnabled="IsMasterGrid"
+			ColumnResizeMode="GridColumnResizeMode.NextColumn" 
 			FilterMenuButtonDisplayMode="@(IsMasterGrid ? GridFilterMenuButtonDisplayMode.Never : GridFilterMenuButtonDisplayMode.Always)">
 	<Columns>
 		<DxGridDataColumn FieldName="Id" SortIndex="0" SortOrder="GridColumnSortOrder.Descending" />
@@ -44,19 +44,19 @@
 				<DxTabPage Text="Rendelés tételek">
 					<GridDetailOrderItemDto OrderItemDtos="orderDto.OrderItemDtos" IsMasterGrid="false" />
 				</DxTabPage>
-				<DxTabPage Text="Mérések">
+				<DxTabPage Text="Mérések" Visible="@LoggedInModel.IsDeveloper">
 					@{
 						var orderItemPalletDtos = orderDto?.OrderItemDtos.SelectMany(oi => oi.OrderItemPallets).ToList() ?? [];
 						<GridDetailOrderItemPallets OrderItemPallets="orderItemPalletDtos"  IsMasterGrid="false"/>
 					}
 				</DxTabPage>
-				<DxTabPage Text="Rendelés jegyzetek">
+				<DxTabPage Text="Rendelés jegyzetek" Visible="@LoggedInModel.IsDeveloper">
 					@{
 						// var orderItemPalletDtos = orderDto?.OrderItemDtos.SelectMany(oi => oi.OrderItemPallets).ToList() ?? [];
 						// <GridDetailOrderItemPallets OrderItemPallets="orderItemPalletDtos" IsMasterGrid="false" />
 					}
 				</DxTabPage>
-				<DxTabPage Text="Speciális jellemzők">
+				<DxTabPage Text="Speciális jellemzők" Visible="@LoggedInModel.IsDeveloper">
 					@{
 						var genericAttributeDtos = new AcObservableCollection<GenericAttributeDto>(orderDto.GenericAttributes);
 						<GridGenericAttribute ParentDataItem="@orderDto" GenericAttributes="@genericAttributeDtos" />
diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
index 7fbcc63..8ff39fb 100644
--- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
+++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
@@ -62,7 +62,7 @@
 						<GridDetailOrderItemPallets OrderItemPallets="orderItemDto.OrderItemPallets" />
 					}
 				</DxTabPage>
-				<DxTabPage Text="Speciális jellemzők">
+				<DxTabPage Text="Speciális jellemzők" Visible="@LoggedInModel.IsDeveloper">
 					@{
 						var genericAttributeDtos = new AcObservableCollection<GenericAttributeDto>(orderItemDto.GenericAttributes);
 						<GridGenericAttribute ParentDataItem="@orderItemDto" GenericAttributes="@genericAttributeDtos" />
diff --git a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor
index 6d30316..5189b9c 100644
--- a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor
+++ b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor
@@ -60,7 +60,7 @@
 						<GridStockQuantityHistoryDtoTemplate ContextIds="@(contextIds)" ParentDataItem="@productDto" />
 					}
 				</DxTabPage>
-				<DxTabPage Text="Speciális jellemzők">
+				<DxTabPage Text="Speciális jellemzők" Visible="@LoggedInModel.IsDeveloper">
 					@{
 						var genericAttributeDtos = new AcObservableCollection<GenericAttributeDto>(productDto.GenericAttributes);
 						<GridGenericAttribute ParentDataItem="@productDto" GenericAttributes="@genericAttributeDtos" />
diff --git a/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj b/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj
index 99c2167..be7cb06 100644
--- a/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj
+++ b/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -14,7 +14,7 @@
     <PackageReference Include="DevExpress.Blazor" Version="25.1.3" />
     <PackageReference Include="MessagePack" Version="3.1.4" />
     <PackageReference Include="MessagePack.Annotations" Version="3.1.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
diff --git a/FruitBankHybrid.Shared/Layout/NavMenu.razor b/FruitBankHybrid.Shared/Layout/NavMenu.razor
index 613268f..ff72e57 100644
--- a/FruitBankHybrid.Shared/Layout/NavMenu.razor
+++ b/FruitBankHybrid.Shared/Layout/NavMenu.razor
@@ -37,6 +37,15 @@
 				</NavLink>
 			</div>
 
+			@if (LoggedInModel.IsDeveloper)
+			{
+				<div class="nav-item px-3">
+					<NavLink class="nav-link" href="StockTaking">
+						<span class="icon counter-icon" aria-hidden="true"></span> Leltározás
+					</NavLink>
+				</div>
+			}
+
 			@if (LoggedInModel.IsAdministrator)
 			{
 				<div class="nav-item px-3">
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs
index dd70eb4..4550ffd 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs
+++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs
@@ -108,8 +108,10 @@ namespace FruitBankHybrid.Shared.Pages
                     lock (_lock)
                     {
                         var localOrderDto = SelectedDayOrders.FirstOrDefault(o => o.OrderItemDtos.Any(oi => oi.Id == orderItemDto.Id));
-                        var localOrderItemDto = localOrderDto?.OrderItemDtos.First(x => x.Id == orderItemDto.Id)!;
+                        var localOrderItemDto = localOrderDto?.OrderItemDtos.FirstOrDefault(x => x.Id == orderItemDto.Id);
                         
+                        if (localOrderItemDto == null) return;
+
                         localOrderItemDto.Quantity = orderItemDto.Quantity;
                         localOrderItemDto.GenericAttributes.UpdateBaseEntityCollection(orderItemDto.GenericAttributes, false);
                     }
diff --git a/FruitBankHybrid.Shared/Pages/StockTaking.razor b/FruitBankHybrid.Shared/Pages/StockTaking.razor
new file mode 100644
index 0000000..68da626
--- /dev/null
+++ b/FruitBankHybrid.Shared/Pages/StockTaking.razor
@@ -0,0 +1,22 @@
+@page "/StockTaking"
+@using FruitBankHybrid.Shared.Databases
+
+<h3>Leltározás</h3>
+
+<DxDialogProvider />
+
+<div style="margin-top: 30px;">
+
+	<DxLoadingPanel @bind-Visible="LoadingPanelVisibility.Visible"
+					IsContentBlocked="true"
+					ApplyBackgroundShading="true"
+					IndicatorAreaVisible="false"
+					Text="Adatok szinkronizálása folyamatban...">
+		
+		<DxTabs RenderMode="TabsRenderMode.OnDemand">
+			<DxTabPage Text="Leltározás"></DxTabPage>
+			<DxTabPage Text="Előzmények"></DxTabPage>
+		</DxTabs>
+
+	</DxLoadingPanel>
+</div>
\ No newline at end of file
diff --git a/FruitBankHybrid.Shared/Pages/StockTaking.razor.cs b/FruitBankHybrid.Shared/Pages/StockTaking.razor.cs
new file mode 100644
index 0000000..7c13668
--- /dev/null
+++ b/FruitBankHybrid.Shared/Pages/StockTaking.razor.cs
@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Components;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FruitBankHybrid.Shared.Pages
+{
+    public partial class StockTaking : ComponentBase
+    {
+    }
+}
diff --git a/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj b/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj
index 580bf2a..72e968a 100644
--- a/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj
+++ b/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
diff --git a/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj b/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj
index bad6e49..0734204 100644
--- a/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj
+++ b/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<!--<PublishTrimmed>true</PublishTrimmed>-->
diff --git a/FruitBankHybrid/FruitBankHybrid.csproj b/FruitBankHybrid/FruitBankHybrid.csproj
index 7fc20f5..ab6363c 100644
--- a/FruitBankHybrid/FruitBankHybrid.csproj
+++ b/FruitBankHybrid/FruitBankHybrid.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.26100.0</TargetFrameworks>
+		<TargetFrameworks>net10.0-android;net10.0-ios</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.26100.0</TargetFrameworks>
 
 		<OutputType>Exe</OutputType>
 		<RootNamespace>FruitBankHybrid</RootNamespace>
@@ -27,9 +27,9 @@
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">29.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">33.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
+		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
 		<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
 		<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
 		<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
@@ -53,14 +53,14 @@
 		<UseInterpreter>true</UseInterpreter>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-android|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net10.0-android|AnyCPU'">
 	  <AndroidPackageFormat>apk</AndroidPackageFormat>
 	  <AndroidUseAapt2>True</AndroidUseAapt2>
 	  <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
 	  <DebugSymbols>True</DebugSymbols>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-android|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net10.0-android|AnyCPU'">
 	  <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
 	  <AndroidUseAapt2>True</AndroidUseAapt2>
 	  <AndroidPackageFormat>apk</AndroidPackageFormat>
@@ -89,8 +89,8 @@
 		<!--<PackageReference Include="DevExpress.Maui.Controls" Version="25.1.3" />
     <PackageReference Include="DevExpress.Maui.Editors" Version="25.1.3" />
     <PackageReference Include="DevExpress.Maui.CollectionView" Version="25.1.3" />-->
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.120" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.10" />
 	</ItemGroup>