Merge branch 'release/FixIntExtSiteSmart'

2023-03-04 16:59:00 +01:00
parent 564a87e177 512494aa38
commit be122e6845
8 changed files with 47 additions and 8 deletions
@@ -216,7 +216,6 @@ CORE.Smart:deploy:
    SOL_NAME: GPW.CORE.Smart
  only:
    - main
-    - develop # test temporaneo 
  needs: ["CORE.Smart:build"]
  before_script:
    - *nuget-fix
@@ -103,7 +103,7 @@ namespace GPW.CORE.Smart.Components
            // seleziono data-ora timbratura
            DateTime dtTimb = DateTime.Now;
            bool preApprov = true;
-            // effettuo controllo: se IP non � interno --> arrotondo 5 minuti!
+            // effettuo controllo: se IP non fosse interno --> arrotondo 5 minuti!
            if (!ipv4.Contains(LocalNet))
            {
                // arrotondo ingresso/uscita ai 5 minuti secondo sia entrata o uscita...
@@ -1,4 +1,7 @@
 <div class="container d-flex justify-content-between">
-    <div class="title" @onclick="ReturnHome"><i class="fa-solid fa-home"></i></div>
+    <div class="title @homeCss" @onclick="ReturnHome">
+        <i class="fa-solid fa-home"></i>
+            <sub>@homeMessage</sub>
+    </div>
    <div class="username" @onclick="ForceReset">@currDip</div>
 </div>
@@ -150,10 +150,19 @@ namespace GPW.CORE.Smart.Components

        protected override async Task OnInitializedAsync()
        {
+            // lettura dati base
+            await ReloadData();
            // verifica attivazione
            await VerifyActiv();
        }

+        private string LocalNet = "10.74";
+        private async Task ReloadData()
+        {
+            var confNet = await CDService.ConfigGetKey("LocalNet");
+            LocalNet = confNet != null ? confNet.valore : "10";
+        }
+
        protected void ReturnHome()
        {
            navManager.NavigateTo("Home", true);
@@ -182,7 +191,7 @@ namespace GPW.CORE.Smart.Components

        private async Task checkOtherData()
        {
-            string currIpv4 = await MService.getDevIpAsync();
+            currIpv4 = await MService.getDevIpAsync();
            if (string.IsNullOrEmpty(currIpv4))
            {
                // ricalcolo e salvo...
@@ -196,6 +205,34 @@ namespace GPW.CORE.Smart.Components
            }
        }

+        protected string currIpv4 = "";
+
+        /// <summary>
+        /// Verifica se IP sia locale
+        /// </summary>
+        protected bool isIpLocal
+        {
+            get
+            {
+                bool answ = false;
+                if (!string.IsNullOrEmpty(currIpv4))
+                {
+                    answ = currIpv4.Contains(LocalNet);
+                }
+                return answ;
+            }
+        }
+
+        protected string homeCss
+        {
+            get => isIpLocal ? "text-light" : "text-danger";
+        }
+
+        protected string homeMessage
+        {
+            get => isIpLocal ? "INT" : "EXT";
+        }
+
        /// <summary>
        /// Verifica dati utente e pagina
        /// </summary>
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
-        <Version>3.0.2303.0412</Version>
+        <Version>3.0.2303.0416</Version>
    <ImplicitUsings>enable</ImplicitUsings>
    <PackageProjectUrl>www.egalware.com</PackageProjectUrl>
    <Description>GPW Smart UI</Description>
@@ -1,6 +1,6 @@
 <body>
    <i>GPW - Gestione Presenze Web</i>
-    <h4>Versione: 3.0.2303.0412</h4>
+    <h4>Versione: 3.0.2303.0416</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-3.0.2303.0412
+3.0.2303.0416
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>3.0.2303.0412</version>
+  <version>3.0.2303.0416</version>
  <url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.Smart.zip</url>
  <changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
  <mandatory>false</mandatory>