From 3cddab592a46fbab6bb6e8dc05c529950aaa6895 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <Giancarlo Panichi@dlib32.isti.cnr.it>
Date: Tue, 12 Nov 2019 12:03:51 +0100
Subject: [PATCH] ref 18034: Accounting Dashboard - Support export csv with
 Firefox and Safari https://support.d4science.org/issues/18034

Updated csv export
---
 .classpath                                            |  6 +++---
 .settings/org.eclipse.wst.common.component            |  2 +-
 changelog.xml                                         |  4 ++++
 pom.xml                                               |  2 +-
 .../application/mainarea/report/chartjs/Chart.java    | 11 +++++++----
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.classpath b/.classpath
index adad1e8..5c0febd 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/accounting-dashboard-1.1.0/WEB-INF/classes" path="src/main/java">
+	<classpathentry including="**/*.java" kind="src" output="target/accounting-dashboard-1.2.0/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/accounting-dashboard-1.1.0/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/accounting-dashboard-1.2.0/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -50,5 +50,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/accounting-dashboard-1.1.0/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/accounting-dashboard-1.2.0/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 15d3abb..822ca16 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="accounting-dashboard-1.1.0">
+    <wb-module deploy-name="accounting-dashboard-1.2.0">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
diff --git a/changelog.xml b/changelog.xml
index 2da21e7..e30161e 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-0"
+		date="2019-11-12">
+		<Change>Updated export csv support with Firefox and Safari [ticket #18034]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-1-0"
 		date="2019-10-01">
 		<Change>Updated to support accounting data visualization at the
diff --git a/pom.xml b/pom.xml
index 2a8b3f8..88b5730 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>accounting-dashboard</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 	<packaging>war</packaging>
 
 	<name>accounting-dashboard</name>
diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java
index 5d5209b..410dc2f 100644
--- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java
+++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java
@@ -181,16 +181,19 @@ public class Chart extends HTMLPanel {
 						heading += "," + recordData.getX();
 						datasetRow += "," + recordData.getY();
 					}
-					csvContent += heading + "\r\n";
-					csvContent += datasetRow + "\r\n";
-
+					
+					var csvData=heading+"\n"+datasetRow + "\n";
+					var csvDataEncoded=encodeURIComponent(csvData);
+					csvContent += csvDataEncoded;
 				} else {
 					var datasetRow = seriesData.getLabel();
 					for (var j = 0; j < dataRowLen; j++) {
 						var recordData = dataRow[j];
 						datasetRow += "," + recordData.getY();
 					}
-					csvContent += datasetRow + "\r\n";
+					var csvData=datasetRow + "\n";
+					var csvDataEncoded=encodeURIComponent(csvData);
+					csvContent += csvDataEncoded;
 				}
 			}
 			this.href = csvContent;