From 742243a5359ce0882eb0854a4c1bb31f85b81abd Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 24 Mar 2026 16:20:39 +0100
Subject: [PATCH] Fix gestione immagini offerta

---
 .../DbModel/Sales/OfferRowModel.cs            | 11 +-----
 Lux.API/Lux.API.csproj                        |  2 +-
 Lux.UI/Components/Compo/OfferRowMan.razor     | 35 +++++++++++--------
 Lux.UI/Lux.UI.csproj                          |  2 +-
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 7 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/EgwCoreLib.Lux.Data/DbModel/Sales/OfferRowModel.cs b/EgwCoreLib.Lux.Data/DbModel/Sales/OfferRowModel.cs
index cb5c09dc..bc196957 100644
--- a/EgwCoreLib.Lux.Data/DbModel/Sales/OfferRowModel.cs
+++ b/EgwCoreLib.Lux.Data/DbModel/Sales/OfferRowModel.cs
@@ -57,6 +57,7 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales
         /// </summary>
         [NotMapped]
         public bool IsNote => SellingItemID == null;
+
         /// <summary>
         /// Riferimento (opzionale) al template da cui è derivato 
         /// </summary>
@@ -69,16 +70,6 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales
         public bool CalcEnabled
         {
             get => ImgType == ImageType.Calculated;
-#if false
-        {
-                bool answ = false;
-                if (SellingItemNav != null)
-                {
-                    answ = SellingItemNav.SourceType == ItemSourceType.Jwd || SellingItemNav.SourceType == ItemSourceType.FileBTL;
-                }
-                return answ;
-            } 
-#endif
         }
 
         /// <summary>
diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj
index 41ed9054..e9706570 100644
--- a/Lux.API/Lux.API.csproj
+++ b/Lux.API/Lux.API.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>1.1.2603.2415</Version>
+        <Version>1.1.2603.2416</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor b/Lux.UI/Components/Compo/OfferRowMan.razor
index 1674b3ab..99f3e5cd 100644
--- a/Lux.UI/Components/Compo/OfferRowMan.razor
+++ b/Lux.UI/Components/Compo/OfferRowMan.razor
@@ -118,18 +118,13 @@ else
                     <tbody>
                         @foreach (var item in ListRecords)
                         {
-                            bool isBuy = (item.SellingItemID > 2 && item.SellingItemID < 5);
                             <tr class="@RowClass(item)">
                                 <td class="text-nowrap">
                                     @if (DisplayMode == DisplayMode.Preview)
                                     {
-                                        @if (isBuy)
+                                        if (item.CalcEnabled)
                                         {
-                                            <img class="img-fluid p-1" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="48" @onclick="() => ReqEditRow()" />
-                                        }
-                                        else
-                                        {
-                                            @if (item.Envir == EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
+                                            if (item.Envir == EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
                                             {
                                                 <img class="img-fluid image-hover-pop p-1" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="48" @onclick="() => ReqEditRow()" title="Edit Item" />
                                             }
@@ -138,6 +133,15 @@ else
                                                 <img class="img-fluid image-hover-pop" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="64" @onclick="() => ReqEditRow()" title="Edit Item" />
                                             }
                                         }
+                                        else
+                                        {
+                                            if (!item.IsNote)
+                                            {
+                                                
+                                                <img class="img-fluid p-1" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="48" @onclick="() => ReqEditRow()" />
+                                            }
+                                        }
+
                                     }
                                     else
                                     {
@@ -185,13 +189,9 @@ else
                                     @if (DisplayMode == DisplayMode.Edit)
                                     {
                                         <td>
-                                            @if (isBuy)
+                                            @if (item.CalcEnabled)
                                             {
-                                                <img class="img-fluid p-1" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="64" />
-                                            }
-                                            else
-                                            {
-                                                @if (item.Envir == EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
+                                                if (item.Envir == EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
                                                 {
                                                     <img class="img-fluid image-hover-pop p-1" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="64" @onclick="() => DoEditJwd(item)" title="Edit Item" />
                                                 }
@@ -200,6 +200,13 @@ else
                                                     <img class="img-fluid image-hover-pop" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="150" @onclick="() => DoEditFile(item)" title="Edit Item" />
                                                 }
                                             }
+                                            else
+                                            {
+                                                if (!item.IsNote)
+                                                {
+                                                    <img class="img-fluid p-1" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="64" />
+                                                }
+                                            }
                                         </td>
                                     }
                                     <td>
@@ -230,7 +237,7 @@ else
                                                     }
                                                 }
                                             </li>
-                                            @if (!isBuy)
+                                            @if (item.CalcEnabled)
                                             {
                                                 @if (item.Envir != EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW || !string.IsNullOrEmpty(item.FileName))
                                                 {
diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj
index f6fec38b..01131db8 100644
--- a/Lux.UI/Lux.UI.csproj
+++ b/Lux.UI/Lux.UI.csproj
@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <UserSecretsId>aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50</UserSecretsId>
-        <Version>1.1.2603.2415</Version>
+        <Version>1.1.2603.2416</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 06f0e3ec..76795990 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>LUX - Web Windows MES</i>
-    <h4>Versione: 1.1.2603.2415</h4>
+    <h4>Versione: 1.1.2603.2416</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 39bd7c4e..dcdc8499 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2603.2415
+1.1.2603.2416
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 62fc8c64..b4ad1a90 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.1.2603.2415</version>
+  <version>1.1.2603.2416</version>
   <url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>