Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop

Browse Source
This commit is contained in:
zaccaria.majid
2023-10-26 08:51:25 +02:00
parent 8a121f59b2 58c4340631
commit df5f78729c
15 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/MachineBlock.razor.cs
+9 -5
View File
@@ -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;
}
}
MP-TAB-SERV/Components/ProdStat.razor
+12 -3
View File
@@ -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>
MP-TAB-SERV/MP-TAB-SERV.csproj
+2 -2
View File
@@ -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>
MP.Data/MP.Data.csproj
+2 -2
View File
@@ -20,9 +20,9 @@
<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.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" />
MP.Data/MailKitMailData.cs
+2 -2
View File
@@ -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; }
}
}
MP.Data/Services/MailService.cs
+21 -21
View File
@@ -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
MP.SPEC/Components/ODLPlot.razor
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="px-1 flex-fill">
@if (isLoading)
{
<LoadingDataSmall></LoadingDataSmall>
<LoadingData DisplaySize="LoadingData.CtrlSize.Small"></LoadingData>
}
else
{
MP.SPEC/MP.SPEC.csproj
+3 -3
View File
@@ -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>
MP.SPEC/Pages/DOSS.razor
+1 -1
View File
@@ -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
MP.SPEC/Pages/Giacenze.razor
+1 -1
View File
@@ -14,7 +14,7 @@ else
</div>
@if (odlExp == null)
{
<LoadingDataSmall></LoadingDataSmall>
<LoadingData DisplaySize="LoadingData.CtrlSize.Small"></LoadingData>
}
else
{
MP.SPEC/Pages/PARAMS.razor
+1 -1
View File
@@ -9,7 +9,7 @@
<div class="px-2 flex-fill">
@if (isFiltering)
{
<LoadingDataSmall></LoadingDataSmall>
<LoadingData DisplaySize="LoadingData.CtrlSize.Small"></LoadingData>
}
else
{
MP.SPEC/Resources/ChangeLog.html
+1 -1
View File
@@ -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>
MP.SPEC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.2409
6.16.2310.2512
MP.SPEC/Resources/manifest.xml
+1 -1
View File
@@ -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>
MP.SPEC/Shared/NavMenu.razor
+1 -1
View File
@@ -32,7 +32,7 @@
</div>
@if (ElencoLink == null)
{
<LoadingDataSmall></LoadingDataSmall>
<LoadingData DisplaySize="LoadingData.CtrlSize.Small"></LoadingData>
}
else
{