diff --git a/MP.MONO.UI/Components/SchedMaintTask.razor.cs b/MP.MONO.UI/Components/SchedMaintTask.razor.cs
index 0200f93..5941521 100644
--- a/MP.MONO.UI/Components/SchedMaintTask.razor.cs
+++ b/MP.MONO.UI/Components/SchedMaintTask.razor.cs
@@ -4,19 +4,9 @@ namespace MP.MONO.UI.Components
{
public partial class SchedMaintTask
{
- #region Protected Methods
-
- protected override async Task OnInitializedAsync()
- {
- await ReloadData();
- }
-
- #endregion Protected Methods
-
#region Private Fields
- private int _MaxRecord = 2000;
- private bool _showCompleted = false;
+ private int _MaxRecord = 1000;
///
/// Valore limite (in ore) per permettere di chiudere un intervento
@@ -45,6 +35,9 @@ namespace MP.MONO.UI.Components
#region Private Properties
private int _currPage { get; set; } = 1;
+
+ private int _limitDayPeriod { get; set; } = 7;
+
private int _numRecord { get; set; } = 10;
private int currPage
@@ -62,11 +55,12 @@ namespace MP.MONO.UI.Components
}
private int currSMTaskId { get; set; } = 0;
- private DateTime execDate { get; set; } = DateTime.Today.AddHours(DateTime.Now.Hour);
- private string execName { get; set; } = "";
- private bool isLoading { get; set; } = false;
- private int _limitDayPeriod { get; set; } = 7;
+ private DateTime execDate { get; set; } = DateTime.Today.AddHours(DateTime.Now.Hour);
+
+ private string execName { get; set; } = "";
+
+ private bool isLoading { get; set; } = false;
private int LimitDayPeriod
{
@@ -76,17 +70,13 @@ namespace MP.MONO.UI.Components
if (_limitDayPeriod != value)
{
_limitDayPeriod = value;
+ currPage = 1;
var pUpd = Task.Run(async () => await ReloadData());
pUpd.Wait();
}
}
}
- private int maxRemainHour
- {
- get => LimitDayPeriod * 24;
- }
-
private int MaxRecord
{
get
@@ -104,6 +94,11 @@ namespace MP.MONO.UI.Components
}
}
+ private int maxRemainHour
+ {
+ get => LimitDayPeriod * 24;
+ }
+
private string modalShow
{
get => showTaskConf ? "show" : "hide";
@@ -123,20 +118,6 @@ namespace MP.MONO.UI.Components
}
}
- private bool showCompleted
- {
- get
- {
- return _showCompleted;
- }
- set
- {
- _showCompleted = value;
- var pUpd = Task.Run(async () => await ReloadData());
- pUpd.Wait();
- }
- }
-
private bool showTaskConf { get; set; } = false;
private int totalCount
@@ -154,6 +135,15 @@ namespace MP.MONO.UI.Components
#endregion Private Properties
+ #region Protected Methods
+
+ protected override async Task OnInitializedAsync()
+ {
+ await ReloadData();
+ }
+
+ #endregion Protected Methods
+
#region Private Methods
private async Task ConfirmDone()
@@ -190,7 +180,7 @@ namespace MP.MONO.UI.Components
isLoading = true;
ListRecords = null;
await Task.Delay(1);
- SearchRecords = await MMDataService.SchedMaintTaskGetFilt(MachineId, maxRemainHour, 0, MaxRecord, showCompleted);
+ SearchRecords = await MMDataService.SchedMaintTaskGetFilt(MachineId, maxRemainHour, 0, MaxRecord);
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
await Task.Delay(1);
await Task.Delay(1);
@@ -203,13 +193,6 @@ namespace MP.MONO.UI.Components
currSMTaskId = SMTaskId;
}
- private async Task ToggleCompleted()
- {
- await Task.Delay(1);
- showCompleted = !showCompleted;
- await Task.Delay(1);
- }
-
#endregion Private Methods
}
}
\ No newline at end of file
diff --git a/MP.MONO.UI/Data/CurrentDataService.cs b/MP.MONO.UI/Data/CurrentDataService.cs
index 27cec85..9bf9468 100644
--- a/MP.MONO.UI/Data/CurrentDataService.cs
+++ b/MP.MONO.UI/Data/CurrentDataService.cs
@@ -22,6 +22,27 @@ namespace MP.MONO.UI.Data
#endregion Public Fields
+ #region Private Fields
+
+ private static IConfiguration _configuration = null!;
+
+ private static ILogger _logger = null!;
+
+ private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+ ///
+ /// Oggetto per connessione a REDIS
+ ///
+ private ConnectionMultiplexer redisConn = null!;
+
+ //ISubscriber sub = redis.GetSubscriber();
+ ///
+ /// Oggetto DB redis da impiegare x chiamate R/W
+ ///
+ private IDatabase redisDb = null!;
+
+ #endregion Private Fields
+
#region Public Constructors
public CurrentDataService(IConfiguration configuration, ILogger logger, IConnectionMultiplexer redisConn)
@@ -334,12 +355,39 @@ namespace MP.MONO.UI.Data
return await Task.FromResult(answ);
}
- public async Task> SchedMaintTaskGetFilt(int machineId, int maxRemain, int skipRec, int numRec, bool showCompleted)
+ ///
+ /// Recupero elenco Task Schedulati dati Macchina ed intervento "master"
+ ///
+ /// Macchina selezionata
+ /// ID del PMTask parent
+ /// Num record da saltare
+ /// num rec da recuperare
+ ///
+ public async Task> SchedMaintTaskGetByPMTask(int MachineId, int PMTaskId, int skipRec, int numRec)
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
// ricerca sul DB "raw"
- List? rawResult = dbController.SchedMaintTaskGetFilt(machineId, skipRec, numRec, showCompleted);
+ List? dbResult = dbController.SchedMaintTaskGetByPMTask(MachineId, PMTaskId, skipRec, numRec);
+ stopWatch.Stop();
+ TimeSpan ts = stopWatch.Elapsed;
+ Log.Trace($"Effettuata lettura da DB SchedMaintTaskGetByPMTask: {ts.TotalMilliseconds} ms");
+ return await Task.FromResult(dbResult);
+ }
+
+ ///
+ /// Recupero elenco Task Schedulati (ultimi dato "skip")
+ ///
+ /// Macchina selezionata
+ /// Num record da saltare
+ /// num rec da recuperare
+ ///
+ public async Task> SchedMaintTaskGetFilt(int machineId, int maxRemain, int skipRec, int numRec)
+ {
+ Stopwatch stopWatch = new Stopwatch();
+ stopWatch.Start();
+ // ricerca sul DB "raw"
+ List? rawResult = dbController.SchedMaintTaskGetFilt(machineId, skipRec, numRec);
// filtro ulteriormente ora...
var dbResult = rawResult.Where(x => x.CountRemainVal <= maxRemain || maxRemain == 0).ToList();
stopWatch.Stop();
@@ -376,24 +424,5 @@ namespace MP.MONO.UI.Data
}
#endregion Public Methods
-
- #region Private Fields
-
- private static IConfiguration _configuration = null!;
- private static ILogger _logger = null!;
- private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
- ///
- /// Oggetto per connessione a REDIS
- ///
- private ConnectionMultiplexer redisConn = null!;
-
- //ISubscriber sub = redis.GetSubscriber();
- ///
- /// Oggetto DB redis da impiegare x chiamate R/W
- ///
- private IDatabase redisDb = null!;
-
- #endregion Private Fields
}
}
\ No newline at end of file
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index e52c82f..9e5653f 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
enable
enable
AnyCPU;x86;x64
- 1.12206.1112
+ 1.12206.1116
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index e93f213..234f998 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
- Version: 1.12206.1112
+ Version: 1.12206.1116
Release Note:
-
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index b326902..ab9d911 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.12206.1112
+1.12206.1116
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index dd0659a..3800fd1 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.12206.1112
+ 1.12206.1116
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html
false