diff --git a/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor b/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor new file mode 100644 index 0000000..58aeaf5 --- /dev/null +++ b/GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor @@ -0,0 +1,13 @@ + +
+
+

Selezione attività

+
+
+ elenco attività selezionate +
+
+ +@code { + +} diff --git a/GPW.CORE.ADM/Components/Pages/SpostaOre.razor b/GPW.CORE.ADM/Components/Pages/SpostaOre.razor index 29856f4..3b43051 100644 --- a/GPW.CORE.ADM/Components/Pages/SpostaOre.razor +++ b/GPW.CORE.ADM/Components/Pages/SpostaOre.razor @@ -1,7 +1,17 @@ - @page "/SpostaOre" +@page "/SpostaOre" +@inject MessageService AppMServ +@inject AppAuthService AuthServ - - @code { + +@code { + + protected override void OnInitialized() + { + // imposto pagina e info testata + AppMServ.ShowSearch = true; + AppMServ.PageName = AuthServ.Traduci("SpostaOre", AppMServ.UserLang); + AppMServ.PageIcon = AuthServ.Traduci("SpostaOreExpl"); } +} diff --git a/GPW.CORE.ADM/GPW.CORE.ADM.csproj b/GPW.CORE.ADM/GPW.CORE.ADM.csproj index aa3d104..a6d5cdf 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.1215 + 4.1.2506.1809 diff --git a/GPW.CORE.Data/Controllers/GPWController.cs b/GPW.CORE.Data/Controllers/GPWController.cs index d122ee8..0fb9009 100644 --- a/GPW.CORE.Data/Controllers/GPWController.cs +++ b/GPW.CORE.Data/Controllers/GPWController.cs @@ -3421,7 +3421,48 @@ namespace GPW.CORE.Data.Controllers } catch (Exception exc) { - Log.Error($"Errore in TimbMeseExplModel:{Environment.NewLine}{exc}"); + Log.Error($"Errore in TimbMeseExplList:{Environment.NewLine}{exc}"); + } + } + return dbResult; + } + + /// + /// Recupero dati delle attività filtrate x spostamento ore tra progetti + /// + /// + /// + /// + /// + /// + /// + /// + /// + public List RegAttDayExplList(int idxDipendente, DateTime dataFrom, DateTime dataTo, int idxCliente, int idxProgetto, int idxFase, bool isAncest) + { + // init dati necessari + List dbResult = new List(); + // cerco su DB recuperando set di dati.... + using (GPWContext dbCtx = new GPWContext(_configuration)) + { + try + { + var pIdxDipendente = new SqlParameter("@idxDipendente", idxDipendente); + var pInizio = new SqlParameter("@dataFrom", dataFrom); + var pFine = new SqlParameter("@dataTo", dataTo); + var pIdxCliente = new SqlParameter("@idxCliente", idxCliente); + var pIdxProgetto = new SqlParameter("@idxProgetto", idxProgetto); + var pIdxFase = new SqlParameter("@idxFase", idxFase); + var pIsAncest = new SqlParameter("@soloAncest", isAncest); + + dbResult = dbCtx + .DbSetDayRaExpl + .FromSqlRaw("EXEC dbo.stp_RAD_Expl_getByIdxDipPeriodo @idxDipendente, @dataFrom, @dataTo, @idxCliente, @idxProgetto, @idxFase, @soloAncest", pIdxDipendente, pInizio, pFine, pIdxCliente, pIdxProgetto, pIdxFase, pIsAncest) + .ToList(); + } + catch (Exception exc) + { + Log.Error($"Errore in RegAttDayExplList:{Environment.NewLine}{exc}"); } } return dbResult; diff --git a/GPW.CORE.Data/DbModels/RegAttivitaDayExplModel.cs b/GPW.CORE.Data/DbModels/RegAttivitaDayExplModel.cs new file mode 100644 index 0000000..c3d1c71 --- /dev/null +++ b/GPW.CORE.Data/DbModels/RegAttivitaDayExplModel.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace GPW.CORE.Data.DbModels +{ + // + // This is here so CodeMaid doesn't reorganize this document + // + public partial class RegAttivitaDayExplModel + { + [Key, Column("idxRA")] + public int IdxRA { get; set; } = 0; + + [Column("idxDipendente")] + public int IdxDipendente { get; set; } = 0; + [Column("idxFase")] + public int IdxFase { get; set; } = 0; + [Column("idxProgetto")] + public int IdxProgetto { get; set; } = 0; + [Column("inizio")] + public DateTime Inizio { get; set; } = DateTime.Today; + [Column("fine")] + public DateTime Fine { get; set; } = DateTime.Today; + + [Column("descrizione")] + public string Descrizione { get; set; } = ""; + + public string RagSociale { get; set; } = ""; + [Column("nomeProj")] + public string NomeProj { get; set; } = ""; + [Column("nomeFase")] + public string NomeFase { get; set; } = ""; + [Column("cognomeNome")] + public string CognomeNome { get; set; } = ""; + [Column("gruppo")] + public string Gruppo { get; set; } = ""; + + [Column("oreTot")] + public decimal OreTot { get; set; } = 0; + [Column("importo")] + public decimal Importo { get; set; } = 0; + [Column("minTot")] + public decimal MinTot { get; set; } = 0; + + + } +} diff --git a/GPW.CORE.Data/GPWContext.cs b/GPW.CORE.Data/GPWContext.cs index 35214cf..4a71fac 100644 --- a/GPW.CORE.Data/GPWContext.cs +++ b/GPW.CORE.Data/GPWContext.cs @@ -79,6 +79,7 @@ namespace GPW.CORE.Data public virtual DbSet DbSetMonthTag { get; set; } = null!; public virtual DbSet DbSetListTagDD { get; set; } = null!; public virtual DbSet DbSetTimbMeseExpl { get; set; } = null!; + public virtual DbSet DbSetDayRaExpl { get; set; } = null!; #endregion Public Properties diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 668fd4a..ea3ee5a 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 4.1.2506.1215

+

Versione: 4.1.2506.1809


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index c5f00d5..72fd833 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -4.1.2506.1215 +4.1.2506.1809 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 23d1696..411e932 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 4.1.2506.1215 + 4.1.2506.1809 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false