[26199] csv excel adjustment (#315)

Author: victoriacarola

bundles/ch.unibe.iam.scg.archie/src/ch/unibe/iam/scg/archie/export/CSVWriter.java

@@ -13,8 +13,9 @@
 
 import org.apache.commons.lang3.StringUtils;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.List;
@@ -52,7 +53,8 @@ public class CSVWriter {
 	 */
 	public static File writeFile(final AbstractDataProvider provider, final String fileName) throws IOException {
 		File file = new File(fileName);
-		FileWriter writer = new FileWriter(file);
+		FileOutputStream fos = new FileOutputStream(file);
+		OutputStreamWriter writer = new OutputStreamWriter(fos, "ISO-8859-1");
 
 		// retrieve DataSet
 		DataSet data = provider.getDataSet();
@@ -79,7 +81,7 @@ public static File writeFile(final AbstractDataProvider provider, final String f
 	 * @param headings List of column headings to write.
 	 * @throws IOException
 	 */
-	private static void writeColumnHeadings(FileWriter writer, List<String> headings) throws IOException {
+	private static void writeColumnHeadings(OutputStreamWriter writer, List<String> headings) throws IOException {
 		// write column headings
 		Object[] objects = headings.toArray();
 		CSVWriter.writeRow(writer, objects);
@@ -94,25 +96,20 @@ private static void writeColumnHeadings(FileWriter writer, List<String> headings
 	 * @param provider A data provider.
 	 * @throws IOException
 	 */
-	private static void writeProviderInformation(FileWriter writer, final AbstractDataProvider provider)
+	private static void writeProviderInformation(OutputStreamWriter writer, final AbstractDataProvider provider)
 			throws IOException {
 		SimpleDateFormat dateFormat = new SimpleDateFormat(DateWidget.VALID_DATE_FORMAT);
 
 		// provider title
-		writer.write(provider.getName());
-		writer.write(StringUtils.LF);
-		writer.write(dateFormat.format(Calendar.getInstance().getTime()));
-		writer.write(StringUtils.LF);
-		writer.write(StringUtils.LF);
+		writer.write(provider.getName() + StringUtils.LF);
+		writer.write(dateFormat.format(Calendar.getInstance().getTime()) + StringUtils.LF + StringUtils.LF);
 
 		// write parameters
 		Map<String, Object> getters = ProviderHelper.getGetterMap(provider, true);
 		for (Object name : getters.keySet().toArray()) {
-			writer.write(name + " = " + getters.get(name)); //$NON-NLS-1$
-			writer.write(StringUtils.LF);
+			writer.write(name + " = " + getters.get(name) + StringUtils.LF); //$NON-NLS-1$
 		}
-		writer.write(StringUtils.LF);
-		writer.write(StringUtils.LF);
+		writer.write(StringUtils.LF + StringUtils.LF);
 	}
 
 	/**
@@ -122,7 +119,7 @@ private static void writeProviderInformation(FileWriter writer, final AbstractDa
 	 * @param objects An array of objects containing the data to write.
 	 * @throws IOException
 	 */
-	private static void writeRow(FileWriter writer, Object[] objects) throws IOException {
+	private static void writeRow(OutputStreamWriter writer, Object[] objects) throws IOException {
 		StringBuffer buf = new StringBuffer();
 		for (Object obj : objects) {
 			buf.append(obj != null ? obj.toString() : StringUtils.EMPTY);

bundles/waelti.statistics/src/waelti/statistics/export/CSVWriter.java

@@ -1,11 +1,13 @@
 package waelti.statistics.export;
 
-import org.apache.commons.lang3.StringUtils;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.List;
+import java.util.Locale;
 
+import ch.rgw.tools.Money;
 import waelti.statistics.queries.AbstractQuery;
 import waelti.statistics.queries.ResultMatrix;
 
@@ -30,32 +32,48 @@ public static File write(AbstractQuery query, File file) throws IOException {
 
 	public static File writer(ResultMatrix matrix, File file) throws IOException {
 
-		FileWriter writer = new FileWriter(file);
+		FileOutputStream fos = new FileOutputStream(file);
+		OutputStreamWriter osw = new OutputStreamWriter(fos, "ISO-8859-1");
 
-		CSVWriter.writeHeading(writer, matrix.getHeadings());
+		try {
+			CSVWriter.writeHeading(osw, matrix.getHeadings());
 
-		for (Object[] objects : matrix) {
-			CSVWriter.writeRow(writer, objects);
+			for (Object[] objects : matrix) {
+				CSVWriter.writeRow(osw, objects);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			osw.close();
 		}
 
-		writer.close();
 		return file;
 	}
 
-	private static void writeHeading(FileWriter writer, List<String> headings) throws IOException {
+	private static void writeHeading(OutputStreamWriter writer, List<String> headings) throws IOException {
 		Object[] objects = headings.toArray();
 		CSVWriter.writeRow(writer, objects);
 	}
 
-	private static void writeRow(FileWriter writer, Object[] objects) throws IOException {
-		StringBuffer buf = new StringBuffer();
+	private static void writeRow(OutputStreamWriter writer, Object[] objects) throws IOException {
+		StringBuilder buf = new StringBuilder();
 		for (Object obj : objects) {
-			buf.append(obj.toString());
+			// Überprüfung, ob der Wert eine Zahl ist
+			if (obj instanceof Number) {
+				if (obj instanceof Money) {
+					buf.append(obj.toString()); // Kommas durch Punkte ersetzen
+
+				} else {
+					buf.append(String.format(Locale.US, "%.2f", obj)); // Dezimalzahlen mit Punkt statt Komma
+				}
+			} else {
+				buf.append(obj.toString()); // Kommas durch Punkte ersetzen
+			}
 			buf.append(CSVWriter.delimiter);
 		}
-		buf.deleteCharAt(buf.length() - 1); // last delimiter not needed
-		buf.append(StringUtils.LF);
+
+		buf.deleteCharAt(buf.length() - 1); // letztes Trennzeichen nicht benötigt
+		buf.append(System.lineSeparator());
 		writer.write(buf.toString());
 	}
-
 }