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 @@ Statistiche di prodizione
- @($"ODL: {RecMSE.IdxOdl}") + @if (RecMSE != null) + { + @($"ODL: {RecMSE.IdxOdl}") + }
@@ -144,10 +147,16 @@ Data di inizio
- @($"{RecMSE.DataInizioOdl:yyyy/MM/dd}") + @if (RecMSE != null) + { + @($"{RecMSE.DataInizioOdl:yyyy/MM/dd}") + }
- @($"{RecMSE.DataInizioOdl:HH: mm}") + @if (RecMSE != null) + { + @($"{RecMSE.DataInizioOdl:HH: mm}") + }
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index a565a4f8..624735a1 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index 36747f66..93a7fb20 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -20,9 +20,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 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 @@
@if (isLoading) { - + } 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 @@ enable enable MP.SPEC - 6.16.2310.2409 + 6.16.2310.2512 @@ -39,8 +39,8 @@ - - + + 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 @@
@if (isFiltering) { - + filtro x macchina / periodo } 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
@if (odlExp == null) { - + } 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 @@
@if (isFiltering) { - + } 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 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.2409

+

Versione: 6.16.2310.2512


Note di rilascio:
  • 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 @@ - 6.16.2310.2409 + 6.16.2310.2512 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false 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 @@
@if (ElencoLink == null) { - + } else {