Changeset 1517

Timestamp:

Jan 20, 2012, 11:01:16 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #350: Blood referral form registration wizard

Added form for blood registration. It is more or less the same as the personal registration form. The differences are in the third step that have input fields for sampling date, freezer date, and serum/plasma.

There is not yet a servlet for loading/storing information. Step 1 and 2 use the personal information servlet.

Re-organized the index page into 3 sections and added different icons for the different wizards.

Location:

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

Files:

• bloodform.jsp (added)
• images (added)
• images/blood.png (added)
• images/consent.png (added)
• images/partition.png (added)
• images/pdffile.png (added)
• images/specimen.png (added)
• index.jsp (modified) (6 diffs)

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

@@ -17 +17 @@
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.util.HTML"
+  import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
   import="net.sf.basedb.util.Values"
   import="java.util.List"
@@ -26 +27 @@
 final String ID = sc.getId();
 final float scale = Base.getScale(sc);
+final String home = ExtensionsControl.getHomeUrl("net.sf.basedb.reggie");
 DbControl dc = null;
 try
@@ -120 +122 @@
       {
         %>
-        <dt>
+        <dt style="border-top: 1px solid #999999; padding-top: 4px;">
           <table border="0" cellspacing="0" cellpadding="0">
           <tr>
@@ -142 +144 @@
           <table border="0" cellspacing="0" cellpadding="0">
           <tr>
-            <td><base:icon image="file.gif" style="padding-right: 4px;"/></td>
+            <td><base:icon image="<%=home + "/images/blood.png" %>" style="padding-right: 4px;"/></td>
+            <td><a href="bloodform.jsp?ID=<%=ID%>">Blood referral form registration wizard</a></td>
+          </tr>
+          </table>
+        </dt>
+        <dd>
+          <ul>
+          <li>Register new blood referral forms and patients.
+          <li>Update information for existing blood referral forms.
+          </ul>
+        </dd>
+        <%
+      }
+      if (isPatientCurator || isAdmin)
+      {
+        %>
+        <dt>
+          <table border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <td><base:icon image="<%=home+"/images/consent.png" %>" style="padding-right: 4px;"/></td>
+            <td><a href="consentform.jsp?ID=<%=ID%>">Consent form registration wizard</a></td>
+          </tr>
+          </table>
+        </dt>
+        <dd>
+          <ul>
+          <li>Register consent forms.
+          </ul>
+        </dd>
+        <%
+      }
+      if (isPatientCurator || isAdmin)
+      {
+        %>
+        <dt>
+          <table border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <td><base:icon image="<%=home+"/images/pdffile.png" %>" style="padding-right: 4px;"/></td>
             <td><a href="refform.jsp?ID=<%=ID%>">Referral form registration wizard</a></td>
           </tr>
@@ -154 +193 @@
         <%
       }
-      if (isPatientCurator || isAdmin)
-      {
-        %>
-        <dt>
-          <table border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td><base:icon image="file.gif" style="padding-right: 4px;"/></td>
-            <td><a href="consentform.jsp?ID=<%=ID%>">Consent form registration wizard</a></td>
-          </tr>
-          </table>
-        </dt>
-        <dd>
-          <ul>
-          <li>Register consent forms.
-          </ul>
-        </dd>
-        <%
-      }
       if (hasCreateSamplePermission)
       {
         %>
-        <dt>
-          <table border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td><base:icon image="file.gif" style="padding-right: 4px;"/></td>
+        <dt style="border-top: 1px solid #999999; padding-top: 4px;">
+          <table border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <td><base:icon image="<%=home+"/images/specimen.png" %>" style="padding-right: 4px;"/></td>
             <td><a href="specimentube.jsp?ID=<%=ID%>">Specimen tube registration wizard</a></td>
           </tr>
@@ -197 +218 @@
           <table border="0" cellspacing="0" cellpadding="0">
           <tr>
-            <td><base:icon image="file.gif" style="padding-right: 4px;"/></td>
+            <td><base:icon image="<%=home+"/images/partition.png" %>" style="padding-right: 4px;"/></td>
             <td><a href="partitionform.jsp?ID=<%=ID%>">Partition registration wizard</a></td>
           </tr>