maximus/Simpl-Resultat
1
0
Fork 0
Code Issues 10 Pull requests 4 Projects Releases 28 Packages Wiki Activity Actions

feat(reports): plumb accountIds[] account filter into 7 report services #281

Closed
maximus wants to merge 2 commits from issue-273-account-filter-services into issue-272-report-filters-hook
pull from: issue-273-account-filter-services
merge into: maximus:issue-272-report-filters-hook
Conversation 2 Commits 2 Files changed 11 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b40381fb89 - Show all commits

6
src/services/reportService.ts
View file

@ -691,7 +691,7 @@ export function buildLeafDrivenTree<T>(leaves: T[], opts: LeafDrivenTreeOptions<
* Minimal category metadata for building the compare tree. Fetched WITHOUT an * Minimal category metadata for building the compare tree. Fetched WITHOUT an
* `is_active` filter so soft-deleted categories (is_active = 0) that still carry * `is_active` filter so soft-deleted categories (is_active = 0) that still carry
* historic transactions keep their place in the hierarchy — matching the raw * historic transactions keep their place in the hierarchy — matching the raw
* LEFT JOIN behavior of COMPARE_DELTA_SQL (no regression on the leaves shown). * LEFT JOIN behavior of compareDeltaSql() (no regression on the leaves shown).
*/ */
type CompareCatMeta = TreeCatMeta; type CompareCatMeta = TreeCatMeta;
@ -702,7 +702,7 @@ const COMPARE_CATEGORIES_SQL = `SELECT id, name, color, type, parent_id FROM cat
const COMPARE_TYPE_ORDER: Record<string, number> = { income: 0, expense: 1, transfer: 2 }; const COMPARE_TYPE_ORDER: Record<string, number> = { income: 0, expense: 1, transfer: 2 };
/** /**
* Turns the flat per-category deltas returned by COMPARE_DELTA_SQL into a * Turns the flat per-category deltas returned by compareDeltaSql() into a
* parent/child tree with subtotal (`is_parent`) rows, mirroring the hierarchy of * parent/child tree with subtotal (`is_parent`) rows, mirroring the hierarchy of
* getBudgetVsActualData. * getBudgetVsActualData.
* *
@ -1418,7 +1418,7 @@ export async function getCartesSnapshot(
// Top movers: biggest MoM increases / decreases. `momRows` now carries the // Top movers: biggest MoM increases / decreases. `momRows` now carries the
// compare hierarchy (Issue #247) — skip the subtotal (`is_parent`) rows so a // compare hierarchy (Issue #247) — skip the subtotal (`is_parent`) rows so a
// parent group can't double-count against its own leaves. Keep only EXPENSE // parent group can't double-count against its own leaves. Keep only EXPENSE
// leaves: since Issue #253 broadened COMPARE_DELTA_SQL to surface income (and // leaves: since Issue #253 broadened compareDeltaSql() to surface income (and
// net transfers), momRows now also carries revenue rows — and this card is a // net transfers), momRows now also carries revenue rows — and this card is a
// spending view whose colours read "up = red" (more spending is bad), so a // spending view whose colours read "up = red" (more spending is bad), so a
// salary rise must not appear under "biggest increases" in red. Mirror the // salary rise must not appear under "biggest increases" in red. Mirror the