Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Dashboard

This commit is contained in:
Hillel Coren 2018-09-25 09:02:51 +03:00
parent 4ed96275bb
commit 6ac67988c4
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ui/dashboard/dashboard_chart.dart
View File

@ -19,6 +19,9 @@ class DashboardChart extends StatefulWidget {
final String title; final String title;
final int currencyId; final int currencyId;
static const PERIOD_CURRENT = 'current';
static const PERIOD_PREVIOUS = 'previous';
@override @override
_DashboardChartState createState() => _DashboardChartState(); _DashboardChartState createState() => _DashboardChartState();
} }
@ -36,7 +39,10 @@ class _DashboardChartState extends State<DashboardChart> {
if (selectedDatum.isNotEmpty) { if (selectedDatum.isNotEmpty) {
date = selectedDatum.first.datum.date; 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; total += datumPair.datum.amount;
measures[datumPair.series.displayName] = datumPair.datum.amount; measures[datumPair.series.displayName] = datumPair.datum.amount;
}); });

8
lib/ui/dashboard/dashboard_panels.dart
View File

@ -118,7 +118,7 @@ class DashboardPanels extends StatelessWidget {
measureFn: (ChartMoneyData chartData, _) => chartData.amount, measureFn: (ChartMoneyData chartData, _) => chartData.amount,
colorFn: (ChartMoneyData chartData, _) => colorFn: (ChartMoneyData chartData, _) =>
charts.MaterialPalette.blue.shadeDefault, charts.MaterialPalette.blue.shadeDefault,
id: 'invoices', id: DashboardChart.PERIOD_CURRENT,
displayName: settings.enableComparison displayName: settings.enableComparison
? localization.currentPeriod ? localization.currentPeriod
: localization.invoices, : localization.invoices,
@ -150,7 +150,7 @@ class DashboardPanels extends StatelessWidget {
measureFn: (ChartMoneyData chartData, _) => chartData.amount, measureFn: (ChartMoneyData chartData, _) => chartData.amount,
colorFn: (ChartMoneyData chartData, _) => colorFn: (ChartMoneyData chartData, _) =>
charts.MaterialPalette.gray.shadeDefault, charts.MaterialPalette.gray.shadeDefault,
id: 'previousInvoices', id: DashboardChart.PERIOD_PREVIOUS,
displayName: localization.previousPeriod, displayName: localization.previousPeriod,
data: previousData, data: previousData,
), ),
@ -192,7 +192,7 @@ class DashboardPanels extends StatelessWidget {
measureFn: (ChartMoneyData chartData, _) => chartData.amount, measureFn: (ChartMoneyData chartData, _) => chartData.amount,
colorFn: (ChartMoneyData chartData, _) => colorFn: (ChartMoneyData chartData, _) =>
charts.MaterialPalette.blue.shadeDefault, charts.MaterialPalette.blue.shadeDefault,
id: 'payments', id: DashboardChart.PERIOD_CURRENT,
displayName: settings.enableComparison displayName: settings.enableComparison
? localization.currentPeriod ? localization.currentPeriod
: localization.payments, : localization.payments,
@ -225,7 +225,7 @@ class DashboardPanels extends StatelessWidget {
measureFn: (ChartMoneyData chartData, _) => chartData.amount, measureFn: (ChartMoneyData chartData, _) => chartData.amount,
colorFn: (ChartMoneyData chartData, _) => colorFn: (ChartMoneyData chartData, _) =>
charts.MaterialPalette.gray.shadeDefault, charts.MaterialPalette.gray.shadeDefault,
id: 'previousPayments', id: DashboardChart.PERIOD_PREVIOUS,
displayName: localization.previousPeriod, displayName: localization.previousPeriod,
data: previousData, data: previousData,
), ),