From e304c08e378f7393eee2d71957f7012f17d26b42 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 2 Jul 2021 19:17:07 +0200 Subject: [PATCH] Refresh naming --- MP.Stats/MP.Stats.csproj | 4 --- MP.Stats/Pages/BasePage.cs | 50 ------------------------------- MP.Stats/Pages/Oee.razor.cs | 18 ++++++----- MP.Stats/Pages/ReportODL.razor.cs | 14 ++++----- 4 files changed, 17 insertions(+), 69 deletions(-) delete mode 100644 MP.Stats/Pages/BasePage.cs diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 1c3dc1ec..1e09e88d 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -7,10 +7,6 @@ 1.0.2107.0219 - - - - diff --git a/MP.Stats/Pages/BasePage.cs b/MP.Stats/Pages/BasePage.cs deleted file mode 100644 index 0120ab0d..00000000 --- a/MP.Stats/Pages/BasePage.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Microsoft.AspNetCore.Components; -using Microsoft.JSInterop; -using MP.Stats.Data; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace MP.Stats.Pages -{ - public class BasePage : ComponentBase, IDisposable - { - [Inject] - protected IJSRuntime JSRuntime { get; set; } - - [Inject] - protected MessageService MessageService { get; set; } - - [Inject] - protected NavigationManager NavManager { get; set; } - - [Inject] - protected MpStatsService StatService { get; set; } - - public virtual void Dispose() - { - MessageService.EA_SearchUpdated -= OnSeachUpdated; - } - - public async void OnSeachUpdated() - { - await InvokeAsync(() => - { - Task task = UpdateData(); - StateHasChanged(); - }); - } - - protected override async Task OnInitializedAsync() - { - clearFile(); - numRecord = 10; - MessageService.ShowSearch = false; - MessageService.PageName = "TRS/OEE %"; - MessageService.PageIcon = "oi oi-monitor"; - MessageService.EA_SearchUpdated += OnSeachUpdated; - await reloadData(); - } - } -} \ No newline at end of file diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 53cf8823..1a5912fa 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -52,7 +52,7 @@ namespace MP.Stats.Pages if (_currPage != value) { _currPage = value; - var pUpd = Task.Run(async () => await reloadData()); + var pUpd = Task.Run(async () => await ReloadData()); pUpd.Wait(); } } @@ -73,7 +73,7 @@ namespace MP.Stats.Pages if (_numRecord != value) { _numRecord = value; - var pUpd = Task.Run(async () => await reloadData()); + var pUpd = Task.Run(async () => await ReloadData()); pUpd.Wait(); } } @@ -128,7 +128,7 @@ namespace MP.Stats.Pages isLoading = false; } - private async Task reloadData() + private async Task ReloadData() { isLoading = true; SearchRecords = await StatService.StatTurniOeeGetAllCached(currFilter, MessageService.SearchVal); @@ -147,7 +147,7 @@ namespace MP.Stats.Pages SearchRecords = null; ListRecords = null; currFilter = newFilter; - await reloadData(); + await ReloadData(); } protected void ForceReload(int newNum) @@ -168,7 +168,7 @@ namespace MP.Stats.Pages MessageService.PageName = "TRS/OEE %"; MessageService.PageIcon = "oi oi-monitor"; MessageService.EA_SearchUpdated += OnSeachUpdated; - await reloadData(); + await ReloadData(); } protected void ResetData() @@ -185,7 +185,7 @@ namespace MP.Stats.Pages SearchRecords = null; ListRecords = null; currFilter = SelectData.Init(5, 7); - await reloadData(); + await ReloadData(); } protected void Select(MP.Data.DatabaseModels.TurniOee selRecord) @@ -199,20 +199,22 @@ namespace MP.Stats.Pages ShowCharts = !ShowCharts; if (ShowCharts) { - await reloadData(); + await ReloadData(); } } protected async Task UpdateData() { currRecord = null; - await reloadData(); + await ReloadData(); } #endregion Protected Methods #region Public Methods + #region Public Methods + public string checkSelect(DateTime DataRif, string Turno, string IdxMacchina) { string answ = ""; diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index deaeee3c..22cf93b5 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -96,7 +96,7 @@ namespace MP.Stats.Pages isLoading = false; } - private async Task reloadData() + private async Task ReloadData() { SearchRecords = await StatService.StatOdlGetAll(currFilter, MessageService.SearchVal); ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); @@ -112,19 +112,19 @@ namespace MP.Stats.Pages SearchRecords = null; ListRecords = null; currFilter = newFilter; - await reloadData(); + await ReloadData(); } protected async Task ForceReload(int newNum) { numRecord = newNum; - await reloadData(); + await ReloadData(); } protected async Task ForceReloadPage(int newNum) { currPage = newNum; - await reloadData(); + await ReloadData(); } protected override async Task OnInitializedAsync() @@ -135,7 +135,7 @@ namespace MP.Stats.Pages MessageService.PageName = "Report ODL/Comm."; MessageService.PageIcon = "oi oi-book"; MessageService.EA_SearchUpdated += OnSeachUpdated; - await reloadData(); + await ReloadData(); } protected void ResetData() @@ -152,13 +152,13 @@ namespace MP.Stats.Pages SearchRecords = null; ListRecords = null; currFilter = SelectData.Init(5, 7); - await reloadData(); + await ReloadData(); } protected async Task UpdateData() { currRecord = null; - await reloadData(); + await ReloadData(); } #endregion Protected Methods