From 94adab451a20ecb646ab14d2472253fcb179f34c Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 2 Mar 2023 16:05:34 +0100
Subject: [PATCH 1/4] fix parziale gestione filtro items

---
 Resources/ChangeLog.html                     |  2 +-
 Resources/VersNum.txt                        |  2 +-
 Resources/manifest.xml                       |  2 +-
 StockMan.CORE/Components/ItemFilter.razor    |  3 ++
 StockMan.CORE/Components/ItemFilter.razor.cs | 30 ++++++++++++++++++++
 StockMan.CORE/Components/ItemList.razor.cs   | 22 ++------------
 StockMan.CORE/Pages/AnagraficaArticoli.razor |  1 +
 StockMan.CORE/StockMan.CORE.csproj           |  2 +-
 8 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 StockMan.CORE/Components/ItemFilter.razor
 create mode 100644 StockMan.CORE/Components/ItemFilter.razor.cs
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 89dda1a..b24e4af 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>StockMan CORE - Gestione Magazzino</i>
-    <h4>Versione: 3.0.2303.215</h4>
+    <h4>Versione: 3.0.2303.216</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index d6821d4..57dd715 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-3.0.2303.215
+3.0.2303.216
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 7006e4a..70dad20 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>3.0.2303.215</version>
+  <version>3.0.2303.216</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>
diff --git a/StockMan.CORE/Components/ItemFilter.razor b/StockMan.CORE/Components/ItemFilter.razor
new file mode 100644
index 0000000..4ebe425
--- /dev/null
+++ b/StockMan.CORE/Components/ItemFilter.razor
@@ -0,0 +1,3 @@
+﻿<h3>ItemFilter</h3>
+
+
diff --git a/StockMan.CORE/Components/ItemFilter.razor.cs b/StockMan.CORE/Components/ItemFilter.razor.cs
new file mode 100644
index 0000000..fb0fbc6
--- /dev/null
+++ b/StockMan.CORE/Components/ItemFilter.razor.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using System.Net.Http;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.Web.Virtualization;
+using Microsoft.JSInterop;
+using EgwCoreLib.Razor;
+using EgwCoreLib.Razor.Data;
+using StockMan.CORE;
+using StockMan.CORE.Data;
+using StockMan.CORE.Shared;
+using StockMan.Data.DbModels;
+using StockMan.Data;
+
+namespace StockMan.CORE.Components
+{
+    public partial class ItemFilter
+    {
+
+        [Parameter]
+        public EventCallback<SelectDocExp> FilterUpdated { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/StockMan.CORE/Components/ItemList.razor.cs b/StockMan.CORE/Components/ItemList.razor.cs
index 0c27f4f..c473188 100644
--- a/StockMan.CORE/Components/ItemList.razor.cs
+++ b/StockMan.CORE/Components/ItemList.razor.cs
@@ -10,10 +10,6 @@ namespace StockMan.CORE.Components
     {
         #region Public Properties
 
-        //[Parameter]
-        //public int NumRecord { get; set; } = 10;
-        //[Parameter]
-        //public int CurrPage { get; set; } = 1;
         [Parameter]
         public ItemSelectFilter actFilter { get; set; } = new ItemSelectFilter();
 
@@ -167,13 +163,8 @@ namespace StockMan.CORE.Components
             set
             {
                 _searchFamily = value;
-
-                var pUpd = Task.Run(async () =>
-                {
-                    await Task.Delay(1);
-                    await ReloadData();
-                });
-                pUpd.Wait();
+                currPage = 1;
+                StateHasChanged();
             }
         }
 
@@ -185,16 +176,10 @@ namespace StockMan.CORE.Components
                 _searchVal = value;
                 currPage = 1;
                 StateHasChanged();
-
-                var pUpd = Task.Run(async () =>
-                {
-                    await Task.Delay(1);
-                    await ReloadData();
-                });
-                pUpd.Wait();
             }
         }
 
+
         protected string uM
         {
             get => _uM;
@@ -264,7 +249,6 @@ namespace StockMan.CORE.Components
 
         protected override async Task OnParametersSetAsync()
         {
-            //lastFilter = actFilter.clone();
             await ReloadData();
         }
 
diff --git a/StockMan.CORE/Pages/AnagraficaArticoli.razor b/StockMan.CORE/Pages/AnagraficaArticoli.razor
index f4648b1..1427cc6 100644
--- a/StockMan.CORE/Pages/AnagraficaArticoli.razor
+++ b/StockMan.CORE/Pages/AnagraficaArticoli.razor
@@ -3,6 +3,7 @@
 
 <div class="ps-2 pe-1">
     <div>
+        <ItemFilter></ItemFilter>
         <ItemList updateRecordCount="UpdateTotCount" actFilter="@currFilter"></ItemList>
     </div>
     <div>
diff --git a/StockMan.CORE/StockMan.CORE.csproj b/StockMan.CORE/StockMan.CORE.csproj
index cdd226f..9264e93 100644
--- a/StockMan.CORE/StockMan.CORE.csproj
+++ b/StockMan.CORE/StockMan.CORE.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-		<Version>3.0.2303.215</Version>
+		<Version>3.0.2303.216</Version>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>

From 192a7953a7c3f43f59b928c145aab1c60b31d0d1 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 2 Mar 2023 18:00:28 +0100
Subject: [PATCH 2/4] fix item list filters

---
 Resources/ChangeLog.html                      |   2 +-
 Resources/VersNum.txt                         |   2 +-
 Resources/manifest.xml                        |   2 +-
 StockMan.CORE/Components/ItemFilter.razor     |  22 +-
 StockMan.CORE/Components/ItemFilter.razor.cs  |  57 ++--
 StockMan.CORE/Components/ItemList.razor       | 289 +++++++++---------
 StockMan.CORE/Components/ItemList.razor.cs    |  54 ++--
 StockMan.CORE/Components/Location.razor       |   4 +-
 StockMan.CORE/Components/Location.razor.cs    |  34 ++-
 .../Components/LocationFilters.razor          |  13 +
 .../Components/LocationFilters.razor.cs       | 124 ++++++++
 .../Components/ValStockGiac.razor.cs          |   4 +-
 StockMan.CORE/Data/ItemSelectFilter.cs        |   2 +
 StockMan.CORE/Data/LocDXSelectFilter.cs       |   6 +-
 StockMan.CORE/Data/LocSXSelectFilter.cs       |   6 +
 StockMan.CORE/Pages/AnagraficaArticoli.razor  |  15 +-
 .../Pages/AnagraficaArticoli.razor.cs         |  23 +-
 StockMan.CORE/Pages/StatoMag.razor            |   4 +
 StockMan.CORE/Pages/StatoMag.razor.cs         |  36 ++-
 StockMan.CORE/StockMan.CORE.csproj            |   2 +-
 20 files changed, 483 insertions(+), 218 deletions(-)
 create mode 100644 StockMan.CORE/Components/LocationFilters.razor
 create mode 100644 StockMan.CORE/Components/LocationFilters.razor.cs

diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index b24e4af..7d8352b 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>StockMan CORE - Gestione Magazzino</i>
-    <h4>Versione: 3.0.2303.216</h4>
+    <h4>Versione: 3.0.2303.217</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 57dd715..7328df5 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-3.0.2303.216
+3.0.2303.217
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 70dad20..3843b55 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>3.0.2303.216</version>
+  <version>3.0.2303.217</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>
diff --git a/StockMan.CORE/Components/ItemFilter.razor b/StockMan.CORE/Components/ItemFilter.razor
index 4ebe425..8655ca2 100644
--- a/StockMan.CORE/Components/ItemFilter.razor
+++ b/StockMan.CORE/Components/ItemFilter.razor
@@ -1,3 +1,23 @@
-﻿<h3>ItemFilter</h3>
+﻿<div class="row">
+    <div class="w-50 d-flex row pb-1 col">
+        <div class="form-floating col ps-1">
+            <select id="fam" @bind="searchFamily" class="form-select">
+                <option value="*">--TUTTI--</option>
+                @if (itemFamList != null)
+                {
+                    @foreach (var item in itemFamList)
+                    {
+                        <option value="@item.Id">@item.Descr</option>
+                    }
+                }
+            </select>
+            <label for="fam">Famiglia articoli</label>
+        </div>
+        <div class="form-floating col ps-1">
+            <input id="search" @bind="searchVal" class="form-control" />
+            <label for="search">Search</label>
+        </div>
+    </div>
+</div>
 
 
diff --git a/StockMan.CORE/Components/ItemFilter.razor.cs b/StockMan.CORE/Components/ItemFilter.razor.cs
index fb0fbc6..6768717 100644
--- a/StockMan.CORE/Components/ItemFilter.razor.cs
+++ b/StockMan.CORE/Components/ItemFilter.razor.cs
@@ -1,30 +1,49 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using System.Net.Http;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.Components.Web.Virtualization;
-using Microsoft.JSInterop;
-using EgwCoreLib.Razor;
-using EgwCoreLib.Razor.Data;
-using StockMan.CORE;
 using StockMan.CORE.Data;
-using StockMan.CORE.Shared;
 using StockMan.Data.DbModels;
-using StockMan.Data;
 
 namespace StockMan.CORE.Components
 {
     public partial class ItemFilter
     {
-
         [Parameter]
-        public EventCallback<SelectDocExp> FilterUpdated { get; set; }
+        public EventCallback<ItemSelectFilter> FilterUpdated { get; set; }
+        [Parameter]
+        public ItemSelectFilter actFilter { get; set; } = new ItemSelectFilter();
+        public List<ItemFamilyModel>? itemFamList { get; set; } = null;
+        [Inject]
+        protected StockDataService SDService { get; set; } = null!;
+        protected override async Task OnParametersSetAsync()
+        {
+            itemFamList = await SDService.ItemFamilyGetAll();
+        }
+
+        private string searchVal
+        {
+            get => actFilter.searchValue;
+            set
+            {
+                actFilter.CurrPage = 1;
+                actFilter.searchValue = value;
+                StateHasChanged();
+                ReportChange();
+            }
+        }
+        private string searchFamily
+        {
+            get => actFilter.itemFamily;
+            set
+            {
+                actFilter.CurrPage = 1;
+                actFilter.itemFamily = value;
+                StateHasChanged();
+                ReportChange();
+            }
+        }
+        private void ReportChange()
+        {
+            FilterUpdated.InvokeAsync(actFilter);
+        }
+
     }
 }
\ No newline at end of file
diff --git a/StockMan.CORE/Components/ItemList.razor b/StockMan.CORE/Components/ItemList.razor
index 92d8ca5..6cd54f2 100644
--- a/StockMan.CORE/Components/ItemList.razor
+++ b/StockMan.CORE/Components/ItemList.razor
@@ -8,165 +8,162 @@ else if (ListRecord == null || ListRecord.Count == 0)
 }
 else
 {
-    <div class="card">
-        <div class="card-header">
-            <div class="row">
-                <div class="w-50 d-flex row pb-1 col">
-                    <div class="form-floating col ps-1">
-                        <select id="fam" @bind="searchFamily" class="form-select">
-                            <option value="*">--TUTTI--</option>
-                            @if (itemFamList != null)
-                            {
-                                @foreach (var item in itemFamList)
-                                {
-                                    <option value="@item.Id">@item.Descr</option>
-                                }
-                            }
-                        </select>
-                        <label for="fam">Famiglia articoli</label>
-                    </div>
-                    <div class="form-floating col ps-1">
-                        <input id="search" @bind="searchVal" class="form-control" />
-                        <label for="search">Search</label>
-                    </div>
-                </div>
-                <div class="col text-end pe-4">
-                    <button data-bs-toggle="modal" data-bs-target="#modalNewFam" class="btn btn-success" title="Aggiungere nuovo articolo"><i class="fa-solid fa-plus"></i> Aggiungi nuovo articolo</button>
-                </div>
-                @*<button data-bs-toggle="modal" data-bs-target="#modalNewFam" class="h-50 mt-4 btnAccept"><i class="fa-solid fa-plus"></i></button>*@
+    @*<div class="row">
+        <div class="w-50 d-flex row pb-1 col">
+        <div class="form-floating col ps-1">
+        <select id="fam" @bind="searchFamily" class="form-select">
+        <option value="*">--TUTTI--</option>
+        @if (itemFamList != null)
+        {
+        @foreach (var item in itemFamList)
+        {
+        <option value="@item.Id">@item.Descr</option>
+        }
+        }
+        </select>
+        <label for="fam">Famiglia articoli</label>
+        </div>
+        <div class="form-floating col ps-1">
+        <input id="search" @bind="searchVal" class="form-control" />
+        <label for="search">Search</label>
+        </div>
+        </div>
+        <div class="col text-end pe-4">
+        <button data-bs-toggle="modal" data-bs-target="#modalNewFam" class="btn btn-success" title="Aggiungere nuovo articolo"><i class="fa-solid fa-plus"></i> Aggiungi nuovo articolo</button>
+        </div>
+        @*
             </div>
-        </div>
-        <div class="card-body">
-            <table class="table table-striped table-bordered">
-                <thead>
-                    <tr class="small row col-12">
-                        <th class="col-1">
-                        </th>
+        </div>*@
+    <div class="card-body">
+        <table class="table table-striped table-bordered">
+            <thead>
+                <tr class="small row col-12">
+                    <th class="col-1">
+                    </th>
 
-                        <th class="col-3">
+                    <th class="col-3">
+                        <div class="row">
+                            <div class="d-flex text-center" @onclick="()=>orderByCodInt()">
+                                COD. ARTICOLO
+                                @if (orderType == orderTypeEnum.codIntAscending)
+                                {
+                                    <i class="fa-solid fa-sort-up text-primary mx-2"></i>
+                                }
+                                else if (orderType == orderTypeEnum.codIntDescending)
+                                {
+                                    <i class="fa-solid fa-sort-down text-primary mx-2"></i>
+                                }
+                                else
+                                {
+                                    <i class="fa-solid fa-sort text-primary mx-2"></i>
+                                }
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="d-flex text-secondary fst-italic text-center" @onclick="()=>orderByCodForn()">
+                                COD. FORNITORE
+                                @if (orderType == orderTypeEnum.codExtAscending)
+                                {
+                                    <i class="fa-solid fa-sort-up text-primary mx-2"></i>
+                                }
+                                else if (orderType == orderTypeEnum.codExtDescending)
+                                {
+                                    <i class="fa-solid fa-sort-down text-primary mx-2"></i>
+                                }
+                                else
+                                {
+                                    <i class="fa-solid fa-sort text-primary mx-2"></i>
+                                }
+                            </div>
+                        </div>
+                    </th>
+                    <th class="col-4">
+                        <div class="row">
+                            <div>
+                                DESC. ARTICOLO
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="text-secondary fst-italic">
+                                DESC. FORNITORE
+                            </div>
+                        </div>
+                    </th>
+                    <th @onclick="()=>orderByStock()" class="col-1">
+                        STOCK
+                        @if (orderType == orderTypeEnum.stockAscending)
+                        {
+                            <i class="fa-solid fa-sort-down text-primary"></i>
+                        }
+                        else if (orderType == orderTypeEnum.stockDescending)
+                        {
+                            <i class="fa-solid fa-sort-up text-primary"></i>
+                        }
+                        else
+                        {
+                            <i class="fa-solid fa-sort text-primary"></i>
+                        }
+                    </th>
+                    <th class="col-1">
+                        VALORE UNIT.
+                    </th>
+                    <th class="col-1">
+                        VALORE TOT.
+                    </th>
+                    <th class="col-1">
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (var item in ListRecord)
+                {
+                    <tr class="small row col-12">
+                        <td class="text-center col-1">
+                            <button class="btnDet" @onclick="()=>selItemToDet(item.Id)" title=@($"Mostra dettagli oggetto {item.CodInt}")><i class="fa-solid fa-magnifying-glass"></i></button>
+                        </td>
+                        <td class="col-3" style="font-size: 14px;">
+                            @item.CodInt
+                            <div class="small text-secondary fst-italic">
+                                @item.CodExt
+                            </div>
+                        </td>
+                        <td class="small col-4">
                             <div class="row">
-                                <div class="d-flex text-center" @onclick="()=>orderByCodInt()">
-                                    COD. ARTICOLO
-                                    @if (orderType == orderTypeEnum.codIntAscending)
-                                    {
-                                        <i class="fa-solid fa-sort-up text-primary mx-2"></i>
-                                    }
-                                    else if (orderType == orderTypeEnum.codIntDescending)
-                                    {
-                                        <i class="fa-solid fa-sort-down text-primary mx-2"></i>
-                                    }
-                                    else
-                                    {
-                                        <i class="fa-solid fa-sort text-primary mx-2"></i>
-                                    }
-                                </div>
+                                <span class="d-inline-block text-truncate" style="max-width: 100%;" title="@item.Descr">
+                                    @item.Descr
+                                </span>
                             </div>
                             <div class="row">
-                                <div class="d-flex text-secondary fst-italic text-center" @onclick="()=>orderByCodForn()">
-                                    COD. FORNITORE
-                                    @if (orderType == orderTypeEnum.codExtAscending)
-                                    {
-                                        <i class="fa-solid fa-sort-up text-primary mx-2"></i>
-                                    }
-                                    else if (orderType == orderTypeEnum.codExtDescending)
-                                    {
-                                        <i class="fa-solid fa-sort-down text-primary mx-2"></i>
-                                    }
-                                    else
-                                    {
-                                        <i class="fa-solid fa-sort text-primary mx-2"></i>
-                                    }
-                                </div>
+                                <span class="d-inline-block text-truncate text-secondary fst-italic" style="max-width: 100%;" title="@item.DescrExt">
+                                    @item.DescrExt
+                                </span>
                             </div>
-                        </th>
-                        <th class="col-4">
-                            <div class="row">
-                                <div>
-                                    DESC. ARTICOLO
-                                </div>
+                        </td>
+                        <td class="text-center col-1">
+                            <div>
+                                @item.QtaBatch
                             </div>
-                            <div class="row">
-                                <div class="text-secondary fst-italic">
-                                    DESC. FORNITORE
-                                </div>
-                            </div>
-                        </th>
-                        <th @onclick="()=>orderByStock()" class="col-1">
-                            STOCK
-                            @if (orderType == orderTypeEnum.stockAscending)
-                            {
-                                <i class="fa-solid fa-sort-down text-primary"></i>
-                            }
-                            else if (orderType == orderTypeEnum.stockDescending)
-                            {
-                                <i class="fa-solid fa-sort-up text-primary"></i>
-                            }
-                            else
-                            {
-                                <i class="fa-solid fa-sort text-primary"></i>
-                            }
-                        </th>
-                        <th class="col-1">
-                            VALORE UNIT.
-                        </th>
-                        <th class="col-1">
-                            VALORE TOT.
-                        </th>
-                        <th class="col-1">
-                        </th>
+                        </td>
+                        <td class="small text-center col-1">
+                            @($"{item.CurrValue:C2}")
+                        </td>
+                        <td class="small text-center col-1">
+                            @($"{(item.CurrValue * item.QtaBatch):C2}")
+                        </td>
+                        <td class="text-center col-1">
+                            <button class="btnDup" data-bs-toggle="modal" data-bs-target="#modalNewItem" @onclick="()=>dupItem(item)" title=@($"Duplica oggetto {item.CodInt}")><i class="fa-solid fa-copy"></i></button>
+                        </td>
                     </tr>
-                </thead>
-                <tbody>
-                    @foreach (var item in ListRecord)
-                    {
-                        <tr class="small row col-12">
-                            <td class="text-center col-1">
-                                <button class="btnDet" @onclick="()=>selItemToDet(item.Id)" title=@($"Mostra dettagli oggetto {item.CodInt}")><i class="fa-solid fa-magnifying-glass"></i></button>
-                            </td>
-                            <td class="col-3" style="font-size: 14px;">
-                                @item.CodInt
-                                <div class="small text-secondary fst-italic">
-                                    @item.CodExt
-                                </div>
-                            </td>
-                            <td class="small col-4">
-                                <div class="row">
-                                    <span class="d-inline-block text-truncate" style="max-width: 100%;" title="@item.Descr">
-                                        @item.Descr
-                                    </span>
-                                </div>
-                                <div class="row">
-                                    <span class="d-inline-block text-truncate text-secondary fst-italic" style="max-width: 100%;" title="@item.DescrExt">
-                                        @item.DescrExt
-                                    </span>
-                                </div>
-                            </td>
-                            <td class="text-center col-1">
-                                <div>
-                                    @item.QtaBatch
-                                </div>
-                            </td>
-                            <td class="small text-center col-1">
-                                @($"{item.CurrValue:C2}")
-                            </td>
-                            <td class="small text-center col-1">
-                                @($"{(item.CurrValue * item.QtaBatch):C2}")
-                            </td>
-                            <td class="text-center col-1">
-                                <button class="btnDup" data-bs-toggle="modal" data-bs-target="#modalNewFam" @onclick="()=>dupItem(item)" title=@($"Duplica oggetto {item.CodInt}")><i class="fa-solid fa-copy"></i></button>
-                            </td>
-                        </tr>
-                    }
-                </tbody>
-            </table>
-        </div>
+                }
+            </tbody>
+        </table>
     </div>
     <!-- Modal -->
-    <div class="modal fade" id="modalNewFam" tabindex="-1" aria-hidden="true">
+    <div class="modal fade" id="modalNewItem" tabindex="-1" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h1 class="modal-title fs-5" id="modalNewFamLabel">Aggiungere nuovo articolo</h1>
+                    <h1 class="modal-title fs-5" id="modalNewItemLabel">Aggiungere nuovo articolo</h1>
                     <button type="button" class="btn-close" aria-label="Close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body">
diff --git a/StockMan.CORE/Components/ItemList.razor.cs b/StockMan.CORE/Components/ItemList.razor.cs
index c473188..aecd679 100644
--- a/StockMan.CORE/Components/ItemList.razor.cs
+++ b/StockMan.CORE/Components/ItemList.razor.cs
@@ -157,28 +157,27 @@ namespace StockMan.CORE.Components
         [Inject]
         protected StockDataService SDService { get; set; } = null!;
 
-        protected string searchFamily
-        {
-            get => _searchFamily;
-            set
-            {
-                _searchFamily = value;
-                currPage = 1;
-                StateHasChanged();
-            }
-        }
-
-        protected string searchVal
-        {
-            get => _searchVal;
-            set
-            {
-                _searchVal = value;
-                currPage = 1;
-                StateHasChanged();
-            }
-        }
+        //protected string searchFamily
+        //{
+        //    get => _searchFamily;
+        //    set
+        //    {
+        //        _searchFamily = value;
+        //        currPage = 1;
+        //        StateHasChanged();
+        //    }
+        //}
 
+        //protected string searchVal
+        //{
+        //    get => _searchVal;
+        //    set
+        //    {
+        //        _searchVal = value;
+        //        currPage = 1;
+        //        StateHasChanged();
+        //    }
+        //}
 
         protected string uM
         {
@@ -314,6 +313,16 @@ namespace StockMan.CORE.Components
             get => actFilter.NumRec;
             set => actFilter.NumRec = value;
         }
+        private string searchVal
+        {
+            get => actFilter.searchValue;
+            set => actFilter.searchValue = value;
+        }
+        private string searchFamily
+        {
+            get => actFilter.itemFamily;
+            set => actFilter.itemFamily = value;
+        }
 
         private int totalCount
         {
@@ -328,6 +337,7 @@ namespace StockMan.CORE.Components
             }
         }
 
+
         #endregion Private Properties
 
         #region Private Methods
@@ -369,7 +379,7 @@ namespace StockMan.CORE.Components
                 SearchRecords = SearchRecords.OrderByDescending(x => x.CodInt).ToList();
             }
             ListRecord = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
-            itemFamList = await SDService.ItemFamilyGetAll();
+            //itemFamList = await SDService.ItemFamilyGetAll();
             await Task.Delay(1);
             await InvokeAsync(() => StateHasChanged());
             isLoading = false;
diff --git a/StockMan.CORE/Components/Location.razor b/StockMan.CORE/Components/Location.razor
index 23742c5..22a982c 100644
--- a/StockMan.CORE/Components/Location.razor
+++ b/StockMan.CORE/Components/Location.razor
@@ -9,7 +9,7 @@ else
             <div class="py-2">
                 @locSxoDx
             </div>
-            <div>
+            @*<div>
                 <select class="form-select" @bind="@id">
                     <option value="">--Selezionare una locazione--</option>
                     @if (ListLocationByType != null)
@@ -21,7 +21,7 @@ else
                         }
                     }
                 </select>
-            </div>
+            </div>*@
         </div>
         <div class="card-body">
             @if (currStock != null)
diff --git a/StockMan.CORE/Components/Location.razor.cs b/StockMan.CORE/Components/Location.razor.cs
index bfd1528..d9f4b55 100644
--- a/StockMan.CORE/Components/Location.razor.cs
+++ b/StockMan.CORE/Components/Location.razor.cs
@@ -107,25 +107,27 @@ namespace StockMan.CORE.Components
 
         protected string id
         {
-            get => currLoc;
+            get
+            {
+                if (isSX)
+                {
+                    return actFilterSX.idSx;
+                }
+                else
+                {
+                    return actFilterDX.idDx;
+                }
+            }
             set
             {
-                currLoc = value;
-                var pUpd = Task.Run(async () =>
+                if (isSX)
                 {
-                    await Task.Delay(1);
-
-                    if (isSX)
-                    {
-                        await setLocationSX(value);
-                    }
-                    else
-                    {
-                        await setLocationDX(value);
-                    }
-                    await ReloadData();
-                });
-                pUpd.Wait();
+                    actFilterSX.idSx = value;
+                }
+                else
+                {
+                    actFilterDX.idDx = value;
+                }
             }
         }
 
