diff --git a/MP.IOC/Data/MpDataService.cs b/MP.IOC/Data/MpDataService.cs index a751b4a3..0eb14066 100644 --- a/MP.IOC/Data/MpDataService.cs +++ b/MP.IOC/Data/MpDataService.cs @@ -858,9 +858,9 @@ namespace MP.IOC.Data /// /// /// - public async Task> MacchineGetFilt(string codGruppo) + public async Task> MacchineGetFilt(string codGruppo) { - List? result = new List(); + List? result = new List(); Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); string readType = "DB"; @@ -870,7 +870,7 @@ namespace MP.IOC.Data RedisValue rawData = redisDb.StringGet(currKey); if (rawData.HasValue) { - result = JsonConvert.DeserializeObject>($"{rawData}"); + result = JsonConvert.DeserializeObject>($"{rawData}"); readType = "REDIS"; } else @@ -882,7 +882,7 @@ namespace MP.IOC.Data } if (result == null) { - result = new List(); + result = new List(); } stopWatch.Stop(); TimeSpan ts = stopWatch.Elapsed; diff --git a/MP.IOC/Resources/ChangeLog.html b/MP.IOC/Resources/ChangeLog.html index 20a6b23a..7ca8e342 100644 --- a/MP.IOC/Resources/ChangeLog.html +++ b/MP.IOC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MP-IOC -

Versione: 6.16.2504.1617

+

Versione: 6.16.2506.3014


