From c358bddd36632345b09bf71248c8896ded84f1f7 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 24 Nov 2021 15:01:36 +0100
Subject: [PATCH 1/5] Upgrade conf e favicon

---
 MP.Land/MP.Land.csproj              | 2 +-
 MP.Land/Resources/ChangeLog.html    | 2 +-
 MP.Land/Resources/VersNum.txt       | 2 +-
 MP.Land/Resources/manifest.xml      | 2 +-
 MP.Land/appsettings.Production.json | 2 +-
 MP.Land/appsettings.Staging.json    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index 3bd78b24..e800dbd7 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.14.2111.2414</Version>
+        <Version>6.14.2111.2415</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index 46de6f68..a24b2acd 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo gestione Programmi MAPO</i>
-    <h4>Versione: 6.14.2111.2414</h4>
+    <h4>Versione: 6.14.2111.2415</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index 814b8410..8e83ab18 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-6.14.2111.2414
+6.14.2111.2415
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index f595ace3..6288b38d 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.14.2111.2414</version>
+  <version>6.14.2111.2415</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Land/appsettings.Production.json b/MP.Land/appsettings.Production.json
index 557d5444..dace0e87 100644
--- a/MP.Land/appsettings.Production.json
+++ b/MP.Land/appsettings.Production.json
@@ -8,5 +8,5 @@
     }
   },
   "Environment": "Steam PROD",
-  "BaseUrl": "https://iis02.egalware.com/MP/"
+  "BaseUrl": "https://iis02.egalware.com/"
 }
\ No newline at end of file
diff --git a/MP.Land/appsettings.Staging.json b/MP.Land/appsettings.Staging.json
index 31aa23ba..85cfe9d8 100644
--- a/MP.Land/appsettings.Staging.json
+++ b/MP.Land/appsettings.Staging.json
@@ -8,5 +8,5 @@
     }
   },
   "Environment": "Steam DEV",
-  "BaseUrl": "https://iis01.egalware.com/MP/"
+  "BaseUrl": "https://iis01.egalware.com/"
 }
\ No newline at end of file

From a9dadb9d9ca173e1ee7f4305bb549dc0085f9377 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 25 Nov 2021 11:19:16 +0100
Subject: [PATCH 2/5] cleanup

---
 MP.Stats/Startup.cs.bak | 74 -----------------------------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 MP.Stats/Startup.cs.bak

diff --git a/MP.Stats/Startup.cs.bak b/MP.Stats/Startup.cs.bak
deleted file mode 100644
index bb9ae887..00000000
--- a/MP.Stats/Startup.cs.bak
+++ /dev/null
@@ -1,74 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using MP.Stats.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-using Microsoft.AspNetCore.Localization;
-using System.Globalization;
-
-namespace MP.Stats
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddRazorPages();
-            services.AddServerSideBlazor();
-            services.AddSingleton<WeatherForecastService>();
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-			// cultura IT...
-            var supportedCultures = new[]{
-                new CultureInfo("it-IT")
-            };
-            app.UseRequestLocalization(new RequestLocalizationOptions
-            {
-                DefaultRequestCulture = new RequestCulture("it-IT"),
-                SupportedCultures = supportedCultures,
-                FallBackToParentCultures = false
-            });
-            CultureInfo.DefaultThreadCurrentCulture = CultureInfo.CreateSpecificCulture("it-IT");
-            app.UseHttpsRedirection();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapBlazorHub();
-                endpoints.MapFallbackToPage("/_Host");
-            });
-        }
-    }
-}

From 1b95fa8d9194c96049171ad749bdee0d0a97d26b Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 6 Dec 2021 11:01:21 +0100
Subject: [PATCH 3/5] Update conf json x prod LAND

---
 .gitlab-ci.yml                      |  2 --
 MP.Land/appsettings.Production.json | 27 ++++++++++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb7833ea..542ab049 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,8 +30,6 @@ variables:
 .nexusUpload: &nexusUpload
    - |
       Set-Alias mCurl  C:\Windows\system32\curl.exe
-      $currentDate = get-date -format yyMM;
-      $currentTime = get-date -format ddHH;
       $fileVers = $env:APP_NAME + "\Resources\VersNum.txt"
       $VersNumb = Get-Content $fileVers
       echo "Curr Version: $VersNumb"     
