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
6 changed files with 13 additions and 10 deletions
@@ -3,7 +3,7 @@
    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
        <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.15.2207.0610</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>
@@ -32,8 +32,9 @@ namespace MP.Land.Pages
        private string MastKey = "########################";

        private string mainCss = "alert alert-info";
-        private string remSrvCss = "bg-danger text-warning";
-        private string expDateCss = "bg-danger text-warning";
+        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()
        {
@@ -59,9 +60,11 @@ namespace MP.Land.Pages
                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";
@@ -70,8 +73,8 @@ namespace MP.Land.Pages

            // 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.0610</h4>
+    <h4>Versione: 6.15.2207.0613</h4>
    <br />
    Note di rilascio:
    <ul>
@@ -1 +1 @@
-6.15.2207.0610
+6.15.2207.0613
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.0610</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>
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