diff --git a/StockMan.CORE/Components/LocationFilters.razor b/StockMan.CORE/Components/LocationFilters.razor
new file mode 100644
index 0000000..4ac965f
--- /dev/null
+++ b/StockMan.CORE/Components/LocationFilters.razor
@@ -0,0 +1,13 @@
+﻿<div>
+    <select class="form-select" @bind="@LocationId">
+        <option value="">--Selezionare una locazione--</option>
+        @if (ListLocationByType != null)
+        {
+
+            @foreach (var item in ListLocationByType)
+            {
+                <option value="@item.Id">@item.Descr</option>
+            }
+        }
+    </select>
+</div>
\ No newline at end of file
diff --git a/StockMan.CORE/Components/LocationFilters.razor.cs b/StockMan.CORE/Components/LocationFilters.razor.cs
new file mode 100644
index 0000000..eaf092a
--- /dev/null
+++ b/StockMan.CORE/Components/LocationFilters.razor.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using System.Net.Http;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.Web.Virtualization;
+using Microsoft.JSInterop;
+using EgwCoreLib.Razor;
+using EgwCoreLib.Razor.Data;
+using StockMan.CORE;
+using StockMan.CORE.Data;
+using StockMan.CORE.Shared;
+using StockMan.Data.DbModels;
+using StockMan.Data;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Newtonsoft.Json.Linq;
+
+namespace StockMan.CORE.Components
+{
+    public partial class LocationFilters
+    {
+        [Parameter]
+        public List<LocationModel>? ListLocationByType { get; set; } = null;
+        [Parameter]
+        public bool isSX { get; set; }
+        [Parameter]
+        public bool isChanged { get; set; }
+        [Parameter]
+        public LocSXSelectFilter actFilterSX { get; set; } = new LocSXSelectFilter();
+        [Parameter]
+        public LocDXSelectFilter actFilterDX { get; set; } = new LocDXSelectFilter();
+        [Parameter]
+        public EventCallback<string> LocId_DX { get; set; }
+        [Parameter]
+        public EventCallback<string> LocId_SX { get; set; }
+        [Parameter]
+        public EventCallback<LocSXSelectFilter> FilterUpdatedSX { get; set; }
+        [Parameter]
+        public EventCallback<LocDXSelectFilter> FilterUpdatedDX { get; set; }
+        protected string LocationId
+        {
+            get
+            {
+                if (isSX && !isChanged)
+                {
+                    return actFilterSX.idSx;
+                }
+                else if (isSX && isChanged)
+                {
+                    return actFilterDX.idDx;
+                }
+                else if (!isSX && !isChanged)
+                {
+                    return actFilterDX.idDx;
+                }
+                else
+                {
+                    return actFilterSX.idSx;
+                }
+            }
+            set
+            {
+                if (isSX && !isChanged)
+                {
+                    actFilterSX.idSx = value;
+                    StateHasChanged();
+                    ReportChangeSX();
+                }
+                else if (isSX && isChanged)
+                {
+                    actFilterDX.idDx = value;
+                    StateHasChanged();
+                    ReportChangeDX();
+                }
+                else if (!isSX && !isChanged)
+                {
+                    actFilterDX.idDx = value;
+                    StateHasChanged();
+                    ReportChangeDX();
+                }
+                else
+                {
+                    actFilterSX.idSx = value;
+                    StateHasChanged();
+                    ReportChangeSX();
+                }
+            }
+        }
+        protected override async Task OnParametersSetAsync()
+        {
+            await Task.Delay(1);
+            //if (isSX && !isChanged)
+            //{
+            //    LocationId = actFilterSX.idSx;
+            //}
+            //else if (isSX && isChanged)
+            //{
+            //    LocationId = actFilterDX.idDx;
+            //}
+            //else if (!isSX && !isChanged)
+            //{
+            //    LocationId = actFilterDX.idDx;
+            //}
+            //else if (!isSX && isChanged)
+            //{
+            //    LocationId = actFilterSX.idSx;
+            //}
+        }
+        private void ReportChangeSX()
+        {
+            FilterUpdatedSX.InvokeAsync(actFilterSX);
+        }
+        private void ReportChangeDX()
+        {
+            FilterUpdatedDX.InvokeAsync(actFilterDX);
+        }
+    }
+}
\ No newline at end of file
diff --git a/StockMan.CORE/Components/ValStockGiac.razor.cs b/StockMan.CORE/Components/ValStockGiac.razor.cs
index f798592..d5bb7a7 100644
--- a/StockMan.CORE/Components/ValStockGiac.razor.cs
+++ b/StockMan.CORE/Components/ValStockGiac.razor.cs
@@ -55,12 +55,12 @@ namespace StockMan.CORE.Components
         {
             await LocId_DX.InvokeAsync(locId);
         }
