Changeset 1721

Timestamp:

Sep 24, 2012, 1:16:11 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #416: Check consent before exporting "monthly operation list"

This is now implemented as an extra column in the exported list. The HTML preview parses the export and automatically display a warning icon to cases that doesn't have an explicit 'YES'.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/export_monthly_oplist.jsp (modified) (5 diffs)
• resources/images/warning_small.png (added)
• src/net/sf/basedb/reggie/servlet/ExportServlet.java (modified) (5 diffs)

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

@@ -71 +71 @@
     else
     {
-      var numLines = request.responseText.split('\n').length - 1;
+      var allLines = request.responseText.split('\n');
+      var numLines = allLines.length - 1;
+      
+      // 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++)
+      {
+        var line = allLines[i];
+        var lastColIdx = line.lastIndexOf('\t');
+        var lastCol = line.substr(lastColIdx+1);
+        
+        if (lastCol != 'YES')
+        {
+          if (lastCol == 'MISSING')
+          {
+            numMissingConsent++;
+          }
+          else
+          {
+            numNoConsent++;
+          }
+          allLines[i] = '<span class="consent-warning">'+line+'</span>';
+        }
+      }
+      
+      if (numMissingConsent > 0 || numNoConsent > 0)
+      {
+        var previewWarning = document.getElementById('previewWarning');
+        var warning = '<img src="images/warning.png" alt="!">';
+        warning += ' Found ' + (numNoConsent+numMissingConsent) + ' case(s) with denied or missing consent!';
+        previewWarning.innerHTML = warning;
+      }
+      
       previewTitle.innerHTML = 'Operation dates - ' + frm.time[frm.time.selectedIndex].text + ' (' + numLines + ')';
-      previewList.innerHTML = request.responseText;
+      previewList.innerHTML = allLines.join('\n');
       Main.show('previewWrapper');
     }
@@ -98 +131 @@
   bottom: 1em;
   left: 20px;
-  width: 850px;
+  width: 950px;
   overflow: visible;
 }
@@ -109 +142 @@
   width: 950px;
   overflow: auto;
-  
   white-space: pre; 
   font-family: monospace;
@@ -121 +153 @@
 {
   font-weight: bold;
+}
+
+.consent-warning
+{
+  font-weight: bold;
+  color: #A00000;
+  background-color: #F8F8E8;
+}
+
+.consent-warning:after
+{
+  content: url('images/warning_small.png');
+  vertical-align: middle;
 }
 
@@ -212 +257 @@
   
   <div id="previewWrapper" style="display: none;">
-    <div id="previewTitle">Preview</div>
+    <div>
+      <span id="previewTitle">Preview</span>
+      <span id="previewWarning"></span>
+    </div>
     <div id="previewList"></div>
   </div>

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

@@ -133 +133 @@
                 // Get the personal number of the patient
                 String pnr = (String)Annotationtype.PERSONAL_NUMBER.getAnnotationValue(dc, manager, patient);
+
                 if (pnr != null)
                 {
@@ -138 +139 @@
                   Site site = Site.findByCaseName(s.getName());
                   String laterality = (String)Annotationtype.LATERALITY.getAnnotationValue(dc, manager, theCase);
+                  String consent = (String)Annotationtype.CONSENT.getAnnotationValue(dc, manager, theCase);
                   String opDate = dateFormat.format(s.getCreationEvent().getEventDate());
                   String subtype = exportSubtype ? s.getItemSubtype().getName() : null;
                   String caseName = caseNamePattern.matcher(s.getName()).replaceFirst("");
-                  opDates.add(new PersonalOpDate(pnr, opDate, site, laterality, subtype, caseName));
+                  opDates.add(new PersonalOpDate(pnr, opDate, site, laterality, subtype, caseName, consent));
                 }
               }
@@ -185 +187 @@
     private final String subtype;
     private final String caseName;
-    
-    PersonalOpDate(String pnr, String opDate, Site site, String laterality, String subtype, String caseName)
+    private final String consent;
+    
+    PersonalOpDate(String pnr, String opDate, Site site, String laterality, String subtype, String caseName, String consent)
     {
       this.pnr = pnr;
@@ -194 +197 @@
       this.subtype = subtype;
       this.caseName = caseName;
+      this.consent = consent;
     }
     
@@ -202 +206 @@
           (laterality == null ? "" : laterality) + "\t" + 
           site.getName() + 
-          (subtype==null ? "" : "\t" + subtype);
+          (subtype==null ? "" : "\t" + subtype) + "\t" +
+          (consent == null ? "MISSING" : consent.toUpperCase());
     }