andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 00:39:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

csv utf-8 with semicolon and Intl.Number format

Browse Source
This commit is contained in:
MichaelDvP
2022-05-06 12:15:25 +02:00
parent b2429e3cff
commit 1a5b012545
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
interface/src/project/DashboardData.tsx
View File

@@ -355,7 +355,7 @@ const DashboardData: FC = () => {
if (sc === '' || sc === '""') { if (sc === '' || sc === '""') {
return sc; return sc;
} }
if (sc.includes('"') || sc.includes(',') || sc.includes('\n') || sc.includes('\r')) { if (sc.includes('"') || sc.includes(';') || sc.includes('\n') || sc.includes('\r')) {
return '"' + sc.replace(/"/g, '""') + '"'; return '"' + sc.replace(/"/g, '""') + '"';
} }
return sc; return sc;
@@ -363,13 +363,13 @@ const DashboardData: FC = () => {
const makeCsvData = (columns: any, data: any) => { const makeCsvData = (columns: any, data: any) => {
return data.reduce((csvString: any, rowItem: any) => { return data.reduce((csvString: any, rowItem: any) => {
return csvString + columns.map(({ accessor }: any) => escapeCsvCell(accessor(rowItem))).join(',') + '\r\n'; return csvString + columns.map(({ accessor }: any) => escapeCsvCell(accessor(rowItem))).join(';') + '\r\n';
}, columns.map(({ name }: any) => escapeCsvCell(name)).join(',') + '\r\n'); }, columns.map(({ name }: any) => escapeCsvCell(name)).join(';') + '\r\n');
}; };
const downloadAsCsv = (columns: any, data: any, filename: string) => { const downloadAsCsv = (columns: any, data: any, filename: string) => {
const csvData = makeCsvData(columns, data); const csvData = makeCsvData(columns, data);
const csvFile = new Blob([csvData], { type: 'text/csv' }); const csvFile = new Blob([csvData], { type: 'text/csv;charset:utf-8' });
const downloadLink = document.createElement('a'); const downloadLink = document.createElement('a');
downloadLink.download = filename; downloadLink.download = filename;
@@ -384,8 +384,8 @@ const DashboardData: FC = () => {
const handleDownloadCsv = () => { const handleDownloadCsv = () => {
const columns = [ const columns = [
{ accessor: (dv: any) => dv.id.slice(2), name: 'Entity' }, { accessor: (dv: any) => dv.id.slice(2), name: 'Entity' },
{ accessor: (dv: any) => dv.v, name: 'Value' }, { accessor: (dv: any) => (typeof dv.v === 'number') ? new Intl.NumberFormat().format(dv.v) : dv.v, name: 'Value' },
{ accessor: (dv: any) => (dv.u >= 1 && dv.u <= 2 ? 'C' : DeviceValueUOM_s[dv.u]), name: 'UoM' } { accessor: (dv: any) => DeviceValueUOM_s[dv.u], name: 'UoM' }
]; ];
downloadAsCsv( downloadAsCsv(
columns, columns,