From 29c2a8ebee7db9332e35c8e19552f9905992f400 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 4 Mar 2020 18:03:26 +0000
Subject: [PATCH]

---
 .../api/relative-date-filter-calculator.js    | 23 ++++++++++++++++++-
 ayanova/src/components/gz-data-table.vue      |  4 ++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ayanova/src/api/relative-date-filter-calculator.js b/ayanova/src/api/relative-date-filter-calculator.js
index 35f55ce6..225aca52 100644
--- a/ayanova/src/api/relative-date-filter-calculator.js
+++ b/ayanova/src/api/relative-date-filter-calculator.js
@@ -13,7 +13,7 @@
       { name: vm.lt("DateRange14DayWindow"), id: "**" },
       { name: vm.lt("DateRangePast"), id: "**" },
       { name: vm.lt("DateRangeFuture"), id: "**" },
-      { name: vm.lt("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec
+      { name: vm.lt("DateRangeLastYear"), id: "**" }, 
       { name: vm.lt("DateRangeThisYear"), id: "*thisyear*" },
       {
         name: vm.lt("DateRangeInTheLastThreeMonths"),
@@ -235,6 +235,27 @@ export default {
         ret.after = dtNow.toUTC().toString();
         ret.before = undefined;
         break;
+
+      case "*lastyear*":
+        //"last year" means prior calendar year from start of january to end of december
+
+        //start with the first day of this year
+        var dtAfter = window.$gz.DateTime.local(dtNow.year);
+
+        //subtract a year
+        dtAfter = dtAfter.plus({ years: -1 });
+
+        //Before zero hour january 1st this year
+        var dtBefore = window.$gz.DateTime.local(dtNow.year);
+
+        //move after back a second for boundary
+        dtAfter = dtAfter.plus({ seconds: -1 });
+
+        //set return values from calculated values
+        ret.after = dtAfter.toUTC().toString();
+        ret.before = dtBefore.toUTC().toString();
+
+        break;
       //--------------------------
     }
 
diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index b391daa4..ef66db5f 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -916,8 +916,8 @@ function untokenizeListView(lv) {
   //iterate the array and build a new array with substituted tokens with the correct date and time in them
   //console.log(lv);
   //console.log(JSON.parse(lv));
-  console.log("test:future");
-  console.log(relativeDatefilterCalculator.tokenToDates("*future*"));
+  console.log("test:lastyear");
+  console.log(relativeDatefilterCalculator.tokenToDates("*lastyear*"));
   //[{"fld":"widgetname"},{"fld":"widgetstartdate","filter":{"items":[{"op":"=","value":"*past90days*","token":true}]}},{"fld":"widgetenddate"}]
   if (lv == null) {
     return lv;