Merge branch 'release/UpdateAboutColorCheck'

Update display a + colori x check licenze
Merge tag 'FixAboutPageError' into develop
2022-07-06 13:30:49 +02:00 · 2022-07-06 13:30:22 +02:00 · 2022-07-06 10:11:29 +02:00 · 2022-07-06 10:11:16 +02:00 · 2022-07-06 10:10:50 +02:00 · 2022-07-05 10:00:30 +02:00
16 changed files with 59 additions and 39 deletions
@@ -30,7 +30,14 @@ namespace Egw.Core
            {
                string passPhrase = string.Format("{0}|{1}", cliente.PadLeft(50, ':'), applicativo);
                plainAuthKey = SteamCrypto.DecryptString(authKey, passPhrase); // uso combinazione cliente+applicativo come passphrase!
-                answ = Convert.ToDateTime(plainAuthKey.Replace(string.Format("{0}#{1}-", cliente, applicativo.PadLeft(20, '-')), "").Replace(string.Format("%{0}%", licenze), ""));
+                string datePart = plainAuthKey.Replace($"{cliente}#{applicativo.PadLeft(20, '-')}-", "").Replace($"%{licenze}%", "");
+                //string datePart = plainAuthKey.Replace(string.Format("{0}#{1}-", cliente, applicativo.PadLeft(20, '-')), "").Replace(string.Format("%{0}%", licenze), "");
+                // se non avesse "bonificato" la parte num licenze (es non corrisponde al max) forzo il trim
+                if (datePart.Contains("%"))
+                {
+                    datePart = datePart.Substring(0, datePart.IndexOf("%"));
+                }
+                answ = Convert.ToDateTime(datePart);
            }
            catch (Exception exc)
            {
@@ -42,7 +42,7 @@ namespace MP.AppAuth.Controllers
            {
                dbResult = localDbCtx
                            .DbSetAnagraficaGruppi
-                            .Where(x => x.TipoGruppo == codTipo && x.SelEnabled)
+                            .Where(x => x.TipoGruppo == codTipo)
                            .ToList();
            }
            return dbResult;
@@ -3,7 +3,7 @@
    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
        <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.15.2207.0419</Version>
+        <Version>6.15.2207.0613</Version>
    </PropertyGroup>

    <ItemGroup>
@@ -64,7 +64,7 @@
                                    <b>@Applicazione</b>
                                </div>
                            </div>
-                            <div class="d-flex justify-content-between">
+                            <div class="d-flex justify-content-between @licenseCss">
                                <div class="px-2">
                                    <i class="fa fa-users" aria-hidden="true"></i> Licenze:
                                </div>
@@ -80,7 +80,7 @@
                                    <b>@($"{Scadenza:yyyy/MM/dd}")</b>
                                </div>
                            </div>
-                            <div class="d-flex justify-content-between">
+                            <div class="d-flex justify-content-between @licenseCss">
                                <div class="px-2">
                                    <i class="fa fa-key" aria-hidden="true"></i> Key
                                </div>
@@ -14,24 +14,27 @@ using Microsoft.JSInterop;
 using MP.Land;
 using MP.Land.Shared;
 using MP.Land.Data;
+using NLog;

 namespace MP.Land.Pages
 {
    public partial class About
    {
-        protected string Titolo = "";
-        protected string Messaggio = "";
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private string Titolo = "";
+        private string Messaggio = "";

-        protected string ServerStatus = "SrvState";
-        protected string Installazione = "Inst";
-        protected string Applicazione = "App";
-        protected string Licenze = "#";
-        protected DateTime Scadenza = DateTime.Today;
-        protected string MastKey = "########################";
+        private string ServerStatus = "SrvState";
+        private string Installazione = "Inst";
+        private string Applicazione = "App";
+        private string Licenze = "#";
+        private DateTime Scadenza = DateTime.Today;
+        private string MastKey = "########################";

-        protected string mainCss = "alert alert-info";
-        protected string remSrvCss = "bg-danger text-warning";
-        protected string expDateCss = "bg-danger text-warning";
+        private string mainCss = "alert alert-info";
+        private string remSrvCss = "bg-warning text-secondary";
+        private string expDateCss = "bg-warning text-secondary";
+        private string licenseCss = "bg-warning text-secondary";

        protected override async Task OnInitializedAsync()
        {
@@ -45,24 +48,33 @@ namespace MP.Land.Pages
            int cDelay = 5;
            // recupero dati
            await Task.Delay(cDelay);
-            LicServ.InitAkv();
-            Installazione = LicServ.Installazione;
-            Applicazione = LicServ.Applicazione;
-            MastKey = LicServ.MasterKey;
-            await Task.Delay(cDelay);
-            var fatto = await LicServ.RefreshLicense();
-            await Task.Delay(cDelay);
-            Licenze = $"{LicServ.NumLicDb}/{LicServ.NumLicRemote}";
-            // verifico stati
-            ServerStatus = await LicServ.checkLimanServer();
+            try
+            {
+                LicServ.InitAkv();
+                // verifico stati
+                ServerStatus = await LicServ.checkLimanServer();
+                Installazione = LicServ.Installazione;
+                Applicazione = LicServ.Applicazione;
+                MastKey = LicServ.MasterKey;
+                await Task.Delay(cDelay);
+                var fatto = await LicServ.RefreshLicense();
+                await Task.Delay(cDelay);
+                Licenze = $"{LicServ.NumLicDb}/{LicServ.NumLicRemote}";
+                licenseCss = "";
+            }
+            catch(Exception exc)
+            {
+                licenseCss = "bg-dark text-warning";
+                Log.Error($"Eccezione in reloadLicenseData:{Environment.NewLine}{exc}");
+            }
            bool okRemoteSrv = ServerStatus == "OK";
            bool okScadenza = LicServ.checkLicenseActive(LicServ.MasterKey);
            bool okNumLic = (LicServ.NumLicDb <= LicServ.NumLicRemote);

            // aggiornamento css secondo status colore da check
            mainCss = okNumLic ? "alert alert-success shadowBox" : "alert alert-warning shadowBox";
-            expDateCss = okScadenza ? "d-flex justify-content-between" : "d-flex justify-content-between bg-danger text-warning";
-            remSrvCss = okRemoteSrv ? "d-flex justify-content-between" : "d-flex justify-content-between bg-danger text-warning";
+            expDateCss = okScadenza ? "" : "bg-danger text-warning";
+            remSrvCss = okRemoteSrv ? "" : "bg-danger text-warning";
            await Task.Delay(cDelay);
        }

@@ -1,6 +1,6 @@
 <body>
    <i>Modulo gestione Programmi MAPO</i>
-    <h4>Versione: 6.15.2207.0419</h4>
+    <h4>Versione: 6.15.2207.0613</h4>
    <br />
    Note di rilascio:
    <ul>
@@ -1 +1 @@
-6.15.2207.0419
+6.15.2207.0613
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.0419</version>
+  <version>6.15.2207.0613</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>
@@ -18,8 +18,8 @@
    "Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
  }
  //"ConnectionStrings": {
-  //  "DefaultConnection": "Server=SQL2016PROD;Database=Valvital_MoonPro_Prod;Trusted_Connection=True;MultipleActiveResultSets=true",
-  //  "MP.Land": "Server=SQL2016PROD;Database=Valvital_MoonPro_Prod;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
+  //  "DefaultConnection": "Server=SQL2016PROD;Database=Jetco_MoonPro_Prod;Trusted_Connection=True;MultipleActiveResultSets=true",
+  //  "MP.Land": "Server=SQL2016PROD;Database=Jetco_MoonPro_Prod;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
  //  "Redis": "localhost:6379,defaultDatabase=11,keepAlive=180,asyncTimeout=5000"
  //}
 }
@@ -4,7 +4,7 @@
        <TargetFramework>net6.0</TargetFramework>
        <RootNamespace>MP.Stats</RootNamespace>
        <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.15.2205.2311</Version>
+        <Version>6.15.2207.0510</Version>
    </PropertyGroup>

    <ItemGroup>
@@ -110,6 +110,7 @@ namespace MP.Stats.Pages
        ;
        private async Task HandleRedraw()
        {
+            await Task.Delay(1);
            // calcolo hist frequenza con EFCore: https://entityframeworkcore.com/knowledge-base/60871048/group-by-and-to-dictionary-in-ef-core-3-1
            randData = RandomizeData();
            //var histDict = randData.GroupBy(r => r).Select(g => new
@@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
  <PropertyGroup>
    <TimeStampOfAssociatedLegacyPublishXmlFile />
    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAACFCXZ0UR7Czo59aaRCHU5QAAAAAASAAACgAAAAEAAAACYlKt9E6s77uEikpKwyhdQYAAAAUwae989LovFbsfjRp69HCVpyUQZbqLyYFAAAAMW8mLSAxWmKaOvB4nkDgUpS27/b</EncryptedPassword>
-    <History>True|2022-02-26T17:24:32.0833123Z;False|2022-02-26T18:24:15.3994092+01:00;False|2022-02-26T18:23:44.8358586+01:00;True|2021-05-26T19:49:30.0427896+02:00;False|2021-05-26T19:49:14.9065510+02:00;True|2021-05-25T17:48:33.3901785+02:00;True|2021-05-25T17:46:09.2063020+02:00;True|2021-05-25T17:42:47.8167539+02:00;True|2021-05-25T17:22:03.1877438+02:00;True|2021-05-25T17:21:05.1565775+02:00;True|2021-05-25T16:26:34.1426996+02:00;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00;</History>
+    <History>True|2022-07-05T08:07:03.1380003Z;True|2022-02-26T18:24:32.0833123+01:00;False|2022-02-26T18:24:15.3994092+01:00;False|2022-02-26T18:23:44.8358586+01:00;True|2021-05-26T19:49:30.0427896+02:00;False|2021-05-26T19:49:14.9065510+02:00;True|2021-05-25T17:48:33.3901785+02:00;True|2021-05-25T17:46:09.2063020+02:00;True|2021-05-25T17:42:47.8167539+02:00;True|2021-05-25T17:22:03.1877438+02:00;True|2021-05-25T17:21:05.1565775+02:00;True|2021-05-25T16:26:34.1426996+02:00;True|2021-05-25T16:14:28.2842402+02:00;True|2021-05-25T15:02:11.7131495+02:00;</History>
  </PropertyGroup>
 </Project>
@@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
  <PropertyGroup>
    <TimeStampOfAssociatedLegacyPublishXmlFile />
    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAAB3zVMW24A4himhWJ5CNqgeAAAAAASAAACgAAAAEAAAAA7IL1n8zHn2/ljDNL4/zlsYAAAAgAEg9RYKHV0xl3wnafZiN9Q954GOBAvdFAAAACSBJkwDndNTiIrUuk7zJls84fN1</EncryptedPassword>
-    <History>True|2022-02-26T17:24:42.6534875Z;True|2021-05-26T19:49:44.3836006+02:00;</History>
+    <History>True|2022-07-05T08:06:48.2207580Z;True|2022-02-26T18:24:42.6534875+01:00;True|2021-05-26T19:49:44.3836006+02:00;</History>
  </PropertyGroup>
 </Project>
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.15.2205.2311</h4>
+    <h4>Versione: 6.15.2207.0510</h4>
    <br />
    Note di rilascio:
    <ul>
@@ -1 +1 @@
-6.15.2205.2311
+6.15.2207.0510
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2205.2311</version>
+  <version>6.15.2207.0510</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>
Author	SHA1	Message	Date
Samuele Locatelli	7dc0aef175	Merge branch 'release/UpdateAboutColorCheck'	2022-07-06 13:30:49 +02:00
Samuele Locatelli	e2afe6a586	Update display a + colori x check licenze	2022-07-06 13:30:22 +02:00
Samuele Locatelli	e3ed9a7f35	Merge tag 'FixAboutPageError' into develop Sistemato About page e suo errore x licenze cannate	2022-07-06 10:11:29 +02:00
Samuele Locatelli	db003d2bc3	Merge branch 'release/FixAboutPageError'	2022-07-06 10:11:16 +02:00
Samuele Locatelli	c203ab6eb3	Fix comportamento pagina About x check licenze	2022-07-06 10:10:50 +02:00
Samuele Locatelli	c10633b6f1	Merge branch 'develop'	2022-07-05 10:00:30 +02:00
Samuele Locatelli	a9fd0e2f83	Ancora fix sel reparto	2022-07-05 10:00:21 +02:00
Samuele Locatelli	112c73aea1	Merge tag 'FixSelReprtoAndSelEnabled' into develop Fix: esclusi i gruppi con sel enabled se NON fossero tipo REPARTO	2022-07-05 09:57:19 +02:00