-
         protected async Task setLocationSX(string locId)
         {
             await LocId_SX.InvokeAsync(locId);
         }
-
+        public LocSXSelectFilter currFilterSX { get; set; } = new LocSXSelectFilter();
+        public LocDXSelectFilter currFilterDX { get; set; } = new LocDXSelectFilter();
         #endregion Protected Methods
     }
 }
\ No newline at end of file
diff --git a/StockMan.CORE/Data/ItemSelectFilter.cs b/StockMan.CORE/Data/ItemSelectFilter.cs
index a0bb6f5..01d5215 100644
--- a/StockMan.CORE/Data/ItemSelectFilter.cs
+++ b/StockMan.CORE/Data/ItemSelectFilter.cs
@@ -14,6 +14,8 @@
         public int CurrPage { get; set; } = 1;
 
         public string Id { get; set; } = "*";
+        public string searchValue { get; set; } = "";
+        public string itemFamily { get; set; } = "";
         public int MaxRecord { get; set; } = 100;
 
         public int NumRec { get; set; } = 10;
diff --git a/StockMan.CORE/Data/LocDXSelectFilter.cs b/StockMan.CORE/Data/LocDXSelectFilter.cs
index c4853de..2b6e803 100644
--- a/StockMan.CORE/Data/LocDXSelectFilter.cs
+++ b/StockMan.CORE/Data/LocDXSelectFilter.cs
@@ -10,7 +10,7 @@
         #endregion Public Constructors
 
         #region Public Properties
