From ea930b308d4b9d37691dff71252ce5d7e296a88f Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 26 Oct 2022 17:25:09 +0200
Subject: [PATCH] fix richiesti pagina PODL

---
 MP.SPEC/Components/ListPODL.razor |  6 +++---
 MP.SPEC/MP.SPEC.csproj            |  2 +-
 MP.SPEC/Pages/PODL.razor          | 26 +++++++++++++++++---------
 MP.SPEC/Pages/PODL.razor.cs       | 15 +++++++++++++++
 MP.SPEC/Resources/ChangeLog.html  |  2 +-
 MP.SPEC/Resources/VersNum.txt     |  2 +-
 MP.SPEC/Resources/manifest.xml    |  2 +-
 7 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/MP.SPEC/Components/ListPODL.razor b/MP.SPEC/Components/ListPODL.razor
index 85641a6c..4bcc0552 100644
--- a/MP.SPEC/Components/ListPODL.razor
+++ b/MP.SPEC/Components/ListPODL.razor
@@ -37,13 +37,13 @@ else
                                 <button @onclick="() => cloneRecord(record)" class="btn btn-info btn-sm" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>
                                 @if (canStartOdl(record.IdxMacchina))
                                 {
-                                    <button @onclick="() => startOdl(record)" class="btn btn-success btn-sm" title="Avvia PODL">
+                                    <button @onclick="() => startOdl(record)" class="btn btn-success btn-sm mx-1" title="Avvia PODL">
                                         <i class="far fa-play-circle"></i>
                                     </button>
                                 }
                                 else
-                                { 
-                                    <button class="btn btn-secondary btn-sm disabled" title="ODL ancora in corso">
+                                {
+                                    <button class="btn btn-secondary btn-sm disabled mx-1" title="ODL ancora in corso">
                                         <i class="far fa-play-circle"></i>
                                     </button>}
                             </td>
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 544da043..f0534463 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.2210.2115</Version>
+    <Version>6.16.2210.2617</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor
index edd74ebb..929bc105 100644
--- a/MP.SPEC/Pages/PODL.razor
+++ b/MP.SPEC/Pages/PODL.razor
@@ -12,7 +12,7 @@
                     <div class="px-2">
                         @if (addEnabled)
                         {
-                            <button class="btn btn-success" @onclick="() => reqNewPODL()">@btnNewText <i class="bi bi-plus-square"></i></button>
+                            <button class="btn btn-success" @onclick="() => reqNewPODL()">Nuovo PODL <i class="bi bi-plus-square"></i></button>
                         }
                     </div>
                 </div>
@@ -21,19 +21,20 @@
                 <div class="input-group input-group-sm">
                     @*<label class="input-group-text" for="maxRecord" title="Selezionare l'azienda da visualizzare"><i class="fa-solid fa-industry"></i></label>
                     <select @bind="@currAzienda" class="form-select" title="Selezionare l'azienda da visualizzare">
-                        @if (ListAziende != null)
-                        {
-                            foreach (var item in ListAziende)
-                            {
-                                <option value="@item.CodGruppo">@item.DescrGruppo</option>
-                            }
-                        }
+                    @if (ListAziende != null)
+                    {
+                    foreach (var item in ListAziende)
+                    {
+                    <option value="@item.CodGruppo">@item.DescrGruppo</option>
+                    }
+                    }
                     </select>*@
                     <label class="input-group-text" for="maxRecord" title="Selezionare la fase da visualizzare"><i class="fa-solid fa-screwdriver-wrench"></i></label>
                     <select @bind="@currFase" class="form-select" title="Selezionare la fase da visualizzare">
                         <option value="*">--- Tutti ---</option>
                         @if (ListStati != null)
                         {
+
                             foreach (var item in ListStati)
                             {
                                 <option value="@item.value">@item.label</option>
@@ -126,7 +127,14 @@
                                                     {
                                                         foreach (var item in ListMacchine)
                                                         {
-                                                            <option value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
+                                                            if (selectFirst(item.IdxMacchina) == true)
+                                                            {
+                                                                <option selected value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
+                                                            }
+                                                            else
+                                                            {
+                                                                <option value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
+                                                            }
                                                         }
                                                     }
                                                 </select>
diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs
index 56c65581..351d2ed0 100644
--- a/MP.SPEC/Pages/PODL.razor.cs
+++ b/MP.SPEC/Pages/PODL.razor.cs
@@ -203,6 +203,21 @@ namespace MP.SPEC.Pages
             }
         }
 
+        private bool selectFirst(string idxMacchina)
+        {
+            string firstMacchina="";
+            bool ans = false;
+            if (ListMacchine != null)
+            {
+                firstMacchina = ListMacchine.Select(x => x.IdxMacchina).FirstOrDefault();
+            }
+            if (firstMacchina == idxMacchina)
+            {
+                ans = true;
+            }
+            return ans;
+        }
+
         private string btnNewText
         {
             get => currArticolo == "" ? "Sel Articolo" : "Nuovo PODL";
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 77837625..c9794f03 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.2210.2115</h4>
+    <h4>Versione: 6.16.2210.2617</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index aa73f981..8baef796 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.2115
+6.16.2210.2617
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 9448f3cd..867aae92 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.2210.2115</version>
+  <version>6.16.2210.2617</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>