Skip to content

A local-first personal finance app

Add 'Prior year to date' time range (#5419)

POGMAN3c346031118c
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png
index 4fcf6ba96c..777cb9631a 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png
index 81c5da63c1..2c2a1c259f 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png
index a63477204d..f58acb0a3f 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png
index 4a1fd09263..23b5300dea 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png
index a4c4263fd3..8eb4880c25 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png
index 8bea5d0f07..f515911c3f 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/src/components/reports/Header.tsx b/packages/desktop-client/src/components/reports/Header.tsx
index 9529693a52..4fbd02ae89 100644
--- a/packages/desktop-client/src/components/reports/Header.tsx
+++ b/packages/desktop-client/src/components/reports/Header.tsx
@@ -219,6 +219,24 @@ export function Header({
>
<Trans>Last year</Trans>
</Button>
+ <Button
+ variant="bare"
+ onPress={() =>
+ onChangeDates(
+ ...convertToMonth(
+ ...getLiveRange(
+ 'Prior year to date',
+ earliestTransaction,
+ false,
+ firstDayOfWeekIdx,
+ ),
+ 'priorYearToDate',
+ ),
+ )
+ }
+ >
+ <Trans>Prior year to date</Trans>
+ </Button>
<Button
variant="bare"
onPress={() =>
diff --git a/packages/desktop-client/src/components/reports/ReportOptions.ts b/packages/desktop-client/src/components/reports/ReportOptions.ts
index 5f11590f82..c3d10d1ebc 100644
--- a/packages/desktop-client/src/components/reports/ReportOptions.ts
+++ b/packages/desktop-client/src/components/reports/ReportOptions.ts
@@ -170,6 +170,16 @@ const dateRangeOptions: dateRangeProps[] = [
Monthly: true,
Yearly: true,
},
+ {
+ description: t('Prior year to date'),
+ key: 'Prior year to date',
+ name: 'priorYearToDate',
+ type: 'Month',
+ Daily: false,
+ Weekly: true,
+ Monthly: true,
+ Yearly: true,
+ },
{
description: t('All time'),
key: 'All time',
diff --git a/packages/desktop-client/src/components/reports/disabledList.ts b/packages/desktop-client/src/components/reports/disabledList.ts
index 57339f62fb..9c9aea8ee8 100644
--- a/packages/desktop-client/src/components/reports/disabledList.ts
+++ b/packages/desktop-client/src/components/reports/disabledList.ts
@@ -42,6 +42,10 @@ const currentIntervalOptions = [
description: t('Last year'),
disableInclude: true,
},
+ {
+ description: t('Prior year to date'),
+ disableInclude: true,
+ },
{
description: t('All time'),
disableInclude: true,
diff --git a/packages/desktop-client/src/components/reports/getLiveRange.ts b/packages/desktop-client/src/components/reports/getLiveRange.ts
index 99536b6a94..8dfa3317d8 100644
--- a/packages/desktop-client/src/components/reports/getLiveRange.ts
+++ b/packages/desktop-client/src/components/reports/getLiveRange.ts
@@ -32,6 +32,15 @@ export function getLiveRange(
'-31',
);
break;
+ case 'priorYearToDate':
+ [dateStart, dateEnd] = validateRange(
+ earliestTransaction,
+ monthUtils.getYearStart(
+ monthUtils.prevYear(monthUtils.currentMonth()),
+ ) + '-01',
+ monthUtils.prevYear(monthUtils.currentDate(), 'yyyy-MM-dd'),
+ );
+ break;
case 'allTime':
dateStart = earliestTransaction;
dateEnd = monthUtils.currentDay();
diff --git a/packages/desktop-client/src/components/reports/reportRanges.ts b/packages/desktop-client/src/components/reports/reportRanges.ts
index a3ff727caa..ef642fd696 100644
--- a/packages/desktop-client/src/components/reports/reportRanges.ts
+++ b/packages/desktop-client/src/components/reports/reportRanges.ts
@@ -208,6 +208,13 @@ export function calculateTimeRange(
'yearToDate',
] as const;
}
+ if (mode === 'priorYearToDate') {
+ return [
+ monthUtils.getYearStart(monthUtils.prevYear(monthUtils.currentMonth())),
+ monthUtils.prevYear(monthUtils.currentDate(), 'yyyy-MM-dd'),
+ 'priorYearToDate',
+ ] as const;
+ }
return [start, end, 'static'] as const;
}
diff --git a/packages/loot-core/src/shared/months.ts b/packages/loot-core/src/shared/months.ts
index c9da3ac136..d3e6bda25a 100644
--- a/packages/loot-core/src/shared/months.ts
+++ b/packages/loot-core/src/shared/months.ts
@@ -164,8 +164,8 @@ export function nextMonth(month: DateLike): string {
return d.format(d.addMonths(_parse(month), 1), 'yyyy-MM');
}
-export function prevYear(month: DateLike): string {
- return d.format(d.subMonths(_parse(month), 12), 'yyyy-MM');
+export function prevYear(month: DateLike, format = 'yyyy-MM'): string {
+ return d.format(d.subMonths(_parse(month), 12), format);
}
export function prevMonth(month: DateLike): string {
diff --git a/packages/loot-core/src/types/models/dashboard.ts b/packages/loot-core/src/types/models/dashboard.ts
index 47afb372d0..f9c564f0e2 100644
--- a/packages/loot-core/src/types/models/dashboard.ts
+++ b/packages/loot-core/src/types/models/dashboard.ts
@@ -4,7 +4,13 @@ import { type RuleConditionEntity } from './rule';
export type TimeFrame = {
start: string;
end: string;
- mode: 'sliding-window' | 'static' | 'full' | 'lastYear' | 'yearToDate';
+ mode:
+ | 'sliding-window'
+ | 'static'
+ | 'full'
+ | 'lastYear'
+ | 'yearToDate'
+ | 'priorYearToDate';
};
type AbstractWidget<
diff --git a/upcoming-release-notes/5419.md b/upcoming-release-notes/5419.md
new file mode 100644
index 0000000000..1611b6e0d9
--- /dev/null
+++ b/upcoming-release-notes/5419.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [pogman-code]
+---
+
+Add 'Prior year to date' time range