From be80f179d78e99a952b4b043e2a602760cfa65e4 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 28 Jun 2023 14:52:57 +0200 Subject: [PATCH] Aggiunto LastYear --- EgwCoreLib.Razor/PeriodoSel.razor | 1 + EgwCoreLib.Razor/PeriodoSel.razor.cs | 6 +++--- EgwCoreLib.Utils/DtUtils.cs | 10 ++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/EgwCoreLib.Razor/PeriodoSel.razor b/EgwCoreLib.Razor/PeriodoSel.razor index d7effc7..21d22bc 100644 --- a/EgwCoreLib.Razor/PeriodoSel.razor +++ b/EgwCoreLib.Razor/PeriodoSel.razor @@ -10,6 +10,7 @@ } + diff --git a/EgwCoreLib.Razor/PeriodoSel.razor.cs b/EgwCoreLib.Razor/PeriodoSel.razor.cs index 8d4a46d..c39ee6c 100644 --- a/EgwCoreLib.Razor/PeriodoSel.razor.cs +++ b/EgwCoreLib.Razor/PeriodoSel.razor.cs @@ -35,7 +35,7 @@ namespace EgwCoreLib.Razor if (CurrPeriodo.Fine != value) { CurrPeriodo.Fine = value; - perSelect = $"{DtUtils.PeriodSet.Period}"; + perSelect = $"{DtUtils.PeriodSet.Select}"; E_PeriodoSel.InvokeAsync(CurrPeriodo); } } @@ -49,7 +49,7 @@ namespace EgwCoreLib.Razor if (CurrPeriodo.Inizio != value) { CurrPeriodo.Inizio = value; - perSelect = $"{DtUtils.PeriodSet.Period}"; + perSelect = $"{DtUtils.PeriodSet.Select}"; E_PeriodoSel.InvokeAsync(CurrPeriodo); } } @@ -86,7 +86,7 @@ namespace EgwCoreLib.Razor #region Private Properties private DtUtils.Periodo currPeriodo { get; set; } = new DtUtils.Periodo(); - private string perSelect { get; set; } = "Period"; + private string perSelect { get; set; } = "Select"; #endregion Private Properties } diff --git a/EgwCoreLib.Utils/DtUtils.cs b/EgwCoreLib.Utils/DtUtils.cs index e3283ae..3b8f2c6 100644 --- a/EgwCoreLib.Utils/DtUtils.cs +++ b/EgwCoreLib.Utils/DtUtils.cs @@ -6,12 +6,13 @@ public enum PeriodSet { - Period = 0, + Select = 0, Today, Yesterday, LastMonth, LastTrim, LastWeek, + LastYear, ThisMonth, ThisTrim, ThisWeek, @@ -63,6 +64,11 @@ this.Inizio = this.Fine.AddMonths(-3); break; + case DtUtils.PeriodSet.LastYear: + this.Inizio = new DateTime(oggi.Year-1, 1, 1); + this.Fine = new DateTime(oggi.Year , 1, 1); + break; + case DtUtils.PeriodSet.LastWeek: this.Inizio = oggi.StartOfWeek(DayOfWeek.Monday).AddDays(-7); this.Fine = this.Inizio.AddDays(7); @@ -90,7 +96,7 @@ this.Fine = new DateTime(oggi.Year + 1, 1, 1); break; - case DtUtils.PeriodSet.Period: + case DtUtils.PeriodSet.Select: default: break; }