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 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 @@ 
-
+
+ + @homeMessage +
@currDip
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 = ""; + + /// + /// Verifica se IP sia locale + /// + 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"; + } + /// /// Verifica dati utente e pagina /// 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 @@ net6.0 enable - 3.0.2303.0412 + 3.0.2303.0416 enable www.egalware.com GPW Smart UI 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 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2303.0412

+

Versione: 3.0.2303.0416


Note di rilascio: