From 80b28efa33acf68c556da7f5a36c627c2de05cf4 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 30 Nov 2022 11:26:43 +0100
Subject: [PATCH] FIX filtro macchina per reparto

---
 MP.SPEC/MP.SPEC.csproj           |  2 +-
 MP.SPEC/Pages/PODL.razor         | 31 ++++++++++++++++++-------------
 MP.SPEC/Pages/PODL.razor.cs      | 26 +++++++++++++++++++++++---
 MP.SPEC/Resources/ChangeLog.html |  2 +-
 MP.SPEC/Resources/VersNum.txt    |  2 +-
 MP.SPEC/Resources/manifest.xml   |  2 +-
 6 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 0db5d526..ecf48b5e 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2211.3010</Version>
+    <Version>6.16.2211.3011</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor
index 97bcd278..1d99e501 100644
--- a/MP.SPEC/Pages/PODL.razor
+++ b/MP.SPEC/Pages/PODL.razor
@@ -131,7 +131,7 @@
                                     <div class="input-group input-group-sm">
                                         <div class="input-group input-group-sm">
                                             <span class="input-group-text" id="inputGroup-sizing-sm">Gruppo</span>
-                                            <select @bind="@currRecord.CodGruppo" class="form-select">
+                                            <select @bind="@gruppoSearch" class="form-select">
                                                 @if (ListGruppiFase != null)
                                                 {
                                                     foreach (var item in ListGruppiFase)
@@ -159,18 +159,26 @@
                                                 <select @bind="@currRecord.IdxMacchina" class="form-select">
                                                     @if (ListMacchine != null)
                                                     {
-                                                        foreach (var item in ListMacchine)
+                                                        if (ListMacchine.Count == 0)
+                                                        {
+                                                            <option selected>--Nessuna macchina presente--</option>
+                                                        }
+                                                        else
                                                         {
-                                                            @if (!item.MachineNav.Descrizione.Contains("NEW Descrizione"))
-                                                            {
 
-                                                                if (item.IdxMacchina == currRecordControlli.IdxMacchina)
+                                                            foreach (var item in ListMacchine)
+                                                            {
+                                                                @if (!item.MachineNav.Descrizione.Contains("NEW Descrizione"))
                                                                 {
-                                                                    <option selected value="@item.IdxMacchina">@item.IdxMacchina | @item.MachineNav.Descrizione</option>
-                                                                }
-                                                                else
-                                                                {
-                                                                    <option value="@item.IdxMacchina">@item.IdxMacchina | @item.MachineNav.Descrizione</option>
+
+                                                                    if (item.IdxMacchina == currRecordControlli.IdxMacchina)
+                                                                    {
+                                                                        <option selected value="@item.IdxMacchina">@item.IdxMacchina | @item.MachineNav.Descrizione</option>
+                                                                    }
+                                                                    else
+                                                                    {
+                                                                        <option value="@item.IdxMacchina">@item.IdxMacchina | @item.MachineNav.Descrizione</option>
+                                                                    }
                                                                 }
                                                             }
                                                         }
@@ -209,10 +217,7 @@
                                 </div>
                                 <div class="col-3">
                                     <div class="d-grid gap-2">
-                                        @if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && currRecord.CodGruppo != "" && currRecord.IdxMacchina != "")
-                                        {
                                             <button class="btn btn-success" @onclick="() => update(currRecord)">Salva <i class="bi bi-save"></i></button>
-                                        }
                                     </div>
                                 </div>
                             </div>
diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs
index 1f7c79a4..2e89a3d8 100644
--- a/MP.SPEC/Pages/PODL.razor.cs
+++ b/MP.SPEC/Pages/PODL.razor.cs
@@ -104,7 +104,7 @@ namespace MP.SPEC.Pages
             await reloadData();
         }
         protected override async Task OnInitializedAsync()
-        {                       
+        {
             // carico dati
             //await reloadData();
         }
@@ -195,6 +195,8 @@ namespace MP.SPEC.Pages
                 return;
             await Task.Delay(1);
             var clonedRec = MP.Data.Utils.POdlExt.convertToPOdl(selRec);
+            clonedRec.CodGruppo = gruppoSearch;
+            clonedRec.IdxOdl = 0;
             var done = await MDService.POdlUpdateRecord(clonedRec);
             await callSyncDb(clonedRec);
             currRecord = null;
@@ -235,7 +237,23 @@ namespace MP.SPEC.Pages
         #region Private Properties
 
         private string _artSearch { get; set; } = "";
-
+        private string _gruppoSearch { get; set; } = "";
+        private string gruppoSearch
+        {
+            get => _gruppoSearch;
+            set
+            {
+                if (!_gruppoSearch.Equals(value))
+                {
+                    _gruppoSearch = value;
+                    var pUpd = Task.Run(async () =>
+                    {
+                        await reloadData();
+                    });
+                    pUpd.Wait();
+                }
+            }
+        }
         private string _currAzienda { get; set; } = "*";
 
         private bool addEnabled
@@ -336,8 +354,10 @@ namespace MP.SPEC.Pages
             {
                 if (value != null)
                 {
+                    value.CodGruppo = gruppoSearch;
                     _currRecord = value;
                     artSearch = value == null ? "" : value.CodArticolo;
+
                 }
             }
         }
@@ -427,7 +447,7 @@ namespace MP.SPEC.Pages
             {
                 ListGruppiFase = allGruppiData.Where(x => x.SelEnabled).ToList();
             }
-            ListMacchine = await MDService.MacchineGetAll(selReparto);
+            ListMacchine = await MDService.MacchineGetAll(gruppoSearch);
             ListStati = await MDService.AnagStatiComm();
             ListArticoli = await MDService.ArticoliGetSearch(100, currAzienda, artSearch);
             //SearchRecords = await MDService.ListPODLFilt(hasOdl, StatoSel, macchina, selReparto, selDtStart, selDtEnd);
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index a6dcc38b..7ddb24d6 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2211.3010</h4>
+    <h4>Versione: 6.16.2211.3011</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index b06c03c3..e4d97594 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2211.3010
+6.16.2211.3011
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 7b0fa5d8..970459b8 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2211.3010</version>
+  <version>6.16.2211.3011</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>