This commit is contained in:
Hillel Coren 2020-02-14 14:44:20 +02:00
parent 720b05925f
commit 8cfaa34a50
2 changed files with 44 additions and 28 deletions

View File

@ -193,13 +193,10 @@ class ReportsScreen extends StatelessWidget {
}), }),
], ],
), ),
FormCard( ReportDataTable(
child: ReportDataTable(
//key: ObjectKey(viewModel.reportResult.columns),
key: ValueKey( key: ValueKey(
'${viewModel.state.isSaving} ${reportsUIState.group}'), '${viewModel.state.isSaving} ${reportsUIState.group}'),
viewModel: viewModel, viewModel: viewModel,
),
) )
], ],
), ),
@ -274,7 +271,20 @@ class _ReportDataTableState extends State<ReportDataTable> {
?.reportSettings[state.uiState.reportsUIState.report] ?? ?.reportSettings[state.uiState.reportsUIState.report] ??
ReportSettingsEntity(); ReportSettingsEntity();
return SingleChildScrollView( return Column(
children: <Widget>[
FormCard(
child: DataTable(
columns: [
DataColumn(
label: Text(AppLocalization.of(context).totals),
)
],
rows: [],
),
),
FormCard(
child: SingleChildScrollView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: DataTable( child: DataTable(
sortColumnIndex: reportSettings.sortIndex, sortColumnIndex: reportSettings.sortIndex,
@ -295,6 +305,9 @@ class _ReportDataTableState extends State<ReportDataTable> {
...reportResult.tableRows(context), ...reportResult.tableRows(context),
], ],
), ),
),
),
],
); );
} }
} }

View File

@ -14,6 +14,7 @@ abstract class LocaleCodeAware {
mixin LocalizationsProvider on LocaleCodeAware { mixin LocalizationsProvider on LocaleCodeAware {
static final Map<String, Map<String, String>> _localizedValues = { static final Map<String, Map<String, String>> _localizedValues = {
'en': { 'en': {
'totals': 'Totals',
'blank': 'Blank', 'blank': 'Blank',
'day': 'Day', 'day': 'Day',
'month': 'Month', 'month': 'Month',
@ -14600,6 +14601,8 @@ mixin LocalizationsProvider on LocaleCodeAware {
String get total => _localizedValues[localeCode]['total']; String get total => _localizedValues[localeCode]['total'];
String get totals => _localizedValues[localeCode]['totals'];
String get percent => _localizedValues[localeCode]['percent']; String get percent => _localizedValues[localeCode]['percent'];
String get edit => _localizedValues[localeCode]['edit']; String get edit => _localizedValues[localeCode]['edit'];