Add possibility to switch columns in result, make sure collection nr …

…is sorted as numbers
BernhardWebstudio · Sep 28, 2024 · 32b9ab8 · 32b9ab8
1 parent 8e8bf7f
commit 32b9ab8
Show file tree

Hide file tree

Showing 3 changed files with 400 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/SpecimenBrowser.java b/src/main/java/edu/harvard/mcz/imagecapture/SpecimenBrowser.java
@@ -28,6 +28,7 @@
 import edu.harvard.mcz.imagecapture.ui.CopyRowButtonEditor;
 import edu.harvard.mcz.imagecapture.ui.frame.SpecimenDetailsViewPane;
 import edu.harvard.mcz.imagecapture.ui.tablemodel.SpecimenListTableModel;
+import edu.harvard.mcz.imagecapture.ui.tablemodel.TableColumnManager;
 import org.hibernate.SessionException;
 import org.hibernate.TransactionException;
 import org.slf4j.Logger;
@@ -133,6 +134,7 @@ private JTable getJTable() {
                 model = new SpecimenListTableModel(s.findAll());
             }
             jTable.setModel(model);
+            new TableColumnManager(jTable);
             sorter = new TableRowSorter<>(model);
             sorter.toggleSortOrder(SpecimenListTableModel.COL_BARCODE - 1);
             jTable.setRowSorter(sorter);

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/ui/tablemodel/SpecimenListTableModel.java b/src/main/java/edu/harvard/mcz/imagecapture/ui/tablemodel/SpecimenListTableModel.java
@@ -140,7 +140,14 @@ public Object getValueAt(int rowIndex, int columnIndex) {
                     result = s.getCollection();
                     break;
                 case COL_COLLECTION_NR:
-                    result = s.getFirstNumberWithType("Collection Number");
+                    String collectionNr = s.getFirstNumberWithType("Collection Number");
+                    if (collectionNr != null) {
+                        try {
+                            result = Double.parseDouble(collectionNr);
+                        } catch (NumberFormatException e) {
+                            result = collectionNr;
+                        }
+                    }
                     break;
             }
         }
@@ -157,6 +164,9 @@ public Class getColumnClass(int c) {
         // needs to return Long for ID column that is to contain button
         // and ** Must Not ** return Long for any other column).
         Class result = String.class; // Default value to return when table is empty.
+        if (c == COL_COLLECTION_NR) {
+            return Double.class;
+        }
         try {
             result = getValueAt(0, c).getClass();
         } catch (NullPointerException e) {