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

Reports

This commit is contained in:
Hillel Coren 2020-02-14 12:07:53 +02:00
parent 08df4b4b6c
commit a847a71b3c
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/ui/reports/reports_screen.dart
View File

@ -9,6 +9,7 @@ import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart';
import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart';
import 'package:invoiceninja_flutter/redux/reports/reports_state.dart';
import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
import 'package:invoiceninja_flutter/ui/app/dialogs/multiselect_dialog.dart';
@ -194,7 +195,7 @@ class ReportsScreen extends StatelessWidget {
FormCard(
child: ReportDataTable(
//key: ObjectKey(viewModel.reportResult.columns),
key: ValueKey(viewModel.state.isSaving),
key: ValueKey('${viewModel.state.isSaving} ${reportsUIState.group ?? ''}'),
viewModel: viewModel,
),
)
@ -384,14 +385,21 @@ class ReportResult {
UserCompanyEntity userCompany,
ReportsUIState reportsUIState,
}) {
DateRange dateRange = DateRange.last30Days;
try {
dateRange = DateRange.valueOf(filter);
} catch(e) {
//
}
final startDate = calculateStartDate(
dateRange: DateRange.valueOf(filter),
dateRange: dateRange,
company: userCompany.company,
customStartDate: reportsUIState.customStartDate,
customEndDate: reportsUIState.customEndDate,
);
final endDate = calculateEndDate(
dateRange: DateRange.valueOf(filter),
dateRange: dateRange,
company: userCompany.company,
customStartDate: reportsUIState.customStartDate,
customEndDate: reportsUIState.customEndDate,
@ -626,7 +634,22 @@ class ReportResult {
} else if (getReportColumnType(column) == ReportColumnType.number) {
value = formatNumber(values[column], context);
}
cells.add(DataCell(Text(value)));
cells.add(DataCell(Text(value), onTap: () {
if (column == groupBy) {
String filter = group;
if (getReportColumnType(column) == ReportColumnType.dateTime) {
filter = DateRange.custom.toString();
}
store.dispatch(
UpdateReportSettings(
report: reportState.report,
group: '',
filters: reportState.filters
.rebuild((b) => b..addAll({column: filter})),
),
);
}
}));
}
rows.add(DataRow(cells: cells));
});