From 1a5b0125456fed561ead0462106222f79acb9680 Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Fri, 6 May 2022 12:15:25 +0200
Subject: [PATCH] csv utf-8 with semicolon and Intl.Number format

---
 interface/src/project/DashboardData.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx
index 827120708..5b4bd827d 100644
--- a/interface/src/project/DashboardData.tsx
+++ b/interface/src/project/DashboardData.tsx
@@ -355,7 +355,7 @@ const DashboardData: FC = () => {
     if (sc === '' || 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;
@@ -363,13 +363,13 @@ const DashboardData: FC = () => {
 
   const makeCsvData = (columns: any, data: any) => {
     return data.reduce((csvString: any, rowItem: any) => {
-      return csvString + columns.map(({ accessor }: any) => escapeCsvCell(accessor(rowItem))).join(',') + '\r\n';
-    }, columns.map(({ name }: any) => escapeCsvCell(name)).join(',') + '\r\n');
+      return csvString + columns.map(({ accessor }: any) => escapeCsvCell(accessor(rowItem))).join(';') + '\r\n';
+    }, columns.map(({ name }: any) => escapeCsvCell(name)).join(';') + '\r\n');
   };
 
   const downloadAsCsv = (columns: any, data: any, filename: string) => {
     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');
 
     downloadLink.download = filename;
@@ -384,8 +384,8 @@ const DashboardData: FC = () => {
   const handleDownloadCsv = () => {
     const columns = [
       { accessor: (dv: any) => dv.id.slice(2), name: 'Entity' },
-      { accessor: (dv: any) => dv.v, name: 'Value' },
-      { accessor: (dv: any) => (dv.u >= 1 && dv.u <= 2 ? 'C' : DeviceValueUOM_s[dv.u]), name: 'UoM' }
+      { accessor: (dv: any) => (typeof dv.v === 'number') ? new Intl.NumberFormat().format(dv.v) : dv.v, name: 'Value' },
+      { accessor: (dv: any) => DeviceValueUOM_s[dv.u], name: 'UoM' }
     ];
     downloadAsCsv(
       columns,