From 2ecad55883e8fcc7cddcbc3d748795abc10bf2b3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 23 Jun 2025 17:04:56 +0200 Subject: [PATCH] Aggiunta prima vers display QRCode GEN x ADM --- GPW.CORE.ADM/Components/App.razor | 2 + .../Components/Compo/DipendentiMan.razor | 166 +++++++++++------- .../Components/Compo/DipendentiMan.razor.cs | 13 +- .../Components/Compo/UserQrCode.razor | 6 +- .../Components/Compo/UserQrCode.razor.cs | 6 + .../Components/Layout/NavMenu.razor.cs | 4 +- GPW.CORE.ADM/GPW.CORE.ADM.csproj | 2 +- GPW.CORE.ADM/appsettings.json | 4 + GPW.CORE.ADM/wwwroot/lib/qrHelper.js | 8 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 12 files changed, 133 insertions(+), 84 deletions(-) diff --git a/GPW.CORE.ADM/Components/App.razor b/GPW.CORE.ADM/Components/App.razor index 6946114..ddb49dd 100644 --- a/GPW.CORE.ADM/Components/App.razor +++ b/GPW.CORE.ADM/Components/App.razor @@ -57,6 +57,8 @@ + + diff --git a/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor b/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor index 07a75f2..ff527d8 100644 --- a/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor +++ b/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor @@ -18,7 +18,12 @@
- elenco switch QRCode + + + + + +
@@ -30,80 +35,105 @@ } else if (totalCount == 0) { +
Nessun record trovato
} else {
-
- - - - - - - - - - - - - - - - - - - - - @foreach (var item in ListRecords) - { - - - - - - - - - - - - - - - - - + @if (ShowQrCode) + { + @foreach (var item in ListRecords) + { +
+
+
+ +
+
+
@item.Cognome
+
@item.Nome
+
+
+
Egalware
+
SMART a-link
+
+
+
+ } + } + else + { +
+
- - Cognome Nome Matricola Profilo Dominio Utente Email CF CodeHw Dati anagrafici Gruppo Stato licenza Responsabile
- - @if (SelItem == null) - { - - } - else - { - - } - @item.Cognome@item.Nome@item.Matricola@item.CodOrario@item.Dominio@item.Utente@item.Email@item.Cf@item.CodHw@($"{item.LuogoNascita}") - @($"{item.ProvNascita}") - @($"{item.NazNascita}") - @($"{item.DataNascita:dd/MM/yyyy}")@item.Gruppo@($"{item.DataAssunzione:dd/MM/yyyy}") - @($"{item.DataCessazione:dd/MM/yyyy}") - - -
+ + + + + + + + + + + + + + + + - } + + + @foreach (var item in ListRecords) + { + + - -
+ + Cognome Nome Matricola Profilo Dominio Utente Email CF CodeHw Dati anagrafici Gruppo Stato licenza Responsabile
+ + @if (SelItem == null) + { + + } + else + { + + } +
-
+ @item.Cognome + @item.Nome + @item.Matricola + @item.CodOrario + @item.Dominio + @item.Utente + @item.Email + @item.Cf + @item.CodHw + @($"{item.LuogoNascita}") - @($"{item.ProvNascita}") - @($"{item.NazNascita}") - @($"{item.DataNascita:dd/MM/yyyy}") + @item.Gruppo + @($"{item.DataAssunzione:dd/MM/yyyy}") - @($"{item.DataCessazione:dd/MM/yyyy}") + + + + + + + } + + + +
+ } } diff --git a/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor.cs b/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor.cs index 68ca85d..c9e16c9 100644 --- a/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor.cs +++ b/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor.cs @@ -91,6 +91,7 @@ namespace GPW.CORE.ADM.Components.Compo private DipendentiModel? SelItem = null; private bool ShowInatt = false; + private bool ShowQrCode = false; private bool sortAsc = true; private string sortField = ""; @@ -101,15 +102,17 @@ namespace GPW.CORE.ADM.Components.Compo private List? ListDipendenti { get; set; } = null; private List? ListRecords { get; set; } = null; - private string mainDivCss - { - get => SelRecord == null ? "col-12" : "col-12 col-lg-9"; - } - private List? SearchRecords { get; set; } = null; private DipendentiModel? SelRecord { get; set; } = null; private int totalCount { get; set; } = 0; + private bool ShowLinkInt = true; + + protected List ListDipendentiOrd + { + get => ListDipendenti != null ? ListDipendenti.OrderBy(x => x.Cognome).ThenBy(x => x.Nome).ToList() : new List(); + } + #endregion Private Properties #region Private Methods diff --git a/GPW.CORE.ADM/Components/Compo/UserQrCode.razor b/GPW.CORE.ADM/Components/Compo/UserQrCode.razor index 819e25f..a589ef5 100644 --- a/GPW.CORE.ADM/Components/Compo/UserQrCode.razor +++ b/GPW.CORE.ADM/Components/Compo/UserQrCode.razor @@ -1,5 +1,5 @@ -

