diff --git a/MP.AppAuth/Controllers/MPController .cs b/MP.AppAuth/Controllers/MPController .cs index 77cd4940..8a0edcb0 100644 --- a/MP.AppAuth/Controllers/MPController .cs +++ b/MP.AppAuth/Controllers/MPController .cs @@ -45,8 +45,11 @@ namespace MP.AppAuth.Controllers public void Dispose() { - // Clear database controller - dbController.Dispose(); + if (dbController != null) + { + // Clear database controller + dbController.Dispose(); + } } #endregion Public Methods diff --git a/MP.Land/Components/HomeLink.razor b/MP.Land/Components/HomeLink.razor index c95301c7..5729ad03 100644 --- a/MP.Land/Components/HomeLink.razor +++ b/MP.Land/Components/HomeLink.razor @@ -4,6 +4,7 @@ @inject IConfiguration Configuration @inject AppAuthService DataService +@inject MessageService MService @inject LicenseService LicServ @if (authOk()) // disegno box cliccabile e programma attivato @@ -29,23 +30,24 @@ } -else // disegno box non cliccabile e licenza mancante +else // disegno box cliccabile e licenza ASSISTENZA mancante {
- +

@CurrItem.AppName 

+
-
+
@(traduci($"{CurrItem.AppName}-TITLE"))
-
Licenza Mancante
+
Licenza Mancate
+ Assistenza/Aggiornamenti non attivi
-
+
@(traduci($"{CurrItem.AppName}-LIST"))
diff --git a/MP.Land/Components/HomeLink.razor.cs b/MP.Land/Components/HomeLink.razor.cs index fee7c062..4b5e800f 100644 --- a/MP.Land/Components/HomeLink.razor.cs +++ b/MP.Land/Components/HomeLink.razor.cs @@ -46,10 +46,15 @@ namespace MP.Land.Components protected bool authOk() { + //return false; bool allOk = !string.IsNullOrEmpty(CurrItem.LicenseKey); if (allOk) { allOk = LicServ.checkLicenseActive(CurrItem.LicenseKey); + if (allOk) + { + MService.YearAuth = true; + } } return allOk; diff --git a/MP.Land/Data/AppAuthService.cs b/MP.Land/Data/AppAuthService.cs index 85391a37..f4410e0c 100644 --- a/MP.Land/Data/AppAuthService.cs +++ b/MP.Land/Data/AppAuthService.cs @@ -10,6 +10,7 @@ using Microsoft.Extensions.Caching.Memory; using System.Diagnostics; using System.Text; using Newtonsoft.Json; +using System.Diagnostics.Eventing.Reader; namespace MP.Land.Data { @@ -74,6 +75,8 @@ namespace MP.Land.Data } } + + #endregion Public Constructors #region Private Properties diff --git a/MP.Land/Data/MessageService.cs b/MP.Land/Data/MessageService.cs index 77ad39cc..0ec97f66 100644 --- a/MP.Land/Data/MessageService.cs +++ b/MP.Land/Data/MessageService.cs @@ -1,4 +1,5 @@ -using System; +using Microsoft.AspNetCore.Components; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -13,6 +14,7 @@ namespace MP.Land.Data private string _pageIcon; private string _pageName; private string _searchVal = ""; + private bool _yearAuth = false; private SelectData _selFilter = SelectData.Init(4, 15); private bool showSearch; @@ -30,6 +32,8 @@ namespace MP.Land.Data public event Action EA_ShowSearch; + public event Action EA_UpdateLic; + #endregion Public Events #region Public Properties @@ -165,6 +169,26 @@ namespace MP.Land.Data } } + public bool YearAuth + { + get => _yearAuth; + set + { + if (_yearAuth != value) + { + _yearAuth = value; + ReportYearAuth(); + } + } + } + public void ReportYearAuth() + { + if (EA_UpdateLic != null) + { + EA_UpdateLic?.Invoke(); + } + } + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index d21864c6..b553890b 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2304.0609 + 6.16.2310.1610 diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 97916616..e7642e5e 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

Versione: 6.16.2304.0609

+

Versione: 6.16.2310.1610


Note di rilascio:
    diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index a8b01d73..3663ae78 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2304.0609 +6.16.2310.1610 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index 78a95e3d..4e42c9aa 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2304.0609 + 6.16.2310.1610 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false diff --git a/MP.Land/Shared/MainLayout.razor b/MP.Land/Shared/MainLayout.razor index e316dc69..9ab2ea95 100644 --- a/MP.Land/Shared/MainLayout.razor +++ b/MP.Land/Shared/MainLayout.razor @@ -4,6 +4,7 @@ @using MP.Land.Components @inject MessageService AppMService +@inject LicenseService LicServ @implements IDisposable
    @@ -19,7 +20,7 @@
    @Body
    -
    +
    diff --git a/MP.Land/Shared/MainLayout.razor.cs b/MP.Land/Shared/MainLayout.razor.cs index ca9bc211..0ba4bfd0 100644 --- a/MP.Land/Shared/MainLayout.razor.cs +++ b/MP.Land/Shared/MainLayout.razor.cs @@ -1,4 +1,8 @@ +using Microsoft.AspNetCore.Components; +using MP.Land.Data; using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace MP.Land.Shared { @@ -33,12 +37,26 @@ namespace MP.Land.Shared #endregion Public Methods + [Inject] + protected AppAuthService DataService { get; set; } #region Protected Methods - - protected override void OnInitialized() + protected override async Task OnInitializedAsync() { AppMService.EA_ShowSearch += OnShowSearch; AppMService.EA_HideSearch += OnHideSearch; + AppMService.EA_UpdateLic += SetYrAuth; + await Task.Delay(1); + + } + + protected void SetYrAuth() + { + annualAuthOk = AppMService.YearAuth; + cssRow = annualAuthOk ? "bottom-row" : "bottom-row bg-danger"; + InvokeAsync(() => + { + StateHasChanged(); + }); } #endregion Protected Methods @@ -47,6 +65,13 @@ namespace MP.Land.Shared private bool ShowSearch { get; set; } = false; + + protected string cssRow { get; set; } = "bottom-row bg-primary"; + + protected bool annualAuthOk { get; set; } = false; + + private List ListRecords; + #endregion Private Properties } } \ No newline at end of file