diff --git a/ayanova/src/api/relative-date-filter-calculator.js b/ayanova/src/api/relative-date-filter-calculator.js index 12fe2379..35f55ce6 100644 --- a/ayanova/src/api/relative-date-filter-calculator.js +++ b/ayanova/src/api/relative-date-filter-calculator.js @@ -12,7 +12,7 @@ { name: vm.lt("DateRangeNextMonth"), id: "**" }, { name: vm.lt("DateRange14DayWindow"), id: "**" }, { name: vm.lt("DateRangePast"), id: "**" }, - { name: vm.lt("DateRangeFuture"), id: "*future*" }, + { name: vm.lt("DateRangeFuture"), id: "**" }, { name: vm.lt("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec { name: vm.lt("DateRangeThisYear"), id: "*thisyear*" }, { @@ -224,12 +224,16 @@ export default { case "*past*": //Any time before Now - //current moment - var dtBefore = dtNow; - //set return values from calculated values ret.after = undefined; - ret.before = dtBefore.toUTC().toString(); + ret.before = dtNow.toUTC().toString(); + break; + + case "*future*": + //Any time after Now + //set return values from calculated values + ret.after = dtNow.toUTC().toString(); + ret.before = undefined; break; //-------------------------- } diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue index 7fa8143b..b391daa4 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:past"); - console.log(relativeDatefilterCalculator.tokenToDates("*past*")); + console.log("test:future"); + console.log(relativeDatefilterCalculator.tokenToDates("*future*")); //[{"fld":"widgetname"},{"fld":"widgetstartdate","filter":{"items":[{"op":"=","value":"*past90days*","token":true}]}},{"fld":"widgetenddate"}] if (lv == null) { return lv;