From 09fe5aed77817a4bcebb1d51f707db256f32e5e4 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 3 Oct 2023 09:09:51 +0200 Subject: [PATCH] Inizio bozza pagine e controlli pagina dettagli --- MP-TAB-SERV/Components/PrintMag.razor | 5 +++ MP-TAB-SERV/Components/ProdConfirm.razor | 5 +++ MP-TAB-SERV/Components/ProdStat.razor | 5 +++ MP-TAB-SERV/Components/TechSheetDetail.razor | 5 +++ MP-TAB-SERV/MP-TAB-SERV.csproj | 6 +++ MP-TAB-SERV/NLog.config | 2 +- MP-TAB-SERV/Pages/MachineDetail.razor | 17 ++++++-- MP-TAB-SERV/Pages/MachineDetail.razor.cs | 5 +++ MP-TAB-SERV/Pages/ODL.razor | 7 +++ MP-TAB-SERV/Pages/TechSheet.razor | 15 +++++++ MP-TAB-SERV/Pages/TechSheet.razor.cs | 45 ++++++++++++++++++++ MP-TAB-SERV/Shared/MainLayout.razor | 14 ++++-- 12 files changed, 124 insertions(+), 7 deletions(-) create mode 100644 MP-TAB-SERV/Components/PrintMag.razor create mode 100644 MP-TAB-SERV/Components/ProdConfirm.razor create mode 100644 MP-TAB-SERV/Components/ProdStat.razor create mode 100644 MP-TAB-SERV/Components/TechSheetDetail.razor create mode 100644 MP-TAB-SERV/Pages/ODL.razor create mode 100644 MP-TAB-SERV/Pages/TechSheet.razor create mode 100644 MP-TAB-SERV/Pages/TechSheet.razor.cs diff --git a/MP-TAB-SERV/Components/PrintMag.razor b/MP-TAB-SERV/Components/PrintMag.razor new file mode 100644 index 00000000..0c8bf38a --- /dev/null +++ b/MP-TAB-SERV/Components/PrintMag.razor @@ -0,0 +1,5 @@ +

PrintMag

+ +@code { + +} diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor new file mode 100644 index 00000000..853ccd65 --- /dev/null +++ b/MP-TAB-SERV/Components/ProdConfirm.razor @@ -0,0 +1,5 @@ +

ProdConfirm

+ +@code { + +} diff --git a/MP-TAB-SERV/Components/ProdStat.razor b/MP-TAB-SERV/Components/ProdStat.razor new file mode 100644 index 00000000..c76e0975 --- /dev/null +++ b/MP-TAB-SERV/Components/ProdStat.razor @@ -0,0 +1,5 @@ +

ProdStat

+ +@code { + +} diff --git a/MP-TAB-SERV/Components/TechSheetDetail.razor b/MP-TAB-SERV/Components/TechSheetDetail.razor new file mode 100644 index 00000000..95a73d89 --- /dev/null +++ b/MP-TAB-SERV/Components/TechSheetDetail.razor @@ -0,0 +1,5 @@ +

TechSheetDetail

