diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index b3882a7b..84e96282 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.DataProtection; using Microsoft.JSInterop; using MP.Data.DatabaseModels; using MP.Data.DTO; @@ -262,6 +263,7 @@ namespace MP.SPEC.Components currFluxLogDto = null; currRecord = null; visualizzaFlux = true; + await RecordSelFlux.InvokeAsync(currFluxLogDto); await Task.Delay(1); } diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index 97105efa..9511dfc4 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -3,6 +3,7 @@ using Microsoft.JSInterop; using MP.Data.DatabaseModels; using MP.SPEC.Data; using MP.SPEC.Services; +using NLog; namespace MP.SPEC.Components { @@ -84,6 +85,7 @@ namespace MP.SPEC.Components { // effettua chiusura sul DB await MDService.ODLClose(currRecord.IdxOdl, currRecord.IdxMacchina, 0, true); + Log.Info($"Effettuata chiusura ODL {currRecord.IdxOdl}"); // ricarica... await selectRecord(null); } @@ -112,6 +114,7 @@ namespace MP.SPEC.Components if (currRecord != null) { await callSyncDb(currRecord.IdxMacchina); + Log.Info($"Richiesto forceSyncDb per idxMacc {currRecord.IdxMacchina}"); // ricarica... await selectRecord(null); } @@ -197,6 +200,7 @@ namespace MP.SPEC.Components #region Private Fields + private static Logger Log = LogManager.GetCurrentClassLogger(); private ODLModel? currRecord = null; private List? ListOdlStats; @@ -273,6 +277,7 @@ namespace MP.SPEC.Components } catch (Exception exc) { + Log.Error($"Errore durante chiamata: {Environment.NewLine}{exc}"); } } diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 2b04387f..dd5efe89 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -3,6 +3,7 @@ using Microsoft.JSInterop; using MP.Data.DatabaseModels; using MP.SPEC.Data; using MP.SPEC.Services; +using NLog; namespace MP.SPEC.Components { @@ -209,9 +210,21 @@ namespace MP.SPEC.Components #region Private Fields + private static Logger Log = LogManager.GetCurrentClassLogger(); private PODLModel? currRecord = null; private List? ListRecords; private List? ListStati; + + /// + /// scadenza validità lista ODL correnti + /// + private DateTime odlCurrExp = DateTime.Now.AddMinutes(-1); + + /// + /// Elenco ODL correnti... + /// + private List odlCurrList = new List(); + private List? SearchRecords; #endregion Private Fields @@ -278,6 +291,7 @@ namespace MP.SPEC.Components } catch (Exception exc) { + Log.Error($"Errore durante chiamata: {Environment.NewLine}{exc}"); } } @@ -379,16 +393,6 @@ namespace MP.SPEC.Components isLoading = false; } - /// - /// scadenza validità lista ODL correnti - /// - private DateTime odlCurrExp = DateTime.Now.AddMinutes(-1); - - /// - /// Elenco ODL correnti... - /// - private List odlCurrList = new List(); - private string tradFase(string codFase) { string answ = codFase; diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index dd2fa825..c0371246 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.1820 + 6.16.2210.1910 diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 36a85db2..56c65581 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -4,6 +4,7 @@ using MP.Data.DatabaseModels; using MP.SPEC.Components; using MP.SPEC.Data; using MP.SPEC.Services; +using NLog; namespace MP.SPEC.Pages { @@ -165,6 +166,7 @@ namespace MP.SPEC.Pages #region Private Fields + private static Logger Log = LogManager.GetCurrentClassLogger(); private PODLModel? _currRecord = null; private List? ListArticoli; private List? ListAziende; @@ -226,6 +228,19 @@ namespace MP.SPEC.Pages } } + private string currFase + { + get => currFilter.CodFase; + set + { + if (!currFilter.CodFase.Equals(value)) + { + currFilter.CodFase = value; + currPage = 1; + } + } + } + private SelectPOdlParams currFilter { get; set; } = new SelectPOdlParams(); private int currPage @@ -252,19 +267,6 @@ namespace MP.SPEC.Pages set => currFilter.NumRec = value; } - private string currFase - { - get => currFilter.CodFase; - set - { - if (!currFilter.CodFase.Equals(value)) - { - currFilter.CodFase = value; - currPage = 1; - } - } - } - private int totalCount { get => currFilter.TotCount; @@ -285,7 +287,14 @@ namespace MP.SPEC.Pages // chiamo aggiunta task SyncDb... string idxMacc = selRec.IdxMacchina; string restUrl = $"IOB/addTask2Exe/{idxMacc}?taskName=syncDbData&taskVal="; - var response = await MpIoApiCall.callMpIoUrlGet(restUrl); + try + { + var response = await MpIoApiCall.callMpIoUrlGet(restUrl); + } + catch (Exception exc) + { + Log.Error($"Errore durante chiamata: {Environment.NewLine}{exc}"); + } } private async Task reloadData() diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 38873420..f16ff6c8 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2210.1820

+

Versione: 6.16.2210.1910


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 57be2c69..4a9c44a1 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2210.1820 +6.16.2210.1910 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index c55595cd..8b8eb2e2 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2210.1820 + 6.16.2210.1910 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.SPEC/Services/IOApiService.cs b/MP.SPEC/Services/IOApiService.cs index 9267abcd..58a29039 100644 --- a/MP.SPEC/Services/IOApiService.cs +++ b/MP.SPEC/Services/IOApiService.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.Configuration; using MP.SPEC.Data; +using NLog; using System.Text.Json; namespace MP.SPEC.Services @@ -18,6 +19,9 @@ namespace MP.SPEC.Services private static IConfiguration _configuration = null!; + + private static Logger Log = LogManager.GetCurrentClassLogger(); + private static string MpIoBaseUrl = ""; public IOApiService(IHttpClientFactory clientFactory, IConfiguration configuration, ILogger logger) @@ -40,15 +44,18 @@ namespace MP.SPEC.Services var request = new HttpRequestMessage(HttpMethod.Get, $"{MpIoBaseUrl}{relUrl}"); request.Headers.Add("Accept", "application/vnd.github.v3+json"); var client = _clientFactory.CreateClient(); + Log.Info($"Richiesta call per {MpIoBaseUrl}{relUrl}"); var response = await client.SendAsync(request); if (response.IsSuccessStatusCode) { var stringResponse = await response.Content.ReadAsStringAsync(); result = stringResponse; + Log.Info($"Richiesta call per {MpIoBaseUrl}{relUrl}"); } else { result = "NO"; + Log.Error($"Errore in chaimata | code {response.StatusCode} | {response.Content}"); } return result; } diff --git a/MP.SPEC/appsettings.Development.json b/MP.SPEC/appsettings.Development.json index 770d3e93..ad871614 100644 --- a/MP.SPEC/appsettings.Development.json +++ b/MP.SPEC/appsettings.Development.json @@ -5,5 +5,11 @@ "Default": "Information", "Microsoft.AspNetCore": "Warning" } + }, + "ServerConf": { + "maxAge": "2000", + "cacheCheckArtUsato": 2, + "redisLongTimeCache": 15, + "MpIoBaseUrl": "https://iis01.egalware.com/MP/IO/" } } diff --git a/MP.SPEC/appsettings.Staging.json b/MP.SPEC/appsettings.Staging.json new file mode 100644 index 00000000..d3047013 --- /dev/null +++ b/MP.SPEC/appsettings.Staging.json @@ -0,0 +1,15 @@ +{ + "DetailedErrors": true, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "ServerConf": { + "maxAge": "2000", + "cacheCheckArtUsato": 2, + "redisLongTimeCache": 15, + "MpIoBaseUrl": "http://localhost/MP/IO/" + } +}