diff --git a/MP.Land/appsettings.Production.json b/MP.Land/appsettings.Production.json
index dace0e87..18d68259 100644
--- a/MP.Land/appsettings.Production.json
+++ b/MP.Land/appsettings.Production.json
@@ -1,12 +1,21 @@
 {
-  "DetailedErrors": true,
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+    "DetailedErrors": true,
+    "Logging": {
+        "LogLevel": {
+            "Default": "Information",
+            "Microsoft": "Warning",
+            "Microsoft.Hosting.Lifetime": "Information"
+        }
+    },
+    "Environment": "Steam PROD",
+    "BaseUrl": "https://iis02.egalware.com/",
+    "AllowedHosts": "*",
+    "QrJumpPath": "MP/TAB/jumper?",
+    "downloadPath": "C:\\Steamware\\installers\\MP",
+    "appVers": "stable",
+    "ConnectionStrings": {
+        "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
+        "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
+        "Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
     }
-  },
-  "Environment": "Steam PROD",
-  "BaseUrl": "https://iis02.egalware.com/"
 }
\ No newline at end of file

From 985e429d3443683fb09c5f9df7b7f1adff6d2cbc Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 23 Dec 2021 14:55:19 +0100
Subject: [PATCH 4/5] Modifica x recuperare e msotrare cod licenza

---
 MP.AppAuth/AppAuthContext.cs                |  5 --
 MP.AppAuth/Controllers/AppAuthController.cs |  4 +-
 MP.AppAuth/Controllers/MPController .cs     | 51 +++++++++++++++++++
 MP.AppAuth/Models/AnagKeyValue.cs           | 11 +++-
 MP.AppAuth/MoonProContext.cs                | 56 +++++++++++++++++----
 MP.Land/Data/AppAuthService.cs              | 13 +++++
 MP.Land/MP.Land.csproj                      |  2 +-
 MP.Land/Pages/SysInfo.razor                 | 23 +++++++--
 MP.Land/Resources/ChangeLog.html            |  2 +-
 MP.Land/Resources/VersNum.txt               |  2 +-
 MP.Land/Resources/manifest.xml              |  2 +-
 11 files changed, 146 insertions(+), 25 deletions(-)
 create mode 100644 MP.AppAuth/Controllers/MPController .cs

diff --git a/MP.AppAuth/AppAuthContext.cs b/MP.AppAuth/AppAuthContext.cs
index 520acb42..306cc5c2 100644
--- a/MP.AppAuth/AppAuthContext.cs
+++ b/MP.AppAuth/AppAuthContext.cs
@@ -3,10 +3,6 @@ using Microsoft.Extensions.Configuration;
 using MP.AppAuth.Models;
 using NLog;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MP.AppAuth
 {
@@ -60,7 +56,6 @@ namespace MP.AppAuth
 
         public virtual DbSet<AnagraficaOperatori> DbSetAnagOpr { get; set; }
         public virtual DbSet<UpdMan> DbSetUpdMan { get; set; }
-
         public virtual DbSet<Vocabolario> DbSetVocabolario { get; set; }
 
         #endregion Public Properties
diff --git a/MP.AppAuth/Controllers/AppAuthController.cs b/MP.AppAuth/Controllers/AppAuthController.cs
index 26d54e80..e441149a 100644
--- a/MP.AppAuth/Controllers/AppAuthController.cs
+++ b/MP.AppAuth/Controllers/AppAuthController.cs
@@ -115,8 +115,8 @@ namespace MP.AppAuth.Controllers
             using (AppAuthContext localDbCtx = new AppAuthContext(_configuration))
             {
                 dbResult = localDbCtx
-                .DbSetVocabolario
-                .ToList();
+                            .DbSetVocabolario
+                            .ToList();
             }
             return dbResult;
         }
