diff --git a/MP.Land/Data/LicenseService.cs b/MP.Land/Data/LicenseService.cs index a9919f55..baeb055c 100644 --- a/MP.Land/Data/LicenseService.cs +++ b/MP.Land/Data/LicenseService.cs @@ -372,7 +372,35 @@ namespace MP.Land.Data } else { - _logger.LogInformation($"Record non trovato per {authKey}"); + _logger.LogInformation($"checkLicenseActive | Record non trovato per {authKey}"); + } + } + return answ; + } + /// + /// Verifica scadenza licenza + /// + /// + /// + public DateTime getLicenseExpiry(string authKey) + { + DateTime answ = DateTime.Today.AddDays(-1); + //cerco anche nelle info AKV + if (AKVList != null) + { + var recLic = AKVList.Where(x => x.ValString == authKey).FirstOrDefault(); + int numLic = 0; + //cerco in record + if (recLic != null) + { + numLic = (int)recLic.ValInt; + // verifico scadenza licenza! + DateTime scadenza = licenseManGLS.expiryDateByAuthKey(Installazione, recLic.NomeVar, numLic, authKey); + answ = scadenza; + } + else + { + _logger.LogInformation($"getLicenseExpiry | Record non trovato per {authKey}"); } } return answ; diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index f3047c6d..e5d244a5 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2211.0415 + 6.16.2211.0416 diff --git a/MP.Land/Pages/About.razor.cs b/MP.Land/Pages/About.razor.cs index a423fa16..2f7a0ded 100644 --- a/MP.Land/Pages/About.razor.cs +++ b/MP.Land/Pages/About.razor.cs @@ -4,12 +4,8 @@ using System.Threading.Tasks; namespace MP.Land.Pages { - public partial class About + public partial class About { - #region Public Methods - - #endregion Public Methods - #region Protected Methods protected override async Task OnInitializedAsync() @@ -43,7 +39,7 @@ namespace MP.Land.Pages private async Task reloadLicenseData() { - int cDelay = 5; + int cDelay = 10; // recupero dati await Task.Delay(cDelay); try @@ -54,6 +50,7 @@ namespace MP.Land.Pages Installazione = LicServ.Installazione; Applicazione = LicServ.Applicazione; MastKey = LicServ.MasterKey; + Scadenza = LicServ.getLicenseExpiry(LicServ.MasterKey); await Task.Delay(cDelay); var fatto = await LicServ.RefreshLicense(); await Task.Delay(cDelay); diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 36121c06..9fbcacb8 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

Versione: 6.16.2211.0415

+

Versione: 6.16.2211.0416


Note di rilascio: