Changeset 1420


Ignore:
Timestamp:
Oct 28, 2011, 11:43:20 AM (10 years ago)
Author:
Martin Svensson
Message:

References #330 Selection-list: Tubes available for partition does no longer include cases.
Box-info is only displayed for a selected specimen tube when the information is available.

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/partitionform.jsp

    r1419 r1420  
    175175     
    176176      inputWeightHtml += '<tr>';
    177       inputWeightHtml += '<td rowspan=2 class=prompt>'+tube.name+' ['+tube.box+'&nbsp;'+tube.row+tube.column+']</td>';
     177      inputWeightHtml += '<td rowspan=2 class=prompt>'+tube.name;
     178      // Only show box information if there is something show.     
     179      if (tube.row != null && tube.column != null)
     180      {
     181        inputWeightHtml += ' ['+tube.box+'&nbsp;'+tube.row+tube.column+']';
     182      }
     183      inputWeightHtml += '</td>';
    178184     
    179185      inputWeightHtml += '<td style="width:400px;">';
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/SpecimenTube.java

    r1419 r1420  
    105105   
    106106    ItemQuery<Sample> tubeQuery = Sample.getQuery();
    107     tubeQuery.restrict(Restrictions.and(
    108         Restrictions.notLike_in(Hql.property("name"), Expressions.string("%.his")),
    109           Restrictions.eq(Hql.property("originalQuantity"), null)));
     107    tubeQuery.restrict(Restrictions.rlike(Hql.property("name"), Expressions.parameter("name", "^.\\.[0-9]+$", Type.STRING)));
    110108    tubeQuery.order(Orders.desc(Hql.property("name")));
    111109    tubeQuery.include(Include.ALL);
Note: See TracChangeset for help on using the changeset viewer.