diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index a339bc42..35159bb7 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -1,9 +1,7 @@ using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.WebUtilities; using Microsoft.JSInterop; using MP.Data.DatabaseModels; using MP.SPEC.Data; -using MP.SPEC.Pages; using MP.SPEC.Services; using NLog; @@ -74,15 +72,10 @@ namespace MP.SPEC.Components [Inject] protected IOApiService MpIoApiCall { get; set; } = null!; - [Inject] - protected NavigationManager NavManager { get; set; } = null!; - #endregion Protected Properties #region Protected Methods - protected int odlCercato = 0; - /// /// Registra chiusura ODL alla data indicata /// @@ -145,14 +138,6 @@ namespace MP.SPEC.Components protected override async Task OnInitializedAsync() { - if (NavManager.Uri.Contains("ODL?")) - { - var uri = NavManager.ToAbsoluteUri(NavManager.Uri); - if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("IdxOdl", out var _idxOdl)) - { - odlCercato = int.Parse(_idxOdl); - } - } ListStati = await MDService.AnagStatiComm(); } @@ -426,14 +411,7 @@ namespace MP.SPEC.Components isLoading = true; SearchRecords = await MDService.ListODLFilt(currFilter.IsActive, currFilter.SearchVal, currFilter.CodFase, currFilter.CodReparto, currFilter.IdxMacchina, currFilter.DtStart, currFilter.DtEnd); totalCount = SearchRecords.Count; - if (NavManager.Uri.Contains("ODL?")) - { - ListRecords = SearchRecords.Where(x => x.IdxOdl == odlCercato).Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - } - else - { - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - } + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); await Task.Delay(1); await InvokeAsync(() => StateHasChanged()); isLoading = false; diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index d2ef2f67..7d48ffdf 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -80,7 +80,7 @@ namespace MP.SPEC.Components currRecord = null; currRecord = selRec; await RecordSel.InvokeAsync(Utils.POdlExt.clone(selRec)); - header = "Nuovo PODL"; + header = "Duplica PODL"; } /// diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index b06244a5..fa781fe8 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2212.114 + 6.16.2212.115 diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index 77590ffc..4c6744de 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -60,7 +60,7 @@ { - + @header @@ -76,20 +76,22 @@ Articolo + --Selezionare un articolo-- @if (ListArticoli != null) { foreach (var item in ListArticoli) { - @if (item.CodArticolo == currRecordControlli.CodArticolo) - { - @item.CodArticolo | @item.DescArticolo | @item.Disegno - } - else - { - @item.CodArticolo | @item.DescArticolo | @item.Disegno - } + @* @if (item.CodArticolo == currRecordControlli.CodArticolo) + { + @item.CodArticolo | @item.DescArticolo | @item.Disegno + else + { + } + }*@ + @item.CodArticolo | @item.DescArticolo | @item.Disegno } } + } @@ -145,6 +147,7 @@ Macchina + --Selezionare una macchina-- @if (ListMacchine != null) { foreach (var item in ListMacchine) @@ -152,14 +155,15 @@ @if (!item.Descrizione.Contains("NEW Descrizione")) { - if (item.IdxMacchina == currRecordControlli.IdxMacchina) - { - @item.IdxMacchina | @item.Descrizione - } - else - { - @item.IdxMacchina | @item.Descrizione - } + @*if (item.IdxMacchina == currRecordControlli.IdxMacchina) + { + @item.IdxMacchina | @item.Descrizione + } + else + { + } + *@ + @item.IdxMacchina | @item.Descrizione } } } diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 59ce326c..d4a0cf7f 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -6,6 +6,7 @@ using MP.SPEC.Components; using MP.SPEC.Data; using MP.SPEC.Services; using NLog; +using System.Reflection.PortableExecutable; namespace MP.SPEC.Pages { @@ -137,6 +138,7 @@ namespace MP.SPEC.Pages /// protected async Task reqNewPODL() { + header = "Nuovo PODL"; #if false if (ListArticoli != null && ListArticoli.Count > 0) { @@ -182,6 +184,7 @@ namespace MP.SPEC.Pages protected async Task selRecord(PODLExpModel selRec) { + currRecord = selRec; await Task.Delay(1); } diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index e5dc50d3..8a8db222 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC - Versione: 6.16.2212.114 + Versione: 6.16.2212.115 Note di rilascio: diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index b011c42f..cbfb93c9 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2212.114 +6.16.2212.115 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 30112398..f0ccd759 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2212.114 + 6.16.2212.115 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false