From 879e5151888e5ba42bea4c3b2aedcbf178f6cace Mon Sep 17 00:00:00 2001
From: Annamaria Sassi <annamaria.sassi@egalware.com>
Date: Thu, 23 Apr 2026 10:58:33 +0200
Subject: [PATCH] Aggiornata pagina BuyOrder

---
 Lux.API/Lux.API.csproj                        |  2 +-
 Lux.All.sln                                   |  4 +-
 .../Compo/Warehouse/BuyOrderDetail.razor      |  5 +-
 .../Compo/Warehouse/BuyOrderDetail.razor.cs   |  7 +++
 .../Compo/Warehouse/BuyOrderList.razor        | 14 ++++-
 .../Compo/Warehouse/BuyOrderList.razor.cs     | 22 +++++++
 .../Compo/Warehouse/MatReq2BuyOrder.razor     | 25 ++++++++
 .../Compo/Warehouse/MatReq2BuyOrder.razor.cs  | 19 ++++++
 .../Compo/Warehouse/MatReqGroup.razor         | 22 +++++--
 .../Compo/Warehouse/MatReqList.razor          | 10 +++-
 .../Compo/Warehouse/MatReqList.razor.cs       | 59 +++++++++++++++++--
 Lux.UI/Components/Pages/BuyOrder.razor        | 19 ++----
 Lux.UI/Components/Pages/BuyOrder.razor.cs     |  5 ++
 Lux.UI/Components/Pages/Offers.razor          | 29 ++++-----
 Lux.UI/Lux.UI.csproj                          |  2 +-
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 18 files changed, 201 insertions(+), 49 deletions(-)
 create mode 100644 Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor
 create mode 100644 Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.cs

diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj
index 4fc42207..bf579d19 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.2604.2210</Version>
+        <Version>1.1.2604.2310</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Lux.All.sln b/Lux.All.sln
index f229a8f8..fc7ebde9 100644
--- a/Lux.All.sln
+++ b/Lux.All.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 18
-VisualStudioVersion = 18.1.11312.151
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.37216.2 d17.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwCoreLib.Lux.Core", "EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj", "{CCE87D58-1E6C-47B3-A28C-65BFCF5F1D0C}"
 EndProject
diff --git a/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor b/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor
index 77931987..f2e3b0de 100644
--- a/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor
+++ b/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor
@@ -9,7 +9,7 @@ else
             <div class="d-flex" @onclick="() => ToggleGruppo()" style="cursor: pointer;">
                 <div class="px-0">
                     <i class="bi @ToggleIcon"></i>
-                    <strong>@CurrRec.BuyOrderCode</strong> | @CurrRec.Description
+                    <strong>@CurrRec.BuyOrderCode</strong> | @CurrRec.BuyOrderRowNav.First().ClassCode | @CurrRec.Inserted
                     <span class="badge rounded-pill bg-dark ms-2">@totalCount</span>
                 </div>
             </div>
@@ -27,7 +27,6 @@ else
                             </td> *@
                             <th class="col-2 text-start">Gruppo</th>
                             <th class="col-5 text-start">Articolo</th>
-                            @* <th class="col-3 text-start">Ord/Riga</th> *@
                             <th class="col-1 text-end">Qty</th>
                         </tr>
                     </thead>
@@ -55,7 +54,7 @@ else
                                     <div class="small">
                                         @item.OrderRowNav?.OrderRowCode
                                     </div>
-                                </td> *@
+                                </td>  *@
                                 <td class="text-end">@item.TotQty.ToString("N1")</td>
                             </tr>
                         }
diff --git a/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor.cs b/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor.cs
index 53585fe5..66d9fb50 100644
--- a/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor.cs
+++ b/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor.cs
@@ -43,6 +43,13 @@ namespace Lux.UI.Components.Compo.Warehouse
             get => showDetail ? "bi-chevron-down" : "bi-chevron-right";
         }
 
+        private List<Enums.BuyOrderStates> OrderStateList
+        {
+            get => Enum.GetValues(typeof(Enums.BuyOrderStates))
+                               .Cast<Enums.BuyOrderStates>()
+                               .ToList();
+        }
+
         #endregion Private Properties
 
         #region Private Methods
diff --git a/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor b/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor
index 4e225d85..0530bd8d 100644
--- a/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor
+++ b/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor
@@ -5,7 +5,19 @@
                 Ordini Fornitore
             </div>
             <div class="px-0">
-                filtro ???
+                <div class="px-0 d-flex justify-content-between">
+                    <div class="px-1">
+                        <div class="input-group input-group-sm" title="ricerca">
+                            <span class="input-group-text"><i class="fas fa-search"></i></span>
+                            <select class="form-select" @bind="@SearchVal">
+                                @foreach (var item in OrderStateList)
+                                {
+                                    <option value="@item.ToString()">@item.ToString()</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor.cs b/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor.cs
index eb490d4f..2eb3678a 100644
--- a/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor.cs
+++ b/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor.cs
@@ -1,4 +1,5 @@
 using EgwCoreLib.Lux.Data.DbModel.Supplier;
+using Microsoft.IdentityModel.Tokens;
 
 namespace Lux.UI.Components.Compo.Warehouse
 {
@@ -33,7 +34,27 @@ namespace Lux.UI.Components.Compo.Warehouse
         private int totalCount = 0;
 
         #endregion Private Fields
+        private Enums.BuyOrderStates searchVal { get; set; } = Enums.BuyOrderStates.Created;
 
+        private Enums.BuyOrderStates SearchVal
+        {
+            get => searchVal;
+            set
+            {
+                if (searchVal != value)
+                {
+                    searchVal = value;
+                    UpdateTable();
+                }
+            }
+        }
+
+        private List<Enums.BuyOrderStates> OrderStateList
+        {
+            get => Enum.GetValues(typeof(Enums.BuyOrderStates))
+                               .Cast<Enums.BuyOrderStates>()
+                               .ToList();
+        }
 
         #region Private Methods
 
@@ -53,6 +74,7 @@ namespace Lux.UI.Components.Compo.Warehouse
         {
             // fix paginazione
             ListRecords = AllRecords
+                            .Where(x => x.OrderState.Equals(SearchVal))
                             .OrderBy(x => x.BuyOrderCode)
                             .Skip(numRecord * (currPage - 1))
                             .Take(numRecord)
diff --git a/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor
new file mode 100644
index 00000000..840406cc
--- /dev/null
+++ b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor
@@ -0,0 +1,25 @@
+<div class="col-2">
+    <div class="card shadow">
+        <div class="card-header">
+            <div class="d-flex justify-content-between">
+                <div class="px-0 fs-5" style="min-height:1.5em;">
+                    Generare ordini
+                </div>
+            </div>
+        </div>
+        <div class="card-body ">
+            <div class="row gy-2 px-1">
+                @foreach (var item in CurrSelDict)
+                {
+                    if (item.Value.Any())
+                    {
+                        <button class="btn bg-primary bg-gradient bg-opacity-50 w-100 d-flex justify-content-between align-items-center" @onclick="() => CreateBuyOrder(item)">
+                            <b class="fs-6">@item.Key</b>
+                            <span class="badge rounded-pill bg-dark">@item.Value.Count</span>
+                        </button>
+                    }
+                }
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.cs b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.cs
new file mode 100644
index 00000000..878e1ea9
--- /dev/null
+++ b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.cs
@@ -0,0 +1,19 @@
+using System.Security.Cryptography.Xml;
+using static Lux.UI.Components.Compo.Warehouse.MatReqGroup;
+
+namespace Lux.UI.Components.Compo.Warehouse
+{
+    public partial class MatReq2BuyOrder
+    {
+        [Parameter]
+        public Dictionary<string, List<int>> CurrSelDict { get; set; } = null!;
+
+        [Parameter]
+        public EventCallback<KeyValuePair<string, List<int>>> EC_CreateBuyOrder { get; set; }
+
+        private Task CreateBuyOrder(KeyValuePair<string, List<int>> ReqInfo)
+        {
+            return EC_CreateBuyOrder.InvokeAsync(ReqInfo);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Lux.UI/Components/Compo/Warehouse/MatReqGroup.razor b/Lux.UI/Components/Compo/Warehouse/MatReqGroup.razor
index bfdf6061..30fdf195 100644
--- a/Lux.UI/Components/Compo/Warehouse/MatReqGroup.razor
+++ b/Lux.UI/Components/Compo/Warehouse/MatReqGroup.razor
@@ -21,12 +21,12 @@ else
                     <thead>
                         <tr>
                             <td class="col-1">
-                                <div class="form-check form-switch">
+                                <div class="d-flex justify-content-center form-check form-switch">
                                     <input class="form-check-input" type="checkbox" role="switch" @onclick="ToggleAll" @bind="allSelected">
                                 </div>
                             </td>
-                            <th class="col-2 text-start">Gruppo</th>
-                            <th class="col-5 text-start">Articolo</th>
+                            @* <th class="col-2 text-start">Gruppo</th> *@
+                            <th class="col-7 text-start">Articolo</th>
                             <th class="col-3 text-start">Ord/Riga</th>
                             <th class="col-1 text-end">Qty</th>
                         </tr>
@@ -36,9 +36,21 @@ else
                         {
                             <tr>
                                 <td>
-                                    <div class="" @onclick="() => ToggleUid(item)"><i class="fa-solid fa-circle @IconCheckSel(item)"></i></div>
+                                    <div class="d-flex justify-content-center" @onclick="() => ToggleUid(item)">
+                                        @* <i class="fa-solid fa-circle @IconCheckSel(item)"></i> *@
+                                        @if (ListSelected.Contains(item.MatReqID))
+                                        {
+                                            <div class="">
+                                                <i class="fa-solid fa-square-check text-secondary opacity-50 fa-lg"></i>
+                                            </div>
+                                        }
+                                        else
+                                        {
+                                            <i class="fa-solid fa-square text-secondary opacity-25"></i>
+                                        }
+                                    </div>
                                 </td>
-                                <td>@item.CodGroup</td>
+                                @* <td>@item.CodGroup</td> *@
                                 <td>
                                     <div>@item.ItemCode</div>
                                     <div class="small">
diff --git a/Lux.UI/Components/Compo/Warehouse/MatReqList.razor b/Lux.UI/Components/Compo/Warehouse/MatReqList.razor
index e066ef78..9f5ef4ab 100644
--- a/Lux.UI/Components/Compo/Warehouse/MatReqList.razor
+++ b/Lux.UI/Components/Compo/Warehouse/MatReqList.razor
@@ -5,7 +5,15 @@
                 Fabbisogni Attivi
             </div>
             <div class="px-0">
-                filtro ordine/riga
+                <div class="px-0 d-flex justify-content-between">
+                    <div class="px-1">
+                        <div class="input-group input-group-sm" title="ricerca">
+                            <span class="input-group-text"><i class="fas fa-search"></i></span>
+                            <input type="text" class="form-control" placeholder="Num ordine/riga ordine" @bind="@SearchVal">
+                            <button class="btn @btnResetCss" @onclick="ResetSearch"><i class="fas fa-ban"></i></button>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/Lux.UI/Components/Compo/Warehouse/MatReqList.razor.cs b/Lux.UI/Components/Compo/Warehouse/MatReqList.razor.cs
index 8f7aa226..f888fda8 100644
--- a/Lux.UI/Components/Compo/Warehouse/MatReqList.razor.cs
+++ b/Lux.UI/Components/Compo/Warehouse/MatReqList.razor.cs
@@ -32,6 +32,25 @@ namespace Lux.UI.Components.Compo.Warehouse
 
         #endregion Private Fields
 
+        private string searchVal { get; set; } = string.Empty;
+
+        private string SearchVal
+        {
+            get => searchVal;
+            set
+            {
+                if (searchVal != value)
+                {
+                    searchVal = value;
+                    UpdateDetail();
+                }
+            }
+        }
+        private string btnResetCss
+        {
+            get => string.IsNullOrEmpty(searchVal) ? "btn-outline-secondary" : "btn-primary";
+        }
+
         #region Private Methods
 
         private Task ReportUpdate(GrpSelect currData)
@@ -39,7 +58,14 @@ namespace Lux.UI.Components.Compo.Warehouse
             // sistemo il dizionario selezioni
             if (SelectDict.ContainsKey(currData.GroupName))
             {
-                SelectDict[currData.GroupName] = currData.ListItemIds;
+                if(currData.ListItemIds.Count > 0)
+                {
+                    SelectDict[currData.GroupName] = currData.ListItemIds;
+                }
+                else
+                {
+                    SelectDict.Remove(currData.GroupName);
+                }
             }
             else
             {
@@ -50,10 +76,33 @@ namespace Lux.UI.Components.Compo.Warehouse
 
         private void UpdateDetail()
         {
-            // calcolo dati derivati
-            GroupDict = AllRecords
-                            .GroupBy(x => x.CodGroup)
-                            .ToDictionary(g => g.Key, g => g.ToList());
+            if (string.IsNullOrEmpty(SearchVal))
+            {
+                // calcolo dati derivati
+                GroupDict = AllRecords
+                                    .GroupBy(x => x.CodGroup)
+                                    .ToDictionary(g => g.Key, g => g.ToList());
+            }
+            else if(SearchVal.StartsWith("POR"))
+            {
+                // calcolo dati derivati
+                GroupDict = AllRecords
+                                    .Where(x => x.OrderRowNav!.OrderRowCode.Equals(SearchVal, StringComparison.InvariantCultureIgnoreCase))
+                                    .GroupBy(x => x.CodGroup)
+                                    .ToDictionary(g => g.Key, g => g.ToList());
+            }
+            else if (SearchVal.StartsWith("PO"))
+            {
+                // calcolo dati derivati
+                GroupDict = AllRecords
+                                    .Where(x => x.OrderNav!.OrderCode.Equals(SearchVal, StringComparison.InvariantCultureIgnoreCase))
+                                    .GroupBy(x => x.CodGroup)
+                                    .ToDictionary(g => g.Key, g => g.ToList());
+            }
+        }
+        private void ResetSearch()
+        {
+            SearchVal = "";
         }
 
         #endregion Private Methods
diff --git a/Lux.UI/Components/Pages/BuyOrder.razor b/Lux.UI/Components/Pages/BuyOrder.razor
index 50e2c391..87a4e516 100644
--- a/Lux.UI/Components/Pages/BuyOrder.razor
+++ b/Lux.UI/Components/Pages/BuyOrder.razor
@@ -16,7 +16,7 @@
     </div>
     <div class="card-body">
         <div class="row">
-            <div class="col-6">
+            <div class="@DimensionColCss()">
                 @if (isProcessing)
                 {
                     <LoadingData DisplayMode="LoadingData.SpinMode.BounceLine"></LoadingData>
@@ -26,24 +26,17 @@
                     <MatReqList AllRecords="@MatReqAllRecords" EC_Updated="RecordUpdate"></MatReqList>
                 }
             </div>
-            <div class="col-6">
-                @if (CurrSelDict.Count > 0)
-                {
-                    foreach (var item in CurrSelDict)
-                    {
-                        if (item.Value.Any())
-                        {
-                            <button class="btn btn-lg btn-primary" @onclick="() => CreateBuyOrder(item)">@item.Key (@item.Value.Count)</button>
-                        }
-                    }
-                }
+            @if (CurrSelDict.Count > 0)
+            {
+                <MatReq2BuyOrder CurrSelDict="CurrSelDict" EC_CreateBuyOrder="CreateBuyOrder"></MatReq2BuyOrder>
+            }
+            <div class="@DimensionColCss()">
                 @if (isProcessing)
                 {
                     <LoadingData DisplayMode="LoadingData.SpinMode.BounceLine"></LoadingData>
                 }
                 else
                 {
-
                     <BuyOrderList AllRecords="@BuyOrdAllRecords"></BuyOrderList>
                 }
             </div>
diff --git a/Lux.UI/Components/Pages/BuyOrder.razor.cs b/Lux.UI/Components/Pages/BuyOrder.razor.cs
index 307444be..c777e465 100644
--- a/Lux.UI/Components/Pages/BuyOrder.razor.cs
+++ b/Lux.UI/Components/Pages/BuyOrder.razor.cs
@@ -74,6 +74,11 @@ namespace Lux.UI.Components.Pages
             isProcessing = false;
         }
 
+        private string DimensionColCss()
+        {
+            return CurrSelDict.Count > 0 ? "col-5" : "col-6";
+        }
+
         #endregion Private Methods
     }
 }
\ No newline at end of file
diff --git a/Lux.UI/Components/Pages/Offers.razor b/Lux.UI/Components/Pages/Offers.razor
index 47369fe2..aaa3fb91 100644
--- a/Lux.UI/Components/Pages/Offers.razor
+++ b/Lux.UI/Components/Pages/Offers.razor
@@ -106,28 +106,29 @@ else
                     <b>Offerte</b> <button class="btn btn-success" @onclick="DoAdd"><i class="fa-solid fa-cart-plus"></i> Nuova</button>
                 </div>
                 <div class="px-0">
-                    <div class="d-flex">
-                        <div class="px-1">
+                    <div class="d-flex align-items-center">
+                        <div class="px-2">
                             <div class="input-group input-group-sm">
                                 @* <span class="input-group-text">Stato</span> *@
-                                <div class="form-control ">
-                                    <div class="form-check form-switch align-content-center">
-                                        <input class="form-check-input" type="checkbox" @bind="@AllStates">
-                                            <label class="form-check-label">@txtState</label>
-                                        </div>
-                                    </div>
-                                    <input type="text" class="form-control" placeholder="ctrl-/" accesskey="/">
-                                    <button class="btn btn-outline-secondary" type="button"><i class="fa-solid fa-rotate-right"></i></button>
+                                <div class="form-check form-switch align-items-center">
+                                    <input class="form-check-input" type="checkbox" @bind="@AllStates">
+                                        <label class="form-check-label">@txtState</label>
                                 </div>
                             </div>
-                            <div class="px-1">
-                                <PeriodoSel E_PeriodoSel="SetPeriodo" CurrPeriodo="PeriodoSel"></PeriodoSel>
+                        </div>
+                        <div class="px-1">
+                            <div class="input-group input-group-sm">
+                                <input type="text" class="form-control" placeholder="ctrl-/" accesskey="/">
+                                <button class="btn btn-outline-secondary" type="button"><i class="fa-solid fa-rotate-right"></i></button>
                             </div>
                         </div>
+                        <div class="px-1">
+                            <PeriodoSel E_PeriodoSel="SetPeriodo" CurrPeriodo="PeriodoSel"></PeriodoSel>
+                        </div>
                     </div>
-                </div>
-
+                 </div>
             </div>
+        </div>
             <div class="card-body">
                 @if (isLoading)
                 {
diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj
index 3fb92ed7..d4e71e43 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.2604.2210</Version>
+        <Version>1.1.2604.2310</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 84255234..21945449 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>LUX - Web Windows MES</i>
-    <h4>Versione: 1.1.2604.2214</h4>
+    <h4>Versione: 1.1.2604.2310</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 4218622b..d0f208bd 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2604.2214
+1.1.2604.2310
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index f50b6fb3..a15f0302 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.1.2604.2214</version>
+  <version>1.1.2604.2310</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>