From 1fbc8b314a5506d6d3fd7f5cfd968bf2b3b4d89e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 12 Jun 2025 09:21:24 +0200 Subject: [PATCH] Fix display area monthTag --- .../Components/Compo/MonthTagMan.razor | 95 ++++++++++--------- .../Components/Compo/MonthTagMan.razor.cs | 15 +++ GPW.CORE.ADM/Components/Compo/listTagDD.razor | 10 +- .../Components/Compo/listTagDD.razor.cs | 2 +- GPW.CORE.ADM/GPW.CORE.ADM.csproj | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 8 files changed, 72 insertions(+), 58 deletions(-) diff --git a/GPW.CORE.ADM/Components/Compo/MonthTagMan.razor b/GPW.CORE.ADM/Components/Compo/MonthTagMan.razor index 5ecfb61..7cec052 100644 --- a/GPW.CORE.ADM/Components/Compo/MonthTagMan.razor +++ b/GPW.CORE.ADM/Components/Compo/MonthTagMan.razor @@ -45,48 +45,50 @@ } else { - - - - - - - - - - - @* +
+
+
- - Anno Mese Cognome Nome CodTag # Tag # Dis
+ + + + + + + + + + @* *@ - - - + + + - - @foreach (var item in ListRecords) - { - - - - - - - - + + @foreach (var item in ListRecords) + { + + + + + + + + - @* + @* *@ - - } - -
+ + Anno Mese Cognome Nome CodTag # Tag # Dis Colonna 4 Colonna 5
- @if (SelItem == null) - { - - } - else - { - - } - @item.Anno@item.Mese@item.CognomeNome@item.CodTag@item.NumTag@item.NumDis
+ @if (SelItem == null) + { + + } + else + { + + } + @item.Anno@item.Mese@item.CognomeNome@item.CodTag@item.NumTag@item.NumDis @if (item.Enabled && item.NumFasi == 0) { @@ -97,17 +99,22 @@ }
+ + } + + + + @if (SelRecord != null) + { +
+ modulo dettaglio da visualizzare +
+ } + }
- - - diff --git a/GPW.CORE.ADM/Components/Compo/MonthTagMan.razor.cs b/GPW.CORE.ADM/Components/Compo/MonthTagMan.razor.cs index e010c27..78b8b45 100644 --- a/GPW.CORE.ADM/Components/Compo/MonthTagMan.razor.cs +++ b/GPW.CORE.ADM/Components/Compo/MonthTagMan.razor.cs @@ -44,6 +44,21 @@ namespace GPW.CORE.ADM.Components.Compo SelRecord = currRec; } + private string mainDivCss + { + get => SelRecord == null ? "col-12" : "col-9"; + } + private string detDivCss + { + get => SelRecord == null ? "col-0" : "col-3"; + } + + protected string CssCheckSel(MonthTagModel currRec) + { + bool isSel = SelRecord != null && SelRecord.IdxDipendente == currRec.IdxDipendente && SelRecord.Anno == currRec.Anno && SelRecord.Mese == currRec.Mese; + return isSel ? "table-info" : ""; + } + protected async Task ForceReload() { currPage = 1; diff --git a/GPW.CORE.ADM/Components/Compo/listTagDD.razor b/GPW.CORE.ADM/Components/Compo/listTagDD.razor index 2049730..2db3775 100644 --- a/GPW.CORE.ADM/Components/Compo/listTagDD.razor +++ b/GPW.CORE.ADM/Components/Compo/listTagDD.razor @@ -1,8 +1,4 @@ -

listTagDD

- - - -
+
@if (ListRecords == null || isLoading) { @@ -44,7 +40,3 @@ }
- -
- - diff --git a/GPW.CORE.ADM/Components/Compo/listTagDD.razor.cs b/GPW.CORE.ADM/Components/Compo/listTagDD.razor.cs index eb6209f..0a19efe 100644 --- a/GPW.CORE.ADM/Components/Compo/listTagDD.razor.cs +++ b/GPW.CORE.ADM/Components/Compo/listTagDD.razor.cs @@ -8,7 +8,7 @@ using NLog; namespace GPW.CORE.ADM.Components.Compo { - public partial class listTagDD + public partial class ListTagDD { #region Protected Properties diff --git a/GPW.CORE.ADM/GPW.CORE.ADM.csproj b/GPW.CORE.ADM/GPW.CORE.ADM.csproj index d7ef906..d3fae57 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.1115 + 4.1.2506.1209 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 8c62c0e..0e4264b 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 4.1.2506.1115

+

Versione: 4.1.2506.1209


Note di rilascio: