From 763fec3fdb370601044a5bdbf2a12397711d7dcc Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 5 Feb 2021 15:15:13 +0000 Subject: [PATCH] --- .../DataListSqlFilterCriteriaBuilder.cs | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs index 64ccd95d..0a9250bd 100644 --- a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs +++ b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs @@ -753,15 +753,29 @@ namespace AyaNova.DataList break; case "*lastyearthismonth*": - throw new System.NotImplementedException("DATE TOKEN NOT IMPLEMENTED YET"); + //start with the first day of this month + dtAfter = new DateTime(ClientToday.Year, ClientToday.Month, 1); + //subtract a year + dtAfter = dtAfter.AddYears(-1); + //Add one month to dtAfter to get end date + dtBefore = dtAfter.AddMonths(1); + dtAfter = dtAfter.AddSeconds(-1); + BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore); break; case "*lastyearnextmonth*": - throw new System.NotImplementedException("DATE TOKEN NOT IMPLEMENTED YET"); + //start with the first day of this month + dtAfter = new DateTime(ClientToday.Year, ClientToday.Month, 1); + //subtract a year + dtAfter = dtAfter.AddYears(-1); + //Add a Month + dtAfter = dtAfter.AddMonths(1); + //Add one month to dtAfter to get end date + dtBefore = dtAfter.AddMonths(1); + dtAfter = dtAfter.AddSeconds(-1); + BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore); break; - - default: throw new System.ArgumentOutOfRangeException("TOKEN", sOperator, "DataListSqlFilterCriteriaBuilder invalid filter TOKEN type [" + sValue + "] IN DATE_TIME");