Changeset 1740

Timestamp:

Nov 22, 2012, 7:57:07 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #431: Add option for exporting PAT-id in the montly operation list

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/export_monthly_oplist.jsp (modified) (3 diffs)
• src/net/sf/basedb/reggie/servlet/ExportServlet.java (modified) (6 diffs)

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

@@ -41 +41 @@
   url += '&time=' + frm.time.value;
   url += '&exportSubtype='+(frm.exportSubtype.checked ? 1 : 0);
+  url += '&exportPatientId='+(frm.exportPatientId.checked ? 1 : 0);
   if (preview) 
   {
@@ -128 +129 @@
 {
   position: absolute;
-  top: 9em;
+  top: 11em;
   bottom: 1em;
   left: 20px;
@@ -229 +230 @@
       </tr>
       
-      <tr>
+      <tr style="vertical-align: top;">
         <td class="prompt">Optional columns</td>
         <td class="input">
           <input type="checkbox" name="exportSubtype" value="1" id="exportSubtype">
-          <label for="exportSubtype">Specimen/NoSpecimen</label>
+          <label for="exportSubtype">Specimen/NoSpecimen</label><br>
+          <input type="checkbox" name="exportPatientId" value="1" id="exportPatientId">
+          <label for="exportPatientId">Patient ID</label>
         </td>
         <td class="help"><span id="subtype.message" class="message" style="display: none;"></span></td>

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

@@ -60 +60 @@
       {
         boolean exportSubtype = Values.getBoolean(req.getParameter("exportSubtype"));
+        boolean exportPatientId = Values.getBoolean(req.getParameter("exportPatientId"));
         
         // This can be any time point in the desired month/year
@@ -142 +143 @@
                   String opDate = dateFormat.format(s.getCreationEvent().getEventDate());
                   String subtype = exportSubtype ? s.getItemSubtype().getName() : null;
+                  String patientId = exportPatientId ? patient.getName() : null;
                   String caseName = caseNamePattern.matcher(s.getName()).replaceFirst("");
-                  opDates.add(new PersonalOpDate(pnr, opDate, site, laterality, subtype, caseName, consent));
+                  opDates.add(new PersonalOpDate(pnr, opDate, site, laterality, subtype, caseName, consent, patientId));
                 }
               }
@@ -155 +157 @@
         resp.setCharacterEncoding("UTF-8");
         PrintWriter os = resp.getWriter();
-        
         for (PersonalOpDate pop : opDates)
         {
@@ -188 +189 @@
     private final String caseName;
     private final String consent;
-    
-    PersonalOpDate(String pnr, String opDate, Site site, String laterality, String subtype, String caseName, String consent)
+    private final String patientId;
+    
+    PersonalOpDate(String pnr, String opDate, Site site, String laterality, String subtype, String caseName, String consent, String patientId)
     {
       this.pnr = pnr;
@@ -198 +200 @@
       this.caseName = caseName;
       this.consent = consent;
+      this.patientId = patientId;
     }
     
@@ -203 +206 @@
     public String toString()
     {
-      return pnr + "\t" + caseName + "\t" + opDate + "\t" + 
-          (laterality == null ? "" : laterality) + "\t" + 
-          site.getName() + 
-          (subtype==null ? "" : "\t" + subtype) + "\t" +
-          (consent == null ? "MISSING" : consent.toUpperCase());
+      return pnr + "\t" + caseName + "\t" + opDate + 
+          "\t" + (laterality == null ? "" : laterality) + 
+          "\t" + site.getName() + 
+          (subtype==null ? "" : "\t" + subtype) + 
+          (patientId==null ? "" : "\t"+patientId)+
+          "\t" + (consent == null ? "MISSING" : consent.toUpperCase());
     }