improving format of exported excel

ganttproject-tester/test/biz/ganttproject/impex/csv/CsvImportTest.java

@@ -229,7 +229,7 @@ private List<Pair<SpreadsheetFormat, Supplier<InputStream>>> createPairs(String.
 
   private byte[] createXls(String... rows) throws Exception {
     ByteArrayOutputStream stream = new ByteArrayOutputStream();
-    try (SpreadsheetWriter writer = new XlsWriterImpl(stream)) {
+    try (SpreadsheetWriter writer = new XlsWriterImpl(stream, "test")) {
       for (String row : rows) {
         for (String cell : row.split(",", -1)) {
           writer.print(cell.trim());

ganttproject-tester/test/biz/ganttproject/impex/csv/GPCsvImportTest.java

@@ -334,7 +334,7 @@ private Map<String, Task> doTestImportAssignments(Supplier<InputStream> supplier
 
   private byte[] createXls(String... rows) throws Exception {
     ByteArrayOutputStream stream = new ByteArrayOutputStream();
-    try (SpreadsheetWriter writer = new XlsWriterImpl(stream)) {
+    try (SpreadsheetWriter writer = new XlsWriterImpl(stream, "test")) {
       for (String row : rows) {
         for (String line : row.split("\n", -1)) {
           for (String cell : line.split(",", -1)) {

ganttproject/src/biz/ganttproject/impex/csv/CsvRecordImpl.java

@@ -35,7 +35,7 @@ class CsvRecordImpl implements SpreadsheetRecord {
 
   @Override
   public String get(String name) {
-    return myRecord.get(name);
+    return (isSet(name)) ? myRecord.get(name) : "";
   }
 
   @Override
@@ -62,4 +62,9 @@ public Iterator<String> iterator() {
   public int size() {
     return myRecord.size();
   }
+
+  @Override
+  public String toString() {
+    return myRecord.toString();
+  }
 }

ganttproject/src/biz/ganttproject/impex/csv/CsvWriterImpl.java

@@ -26,6 +26,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.math.BigDecimal;
+import java.util.Calendar;
 
 /**
  * @author akurutin on 04.04.2017.
@@ -53,4 +55,35 @@ public void close() throws IOException {
     myCsvPrinter.flush();
     myCsvPrinter.close();
   }
+
+  @Override
+  public void newSheet() throws IOException {
+    println();
+    println();
+  }
+
+  @Override
+  public void newSheet(String name) throws IOException {
+    newSheet();
+  }
+
+  @Override
+  public void print(Double value) throws IOException {
+    myCsvPrinter.print(String.valueOf(value));
+  }
+
+  @Override
+  public void print(Integer value) throws IOException {
+    myCsvPrinter.print(String.valueOf(value));
+  }
+
+  @Override
+  public void print(BigDecimal value) throws IOException {
+    myCsvPrinter.print(value.toPlainString());
+  }
+
+  @Override
+  public void print(Calendar value) throws IOException {
+    myCsvPrinter.print(value.toString());
+  }
 }

ganttproject/src/biz/ganttproject/impex/csv/GanttCSVExport.java

@@ -114,15 +114,14 @@ private SpreadsheetWriter getCsvWriter(OutputStream stream) throws IOException {
   }
 
   private SpreadsheetWriter getXlsWriter(OutputStream stream) {
-    return new XlsWriterImpl(stream);
+    return new XlsWriterImpl(stream, i18n("tasksList"));
   }
 
   public void save(SpreadsheetWriter writer) throws IOException {
     writeTasks(writer);
 
     if (myHumanResourceManager.getResources().size() > 0) {
-      writer.println();
-      writer.println();
+      writer.newSheet(i18n("resourcesList"));
       writeResources(writer);
     }
   }
@@ -171,22 +170,22 @@ private void writeTasks(SpreadsheetWriter writer) throws IOException {
         } else {
           switch (defaultColumn) {
             case ID:
-              writer.print(String.valueOf(task.getTaskID()));
+              writer.print(task.getTaskID());
               break;
             case NAME:
               writer.print(getName(task));
               break;
             case BEGIN_DATE:
-              writer.print(task.getStart().toString());
+              writer.print(task.getStart());
               break;
             case END_DATE:
-              writer.print(task.getDisplayEnd().toString());
+              writer.print(task.getDisplayEnd());
               break;
             case DURATION:
-              writer.print(String.valueOf(task.getDuration().getLength()));
+              writer.print(task.getDuration().getLength());
               break;
             case COMPLETION:
-              writer.print(String.valueOf(task.getCompletionPercentage()));
+              writer.print(task.getCompletionPercentage());
               break;
             case OUTLINE_NUMBER:
               List<Integer> outlinePath = task.getManager().getTaskHierarchy().getOutlinePath(task);
@@ -203,7 +202,7 @@ private void writeTasks(SpreadsheetWriter writer) throws IOException {
               writer.print(getAssignments(task));
               break;
             case COST:
-              writer.print(task.getCost().getValue().toPlainString());
+              writer.print(task.getCost().getValue());
               break;
             case INFO:
             case PRIORITY:
@@ -282,13 +281,13 @@ private void writeResources(SpreadsheetWriter writer) throws IOException {
               writer.print("");
               break;
             case STANDARD_RATE:
-              writer.print(p.getStandardPayRate().toPlainString());
+              writer.print(p.getStandardPayRate());
               break;
             case TOTAL_COST:
-              writer.print(p.getTotalCost().toPlainString());
+              writer.print(p.getTotalCost());
               break;
             case TOTAL_LOAD:
-              writer.print(String.valueOf(p.getTotalLoad()));
+              writer.print(p.getTotalLoad());
               break;
           }
         }

ganttproject/src/biz/ganttproject/impex/csv/GanttCSVOpen.java

@@ -130,7 +130,7 @@ private int doLoad(SpreadsheetReader reader, int numGroup, int linesToSkip) {
       numGroup++;
     }
 
-    for (Iterator<SpreadsheetRecord> it = reader.iterator(); it.hasNext(); ) {
+    for (Iterator<SpreadsheetRecord> it = reader.iterator(); it.hasNext();) {
       SpreadsheetRecord record = it.next();
       lineCounter++;
       if (linesToSkip-- > 0) {
@@ -155,7 +155,7 @@ private int doLoad(SpreadsheetReader reader, int numGroup, int linesToSkip) {
           }
         }
       }
-      if (currentGroup.doProcess(record)) {
+      if (currentGroup.process(record)) {
         searchHeader = false;
       } else {
         mySkippedLine++;

ganttproject/src/biz/ganttproject/impex/csv/SpreadsheetWriter.java

@@ -20,13 +20,26 @@
 package biz.ganttproject.impex.csv;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 
 /**
  * @author akurutin on 04.04.2017.
  */
 public interface SpreadsheetWriter extends AutoCloseable {
   void print(String value) throws IOException;
 
+  void print(Double value) throws IOException;
+
+  void print(Integer value) throws IOException;
+
+  void print(BigDecimal value) throws IOException;
+
+  void print(java.util.Calendar value) throws IOException;
+
   void println() throws IOException;
 
+  void newSheet() throws IOException;
+
+  void newSheet(String name) throws IOException;
+
 }

ganttproject/src/biz/ganttproject/impex/csv/XlsReaderImpl.java

@@ -21,9 +21,13 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
+
+import net.sourceforge.ganttproject.language.GanttLanguage;
+
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 
 import java.io.IOException;
@@ -32,6 +36,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.text.SimpleDateFormat;
 
 /**
  * @author torkhov
@@ -40,10 +45,12 @@ class XlsReaderImpl implements SpreadsheetReader {
 
   private final Workbook myBook;
   private final Map<String, Integer> myHeaders;
+  private final SimpleDateFormat myDateFormat;
 
   XlsReaderImpl(InputStream is, List<String> columnHeaders) throws IOException {
     myBook = new HSSFWorkbook(is);
     myHeaders = initializeHeader(columnHeaders);
+    myDateFormat = GanttLanguage.getInstance().getShortDateFormat();
   }
 
   @Override
@@ -53,11 +60,44 @@ public void close() throws IOException {
 
   @Override
   public Iterator<SpreadsheetRecord> iterator() {
-    return Iterators.transform(myBook.getSheetAt(0).iterator(), (input) -> new XlsRecordImpl(getCellValues(input), myHeaders));
+    Iterator<SpreadsheetRecord> iterator = null;
+    Iterator<SpreadsheetRecord> it = null;
+
+    // import all sheets into CSV style records with two empty records to separate "tables" 
+    for (int i = 0; i < myBook.getNumberOfSheets(); ++i) {
+      Sheet sheet = myBook.getSheetAt(i);
+      if (i < myBook.getNumberOfSheets() - 1) {
+        int lastRow = sheet.getPhysicalNumberOfRows();
+        sheet.createRow(lastRow + 1);
+        sheet.createRow(lastRow + 2);
+      }
+      it = Iterators.transform(sheet.iterator(), (input) -> new XlsRecordImpl(getCellValues(input), myHeaders));
+      iterator = (iterator == null) ? it : Iterators.concat(iterator, it);
+    }
+
+    return iterator;
   }
 
   private List<String> getCellValues(Row row) {
-    return Lists.newArrayList(Iterables.transform(row, Cell::getStringCellValue));
+    return Lists.newArrayList(Iterables.transform(row, (input) -> {
+      switch (input.getCellTypeEnum()) {
+        // handle the cases for date, integer and double as used when writing
+        // this is neccessary to get correct date values and make the parser happy
+        case NUMERIC: {
+          if (HSSFDateUtil.isCellDateFormatted(input)) {
+            return myDateFormat.format(input.getDateCellValue());
+          } else {
+            if (input.getCellStyle().getDataFormat() == (short) 1) {
+              return String.valueOf((int) input.getNumericCellValue());
+            } else {
+              return String.valueOf(input.getNumericCellValue());
+            }
+          }
+        }
+        default:
+          return input.getStringCellValue();
+      }
+    }));
   }
 
   /**

ganttproject/src/biz/ganttproject/impex/csv/XlsRecordImpl.java

@@ -44,7 +44,7 @@ public String get(String name) {
     if (index == null) {
       throw new IllegalArgumentException(String.format("Mapping for %s not found, expected one of %s", name, myMapping.keySet()));
     }
-    return myValues.get(index);
+    return (myValues.size() <= index) ? "" : myValues.get(index);
   }
 
   @Override
@@ -71,4 +71,17 @@ public Iterator<String> iterator() {
   public int size() {
     return myValues.size();
   }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    for (String name : myMapping.keySet()) {
+      try {
+        sb.append(name + ": " + get(myMapping.get(name)) + ";");
+      } catch (Throwable t) {
+        sb.append(name + ": <invalid column>;");
+      }
+    }
+    return sb.toString();
+  }
 }