From 59b43f60057ef67f0096a9a1ca5d82ee7313d22e Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 5 Oct 2022 10:24:19 +0200
Subject: [PATCH] Update pagina PODL

---
 MP.Data/Controllers/MpSpecController.cs |  2 ++
 MP.Data/DatabaseModels/PODLModel.cs     | 11 +++++++++++
 MP.SPEC/Components/ListPODL.razor       | 13 +++++++++++++
 MP.SPEC/MP.SPEC.csproj                  |  2 +-
 MP.SPEC/Pages/PODL.razor                |  9 ++++++++-
 MP.SPEC/Resources/ChangeLog.html        |  2 +-
 MP.SPEC/Resources/VersNum.txt           |  2 +-
 MP.SPEC/Resources/manifest.xml          |  2 +-
 8 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index 561536ed..39568dbe 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -465,6 +465,8 @@ namespace MP.Data.Controllers
                 .DbSetPODL
                 .Where(x => (x.IdxOdl == 0) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt)))
                 .AsNoTracking()
+                .Include(m => m.MachineNav)
+                .Include(a => a.ArticoloNav)
                 .OrderBy(x => x.InsertDate)
                 .ToList();
             }
diff --git a/MP.Data/DatabaseModels/PODLModel.cs b/MP.Data/DatabaseModels/PODLModel.cs
index 73b5b19d..2575e287 100644
--- a/MP.Data/DatabaseModels/PODLModel.cs
+++ b/MP.Data/DatabaseModels/PODLModel.cs
@@ -55,6 +55,17 @@ namespace MP.Data.DatabaseModels
             }
         }
 
+        /// <summary>
+        /// Navigazione oggetto Machine
+        /// </summary>
+        [ForeignKey("IdxMacchina")]
+        public virtual Macchine MachineNav { get; set; } = null!;
+        /// <summary>
+        /// Navigazione oggetto Articolo
+        /// </summary>
+        [ForeignKey("CodArticolo")]
+        public virtual AnagArticoli ArticoloNav { get; set; } = null!;
+
         #endregion Public Properties
     }
 }
\ No newline at end of file
diff --git a/MP.SPEC/Components/ListPODL.razor b/MP.SPEC/Components/ListPODL.razor
index cb4fdeb6..b7bf7cb8 100644
--- a/MP.SPEC/Components/ListPODL.razor
+++ b/MP.SPEC/Components/ListPODL.razor
@@ -25,6 +25,7 @@ else
                         <th># pz</th>
                         <th><i class="fa-solid fa-clock"></i> T.Ciclo</th>
                         <th><i class="fa-solid fa-pen-to-square"></i> Note</th>
+                        <th title="Attivabile"><i class="fa-regular fa-square-check"></i> Att</th>
                         <th></th>
                     </tr>
                 </thead>
@@ -38,10 +39,12 @@ else
                             </td>
                             <td>
                                 @record.CodArticolo
+                                <div class="small textConsensed text-secondary">@record.ArticoloNav.DescArticolo</div>
                             </td>
                             <td>@tradFase(record.KeyRichiesta)</td>
                             <td>
                                 @record.IdxMacchina
+                                <div class="small textConsensed text-secondary">@record.MachineNav.Descrizione</div>
                             </td>
                             <td>
                                 @record.NumPezzi
@@ -50,6 +53,16 @@ else
                                 @record.Tcassegnato.ToString("N3")
                             </td>
                             <td>@record.Note</td>
+                            <td>
+                                @if (@record.Attivabile)
+                                {
+                                    <i class="fa-regular fa-square-check text-success"></i>
+                                }
+                                else
+                                {
+                                    <i class="fa-regular fa-square text-secondary"></i>
+                                }
+                            </td>
                             <td>
                                 @if (POdlDelEnabled(record.IdxOdl))
                                 {
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 4fec5a42..0c5728b0 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.2209.2809</Version>
+    <Version>6.16.2210.510</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor
index f739d21a..9ce35a87 100644
--- a/MP.SPEC/Pages/PODL.razor
+++ b/MP.SPEC/Pages/PODL.razor
@@ -142,7 +142,14 @@
                                 </div>
                             </div>
                             <div class="row mt-2">
-                                <div class="col-6">
+                                <div class="col-3">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm" title="Attivabile">Att</span>
+
+                                    <div class="form-check form-check-sm form-switch py-1" title="Attivabile">
+                                        <input class="form-check-input" type="checkbox" id="mySwitch" name="setupAlarms" title="Attivabile" @bind="@currRecord.Attivabile">
+                                    </div>
+                                </div>
+                                <div class="col-3">
                                 </div>
                                 <div class="col-3">
                                     <div class="d-grid gap-2">
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 73a3d73c..daa5c95c 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.2209.2809</h4>
+    <h4>Versione: 6.16.2210.510</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index d3f097ee..1324a324 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2209.2809
+6.16.2210.510
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 3a813e4d..b7774a44 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.2209.2809</version>
+  <version>6.16.2210.510</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>