Changeset 1766

Timestamp:

Dec 4, 2012, 8:28:03 AM (10 years ago)

Author:

olle

Message:

Fixes #443. Sample count report generator updated to allow the user to select sample type "no specimen" for the report.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/samplereportgenerator.jsp (modified) (3 diffs)
• src/net/sf/basedb/reggie/servlet/SampleReportServlet.java (modified) (1 diff)

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

@@ -286 +286 @@
     {
       var samples = 'specimens';
-      if ('blood' == sampleType)
+      if ('nospecimen' == sampleType)
+      {
+        samples = '"no specimens"';
+      }
+      else if ('blood' == sampleType)
       {
         samples = 'blood samples';
@@ -378 +382 @@
     {
       headerText = '# Specimens by ';
-      if ('blood' == sampleType)
+      if ('nospecimen' == sampleType)
+      {
+        headerText = '# "No specimens" by ';
+      }
+      else if ('blood' == sampleType)
       {
         headerText = '# Blood samples by ';
@@ -1862 +1870 @@
                   <select name="sampletype">
                     <option value="specimen" selected="yes">Specimen</option>
+                    <option value="nospecimen">No specimen</option>
                     <option value="blood">Blood</option>
                   </select>

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/SampleReportServlet.java

@@ -250 +250 @@
     ItemQuery<Sample> sampleQuery = Sample.getQuery();
     sampleQuery.joinPermanent(Hql.innerJoin(null, "creationEvent", "ce", true));
-    if (sampleType.equals("blood"))
+    if (sampleType.equals("nospecimen"))
+    {
+      Subtype.NO_SPECIMEN.addFilter(dc, sampleQuery);
+    }
+    else if (sampleType.equals("blood"))
     {
       Subtype.BLOOD.addFilter(dc, sampleQuery);