diff --git a/MP.Data/Controllers/MpInveController.cs b/MP.Data/Controllers/MpInveController.cs
index d78c2f94..b4bb4cb9 100644
--- a/MP.Data/Controllers/MpInveController.cs
+++ b/MP.Data/Controllers/MpInveController.cs
@@ -581,14 +581,23 @@ namespace MP.Data.Controllers
///
///
///
- public List InventSessHistList(DateTime FromDate, DateTime ToDate)
+ public List InventSessHistList()
{
List dbResult = new List();
using (var dbCtx = new MoonPro_InveContext(_configuration))
{
+#if false
+ dbResult = dbCtx
+ .DbInveSess
+ .Where(x => x.DtStart >= FromDate && x.DtStart <= ToDate && x.DtEnd != null)
+ .Include(m => m.AnagMagNav)
+ .AsNoTracking()
+ .OrderByDescending(x => x.DtStart)
+ .ToList();
+#endif
dbResult = dbCtx
.DbInveSess
- .Where(x => x.DtStart >= FromDate && x.DtStart <= ToDate && x.DtEnd != null)
+ .Where(x => x.Transferred)
.Include(m => m.AnagMagNav)
.AsNoTracking()
.OrderByDescending(x => x.DtStart)
@@ -608,7 +617,7 @@ namespace MP.Data.Controllers
{
dbResult = dbCtx
.DbInveSess
- .Where(x => x.DtEnd == null)
+ .Where(x => (x.DtEnd == null) || !(x.Transferred))
.Include(m => m.AnagMagNav)
.AsNoTracking()
.OrderByDescending(x => x.DtStart)
diff --git a/MP.INVE/Components/InveSessionList.razor.cs b/MP.INVE/Components/InveSessionList.razor.cs
index 6209bc84..02c22582 100644
--- a/MP.INVE/Components/InveSessionList.razor.cs
+++ b/MP.INVE/Components/InveSessionList.razor.cs
@@ -170,7 +170,7 @@ namespace MP.INVE.Components
}
else
{
- SearchRecords = MIDataservice.InventSessHistList(dtStart, dtEnd);
+ SearchRecords = MIDataservice.InventSessHistList();
}
totalCount = SearchRecords.Count;
elencoSessioni = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
diff --git a/MP.INVE/Data/MiDataService.cs b/MP.INVE/Data/MiDataService.cs
index d173b517..c388a37f 100644
--- a/MP.INVE/Data/MiDataService.cs
+++ b/MP.INVE/Data/MiDataService.cs
@@ -595,14 +595,14 @@ namespace MP.INVE.Data
return result;
}
- public List InventSessHistList(DateTime dtStart, DateTime dtEnd)
+ public List InventSessHistList()
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
List result = new List();
string source = "DB";
// cerco in redis...
- RedisValue rawData = redisDb.StringGet($"{redisSessionHistList}:{dtStart:yyyyMMdd_HHmmss}:{dtEnd:yyyyMMdd_HHmmss}");
+ RedisValue rawData = redisDb.StringGet($"{redisSessionHistList}");
if (!string.IsNullOrEmpty($"{rawData}"))
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -610,7 +610,7 @@ namespace MP.INVE.Data
}
else
{
- result = dbController.InventSessHistList(dtStart, dtEnd);
+ result = dbController.InventSessHistList();
// serializzo e salvo...
rawData = JsonConvert.SerializeObject(result);
redisDb.StringSetAsync(redisSessionHistList, rawData, getRandTOut(redisLongTimeCache));