Fix export

This commit is contained in:
Hillel Coren 2021-03-07 15:00:10 +02:00
parent 4cfbd47f66
commit fa62254181
2 changed files with 9 additions and 11 deletions

View File

@ -12,6 +12,7 @@ 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/buttons/app_text_button.dart';
import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart';
import 'package:invoiceninja_flutter/ui/app/dialogs/multiselect_dialog.dart';
import 'package:invoiceninja_flutter/ui/app/form_card.dart';
@ -206,11 +207,9 @@ class ReportsScreen extends StatelessWidget {
actions: <Widget>[
if (isDesktop(context)) ...[
Builder(builder: (BuildContext context) {
return TextButton(
child: Text(
localization.columns,
style: TextStyle(color: store.state.headerTextColor),
),
return AppTextButton(
label: localization.columns,
isInHeader: true,
onPressed: () {
multiselectDialog(
context: context,
@ -224,11 +223,9 @@ class ReportsScreen extends StatelessWidget {
},
);
}),
TextButton(
child: Text(
localization.export,
style: TextStyle(color: store.state.headerTextColor),
),
AppTextButton(
label: localization.export,
isInHeader: true,
onPressed: () {
viewModel.onExportPressed(context);
},

View File

@ -347,7 +347,8 @@ class ReportsScreenVM {
if (reportState.group.isEmpty || reportState.isGroupByFiltered) {
reportResult.columns.forEach((column) {
csvData += '${localization.lookup(column)},';
final value = localization.lookup(column);
csvData += value.contains(' ') ? '"$value",' : '$value,';
});
csvData = csvData.substring(0, csvData.length - 1);
reportResult.data.forEach((row) {