This commit is contained in:
2020-03-04 18:03:26 +00:00
parent 0d88945698
commit 29c2a8ebee
2 changed files with 24 additions and 3 deletions

View File

@@ -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;
//--------------------------
}

View File

@@ -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;