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

ok anagrafica eventi da stored

Browse Source
This commit is contained in:
zaccaria.majid
2023-10-06 09:37:03 +02:00
parent 371040f556
commit b7585ee10b
10 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/ProdStopMan.razor
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="card-body text-light">
<i class="@objIcon" style="font-size: 8vw"></i>
</div>
<div class="card-footer text-center bg-dark text-light opacity-50">
<div class="card-footer text-center bg-dark text-light opacity-50 p-1">
<span class="text-nowrap text-center" style="font-size: .9rem;">@objTxt</span>
</div>
</div>
MP-TAB-SERV/MP-TAB-SERV.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2310.608</Version>
<Version>6.16.2310.609</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Pages/ProdStop.razor
+1 -1
View File
@@ -20,7 +20,7 @@ else
<div class="d-flex justify-content-between flex-wrap align-items-center mb-3">
@foreach(var item in events2show)
{
<ProdStopMan objCss="@item.CssClass" objIcon="@item.Icon" objTxt="@(item.Nome.Split(" - ")[1])"></ProdStopMan>
<ProdStopMan objCss="@item.CssClass" objIcon="@item.Icon" objTxt="@item.Label"></ProdStopMan>
}
</div>
}
MP-TAB-SERV/Pages/ProdStop.razor.cs
+5 -5
View File
@@ -40,13 +40,13 @@ namespace MP_TAB_SERV.Pages
{
CurrMSE = await MsgServ.GetMachineMse(IdxMacc);
}
var eventsAll = await TabSrv.AnagEventiGetAll(IdxMacc);
if (eventsAll != null)
{
events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x => x.Label).ToList();
}
}
var eventsAll = await TabSrv.AnagEventiGetAll();
if(eventsAll != null)
{
events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x=>x.Nome).ToList();
}
}
#endregion Private Methods
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2310.608</h4>
<h4>Versione: 6.16.2310.609</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.608
6.16.2310.609
MP-TAB-SERV/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2310.608</version>
<version>6.16.2310.609</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Data/Controllers/MpTabController.cs
+9 -4
View File
@@ -6,6 +6,7 @@ using NLog;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace MP.Data.Controllers
{
@@ -27,15 +28,19 @@ namespace MP.Data.Controllers
/// Restituisce l'anagrafica eventi per intero
/// </summary>
/// <returns></returns>
public List<AnagEventiModel> AnagEventiGetAll()
public List<AnagEventiModel> AnagEventiGetAll(string IdxMac)
{
List<AnagEventiModel> dbResult = new List<AnagEventiModel>();
using (var dbCtx = new MoonProContext(_configuration))
{
var IdxMacch = new SqlParameter("@idxMacchina", IdxMac);
dbResult = dbCtx
.DbSetAnagEventi
.AsNoTracking()
.ToList();
.DbSetAnagEventi
.FromSqlRaw("exec dbo.stp_vseb_getByIdxMacchinaFull @idxMacchina", IdxMacch)
.AsNoTracking()
.AsEnumerable()
.ToList();
}
return dbResult;
}
MP.Data/DatabaseModels/AnagEventiModel.cs
+1 -5
View File
@@ -13,12 +13,8 @@ namespace MP.Data.DatabaseModels
{
[Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int IdxTipo { get; set; } = 0;
public string Nome { get; set; } = "";
public string TabAzione { get; set; } = "";
public string Azione { get; set; } = "";
public string KeyEvento { get; set; } = "";
public string Label { get; set; } = "";
public bool EventoTablet { get; set; } = true;
public string NoteEvento { get; set; } = "";
public string CssClass { get; set; } = "";
public string Icon { get; set; } = "";
}
MP.Data/Services/TabDataService.cs
+3 -3
View File
@@ -52,7 +52,7 @@ namespace MP.Data.Services
#region Public Methods
public async Task<List<AnagEventiModel>> AnagEventiGetAll()
public async Task<List<AnagEventiModel>> AnagEventiGetAll(string IdxMacch)
{
// setup parametri costanti
DateTime startDate = new DateTime(2000, 1, 1);
@@ -62,7 +62,7 @@ namespace MP.Data.Services
sw.Start();
List<AnagEventiModel>? result = new List<AnagEventiModel>();
// cerco in redis...
string currKey = $"{redisBaseKey}:AnagEventi";
string currKey = $"{redisBaseKey}:AnagEventi:{IdxMacch}";
RedisValue rawData = await redisDb.StringGetAsync(currKey);
if (!string.IsNullOrEmpty($"{rawData}"))
{
@@ -71,7 +71,7 @@ namespace MP.Data.Services
}
else
{
result = dbTabController.AnagEventiGetAll();
result = dbTabController.AnagEventiGetAll(IdxMacch);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
await redisDb.StringSetAsync(currKey, rawData, LongCache);