From 935898a84711674122290642b5d8f5a4c03852b6 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 1 Dec 2022 15:05:49 +0100 Subject: [PATCH 1/2] fix selezione art e macchina --- MP.SPEC/Components/ListODL.razor.cs | 24 +----------------------- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/PODL.razor | 4 +++- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 6 files changed, 8 insertions(+), 28 deletions(-) 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/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..149092f8 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -76,6 +76,7 @@
Articolo + @if (ListMacchine != null) { foreach (var item in ListMacchine) { @if (!item.Descrizione.Contains("NEW Descrizione")) { - + if (item.IdxMacchina == currRecordControlli.IdxMacchina) { 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 From 7ecba567483a412333db86841409f8dd2d8bfcf1 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 1 Dec 2022 15:36:50 +0100 Subject: [PATCH 2/2] fix grafici --- MP.SPEC/Components/ListPODL.razor.cs | 2 +- MP.SPEC/Pages/PODL.razor | 42 +++++++++++++++------------- MP.SPEC/Pages/PODL.razor.cs | 3 ++ 3 files changed, 26 insertions(+), 21 deletions(-) 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/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index 149092f8..4c6744de 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -60,7 +60,7 @@ {
    -
    +
    @header
    @@ -76,21 +76,22 @@
    Articolo
    @@ -146,22 +147,23 @@
    Macchina