Changeset 7488

Timestamp:

May 28, 2018, 9:14:39 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2121: Display more information in synchronization filters

Fixed for the platofrm, biowell and parentType filters.

File:

• branches/3.12-stable/src/core/net/sf/basedb/util/formatter/PropertyFilterFormatter.java (modified) (1 diff)

branches/3.12-stable/src/core/net/sf/basedb/util/formatter/PropertyFilterFormatter.java

@@ -112 +112 @@
       sb.append(")");
     }
-    else if (property.equals("itemSubtype") || property.endsWith(".itemSubtype"))
-    {
-      // Special handling to display name of subtype
+    else if (property.equals("bioWell.row") || property.equals("bioWell.column"))
+    {
+      WellCoordinateFormatter formatter = new WellCoordinateFormatter(property.equals("bioWell.row"));
       sb.append(property).append(" ").append(operator).append(" ");
-      List<Object> subtypes = filter.getValuesAsObjects();
-      if (subtypes.size() > 1) sb.append("(");
-      if (subtypes.size() == 0) sb.append("null");
+      List<Object> selected = filter.getValuesAsObjects();
+      if (selected.size() > 1) sb.append("(");
+      if (selected.size() == 0) sb.append("null");
       String sep = "";
-      for (Object id : subtypes)
+      for (Object index : selected)
       {
         sb.append(sep);
         sep = ", ";
-        sb.append(nameOfItem(dc, Item.ITEMSUBTYPE, (Integer)id, true));
-      }
-      if (subtypes.size() > 1) sb.append(")");
+        sb.append(formatter.format((Integer)index));
+      }
+      if (selected.size() > 1) sb.append(")");
+    }
+    else if (property.equals("parentType"))
+    {
+      sb.append(property).append(" ").append(operator).append(" ");
+      List<Object> selected = filter.getValuesAsObjects();
+      if (selected.size() > 1) sb.append("(");
+      if (selected.size() == 0) sb.append("null");
+      String sep = "";
+      for (Object index : selected)
+      {
+        sb.append(sep);
+        sep = ", ";
+        sb.append(Item.fromValue((Integer)index).toString());
+      }
+      if (selected.size() > 1) sb.append(")");
     }
     else
     {
-      if (property.startsWith("&") || property.startsWith("@") || property.startsWith("!"))
-      {
-        property = property.substring(1);
-      }
-      sb.append(property).append(" ").append(operator).append(" ");
-      if (operator.isListOperator() && value != null)
-      {
-        appendListOfValues(sb, value, quote);
+      Item nameOfItemType = null;
+      if (property.equals("itemSubtype") || property.endsWith(".itemSubtype"))
+      {
+        // Special handling to display name of subtype
+        nameOfItemType = Item.ITEMSUBTYPE;
+      }
+      else if (property.equals("platform"))
+      {
+        // Special handling to display name of platform
+        nameOfItemType = Item.PLATFORM;
+      }
+      if (nameOfItemType != null)
+      {
+        sb.append(property).append(" ").append(operator).append(" ");
+        List<Object> itemIds = filter.getValuesAsObjects();
+        if (itemIds.size() > 1) sb.append("(");
+        if (itemIds.size() == 0) sb.append("null");
+        String sep = "";
+        for (Object id : itemIds)
+        {
+          sb.append(sep);
+          sep = ", ";
+          sb.append(nameOfItem(dc, nameOfItemType, (Integer)id, true));
+        }
+        if (itemIds.size() > 1) sb.append(")");
       }
       else
       {
-        if (filter.getValueType().isTemporal())
-        {
-          value = dateFormatter.format((Date)Type.DATE.parseString(value));
-        }
-        sb.append(quote).append(value).append(quote);
+        if (property.startsWith("&") || property.startsWith("@") || property.startsWith("!"))
+        {
+          property = property.substring(1);
+        }
+        sb.append(property).append(" ").append(operator).append(" ");
+        if (operator.isListOperator() && value != null)
+        {
+          appendListOfValues(sb, value, quote);
+        }
+        else
+        {
+          if (filter.getValueType().isTemporal())
+          {
+            value = dateFormatter.format((Date)Type.DATE.parseString(value));
+          }
+          sb.append(quote).append(value).append(quote);
+        }
       }
     }