gCubeSystem
/
accounting-dashboard
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

ref 18034: Accounting Dashboard - Support export csv with Firefox and 

Safari
https://support.d4science.org/issues/18034

Updated csv export
This commit is contained in:
Giancarlo Panichi 2019-11-12 12:03:51 +01:00
parent 5deb2c2a05
commit 3cddab592a
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <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> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </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> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -50,5 +50,5 @@
</classpathentry> </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.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="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> </classpath>

2
.settings/org.eclipse.wst.common.component
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?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="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>

4
changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes> <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" <Changeset component="org.gcube.portlets.user.accounting-dashboard.1-1-0"
date="2019-10-01"> date="2019-10-01">
<Change>Updated to support accounting data visualization at the <Change>Updated to support accounting data visualization at the

2
pom.xml
View File

@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>accounting-dashboard</artifactId> <artifactId>accounting-dashboard</artifactId>
<version>1.1.0</version> <version>1.2.0</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>accounting-dashboard</name> <name>accounting-dashboard</name>

11
src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java
View File

@ -181,16 +181,19 @@ public class Chart extends HTMLPanel {
heading += "," + recordData.getX(); heading += "," + recordData.getX();
datasetRow += "," + recordData.getY(); datasetRow += "," + recordData.getY();
} }
csvContent += heading + "\r\n";
csvContent += datasetRow + "\r\n"; var csvData=heading+"\n"+datasetRow + "\n";
var csvDataEncoded=encodeURIComponent(csvData);
csvContent += csvDataEncoded;
} else { } else {
var datasetRow = seriesData.getLabel(); var datasetRow = seriesData.getLabel();
for (var j = 0; j < dataRowLen; j++) { for (var j = 0; j < dataRowLen; j++) {
var recordData = dataRow[j]; var recordData = dataRow[j];
datasetRow += "," + recordData.getY(); datasetRow += "," + recordData.getY();
} }
csvContent += datasetRow + "\r\n"; var csvData=datasetRow + "\n";
var csvDataEncoded=encodeURIComponent(csvData);
csvContent += csvDataEncoded;
} }
} }
this.href = csvContent; this.href = csvContent;