+ @if (ShowCharts == true)
+ {
+
+ }
@if (currRecord != null)
{
diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs
index 5b260e77..69a1f8c6 100644
--- a/MP.Stats/Pages/Oee.razor.cs
+++ b/MP.Stats/Pages/Oee.razor.cs
@@ -34,9 +34,39 @@ namespace MP.Stats.Pages
}
}
- private int currPage { get; set; } = 1;
+ 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 numRecord { get; set; } = 10;
+ private int numRecord
+ {
+ get => _numRecord;
+ set
+ {
+ if (_numRecord != value)
+ {
+ _numRecord = value;
+ var pUpd = Task.Run(async () => await reloadData());
+ pUpd.Wait();
+ }
+ }
+ }
+
+ private bool ShowCharts { get; set; } = false;
#endregion Private Properties
@@ -92,16 +122,14 @@ namespace MP.Stats.Pages
await reloadData();
}
- protected async Task ForceReload(int newNum)
+ protected void ForceReload(int newNum)
{
numRecord = newNum;
- await reloadData();
}
- protected async Task ForceReloadPage(int newNum)
+ protected void ForceReloadPage(int newNum)
{
currPage = newNum;
- await reloadData();
}
protected override async Task OnInitializedAsync()
@@ -135,6 +163,14 @@ namespace MP.Stats.Pages
currRecord = selRecord;
}
+ protected async Task ToggleChart(bool doShow)
+ {
+ ShowCharts = !ShowCharts;
+ if (ShowCharts)
+ {
+ await reloadData();
+ }
+ }
protected async Task UpdateData()
{
currRecord = null;
@@ -165,11 +201,19 @@ namespace MP.Stats.Pages
MessageService.EA_SearchUpdated -= OnSeachUpdated;
}
- public void OnSeachUpdated()
+ // public void OnSeachUpdated()
+ // {
+ // InvokeAsync(() =>
+ // {
+ // UpdateData();
+ // StateHasChanged();
+ // });
+ // }
+ public async void OnSeachUpdated()
{
- InvokeAsync(() =>
+ await InvokeAsync(() =>
{
- UpdateData();
+ Task task = UpdateData();
StateHasChanged();
});
}