This commit is contained in:
2020-03-04 17:54:43 +00:00
parent 589e8d4b9c
commit a48336ed20
2 changed files with 16 additions and 3 deletions

View File

@@ -11,7 +11,7 @@
{ name: vm.lt("DateRangeThisMonth"), id: "**" },
{ name: vm.lt("DateRangeNextMonth"), id: "**" },
{ name: vm.lt("DateRange14DayWindow"), id: "**" },
{ name: vm.lt("DateRangePast"), id: "*past*" },
{ name: vm.lt("DateRangePast"), id: "**" },
{ name: vm.lt("DateRangeFuture"), id: "*future*" },
{ name: vm.lt("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec
{ name: vm.lt("DateRangeThisYear"), id: "*thisyear*" },
@@ -44,6 +44,9 @@ export default {
//return object contains the two dates that encompass the time period
//the token represents to the local browser time zone but in UTC
//and iso8601 format
//NOTE: it's valid for one of the two ret values might be undefined as it's valid to have a single date for
//Past or Future
var ret = { after: undefined, before: undefined };
var dtNow = window.$gz.DateTime.local();
var dtToday = window.$gz.DateTime.local(dtNow.year, dtNow.month, dtNow.day);
@@ -218,6 +221,16 @@ export default {
ret.after = dtAfter.toUTC().toString();
ret.before = dtBefore.toUTC().toString();
break;
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();
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:14daywindow");
console.log(relativeDatefilterCalculator.tokenToDates("*14daywindow*"));
console.log("test:past");
console.log(relativeDatefilterCalculator.tokenToDates("*past*"));
//[{"fld":"widgetname"},{"fld":"widgetstartdate","filter":{"items":[{"op":"=","value":"*past90days*","token":true}]}},{"fld":"widgetenddate"}]
if (lv == null) {
return lv;