Changeset 1403

Timestamp:

Oct 11, 2011, 1:24:47 PM (12 years ago)

Author:

Martin Svensson

Message:

References #317 Added partition registration form.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• META-INF/servlets.xml (modified) (1 diff)
• resources/index.jsp (modified) (3 diffs)
• resources/partitionform.jsp (added)
• src/net/sf/basedb/reggie/servlet/InstallServlet.java (modified) (1 diff)
• src/net/sf/basedb/reggie/servlet/PartitionRegistrationServlet.java (added)

extensions/net.sf.basedb.reggie/trunk/META-INF/servlets.xml

@@ -21 +21 @@
     <servlet-class>net.sf.basedb.reggie.servlet.SpecimenTubeServlet</servlet-class>
   </servlet>
-
+  <servlet>
+    <servlet-name>PartitionRegistration</servlet-name>
+    <servlet-class>net.sf.basedb.reggie.servlet.PartitionRegistrationServlet</servlet-class>
+  </servlet>
 </servlets>

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

@@ -34 +34 @@
   boolean isPatientCurator = false;
   boolean hasCreateSamplePermission = false;
+  boolean hasCreateExtractPermission = false;
   try
   {
@@ -58 +59 @@
     {
       hasCreateSamplePermission = true;
+    }
+  }
+  catch(RuntimeException ex)
+  {}
+  try
+  {
+    if (sc.hasPermission(Permission.CREATE, Item.EXTRACT))
+    {
+      hasCreateExtractPermission = true;
     }
   }
@@ -181 +191 @@
         <%
       }
+      if (hasCreateSamplePermission && hasCreateExtractPermission)
+      {
+        %>
+        <dt>
+          <table border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <td><base:icon image="file.gif" style="padding-right: 4px;"/></td>
+            <td><a href="partitionform.jsp?ID=<%=ID%>">Partition registration wizard</a></td>
+          </tr>
+          </table>
+        </dt>
+        <dd>
+          <ul>
+          <li>Register new partitions of existing specimens.
+          </ul>
+        </dd>
+        <%
+      }
       %>
       </dl>

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

@@ -139 +139 @@
             new EnumerationOptions("SpecimenSurgery", "SpecimenCoreBiopsy", "SpecimenFineNeedleAspiration"), 
             effectiveOptions, createIfMissing));
+        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_NOF_PIECES, Item.SAMPLE, Type.INT, 1,
+            null, effectiveOptions, createIfMissing));
                 
         json.put("checks", jsonChecks);