From 3a3ca7a6d2d9d0e7bdb8c568baab2674a0867a8a Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 3 Mar 2023 09:18:45 +0100
Subject: [PATCH] fix filtro di locazione stato magazzino

---
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 StockMan.CORE/Components/Location.razor       | 24 +----------
 .../Components/LocationFilters.razor.cs       | 33 +++++----------
 .../Components/ValStockGiac.razor.cs          | 13 ++++++
 StockMan.CORE/Pages/StatoMag.razor            | 40 ++++++++++++++-----
 StockMan.CORE/StockMan.CORE.csproj            |  2 +-
 8 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 7d8352b..72a4544 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.217</h4>
+    <h4>Versione: 3.0.2303.309</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 7328df5..b9e49ab 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-3.0.2303.217
+3.0.2303.309
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 3843b55..cee1184 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.217</version>
+  <version>3.0.2303.309</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/Location.razor b/StockMan.CORE/Components/Location.razor
index 22a982c..269a1e9 100644
--- a/StockMan.CORE/Components/Location.razor
+++ b/StockMan.CORE/Components/Location.razor
@@ -4,26 +4,7 @@
 }
 else
 {
-    <div class="card">
-        <div class="card-header @bgCard text-light d-flex justify-content-between">
-            <div class="py-2">
-                @locSxoDx
-            </div>
-            @*<div>
-                <select class="form-select" @bind="@id">
-                    <option value="">--Selezionare una locazione--</option>
-                    @if (ListLocationByType != null)
-                    {
-
-                        @foreach (var item in ListLocationByType)
-                        {
-                            <option value="@item.Id">@item.Descr</option>
-                        }
-                    }
-                </select>
-            </div>*@
-        </div>
-        <div class="card-body">
+    
             @if (currStock != null)
             {
                 <div class="d-flex justify-content-between">
@@ -78,8 +59,7 @@ else
                     }
                 </tbody>
             </table>
-        </div>
-    </div>
+       
 
 }
 
diff --git a/StockMan.CORE/Components/LocationFilters.razor.cs b/StockMan.CORE/Components/LocationFilters.razor.cs
index eaf092a..e9c6590 100644
--- a/StockMan.CORE/Components/LocationFilters.razor.cs
+++ b/StockMan.CORE/Components/LocationFilters.razor.cs
@@ -36,9 +36,13 @@ namespace StockMan.CORE.Components
         [Parameter]
         public LocDXSelectFilter actFilterDX { get; set; } = new LocDXSelectFilter();
         [Parameter]
-        public EventCallback<string> LocId_DX { get; set; }
+        public EventCallback<string> E_LocId_DX { get; set; }
         [Parameter]
-        public EventCallback<string> LocId_SX { get; set; }
+        public EventCallback<string> E_LocId_SX { get; set; }
+        [Parameter]
+        public string currLocId_DX { get; set; } = string.Empty;
+        [Parameter]
+        public string currLocId_SX { get; set; } = string.Empty;
         [Parameter]
         public EventCallback<LocSXSelectFilter> FilterUpdatedSX { get; set; }
         [Parameter]
@@ -49,19 +53,19 @@ namespace StockMan.CORE.Components
             {
                 if (isSX && !isChanged)
                 {
-                    return actFilterSX.idSx;
+                    return currLocId_SX;
                 }
                 else if (isSX && isChanged)
                 {
-                    return actFilterDX.idDx;
+                    return currLocId_DX;
                 }
                 else if (!isSX && !isChanged)
                 {
-                    return actFilterDX.idDx;
+                    return currLocId_DX;
                 }
                 else
                 {
-                    return actFilterSX.idSx;
+                    return currLocId_SX;
                 }
             }
             set
