diff --git a/MP.Stats/Components/DetailOee.razor b/MP.Stats/Components/DetailOee.razor index 746c8308..767bd4f0 100644 --- a/MP.Stats/Components/DetailOee.razor +++ b/MP.Stats/Components/DetailOee.razor @@ -47,7 +47,10 @@ { SetFilter(); // rimando... - NavManager.NavigateTo($"controlli/{currRecord.IdxMacchina}"); + NavManager.NavigateTo($"controlli"); +#if false + NavManager.NavigateTo($"controlli/{currRecord.IdxMacchina}"); +#endif } protected void ShowDDB() diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 1a1396a1..1e72a42c 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -1,5 +1,5 @@ @page "/controlli" -@page "/controlli/{IdxMacchina}" +@*@page "/controlli/{IdxMacchina}"*@ @using MP.Stats.Components diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 9783c590..db75f1a6 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -61,7 +61,17 @@ namespace MP.Stats.Pages #region Public Properties [Parameter] - public SelectData currFilter { get; set; } = new SelectData(); + public SelectData currFilter + { + get + { + return MessageService.DetailFilter; + } + set + { + MessageService.DetailFilter = value; + } + } [Parameter] public string IdxMacchina { get; set; } = ""; @@ -105,14 +115,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; - if (string.IsNullOrEmpty(IdxMacchina)) - { - currFilter = SelectData.Init(5, 7); - } - else - { - currFilter = MessageService.DetailFilter; - } MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 048e8139..47d620fb 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -106,9 +106,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; -#if false - currFilter = SelectData.Init(5, 3); -#endif MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index 7afb9c35..eaf7b98d 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -107,9 +107,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; -#if false - currFilter = SelectData.Init(5, 7); -#endif MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index fe994c2d..da15122a 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -102,9 +102,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; -#if false - currFilter = SelectData.Init(5, 7); -#endif MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 42190233..77fec8ac 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -21,7 +21,18 @@ namespace MP.Stats.Pages #region Private Properties - private SelectData currFilter { get; set; } = new SelectData(); + private SelectData currFilter + { + get + { + return MessageService.DetailFilter; + } + set + { + MessageService.DetailFilter = value; + } + } + private int currPage { get; set; } = 1; private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; @@ -54,6 +65,7 @@ namespace MP.Stats.Pages return answ; } } + #endregion Protected Properties #region Private Methods @@ -93,7 +105,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; - currFilter = SelectData.Init(5, 7); MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 248addff..45eda1a9 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -22,7 +22,18 @@ namespace MP.Stats.Pages #region Private Properties - private SelectData currFilter { get; set; } = new SelectData(); + private SelectData currFilter + { + get + { + return MessageService.DetailFilter; + } + set + { + MessageService.DetailFilter = value; + } + } + private int currPage { get; set; } = 1; private bool isLoading { get; set; } = false; private int numRecord { get; set; } = 10; @@ -96,7 +107,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { numRecord = 10; - currFilter = SelectData.Init(5, 7); MessageService.ShowSearch = false; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData();