Use locale format to export CSV from print button

issue8635
review252101002
This commit is contained in:
Cédric Krier committed 2019-09-17 00:09:44 +02:00
1 parent e9f6976eae
commit e6e307f575
2 files changed
+31 -22

No files matched your search

+3
View File
@@ -1299,6 +1299,9 @@
'fields': fields,
'data': data,
};
unparse_obj.data = data.map(function(row) {
return Sao.Window.Export.format_row(row);
});
var delimiter = ',';
var encoding = 'utf-8';
if (navigator.platform &&
+28 -22
View File
@@ -1776,27 +1776,8 @@
var encoding = this.el_csv_encoding.val();
var locale_format = this.el_csv_locale.prop('checked');
var unparse_obj = {};
unparse_obj.data = [];
data.forEach(function(line) {
var row = [];
line.forEach(function(val) {
if (locale_format) {
if (val.isDateTime) {
val = val.format(
Sao.common.date_format() + ' ' +
Sao.common.moment_format('%X'));
} else if (val.isDate) {
val = val.format(Sao.common.date_format());
} else if (!isNaN(Number(val))) {
val = val.toLocaleString(
Sao.i18n.BC47(Sao.i18n.getlang()));
}
} else if (typeof(val) == 'boolean') {
val += 0;
}
row.push(val);
});
unparse_obj.data.push(row);
unparse_obj.data = data.map(function(row) {
return Sao.Window.Export.format_row(row, locale_format);
});
if (this.el_add_field_names.is(':checked')) {
unparse_obj.fields = fields;
@@ -1810,7 +1791,32 @@
return Sao.common.message.run(
Sao.i18n.ngettext('%1 record saved', '%1 records saved',
data.length));
}
},
});
Sao.Window.Export.format_row = function(line, locale_format) {
if (locale_format === undefined) {
locale_format = true;
}
var row = [];
line.forEach(function(val) {
if (locale_format) {
if (val.isDateTime) {
val = val.format(
Sao.common.date_format() + ' ' +
Sao.common.moment_format('%X'));
} else if (val.isDate) {
val = val.format(Sao.common.date_format());
} else if (!isNaN(Number(val))) {
val = val.toLocaleString(
Sao.i18n.BC47(Sao.i18n.getlang()));
}
} else if (typeof(val) == 'boolean') {
val += 0;
}
row.push(val);
});
return row;
};
}());