diff --git a/GPW.CORE.WRKLOG/Components/DayHoriz.razor b/GPW.CORE.WRKLOG/Components/DayHoriz.razor index 3f45e81..816d116 100644 --- a/GPW.CORE.WRKLOG/Components/DayHoriz.razor +++ b/GPW.CORE.WRKLOG/Components/DayHoriz.razor @@ -71,49 +71,54 @@ } else { - @**@ -
- @if (hasFest && DayDTO != null && DayDTO.ListFermateAzienda != null) - { - @foreach (var fermata in DayDTO.ListFermateAzienda) + @if (hasFest || hasFerie || hasPerm) + { +
+ @**@ + @if (hasFest && DayDTO != null && DayDTO.ListFermateAzienda != null) { - if (fermata.codGiust == "FEST") + @foreach (var fermata in DayDTO.ListFermateAzienda) { -
-
@fermata.codGiust | @fermata.descrizione
-
+ if (fermata.codGiust == "FEST") + { +
+
@fermata.codGiust | @fermata.descrizione
+
+ } + else + { +
+
@fermata.codGiust | @fermata.descrizione
+
+ } } - else + + } + @if (hasFerie && DayDTO != null && DayDTO.ListFerieDip != null) + { + @foreach (var richiesta in DayDTO.ListFerieDip) { -
-
@fermata.codGiust | @fermata.descrizione
+
+
+ FERIE | @richiesta.Note +
} } - } - @if (hasFerie && DayDTO != null && DayDTO.ListFerieDip != null) - { - @foreach (var richiesta in DayDTO.ListFerieDip) + @if (hasPerm && DayDTO != null && DayDTO.ListRichiesteDip != null) { -
-
- FERIE | @richiesta.Note + + @foreach (var richiesta in DayDTO.ListRichiesteDip) + { +
+
+ @richiesta.CodGiust | @richiesta.Note, @($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}") +
-
+ } } - } - @if (hasPerm && DayDTO != null && DayDTO.ListRichiesteDip != null) - { - @foreach (var richiesta in DayDTO.ListRichiesteDip) - { -
-
- @richiesta.CodGiust | @richiesta.Note, @($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}") -
-
- } - } -
+
+ } @**@
@if (DayDTO != null && DayDTO.ListTimbr != null && DayDTO.ListTimbr.Count > 0) @@ -148,14 +153,13 @@ } else { -
 
}
@**@ -
+
@if (@noData) { diff --git a/GPW.CORE.WRKLOG/Components/DayHoriz.razor.cs b/GPW.CORE.WRKLOG/Components/DayHoriz.razor.cs index 76c801f..79fd21b 100644 --- a/GPW.CORE.WRKLOG/Components/DayHoriz.razor.cs +++ b/GPW.CORE.WRKLOG/Components/DayHoriz.razor.cs @@ -372,6 +372,28 @@ namespace GPW.CORE.WRKLOG.Components #region Private Methods + protected string cStyle + { + get + { + int numBlock = ListRegAtt().Count; + string fSize = "1.1rem"; + if (numBlock > 8) + { + fSize = "0.8rem"; + } + else if (numBlock > 6) + { + fSize = "0.9rem"; + } + else if (numBlock > 4) + { + fSize = "1.0rem"; + } + return $"font-size: {fSize};"; + } + } + private List ListRegAtt() { // init diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index 22dc81a..e6f8f00 100644 --- a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj +++ b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj @@ -2,7 +2,7 @@ net6.0 - 3.0.2403.1611 + 3.0.2403.2617 enable enable diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 11b6389..b8cea49 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2403.1611

+

Versione: 3.0.2403.2617


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 03c5747..070bdb8 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -3.0.2403.1611 +3.0.2403.2617 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index bf88e92..1176be3 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 3.0.2403.1611 + 3.0.2403.2617 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false