Changeset 1420 for extensions

Timestamp:

Oct 28, 2011, 11:43:20 AM (12 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:

• resources/partitionform.jsp (modified) (1 diff)
• src/net/sf/basedb/reggie/dao/SpecimenTube.java (modified) (1 diff)

extensions/net.sf.basedb.reggie/trunk/resources/partitionform.jsp

@@ -175 +175 @@
       
       inputWeightHtml += '<tr>';
-      inputWeightHtml += '<td rowspan=2 class=prompt>'+tube.name+' ['+tube.box+'&nbsp;'+tube.row+tube.column+']</td>';
+      inputWeightHtml += '<td rowspan=2 class=prompt>'+tube.name;
+      // Only show box information if there is something show.      
+      if (tube.row != null && tube.column != null)
+      {
+        inputWeightHtml += ' ['+tube.box+'&nbsp;'+tube.row+tube.column+']';
+      }
+      inputWeightHtml += '</td>';
       
       inputWeightHtml += '<td style="width:400px;">';

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/SpecimenTube.java

@@ -105 +105 @@
     
     ItemQuery<Sample> tubeQuery = Sample.getQuery();
-    tubeQuery.restrict(Restrictions.and(
-        Restrictions.notLike_in(Hql.property("name"), Expressions.string("%.his")),
-          Restrictions.eq(Hql.property("originalQuantity"), null)));
+    tubeQuery.restrict(Restrictions.rlike(Hql.property("name"), Expressions.parameter("name", "^.\\.[0-9]+$", Type.STRING)));
     tubeQuery.order(Orders.desc(Hql.property("name")));
     tubeQuery.include(Include.ALL);