-
+        public string idDx { get; set; } = "";
         public int CurrPage { get; set; } = 1;
 
         public int MaxRecord { get; set; } = 100;
@@ -27,6 +27,7 @@
         {
             LocDXSelectFilter clonedData = new LocDXSelectFilter()
             {
+                idDx = this.idDx,
                 CurrPage = this.CurrPage,
                 MaxRecord = this.MaxRecord,
                 NumRec = this.NumRec,
@@ -43,6 +44,9 @@
             if (!(obj is LocDXSelectFilter item))
                 return false;
 
+            if (idDx != item.idDx)
+                return false;
+
             if (MaxRecord != item.MaxRecord)
                 return false;
 
diff --git a/StockMan.CORE/Data/LocSXSelectFilter.cs b/StockMan.CORE/Data/LocSXSelectFilter.cs
index 6c7f572..be65dc3 100644
--- a/StockMan.CORE/Data/LocSXSelectFilter.cs
+++ b/StockMan.CORE/Data/LocSXSelectFilter.cs
@@ -11,6 +11,8 @@
 
         #region Public Properties
 
+        public string idSx { get; set; } = "";
+
         public int CurrPage { get; set; } = 1;
 
         public int MaxRecord { get; set; } = 100;
@@ -27,6 +29,7 @@
         {
             LocSXSelectFilter clonedData = new LocSXSelectFilter()
             {
+                idSx = this.idSx,
                 CurrPage = this.CurrPage,
                 MaxRecord = this.MaxRecord,
                 NumRec = this.NumRec,
@@ -43,6 +46,9 @@
             if (!(obj is LocSXSelectFilter item))
                 return false;
 
+            if (idSx != item.idSx)
+                return false;
+
             if (MaxRecord != item.MaxRecord)
                 return false;
 
diff --git a/StockMan.CORE/Pages/AnagraficaArticoli.razor b/StockMan.CORE/Pages/AnagraficaArticoli.razor
index 1427cc6..9ae58e0 100644
--- a/StockMan.CORE/Pages/AnagraficaArticoli.razor
+++ b/StockMan.CORE/Pages/AnagraficaArticoli.razor
@@ -3,8 +3,19 @@
 
 <div class="ps-2 pe-1">
     <div>
-        <ItemFilter></ItemFilter>
-        <ItemList updateRecordCount="UpdateTotCount" actFilter="@currFilter"></ItemList>
+        <div class="card">
+            <div class="card-header d-flex justify-content-between">
+                <div class="w-50">
+                    <ItemFilter FilterUpdated="updateFilter"></ItemFilter>
+                </div>
+                <div>
+                    <button data-bs-toggle="modal" data-bs-target="#modalNewItem" class="h-50 mt-4 btn btn-sm btn-success"><i class="fa-solid fa-plus"></i> Aggiungi nuovo item</button>
+                </div>
+            </div>
+            <div class="card-body">
+                <ItemList updateRecordCount="UpdateTotCount" actFilter="@currFilter"></ItemList>
+            </div>
+        </div>
     </div>
     <div>
         <DataPager @ref="pagerFamArt" PageSize="@numRecord" currPage="@currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="@totalCount" showLoading="@isLoading" />
diff --git a/StockMan.CORE/Pages/AnagraficaArticoli.razor.cs b/StockMan.CORE/Pages/AnagraficaArticoli.razor.cs
index e4c25f2..e98fd30 100644
--- a/StockMan.CORE/Pages/AnagraficaArticoli.razor.cs
+++ b/StockMan.CORE/Pages/AnagraficaArticoli.razor.cs
@@ -53,6 +53,18 @@ namespace StockMan.CORE.Pages
             totalCount = newTotCount;
         }
 
+        private async Task updateFilter(ItemSelectFilter newParams)
+        {
+            isLoading = true;
+            await Task.Delay(1);
+            currPage = 1;
+            searchValue = newParams.searchValue;
+            itemFamily = newParams.itemFamily;
+            await Task.Delay(1);
+            await InvokeAsync(() => StateHasChanged());
+            currFilter = newParams;
+            isLoading = false;
+        }
         #endregion Protected Methods
 
         #region Private Properties
@@ -70,7 +82,16 @@ namespace StockMan.CORE.Pages
             get => currFilter.NumRec;
             set => currFilter.NumRec = value;
         }
-
+        private string searchValue
+        {
+            get => currFilter.searchValue;
+            set => currFilter.searchValue = value;
+        }
+        private string itemFamily
+        {
+            get => currFilter.itemFamily;
+            set => currFilter.itemFamily = value;
+        }
         #endregion Private Properties
     }
 }
