From 1eb2d54235e20b80a7be2bcf1fb21bcef2474e53 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Sat, 4 Mar 2023 15:01:01 +0100
Subject: [PATCH 1/2] fix deploy only main x develop

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66ded59..e872545 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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

From 512494aa38633ec6f0ff8e790197a4bfaad64bf3 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Sat, 4 Mar 2023 16:58:36 +0100
Subject: [PATCH 2/2] CoreSmart: - Fix calcolo INT/EXT - display colore + testo
 home INT/EXT

---
 .../Components/BottoniEntrEsc.razor.cs        |  2 +-
 GPW.CORE.SMART/Components/CmpTop.razor        |  5 ++-
 GPW.CORE.SMART/Components/CmpTop.razor.cs     | 39 ++++++++++++++++++-
 GPW.CORE.SMART/GPW.CORE.SMART.csproj          |  2 +-
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 7 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs b/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs
index d294e5a..e478b62 100644
--- a/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs
+++ b/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs
@@ -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...
diff --git a/GPW.CORE.SMART/Components/CmpTop.razor b/GPW.CORE.SMART/Components/CmpTop.razor
index 2b63ad1..8c7597e 100644
--- a/GPW.CORE.SMART/Components/CmpTop.razor
+++ b/GPW.CORE.SMART/Components/CmpTop.razor
@@ -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>
diff --git a/GPW.CORE.SMART/Components/CmpTop.razor.cs b/GPW.CORE.SMART/Components/CmpTop.razor.cs
index 0d7d45e..e208853 100644
--- a/GPW.CORE.SMART/Components/CmpTop.razor.cs
+++ b/GPW.CORE.SMART/Components/CmpTop.razor.cs
@@ -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>
diff --git a/GPW.CORE.SMART/GPW.CORE.SMART.csproj b/GPW.CORE.SMART/GPW.CORE.SMART.csproj
index 650a9f2..da2ad3d 100644
--- a/GPW.CORE.SMART/GPW.CORE.SMART.csproj
+++ b/GPW.CORE.SMART/GPW.CORE.SMART.csproj
@@ -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>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 2386b73..c76868b 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -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>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index bd9c3a8..ed34a26 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-3.0.2303.0412
+3.0.2303.0416
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 8701270..e1978e5 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -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>