@@ -94,23 +98,8 @@ namespace StockMan.CORE.Components
         }
         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()
         {
diff --git a/StockMan.CORE/Components/ValStockGiac.razor.cs b/StockMan.CORE/Components/ValStockGiac.razor.cs
index d5bb7a7..77665d7 100644
--- a/StockMan.CORE/Components/ValStockGiac.razor.cs
+++ b/StockMan.CORE/Components/ValStockGiac.razor.cs
@@ -53,14 +53,27 @@ namespace StockMan.CORE.Components
 
         protected async Task setLocationDX(string locId)
         {
+            currLocId_DX = locId;
             await LocId_DX.InvokeAsync(locId);
         }
         protected async Task setLocationSX(string locId)
         {
+            currLocId_SX = locId;
             await LocId_SX.InvokeAsync(locId);
         }
         public LocSXSelectFilter currFilterSX { get; set; } = new LocSXSelectFilter();
         public LocDXSelectFilter currFilterDX { get; set; } = new LocDXSelectFilter();
+
+        private string currLocId_SX
+        {
+            get => currFilterSX.idSx;
+            set => currFilterSX.idSx = value;
+        }
+        private string currLocId_DX
+        {
+            get => currFilterDX.idDx;
+            set => currFilterDX.idDx = value;
+        }
         #endregion Protected Methods
     }
 }
\ No newline at end of file
diff --git a/StockMan.CORE/Pages/StatoMag.razor b/StockMan.CORE/Pages/StatoMag.razor
index acbe384..7e5906d 100644
--- a/StockMan.CORE/Pages/StatoMag.razor
+++ b/StockMan.CORE/Pages/StatoMag.razor
@@ -21,7 +21,7 @@
             </div>
         </div>
         <div class="card-body">
-            <ValStockGiac isCompact="false" LocId_SX="catchCurrLocId_SX" LocId_DX="catchCurrLocId_DX"></ValStockGiac>
+            <ValStockGiac isCompact="false" LocId_SX="catchCurrLocId_SX" LocId_DX="catchCurrLocId_DX" ></ValStockGiac>
         </div>
     </div>
 }
@@ -38,17 +38,35 @@ 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 class="card">
+            <div class="card-header bg-primary text-light d-flex justify-content-between">
+                <div class="py-2">
+                    Locazione Mittente:
+                </div>
+                <LocationFilters isSX="true" isChanged="@isChanged" ListLocationByType="@listLocationByType" FilterUpdatedSX="updateFilterSX" currLocId_SX="@currLocId_SX" currLocId_DX="@currLocId_DX"></LocationFilters>
+            </div>
+            <div class="card-body">
+                <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>
+            </div>
+            <div class="card-footer">
+                <DataPager PageSize="@numRecordSX" currPage="@currPageSX" numRecordChanged="ForceReloadSX" numPageChanged="ForceReloadPageSX" totalCount="@totalCountSX" showLoading="@isLoading" />
+            </div>
+        </div>
     </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" />
+        <div class="card">
+            <div class="card-header bg-success text-light d-flex justify-content-between">
+                <div class="py-2">
+                    Locazione Destinatario:
+                </div>
+                <LocationFilters isSX="false" isChanged="@isChanged" ListLocationByType="@listLocationByType" FilterUpdatedDX="updateFilterDX" currLocId_SX="@currLocId_SX" currLocId_DX="@currLocId_DX"></LocationFilters>
+            </div>
+            <div class="card-body">
+                <Location actFilterDX="@currFilterDX" updateRecordCount="UpdateTotCountDX" LocId_DX="catchCurrLocId_DX" isSX="false" isChanged="@isChanged" locDX_ID="@currLocId_DX" locSX_ID="@currLocId_SX" ListLocationByType="@listLocationByType"></Location>
+            </div>
+            <div class="card-footer">
+                <DataPager PageSize="@numRecordDX" currPage="@currPageDX" numRecordChanged="ForceReloadDX" numPageChanged="ForceReloadPageDX" totalCount="@totalCountDX" showLoading="@isLoading" />
+            </div>
+        </div>
     </div>
 </div>
diff --git a/StockMan.CORE/StockMan.CORE.csproj b/StockMan.CORE/StockMan.CORE.csproj
index e6a4114..5645811 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.217</Version>
+		<Version>3.0.2303.309</Version>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