+ +@code { + +} diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index a396fbea..b9ea214c 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -41,4 +41,10 @@ + + + Always + + + diff --git a/MP-TAB-SERV/NLog.config b/MP-TAB-SERV/NLog.config index 3e4185f4..b32ba10a 100644 --- a/MP-TAB-SERV/NLog.config +++ b/MP-TAB-SERV/NLog.config @@ -39,7 +39,7 @@ Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f" --> - + diff --git a/MP-TAB-SERV/Pages/MachineDetail.razor b/MP-TAB-SERV/Pages/MachineDetail.razor index 30634109..b145d4de 100644 --- a/MP-TAB-SERV/Pages/MachineDetail.razor +++ b/MP-TAB-SERV/Pages/MachineDetail.razor @@ -1,14 +1,25 @@ @page "/machine-detail" -@using MP.Data.Services; -@inject MessageService MsgServ @if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null) { - loading... + } else { +
+
+ + + + } diff --git a/MP-TAB-SERV/Pages/MachineDetail.razor.cs b/MP-TAB-SERV/Pages/MachineDetail.razor.cs index 47cbac5f..38b75727 100644 --- a/MP-TAB-SERV/Pages/MachineDetail.razor.cs +++ b/MP-TAB-SERV/Pages/MachineDetail.razor.cs @@ -1,4 +1,6 @@ +using Microsoft.AspNetCore.Components; using MP.Data.DatabaseModels; +using MP.Data.Services; namespace MP_TAB_SERV.Pages { @@ -9,6 +11,9 @@ namespace MP_TAB_SERV.Pages protected MappaStatoExpl? CurrMSE { get; set; } = null; protected string IdxMacc { get; set; } = ""; + [Inject] + protected MessageService MsgServ { get; set; } = null!; + #endregion Protected Properties #region Protected Methods diff --git a/MP-TAB-SERV/Pages/ODL.razor b/MP-TAB-SERV/Pages/ODL.razor new file mode 100644 index 00000000..20c7936e --- /dev/null +++ b/MP-TAB-SERV/Pages/ODL.razor @@ -0,0 +1,7 @@ +@page "/odl" + +

ODL

+ +@code { + +} diff --git a/MP-TAB-SERV/Pages/TechSheet.razor b/MP-TAB-SERV/Pages/TechSheet.razor new file mode 100644 index 00000000..060f0eed --- /dev/null +++ b/MP-TAB-SERV/Pages/TechSheet.razor @@ -0,0 +1,15 @@ +@page "/tech-sheet" + +@if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null) +{ + +} +else +{ +
+ +
+ +} + + diff --git a/MP-TAB-SERV/Pages/TechSheet.razor.cs b/MP-TAB-SERV/Pages/TechSheet.razor.cs new file mode 100644 index 00000000..ae2082f3 --- /dev/null +++ b/MP-TAB-SERV/Pages/TechSheet.razor.cs @@ -0,0 +1,45 @@ +using global::Microsoft.AspNetCore.Components; +using MP.Data.DatabaseModels; +using MP.Data.Services; + +namespace MP_TAB_SERV.Pages +{ + public partial class TechSheet + { + #region Protected Properties + + protected MappaStatoExpl? CurrMSE { get; set; } = null; + protected string IdxMacc { get; set; } = ""; + + [Inject] + protected MessageService MsgServ { get; set; } = null!; + + #endregion Protected Properties + + #region Protected Methods + + protected override async Task OnInitializedAsync() + { + await ReloadData(); + } + + #endregion Protected Methods + + #region Private Methods + + private async Task ReloadData() + { + if (string.IsNullOrEmpty(IdxMacc)) + { + IdxMacc = await MsgServ.IdxMaccGet(); + // recupero MSE macchina.... + if (!string.IsNullOrEmpty(IdxMacc)) + { + CurrMSE = await MsgServ.GetMachineMse(IdxMacc); + } + } + } + + #endregion Private Methods + } +} \ No newline at end of file diff --git a/MP-TAB-SERV/Shared/MainLayout.razor b/MP-TAB-SERV/Shared/MainLayout.razor index 99fc2a41..c356a9e2 100644 --- a/MP-TAB-SERV/Shared/MainLayout.razor +++ b/MP-TAB-SERV/Shared/MainLayout.razor @@ -1,4 +1,5 @@ -@inherits LayoutComponentBase +@using System.Diagnostics; +@inherits LayoutComponentBase @implements IDisposable @inject NavigationManager NavMan @@ -99,6 +100,8 @@ protected async Task ForceReload() { + Stopwatch sw = new Stopwatch(); + sw.Start(); Log.Info("Start ForceReload"); ResetClass = "btn-warning"; await InvokeAsync(StateHasChanged); @@ -108,12 +111,17 @@ await MDataService.FlushCache(); var allData = await MDataService.ListLinkAll(); MStor.SetupMenu(allData); - await Task.Delay(300); + sw.Stop(); + int delta = 400 - (int)sw.ElapsedMilliseconds; + if (delta > 0) + { + await Task.Delay(delta); + } ResetClass = "btn-primary"; // await InvokeAsync(StateHasChanged); + Log.Info($"ForceReload completed in {sw.ElapsedMilliseconds}ms"); // ricarica pagina! NavMan.NavigateTo("/", true); - Log.Info("END ForceReload"); }