Changeset 1741

Timestamp:

Nov 22, 2012, 9:13:19 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #432: The monthly operation list should include column headers

Including the headers what easy. Forrmatting the preview so that is looked nice requried a bit more work since columns do not align with the headers. Now using a <table> approach instead.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/export_monthly_oplist.jsp (modified) (4 diffs)
• src/net/sf/basedb/reggie/servlet/ExportServlet.java (modified) (1 diff)

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

@@ -73 +73 @@
     {
       var allLines = request.responseText.split('\n');
-      var numLines = allLines.length - 1;
-      
+      var numCases = allLines.length - 2; // First line is a header line
+      
+      var html = '<tr><th>'+allLines[0].replace(/\t/g, '</th><th>')+'</th></tr>';
       // Check last column for the 'Consent' value. All should be 'YES' for the export to be ok.
       var numNoConsent = 0;
       var numMissingConsent = 0;
-      for (var i = 0 ; i < numLines; i++)
+      for (var i = 1 ; i <= numCases; i++)
       {
         var line = allLines[i];
-        var lastColIdx = line.lastIndexOf('\t');
-        var lastCol = line.substr(lastColIdx+1);
-        
-        if (lastCol != 'YES')
+        var cols = line.split(/\t/);
+        var consent = cols[cols.length-1];
+        var rowClass = '';
+        if (consent != 'YES')
         {
-          if (lastCol == 'MISSING')
+          rowClass = 'consent-warning';
+          if (consent == 'MISSING')
           {
             numMissingConsent++;
@@ -94 +96 @@
             numNoConsent++;
           }
-          allLines[i] = '<span class="consent-warning">'+line+'</span>';
         }
+        html += '<tr class="'+rowClass+'"><td>'+cols.join('</td><td>')+'</td></tr>';
       }
       
@@ -106 +108 @@
       }
       
-      previewTitle.innerHTML = 'Operation dates - ' + frm.time[frm.time.selectedIndex].text + ' (' + numLines + ')';
-      previewList.innerHTML = allLines.join('\n');
+      previewTitle.innerHTML = 'Operation dates - ' + frm.time[frm.time.selectedIndex].text + ' (' + numCases + ')';
+      previewList.innerHTML = '<table>'+html+'</table>';
       Main.show('previewWrapper');
     }
@@ -156 +158 @@
 }
 
+#previewList th
+{
+  border-bottom: 1px dotted #A0A0A0;
+}
+
+#previewList td, #previewList th
+{
+  text-align: left;
+  padding-right: 2em;
+  vertical-align: bottom;
+}
+
 .consent-warning
 {
-  font-weight: bold;
   color: #A00000;
   background-color: #F8F8E8;
 }
 
-.consent-warning:after
-{
-  content: url('images/warning_small.png');
-  vertical-align: middle;
+.consent-warning td:last-child
+{
+  background-image: url('images/warning_small.png');
+  background-position: 95% 50%;
+  background-repeat: no-repeat;
 }
 

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

@@ -157 +157 @@
         resp.setCharacterEncoding("UTF-8");
         PrintWriter os = resp.getWriter();
+        os.write("PersonalNr\tScanBId\tOpDate\tLaterality\tSite");
+        if (exportSubtype) os.write("\tSpecimen");
+        if (exportPatientId) os.write("\tPatientId");
+        os.write("\tConsent\n");
+
         for (PersonalOpDate pop : opDates)
         {