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

Fix MacchineModel in proj non ancora ricompilati

Browse Source
This commit is contained in:
Samuele Locatelli
2025-06-30 14:33:44 +02:00
parent 237a770067
commit f73c62c3df
27 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.IOC/Data/MpDataService.cs
+4 -4
View File
@@ -858,9 +858,9 @@ namespace MP.IOC.Data
/// </summary>
/// <param name="codGruppo"></param>
/// <returns></returns>
public async Task<List<Macchine>> MacchineGetFilt(string codGruppo)
public async Task<List<MacchineModel>> MacchineGetFilt(string codGruppo)
{
List<Macchine>? result = new List<Macchine>();
List<MacchineModel>? result = new List<MacchineModel>();
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string readType = "DB";
@@ -870,7 +870,7 @@ namespace MP.IOC.Data
RedisValue rawData = redisDb.StringGet(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject<List<Macchine>>($"{rawData}");
result = JsonConvert.DeserializeObject<List<MacchineModel>>($"{rawData}");
readType = "REDIS";
}
else
@@ -882,7 +882,7 @@ namespace MP.IOC.Data
}
if (result == null)
{
result = new List<Macchine>();
result = new List<MacchineModel>();
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
MP.IOC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MP-IOC </i>
<h4>Versione: 6.16.2504.1617</h4>
<h4>Versione: 6.16.2506.3014</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.IOC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2504.1617
6.16.2506.3014
MP.IOC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2504.1617</version>
<version>6.16.2506.3014</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.MON/Components/Pages/Index.razor.cs
+1 -1
View File
@@ -217,7 +217,7 @@ namespace MP.MON.Components.Pages
private bool doBlink = false;
private List<Macchine> listMacchine = new List<Macchine>();
private List<MacchineModel> listMacchine = new List<MacchineModel>();
private List<MappaStatoExplModel>? ListMSE = null;
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>6.16.2504.1418</Version>
<Version>6.16.2506.3014</Version>
</PropertyGroup>
<ItemGroup>
MP.MON/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2504.1418</h4>
<h4>Versione: 6.16.2506.3014</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.MON/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2504.1418
6.16.2506.3014
MP.MON/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2504.1418</version>
<version>6.16.2506.3014</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.SPEC/Components/ListDossiers.razor.cs
+1 -1
View File
@@ -317,7 +317,7 @@ namespace MP.SPEC.Components
private List<AnagArticoliModel>? ListArticoli;
private List<AnagGruppiModel>? ListGruppiFase;
private List<Macchine>? ListMacchine;
private List<MacchineModel>? ListMacchine;
private List<DossierModel>? ListRecords;
private List<ListValuesModel>? ListStati;
MP.SPEC/Components/Reparti/ListMacchine.razor.cs
+7 -7
View File
@@ -10,13 +10,13 @@ namespace MP.SPEC.Components.Reparti
#region Public Properties
[Parameter]
public List<Macchine>? AllRecords { get; set; } = null;
public List<MacchineModel>? AllRecords { get; set; } = null;
[Parameter]
public string CodGruppoCurr { get; set; } = "";
[Parameter]
public List<Macchine>? CurrRecords { get; set; } = null;
public List<MacchineModel>? CurrRecords { get; set; } = null;
[Parameter]
public EventCallback<bool> EC_RecChange { get; set; }
@@ -63,8 +63,8 @@ namespace MP.SPEC.Components.Reparti
private bool isLoading = false;
private List<Macchine>? ListAvail;
private List<Macchine>? ListRecords;
private List<MacchineModel>? ListAvail;
private List<MacchineModel>? ListRecords;
private int numRecord = 5;
private int totalCount = 0;
@@ -92,7 +92,7 @@ namespace MP.SPEC.Components.Reparti
#region Private Methods
private async Task DoAdd(Macchine currRec)
private async Task DoAdd(MacchineModel currRec)
{
// eliminazione dal gruppo
Gruppi2MaccModel rec2del = new Gruppi2MaccModel()
@@ -104,7 +104,7 @@ namespace MP.SPEC.Components.Reparti
await EC_RecChange.InvokeAsync(false);
}
private async Task DoDelete(Macchine currRec)
private async Task DoDelete(MacchineModel currRec)
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", "Eliminazione record dal gruppo: sei sicuro di voler procedere?"))
return;
@@ -142,7 +142,7 @@ namespace MP.SPEC.Components.Reparti
.ToList();
totalCount = CurrRecords.Count;
}
ListAvail = new List<Macchine>();
ListAvail = new List<MacchineModel>();
if (AllRecords != null)
{
foreach (var item in AllRecords)
MP.SPEC/Components/Reparti/ModalMaccAdd.razor
+5 -5
View File
@@ -65,12 +65,12 @@
[Parameter]
public List<Macchine>? AllRecords { get; set; } = null;
public List<MacchineModel>? AllRecords { get; set; } = null;
[Parameter]
public EventCallback<bool> EC_Close { get; set; }
[Parameter]
public EventCallback<Macchine> EC_ReqAdd { get; set; }
public EventCallback<MacchineModel> EC_ReqAdd { get; set; }
private int numRecord = 5;
@@ -90,7 +90,7 @@
private int totalCount = 0;
private int currPage = 1;
private bool isLoading = false;
private List<Macchine>? ListRecords;
private List<MacchineModel>? ListRecords;
private string btnSearchCss
{
@@ -114,7 +114,7 @@
totalCount = 0;
if (AllRecords != null)
{
List<Macchine> tmpList = new List<Macchine>(AllRecords);
List<MacchineModel> tmpList = new List<MacchineModel>(AllRecords);
// verifico ricerca
if (!string.IsNullOrEmpty(SearchVal))
{
@@ -146,7 +146,7 @@
await EC_Close.InvokeAsync(true);
}
private async Task DoAdd(Macchine currRec)
private async Task DoAdd(MacchineModel currRec)
{
// sollevo evento richiesta aggiunta ...
await EC_ReqAdd.InvokeAsync(currRec);
MP.SPEC/Components/SelFilterXDL.razor.cs
+1 -1
View File
@@ -19,7 +19,7 @@ namespace MP.SPEC.Components
public List<AnagGruppiModel>? ListGruppiFase { get; set; } = null;
[Parameter]
public List<Macchine>? ListMacchine { get; set; } = null;
public List<MacchineModel>? ListMacchine { get; set; } = null;
[Parameter]
public List<ListValuesModel>? ListStati { get; set; } = null;
MP.SPEC/Data/MpDataService.cs
+4 -4
View File
@@ -1450,9 +1450,9 @@ namespace MP.SPEC.Data
/// </summary>
/// <param name="codGruppo"></param>
/// <returns></returns>
public List<Macchine> MacchineGetFilt(string codGruppo)
public List<MacchineModel> MacchineGetFilt(string codGruppo)
{
List<Macchine>? result = new List<Macchine>();
List<MacchineModel>? result = new List<MacchineModel>();
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string readType = "DB";
@@ -1462,7 +1462,7 @@ namespace MP.SPEC.Data
RedisValue rawData = redisDb.StringGet(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject<List<Macchine>>($"{rawData}");
result = JsonConvert.DeserializeObject<List<MacchineModel>>($"{rawData}");
readType = "REDIS";
}
else
@@ -1474,7 +1474,7 @@ namespace MP.SPEC.Data
}
if (result == null)
{
result = new List<Macchine>();
result = new List<MacchineModel>();
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
MP.SPEC/MP.SPEC.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.SPEC</RootNamespace>
<Version>6.16.2506.1118</Version>
<Version>6.16.2506.3014</Version>
<UserSecretsId>1800a78a-6ff1-40f9-b490-87fb8bfc1394</UserSecretsId>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
MP.SPEC/Pages/GroupMacOprMan.razor.cs
+2 -2
View File
@@ -11,8 +11,8 @@ namespace MP.SPEC.Pages
{
#region Protected Fields
protected List<Macchine>? ListMacchine = null;
protected List<Macchine>? ListMacchineAll = null;
protected List<MacchineModel>? ListMacchine = null;
protected List<MacchineModel>? ListMacchineAll = null;
protected List<AnagOperatoriModel>? ListOperatori = null;
protected List<AnagOperatoriModel>? ListOperatoriAll = null;
protected List<RepartiDTO>? ListReparti = null;
MP.SPEC/Pages/ODL.razor.cs
+1 -1
View File
@@ -160,7 +160,7 @@ namespace MP.SPEC.Pages
#region Private Fields
private List<Macchine>? ListMacchine;
private List<MacchineModel>? ListMacchine;
private List<MP.Data.DbModels.ListValuesModel>? ListStati;
#endregion Private Fields
MP.SPEC/Pages/PODL.razor.cs
+1 -1
View File
@@ -300,7 +300,7 @@ namespace MP.SPEC.Pages
private List<AnagArticoliModel>? ListArticoli;
private List<AnagGruppiModel>? ListAziende;
private List<AnagGruppiModel>? ListGruppiFase;
private List<Macchine>? ListMacchine;
private List<MacchineModel>? ListMacchine;
private List<ListValuesModel>? ListStati;
private int nArtSearch = 5;
MP.SPEC/Pages/Podl2Kit.razor.cs
+1 -1
View File
@@ -246,7 +246,7 @@ namespace MP.SPEC.Pages
private List<AnagGruppiModel> ListGruppiFase = new List<AnagGruppiModel>();
private List<Macchine> ListMacchine = new List<Macchine>();
private List<MacchineModel> ListMacchine = new List<MacchineModel>();
private List<IstanzeKitModel>? ListRecords;
MP.SPEC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2506.1118</h4>
<h4>Versione: 6.16.2506.3014</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.SPEC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2506.1118
6.16.2506.3014
MP.SPEC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2506.1118</version>
<version>6.16.2506.3014</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.Stats/Data/MpStatsService.cs
+4 -4
View File
@@ -248,20 +248,20 @@ namespace MP.Stats.Data
return answ;
}
public async Task<List<Macchine>> MacchineGetAll()
public async Task<List<MacchineModel>> MacchineGetAll()
{
// setup parametri costanti
string source = "DB";
Stopwatch sw = new Stopwatch();
sw.Start();
List<Macchine> result = new List<Macchine>();
List<MacchineModel> result = new List<MacchineModel>();
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = $"{redisBaseKey}:Cache:Macchine";
RedisValue rawData = await redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject<List<Macchine>>($"{rawData}");
result = JsonConvert.DeserializeObject<List<MacchineModel>>($"{rawData}");
source = "REDIS";
}
else
@@ -273,7 +273,7 @@ namespace MP.Stats.Data
}
if (result == null)
{
result = new List<Macchine>();
result = new List<MacchineModel>();
}
sw.Stop();
Log.Debug($"MacchineGetAll | {source} | {sw.Elapsed.TotalMilliseconds}ms");
MP.Stats/MP.Stats.csproj
+2 -2
View File
@@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>MP.Stats</RootNamespace>
<UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
<Version>6.16.2505.1908</Version>
<Version>6.16.2505.1908</Version>
<Version>6.16.2506.3014</Version>
<Version>6.16.2506.3014</Version>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
MP.Stats/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo statistiche MAPO</i>
<h4>Versione: 6.16.2505.1908</h4>
<h4>Versione: 6.16.2506.3014</h4>
<br />
Note di rilascio:
<ul>
MP.Stats/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2505.1908
6.16.2506.3014
MP.Stats/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2505.1908</version>
<version>6.16.2506.3014</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>