From 36d7674304ebc8e6d340bbd3ad714cff829b31a7 Mon Sep 17 00:00:00 2001
From: "Rawan.Abouzahra" <pcto@egalware.com>
Date: Thu, 19 Jun 2025 11:51:02 +0200
Subject: [PATCH] codice spostaOre

---
 .../Components/Compo/SpostaOreMan.razor       | 12 ++++---
 .../Components/Compo/SpostaOreMan.razor.cs    | 34 +++++++++++++++++--
 GPW.CORE.ADM/GPW.CORE.ADM.csproj              |  2 +-
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 6 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor b/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor
index 7ae7378..aa60981 100644
--- a/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor
+++ b/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor
@@ -66,18 +66,20 @@
                                         <i class="fa-solid fa-toggle-off text-secondary fs-5" @onclick="ToggleSelection"></i>
                                     }
                                 </th>
-                                <th>CognomeNome</th>
+                                <th>Cognome Nome</th>
                                 <th>Ore</th>
                                 <th>Periodo</th>
                                 <th>Gruppo</th>
-                                <th></th>
+                                <th>Progetto</th>
+                                <th>Descrizione</th>
                             </tr>
                         </thead>
                         <tbody>
                             @foreach (var item in ListRecords)
                             {
                                 <tr class="@CssCheckSel(item)">
-                                    <td>
+                                    <td class="text-center">
+
                                         <div class="form-check">
                                             <input class="form-check-input" type="checkbox" @bind="item.Selected"></input>
                                         </div>
@@ -91,8 +93,8 @@
                                         </div>
                                     </td>
                                     <td class="text-start">@($"{item.Gruppo}") - @($"{item.RagSociale}")</td>
-                                    <td class="text-end">@($"{item.NomeProj}") - @($"{item.NomeFase}")</td>
-                                    <td class="text-end text-truncate" style="max-width: 20rem;" title="@item.Descrizione">@item.Descrizione</td>
+                                    <td class="text-start">@($"{item.NomeProj}") - @($"{item.NomeFase}")</td>
+                                    <td class="text-start text-truncate" style="max-width: 20rem;" title="@item.Descrizione">@item.Descrizione</td>
 
                                 </tr>
                             }
diff --git a/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor.cs b/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor.cs
index 6f0cdf4..b1ec03d 100644
--- a/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor.cs
+++ b/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor.cs
@@ -4,6 +4,8 @@ using GPW.CORE.Data.DbModels;
 using GPW.CORE.Data.DTO;
 using GPW.CORE.Data.Services;
 using Microsoft.AspNetCore.Components;
+using NLog;
+using System.Diagnostics;
 
 namespace GPW.CORE.ADM.Components.Compo
 {
@@ -52,10 +54,37 @@ namespace GPW.CORE.ADM.Components.Compo
                                 .Skip(numRecord * (currPage - 1))
                                 .Take(numRecord)
                                 .ToList();
+
+            var rawList = await GDataServ.DipendentiGetAll();
+
+            if (ShowInatt)
+            {
+                ListDipendenti = rawList;
+            }
+            else
+            {
+                ListDipendenti = rawList.Where(x => (x.Attivo ?? false)).ToList();
+            }
+
+
+            //try
+            //{
+            //    SearchRecords = await GDataServ.RegAttDayExplList(idxDipendente, CurrPeriodo.Inizio, CurrPeriodo.Fine, idxCliente, idxProgetto, idxFase, isAncest);
+            //    // verifico filtro per IdxDip
+            //    if (IdxDipSel > 0)
+            //    {
+            //        SearchRecords = SearchRecords.Where(x => x.IdxDipendente == IdxDipSel).ToList();
+            //    }
+            //}
+            //catch (Exception ex)
+            //{
+            //    Log.Error($"Eccezione in recupero dati{Environment.NewLine}{ex}");
+            //}
         }
 
-        /// <summary>
-        /// Effettua toggle selezione globale delle righe mostrate
+        /// <summary>GpwDataService gDataServ)
+        /// Effettua toggle selezione globale delle righe mostrateGpwDataService gDataServprivate async Task ReloadData(GpwDataService gDataServ)
+
         /// </summary>
         protected void ToggleSelection()
         {
@@ -128,6 +157,7 @@ namespace GPW.CORE.ADM.Components.Compo
         private int totalCount { get; set; } = 0;
         private int numRecord { get; set; } = 10;
         private string gridKey = "TimbMan";
+        private static Logger Log = LogManager.GetCurrentClassLogger();
 
 
         private RegAttDayExpDTO? SelRecord { get; set; } = null;
diff --git a/GPW.CORE.ADM/GPW.CORE.ADM.csproj b/GPW.CORE.ADM/GPW.CORE.ADM.csproj
index 4a1867f..8db85b6 100644
--- a/GPW.CORE.ADM/GPW.CORE.ADM.csproj
+++ b/GPW.CORE.ADM/GPW.CORE.ADM.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>4.1.2506.1814</Version>
+    <Version>4.1.2506.1911</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 4e04144..80c5c68 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>GPW - Gestione Presenze Web</i>
-    <h4>Versione: 4.1.2506.1814</h4>
+    <h4>Versione: 4.1.2506.1911</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index d446598..26d44f9 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-4.1.2506.1814
+4.1.2506.1911
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 6021afa..e7d1600 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>4.1.2506.1814</version>
+  <version>4.1.2506.1911</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>