diff --git a/MP.AppAuth/Controllers/MPController .cs b/MP.AppAuth/Controllers/MPController .cs
new file mode 100644
index 00000000..0c54dd80
--- /dev/null
+++ b/MP.AppAuth/Controllers/MPController .cs	
@@ -0,0 +1,51 @@
+﻿using Microsoft.Extensions.Configuration;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.AppAuth.Controllers
+{
+    public class MPController
+    {
+        #region Private Fields
+
+        private static IConfiguration _configuration;
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Private Fields
+
+        #region Public Constructors
+
+        public MPController(IConfiguration configuration)
+        {
+            _configuration = configuration;
+            Log.Info("Avviata classe MpController");
+        }
+
+        #endregion Public Constructors
+
+        #region Public Methods
+
+
+        /// <summary>
+        /// Elenco Record x AnagKeyValue
+        /// </summary>
+        /// <returns></returns>
+        public List<Models.AnagKeyValue> AnagKeyValuesGetAll()
+        {
+            List<Models.AnagKeyValue> dbResult = new List<Models.AnagKeyValue>();
+            using (MoonProContext localDbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = localDbCtx
+                            .DbSetAnagKeyValues
+                            .ToList();
+            }
+            return dbResult;
+        }
+
+        #endregion Public Methods
+    }
+}
\ No newline at end of file
diff --git a/MP.AppAuth/Models/AnagKeyValue.cs b/MP.AppAuth/Models/AnagKeyValue.cs
index bdeede66..d2be5358 100644
--- a/MP.AppAuth/Models/AnagKeyValue.cs
+++ b/MP.AppAuth/Models/AnagKeyValue.cs
@@ -1,19 +1,26 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 #nullable disable
 
 namespace MP.AppAuth.Models
 {
+    // <Auto-Generated>
+    // This is here so CodeMaid doesn't reorganize this document
+    // </Auto-Generated>
+    [Table("AnagKeyValue")]
     public partial class AnagKeyValue
     {
         #region Public Properties
 
-        public string Descrizione { get; set; }
+        [Key]
         public string NomeVar { get; set; }
-        public double? ValFloat { get; set; }
         public int? ValInt { get; set; }
+        public double? ValFloat { get; set; }
         public string ValString { get; set; }
+        public string Descrizione { get; set; }
 
         #endregion Public Properties
     }
diff --git a/MP.AppAuth/MoonProContext.cs b/MP.AppAuth/MoonProContext.cs
index a1eca39d..7c4d02d8 100644
--- a/MP.AppAuth/MoonProContext.cs
+++ b/MP.AppAuth/MoonProContext.cs
@@ -1,23 +1,53 @@
-﻿using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata;
+﻿using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using MP.AppAuth.Models;
-
-#nullable disable
+using NLog;
+using System;
 
 namespace MP.AppAuth
 {
     public partial class MoonProContext : DbContext
     {
+        #region Private Fields
+
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        private IConfiguration _configuration;
+
+        #endregion Private Fields
+
         #region Public Constructors
 
+        [Obsolete("This constructor should never be used directly, and is only needed to generate entityframework stuff. Connection string can be adapted as pleased.")]
         public MoonProContext()
         {
         }
 
-        public MoonProContext(DbContextOptions<MoonProContext> options)
-            : base(options)
+        public MoonProContext(IConfiguration configuration)
         {
+            _configuration = configuration;
+            try
+            {
+                // se non ci fosse... crea o migra!
+                Database.Migrate();
+            }
+            catch (Exception exc)
+            {
+                Log.Error(exc, "Exception during context initialization 01");
+            }
+        }
+
+        public MoonProContext(DbContextOptions<MoonProContext> options) : base(options)
+        {
+            try
+            {
+                // se non ci fosse... crea o migra!
+                Database.Migrate();
+            }
+            catch (Exception exc)
+            {
+                Log.Error(exc, "Exception during context initialization 02");
+            }
         }
 
         #endregion Public Constructors
@@ -26,7 +56,6 @@ namespace MP.AppAuth
 
         public virtual DbSet<AnagArticoli> AnagArticolis { get; set; }
         public virtual DbSet<AnagClassiTempo> AnagClassiTempos { get; set; }
-        public virtual DbSet<AnagKeyValue> AnagKeyValues { get; set; }
         public virtual DbSet<AnagraficaCausaliScarto> AnagraficaCausaliScartos { get; set; }
         public virtual DbSet<AnagraficaFlussi> AnagraficaFlussis { get; set; }
         public virtual DbSet<AnagraficaIngressi> AnagraficaIngressis { get; set; }
@@ -34,6 +63,7 @@ namespace MP.AppAuth
         public virtual DbSet<AnagraficaOperatori> AnagraficaOperatoris { get; set; }
         public virtual DbSet<Config> Configs { get; set; }
         public virtual DbSet<DatiMacchine> DatiMacchines { get; set; }
+        public virtual DbSet<AnagKeyValue> DbSetAnagKeyValues { get; set; }
         public virtual DbSet<FamigliaTipoIngressi> FamigliaTipoIngressis { get; set; }
         public virtual DbSet<FamiglieMacchine> FamiglieMacchines { get; set; }
         public virtual DbSet<KeepAlive> KeepAlives { get; set; }
@@ -57,7 +87,15 @@ namespace MP.AppAuth
         {
             if (!optionsBuilder.IsConfigured)
             {
-                optionsBuilder.UseSqlServer("Data Source=SQL2016DEV;Initial Catalog=MoonPro;Trusted_Connection=True;");
+                string connString = _configuration.GetConnectionString("MP.Land");
+                if (!string.IsNullOrEmpty(connString))
+                {
+                    optionsBuilder.UseSqlServer(connString);
+                }
+                else
+                {
+                    optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;");
+                }
             }
         }
 
diff --git a/MP.Land/Data/AppAuthService.cs b/MP.Land/Data/AppAuthService.cs
index 2d9b5d23..67037c3d 100644
--- a/MP.Land/Data/AppAuthService.cs
+++ b/MP.Land/Data/AppAuthService.cs
@@ -47,6 +47,7 @@ namespace MP.Land.Data
         #region Public Fields
 
         public static AppAuth.Controllers.AppAuthController dbController;
+        public static AppAuth.Controllers.MPController MpDbController;
 
         #endregion Public Fields
 
@@ -170,6 +171,18 @@ namespace MP.Land.Data
             return await Task.FromResult(dbResult);
         }
 
+        public async Task<List<AppAuth.Models.AnagKeyValue>> AnagKeyValList()
+        {
+            List<AppAuth.Models.AnagKeyValue> dbResult = new List<AppAuth.Models.AnagKeyValue>();
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            dbResult = MpDbController.AnagKeyValuesGetAll();
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Trace($"Effettuata lettura da DB per AnagKeyValList: {ts.TotalMilliseconds} ms");
+            return await Task.FromResult(dbResult);
+        }
+
         #endregion Public Methods
     }
 }
\ No newline at end of file
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index e800dbd7..5340ca47 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.14.2111.2415</Version>
+        <Version>6.14.2112.2314</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/MP.Land/Pages/SysInfo.razor b/MP.Land/Pages/SysInfo.razor
index 5b5c2c2a..7de838bd 100644
--- a/MP.Land/Pages/SysInfo.razor
+++ b/MP.Land/Pages/SysInfo.razor
@@ -3,11 +3,12 @@
 @using MP.Land.Data
 @using Microsoft.Extensions.Configuration
 
+@inject AppAuthService DataService
 @inject MessageService AppMService
 @inject IConfiguration Configuration
 
 <div class="row mx-2">
-    <div class="col-12 col-lg-8 offset-lg-2">
+    <div class="col-12 col-lg-10 offset-lg-1">
         <div class="card">
             <div class="card-header text-center">
                 <div class="row">
@@ -126,6 +127,9 @@
                     </div>
                 </div>
             </div>
+            <div class="card-footer py-1">
+                <span>Chiave licenza: <b>@masterLic()</b></span>
+            </div>
         </div>
     </div>
 </div>
@@ -135,6 +139,21 @@
     protected string Titolo = "MAPO System Info";
     protected string Messaggio = "HW & SW details";
     protected HwSwInfo currHwSwInfo = HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly());
+
+    protected async Task<string> masterLic()
+    {
+        string answ = "-";
+        var akvList = await DataService.AnagKeyValList();
+        var licRecord = akvList
+                        .Where(x => x.NomeVar == "MAPO")
+                        .FirstOrDefault();
+        if (licRecord != null)
+        {
+            answ = licRecord.ValString;
+        }
+        return answ;
+    }
+
     protected string DbNameExample
     {
         get
@@ -156,6 +175,4 @@
         }
     }
 
-    //string connStr = memLayer.ML.confReadString("DbConfConnectionString");
-    //currHwSwInfo = currHwSwInfo;
 }
\ No newline at end of file
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index a24b2acd..8e776013 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo gestione Programmi MAPO</i>
-    <h4>Versione: 6.14.2111.2415</h4>
+    <h4>Versione: 6.14.2112.2314</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index 8e83ab18..2fb5c419 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-6.14.2111.2415
+6.14.2112.2314
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index 6288b38d..8d1fc59d 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.14.2111.2415</version>
+  <version>6.14.2112.2314</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 2cc8da110dd437dec5c29f1dd5cff339f733a3d8 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 23 Dec 2021 15:07:15 +0100
Subject: [PATCH 5/5] Fix lettura dati da DB x licenza

