Changeset 7651

Timestamp:

Mar 14, 2019, 11:55:13 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2160: Table exporter should support exporting to Excel files

Better handling of collections, multi-valued annotations and annotations with units.

Location:

trunk/src

Files:

• clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java (modified) (1 diff)
• clients/web/net/sf/basedb/clients/web/plugins/XlsxTemplate.java (modified) (5 diffs)
• core/net/sf/basedb/util/excel/ExcelValue.java (modified) (1 diff)

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java

@@ -648 +648 @@
                   Type valueType = ep.annotationType.getValueType();
                   UnitConverter unitConverter = null;
-                  if (defaultUnit != null)
-                  {
-                    if (ep.unit != null) unitConverter = ep.unit.getUnitConverter(defaultUnit);
-                    if (ep.unit == null) unitSymbol = defaultUnit.getDisplaySymbol();
-                  }
                   values = new ArrayList();
                   for (AnnotationSnapshot s : list)
                   {
+                    if (defaultUnit != null && ep.unit == null && unitConverter == null) // Units should be converted for each item
+                    {
+                      Unit u = s.getActualUnit(dc);
+                      unitConverter = u.getUnitConverter(defaultUnit);
+                      unitSymbol = u.getDisplaySymbol();
+                    }
                     values.addAll(s.getActualValues(unitConverter, valueType));
                   }

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/XlsxTemplate.java

@@ -25 +25 @@
 import java.io.OutputStream;
 import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.DataFormat;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -44 +39 @@
 import net.sf.basedb.util.Values;
 import net.sf.basedb.util.excel.CellStyleCreator;
-import net.sf.basedb.util.excel.ExcelFormatter;
 import net.sf.basedb.util.excel.ExcelValue;
 import net.sf.basedb.util.formatter.Formatter;
@@ -157 +151 @@
     throws IOException
   {
-    if (values != null && values.size() == 1)
+    if (values == null || values.size() == 0)
+    {
+      writeProperty(ep, null);
+    }
+    else if (values.size() == 1 && unit == null)
     {
       writeProperty(ep, values.get(0));
-      return;
-    }
-    Cell cell = currentRow.createCell(colNum++);
-    Formatter f = ep.formatter;
-    if (unit != null) f = new PrefixSuffixFormatter("", f, PrefixSuffixFormatter.NBSP + unit);
-    cell.setCellValue(Values.getString(values, collectionSeparator, true, f));
+    }
+    else
+    {
+      Cell cell = currentRow.createCell(colNum++);
+      Formatter f = ep.formatter;
+      if (unit != null) f = new PrefixSuffixFormatter("", f, PrefixSuffixFormatter.NBSP + unit);
+      ExcelValue ev = ExcelValue.asString(Values.getString(values, collectionSeparator, true, f));
+      ev.writeTo(cell, styleCreator);
+    }
   }
 
@@ -172 +173 @@
   */
   @Override
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   public void writeProperty(ExportedProperty ep, Object data)
     throws IOException
@@ -186 +187 @@
    */
   @Override
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   public void writeCollection(ExportedProperty ep, Collection<?> values)
     throws IOException
   {
-    Cell cell = currentRow.createCell(colNum++);
-    cell.setCellValue(Values.getString(values, collectionSeparator, true, ep.formatter));
+    if (values == null || values.size() == 0)
+    {
+      writeProperty(ep, null);
+    }
+    else if (values.size() == 1)
+    {
+      writeProperty(ep, values.iterator().next());
+    }
+    else
+    {
+      Cell cell = currentRow.createCell(colNum++);
+      ExcelValue ev = ExcelValue.asString(Values.getString(values, collectionSeparator, true, ep.formatter));
+      ev.writeTo(cell, styleCreator);
+    }
   }
 

trunk/src/core/net/sf/basedb/util/excel/ExcelValue.java

@@ -129 +129 @@
   protected final String format;
   
-  ExcelValue(T value, String format)
+  protected ExcelValue(T value, String format)
   {
     this.value = value;