Note di rilascio:
  • diff --git a/MP.IOC/Resources/VersNum.txt b/MP.IOC/Resources/VersNum.txt index 02219081..a612c160 100644 --- a/MP.IOC/Resources/VersNum.txt +++ b/MP.IOC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2504.1617 +6.16.2506.3014 diff --git a/MP.IOC/Resources/manifest.xml b/MP.IOC/Resources/manifest.xml index 74313120..29da8138 100644 --- a/MP.IOC/Resources/manifest.xml +++ b/MP.IOC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2504.1617 + 6.16.2506.3014 https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/MP.IOC.zip https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/ChangeLog.html false diff --git a/MP.MON/Components/Pages/Index.razor.cs b/MP.MON/Components/Pages/Index.razor.cs index 0cd82f38..a39b6ce0 100644 --- a/MP.MON/Components/Pages/Index.razor.cs +++ b/MP.MON/Components/Pages/Index.razor.cs @@ -217,7 +217,7 @@ namespace MP.MON.Components.Pages private bool doBlink = false; - private List listMacchine = new List(); + private List listMacchine = new List(); private List? ListMSE = null; diff --git a/MP.MON/MP.MON.csproj b/MP.MON/MP.MON.csproj index 3867db9f..42dd6a7e 100644 --- a/MP.MON/MP.MON.csproj +++ b/MP.MON/MP.MON.csproj @@ -6,7 +6,7 @@ enable MP.MON $(AssemblyName.Replace(' ', '_')) - 6.16.2504.1418 + 6.16.2506.3014 diff --git a/MP.MON/Resources/ChangeLog.html b/MP.MON/Resources/ChangeLog.html index 3a00bd95..8d295a3e 100644 --- a/MP.MON/Resources/ChangeLog.html +++ b/MP.MON/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

    Versione: 6.16.2504.1418

    +

    Versione: 6.16.2506.3014


    Note di rilascio:
    • diff --git a/MP.MON/Resources/VersNum.txt b/MP.MON/Resources/VersNum.txt index 97c8814a..a612c160 100644 --- a/MP.MON/Resources/VersNum.txt +++ b/MP.MON/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2504.1418 +6.16.2506.3014 diff --git a/MP.MON/Resources/manifest.xml b/MP.MON/Resources/manifest.xml index 85eb84f3..96d7d7a3 100644 --- a/MP.MON/Resources/manifest.xml +++ b/MP.MON/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2504.1418 + 6.16.2506.3014 https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.MON.zip https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html false diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index 639db8b9..6360e323 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -317,7 +317,7 @@ namespace MP.SPEC.Components private List? ListArticoli; private List? ListGruppiFase; - private List? ListMacchine; + private List? ListMacchine; private List? ListRecords; private List? ListStati; diff --git a/MP.SPEC/Components/Reparti/ListMacchine.razor.cs b/MP.SPEC/Components/Reparti/ListMacchine.razor.cs index 96cd6c33..f8a2d32c 100644 --- a/MP.SPEC/Components/Reparti/ListMacchine.razor.cs +++ b/MP.SPEC/Components/Reparti/ListMacchine.razor.cs @@ -10,13 +10,13 @@ namespace MP.SPEC.Components.Reparti #region Public Properties [Parameter] - public List? AllRecords { get; set; } = null; + public List? AllRecords { get; set; } = null; [Parameter] public string CodGruppoCurr { get; set; } = ""; [Parameter] - public List? CurrRecords { get; set; } = null; + public List? CurrRecords { get; set; } = null; [Parameter] public EventCallback EC_RecChange { get; set; } @@ -63,8 +63,8 @@ namespace MP.SPEC.Components.Reparti private bool isLoading = false; - private List? ListAvail; - private List? ListRecords; + private List? ListAvail; + private List? ListRecords; private int numRecord = 5; private int totalCount = 0; @@ -92,7 +92,7 @@ namespace MP.SPEC.Components.Reparti #region Private Methods - private async Task DoAdd(Macchine currRec) + private async Task DoAdd(MacchineModel currRec) { // eliminazione dal gruppo Gruppi2MaccModel rec2del = new Gruppi2MaccModel() @@ -104,7 +104,7 @@ namespace MP.SPEC.Components.Reparti await EC_RecChange.InvokeAsync(false); } - private async Task DoDelete(Macchine currRec) + private async Task DoDelete(MacchineModel currRec) { if (!await JSRuntime.InvokeAsync("confirm", "Eliminazione record dal gruppo: sei sicuro di voler procedere?")) return; @@ -142,7 +142,7 @@ namespace MP.SPEC.Components.Reparti .ToList(); totalCount = CurrRecords.Count; } - ListAvail = new List(); + ListAvail = new List(); if (AllRecords != null) { foreach (var item in AllRecords) diff --git a/MP.SPEC/Components/Reparti/ModalMaccAdd.razor b/MP.SPEC/Components/Reparti/ModalMaccAdd.razor index 571df799..39db2951 100644 --- a/MP.SPEC/Components/Reparti/ModalMaccAdd.razor +++ b/MP.SPEC/Components/Reparti/ModalMaccAdd.razor @@ -65,12 +65,12 @@ [Parameter] - public List? AllRecords { get; set; } = null; + public List? AllRecords { get; set; } = null; [Parameter] public EventCallback EC_Close { get; set; } [Parameter] - public EventCallback EC_ReqAdd { get; set; } + public EventCallback EC_ReqAdd { get; set; } private int numRecord = 5; @@ -90,7 +90,7 @@ private int totalCount = 0; private int currPage = 1; private bool isLoading = false; - private List? ListRecords; + private List? ListRecords; private string btnSearchCss { @@ -114,7 +114,7 @@ totalCount = 0; if (AllRecords != null) { - List tmpList = new List(AllRecords); + List tmpList = new List(AllRecords); // verifico ricerca if (!string.IsNullOrEmpty(SearchVal)) { @@ -146,7 +146,7 @@ await EC_Close.InvokeAsync(true); } - private async Task DoAdd(Macchine currRec) + private async Task DoAdd(MacchineModel currRec) { // sollevo evento richiesta aggiunta ... await EC_ReqAdd.InvokeAsync(currRec); diff --git a/MP.SPEC/Components/SelFilterXDL.razor.cs b/MP.SPEC/Components/SelFilterXDL.razor.cs index 96517c6b..cd54966f 100644 --- a/MP.SPEC/Components/SelFilterXDL.razor.cs +++ b/MP.SPEC/Components/SelFilterXDL.razor.cs @@ -19,7 +19,7 @@ namespace MP.SPEC.Components public List? ListGruppiFase { get; set; } = null; [Parameter] - public List? ListMacchine { get; set; } = null; + public List? ListMacchine { get; set; } = null; [Parameter] public List? ListStati { get; set; } = null; diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 5892720f..e4b1e954 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -1450,9 +1450,9 @@ namespace MP.SPEC.Data /// /// /// - public List MacchineGetFilt(string codGruppo) + public List MacchineGetFilt(string codGruppo) { - List? result = new List(); + List? result = new List(); Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); string readType = "DB"; @@ -1462,7 +1462,7 @@ namespace MP.SPEC.Data RedisValue rawData = redisDb.StringGet(currKey); if (rawData.HasValue) { - result = JsonConvert.DeserializeObject>($"{rawData}"); + result = JsonConvert.DeserializeObject>($"{rawData}"); readType = "REDIS"; } else @@ -1474,7 +1474,7 @@ namespace MP.SPEC.Data } if (result == null) { - result = new List(); + result = new List(); } stopWatch.Stop(); TimeSpan ts = stopWatch.Elapsed; diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 77156d41..c4f0a4bc 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2506.1118 + 6.16.2506.3014 1800a78a-6ff1-40f9-b490-87fb8bfc1394 en diff --git a/MP.SPEC/Pages/GroupMacOprMan.razor.cs b/MP.SPEC/Pages/GroupMacOprMan.razor.cs index 68566d90..8bd01f77 100644 --- a/MP.SPEC/Pages/GroupMacOprMan.razor.cs +++ b/MP.SPEC/Pages/GroupMacOprMan.razor.cs @@ -11,8 +11,8 @@ namespace MP.SPEC.Pages { #region Protected Fields - protected List? ListMacchine = null; - protected List? ListMacchineAll = null; + protected List? ListMacchine = null; + protected List? ListMacchineAll = null; protected List? ListOperatori = null; protected List? ListOperatoriAll = null; protected List? ListReparti = null; diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs index 9f39fbea..0dd3230a 100644 --- a/MP.SPEC/Pages/ODL.razor.cs +++ b/MP.SPEC/Pages/ODL.razor.cs @@ -160,7 +160,7 @@ namespace MP.SPEC.Pages #region Private Fields - private List? ListMacchine; + private List? ListMacchine; private List? ListStati; #endregion Private Fields diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 14d2960e..73f994a2 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -300,7 +300,7 @@ namespace MP.SPEC.Pages private List? ListArticoli; private List? ListAziende; private List? ListGruppiFase; - private List? ListMacchine; + private List? ListMacchine; private List? ListStati; private int nArtSearch = 5; diff --git a/MP.SPEC/Pages/Podl2Kit.razor.cs b/MP.SPEC/Pages/Podl2Kit.razor.cs index 51d1cee7..9952a5e5 100644 --- a/MP.SPEC/Pages/Podl2Kit.razor.cs +++ b/MP.SPEC/Pages/Podl2Kit.razor.cs @@ -246,7 +246,7 @@ namespace MP.SPEC.Pages private List ListGruppiFase = new List(); - private List ListMacchine = new List(); + private List ListMacchine = new List(); private List? ListRecords; diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index b251ad1a..8d295a3e 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

      Versione: 6.16.2506.1118

      +

      Versione: 6.16.2506.3014


      Note di rilascio:
      • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 46795157..a612c160 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2506.1118 +6.16.2506.3014 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index c1b25cc9..065aac64 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2506.1118 + 6.16.2506.3014 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 diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 8aece0ac..417aea48 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -248,20 +248,20 @@ namespace MP.Stats.Data return answ; } - public async Task> MacchineGetAll() + public async Task> MacchineGetAll() { // setup parametri costanti string source = "DB"; Stopwatch sw = new Stopwatch(); sw.Start(); - List result = new List(); + List result = new List(); // cerco in redis... DateTime adesso = DateTime.Now; string currKey = $"{redisBaseKey}:Cache:Macchine"; RedisValue rawData = await redisDb.StringGetAsync(currKey); if (rawData.HasValue) { - result = JsonConvert.DeserializeObject>($"{rawData}"); + result = JsonConvert.DeserializeObject>($"{rawData}"); source = "REDIS"; } else @@ -273,7 +273,7 @@ namespace MP.Stats.Data } if (result == null) { - result = new List(); + result = new List(); } sw.Stop(); Log.Debug($"MacchineGetAll | {source} | {sw.Elapsed.TotalMilliseconds}ms"); diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 039d6c10..5ebc9e7a 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2505.1908 - 6.16.2505.1908 + 6.16.2506.3014 + 6.16.2506.3014 true $(NoWarn);1591 en diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index c9ba38db..22f8d7b9 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

        Versione: 6.16.2505.1908

        +

        Versione: 6.16.2506.3014


        Note di rilascio:
          diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 723f40e5..a612c160 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2505.1908 +6.16.2506.3014 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index f50a7ec3..f03f1def 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2505.1908 + 6.16.2506.3014 https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false