From abdfd82b0ae2f14cfc8a84ea4bbc6dee5fbbe8ec Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 12 Sep 2024 10:02:06 +0200 Subject: [PATCH] Completata gestione con filtraggio x calendario e elenco --- .../Compo/CalendarioAziendale.razor | 9 +- .../Compo/CalendarioAziendale.razor.cs | 116 +++++++++++++++--- .../Components/Compo/RegRichieste.razor.cs | 21 ---- .../Components/Pages/RichiesteDip.razor | 2 +- GPW.CORE.ADM/GPW.CORE.ADM.csproj | 2 +- GPW.CORE.SMART/Components/Pages/DayOff.razor | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 9 files changed, 110 insertions(+), 48 deletions(-) diff --git a/GPW.CORE.ADM/Components/Compo/CalendarioAziendale.razor b/GPW.CORE.ADM/Components/Compo/CalendarioAziendale.razor index 3a3bad9..8d61167 100644 --- a/GPW.CORE.ADM/Components/Compo/CalendarioAziendale.razor +++ b/GPW.CORE.ADM/Components/Compo/CalendarioAziendale.razor @@ -3,7 +3,14 @@
- + +
+ + + + + +
Calendario Aziendale diff --git a/GPW.CORE.ADM/Components/Compo/CalendarioAziendale.razor.cs b/GPW.CORE.ADM/Components/Compo/CalendarioAziendale.razor.cs index 0f3d44e..ba1ec82 100644 --- a/GPW.CORE.ADM/Components/Compo/CalendarioAziendale.razor.cs +++ b/GPW.CORE.ADM/Components/Compo/CalendarioAziendale.razor.cs @@ -25,7 +25,7 @@ namespace GPW.CORE.ADM.Components.Compo public DateTime firstDate { get; set; } = new DateTime(DateTime.Today.Year, 1, 1); [Parameter] - public int IdxDip { get; set; } = 0; + public bool ShowNeedConf { get; set; } = false; [Parameter] public DateTime maxDate { get; set; } = new DateTime(DateTime.Today.Year + 1, 1, 1); @@ -106,12 +106,6 @@ namespace GPW.CORE.ADM.Components.Compo await Task.Delay(1); // il mese viene preimpostato sul trimestre corrente... startMonth = (Month)((DateTime.Today.Month / 6) * 6); - ToggleData = new SelectGlobalToggle() - { - leftString = "Personali", - rightString = "Tutti", - placardCss = "bg-dark border-dark text-light" - }; } protected override void OnParametersSet() @@ -141,32 +135,114 @@ namespace GPW.CORE.ADM.Components.Compo private string schedHeight { get; set; } = "height: 50rem;"; private DateTime SelDate { get; set; } = DateTime.Today; private Month startMonth { get; set; } = Month.January; - private SelectGlobalToggle ToggleData { get; set; } = new SelectGlobalToggle(); #endregion Private Properties #region Private Methods - private async Task evToggled(SelectGlobalToggle newTogData) - { - ToggleData = newTogData; - await Task.Delay(1); - FilterData(); - } private void FilterData() { - // filtro risultati richiesti... - if (ToggleData.isActive) + // in primis copio tutto + EvDtoFilt = EvDtoList; + if (ShowNeedConf) { - EvDtoFilt = EvDtoList; + EvDtoFilt = EvDtoFilt.Where(x => !x.Conf).ToList(); } - else + // controllo ogni toggle... + if (!showChiu) { - EvDtoFilt = EvDtoList - .Where(x => x.IdxDipendente == IdxDip || x.IdxDipendente == 0) + EvDtoFilt = EvDtoFilt + .Where(x => !x.IsCompany || (x.IsCompany && !x.CodTipo.Equals("FER", StringComparison.InvariantCultureIgnoreCase))) .ToList(); } + if (!showFer) + { + EvDtoFilt = EvDtoFilt + .Where(x => !x.CodTipo.Equals("FER", StringComparison.InvariantCultureIgnoreCase) || (x.CodTipo.Equals("FER", StringComparison.InvariantCultureIgnoreCase) && x.IsCompany)) + .ToList(); + } + if (!showFest) + { + EvDtoFilt = EvDtoFilt + .Where(x => !x.CodTipo.Equals("FEST", StringComparison.InvariantCultureIgnoreCase)) + .ToList(); + } + if (!showMal) + { + EvDtoFilt = EvDtoFilt + .Where(x => !x.CodTipo.Equals("MAL", StringComparison.InvariantCultureIgnoreCase)) + .ToList(); + } + if (!showPer) + { + EvDtoFilt = EvDtoFilt + .Where(x => !x.CodTipo.Equals("PERM", StringComparison.InvariantCultureIgnoreCase) && !x.CodTipo.Equals("104", StringComparison.InvariantCultureIgnoreCase)) + .ToList(); + } + + } + private bool showChiu { get; set; } = true; + private bool showFer { get; set; } = true; + private bool showFest { get; set; } = true; + private bool showMal { get; set; } = true; + private bool showPer { get; set; } = true; + + protected string btnSel(string bName) + { + bool answ = false; + switch (bName) + { + case "CHIU": + answ = showChiu; + break; + + case "FER": + answ = showFer; + break; + + case "FEST": + answ = showFest; + break; + + case "MAL": + answ = showMal; + break; + + case "PER": + answ = showPer; + break; + + default: + break; + } + return answ ? "btn-primary" : "btn-secondary"; + } + protected void ToggMal() + { + showMal = !showMal; + FilterData(); + } + + protected void ToggPer() + { + showPer = !showPer; + FilterData(); + } + protected void ToggFer() + { + showFer = !showFer; + FilterData(); + } + protected void ToggFest() + { + showFest = !showFest; + FilterData(); + } + protected void ToggChiu() + { + showChiu = !showChiu; + FilterData(); } private void OnAppointmentRender(SchedulerAppointmentRenderEventArgs args) diff --git a/GPW.CORE.ADM/Components/Compo/RegRichieste.razor.cs b/GPW.CORE.ADM/Components/Compo/RegRichieste.razor.cs index b93bdea..bc07900 100644 --- a/GPW.CORE.ADM/Components/Compo/RegRichieste.razor.cs +++ b/GPW.CORE.ADM/Components/Compo/RegRichieste.razor.cs @@ -299,27 +299,6 @@ namespace GPW.CORE.ADM.Components.Compo sendDataVal = 0; sendDataNextVal = 5; await Task.Delay(1); - // verifica preliminare delle date compatibili... - var dtCheckMin = minDate(currRecord.CodGiust); - var dtCheckMax = maxDate(currRecord.CodGiust); - if (currRecord.DtStart < dtCheckMin) - { - currRecord.DtStart = dtCheckMin; - } - else if (currRecord.DtStart > dtCheckMax) - { - currRecord.DtStart = dtCheckMax; - currRecord.DtEnd = dtCheckMax; - } - if (currRecord.DtEnd > dtCheckMax) - { - currRecord.DtEnd = dtCheckMax; - } - else if (currRecord.DtEnd < dtCheckMin) - { - currRecord.DtStart = dtCheckMin; - currRecord.DtEnd = dtCheckMin; - } // effettuo insert... sendDataVal = 5; sendDataNextVal = 90; diff --git a/GPW.CORE.ADM/Components/Pages/RichiesteDip.razor b/GPW.CORE.ADM/Components/Pages/RichiesteDip.razor index 6fba677..600b51f 100644 --- a/GPW.CORE.ADM/Components/Pages/RichiesteDip.razor +++ b/GPW.CORE.ADM/Components/Pages/RichiesteDip.razor @@ -22,7 +22,7 @@ }
- +
diff --git a/GPW.CORE.ADM/GPW.CORE.ADM.csproj b/GPW.CORE.ADM/GPW.CORE.ADM.csproj index e9cd6c8..66a3d6f 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.2409.1208 + 4.1.2409.1210 diff --git a/GPW.CORE.SMART/Components/Pages/DayOff.razor b/GPW.CORE.SMART/Components/Pages/DayOff.razor index d04b9fd..f90663d 100644 --- a/GPW.CORE.SMART/Components/Pages/DayOff.razor +++ b/GPW.CORE.SMART/Components/Pages/DayOff.razor @@ -11,7 +11,7 @@ {
Mostra: -
+
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 4aa2075..bb1135f 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 4.1.2409.1208

+

Versione: 4.1.2409.1210


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 06be5a4..40fba68 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -4.1.2409.1208 +4.1.2409.1210 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 113abb7..3520bca 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 4.1.2409.1208 + 4.1.2409.1210 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false