@if (ListRecords == null)
diff --git a/MP.MONO.UI/Components/PrevMaintTask.razor.cs b/MP.MONO.UI/Components/PrevMaintTask.razor.cs
index 93eca15..caee842 100644
--- a/MP.MONO.UI/Components/PrevMaintTask.razor.cs
+++ b/MP.MONO.UI/Components/PrevMaintTask.razor.cs
@@ -1,26 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
-using System.Net.Http;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.Components.Web.Virtualization;
-using Microsoft.JSInterop;
-using MP.MONO.UI;
-using MP.MONO.UI.Shared;
-using MP.MONO.UI.Components;
using MP.MONO.Data.DbModels;
namespace MP.MONO.UI.Components
{
public partial class PrevMaintTask
{
+ #region Protected Methods
+ protected override async Task OnInitializedAsync()
+ {
+ await ReloadData();
+ }
+
+ #endregion Protected Methods
+
+ #region Private Fields
+
+ private int _MaxRecord = 200;
+ private bool doSetup = false;
private List
? ListRecords = null;
// FARE!!! filtro macchina
@@ -28,88 +24,9 @@ namespace MP.MONO.UI.Components
private List? SearchRecords = null;
+ #endregion Private Fields
- private int _MaxRecord = 200;
-
-
- private int MaxRecord
- {
- get
- {
- return _MaxRecord;
- }
- set
- {
- if (_MaxRecord != value)
- {
- _MaxRecord = value;
- var pUpd = Task.Run(async () => await ReloadData());
- pUpd.Wait();
- }
- }
- }
-
- private int totalCount
- {
- get
- {
- int answ = 0;
- if (SearchRecords != null)
- {
- answ = SearchRecords.Count;
- }
- return answ;
- }
- }
-
- protected void ForceReload(int newNum)
- {
- numRecord = newNum;
- }
-
- protected void ForceReloadPage(int newNum)
- {
- currPage = newNum;
- }
-
- protected override async Task OnInitializedAsync()
- {
- await ReloadData();
- }
-
- protected async Task ReloadData()
- {
- isLoading = true;
- ListRecords = null;
- await Task.Delay(1);
- SearchRecords = await MMDataService.PrevMaintTaskGetFilt(MachineId, 0, MaxRecord);
- ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
- await Task.Delay(1);
- await Task.Delay(1);
- isLoading = false;
- }
-
- protected async Task reloadFromMessage()
- {
- isLoading = true;
- ListRecords = null;
- await Task.Delay(300);
- await ReloadData();
- await Task.Delay(1);
- await InvokeAsync(() =>
- {
- StateHasChanged();
- });
- }
-
- protected bool doSetup = false;
-
- protected async Task SetupAlarms()
- {
- await Task.Delay(1);
- doSetup = !doSetup;
- await Task.Delay(1);
- }
+ #region Private Properties
private int _currPage { get; set; } = 1;
@@ -131,6 +48,23 @@ namespace MP.MONO.UI.Components
private bool isLoading { get; set; } = false;
+ private int MaxRecord
+ {
+ get
+ {
+ return _MaxRecord;
+ }
+ set
+ {
+ if (_MaxRecord != value)
+ {
+ _MaxRecord = value;
+ var pUpd = Task.Run(async () => await ReloadData());
+ pUpd.Wait();
+ }
+ }
+ }
+
private int numRecord
{
get => _numRecord;
@@ -145,5 +79,45 @@ namespace MP.MONO.UI.Components
}
}
+ private int totalCount
+ {
+ get
+ {
+ int answ = 0;
+ if (SearchRecords != null)
+ {
+ answ = SearchRecords.Count;
+ }
+ return answ;
+ }
+ }
+
+ #endregion Private Properties
+
+ #region Private Methods
+
+ private void ForceReload(int newNum)
+ {
+ numRecord = newNum;
+ }
+
+ private void ForceReloadPage(int newNum)
+ {
+ currPage = newNum;
+ }
+
+ private async Task ReloadData()
+ {
+ isLoading = true;
+ ListRecords = null;
+ await Task.Delay(1);
+ SearchRecords = await MMDataService.PrevMaintTaskGetFilt(MachineId, 0, MaxRecord);
+ ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
+ await Task.Delay(1);
+ await Task.Delay(1);
+ isLoading = false;
+ }
+
+ #endregion Private Methods
}
}
\ No newline at end of file
diff --git a/MP.MONO.UI/Components/SchedMaintTask.razor b/MP.MONO.UI/Components/SchedMaintTask.razor
new file mode 100644
index 0000000..8db85b3
--- /dev/null
+++ b/MP.MONO.UI/Components/SchedMaintTask.razor
@@ -0,0 +1,76 @@
+@using MP.MONO.Data
+@using MP.MONO.UI.Components
+@using MP.MONO.Core.DTO
+@using MP.MONO.UI.Data
+
+@inject CurrentDataService MMDataService
+
+
+
+
+
+ @if (ListRecords == null)
+ {
+
+ }
+ else if (totalCount == 0)
+ {
+
No record found
+ }
+ else
+ {
+
+
+
+ | ID |
+ Created |
+ Topic |
+ Machine Group |
+ Rem. Hours |
+ Team in Charge |
+ Counter Var |
+ Job Description |
+ |
+
+
+
+ @foreach (var record in ListRecords)
+ {
+
+ | @record.PMTaskeNav.ExtIdx |
+ @record.DtCreation.ToString("yyyy-MM-dd HH:mm:ss") |
+ @record.PMTaskeNav.TopicNav.Description |
+ @record.PMTaskeNav.MachGroupNav.Description |
+ @record.RemainingHours/@record.ExpiryVal |
+ @record.PMTaskeNav.UserTeamNav.Description |
+ @record.CounterNav.Description |
+ @record.PMTaskeNav.JobDescription |
+
+ @*..buttons...*@
+ |
+
+ }
+
+
+ }
+
+
+
+
+
+
diff --git a/MP.MONO.UI/Components/SchedMaintTask.razor.cs b/MP.MONO.UI/Components/SchedMaintTask.razor.cs
new file mode 100644
index 0000000..4bab0b7
--- /dev/null
+++ b/MP.MONO.UI/Components/SchedMaintTask.razor.cs
@@ -0,0 +1,149 @@
+using MP.MONO.Data.DbModels;
+
+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 = 200;
+ private bool _showCompleted = false;
+ private List? ListRecords = null;
+
+ // FARE!!! filtro macchina
+ private int MachineId = 1;
+
+ private List? SearchRecords = null;
+
+ #endregion Private Fields
+
+ #region Private Properties
+
+ private int _currPage { get; set; } = 1;
+ private int _numRecord { get; set; } = 10;
+
+ private int currPage
+ {
+ get => _currPage;
+ set
+ {
+ if (_currPage != value)
+ {
+ _currPage = value;
+ var pUpd = Task.Run(async () => await ReloadData());
+ pUpd.Wait();
+ }
+ }
+ }
+
+ private bool isLoading { get; set; } = false;
+
+ private int MaxRecord
+ {
+ get
+ {
+ return _MaxRecord;
+ }
+ set
+ {
+ if (_MaxRecord != value)
+ {
+ _MaxRecord = value;
+ var pUpd = Task.Run(async () => await ReloadData());
+ pUpd.Wait();
+ }
+ }
+ }
+
+ private int numRecord
+ {
+ get => _numRecord;
+ set
+ {
+ if (_numRecord != value)
+ {
+ _numRecord = value;
+ var pUpd = Task.Run(async () => await ReloadData());
+ pUpd.Wait();
+ }
+ }
+ }
+
+ private bool showCompleted
+ {
+ get
+ {
+ return _showCompleted;
+ }
+ set
+ {
+ _showCompleted = value;
+ var pUpd = Task.Run(async () => await ReloadData());
+ pUpd.Wait();
+ }
+ }
+
+ private int totalCount
+ {
+ get
+ {
+ int answ = 0;
+ if (SearchRecords != null)
+ {
+ answ = SearchRecords.Count;
+ }
+ return answ;
+ }
+ }
+
+ #endregion Private Properties
+
+ #region Private Methods
+
+ private void ForceReload(int newNum)
+ {
+ numRecord = newNum;
+ }
+
+ private void ForceReloadPage(int newNum)
+ {
+ currPage = newNum;
+ }
+
+ private async Task RegenTask()
+ {
+ await MMDataService.createMissingSchedTask(MachineId);
+ await ReloadData();
+ }
+
+ private async Task ReloadData()
+ {
+ isLoading = true;
+ ListRecords = null;
+ await Task.Delay(1);
+ SearchRecords = await MMDataService.SchedMaintTaskGetFilt(MachineId, 0, MaxRecord, showCompleted);
+ ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
+ await Task.Delay(1);
+ await Task.Delay(1);
+ isLoading = false;
+ }
+
+ 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 2d60744..5bcec3d 100644
--- a/MP.MONO.UI/Data/CurrentDataService.cs
+++ b/MP.MONO.UI/Data/CurrentDataService.cs
@@ -85,6 +85,17 @@ namespace MP.MONO.UI.Data
return await Task.FromResult(dbResult);
}
+ public async Task createMissingSchedTask(int machineId)
+ {
+ Stopwatch stopWatch = new Stopwatch();
+ stopWatch.Start();
+ bool answ = await dbController.SchedMaintTaskCreateMissing(machineId);
+ stopWatch.Stop();
+ TimeSpan ts = stopWatch.Elapsed;
+ Log.Trace($"Effettuata chiamata a createMissingSchedTask: {ts.TotalMilliseconds} ms");
+ return await Task.FromResult(answ);
+ }
+
public async Task> DataLogGetFilt(int machineId, string fluxType, DateTime inizio, DateTime fine)
{
Stopwatch stopWatch = new Stopwatch();
@@ -323,6 +334,17 @@ namespace MP.MONO.UI.Data
return await Task.FromResult(dbResult);
}
+ public async Task> SchedMaintTaskGetFilt(int machineId, int skipRec, int numRec, bool showCompleted)
+ {
+ Stopwatch stopWatch = new Stopwatch();
+ stopWatch.Start();
+ List? dbResult = dbController.SchedMaintTaskGetFilt(machineId, skipRec, numRec, showCompleted);
+ stopWatch.Stop();
+ TimeSpan ts = stopWatch.Elapsed;
+ Log.Trace($"Effettuata lettura da DB SchedMaintTaskGetFilt: {ts.TotalMilliseconds} ms");
+ return await Task.FromResult(dbResult);
+ }
+
public async Task setAlarmSetup(List alarmConf)
{
bool answ = false;
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index cd155b9..d06fae2 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.1018
+ 1.12206.1019
diff --git a/MP.MONO.UI/Pages/Maintenance.razor b/MP.MONO.UI/Pages/Maintenance.razor
index 99b3e9c..ea6e3d4 100644
--- a/MP.MONO.UI/Pages/Maintenance.razor
+++ b/MP.MONO.UI/Pages/Maintenance.razor
@@ -23,6 +23,7 @@
}
else
{
+
}
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 2c003b5..3c0248e 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@