From 2eaf74b19995b0eac135d8bf8763c5f5802bd07e Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Thu, 23 Oct 2025 06:34:40 +0200
Subject: [PATCH] fixes

---
 FruitBank.Common/FruitBankConstClient.cs      |   2 +-
 ...on.cs => DevexpressComponentExtensions.cs} |   2 +-
 .../Pages/MeasuringOut.razor                  |  28 ++--
 .../Pages/MeasuringOut.razor.cs               |  28 ++--
 .../FruitBankHybrid.Web.csproj                | 148 +++++++++---------
 5 files changed, 106 insertions(+), 102 deletions(-)
 rename FruitBankHybrid.Shared/Extensions/{DevextremeComponentExtension.cs => DevexpressComponentExtensions.cs} (95%)

diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs
index 992b467..5e51fc9 100644
--- a/FruitBank.Common/FruitBankConstClient.cs
+++ b/FruitBank.Common/FruitBankConstClient.cs
@@ -10,7 +10,7 @@ public static class FruitBankConstClient
     public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop
 
     #if RELEASE
-    //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop
+    public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop
     #endif
 
     //public static string BaseUrl = "http://10.0.2.2:59579"; //FrutiBank (android) nop
diff --git a/FruitBankHybrid.Shared/Extensions/DevextremeComponentExtension.cs b/FruitBankHybrid.Shared/Extensions/DevexpressComponentExtensions.cs
similarity index 95%
rename from FruitBankHybrid.Shared/Extensions/DevextremeComponentExtension.cs
rename to FruitBankHybrid.Shared/Extensions/DevexpressComponentExtensions.cs
index a2f971d..6cca84f 100644
--- a/FruitBankHybrid.Shared/Extensions/DevextremeComponentExtension.cs
+++ b/FruitBankHybrid.Shared/Extensions/DevexpressComponentExtensions.cs
@@ -3,7 +3,7 @@ using DevExpress.Blazor.Internal;
 
 namespace FruitBankHybrid.Shared.Extensions;
 
