Browse Source

fix: isWithin - formula related issues

pull/7574/head
Pranav C 11 months ago
parent
commit
a3064be32d
  1. 10
      packages/nocodb/src/db/conditionV2.ts

10
packages/nocodb/src/db/conditionV2.ts

@ -1060,18 +1060,24 @@ const parseConditionV2 = async (
case 'isWithin': { case 'isWithin': {
let now = dayjs(new Date()).format(dateFormat).toString(); let now = dayjs(new Date()).format(dateFormat).toString();
now = column.uidt === UITypes.Date ? now.substring(0, 10) : now; now = column.uidt === UITypes.Date ? now.substring(0, 10) : now;
// switch between arg based on customWhereClause(builder)
const [firstArg, rangeArg] = [
customWhereClause ? val : field,
customWhereClause ? field : val,
];
switch (filter.comparison_sub_op) { switch (filter.comparison_sub_op) {
case 'pastWeek': case 'pastWeek':
case 'pastMonth': case 'pastMonth':
case 'pastYear': case 'pastYear':
case 'pastNumberOfDays': case 'pastNumberOfDays':
qb = qb.whereBetween(field, [val, now]); qb = qb.whereBetween(firstArg, [rangeArg, now]);
break; break;
case 'nextWeek': case 'nextWeek':
case 'nextMonth': case 'nextMonth':
case 'nextYear': case 'nextYear':
case 'nextNumberOfDays': case 'nextNumberOfDays':
qb = qb.whereBetween(field, [now, val]); qb = qb.whereBetween(firstArg, [now, rangeArg]);
break; break;
} }
} }

Loading…
Cancel
Save