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

Merge branch 'Release/SpecAddKitCreation_02'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-04-14 18:26:18 +02:00
parent bf94c59bef e83ae513a8
commit fe32fcd95a
56 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/AlarmsMan.razor.cs
+2 -2
View File
@@ -15,7 +15,7 @@ namespace MP_TAB3.Components
#region Public Properties
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
@@ -223,7 +223,7 @@ namespace MP_TAB3.Components
private Periodo CurrPeriodo { get; set; } = new Periodo();
private string IdxMaccSel { get; set; } = "";
private MappaStatoExpl? lastRecMSE { get; set; } = null;
private MappaStatoExplModel? lastRecMSE { get; set; } = null;
#endregion Private Properties
}
MP-TAB3/Components/CheckControls.razor.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace MP_TAB3.Components
#region Public Properties
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/CommentEditor.razor.cs
+1 -1
View File
@@ -19,7 +19,7 @@ namespace MP_TAB3.Components
public EventCallback<DateTime> E_DateSel { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
[Parameter]
public string Title { get; set; } = "NA";
MP-TAB3/Components/ControlsMan.razor.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace MP_TAB3.Components
public EventCallback<bool> E_Updated { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/DeclarEditor.razor.cs
+1 -1
View File
@@ -28,7 +28,7 @@ namespace MP_TAB3.Components
}
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/DeclarMan.razor.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace MP_TAB3.Components
public EventCallback<string> E_MachSel { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/InsManual.razor.cs
+2 -2
View File
@@ -16,7 +16,7 @@ namespace MP_TAB3.Components
#region Public Properties
[Parameter]
public MappaStatoExpl? RecMSE
public MappaStatoExplModel? RecMSE
{
get => currRecMSE;
set
@@ -310,7 +310,7 @@ namespace MP_TAB3.Components
private bool confProdActive { get; set; } = false;
private MappaStatoExpl? currRecMSE { get; set; } = null;
private MappaStatoExplModel? currRecMSE { get; set; } = null;
private List<InsManualiModel>? ListDay { get; set; } = new List<InsManualiModel>();
private List<InsManDayDto>? ListDTO { get; set; } = new List<InsManDayDto>();
MP-TAB3/Components/MachSel.razor.cs
+1 -1
View File
@@ -16,7 +16,7 @@ namespace MP_TAB3.Components
public EventCallback<string> E_MachSel { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/MachineBlock.razor.cs
+5 -5
View File
@@ -32,7 +32,7 @@ namespace MP_TAB3.Components
public int KeepAliveMin { get; set; } = 5;
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
[Parameter]
public bool ShowCard { get; set; }
@@ -367,7 +367,7 @@ namespace MP_TAB3.Components
private bool LastFullMode = true;
private string LastIdxMacchSub = "";
private int LastKeepAliveMin = 5;
private MappaStatoExpl? LastRecMSE = null;
private MappaStatoExplModel? LastRecMSE = null;
private bool LastShowCard = true;
private bool showOdlDetail = false;
private bool showPodl = false;
@@ -380,11 +380,11 @@ namespace MP_TAB3.Components
/// <summary>
/// Info correnti secondo tipo selezione
/// </summary>
private MappaStatoExpl? CRecMSE
private MappaStatoExplModel? CRecMSE
{
get
{
MappaStatoExpl? answ = RecMSE;
MappaStatoExplModel? answ = RecMSE;
if (!string.IsNullOrEmpty(IdxMacchSub))
{
answ = RecMSESub;
@@ -456,7 +456,7 @@ namespace MP_TAB3.Components
/// </summary>
private bool isMobile { get; set; }
private MappaStatoExpl? RecMSESub { get; set; } = null;
private MappaStatoExplModel? RecMSESub { get; set; } = null;
private bool showDraw { get; set; } = false;
MP-TAB3/Components/NotesEditor.razor.cs
+1 -1
View File
@@ -55,7 +55,7 @@ namespace MP_TAB3.Components
public EventCallback<bool> E_Updated { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
[Parameter]
public string Title { get; set; } = "NA";
MP-TAB3/Components/NotesMan.razor.cs
+1 -1
View File
@@ -24,7 +24,7 @@ namespace MP_TAB3.Components
#region Public Properties
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/OdlMan.razor.cs
+4 -4
View File
@@ -21,10 +21,10 @@ namespace MP_TAB3.Components
/// Post update restituisco nuova lista dati
/// </summary>
[Parameter]
public EventCallback<List<MappaStatoExpl>> E_Updated { get; set; }
public EventCallback<List<MappaStatoExplModel>> E_Updated { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE
public MappaStatoExplModel? RecMSE
{
get => currRecMSE;
set
@@ -1315,7 +1315,7 @@ namespace MP_TAB3.Components
private PODLExpModel currPodl { get; set; } = new PODLExpModel();
private MappaStatoExpl? currRecMSE { get; set; } = null;
private MappaStatoExplModel? currRecMSE { get; set; } = null;
/// <summary>
/// Verifica se l'ALTRA macchina NON abbia ODL valido (== 0)
@@ -1359,7 +1359,7 @@ namespace MP_TAB3.Components
private bool isLoading { get; set; } = false;
private MappaStatoExpl? lastRecMSE { get; set; } = null;
private MappaStatoExplModel? lastRecMSE { get; set; } = null;
private string lblWarnBody
{
MP-TAB3/Components/ParamsMan.razor.cs
+2 -2
View File
@@ -11,7 +11,7 @@ namespace MP_TAB3.Components
#region Public Properties
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
@@ -159,7 +159,7 @@ namespace MP_TAB3.Components
private ObjItemDTO? currItem { get; set; } = null;
private string IdxMaccSel { get; set; } = "";
private MappaStatoExpl? lastRecMSE { get; set; } = null;
private MappaStatoExplModel? lastRecMSE { get; set; } = null;
#endregion Private Properties
MP-TAB3/Components/PrintMag.razor.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace MP_TAB3.Components
#region Public Properties
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/ProdConfirm.razor.cs
+5 -5
View File
@@ -29,10 +29,10 @@ namespace MP_TAB3.Components
/// Post update restituisco nuova lista dati
/// </summary>
[Parameter]
public EventCallback<List<MappaStatoExpl>> E_Updated { get; set; }
public EventCallback<List<MappaStatoExplModel>> E_Updated { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE
public MappaStatoExplModel? RecMSE
{
get => currRecMSE;
set
@@ -393,7 +393,7 @@ namespace MP_TAB3.Components
private bool confProdActive { get; set; } = false;
private MappaStatoExpl? currRecMSE { get; set; } = null;
private MappaStatoExplModel? currRecMSE { get; set; } = null;
private DateTime dtReqUpdate { get; set; } = DateTime.Now;
@@ -401,7 +401,7 @@ namespace MP_TAB3.Components
private bool isProcessing { get; set; } = false;
private MappaStatoExpl? lastRecMSE { get; set; } = null;
private MappaStatoExplModel? lastRecMSE { get; set; } = null;
private int MatrOpr
{
@@ -444,7 +444,7 @@ namespace MP_TAB3.Components
private async Task RefreshData()
{
List<MappaStatoExpl> ListMSE = await SDService.MseGetAll(true);
List<MappaStatoExplModel> ListMSE = await SDService.MseGetAll(true);
await MsgServ.SaveMse(ListMSE);
await E_Updated.InvokeAsync(ListMSE);
}
MP-TAB3/Components/ProdPlanMan.razor.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace MP_TAB3.Components
#region Public Properties
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/ProdStat.razor.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace MP_TAB3.Components
#region Public Properties
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/ScrapEditor.razor.cs
+1 -1
View File
@@ -13,7 +13,7 @@ namespace MP_TAB3.Components
public EventCallback<bool> E_Updated { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/ScrapMan.razor.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace MP_TAB3.Components
public EventCallback<string> E_MachSel { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
MP-TAB3/Components/TechSheetMan.razor.cs
+2 -2
View File
@@ -10,7 +10,7 @@ namespace MP_TAB3.Components
#region Public Properties
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExplModel? RecMSE { get; set; } = null;
#endregion Public Properties
@@ -74,7 +74,7 @@ namespace MP_TAB3.Components
private string IdxMaccSel { get; set; } = "";
private int IdxOdl { get; set; } = 0;
private MappaStatoExpl? lastRecMSE { get; set; } = null;
private MappaStatoExplModel? lastRecMSE { get; set; } = null;
#endregion Private Properties
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2504.918</Version>
<Version>6.16.2504.1418</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Pages/BasePage.razor.cs
+3 -3
View File
@@ -18,7 +18,7 @@ namespace MP_TAB3.Pages
/// <summary>
/// Dato di dettaglio MSE per macchina
/// </summary>
public MappaStatoExpl? CurrMSE { get; set; } = null;
public MappaStatoExplModel? CurrMSE { get; set; } = null;
[Inject]
public MessageService MsgServ { get; set; } = null!;
@@ -78,7 +78,7 @@ namespace MP_TAB3.Pages
/// </summary>
/// <param name="ListMSE"></param>
/// <returns></returns>
protected async Task RefreshData(List<MappaStatoExpl> ListMSE)
protected async Task RefreshData(List<MappaStatoExplModel> ListMSE)
{
// se vecchio salvo sul browser...
if (DateTime.Now.Subtract(lastSave).TotalSeconds > 5)
@@ -164,7 +164,7 @@ namespace MP_TAB3.Pages
{
try
{
List<MappaStatoExpl>? dataList = JsonConvert.DeserializeObject<List<MappaStatoExpl>>(currArgs.newMessage);
List<MappaStatoExplModel>? dataList = JsonConvert.DeserializeObject<List<MappaStatoExplModel>>(currArgs.newMessage);
if (dataList != null)
{
InvokeAsync(() => RefreshData(dataList));
MP-TAB3/Pages/StatusMap.razor.cs
+7 -7
View File
@@ -106,13 +106,13 @@ namespace MP_TAB3.Pages
#region Private Properties
private List<MappaStatoExpl>? AllDataMSE { get; set; } = null;
private List<MappaStatoExplModel>? AllDataMSE { get; set; } = null;
private string baseLang { get; set; } = "";
private List<Macchine>? ListMachineEnabled { get; set; } = null;
private List<MappaStatoExpl>? ListMSE { get; set; } = null;
private List<MappaStatoExplModel>? ListMSE { get; set; } = null;
private int MatrOpr
{
@@ -200,9 +200,9 @@ namespace MP_TAB3.Pages
/// </summary>
/// <param name="mseIdx">Indice MSE richiesto</param>
/// <returns></returns>
protected MappaStatoExpl? MseById(int mseIdx)
protected MappaStatoExplModel? MseById(int mseIdx)
{
MappaStatoExpl? answ = null;
MappaStatoExplModel? answ = null;
if (ListMSE != null && ListMSE.Count > mseIdx)
{
answ = ListMSE[mseIdx];
@@ -252,7 +252,7 @@ namespace MP_TAB3.Pages
}
}
protected async Task SaveData(List<MappaStatoExpl> newList)
protected async Task SaveData(List<MappaStatoExplModel> newList)
{
// rileggo elenco macchine operatore...
if (ListMachineEnabled == null || ListMachineEnabled.Count == 0)
@@ -321,7 +321,7 @@ namespace MP_TAB3.Pages
{
try
{
List<MappaStatoExpl>? dataList = JsonConvert.DeserializeObject<List<MappaStatoExpl>>(currArgs.newMessage);
List<MappaStatoExplModel>? dataList = JsonConvert.DeserializeObject<List<MappaStatoExplModel>>(currArgs.newMessage);
if (dataList != null)
{
InvokeAsync(() => SaveData(dataList));
@@ -342,7 +342,7 @@ namespace MP_TAB3.Pages
/// <exception cref="NotImplementedException"></exception>
private void FiltOprMse()
{
ListMSE = new List<MappaStatoExpl>();
ListMSE = new List<MappaStatoExplModel>();
if (AllDataMSE != null)
{
foreach (var item in AllDataMSE)
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2504.918</h4>
<h4>Versione: 6.16.2504.1418</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2504.918
6.16.2504.1418
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2504.918</version>
<version>6.16.2504.1418</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
+3 -3
View File
@@ -255,12 +255,12 @@ namespace MP.Data.Controllers
}
/// <summary>
/// Elenco da tabella MappaStatoExpl
/// Elenco da tabella MappaStatoExplModel
/// </summary>
/// <returns></returns>
public List<MappaStatoExpl> MseGetAll(int maxAge = 2000)
public List<MappaStatoExplModel> MseGetAll(int maxAge = 2000)
{
List<MappaStatoExpl> dbResult = new List<MappaStatoExpl>();
List<MappaStatoExplModel> dbResult = new List<MappaStatoExplModel>();
using (var dbCtx = new MoonProContext(_configuration))
{
var maxAgeSec = new SqlParameter("@maxAgeSec", maxAge);
MP.Data/Controllers/MpMonController.cs
+3 -3
View File
@@ -133,12 +133,12 @@ namespace MP.Data.Controllers
}
/// <summary>
/// Elenco da tabella MappaStatoExpl
/// Elenco da tabella MappaStatoExplModel
/// </summary>
/// <returns></returns>
public List<DbModels.MappaStatoExpl> MseGetAll(int maxAge = 2000)
public List<DbModels.MappaStatoExplModel> MseGetAll(int maxAge = 2000)
{
List<DbModels.MappaStatoExpl> dbResult = new List<DbModels.MappaStatoExpl>();
List<DbModels.MappaStatoExplModel> dbResult = new List<DbModels.MappaStatoExplModel>();
using (var dbCtx = new MoonProContext(_configuration))
{
var maxAgeSec = new SqlParameter("@maxAgeSec", maxAge);
MP.Data/Controllers/MpSpecController.cs
+7 -7
View File
@@ -152,7 +152,7 @@ namespace MP.Data.Controllers
/// Elenco valori ammessi x Stati commessa (es Yacht Baglietto)
/// </summary>
/// <returns></returns>
public List<ListValues> AnagStatiComm()
public List<ListValuesModel> AnagStatiComm()
{
return ListValuesFilt("PODL", "StatoComm");
}
@@ -161,7 +161,7 @@ namespace MP.Data.Controllers
/// Elenco valori ammessi x Tipo articoli
/// </summary>
/// <returns></returns>
public List<ListValues> AnagTipoArtLV()
public List<ListValuesModel> AnagTipoArtLV()
{
return ListValuesFilt("AnagArticoli", "Tipo");
}
@@ -1071,9 +1071,9 @@ namespace MP.Data.Controllers
/// <param name="tabName"></param>
/// <param name="fieldName"></param>
/// <returns></returns>
public List<ListValues> ListValuesFilt(string tabName, string fieldName)
public List<ListValuesModel> ListValuesFilt(string tabName, string fieldName)
{
List<ListValues> dbResult = new List<ListValues>();
List<ListValuesModel> dbResult = new List<ListValuesModel>();
using (var dbCtx = new MoonProContext(_configuration))
{
dbResult = dbCtx
@@ -1202,12 +1202,12 @@ namespace MP.Data.Controllers
}
/// <summary>
/// Elenco da tabella MappaStatoExpl
/// Elenco da tabella MappaStatoExplModel
/// </summary>
/// <returns></returns>
public List<MappaStatoExpl> MseGetAll(int maxAge = 2000)
public List<MappaStatoExplModel> MseGetAll(int maxAge = 2000)
{
List<MappaStatoExpl> dbResult = new List<MappaStatoExpl>();
List<MappaStatoExplModel> dbResult = new List<MappaStatoExplModel>();
using (var dbCtx = new MoonProContext(_configuration))
{
var maxAgeSec = new SqlParameter("@maxAgeSec", maxAge);
MP.Data/Controllers/MpTabController.cs
+4 -4
View File
@@ -832,9 +832,9 @@ namespace MP.Data.Controllers
/// <param name="tabName"></param>
/// <param name="fieldName"></param>
/// <returns></returns>
public List<ListValues> ListValuesFilt(string tabName, string fieldName)
public List<ListValuesModel> ListValuesFilt(string tabName, string fieldName)
{
List<ListValues> dbResult = new List<ListValues>();
List<ListValuesModel> dbResult = new List<ListValuesModel>();
using (var dbCtx = new MoonProContext(_configuration))
{
dbResult = dbCtx
@@ -1017,9 +1017,9 @@ namespace MP.Data.Controllers
/// <param name="idxMacc"></param>
/// <param name="idxMacchSub"></param>
/// <returns></returns>
public List<MappaStatoExpl> MseGetSub(string idxMacc, string idxMacchSub)
public List<MappaStatoExplModel> MseGetSub(string idxMacc, string idxMacchSub)
{
List<MappaStatoExpl> dbResult = new List<MappaStatoExpl>();
List<MappaStatoExplModel> dbResult = new List<MappaStatoExplModel>();
using (var dbCtx = new MoonProContext(_configuration))
{
try
MP.Data/DbModels/ListValues.cs → MP.Data/DbModels/ListValuesModel.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace MP.Data.DbModels
{
[Table("ListValues")]
public partial class ListValues
public partial class ListValuesModel
{
#region Public Properties
MP.Data/DbModels/MappaStatoExpl.cs → MP.Data/DbModels/MappaStatoExplModel.cs
+3 -3
View File
@@ -9,7 +9,7 @@ using System.Data;
// </Auto-Generated>
namespace MP.Data.DbModels
{
public partial class MappaStatoExpl
public partial class MappaStatoExplModel
{
public int RowNum { get; set; }
public DateTime? LastUpdate { get; set; }
@@ -163,7 +163,7 @@ namespace MP.Data.DbModels
public override bool Equals(object obj)
{
if (!(obj is MappaStatoExpl item))
if (!(obj is MappaStatoExplModel item))
return false;
if (RowNum != item.RowNum)
@@ -256,7 +256,7 @@ namespace MP.Data.DbModels
public bool MostlyEquals(object obj)
{
if (!(obj is MappaStatoExpl item))
if (!(obj is MappaStatoExplModel item))
return false;
if (RowNum != item.RowNum)
MP.Data/MoonProContext.cs
+4 -4
View File
@@ -49,9 +49,9 @@ namespace MP.Data
public virtual DbSet<AnagArticoliModel> DbSetArticoli { get; set; }
public virtual DbSet<ConfigModel> DbSetConfig { get; set; }
public virtual DbSet<LinkMenu> DbSetLinkMenu { get; set; }
public virtual DbSet<ListValues> DbSetListValues { get; set; }
public virtual DbSet<ListValuesModel> DbSetListValues { get; set; }
public virtual DbSet<Macchine> DbSetMacchine { get; set; }
public virtual DbSet<MappaStatoExpl> DbSetMSE { get; set; }
public virtual DbSet<MappaStatoExplModel> DbSetMSE { get; set; }
public virtual DbSet<ODLModel> DbSetODL { get; set; }
public virtual DbSet<ODLExpModel> DbSetODLExp { get; set; }
public virtual DbSet<PODLModel> DbSetPODL { get; set; }
@@ -207,7 +207,7 @@ namespace MP.Data
entity.Property(e => e.Nome).HasMaxLength(50);
});
modelBuilder.Entity<MappaStatoExpl>(entity =>
modelBuilder.Entity<MappaStatoExplModel>(entity =>
{
entity.HasKey(e => e.RowNum);
@@ -346,7 +346,7 @@ namespace MP.Data
.HasColumnName("SelEnabled");
});
modelBuilder.Entity<ListValues>(entity =>
modelBuilder.Entity<ListValuesModel>(entity =>
{
entity.HasKey(e => new { e.TableName, e.FieldName, e.value });
MP.Data/Services/MessageService.cs
+4 -4
View File
@@ -495,13 +495,13 @@ namespace MP.Data.Services
/// </summary>
/// <param name="idxMacchina"></param>
/// <returns></returns>
public async Task<MappaStatoExpl?> GetMachineMse(string idxMacchina)
public async Task<MappaStatoExplModel?> GetMachineMse(string idxMacchina)
{
MappaStatoExpl answ = null;
MappaStatoExplModel answ = null;
var rawData = await localStorage.GetItemAsync<string>(machineMse(idxMacchina));
if (!string.IsNullOrEmpty(rawData))
{
answ = JsonConvert.DeserializeObject<MappaStatoExpl>(rawData);
answ = JsonConvert.DeserializeObject<MappaStatoExplModel>(rawData);
}
return answ;
}
@@ -544,7 +544,7 @@ namespace MP.Data.Services
/// <param name="currListMSE"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public async Task SaveMse(List<MappaStatoExpl> currListMSE)
public async Task SaveMse(List<MappaStatoExplModel> currListMSE)
{
// procedo SOLO SE non sono in reloading...
if (!IsReloading)
MP.Data/Services/StatusData.cs
+4 -4
View File
@@ -317,17 +317,17 @@ namespace MP.Data.Services
return answ;
}
public async Task<List<MappaStatoExpl>> MseGetAll(bool forceDb = false)
public async Task<List<MappaStatoExplModel>> MseGetAll(bool forceDb = false)
{
Stopwatch sw = new Stopwatch();
string source = "DB";
sw.Start();
List<MappaStatoExpl>? result = new List<MappaStatoExpl>();
List<MappaStatoExplModel>? result = new List<MappaStatoExplModel>();
// cerco in redis...
RedisValue rawData = redisDb.StringGet(Constants.redisMseKey);
if (rawData.HasValue && !forceDb)
{
result = JsonConvert.DeserializeObject<List<MappaStatoExpl>>($"{rawData}");
result = JsonConvert.DeserializeObject<List<MappaStatoExplModel>>($"{rawData}");
source = "REDIS";
}
else
@@ -339,7 +339,7 @@ namespace MP.Data.Services
}
if (result == null)
{
result = new List<MappaStatoExpl>();
result = new List<MappaStatoExplModel>();
}
sw.Stop();
Log.Debug($"MseGetAll | {source} | {sw.Elapsed.TotalMilliseconds}ms");
MP.Data/Services/TabDataService.cs
+8 -8
View File
@@ -1275,18 +1275,18 @@ namespace MP.Data.Services
/// Elenco parametri validi tab/campo
/// </summary>
/// <returns></returns>
public List<ListValues> ListValuesFilt(string tabName, string fieldName)
public List<ListValuesModel> ListValuesFilt(string tabName, string fieldName)
{
string source = "DB";
Stopwatch sw = new Stopwatch();
sw.Start();
List<ListValues>? result = new List<ListValues>();
List<ListValuesModel>? result = new List<ListValuesModel>();
// cerco in redis...
string currKey = $"{redisBaseKey}:ListVal:{tabName}:{fieldName}";
RedisValue rawData = redisDb.StringGet(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject<List<ListValues>>($"{rawData}");
result = JsonConvert.DeserializeObject<List<ListValuesModel>>($"{rawData}");
source = "REDIS";
}
else
@@ -1298,7 +1298,7 @@ namespace MP.Data.Services
}
if (result == null)
{
result = new List<ListValues>();
result = new List<ListValuesModel>();
}
sw.Stop();
Log.Debug($"ListValuesFilt | {source} | {sw.Elapsed.TotalMilliseconds}ms");
@@ -1621,17 +1621,17 @@ namespace MP.Data.Services
/// <param name="idxMacchSub"></param>
/// <param name="forceDb"></param>
/// <returns></returns>
public MappaStatoExpl MseGetSub(string idxMacc, string idxMacchSub, bool forceDb)
public MappaStatoExplModel MseGetSub(string idxMacc, string idxMacchSub, bool forceDb)
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
MappaStatoExpl result = new MappaStatoExpl();
MappaStatoExplModel result = new MappaStatoExplModel();
// cerco in redis...
string currKey = $"{Constants.redisMseKeySingle}:{idxMacchSub}";
RedisValue rawData = redisDb.StringGet(currKey);
if (rawData.HasValue && !forceDb)
{
result = JsonConvert.DeserializeObject<MappaStatoExpl>($"{rawData}");
result = JsonConvert.DeserializeObject<MappaStatoExplModel>($"{rawData}");
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"Read from REDIS: {ts.TotalMilliseconds}ms");
@@ -1652,7 +1652,7 @@ namespace MP.Data.Services
}
if (result == null)
{
result = new MappaStatoExpl();
result = new MappaStatoExplModel();
}
return result;
}
MP.Data/Translate/DbDto.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace MP.Data.Translate
/// </summary>
/// <param name="origRec"></param>
/// <returns></returns>
public static MappaStatoExplDTO Mse2DTO(MappaStatoExpl? origRec)
public static MappaStatoExplDTO Mse2DTO(MappaStatoExplModel? origRec)
{
MappaStatoExplDTO result = new MappaStatoExplDTO();
if (origRec != null)
MP.IOC/Data/MpDataService.cs
+13 -13
View File
@@ -148,16 +148,16 @@ namespace MP.IOC.Data
return answ;
}
public async Task<List<ListValues>> AnagStatiComm()
public async Task<List<ListValuesModel>> AnagStatiComm()
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
List<ListValues>? result = new List<ListValues>();
List<ListValuesModel>? result = new List<ListValuesModel>();
// cerco in redis...
RedisValue rawData = await redisDb.StringGetAsync(Utils.redisStatoCom);
if (!string.IsNullOrEmpty($"{rawData}"))
{
result = JsonConvert.DeserializeObject<List<ListValues>>($"{rawData}");
result = JsonConvert.DeserializeObject<List<ListValuesModel>>($"{rawData}");
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"AnagStatiComm Read from REDIS: {ts.TotalMilliseconds}ms");
@@ -174,22 +174,22 @@ namespace MP.IOC.Data
}
if (result == null)
{
result = new List<ListValues>();
result = new List<ListValuesModel>();
}
return result;
}
public async Task<List<ListValues>> AnagTipoArtLV()
public async Task<List<ListValuesModel>> AnagTipoArtLV()
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string source = "DB";
List<ListValues>? result = new List<ListValues>();
List<ListValuesModel>? result = new List<ListValuesModel>();
// cerco in redis...
RedisValue rawData = await redisDb.StringGetAsync(Utils.redisTipoArt);
if (!string.IsNullOrEmpty($"{rawData}"))
{
result = JsonConvert.DeserializeObject<List<ListValues>>($"{rawData}");
result = JsonConvert.DeserializeObject<List<ListValuesModel>>($"{rawData}");
source = "REDIS";
}
else
@@ -204,7 +204,7 @@ namespace MP.IOC.Data
Log.Debug($"AnagTipoArtLV Read from {source}: {ts.TotalMilliseconds}ms");
if (result == null)
{
result = new List<ListValues>();
result = new List<ListValuesModel>();
}
return result;
}
@@ -583,7 +583,7 @@ namespace MP.IOC.Data
/// Restitusice elenco aziende
/// </summary>
/// <returns></returns>
public Task<List<AnagGruppi>> ElencoAziende()
public Task<List<AnagGruppiModel>> ElencoAziende()
{
return Task.FromResult(SpecDbController.AnagGruppiAziende());
}
@@ -592,9 +592,9 @@ namespace MP.IOC.Data
/// Restitusice elenco fasi
/// </summary>
/// <returns></returns>
public Task<List<AnagGruppi>> ElencoGruppiFase()
public Task<List<AnagGruppiModel>> ElencoGruppiFase()
{
List<AnagGruppi> result = new List<AnagGruppi>();
List<AnagGruppiModel> result = new List<AnagGruppiModel>();
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string readType = "DB";
@@ -603,7 +603,7 @@ namespace MP.IOC.Data
RedisValue rawData = redisDb.StringGet(currKey);
if (rawData.HasValue)
{
var rawResult = JsonConvert.DeserializeObject<List<AnagGruppi>>($"{rawData}");
var rawResult = JsonConvert.DeserializeObject<List<AnagGruppiModel>>($"{rawData}");
if (rawResult != null)
{
result = rawResult;
@@ -619,7 +619,7 @@ namespace MP.IOC.Data
}
if (result == null)
{
result = new List<AnagGruppi>();
result = new List<AnagGruppiModel>();
}
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.418</h4>
<h4>Versione: 6.16.2504.1418</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.IOC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2504.418
6.16.2504.1418
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.418</version>
<version>6.16.2504.1418</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
+4 -4
View File
@@ -219,7 +219,7 @@ namespace MP.MON.Components.Pages
private List<Macchine> listMacchine = new List<Macchine>();
private List<MappaStatoExpl>? ListMSE = null;
private List<MappaStatoExplModel>? ListMSE = null;
/// <summary>
/// num max caratteri prima di abilitare scrolling testo
@@ -291,13 +291,13 @@ namespace MP.MON.Components.Pages
{
try
{
List<MappaStatoExpl>? dataList = JsonConvert.DeserializeObject<List<MappaStatoExpl>>(currArgs.newMessage);
List<MappaStatoExplModel>? dataList = JsonConvert.DeserializeObject<List<MappaStatoExplModel>>(currArgs.newMessage);
if (dataList != null)
{
// se ho filtro macchine --> tengo solo quelle che mi tornano...
if (listMacchine != null && listMacchine.Count > 0)
{
List<MappaStatoExpl> listaFilt = new List<MappaStatoExpl>();
List<MappaStatoExplModel> listaFilt = new List<MappaStatoExplModel>();
foreach (var item in listMacchine)
{
var rigaFilt = dataList.FirstOrDefault(x => x.IdxMacchina == item.IdxMacchina);
@@ -312,7 +312,7 @@ namespace MP.MON.Components.Pages
#if DEBUG
// hack: legge 3 volte i dati x stressare sistema
var singleData = dataList;
ListMSE = new List<MappaStatoExpl>();
ListMSE = new List<MappaStatoExplModel>();
for (int i = 0; i < 3; i++)
{
ListMSE.AddRange(singleData);
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.2503.2116</Version>
<Version>6.16.2504.1418</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.2503.2116</h4>
<h4>Versione: 6.16.2504.1418</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.MON/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2503.2116
6.16.2504.1418
MP.MON/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2503.2116</version>
<version>6.16.2504.1418</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
@@ -320,7 +320,7 @@ namespace MP.SPEC.Components
private List<Macchine>? ListMacchine;
private List<DossierModel>? ListRecords;
private List<ListValues>? ListStati;
private List<ListValuesModel>? ListStati;
private List<DossierModel>? SearchRecords;
MP.SPEC/Components/ListODL.razor.cs
+1 -1
View File
@@ -271,7 +271,7 @@ namespace MP.SPEC.Components
private List<ODLExpModel>? ListRecords;
private List<ListValues>? ListStati;
private List<ListValuesModel>? ListStati;
private List<ODLExpModel>? SearchRecords;
MP.SPEC/Components/ListPODL.razor.cs
+1 -1
View File
@@ -311,7 +311,7 @@ namespace MP.SPEC.Components
private List<PODLExpModel>? ListRecords;
private List<ListValues>? ListStati;
private List<ListValuesModel>? ListStati;
private bool MachineWithRecipe = false;
MP.SPEC/Components/SelFilterXDL.razor.cs
+1 -1
View File
@@ -22,7 +22,7 @@ namespace MP.SPEC.Components
public List<Macchine>? ListMacchine { get; set; } = null;
[Parameter]
public List<ListValues>? ListStati { get; set; } = null;
public List<ListValuesModel>? ListStati { get; set; } = null;
#endregion Public Properties
MP.SPEC/Components/StatsOdl.razor.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace MP.SPEC.Components
}
[Parameter]
public List<ListValues>? ListStati { get; set; }
public List<ListValuesModel>? ListStati { get; set; }
[Parameter]
public ODLExpModel statRecord { get; set; } = null!;
MP.SPEC/Data/MpDataService.cs
+8 -8
View File
@@ -189,16 +189,16 @@ namespace MP.SPEC.Data
return result;
}
public async Task<List<ListValues>> AnagStatiComm()
public async Task<List<ListValuesModel>> AnagStatiComm()
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
List<ListValues>? result = new List<ListValues>();
List<ListValuesModel>? result = new List<ListValuesModel>();
// cerco in redis...
RedisValue rawData = await redisDb.StringGetAsync(Utils.redisStatoCom);
if (!string.IsNullOrEmpty($"{rawData}"))
{
result = JsonConvert.DeserializeObject<List<ListValues>>($"{rawData}");
result = JsonConvert.DeserializeObject<List<ListValuesModel>>($"{rawData}");
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"AnagStatiComm Read from REDIS: {ts.TotalMilliseconds}ms");
@@ -215,22 +215,22 @@ namespace MP.SPEC.Data
}
if (result == null)
{
result = new List<ListValues>();
result = new List<ListValuesModel>();
}
return result;
}
public async Task<List<ListValues>> AnagTipoArtLV()
public async Task<List<ListValuesModel>> AnagTipoArtLV()
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string source = "DB";
List<ListValues>? result = new List<ListValues>();
List<ListValuesModel>? result = new List<ListValuesModel>();
// cerco in redis...
RedisValue rawData = await redisDb.StringGetAsync(Utils.redisTipoArt);
if (!string.IsNullOrEmpty($"{rawData}"))
{
result = JsonConvert.DeserializeObject<List<ListValues>>($"{rawData}");
result = JsonConvert.DeserializeObject<List<ListValuesModel>>($"{rawData}");
source = "REDIS";
}
else
@@ -245,7 +245,7 @@ namespace MP.SPEC.Data
Log.Debug($"AnagTipoArtLV Read from {source}: {ts.TotalMilliseconds}ms");
if (result == null)
{
result = new List<ListValues>();
result = new List<ListValuesModel>();
}
return result;
}
MP.SPEC/Pages/Articoli.razor.cs
+1 -1
View File
@@ -239,7 +239,7 @@ namespace MP.SPEC.Pages
private AnagArticoliModel? currRecord = null;
private List<AnagGruppiModel>? ListAziende;
private List<AnagArticoliModel>? ListRecords;
private List<ListValues>? ListTipoArt;
private List<ListValuesModel>? ListTipoArt;
private List<AnagArticoliModel>? SearchRecords;
#endregion Private Fields
MP.SPEC/Pages/ODL.razor.cs
+1 -1
View File
@@ -161,7 +161,7 @@ namespace MP.SPEC.Pages
#region Private Fields
private List<Macchine>? ListMacchine;
private List<MP.Data.DbModels.ListValues>? ListStati;
private List<MP.Data.DbModels.ListValuesModel>? ListStati;
#endregion Private Fields
MP.SPEC/Pages/PODL.razor.cs
+1 -1
View File
@@ -299,7 +299,7 @@ namespace MP.SPEC.Pages
private List<AnagGruppiModel>? ListAziende;
private List<AnagGruppiModel>? ListGruppiFase;
private List<Macchine>? ListMacchine;
private List<ListValues>? ListStati;
private List<ListValuesModel>? ListStati;
private int nArtSearch = 5;
#endregion Private Fields
MP.SPEC/Pages/Podl2Kit.razor.cs
+1 -1
View File
@@ -250,7 +250,7 @@ namespace MP.SPEC.Pages
private List<IstanzeKitModel>? ListRecords;
private List<ListValues>? ListStati;
private List<ListValuesModel>? ListStati;
private int minChar = 2;