UserQrCode

+
+
+
-@code { -} diff --git a/GPW.CORE.ADM/Components/Compo/UserQrCode.razor.cs b/GPW.CORE.ADM/Components/Compo/UserQrCode.razor.cs index 5444826..f6a2717 100644 --- a/GPW.CORE.ADM/Components/Compo/UserQrCode.razor.cs +++ b/GPW.CORE.ADM/Components/Compo/UserQrCode.razor.cs @@ -24,6 +24,12 @@ namespace GPW.CORE.ADM.Components.Compo #region Protected Methods + protected int idxDipendente + { + get => RecordDip != null ? RecordDip.IdxDipendente : 0; + } + + protected string getUrlCode(string baseUrl, string authKey) { return $"{baseUrl}jumper?idxDipendente={RecordDip.IdxDipendente}&authKey={authKey}"; diff --git a/GPW.CORE.ADM/Components/Layout/NavMenu.razor.cs b/GPW.CORE.ADM/Components/Layout/NavMenu.razor.cs index 437e94e..d41e298 100644 --- a/GPW.CORE.ADM/Components/Layout/NavMenu.razor.cs +++ b/GPW.CORE.ADM/Components/Layout/NavMenu.razor.cs @@ -83,9 +83,9 @@ namespace GPW.CORE.ADM.Components.Layout #region Private Properties - private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; + protected string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; - private string? TextCss => onlyIcon ? "d-none" : ""; + protected string? TextCss => onlyIcon ? "d-none" : ""; #endregion Private Properties diff --git a/GPW.CORE.ADM/GPW.CORE.ADM.csproj b/GPW.CORE.ADM/GPW.CORE.ADM.csproj index f14a9eb..150d19a 100644 --- a/GPW.CORE.ADM/GPW.CORE.ADM.csproj +++ b/GPW.CORE.ADM/GPW.CORE.ADM.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 4.1.2506.2314 + 4.1.2506.2317 diff --git a/GPW.CORE.ADM/appsettings.json b/GPW.CORE.ADM/appsettings.json index f38710d..c98c654 100644 --- a/GPW.CORE.ADM/appsettings.json +++ b/GPW.CORE.ADM/appsettings.json @@ -80,5 +80,9 @@ "AdmApp": { "LinkMal": "https://office.egalware.com/GPW/CORE.ADM/malattia", "LinkRich": "https://office.egalware.com/GPW/CORE.ADM/richiesteDip" + }, + "OptPar": { + "UrlLinkInt": "https://office.egalware.com/GPW/CORE.SMART/", + "UrlLinkExt": "https://seriate.egalware.com/GPW/CORE.SMART/" } } diff --git a/GPW.CORE.ADM/wwwroot/lib/qrHelper.js b/GPW.CORE.ADM/wwwroot/lib/qrHelper.js index 8c7e543..2bf0a05 100644 --- a/GPW.CORE.ADM/wwwroot/lib/qrHelper.js +++ b/GPW.CORE.ADM/wwwroot/lib/qrHelper.js @@ -11,8 +11,12 @@ function displayQr(elementName, rawData) { qrcode = new QRCode(document.getElementById(elementName), { text: rawData, - width: 200, - height: 200 + width: 240, + height: 240, + correctLevel: QRCode.CorrectLevel.L + //correctLevel: QRCode.CorrectLevel.M + //correctLevel: QRCode.CorrectLevel.Q + //correctLevel: QRCode.CorrectLevel.H }); } } diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index f9dfc72..cfe81e4 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 4.1.2506.2314

+

Versione: 4.1.2506.2317


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 197f508..f1dc0e0 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -4.1.2506.2314 +4.1.2506.2317 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index a4db0ed..b13afff 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 4.1.2506.2314 + 4.1.2506.2317 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false