Changeset 4610

Timestamp:

Oct 28, 2008, 2:20:41 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #1129: Filtering of child/parent items in table listing

Added collection filter support for all list pages in the Array LIMS menu

Location:

trunk

Files:

• src/core/net/sf/basedb/core/data/PlateData.java (modified) (1 diff)
• src/core/net/sf/basedb/core/data/PlateGeometryData.java (modified) (2 diffs)
• www/lims/arraybatches/list_batches.jsp (modified) (1 diff)
• www/lims/arraydesigns/list_designs.jsp (modified) (1 diff)
• www/lims/geometries/list_geometries.jsp (modified) (1 diff)
• www/lims/plates/list_plates.jsp (modified) (1 diff)
• www/lims/platetypes/list_platetypes.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/data/PlateData.java

@@ -142 +142 @@
   }
 
+  private Set<PlateData> parentSet;
+  /**
+    Duplicate of {@link #getParents()} but with a set instead of a map.
+    This is needed if we want to use the parent plates in a query.
+    @see #getParents()
+    @since 2.9
+    @hibernate.set table="`PlateParents`" lazy="true" inverse="true"
+    @hibernate.collection-key column="`plate_id`"
+    @hibernate.collection-many-to-many column="`parent_id`" 
+      class="net.sf.basedb.core.data.PlateData"
+  */
+  Set<PlateData> getParentSet()
+  {
+    return parentSet;
+  }
+  void setParentSet(Set<PlateData> parentSet)
+  {
+    this.parentSet = parentSet;
+  }
+
+  
   private Set<PlateData> children;
   /**

trunk/src/core/net/sf/basedb/core/data/PlateGeometryData.java

@@ -22 +22 @@
 */
 package net.sf.basedb.core.data;
+
+import java.util.Set;
 
 /**
@@ -106 +108 @@
     this.columns = columns;
   }
+  
+  private Set<PlateTypeData> plateTypes;
+  /**
+    This is the invers end.
+    @see PlateTypeData#getPlateGeometry()
+    @since 2.9
+    @hibernate.set lazy="true" inverse="true" cascade="delete"
+    @hibernate.collection-key column="`plategeometry_id`"
+    @hibernate.collection-one-to-many class="net.sf.basedb.core.data.PlateTypeData"
+  */
+  Set<PlateTypeData> getPlateTypes()
+  {
+    return plateTypes;
+  }
+  void setPlateTypes(Set<PlateTypeData> plateTypes)
+  {
+    this.plateTypes = plateTypes;
+  }
 }

trunk/www/lims/arraybatches/list_batches.jsp

@@ -275 +275 @@
         id="slides"
         title="Slides"
+        property="&arraySlides(name)"
+        datatype="string"
+        filterable="true"
       />
       <tbl:columndef 

trunk/www/lims/arraydesigns/list_designs.jsp

@@ -372 +372 @@
         id="batches"
         title="Batches"
+        property="&arrayBatches(name)"
+        datatype="string"
+        filterable="true"
       />
       <tbl:columndef 

trunk/www/lims/geometries/list_geometries.jsp

@@ -237 +237 @@
         id="plateTypes"
         title="Plate types"
+        property="&plateTypes(name)"
+        datatype="string"
+        filterable="true"
       />
       <tbl:columndef 

trunk/www/lims/plates/list_plates.jsp

@@ -310 +310 @@
         id="parents"
         title="Parents"
+        property="&parentSet(name)"
+        datatype="string"
+        filterable="true"
       />
       <tbl:columndef
         id="children"
         title="Children"
+        property="&children(name)"
+        datatype="string"
+        filterable="true"
       />
       <tbl:columndef 

trunk/www/lims/platetypes/list_platetypes.jsp

@@ -255 +255 @@
         id="plates"
         title="Plates"
+        property="&plates(name)"
+        datatype="string"
+        filterable="true"
       />
       <tbl:columndef