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 @@ } - CognomeNome + Cognome Nome Ore Periodo Gruppo - + Progetto + Descrizione @foreach (var item in ListRecords) { - + +
@@ -91,8 +93,8 @@ @($"{item.Gruppo}") - @($"{item.RagSociale}") - @($"{item.NomeProj}") - @($"{item.NomeFase}") - @item.Descrizione + @($"{item.NomeProj}") - @($"{item.NomeFase}") + @item.Descrizione } 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}"); + //} } - /// - /// Effettua toggle selezione globale delle righe mostrate + /// GpwDataService gDataServ) + /// Effettua toggle selezione globale delle righe mostrateGpwDataService gDataServprivate async Task ReloadData(GpwDataService gDataServ) + /// 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 @@ net8.0 enable enable - 4.1.2506.1814 + 4.1.2506.1911 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 @@ GPW - Gestione Presenze Web -

Versione: 4.1.2506.1814

+

Versione: 4.1.2506.1911


Note di rilascio: