diff --git a/MP-TAB3/Components/CheckControls.razor.cs b/MP-TAB3/Components/CheckControls.razor.cs
index 5f5c1a8b..d9da4b7e 100644
--- a/MP-TAB3/Components/CheckControls.razor.cs
+++ b/MP-TAB3/Components/CheckControls.razor.cs
@@ -49,6 +49,26 @@ namespace MP_TAB3.Components
}
}
+ [Inject]
+ protected MessageService MServ { get; set; } = null!;
+
+ [Inject]
+ protected NavigationManager NavMan { get; set; } = null!;
+
+ protected bool ShowInsFermata { get; set; } = false;
+
+ protected bool ShowReqControls { get; set; } = false;
+
+ [Inject]
+ protected SharedMemService SMServ { get; set; } = null!;
+
+ [Inject]
+ protected TabDataService TabDServ { get; set; } = null!;
+
+ #endregion Protected Properties
+
+ #region Protected Methods
+
///
/// Verifica necessit� visualizzare il check controlli
///
@@ -87,25 +107,6 @@ namespace MP_TAB3.Components
return answ;
}
- [Inject]
- protected NavigationManager NavMan { get; set; } = null!;
-
- protected bool ShowInsFermata { get; set; } = false;
-
- protected bool ShowReqControls { get; set; } = false;
-
- [Inject]
- protected SharedMemService SMServ { get; set; } = null!;
-
- [Inject]
- protected TabDataService TabDServ { get; set; } = null!;
-
- protected DateTime lastCheck = DateTime.Today;
- protected string lastIdxMacc = "";
- #endregion Protected Properties
-
- #region Protected Methods
-
protected void GoToControls()
{
NavMan.NavigateTo("controls");
@@ -120,13 +121,11 @@ namespace MP_TAB3.Components
{
if (RecMSE != null)
{
- DateTime adesso = DateTime.Now;
- if (adesso.Subtract(lastCheck).TotalSeconds > 15 || lastIdxMacc != RecMSE.IdxMacchina)
+ if (MServ.LastIdxMacchina != RecMSE.IdxMacchina)
{
ShowInsFermata = CheckShowInsFermata;
ShowReqControls = await CheckShowReqControls();
- lastIdxMacc = RecMSE.IdxMacchina;
- lastCheck = adesso;
+ MServ.LastIdxMacchina = RecMSE.IdxMacchina;
}
}
}
diff --git a/MP-TAB3/Components/ControlsMan.razor.cs b/MP-TAB3/Components/ControlsMan.razor.cs
index 5a78327a..6ed3420c 100644
--- a/MP-TAB3/Components/ControlsMan.razor.cs
+++ b/MP-TAB3/Components/ControlsMan.razor.cs
@@ -88,7 +88,7 @@ namespace MP_TAB3.Components
}
DateTime fine = DateTime.Today.AddDays(1);
- DateTime inizio = fine.AddDays(-8);
+ DateTime inizio = fine.AddDays(-3);
CurrPeriodo = new Periodo(inizio, fine);
await doUpdate();
}
diff --git a/MP-TAB3/Components/DeclarMan.razor.cs b/MP-TAB3/Components/DeclarMan.razor.cs
index ca2d229c..bf2f0250 100644
--- a/MP-TAB3/Components/DeclarMan.razor.cs
+++ b/MP-TAB3/Components/DeclarMan.razor.cs
@@ -77,7 +77,7 @@ namespace MP_TAB3.Components
}
DateTime fine = DateTime.Today.AddDays(1);
- DateTime inizio = fine.AddDays(-8);
+ DateTime inizio = fine.AddDays(-3);
CurrPeriodo = new Periodo(inizio, fine);
await doUpdate();
}
diff --git a/MP-TAB3/Components/ScrapMan.razor.cs b/MP-TAB3/Components/ScrapMan.razor.cs
index fc309996..2908d642 100644
--- a/MP-TAB3/Components/ScrapMan.razor.cs
+++ b/MP-TAB3/Components/ScrapMan.razor.cs
@@ -66,7 +66,7 @@ namespace MP_TAB3.Components
}
DateTime fine = DateTime.Today.AddDays(1);
- DateTime inizio = fine.AddDays(-8);
+ DateTime inizio = fine.AddDays(-3);
CurrPeriodo = new Periodo(inizio, fine);
await ReloadData();
}
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 5a8144fc..1845fa90 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2401.2609
+ 6.16.2401.2616
enable
MP_TAB3
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index c35e9172..2ea78b00 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2401.2609
+ Versione: 6.16.2401.2616
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 9e2ef1a2..5a7a59ab 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2401.2609
+6.16.2401.2616
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index c0e01681..d3e0dec0 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2401.2609
+ 6.16.2401.2616
https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip
https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html
false
diff --git a/MP.Data/Services/ListSelectDataSrv.cs b/MP.Data/Services/ListSelectDataSrv.cs
index f36731ef..1bbf1fda 100644
--- a/MP.Data/Services/ListSelectDataSrv.cs
+++ b/MP.Data/Services/ListSelectDataSrv.cs
@@ -173,7 +173,6 @@ namespace MP.Data.Services
// cerco in redis...
string currKey = $"{redisBaseKey}:Menu:ALL";
RedisValue rawData = await redisDb.StringGetAsync(currKey);
- //if (!string.IsNullOrEmpty($"{rawData}"))
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject
>($"{rawData}");
diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs
index 0466f32f..b2f6fabc 100644
--- a/MP.Data/Services/MessageService.cs
+++ b/MP.Data/Services/MessageService.cs
@@ -97,6 +97,20 @@ namespace MP.Data.Services
public DateTime dtLastAction { get; set; } = DateTime.Now;
public DateTime dtLastSave { get; set; } = DateTime.Now;
+ public string LastIdxMacchina
+ {
+ get
+ {
+ string answ = "";
+ answ = redisDb.StringGet((RedisKey)$"{redisBaseKey}:{MatrOpr}:lastIdxMacc");
+ return answ;
+ }
+ set
+ {
+ redisDb.StringSet((RedisKey)$"{redisBaseKey}:{MatrOpr}:lastIdxMacc", value, TimeSpan.FromSeconds(30));
+ }
+ }
+
public int MatrOpr
{
get
@@ -612,6 +626,7 @@ namespace MP.Data.Services
///
private int cacheTtlShort = 60 * 1;
+ private string lastIdxMacc = "";
private Logger Log = LogManager.GetCurrentClassLogger();
private string redisBaseKey = "MP:TAB:User";
private Random rnd = new Random();
diff --git a/MP.Data/Services/SharedMemService.cs b/MP.Data/Services/SharedMemService.cs
index c5a84399..9cd161c8 100644
--- a/MP.Data/Services/SharedMemService.cs
+++ b/MP.Data/Services/SharedMemService.cs
@@ -1,6 +1,7 @@
using MP.Data.DatabaseModels;
using NLog;
using StackExchange.Redis;
+using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index cb4db236..bbeae229 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -1951,7 +1951,7 @@ namespace MP.Data.Services
result = dbTabController.RegControlliFilt(idxMacchina, idxODL, dataFrom, dataTo, showMulti);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await redisDb.StringSetAsync(currKey, rawData, UltraLongCache);
}
if (result == null)
{
@@ -2013,7 +2013,7 @@ namespace MP.Data.Services
result = dbTabController.RegControlliLast(idxMacchina);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await redisDb.StringSetAsync(currKey, rawData, UltraLongCache);
}
if (result == null)
{
@@ -2053,7 +2053,7 @@ namespace MP.Data.Services
result = dbTabController.RegDichiarGetFilt(idxMacchina, tagCode, matrOpr, idxODL, dataFrom, dataTo);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await redisDb.StringSetAsync(currKey, rawData, UltraLongCache);
}
if (result == null)
{
@@ -2139,7 +2139,7 @@ namespace MP.Data.Services
result = dbTabController.RegScartiGetFilt(idxMacchina, idxODL, dataFrom, dataTo, showMulti);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await redisDb.StringSetAsync(currKey, rawData, UltraLongCache);
}
if (result == null)
{