diff --git a/src/lib/db/queries/queries.ts b/src/lib/db/queries/queries.ts index 760bb1b..15b314a 100644 --- a/src/lib/db/queries/queries.ts +++ b/src/lib/db/queries/queries.ts @@ -11,6 +11,8 @@ import { in_1y, in_30d, in_7d, + in_15d, + in_20d, in_90d, in_xdays, in_cm, @@ -174,6 +176,8 @@ const initialRanges: Record = { '_cm': in_cm, '_lm': in_lm, '7d': in_7d, + '15d': in_15d, + '20d': in_20d, '30d': in_30d, '90d': in_90d, '1y': in_1y, diff --git a/src/lib/db/queries/ranges.ts b/src/lib/db/queries/ranges.ts index b16800f..1335bd7 100644 --- a/src/lib/db/queries/ranges.ts +++ b/src/lib/db/queries/ranges.ts @@ -5,6 +5,16 @@ export const in_7d = (getCell: any) => dayjs().subtract(7, "day") ); +export const in_15d = (getCell: any) => + dayjs(getCell("date")?.toString(), "YYYY-MM-DD").isAfter( + dayjs().subtract(15, "day") + ); + +export const in_20d = (getCell: any) => + dayjs(getCell("date")?.toString(), "YYYY-MM-DD").isAfter( + dayjs().subtract(20, "day") + ); + export const in_30d = (getCell: any) => dayjs(getCell("date")?.toString(), "YYYY-MM-DD").isAfter( dayjs().subtract(30, "day") diff --git a/src/lib/utils.ts b/src/lib/utils.ts index acccccb..85327a2 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -62,6 +62,8 @@ export const rangeToStr : any = { "1y": "1 Year", "90d": "90 Days", "7d": "7 Days", + "15d": "15 Days", + "20d": "20 Days", "30d": "30 Days", "all": "All", "_lm": "Last Month", @@ -97,6 +99,8 @@ function getMostRecentMonthStart(month: number) { export const rangeData = (range: string) => { switch (range) { case "7d": return { from: dayjs().subtract(7, "day"), to: dayjs() }; + case "15d": return { from: dayjs().subtract(15, "day"), to: dayjs() }; + case "20d": return { from: dayjs().subtract(20, "day"), to: dayjs() }; case "30d": return { from: dayjs().subtract(30, "day"), to: dayjs() }; case "90d": return { from: dayjs().subtract(90, "day"), to: dayjs() }; case "1y": return { from: dayjs().subtract(365, "day"), to: dayjs() };