diff --git a/lib/ui/dashboard/dashboard_chart.dart b/lib/ui/dashboard/dashboard_chart.dart index 2ca10e347..0ef383942 100644 --- a/lib/ui/dashboard/dashboard_chart.dart +++ b/lib/ui/dashboard/dashboard_chart.dart @@ -19,6 +19,9 @@ class DashboardChart extends StatefulWidget { final String title; final int currencyId; + static const PERIOD_CURRENT = 'current'; + static const PERIOD_PREVIOUS = 'previous'; + @override _DashboardChartState createState() => _DashboardChartState(); } @@ -36,7 +39,10 @@ class _DashboardChartState extends State { if (selectedDatum.isNotEmpty) { date = selectedDatum.first.datum.date; - selectedDatum.forEach((charts.SeriesDatum datumPair) { + selectedDatum + .where((charts.SeriesDatum datumPair) => + datumPair.series.id == DashboardChart.PERIOD_CURRENT) + .forEach((charts.SeriesDatum datumPair) { total += datumPair.datum.amount; measures[datumPair.series.displayName] = datumPair.datum.amount; }); diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart index e38c0e121..d6e9db2d4 100644 --- a/lib/ui/dashboard/dashboard_panels.dart +++ b/lib/ui/dashboard/dashboard_panels.dart @@ -118,7 +118,7 @@ class DashboardPanels extends StatelessWidget { measureFn: (ChartMoneyData chartData, _) => chartData.amount, colorFn: (ChartMoneyData chartData, _) => charts.MaterialPalette.blue.shadeDefault, - id: 'invoices', + id: DashboardChart.PERIOD_CURRENT, displayName: settings.enableComparison ? localization.currentPeriod : localization.invoices, @@ -150,7 +150,7 @@ class DashboardPanels extends StatelessWidget { measureFn: (ChartMoneyData chartData, _) => chartData.amount, colorFn: (ChartMoneyData chartData, _) => charts.MaterialPalette.gray.shadeDefault, - id: 'previousInvoices', + id: DashboardChart.PERIOD_PREVIOUS, displayName: localization.previousPeriod, data: previousData, ), @@ -192,7 +192,7 @@ class DashboardPanels extends StatelessWidget { measureFn: (ChartMoneyData chartData, _) => chartData.amount, colorFn: (ChartMoneyData chartData, _) => charts.MaterialPalette.blue.shadeDefault, - id: 'payments', + id: DashboardChart.PERIOD_CURRENT, displayName: settings.enableComparison ? localization.currentPeriod : localization.payments, @@ -225,7 +225,7 @@ class DashboardPanels extends StatelessWidget { measureFn: (ChartMoneyData chartData, _) => chartData.amount, colorFn: (ChartMoneyData chartData, _) => charts.MaterialPalette.gray.shadeDefault, - id: 'previousPayments', + id: DashboardChart.PERIOD_PREVIOUS, displayName: localization.previousPeriod, data: previousData, ),