Changeset 4610


Ignore:
Timestamp:
Oct 28, 2008, 2:20:41 PM (13 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:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/core/net/sf/basedb/core/data/PlateData.java

    r4517 r4610  
    142142  }
    143143
     144  private Set<PlateData> parentSet;
     145  /**
     146    Duplicate of {@link #getParents()} but with a set instead of a map.
     147    This is needed if we want to use the parent plates in a query.
     148    @see #getParents()
     149    @since 2.9
     150    @hibernate.set table="`PlateParents`" lazy="true" inverse="true"
     151    @hibernate.collection-key column="`plate_id`"
     152    @hibernate.collection-many-to-many column="`parent_id`"
     153      class="net.sf.basedb.core.data.PlateData"
     154  */
     155  Set<PlateData> getParentSet()
     156  {
     157    return parentSet;
     158  }
     159  void setParentSet(Set<PlateData> parentSet)
     160  {
     161    this.parentSet = parentSet;
     162  }
     163
     164 
    144165  private Set<PlateData> children;
    145166  /**
  • trunk/src/core/net/sf/basedb/core/data/PlateGeometryData.java

    r4517 r4610  
    2222*/
    2323package net.sf.basedb.core.data;
     24
     25import java.util.Set;
    2426
    2527/**
     
    106108    this.columns = columns;
    107109  }
     110 
     111  private Set<PlateTypeData> plateTypes;
     112  /**
     113    This is the invers end.
     114    @see PlateTypeData#getPlateGeometry()
     115    @since 2.9
     116    @hibernate.set lazy="true" inverse="true" cascade="delete"
     117    @hibernate.collection-key column="`plategeometry_id`"
     118    @hibernate.collection-one-to-many class="net.sf.basedb.core.data.PlateTypeData"
     119  */
     120  Set<PlateTypeData> getPlateTypes()
     121  {
     122    return plateTypes;
     123  }
     124  void setPlateTypes(Set<PlateTypeData> plateTypes)
     125  {
     126    this.plateTypes = plateTypes;
     127  }
    108128}
  • trunk/www/lims/arraybatches/list_batches.jsp

    r4596 r4610  
    275275        id="slides"
    276276        title="Slides"
     277        property="&arraySlides(name)"
     278        datatype="string"
     279        filterable="true"
    277280      />
    278281      <tbl:columndef
  • trunk/www/lims/arraydesigns/list_designs.jsp

    r4596 r4610  
    372372        id="batches"
    373373        title="Batches"
     374        property="&arrayBatches(name)"
     375        datatype="string"
     376        filterable="true"
    374377      />
    375378      <tbl:columndef
  • trunk/www/lims/geometries/list_geometries.jsp

    r4511 r4610  
    237237        id="plateTypes"
    238238        title="Plate types"
     239        property="&plateTypes(name)"
     240        datatype="string"
     241        filterable="true"
    239242      />
    240243      <tbl:columndef
  • trunk/www/lims/plates/list_plates.jsp

    r4596 r4610  
    310310        id="parents"
    311311        title="Parents"
     312        property="&parentSet(name)"
     313        datatype="string"
     314        filterable="true"
    312315      />
    313316      <tbl:columndef
    314317        id="children"
    315318        title="Children"
     319        property="&children(name)"
     320        datatype="string"
     321        filterable="true"
    316322      />
    317323      <tbl:columndef
  • trunk/www/lims/platetypes/list_platetypes.jsp

    r4578 r4610  
    255255        id="plates"
    256256        title="Plates"
     257        property="&plates(name)"
     258        datatype="string"
     259        filterable="true"
    257260      />
    258261      <tbl:columndef
Note: See TracChangeset for help on using the changeset viewer.