From 87c42e09103573e0d3afdd8f3d656c703bf60f7e Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 11 Apr 2023 16:02:06 +0200
Subject: [PATCH] Fix colori diversi fest/ferie ufficio

---
 GPW.CORE.WRKLOG/Components/DayHoriz.razor | 75 +++++++++++++----------
 GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj    |  2 +-
 Resources/ChangeLog.html                  |  2 +-
 Resources/VersNum.txt                     |  2 +-
 Resources/manifest.xml                    |  2 +-
 5 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/GPW.CORE.WRKLOG/Components/DayHoriz.razor b/GPW.CORE.WRKLOG/Components/DayHoriz.razor
index db6448c..a797488 100644
--- a/GPW.CORE.WRKLOG/Components/DayHoriz.razor
+++ b/GPW.CORE.WRKLOG/Components/DayHoriz.razor
@@ -62,49 +62,56 @@
                 }
                 else
                 {
-                @if (hasFest)
-                {
-                    //verifico se ci siano festività...
-                    if (DayDTO.ListFermateAzienda != null && DayDTO.ListFermateAzienda.Count > 0)
+                    @if (hasFest)
                     {
-                        <div class="mx-2 bg-danger rounded text-warning w-100">
-                            <div class="text-uppercase">@DayDTO.ListFermateAzienda.FirstOrDefault().descrizione</div>
-                        </div>
-                    }
-                }
-                @if (hasFerie)
-                {
-                    if (DayDTO.ListFerieDip != null && DayDTO.ListFerieDip.Count > 0)
-                    {
-                        @foreach (var richiesta in DayDTO.ListFerieDip)
+                        //verifico se ci siano festività...
+                        if (DayDTO.ListFermateAzienda != null && DayDTO.ListFermateAzienda.Count > 0)
                         {
-                            <div class="mx-2 bg-info rounded text-light w-100">
-                                <div>
-                                    <b>FERIE</b>
-                                </div>
-                                <div class="small">
-                                    @richiesta.Note
-                                </div>
-                            </div>
+                            @foreach (var fermata in DayDTO.ListFermateAzienda)
+                            {
+                                if (fermata.codGiust == "FEST")
+                                {
+                                    <div class="mx-2 bg-danger rounded text-warning w-100">
+                                        <div class="text-uppercase"><b>@fermata.codGiust</b> | @fermata.descrizione</div>
+                                    </div>
+                                }
+                                else
+                                {
+                                    <div class="mx-2 bg-warning rounded text-danger w-100">
+                                        <div class="text-uppercase"><b>@fermata.codGiust</b> | @fermata.descrizione</div>
+                                    </div>
+                                }
+                            }
                         }
                     }
-                }
-                @if (hasPerm)
-                {
-                    if (DayDTO.ListRichiesteDip != null && DayDTO.ListRichiesteDip.Count > 0)
+                    @if (hasFerie)
                     {
-                        @foreach (var richiesta in DayDTO.ListRichiesteDip)
+                        if (DayDTO.ListFerieDip != null && DayDTO.ListFerieDip.Count > 0)
                         {
-                            <div class="mx-2 bg-warning rounded text-dark w-100">
-                                <div>
-                                    <b>@richiesta.CodGiust</b> | @richiesta.Note | <small class="small">
-                                    @($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}")
-                                </small>
+                            @foreach (var richiesta in DayDTO.ListFerieDip)
+                            {
+                                <div class="mx-2 bg-info rounded text-light w-100">
+                                    <div>
+                                        <b>FERIE</b> | <small class="small">@richiesta.Note</small>
+                                    </div>
                                 </div>
-                            </div>
+                            }
+                        }
+                    }
+                    @if (hasPerm)
+                    {
+                        if (DayDTO.ListRichiesteDip != null && DayDTO.ListRichiesteDip.Count > 0)
+                        {
+                            @foreach (var richiesta in DayDTO.ListRichiesteDip)
+                            {
+                                <div class="mx-2 bg-warning rounded text-dark w-100">
+                                    <div>
+                                        <b>@richiesta.CodGiust</b> | <small class="small">@richiesta.Note, @($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}")</small>
+                                    </div>
+                                </div>
+                            }
                         }
                     }
-                }
                 }
             </div>
             @*<!-- RegAtt -->*@
diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
index ab6d69e..7e85e02 100644
--- a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+++ b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-		<Version>3.0.2304.1115</Version>
+		<Version>3.0.2304.1116</Version>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 029caf6..27d4812 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>GPW - Gestione Presenze Web</i>
-    <h4>Versione: 3.0.2304.1115</h4>
+    <h4>Versione: 3.0.2304.1116</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 9687276..e8333be 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-3.0.2304.1115
+3.0.2304.1116
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 436ed70..1eb384e 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>3.0.2304.1115</version>
+  <version>3.0.2304.1116</version>
   <url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>