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

Correzioni warnings vari e test compilazione, fix applicazioni CORE in generale

Browse Source
This commit is contained in:
Samuele Locatelli
2026-05-28 10:33:00 +02:00
parent ce59a00d02
commit e4d56be0af
55 changed files with 108 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>8.16.2605.2809</Version>
<Version>8.16.2605.2810</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 8.16.2605.2809</h4>
<h4>Versione: 8.16.2605.2810</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
8.16.2605.2809
8.16.2605.2810
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>8.16.2605.2809</version>
<version>8.16.2605.2810</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Data/Controllers/MpIocController.cs
+5 -5
View File
@@ -346,14 +346,14 @@ namespace MP.Data.Controllers
using var dbCtx = new MoonProContext(options);
bool fatto = false;
var dbResult = dbCtx
.DbSetConfig
.Where(x => x.Chiave == updRec.Chiave)
.FirstOrDefault();
var dbResult = await dbCtx
.DbSetConfig
.Where(x => x.Chiave == updRec.Chiave)
.FirstOrDefaultAsync();
if (dbResult != null)
{
dbResult.Valore = updRec.Valore;
fatto = dbCtx.SaveChanges() > 0;
fatto = await dbCtx.SaveChangesAsync() > 0;
}
return fatto;
MP.Data/MoonProContext.cs
+2 -41
View File
@@ -1,9 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using MP.Core.DTO;
using MP.Data.DbModels;
using MP.Data.DbModels.Anag;
using NLog;
#nullable disable
// <Auto-Generated>
@@ -13,27 +11,9 @@ namespace MP.Data
{
public partial class MoonProContext : DbContext
{
#region Private Fields
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
private IConfiguration _configuration;
#endregion Private Fields
#region Public Constructors
//public MoonProContext(IConfiguration configuration)
//{
// _configuration = configuration;
//}
//public MoonProContext(DbContextOptions<MoonProContext> options, IConfiguration configuration)
//: base(options)
//{
// _configuration = configuration;
//}
public MoonProContext(DbContextOptions<MoonProContext> options) : base(options)
{
}
@@ -92,7 +72,6 @@ namespace MP.Data
public virtual DbSet<RegCheckModel> DbSetRegWithCheck { get; set; }
public virtual DbSet<SignalLogModel> DbSetSignalLog { get; set; }
public virtual DbSet<ST_Act> DbSetStAct { get; set; }
public virtual DbSet<ST_ActRow> DbSetStActRow { get; set; }
public virtual DbSet<ST_AnagGruppi> DbSetStAnagGruppi { get; set; }
@@ -130,26 +109,8 @@ namespace MP.Data
{
if (!optionsBuilder.IsConfigured)
{
string connString = _configuration.GetConnectionString("MP.Data");
if (string.IsNullOrEmpty(connString))
{
connString = _configuration.GetConnectionString("MP.All");
}
if (string.IsNullOrEmpty(connString))
{
connString = _configuration.GetConnectionString("MP.Land");
}
if (string.IsNullOrEmpty(connString))
{
connString = _configuration.GetConnectionString("MP.Mon");
}
if (string.IsNullOrEmpty(connString))
{
connString = _configuration.GetConnectionString("MP.STATS");
}
optionsBuilder.UseSqlServer(connString);
//optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;");
// fallback si spera non necessario
optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;");
}
}
MP.Data/MoonPro_UtilsContext.cs
+2 -19
View File
@@ -1,8 +1,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using MP.Data.DbModels.Mtc;
using MP.Data.DbModels.Utils;
using NLog;
using System;
#nullable disable
@@ -13,14 +11,6 @@ namespace MP.Data
{
public partial class MoonPro_UtilsContext : DbContext
{
#region Private Fields
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
private IConfiguration _configuration;
#endregion Private Fields
#region Public Constructors
/// <summary>
@@ -66,15 +56,8 @@ namespace MP.Data
{
if (!optionsBuilder.IsConfigured)
{
string connString = _configuration.GetConnectionString("MP.Utils");
if (!string.IsNullOrEmpty(connString))
{
optionsBuilder.UseSqlServer(connString);
}
else
{
optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro_Utils;Trusted_Connection=True;");
}
// fallback (si spera non necessario)
optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro_Utils;Trusted_Connection=True;");
}
}
MP.Data/Services/IOC/IocService.cs
+4 -8
View File
@@ -468,10 +468,6 @@ namespace MP.Data.Services.IOC
/// <returns></returns>
private async Task<T> GetOrFetchAsync<T>(string cacheKey, Func<Task<T>> fetchFunc, TimeSpan expiration)
{
// GetOrSetAsync di Fusion cache:
// - TryGetValue, se mancasse crea un lock solo per QUELLA key
// - Esegue fetchFunc (la logica Redis + DB)
// - Salva in memoria e rilascia il lock
return await _cache.GetOrSetAsync<T>(
cacheKey,
async ct => await fetchFunc(),
@@ -1066,19 +1062,19 @@ namespace MP.Data.Services.IOC
string currVals = $"idxMacchina: {idxMacchina} | valOut: {valore} | dtEve: {dtEve} | dtCurr:{dtCurr}";
if (dtEve == null || dtCurr == null)
{
Log.Warn($"procInput: null found | {currVals}");
Log.Warn($"{_className} | procInput: null found | {currVals}");
}
else if (dtEve.Length < 17 || dtCurr.Length < 17)
{
Log.Info($"procInput: invalid data | {currVals}");
Log.Info($"{_className} | procInput: invalid data | {currVals}");
}
else if (string.IsNullOrEmpty(idxMacchina))
{
Log.Info($"procInput: missing IdxMacchina | {currVals}");
Log.Info($"{_className} | procInput: missing IdxMacchina | {currVals}");
}
else if (string.IsNullOrEmpty(valore))
{
Log.Info($"procInput: missing valOut | {currVals}");
Log.Info($"{_className} | procInput: missing valOut | {currVals}");
}
else
{
MP.Data/Services/MessageService.cs
-18
View File
@@ -47,10 +47,6 @@ namespace MP.Data.Services
public event Action EA_OperUpdated = null!;
public event Action EA_PageUpdated = null!;
public event Action EA_ResetFooterTimer = null!;
#endregion Public Events
#region Public Properties
@@ -707,26 +703,12 @@ namespace MP.Data.Services
private AnagOperatoriModel? _rigaOper;
/// <summary>
/// Durata cache lunga IN SECONDI
/// </summary>
private int cacheTtlLong = 60 * 5;
/// <summary>
/// Durata cache breve IN SECONDI
/// </summary>
private int cacheTtlShort = 60 * 1;
private string lastIdxMacc = "";
private DateTime lastUserUpd = DateTime.Now;
private Logger Log = LogManager.GetCurrentClassLogger();
private string redisBaseKey = "MP:TAB:User";
private Random rnd = new Random();
#endregion Private Fields
#region Private Properties
MP.Data/Services/OrderDataSrv.cs
-5
View File
@@ -1,16 +1,11 @@
using Microsoft.Extensions.Configuration;
using MP.Core.Conf;
using MP.Data.DbModels;
using Newtonsoft.Json;
using NLog;
using StackExchange.Redis;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Data;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
MP.Data/Services/TabDataService.cs
+1 -63
View File
@@ -3945,75 +3945,13 @@ namespace MP.Data.Services
#region Private Methods
/// <summary>
/// Esegue flush memoria _redisConn dato pat2Flush, metodo sincrono
/// </summary>
/// <param name="pat2Flush"></param>
/// <returns></returns>
private bool ExecFlushRedisPattern(RedisValue pat2Flush)
{
bool answ = false;
var masterEndpoint = _redisConn.GetEndPoints()
.Where(ep => _redisConn.GetServer(ep).IsConnected && !_redisConn.GetServer(ep).IsReplica)
.FirstOrDefault();
// sepattern è "*" elimino intero DB...
if (masterEndpoint != null && (pat2Flush.Equals(new RedisValue("*")) || pat2Flush == RedisValue.Null))
{
_redisConn.GetServer(masterEndpoint).FlushDatabase(database: _redisDb.Database);
}
else
{
var server = _redisConn.GetServer(masterEndpoint);
var keys = server.Keys(database: _redisDb.Database, pattern: pat2Flush, pageSize: 1000);
var batch = new List<RedisKey>();
foreach (var key in keys)
{
batch.Add(key);
// Flush in batches of 1000
if (batch.Count >= 1000)
{
foreach (var item in batch)
_redisDb.KeyDelete(item);
batch.Clear();
}
}
// Flush remaining keys
foreach (var item in batch)
_redisDb.KeyDelete(item);
}
answ = true;
#if false
var listEndpoints = redisConn.GetEndPoints();
foreach (var endPoint in listEndpoints)
{
//var server = redisConnAdmin.GetServer(listEndpoints[0]);
var server = redisConn.GetServer(endPoint);
if (server != null)
{
var keyList = server.Keys(redisDb.Database, pattern);
foreach (var item in keyList)
{
redisDb.KeyDelete(item);
}
answ = true;
}
}
#endif
// notifico update ai client in ascolto x reset cache
NotifyReloadRequest($"FlushRedisCache | {pat2Flush}");
return answ;
}
/// <summary>
/// Esegue flush memoria _redisConn dato pat2Flush in async
/// </summary>
/// <param name="pat2Flush"></param>
/// <returns></returns>
private async Task<bool> ExecFlushRedisPatternAsync(RedisValue pat2Flush)
private async new Task<bool> ExecFlushRedisPatternAsync(RedisValue pat2Flush)
{
bool answ = false;
var masterEndpoint = _redisConn.GetEndPoints()
MP.INVE/MP.INVE.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.INVE</RootNamespace>
<Version>8.16.2605.2809</Version>
<Version>8.16.2605.2810</Version>
</PropertyGroup>
<ItemGroup>
MP.INVE/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOINVE </i>
<h4>Versione: 8.16.2605.2809</h4>
<h4>Versione: 8.16.2605.2810</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.INVE/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
8.16.2605.2809
8.16.2605.2810
MP.INVE/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>8.16.2605.2809</version>
<version>8.16.2605.2810</version>
<url>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.IOC/Data/MpDataService.cs
+11 -18
View File
@@ -1319,7 +1319,7 @@ namespace MP.IOC.Data
/// Restitusice elenco fasi
/// </summary>
/// <returns></returns>
public Task<List<AnagGruppiModel>> ElencoGruppiFase()
public async Task<List<AnagGruppiModel>> ElencoGruppiFaseAsync()
{
List<AnagGruppiModel> result = new List<AnagGruppiModel>();
Stopwatch stopWatch = new Stopwatch();
@@ -1327,7 +1327,7 @@ namespace MP.IOC.Data
string readType = "DB";
string currKey = $"{Utils.redisAnagGruppi}";
// cerco in redis dato valOut sel macchina...
RedisValue rawData = redisDb.StringGet(currKey);
RedisValue rawData = await redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
var rawResult = JsonConvert.DeserializeObject<List<AnagGruppiModel>>($"{rawData}");
@@ -1339,10 +1339,10 @@ namespace MP.IOC.Data
}
else
{
result = SpecDbController.AnagGruppiFase();
result = await SpecDbController.AnagGruppiFaseAsync();
// serializzo e salvo...
rawData = JsonConvert.SerializeObject(result);
redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache / 5));
await redisDb.StringSetAsync(currKey, rawData, getRandTOut(redisLongTimeCache / 5));
}
if (result == null)
{
@@ -1350,17 +1350,10 @@ namespace MP.IOC.Data
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"ElencoGruppiFase | Read from {readType}: {ts.TotalMilliseconds}ms");
return Task.FromResult(result);
Log.Debug($"ElencoGruppiFaseAsync | Read from {readType}: {ts.TotalMilliseconds}ms");
return result;
}
#if false
public Task<List<LinkMenuModel>> ElencoLinkAsync()
{
return SpecDbController.ElencoLinkAsync();
}
#endif
/// <summary>
/// Aggiunta record EventList
/// </summary>
@@ -1803,7 +1796,7 @@ namespace MP.IOC.Data
/// </summary>
/// <param name="IdxOdl">idxMacc odl da cercare</param>
/// <returns></returns>
public async Task<List<AnagGiacenzeModel>> ListGiacenze(int IdxOdl)
public async Task<List<AnagGiacenzeModel>> ListGiacenzeAsync(int IdxOdl)
{
List<AnagGiacenzeModel>? result = new List<AnagGiacenzeModel>();
Stopwatch stopWatch = new Stopwatch();
@@ -1811,7 +1804,7 @@ namespace MP.IOC.Data
string readType = "DB";
string currKey = $"{Utils.redisGiacenzaList}:{IdxOdl}";
// cerco in redis dato valOut sel macchina...
RedisValue rawData = redisDb.StringGet(currKey);
RedisValue rawData = await redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject<List<AnagGiacenzeModel>>($"{rawData}");
@@ -1819,10 +1812,10 @@ namespace MP.IOC.Data
}
else
{
result = await Task.FromResult(SpecDbController.ListGiacenze(IdxOdl));
result = await SpecDbController.ListGiacenzeAsync(IdxOdl);
// serializzo e salvo...
rawData = JsonConvert.SerializeObject(result);
redisDb.StringSet(currKey, rawData, TimeSpan.FromSeconds(redisShortTimeCache));
await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromSeconds(redisShortTimeCache));
}
if (result == null)
{
@@ -1830,7 +1823,7 @@ namespace MP.IOC.Data
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"ListGiacenze | Read from {readType}: {ts.TotalMilliseconds}ms");
Log.Debug($"ListGiacenzeAsync | Read from {readType}: {ts.TotalMilliseconds}ms");
return result;
}
MP.IOC/MP.IOC.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>8.16.2605.2808</Version>
<Version>8.16.2605.2810</Version>
</PropertyGroup>
<ItemGroup>
MP.IOC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MP-IOC </i>
<h4>Versione: 8.16.2605.2808</h4>
<h4>Versione: 8.16.2605.2810</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.IOC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
8.16.2605.2808
8.16.2605.2810
MP.IOC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>8.16.2605.2808</version>
<version>8.16.2605.2810</version>
<url>https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/MP.IOC.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Land/MP.Land.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>MP.Land</RootNamespace>
<Version>8.16.2605.2809</Version>
<Version>8.16.2605.2810</Version>
<Configurations>Debug;Release;Debug_LiManDebug</Configurations>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<RunAnalyzersDuringBuild>True</RunAnalyzersDuringBuild>
MP.Land/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo Tablet MAPO - DotNet6</i>
<h4>Versione: 8.16.2605.2809</h4>
<h4>Versione: 8.16.2605.2810</h4>
<br />
Note di rilascio:
<ul>
MP.Land/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
8.16.2605.2809
8.16.2605.2810
MP.Land/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>8.16.2605.2809</version>
<version>8.16.2605.2810</version>
<url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MON/MP.MON.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.MON</RootNamespace>
<AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
<Version>8.16.2605.2809</Version>
<Version>8.16.2605.2810</Version>
</PropertyGroup>
<ItemGroup>
MP.MON/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 8.16.2605.2809</h4>
<h4>Versione: 8.16.2605.2810</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.MON/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
8.16.2605.2809
8.16.2605.2810
MP.MON/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>8.16.2605.2809</version>
<version>8.16.2605.2810</version>
<url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.MON.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Prog/MP.Prog.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>MP.Prog</RootNamespace>
<Version>8.16.2605.2809</Version>
<Version>8.16.2605.2810</Version>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
MP.Prog/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo gestione Programmi MAPO</i>
<h4>Versione: 8.16.2605.2809</h4>
<h4>Versione: 8.16.2605.2810</h4>
<br />
Note di rilascio:
<ul>
MP.Prog/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
8.16.2605.2809
8.16.2605.2810
MP.Prog/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>8.16.2605.2809</version>
<version>8.16.2605.2810</version>
<url>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.RIOC/MP.RIOC.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.RIOC</RootNamespace>
<Version>8.16.2605.2809</Version>
<Version>8.16.2605.2810</Version>
</PropertyGroup>
<ItemGroup>
MP.RIOC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MP-RIOC </i>
<h4>Versione: 8.16.2605.2809</h4>
<h4>Versione: 8.16.2605.2810</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.RIOC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
8.16.2605.2809
8.16.2605.2810
MP.RIOC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>8.16.2605.2809</version>
<version>8.16.2605.2810</version>
<url>https://nexus.steamware.net/repository/SWS/MP-RIOC/stable/LAST/MP.RIOC.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-RIOC/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.SPEC/Components/ProdKit/KitComposer.razor.cs
+2 -3
View File
@@ -10,10 +10,10 @@ namespace MP.SPEC.Components.ProdKit
#region Public Properties
[Parameter]
public EventCallback<bool> EC_ListUpdated { get; set; }
public EventCallback<bool> EC_ListCleared { get; set; }
[Parameter]
public EventCallback<bool> EC_ListCleared { get; set; }
public EventCallback<bool> EC_ListUpdated { get; set; }
[Parameter]
public string KeyFilt { get; set; } = "";
@@ -75,7 +75,6 @@ namespace MP.SPEC.Components.ProdKit
#region Private Fields
private PODLExpModel? currRec = null;
private List<WipSetupKitModel> ListRecords = new List<WipSetupKitModel>();
#endregion Private Fields
MP.SPEC/Components/ProdKit/KitDetailModal.razor
+20 -9
View File
@@ -80,20 +80,31 @@
</tr>
</thead>
<tbody>
@foreach (var record in ListTK)
@if (ListTK == null)
{
<tr>
<td>
@record.CodArtParent
</td>
<td>
@record.CodArtChild
</td>
<td class="text-end">
<div>@record.Qty</div>
<td colspan="3">
<div class="alert alert-info">No data found</div>
</td>
</tr>
}
else
{
foreach (var record in ListTK)
{
<tr>
<td>
@record.CodArtParent
</td>
<td>
@record.CodArtChild
</td>
<td class="text-end">
<div>@record.Qty</div>
</td>
</tr>
}
}
</tbody>
</table>
}
MP.SPEC/Components/ProdKit/Manager.razor.cs
+2 -4
View File
@@ -2,8 +2,6 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Authorization;
using MP.Data.DbModels;
using MP.SPEC.Data;
using System;
using System.Reflection.PortableExecutable;
namespace MP.SPEC.Components.ProdKit
{
@@ -105,7 +103,7 @@ namespace MP.SPEC.Components.ProdKit
}
currPodlRec = selRec;
isComposing = true;
await EC_IsComposing.InvokeAsync(true);
await EC_IsComposing.InvokeAsync(isComposing);
// rileggo
ReloadData();
@@ -166,7 +164,7 @@ namespace MP.SPEC.Components.ProdKit
}
ReloadData();
isComposing = false;
await EC_IsComposing.InvokeAsync(false);
await EC_IsComposing.InvokeAsync(isComposing);
}
private async Task SetHasOdl(bool setHasOdl)
MP.SPEC/Components/Reparti/ListOperatori.razor.cs
-2
View File
@@ -62,8 +62,6 @@ namespace MP.SPEC.Components.Reparti
private int currPage = 1;
private AnagOperatoriModel? EditRecord = null;
private bool isLoading = false;
private List<AnagOperatoriModel>? ListAvail;
MP.SPEC/MP.SPEC.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.SPEC</RootNamespace>
<Version>8.16.2605.2809</Version>
<Version>8.16.2605.2810</Version>
<UserSecretsId>1800a78a-6ff1-40f9-b490-87fb8bfc1394</UserSecretsId>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
MP.SPEC/Pages/Giacenze.razor.cs
+4 -1
View File
@@ -33,7 +33,10 @@ namespace MP.SPEC.Pages
var uri = NavManager.ToAbsoluteUri(NavManager.Uri);
if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("IdxOdl", out var _idxOdl))
{
IdxOdl = int.Parse(_idxOdl);
if (!string.IsNullOrEmpty(_idxOdl))
{
IdxOdl = int.Parse(_idxOdl.ToString());
}
}
odlExp = MDService.OdlByKey(IdxOdl);
}
MP.SPEC/Pages/Podl2Kit.razor.cs
+2 -2
View File
@@ -246,9 +246,9 @@ namespace MP.SPEC.Pages
private List<MacchineModel> ListMacchine = new List<MacchineModel>();
private List<IstanzeKitModel>? ListRecords;
private List<IstanzeKitModel>? ListRecords = new();
private List<ListValuesModel>? ListStati;
private List<ListValuesModel>? ListStati = new();
private int minChar = 2;
MP.SPEC/Pages/ProdPlanner.razor
+2 -1
View File
@@ -11,7 +11,8 @@
</div>
</div>
<div class="card-body">
<CalendarPlanner EvDtoList="ListEventi"></CalendarPlanner>
<div>inserire calendar planner</div>
@* <CalendarPlanner EvDtoList="ListEventi"></CalendarPlanner> *@
</div>
</div>
MP.SPEC/Program.cs
+5 -2
View File
@@ -226,8 +226,11 @@ if (!string.IsNullOrEmpty(BasePathOdlReturn))
// https://harrybellamy.com/posts/getting-mime-types-from-file-extensions-in-net-core/
foreach (var item in mimeDict)
{
// Add new mappings
provider.Mappings[item.Key] = item.Value;
if (!string.IsNullOrEmpty(item.Value))
{
// Add new mappings
provider.Mappings[item.Key] = item.Value;
}
}
}
MP.SPEC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 8.16.2605.2809</h4>
<h4>Versione: 8.16.2605.2810</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.SPEC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
8.16.2605.2809
8.16.2605.2810
MP.SPEC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>8.16.2605.2809</version>
<version>8.16.2605.2810</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/Services/IOApiService.cs
+2 -4
View File
@@ -1,7 +1,5 @@
using Microsoft.Extensions.Configuration;
using MP.SPEC.Data;
using MP.SPEC.Data;
using NLog;
using System.Text.Json;
namespace MP.SPEC.Services
{
@@ -21,7 +19,7 @@ namespace MP.SPEC.Services
_configuration = configuration;
_clientFactory = clientFactory;
// conf url x chiamate REST
MpIoBaseUrl = _configuration.GetValue<string>("ServerConf:MpIoBaseUrl");
MpIoBaseUrl = _configuration.GetValue<string>("ServerConf:MpIoBaseUrl") ?? "MoonPro";
}
#endregion Public Constructors
MP.Stats/Components/ChartEnergy.razor
+1 -2
View File
@@ -1,5 +1,4 @@
@using ChartJs
<div class="row">
@if (RawData == null || RawData.Count == 0)
{
MP.Stats/Components/ChartJs/Chart.razor
+3 -3
View File
@@ -16,13 +16,13 @@
public ChartType Type { get; set; }
[Parameter]
public string[]? Data { get; set; }
public string[] Data { get; set; }
[Parameter]
public string[]? BackgroundColor { get; set; }
public string[] BackgroundColor { get; set; }
[Parameter]
public string[]? Labels { get; set; }
public string[] Labels { get; set; }
protected override async Task OnAfterRenderAsync(bool firstRender)
{
MP.Stats/MP.Stats.csproj
+5 -1
View File
@@ -4,10 +4,14 @@
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>MP.Stats</RootNamespace>
<UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
<Version>8.16.2605.2809</Version>
<Version>8.16.2605.2810</Version>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
<PropertyGroup>
<NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Components\TaskEdit.razor.cs" />
MP.Stats/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo statistiche MAPO</i>
<h4>Versione: 8.16.2605.2809</h4>
<h4>Versione: 8.16.2605.2810</h4>
<br />
Note di rilascio:
<ul>
MP.Stats/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
8.16.2605.2809
8.16.2605.2810
MP.Stats/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>8.16.2605.2809</version>
<version>8.16.2605.2810</version>
<url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>