From 777d263efe84e53d6ea2d4680715ae569f0767e1 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 7 Mar 2025 13:36:24 -0700 Subject: [PATCH] Start loading incomes and assets for reporting. --- lib/pages/report.dart | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/pages/report.dart b/lib/pages/report.dart index 6a07f49..8c76bd7 100644 --- a/lib/pages/report.dart +++ b/lib/pages/report.dart @@ -1,5 +1,6 @@ // Flutter import 'package:flutter/material.dart'; +import 'package:flutter_expense_tracker/models/item_type.dart'; // Local import '/db.dart'; @@ -27,24 +28,22 @@ class _ProjectionPageState extends State { Widget build(BuildContext context) { Widget expenseSummary = SummaryCardForTotals( list: DatabaseHelper.instance.getExpenses(), - summaryTypeLabel: "Expense", + summaryTypeLabel: ItemType.expense.title, + ); + Widget incomeSummary = SummaryCardForTotals( + list: DatabaseHelper.instance.getIncomes(), + summaryTypeLabel: ItemType.income.title, + ); + Widget assetSummary = SummaryCardForTotals( + list: DatabaseHelper.instance.getAssets(), + summaryTypeLabel: ItemType.asset.title, ); return ListView( children: [ expenseSummary, - SummaryCard( - name: "Income Totals", - leftText: "left", - middleText: "middle", - rightText: "right", - ), - SummaryCard( - name: "Asset Totals", - leftText: "left", - middleText: "middle", - rightText: "right", - ), + incomeSummary, + assetSummary, ], ); } @@ -71,6 +70,7 @@ class SummaryCardForTotals extends StatelessWidget { if (!snapshot.hasData) { return Text('Loading $summaryTypeLabel Section...'); } + // TODO: Do not show all 3 sections or any text for Assets. double dailyTotal = 0, monthlyTotal = 0, yearlyTotal = 0; for (TrackedItem e in snapshot.data!) { dailyTotal += e.calcComparableAmountDaily(); @@ -122,9 +122,7 @@ class SummaryCard extends StatelessWidget { Text( name, style: TextStyle( - decoration: TextDecoration.underline, - fontSize: 16 - ), + decoration: TextDecoration.underline, fontSize: 16), ), Row( children: [