diff --git a/MP.Stats/Components/CmpTop.razor b/MP.Stats/Components/CmpTop.razor index 187e684f..ab4bb84b 100644 --- a/MP.Stats/Components/CmpTop.razor +++ b/MP.Stats/Components/CmpTop.razor @@ -1,16 +1,19 @@ @using MP.Stats.Components @using System.Security.Claims @using Microsoft.AspNetCore.Components.Authorization +@using MP.Stats.Data +@inject MessageService AppMessages @inject AuthenticationStateProvider AuthenticationStateProvider
-
+
@userName
-
+
+ @PageName
-
+
@if (ShowSearch) { @@ -25,11 +28,33 @@ private string userName = ""; + private string PageName { get; set; } + private string PageIcon { get; set; } + protected override async Task OnInitializedAsync() { await forceReload(); } + protected override void OnInitialized() + { + AppMessages.EA_PageUpdated += OnPageUpdate; + } + public void OnPageUpdate() + { + PageName = AppMessages.PageName; + PageIcon = AppMessages.PageIcon; + InvokeAsync(() => + { + StateHasChanged(); + }); + } + + public void Dispose() + { + AppMessages.EA_PageUpdated -= OnPageUpdate; + } + private async Task forceReload() { diff --git a/MP.Stats/Components/DetailOee.razor b/MP.Stats/Components/DetailOee.razor index 032aae93..2e65aa37 100644 --- a/MP.Stats/Components/DetailOee.razor +++ b/MP.Stats/Components/DetailOee.razor @@ -6,20 +6,11 @@
GRAFICO
-
+
-
- -
-
- -
-
- -
-
- +
+
@@ -40,38 +31,9 @@ } } - [Parameter] public SelectData CurrFilter { get; set; } - protected void ShowCont() - { - SetFilter(); - // rimando... - NavManager.NavigateTo($"controlli"); - } - - protected void ShowDDB() - { - SetFilter(); - // rimando... - NavManager.NavigateTo($"diario"); - } - - protected void ShowScar() - { - SetFilter(); - // rimando... - NavManager.NavigateTo($"scarti"); - } - - protected void ShowUAL() - { - SetFilter(); - // rimando... - NavManager.NavigateTo($"userlog"); - } - - protected void SetFilter() + protected override Task OnInitializedAsync() { int oraStart = 0; switch (currRecord.Turno) @@ -95,6 +57,8 @@ DateStart = currRecord.DataRif.AddHours(oraStart), DateEnd = currRecord.DataRif.AddHours(oraStart + 8) }; - MessageService.DetailFilter = CurrFilter; + + return base.OnInitializedAsync(); } + } \ No newline at end of file diff --git a/MP.Stats/Components/JumpDetail.razor b/MP.Stats/Components/JumpDetail.razor new file mode 100644 index 00000000..bab4c64f --- /dev/null +++ b/MP.Stats/Components/JumpDetail.razor @@ -0,0 +1,58 @@ +@using MP.Stats.Data +@inject NavigationManager NavManager +@inject MessageService MessageService + +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +@code{ + [Parameter] + public SelectData DetailFilterSel { get; set; } + + protected void ShowCont() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"controlli"); + } + + protected void ShowDDB() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"diario"); + } + + protected void ShowScar() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"scarti"); + } + + protected void ShowUAL() + { + SetFilter(); + // rimando... + NavManager.NavigateTo($"userlog"); + } + + protected void SetFilter() + { + MessageService.DetailFilter = DetailFilterSel; + } +} \ No newline at end of file diff --git a/MP.Stats/Data/MessageService.cs b/MP.Stats/Data/MessageService.cs index 13417b00..1394318c 100644 --- a/MP.Stats/Data/MessageService.cs +++ b/MP.Stats/Data/MessageService.cs @@ -11,6 +11,8 @@ namespace MP.Stats.Data private SelectData _detailFilter = new SelectData(); private SelectData _masterFilter = new SelectData(); + private string _pageIcon; + private string _pageName; private string _searchVal; private bool showSearch; @@ -22,6 +24,8 @@ namespace MP.Stats.Data public event Action EA_HideSearch; + public event Action EA_PageUpdated; + public event Action EA_SearchUpdated; public event Action EA_ShowSearch; @@ -53,6 +57,32 @@ namespace MP.Stats.Data public SelectData ODL_Filter { get; set; } = SelectData.Init(5, 7); public SelectData OEE_Filter { get; set; } = SelectData.Init(5, 7); + public string PageIcon + { + get => _pageIcon; + set + { + if (_pageIcon != value) + { + _pageIcon = value; + ReportPageUpd(); + } + } + } + + public string PageName + { + get => _pageName; + set + { + if (_pageName != value) + { + _pageName = value; + ReportPageUpd(); + } + } + } + public string SearchVal { get => _searchVal; @@ -98,9 +128,17 @@ namespace MP.Stats.Data #endregion Public Properties - #region Protected Methods + #region Private Methods - protected void ReportSearch() + private void ReportPageUpd() + { + if (EA_PageUpdated != null) + { + EA_PageUpdated?.Invoke(); + } + } + + private void ReportSearch() { if (EA_SearchUpdated != null) { @@ -108,6 +146,6 @@ namespace MP.Stats.Data } } - #endregion Protected Methods + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 9078500b..86463196 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -116,6 +116,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "Registro Controlli"; + MessageService.PageIcon = "oi oi-beaker"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 51f547ca..aff832fd 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -107,6 +107,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "Diario Produzione"; + MessageService.PageIcon = "oi oi-clipboard"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index 8466112e..bafa7164 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -42,6 +42,8 @@ protected override Task OnInitializedAsync() { MessageService.ShowSearch = false; + MessageService.PageName = "Home"; + MessageService.PageIcon = "oi oi-home"; return base.OnInitializedAsync(); } } \ No newline at end of file diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 02d80146..5b260e77 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -108,6 +108,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "TRS/OEE %"; + MessageService.PageIcon = "oi oi-monitor"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index 7b472ac7..e4477774 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -103,6 +103,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "Report ODL/Comm."; + MessageService.PageIcon = "oi oi-book"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 025e10be..bfb8cc7c 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -106,6 +106,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "Registro Scarti"; + MessageService.PageIcon = "oi oi-warning"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); } diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 2f092c0a..8a3f824d 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -108,6 +108,8 @@ namespace MP.Stats.Pages { numRecord = 10; MessageService.ShowSearch = false; + MessageService.PageName = "User ActionLog"; + MessageService.PageIcon = "oi oi-document"; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); }