From 37916a19074bb6f9896111644ff661d1a3dadbf8 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 25 Oct 2023 12:02:43 +0200
Subject: [PATCH 1/2] Update nuget Razor lib + refresh

---
 MP.Data/MP.Data.csproj           | 2 +-
 MP.SPEC/Components/ODLPlot.razor | 2 +-
 MP.SPEC/MP.SPEC.csproj           | 6 +++---
 MP.SPEC/Pages/DOSS.razor         | 2 +-
 MP.SPEC/Pages/Giacenze.razor     | 2 +-
 MP.SPEC/Pages/PARAMS.razor       | 2 +-
 MP.SPEC/Resources/ChangeLog.html | 2 +-
 MP.SPEC/Resources/VersNum.txt    | 2 +-
 MP.SPEC/Resources/manifest.xml   | 2 +-
 MP.SPEC/Shared/NavMenu.razor     | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj
index 36747f66..3436ee4e 100644
--- a/MP.Data/MP.Data.csproj
+++ b/MP.Data/MP.Data.csproj
@@ -20,7 +20,7 @@
     <ItemGroup>
         <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
         <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
-        <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2310.2409" />
+        <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2310.2417" />
         <PackageReference Include="MailKit" Version="4.2.0" />
         <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
diff --git a/MP.SPEC/Components/ODLPlot.razor b/MP.SPEC/Components/ODLPlot.razor
index a304ea42..0dc85fef 100644
--- a/MP.SPEC/Components/ODLPlot.razor
+++ b/MP.SPEC/Components/ODLPlot.razor
@@ -3,7 +3,7 @@
     <div class="px-1 flex-fill">
         @if (isLoading)
         {
-            <LoadingDataSmall></LoadingDataSmall>
+            <LoadingData DisplaySize="LoadingData.CtrlSize.Small"></LoadingData>
         }
         else
         {
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 0947ddfb..e3fe8ad6 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.2310.2409</Version>
+    <Version>6.16.2310.2512</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -39,8 +39,8 @@
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
     <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
-    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2310.2409" />
-    <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2310.2409" />
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2310.2417" />
+    <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2310.2417" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.9" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
diff --git a/MP.SPEC/Pages/DOSS.razor b/MP.SPEC/Pages/DOSS.razor
index edbc2926..5bbd452b 100644
--- a/MP.SPEC/Pages/DOSS.razor
+++ b/MP.SPEC/Pages/DOSS.razor
@@ -9,7 +9,7 @@
             <div class="px-2 flex-fill">
                 @if (isFiltering)
                 {
-                    <LoadingDataSmall></LoadingDataSmall>
+                    <LoadingData DisplaySize="LoadingData.CtrlSize.Small"></LoadingData>
                     <i>filtro x macchina / periodo</i>
                 }
                 else
diff --git a/MP.SPEC/Pages/Giacenze.razor b/MP.SPEC/Pages/Giacenze.razor
index 6405b8bb..7970bc22 100644
--- a/MP.SPEC/Pages/Giacenze.razor
+++ b/MP.SPEC/Pages/Giacenze.razor
@@ -14,7 +14,7 @@ else
                 </div>
                 @if (odlExp == null)
                 {
-                    <LoadingDataSmall></LoadingDataSmall>
+                    <LoadingData DisplaySize="LoadingData.CtrlSize.Small"></LoadingData>
                 }
                 else
                 {
diff --git a/MP.SPEC/Pages/PARAMS.razor b/MP.SPEC/Pages/PARAMS.razor
index b7f55739..ef91f391 100644
--- a/MP.SPEC/Pages/PARAMS.razor
+++ b/MP.SPEC/Pages/PARAMS.razor
@@ -9,7 +9,7 @@
             <div class="px-2 flex-fill">
                 @if (isFiltering)
                 {
-                    <LoadingDataSmall></LoadingDataSmall>
+                    <LoadingData DisplaySize="LoadingData.CtrlSize.Small"></LoadingData>
                 }
                 else
                 {
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index ce571c47..0a78c87b 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.2310.2409</h4>
+    <h4>Versione: 6.16.2310.2512</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index a4239c9b..292a8493 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2310.2409
+6.16.2310.2512
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 041e5468..a411913f 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.2310.2409</version>
+  <version>6.16.2310.2512</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>
diff --git a/MP.SPEC/Shared/NavMenu.razor b/MP.SPEC/Shared/NavMenu.razor
index f0496859..1bee2d32 100644
--- a/MP.SPEC/Shared/NavMenu.razor
+++ b/MP.SPEC/Shared/NavMenu.razor
@@ -32,7 +32,7 @@
         </div>
         @if (ElencoLink == null)
         {
-            <LoadingDataSmall></LoadingDataSmall>
+            <LoadingData DisplaySize="LoadingData.CtrlSize.Small"></LoadingData>
         }
         else
         {

From 58c4340631c706bf4c3e44d58d26283a29cde3f9 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 25 Oct 2023 15:22:31 +0200
Subject: [PATCH 2/2] Rimozione nuget deprecati x allegati mail

---
 MP-TAB-SERV/Components/MachineBlock.razor.cs | 14 ++++---
 MP-TAB-SERV/Components/ProdStat.razor        | 15 +++++--
 MP-TAB-SERV/MP-TAB-SERV.csproj               |  6 +--
 MP-TAB-SERV/Resources/ChangeLog.html         |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt            |  2 +-
 MP-TAB-SERV/Resources/manifest.xml           |  2 +-
 MP.Data/MP.Data.csproj                       |  2 +-
 MP.Data/MailKitMailData.cs                   |  4 +-
 MP.Data/Services/MailService.cs              | 42 ++++++++++----------
 9 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.cs b/MP-TAB-SERV/Components/MachineBlock.razor.cs
index 1ca77a1a..ee8b3725 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor.cs
+++ b/MP-TAB-SERV/Components/MachineBlock.razor.cs
@@ -156,12 +156,16 @@ namespace MP_TAB_SERV.Components
         {
             get
             {
-                ProdAdvDispl.ProdCounter answ = new ProdAdvDispl.ProdCounter()
+                ProdAdvDispl.ProdCounter answ = new ProdAdvDispl.ProdCounter();
+                if (RecMSE != null)
                 {
-                    numPzConf = (int)RecMSE.PezziConf,
-                    numPzOrd = (int)RecMSE.NumPezzi,
-                    numPzProd = (int)RecMSE.PezziProd
-                };
+                    answ = new ProdAdvDispl.ProdCounter()
+                    {
+                        numPzConf = (int)RecMSE.PezziConf,
+                        numPzOrd = (int)RecMSE.NumPezzi,
+                        numPzProd = (int)RecMSE.PezziProd
+                    };
+                }
                 return answ;
             }
         }
diff --git a/MP-TAB-SERV/Components/ProdStat.razor b/MP-TAB-SERV/Components/ProdStat.razor
index 189f27be..2efaad58 100644
--- a/MP-TAB-SERV/Components/ProdStat.razor
+++ b/MP-TAB-SERV/Components/ProdStat.razor
@@ -133,7 +133,10 @@
         <b>Statistiche di prodizione</b>
     </div>
     <div class="col-6 text-end">
-        <span>@($"ODL: {RecMSE.IdxOdl}")</span>
+        @if (RecMSE != null)
+        {
+            <span>@($"ODL: {RecMSE.IdxOdl}")</span>
+        }
     </div>
 </div>
 
@@ -144,10 +147,16 @@
                 <span>Data di inizio</span>
             </div>
             <div class="text-center fw-bold">
-                <span>@($"{RecMSE.DataInizioOdl:yyyy/MM/dd}")</span>
+                @if (RecMSE != null)
+                {
+                    <span>@($"{RecMSE.DataInizioOdl:yyyy/MM/dd}")</span>
+                }
             </div>
             <div class="text-center small">
-                <span>@($"{RecMSE.DataInizioOdl:HH: mm}")</span>
+                @if (RecMSE != null)
+                {
+                    <span>@($"{RecMSE.DataInizioOdl:HH: mm}")</span>
+                }
             </div>
         </div>
     </div>
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index be2d53cc..760885e2 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2310.2509</Version>
+      <Version>6.16.2310.2515</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2310.2409" />
-    <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2310.2409" />
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2310.2417" />
+    <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2310.2417" />
     <PackageReference Include="StackExchange.Redis" Version="2.2.4" />
   </ItemGroup>
 
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 511e3d72..f082749e 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2310.2509</h4>
+    <h4>Versione: 6.16.2310.2515</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 24c0b9d0..5e35af7b 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2310.2509
+6.16.2310.2515
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 264c7685..7033c15c 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2310.2509</version>
+  <version>6.16.2310.2515</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj
index 3436ee4e..93a7fb20 100644
--- a/MP.Data/MP.Data.csproj
+++ b/MP.Data/MP.Data.csproj
@@ -22,7 +22,7 @@
         <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
         <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2310.2417" />
         <PackageReference Include="MailKit" Version="4.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
+        <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="6.0.24" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.9" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.9" />
diff --git a/MP.Data/MailKitMailData.cs b/MP.Data/MailKitMailData.cs
index 286c54d8..82a3cbc0 100644
--- a/MP.Data/MailKitMailData.cs
+++ b/MP.Data/MailKitMailData.cs
@@ -29,7 +29,7 @@ namespace MP.Data
 
         public string? Body { get; set; }
 
-        // Attach (opzionale)
-        public IFormFileCollection? Attachments { get; set; }
+        //// Attach (opzionale)
+        //public IFormFileCollection? Attachments { get; set; }
     }
 }
diff --git a/MP.Data/Services/MailService.cs b/MP.Data/Services/MailService.cs
index 9c8d6d2c..ff5735cc 100644
--- a/MP.Data/Services/MailService.cs
+++ b/MP.Data/Services/MailService.cs
@@ -74,28 +74,28 @@ namespace MP.Data.Services
                 body.HtmlBody = mailData.Body;
                 mail.Body = body.ToMessageBody();
 
-                // Check if we got any attachments and add the to the builder for our message
-                if (mailData.Attachments != null)
-                {
-                    byte[] attachmentFileByteArray;
+                //// Check if we got any attachments and add the to the builder for our message
+                //if (mailData.Attachments != null)
+                //{
+                //    byte[] attachmentFileByteArray;
 
-                    foreach (IFormFile attachment in mailData.Attachments)
-                    {
-                        // Check if length of the file in bytes is larger than 0
-                        if (attachment.Length > 0)
-                        {
-                            // Create a new memory stream and attach attachment to mail body
-                            using (MemoryStream memoryStream = new MemoryStream())
-                            {
-                                // Copy the attachment to the stream
-                                attachment.CopyTo(memoryStream);
-                                attachmentFileByteArray = memoryStream.ToArray();
-                            }
-                            // Add the attachment from the byte array
-                            body.Attachments.Add(attachment.FileName, attachmentFileByteArray, ContentType.Parse(attachment.ContentType));
-                        }
-                    }
-                }
+                //    foreach (IFormFile attachment in mailData.Attachments)
+                //    {
+                //        // Check if length of the file in bytes is larger than 0
+                //        if (attachment.Length > 0)
+                //        {
+                //            // Create a new memory stream and attach attachment to mail body
+                //            using (MemoryStream memoryStream = new MemoryStream())
+                //            {
+                //                // Copy the attachment to the stream
+                //                attachment.CopyTo(memoryStream);
+                //                attachmentFileByteArray = memoryStream.ToArray();
+                //            }
+                //            // Add the attachment from the byte array
+                //            body.Attachments.Add(attachment.FileName, attachmentFileByteArray, ContentType.Parse(attachment.ContentType));
+                //        }
+                //    }
+                //}
 
                 #endregion Content