---
 MP.AppAuth/Controllers/MPController .cs | 11 ++++++++++-
 MP.Land/Data/AppAuthService.cs          |  2 ++
 MP.Land/MP.Land.csproj                  |  2 +-
 MP.Land/Pages/SysInfo.razor             | 15 ++++++++++-----
 MP.Land/Resources/ChangeLog.html        |  2 +-
 MP.Land/Resources/VersNum.txt           |  2 +-
 MP.Land/Resources/manifest.xml          |  2 +-
 7 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/MP.AppAuth/Controllers/MPController .cs b/MP.AppAuth/Controllers/MPController .cs
index 0c54dd80..81c577ca 100644
--- a/MP.AppAuth/Controllers/MPController .cs	
+++ b/MP.AppAuth/Controllers/MPController .cs	
@@ -2,18 +2,20 @@
 using NLog;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace MP.AppAuth.Controllers
 {
-    public class MPController
+    public class MPController : IDisposable
     {
         #region Private Fields
 
         private static IConfiguration _configuration;
         private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        public static AppAuth.Controllers.MPController dbController;
 
         #endregion Private Fields
 
@@ -29,6 +31,12 @@ namespace MP.AppAuth.Controllers
 
         #region Public Methods
 
+        public void Dispose()
+        {
+            // Clear database controller
+            dbController.Dispose();
+        }
+
 
         /// <summary>
         /// Elenco Record x AnagKeyValue
@@ -46,6 +54,7 @@ namespace MP.AppAuth.Controllers
             return dbResult;
         }
 
+
         #endregion Public Methods
     }
 }
\ No newline at end of file
diff --git a/MP.Land/Data/AppAuthService.cs b/MP.Land/Data/AppAuthService.cs
index 67037c3d..6f586b39 100644
--- a/MP.Land/Data/AppAuthService.cs
+++ b/MP.Land/Data/AppAuthService.cs
@@ -69,6 +69,7 @@ namespace MP.Land.Data
             else
             {
                 dbController = new AppAuth.Controllers.AppAuthController(configuration);
+                MpDbController = new AppAuth.Controllers.MPController(configuration);
                 _logger.LogInformation("DbController OK");
             }
         }
@@ -144,6 +145,7 @@ namespace MP.Land.Data
         {
             // Clear database controller
             dbController.Dispose();
+            MpDbController.Dispose();
         }
 
         public string Traduci(string lemma, string lingua = "IT")
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index 5340ca47..9672a391 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.14.2112.2314</Version>
+        <Version>6.14.2112.2315</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/MP.Land/Pages/SysInfo.razor b/MP.Land/Pages/SysInfo.razor
index 7de838bd..d5cfbb5c 100644
--- a/MP.Land/Pages/SysInfo.razor
+++ b/MP.Land/Pages/SysInfo.razor
@@ -128,7 +128,7 @@
                 </div>
             </div>
             <div class="card-footer py-1">
-                <span>Chiave licenza: <b>@masterLic()</b></span>
+                <span>Chiave licenza: <b>@masterLic</b></span>
             </div>
         </div>
     </div>
@@ -140,18 +140,23 @@
     protected string Messaggio = "HW & SW details";
     protected HwSwInfo currHwSwInfo = HwSwInfo.man(System.Reflection.Assembly.GetExecutingAssembly());
 
-    protected async Task<string> masterLic()
+    protected string masterLic = "";
+
+    protected override async Task OnInitializedAsync()
+    {
+        await ReloadData();
+    }
+
+    protected async Task ReloadData()
     {
-        string answ = "-";
         var akvList = await DataService.AnagKeyValList();
         var licRecord = akvList
                         .Where(x => x.NomeVar == "MAPO")
                         .FirstOrDefault();
         if (licRecord != null)
         {
-            answ = licRecord.ValString;
+            masterLic = licRecord.ValString;
         }
-        return answ;
     }
 
     protected string DbNameExample
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index 8e776013..3fcbcdb1 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo gestione Programmi MAPO</i>
-    <h4>Versione: 6.14.2112.2314</h4>
+    <h4>Versione: 6.14.2112.2315</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index 2fb5c419..aae3317e 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-6.14.2112.2314
+6.14.2112.2315
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index 8d1fc59d..26b3c9a1 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.14.2112.2314</version>
+  <version>6.14.2112.2315</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