\ No newline at end of file
diff --git a/StockMan.CORE/Pages/StatoMag.razor b/StockMan.CORE/Pages/StatoMag.razor
index dd84dac..acbe384 100644
--- a/StockMan.CORE/Pages/StatoMag.razor
+++ b/StockMan.CORE/Pages/StatoMag.razor
@@ -38,11 +38,15 @@ else
 }
 <div class="row">
     <div class="col">
+        <LocationFilters isSX="true" isChanged="@isChanged" ListLocationByType="@listLocationByType" FilterUpdatedSX="updateFilterSX" ></LocationFilters>
+
         <Location actFilterSX="@currFilterSX" updateRecordCount="UpdateTotCountSX" LocId_SX="catchCurrLocId_SX" isSX="true" isChanged="@isChanged" UserName="@currOpr.Id" locSX_ID="@currLocId_SX" locDX_ID="@currLocId_DX" ListLocationByType="@listLocationByType"></Location>
 
         <DataPager PageSize="@numRecordSX" currPage="@currPageSX" numRecordChanged="ForceReloadSX" numPageChanged="ForceReloadPageSX" totalCount="@totalCountSX" showLoading="@isLoading" />
     </div>
     <div class="col">
+        <LocationFilters isSX="false" isChanged="@isChanged" ListLocationByType="@listLocationByType" FilterUpdatedDX="updateFilterDX" ></LocationFilters>
+
         <Location actFilterDX="@currFilterDX" updateRecordCount="UpdateTotCountDX" LocId_DX="catchCurrLocId_DX" isSX="false" isChanged="@isChanged" locDX_ID="@currLocId_DX" locSX_ID="@currLocId_SX" ListLocationByType="@listLocationByType"></Location>
 
         <DataPager PageSize="@numRecordDX" currPage="@currPageDX" numRecordChanged="ForceReloadDX" numPageChanged="ForceReloadPageDX" totalCount="@totalCountDX" showLoading="@isLoading" />
diff --git a/StockMan.CORE/Pages/StatoMag.razor.cs b/StockMan.CORE/Pages/StatoMag.razor.cs
index f0872c8..3038684 100644
--- a/StockMan.CORE/Pages/StatoMag.razor.cs
+++ b/StockMan.CORE/Pages/StatoMag.razor.cs
@@ -16,9 +16,9 @@ namespace StockMan.CORE.Pages
 
         #region Protected Properties
 
-        protected string currLocId_DX { get; set; } = "";
+        //protected string currLocId_DX { get; set; } = "";
 
-        protected string currLocId_SX { get; set; } = "";
+        //protected string currLocId_SX { get; set; } = "";
 
         protected OperatorModel currOpr { get; set; } = new OperatorModel();
 
@@ -126,6 +126,38 @@ namespace StockMan.CORE.Pages
             get => currFilterDX.NumRec;
             set => currFilterDX.NumRec = value;
         }
+        private string currLocId_SX
+        {
+            get => currFilterSX.idSx;
+            set => currFilterSX.idSx = value;
+        }
+        private string currLocId_DX
+        {
+            get => currFilterDX.idDx;
+            set => currFilterDX.idDx = value;
+        }
+
+
+        private async Task updateFilterSX(LocSXSelectFilter newParams)
+        {
+            isLoading = true;
+            await Task.Delay(1);
+            currPageSX = 1;
+            await Task.Delay(1);
+            await InvokeAsync(() => StateHasChanged());
+            currFilterSX = newParams;
+            isLoading = false;
+        }
+        private async Task updateFilterDX(LocDXSelectFilter newParams)
+        {
+            isLoading = true;
+            await Task.Delay(1);
+            currPageDX = 1;
+            await Task.Delay(1);
+            await InvokeAsync(() => StateHasChanged());
+            currFilterDX = newParams;
+            isLoading = false;
+        }
         #endregion Protected Methods
     }
 }
\ No newline at end of file
diff --git a/StockMan.CORE/StockMan.CORE.csproj b/StockMan.CORE/StockMan.CORE.csproj
index 9264e93..e6a4114 100644
--- a/StockMan.CORE/StockMan.CORE.csproj
+++ b/StockMan.CORE/StockMan.CORE.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-		<Version>3.0.2303.216</Version>
+		<Version>3.0.2303.217</Version>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>

From 43269aeb26d8df436bf7c03955b8ebda7b57fe89 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 3 Mar 2023 08:41:52 +0100
Subject: [PATCH 3/4] fix pubxml x versione MVC e CORE

---
 .../PublishProfiles/IIS-PROD.pubxml           | 47 +++++++++++++++++++
 .../Properties/PublishProfiles/IIS04.pubxml   | 47 +++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 StockManMVC/Properties/PublishProfiles/IIS-PROD.pubxml
 create mode 100644 StockManMVC/Properties/PublishProfiles/IIS04.pubxml

diff --git a/StockManMVC/Properties/PublishProfiles/IIS-PROD.pubxml b/StockManMVC/Properties/PublishProfiles/IIS-PROD.pubxml
new file mode 100644
index 0000000..fd8ac85
--- /dev/null
+++ b/StockManMVC/Properties/PublishProfiles/IIS-PROD.pubxml
@@ -0,0 +1,47 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>True</ExcludeApp_Data>
+    <MSDeployServiceURL>https://office.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>office.egalware.com/StockMan/STEA</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>True</EnableMSDeployBackup>
+    <UserName>jenkins</UserName>
+    <_SavePWD>True</_SavePWD>
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+    <AllowUntrustedCertificate>True</AllowUntrustedCertificate>
+    <PublishDatabaseSettings>
+      <Objects xmlns="">
+        <ObjectGroup Name="StockManEntities" Order="1" Enabled="False">
+          <Destination Path="Data Source=W2019-SQL-STEAM;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer16" />
+          <Object Type="DbCodeFirst">
+            <Source Path="DBContext" DbContext="StockManMVC.Models.StockManEntities, StockManMVC" Origin="Configuration" />
+          </Object>
+        </ObjectGroup>
+      </Objects>
+    </PublishDatabaseSettings>
+    <PrecompileBeforePublish>True</PrecompileBeforePublish>
+    <EnableUpdateable>True</EnableUpdateable>
+    <DebugSymbols>False</DebugSymbols>
+    <WDPMergeOption>DonotMerge</WDPMergeOption>
+    <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)StockManEntities-Web.config Connection String">
+      <ParameterValue>metadata=res://*/Models.SMModel.csdl|res://*/Models.SMModel.ssdl|res://*/Models.SMModel.msl;provider=System.Data.SqlClient;provider connection string="Data Source=W2019-SQL-STEAM;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer16"</ParameterValue>
+      <UpdateDestWebConfig>False</UpdateDestWebConfig>
+    </MSDeployParameterValue>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/StockManMVC/Properties/PublishProfiles/IIS04.pubxml b/StockManMVC/Properties/PublishProfiles/IIS04.pubxml
new file mode 100644
index 0000000..de4f45b
--- /dev/null
+++ b/StockManMVC/Properties/PublishProfiles/IIS04.pubxml
@@ -0,0 +1,47 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>True</ExcludeApp_Data>
+    <MSDeployServiceURL>https://iis03.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>office.egalware.com/StockMan/STEA</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>True</EnableMSDeployBackup>
+    <UserName>jenkins</UserName>
+    <_SavePWD>True</_SavePWD>
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+    <AllowUntrustedCertificate>True</AllowUntrustedCertificate>
+    <PublishDatabaseSettings>
+      <Objects xmlns="">
+        <ObjectGroup Name="StockManEntities" Order="1" Enabled="False">
+          <Destination Path="Data Source=W2019-SQL-STEAM;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer16" />
+          <Object Type="DbCodeFirst">
+            <Source Path="DBContext" DbContext="StockManMVC.Models.StockManEntities, StockManMVC" Origin="Configuration" />
+          </Object>
+        </ObjectGroup>
+      </Objects>
+    </PublishDatabaseSettings>
+    <PrecompileBeforePublish>True</PrecompileBeforePublish>
+    <EnableUpdateable>True</EnableUpdateable>
+    <DebugSymbols>False</DebugSymbols>
+    <WDPMergeOption>DonotMerge</WDPMergeOption>
+    <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)StockManEntities-Web.config Connection String">
+      <ParameterValue>metadata=res://*/Models.SMModel.csdl|res://*/Models.SMModel.ssdl|res://*/Models.SMModel.msl;provider=System.Data.SqlClient;provider connection string="Data Source=W2019-SQL-STEAM;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer16"</ParameterValue>
+      <UpdateDestWebConfig>False</UpdateDestWebConfig>
+    </MSDeployParameterValue>
+  </ItemGroup>
+</Project>
\ No newline at end of file

From 073ba59a11aef1e590d70f8a2b52f2fd09fb2f17 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 3 Mar 2023 08:42:04 +0100
Subject: [PATCH 4/4] ancora fix pub profile MVC/Core

---
 .vs/StockManMVC/config/applicationhost.config |   4 +-
 SiteSelector/SiteSelector.csproj.user         |   2 +-
 .../Properties/PublishProfiles/IIS04.pubxml   |  47 ------------------
 StockManMVC/StockManMVC.csproj                |   1 +
 StockManMVC/StockManMVC.csproj.user           |   4 +-
 VersGen/obj/Release/TempPE/VersGen.cs.dll     | Bin 2048 -> 2048 bytes
 6 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 StockManMVC/Properties/PublishProfiles/IIS04.pubxml