-public static class DevextremeComponentExtension
+public static class DevexpressComponentExtensions
 {
     public static async Task ShowMessageBoxAsync(this IDialogService messageBox, string title, string text, MessageBoxRenderStyle messageBoxRenderStyle)
     {
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
index d8b4542..b255f92 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
+++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
@@ -71,25 +71,27 @@
 				</DxComboBox>
 			</DxFormLayoutItem>
 
-			@switch (SelectedOrder)
+			@if (SelectedOrder == null)
 			{
-				case null:
-					<DxFormLayoutItem ColSpanMd="2" />
-					break;
-
-				case { MeasurementOwnerId: 0, IsComplete: false } when HasMeasuringAccess:
+				<DxFormLayoutItem ColSpanMd="2" />
+			}
+			else
+			{
+				if (SelectedOrder is { MeasurementOwnerId: 0, IsComplete: false } && HasMeasuringAccess)
+				{
 					<DxFormLayoutItem ColSpanMd="2">
-						<DxButton Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0)" Visible="@(SelectedOrder != null)" CssClass="w-100"
-								  Text="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0 ? "Indítás" : "Folyamatban...")"
+						<DxButton Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0)" Visible="(SelectedOrder != null)" 
+						          CssClass="w-100"
+								  Text="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0 ? " Indítás" : "Folyamatban...")"
 								  Click="() => OnStartMeasuringClick()" />
 					</DxFormLayoutItem>
-					break;
-
-				default:
-					<DxFormLayoutItem ColSpanMd="2" Caption="Indította" CaptionCssClass="@(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
+				}
+				else
+				{
+					<DxFormLayoutItem ColSpanMd="2" Caption="Indította" CaptionCssClass="@(SelectedOrder?.IsMeasured == true ? " text-success" : "" )">
 						<DxTextBox Enabled="false" Text="@(LoggedInModel.MeasuringUsers.FirstOrDefault(x => x.Id == SelectedOrder?.MeasurementOwnerId)?.LastName)" />
 					</DxFormLayoutItem>
-					break;
+				}
 			}
 
 			@* <DxFormLayoutItem ColSpanMd="1"></DxFormLayoutItem> *@
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs
index 914cc82..40c9096 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs
+++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs
@@ -174,28 +174,30 @@ namespace FruitBankHybrid.Shared.Pages
 
         private async Task OnStartMeasuringClick()
         {
-            if (SelectedOrder != null && LoggedInModel.IsLoggedIn && SelectedOrder.MeasurementOwnerId == 0)
+            if (SelectedOrder == null || !LoggedInModel.IsLoggedIn || SelectedOrder.MeasurementOwnerId != 0) return;
+            
+            var confirmed = !LoggedInModel.IsRevisor || await DialogService.ShowConfirmBoxAsync("Megerősítés", "Ha elindítja a mérést, senki más nem tudja befelyezni! Biztoan folytatja?", MessageBoxRenderStyle.Info);
+            if (!confirmed) return;
+
+            var responseOrderDto = await FruitBankSignalRClient.StartMeasuring(SelectedOrder.Id, LoggedInModel.CustomerDto!.Id);
+            if (responseOrderDto != null)
             {
-                var responseOrderDto = await FruitBankSignalRClient.StartMeasuring(SelectedOrder.Id, LoggedInModel.CustomerDto!.Id);
-                if (responseOrderDto != null)
-                {
-                    PrepareOrderDto(responseOrderDto);
+                PrepareOrderDto(responseOrderDto);
 
-                    //SelectedOrder.GenericAttributes.UpdateBaseEntityCollection(responseOrderDto.GenericAttributes, false);
-                    SelectedDayOrders.UpdateCollection(responseOrderDto, false);
-                    SelectedOrder = responseOrderDto;
-                }
-                else await DialogService.ShowMessageBoxAsync("Hiba", "Nem sikerült a mérést elindítani!", MessageBoxRenderStyle.Danger);
-
-                StateHasChanged();
+                //SelectedOrder.GenericAttributes.UpdateBaseEntityCollection(responseOrderDto.GenericAttributes, false);
+                SelectedDayOrders.UpdateCollection(responseOrderDto, false);
+                SelectedOrder = responseOrderDto;
             }
+            else await DialogService.ShowMessageBoxAsync("Hiba", "Nem sikerült a mérést elindítani!", MessageBoxRenderStyle.Danger);
+
+            StateHasChanged();
         }
 
         private async Task OnMeasuringAuditorClick()
         {
             if (SelectedOrder != null && LoggedInModel.IsRevisor && SelectedOrder.IsMeasured && SelectedOrder.OrderStatus != OrderStatus.Complete)
             {
-                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))
+                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.Info))
                 {
                     var responseOrderDto = await FruitBankSignalRClient.SetOrderStatusToComplete(SelectedOrder.Id, LoggedInModel.CustomerDto!.Id);
                     if (responseOrderDto != null)
diff --git a/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj b/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj
index 63d25b1..b5b9812 100644
--- a/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj
+++ b/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj
@@ -1,82 +1,82 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-	  <PublishTrimmed>true</PublishTrimmed>
-  </PropertyGroup>
-	
-  <ItemGroup>
-	  <ProjectReference Include="..\FruitBank.Common.Server\FruitBank.Common.Server.csproj" />
-    <ProjectReference Include="..\FruitBank.Common\FruitBank.Common.csproj" />
-    <ProjectReference Include="..\FruitBankHybrid.Shared.Common\FruitBankHybrid.Shared.Common.csproj" />
-    <ProjectReference Include="..\FruitBankHybrid.Shared\FruitBankHybrid.Shared.csproj" />
-    <ProjectReference Include="..\FruitBankHybrid.Web.Client\FruitBankHybrid.Web.Client.csproj" />
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<!--<PublishTrimmed>true</PublishTrimmed>-->
+	</PropertyGroup>
 
-    <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.WebAssembly.Server" Version="9.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.10" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\FruitBank.Common.Server\FruitBank.Common.Server.csproj" />
+		<ProjectReference Include="..\FruitBank.Common\FruitBank.Common.csproj" />
+		<ProjectReference Include="..\FruitBankHybrid.Shared.Common\FruitBankHybrid.Shared.Common.csproj" />
+		<ProjectReference Include="..\FruitBankHybrid.Shared\FruitBankHybrid.Shared.csproj" />
+		<ProjectReference Include="..\FruitBankHybrid.Web.Client\FruitBankHybrid.Web.Client.csproj" />
 
-  <ItemGroup>
-    <Reference Include="AyCode.Core">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Core.Server">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Core.Server.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Entities">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Entities.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Entities.Server">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Entities.Server.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Interfaces">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Interfaces.Server">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Interfaces.Server.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Models">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Models.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Models.Server">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Models.Server.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Services">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Services.Server">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Services.Server.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Utils">
-      <HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Utils.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Blazor.Resources.v25.1">
-      
-    </Reference>
-	  <Reference Include="DevExpress.Blazor.v25.1">
-		  
-	  </Reference>
-	  <Reference Include="DevExpress.Blazor.v25.1.Viewer">
-	    
-	  </Reference>
-	  <Reference Include="DevExpress.Data.v25.1">
-		  
-	  </Reference>
-	  <Reference Include="DevExpress.Utils.v25.1">
-		  
-	  </Reference>
-  </ItemGroup>
+		<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.WebAssembly.Server" Version="9.0.10" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.10" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Controllers\" />
-    <Folder Include="Services\SignalRs\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Reference Include="AyCode.Core">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Core.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Core.Server">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Core.Server.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Entities">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Entities.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Entities.Server">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Entities.Server.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Interfaces">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Interfaces.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Interfaces.Server">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Interfaces.Server.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Models">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Models.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Models.Server">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Models.Server.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Services">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Services.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Services.Server">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Services.Server.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Utils">
+			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Utils.dll</HintPath>
+		</Reference>
+		<Reference Include="DevExpress.Blazor.Resources.v25.1">
+
+		</Reference>
+		<Reference Include="DevExpress.Blazor.v25.1">
+
+		</Reference>
+		<Reference Include="DevExpress.Blazor.v25.1.Viewer">
+
+		</Reference>
+		<Reference Include="DevExpress.Data.v25.1">
+
+		</Reference>
+		<Reference Include="DevExpress.Utils.v25.1">
+
+		</Reference>
+	</ItemGroup>
+
+	<ItemGroup>
+		<Folder Include="Controllers\" />
+		<Folder Include="Services\SignalRs\" />
+	</ItemGroup>