This commit is contained in:
2020-03-04 17:56:39 +00:00
parent a48336ed20
commit 0d88945698
2 changed files with 11 additions and 7 deletions

View File

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

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