Changeset 4856

Timestamp:

Mar 27, 2009, 11:14:41 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #1266, #1272: Bioplate coordinates are numbers but it would be better to have character-number pairs

A test of #1272. Fixes the export of wells from the Biomaterial LIMS -> Bioplates -> Biowell tab.

Location:

trunk

Files:

• src/core/net/sf/basedb/util/Coordinate.java (modified) (1 diff)
• src/core/net/sf/basedb/util/formatter/WellCoordinateFormatter.java (added)
• www/biomaterials/bioplates/wells/index.jsp (modified) (5 diffs)

trunk/src/core/net/sf/basedb/util/Coordinate.java

@@ -87 +87 @@
   public static String numericToAlpha(int i)
   {
-    String result = "";
+    StringBuilder result = new StringBuilder();
     while(i > 0)
     {
       i--;
-      result = (char)((i%26)+97) + result;
+      result = result.insert(0, (char)((i%26)+97));
       i = i / 26;
     }
-    return result;
+    return result.toString().toUpperCase();
   }
   

trunk/www/biomaterials/bioplates/wells/index.jsp

@@ -37 +37 @@
   import="net.sf.basedb.core.PermissionDeniedException"
   import="net.sf.basedb.core.data.ReporterData"
+  import="net.sf.basedb.core.query.Orders"
+  import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.util.RemovableUtil"
   import="net.sf.basedb.clients.web.Base"
@@ -42 +44 @@
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.util.Values"
+  import="net.sf.basedb.util.formatter.WellCoordinateFormatter"
   import="java.util.List"
   import="java.util.Collections"
@@ -50 +53 @@
   private static final ItemContext defaultContext = Base.createDefaultContext("row", "row,column,bioMaterial.name");
   private static final Item itemType = Item.BIOWELL;
+  
+  private static void registerExportFormatters(ItemContext cc)
+  {
+    cc.setObject("export.formatter.row", new WellCoordinateFormatter(true));
+    cc.setObject("export.formatter.column", new WellCoordinateFormatter(false));
+  }
 %>
 <%
@@ -148 +157 @@
     final ItemQuery<BioWell> query = bioplate.getBioWells();
     cc.configureQuery(query, true);
+    if (!"row".equals(cc.getSortProperty())) query.order(Orders.asc(Hql.property("row")));
+    if (!"column".equals(cc.getSortProperty())) query.order(Orders.asc(Hql.property("column")));
     cc.setQuery(query);
-    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+biowells";
+    registerExportFormatters(cc);
+    redirect = "../../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+biowells";
   }
   else if ("ExportItem".equals(cmd))
@@ -155 +167 @@
     // Run an export plugin in single-item context
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    registerExportFormatters(cc);
     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+biowell";
   }