diff --git a/.vs/StockManMVC/config/applicationhost.config b/.vs/StockManMVC/config/applicationhost.config
index 0152c4d..fd7cce8 100644
--- a/.vs/StockManMVC/config/applicationhost.config
+++ b/.vs/StockManMVC/config/applicationhost.config
@@ -162,7 +162,7 @@
             </site>
             <site name="StockManMVC" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\Repo\StockMan\StockManMVC" />
+                    <virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\source\StockMan\StockManMVC" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:4539:localhost" />
@@ -170,7 +170,7 @@
             </site>
             <site name="SiteSelector" id="3">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\Repo\StockMan\SiteSelector" />
+                    <virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\source\StockMan\SiteSelector" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:3526:localhost" />
diff --git a/SiteSelector/SiteSelector.csproj.user b/SiteSelector/SiteSelector.csproj.user
index 510a6eb..e288075 100644
--- a/SiteSelector/SiteSelector.csproj.user
+++ b/SiteSelector/SiteSelector.csproj.user
@@ -5,7 +5,7 @@
     <IISExpressAnonymousAuthentication>disabled</IISExpressAnonymousAuthentication>
     <IISExpressWindowsAuthentication>enabled</IISExpressWindowsAuthentication>
     <NameOfLastUsedPublishProfile>IIS01</NameOfLastUsedPublishProfile>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressUseClassicPipelineMode />
diff --git a/StockManMVC/Properties/PublishProfiles/IIS04.pubxml b/StockManMVC/Properties/PublishProfiles/IIS04.pubxml
deleted file mode 100644
index de4f45b..0000000
--- a/StockManMVC/Properties/PublishProfiles/IIS04.pubxml
+++ /dev/null
@@ -1,47 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>MSDeploy</WebPublishMethod>
-    <ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>True</ExcludeApp_Data>
-    <MSDeployServiceURL>https://iis03.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
-    <DeployIisAppPath>office.egalware.com/StockMan/STEA</DeployIisAppPath>
-    <RemoteSitePhysicalPath />
-    <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
-    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
-    <EnableMSDeployBackup>True</EnableMSDeployBackup>
-    <UserName>jenkins</UserName>
-    <_SavePWD>True</_SavePWD>
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-    <AllowUntrustedCertificate>True</AllowUntrustedCertificate>
-    <PublishDatabaseSettings>
-      <Objects xmlns="">
-        <ObjectGroup Name="StockManEntities" Order="1" Enabled="False">
-          <Destination Path="Data Source=W2019-SQL-STEAM;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer16" />
-          <Object Type="DbCodeFirst">
-            <Source Path="DBContext" DbContext="StockManMVC.Models.StockManEntities, StockManMVC" Origin="Configuration" />
-          </Object>
-        </ObjectGroup>
-      </Objects>
-    </PublishDatabaseSettings>
-    <PrecompileBeforePublish>True</PrecompileBeforePublish>
-    <EnableUpdateable>True</EnableUpdateable>
-    <DebugSymbols>False</DebugSymbols>
-    <WDPMergeOption>DonotMerge</WDPMergeOption>
-    <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <MSDeployParameterValue Include="$(DeployParameterPrefix)StockManEntities-Web.config Connection String">
-      <ParameterValue>metadata=res://*/Models.SMModel.csdl|res://*/Models.SMModel.ssdl|res://*/Models.SMModel.msl;provider=System.Data.SqlClient;provider connection string="Data Source=W2019-SQL-STEAM;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer16"</ParameterValue>
-      <UpdateDestWebConfig>False</UpdateDestWebConfig>
-    </MSDeployParameterValue>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/StockManMVC/StockManMVC.csproj b/StockManMVC/StockManMVC.csproj
index ac0b1ee..829301c 100644
--- a/StockManMVC/StockManMVC.csproj
+++ b/StockManMVC/StockManMVC.csproj
@@ -477,6 +477,7 @@
     <Content Include="Content\bootstrap-theme.css.map" />
     <None Include="Properties\PublishProfiles\IIS01.pubxml" />
     <None Include="Properties\PublishProfiles\IIS01_TK.pubxml" />
+    <None Include="Properties\PublishProfiles\IIS-PROD.pubxml" />
     <None Include="Properties\PublishProfiles\IIS03_TK.pubxml" />
     <None Include="Properties\PublishProfiles\IIS03.pubxml" />
     <None Include="Properties\PublishProfiles\IIS02.pubxml" />
diff --git a/StockManMVC/StockManMVC.csproj.user b/StockManMVC/StockManMVC.csproj.user
index 207c830..7aafd5a 100644
--- a/StockManMVC/StockManMVC.csproj.user
+++ b/StockManMVC/StockManMVC.csproj.user
@@ -13,13 +13,13 @@
     <WebStackScaffolding_IsViewGenerationSelected>True</WebStackScaffolding_IsViewGenerationSelected>
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>IIS02</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>C:\Users\samuele.steamw\source\StockMan\StockManMVC\Properties\PublishProfiles\IIS-PROD.pubxml</NameOfLastUsedPublishProfile>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
diff --git a/VersGen/obj/Release/TempPE/VersGen.cs.dll b/VersGen/obj/Release/TempPE/VersGen.cs.dll
index 7aa488e3b9dd3ac11a3351e11da4d8b013109d59..807e7bd65bd61559f29eec4aaca15f853df085ca 100644
GIT binary patch
delta 183
zcmZn=Xb_mt!4kTJF=b+p4CASZE5jKpCNnbDGhUe72qf1`W@Hj()nH~|V4N(-W<EK9
zDS@$L@<yhE{4orA48{x<3@i-{Ah5ZSIi6AAkS@PXdg}@Q)s<J`13IOBCVyb@=i*^x
zU^mbM!O4EC(rQLV3=DjX44lCwsfoGeiAAYE-3ye#hJcA(AhyCpMKPe|OIc$k8nAFG
UFfi}{1<x377G!(RIMIL|0KA4RMF0Q*

delta 184
zcmZn=Xb_mt!ID!V9x<^;hVk6QmEnvvlNlN78Lv!k1d<yjGcpOY>M%1fFisX^GoKv5
zl)%_Cc_Y(7{zL{n24jX=29^e(90SwlM&@`%fjbv_w2q&g;M?DyB<*bxo-_Fai$A|0
zBLk12o{^q`fdL3l_GFb-H8f*j;A3Rq3@%Ac%q>qWN@ZYJqRapX`#@}kiHc%C2P|Zb
W;Z$H?-~ozUFy1W4_MUN~0XqO%S}uM7

