Changeset 1784

Timestamp:

Dec 13, 2012, 9:53:56 AM (10 years ago)

Author:

olle

Message:

Fixes #452. Consent count report updated to not count missing consents as consents with unknown date.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/samplereportgenerator.jsp (modified) (7 diffs)
• src/net/sf/basedb/reggie/servlet/SampleReportServlet.java (modified) (4 diffs)

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

@@ -33 +33 @@
   var numCols;
   var unknownSite = 0;
-  var unknownCreation;
+  var unknownCreation = 0;
+  var numMissing = 0;
   var numPatientsNoSamples = 0;
   
@@ -337 +338 @@
       summaryList.appendChild(getListElement(unknownSite + ' consents registered to unknown sites.'));
       summaryList.appendChild(getListElement(unknownCreation + ' consents without known date. These are included in the \'Total\' column.'));
+      summaryList.appendChild(getListElement(numMissing + ' missing consents for cases and blood samples. These are NOT included in the \'Total\' column.'));
       summaryList.appendChild(getListElement(numDuplicates + ' duplicates ignored.'));
 
@@ -637 +639 @@
     var numCols = 4;
     var numDecimals = 0;
-    var headerText = '# Consent forms of different types for cases and blood samples, unknown consent date';
+    var headerText = '# Consent forms of different types for cases and blood samples with unknown consent date, as well as items with missing consents';
     headerRow.appendChild(getTableCellElement(headerText, 'reportheader', (numCols+5)));
     
@@ -677 +679 @@
     sitesCombinedRow.appendChild(getTableCellElement('', 'colsummary', 2));
     // Get combined numbers for all sites
+    var noDateOrMissingKey = 'noDateOrMissing';
     var sumKey = 'sumKey';
     var statistics = report.statistics;
@@ -682 +685 @@
     if (sitesCombined != null)
     {
-      data = getJSONDataWithPercent(sitesCombined, 'yesNoDate', sumKey, numDecimals);
-      sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
-      data = getJSONDataWithPercent(sitesCombined, 'noNoDate', sumKey, numDecimals);
-      sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
-      data = getJSONDataWithPercent(sitesCombined, 'notAskedNoDate', sumKey, numDecimals);
-      sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
-      data = getJSONDataWithPercent(sitesCombined, 'missing', sumKey, numDecimals);
-      sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
-    }
-    // Add entry with total number of consents with chosen restrictions
-    var noDateKey = 'noDate';
-    data = getJSONData(sitesCombined, noDateKey, 0);
-    sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
-    // Add entry with total number of consents, regardless of restrictions
-    var totalKey = 'totalKey';
-    data = getJSONData(sitesCombined, totalKey, 0);
-    sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
+      data = getJSONDataWithPercent(sitesCombined, 'yesNoDate', noDateOrMissingKey, numDecimals);
+      sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
+      data = getJSONDataWithPercent(sitesCombined, 'noNoDate', noDateOrMissingKey, numDecimals);
+      sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
+      data = getJSONDataWithPercent(sitesCombined, 'notAskedNoDate', noDateOrMissingKey, numDecimals);
+      sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
+      data = getJSONDataWithPercent(sitesCombined, 'missing', noDateOrMissingKey, numDecimals);
+      sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
+      // Add entry with total number of consents with chosen restrictions
+      var noDateOrMissingKey = 'noDateOrMissing';
+      data = getJSONData(sitesCombined, noDateOrMissingKey, 0);
+      sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
+      // Add entry with total number of consents, regardless of restrictions
+      var totalKey = 'totalKey';
+      data = getJSONData(sitesCombined, totalKey, 0);
+      sitesCombinedRow.appendChild(getTableCellElement(data, 'colsummary'));
+    }
     reportTable.appendChild(sitesCombinedRow);  
 
@@ -1198 +1201 @@
     unknownCreation = statistics.noDate;
     unknownSite = statistics.unknownSite;
+    numMissing = statistics.missing;
     var siteOrderList = report.siteOrderListKey;
     for (var siteOrderIndex in siteOrderList)
@@ -1216 +1220 @@
       tableRow.appendChild(getTableCellElement(siteStartDateStr, 'reportdata'));
       tableRow.appendChild(getTableCellElement(siteLatestDateStr, 'reportdata'));
-      var noDateKey = 'noDate';
+      var noDateOrMissingKey = 'noDateOrMissing';
       var sumKey = 'sumKey';
       var totalKey = 'totalKey';
       if (siteData != null)
       {
-        data = getJSONDataWithPercent(siteData, 'yesNoDate', sumKey, numDecimals);
-        tableRow.appendChild(getTableCellElement(data, 'reportdata'));
-        data = getJSONDataWithPercent(siteData, 'noNoDate', sumKey, numDecimals);
-        tableRow.appendChild(getTableCellElement(data, 'reportdata'));
-        data = getJSONDataWithPercent(siteData, 'notAskedNoDate', sumKey, numDecimals);
-        tableRow.appendChild(getTableCellElement(data, 'reportdata'));
-        data = getJSONDataWithPercent(siteData, 'missing', sumKey, numDecimals);
+        data = getJSONDataWithPercent(siteData, 'yesNoDate', noDateOrMissingKey, numDecimals);
+        tableRow.appendChild(getTableCellElement(data, 'reportdata'));
+        data = getJSONDataWithPercent(siteData, 'noNoDate', noDateOrMissingKey, numDecimals);
+        tableRow.appendChild(getTableCellElement(data, 'reportdata'));
+        data = getJSONDataWithPercent(siteData, 'notAskedNoDate', noDateOrMissingKey, numDecimals);
+        tableRow.appendChild(getTableCellElement(data, 'reportdata'));
+        data = getJSONDataWithPercent(siteData, 'missing', noDateOrMissingKey, numDecimals);
         tableRow.appendChild(getTableCellElement(data, 'reportdata'));
         // Add column with summed values for site
-        var siteSum = getJSONData(siteData, noDateKey, 0);
+        var siteSum = getJSONData(siteData, noDateOrMissingKey, 0);
         tableRow.appendChild(getTableCellElement(siteSum, 'rowsummary'));
       }

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

@@ -488 +488 @@
     String latestDateKey = "latestDateKey";
     String noDateKey = "noDate";
+    String noDateOrMissingKey = "noDateOrMissing";
     String duplicateKey = "duplicateKey";
     jsonStatistics.put(sitesCombinedKey, jsonSitesCombined);
@@ -502 +503 @@
     jsonStatistics = initializeJSONSiteData(jsonStatistics, missingKey);
     jsonStatistics = initializeJSONSiteData(jsonStatistics, noDateKey);
+    jsonStatistics = initializeJSONSiteData(jsonStatistics, noDateOrMissingKey);
     jsonStatistics = initializeJSONSiteData(jsonStatistics, sumKey);
     jsonStatistics = initializeJSONSiteData(jsonStatistics, totalKey);
@@ -516 +518 @@
     jsonSitesCombined.put(missingKey, 0);
     jsonSitesCombined.put(noDateKey, 0);
+    jsonSitesCombined.put(noDateOrMissingKey, 0);
     jsonSitesCombined.put(sumKey, 0);
     jsonSitesCombined.put(totalKey, 0);
     // Initialize other data to 0 for different keys
     jsonStatistics.put(noDateKey, 0);
+    jsonStatistics.put(missingKey, 0);
     jsonStatistics.put(duplicateKey, 0);
     Date latestDate = null;
@@ -651 +655 @@
             // Update consent counters
             jsonSite = updateJSONObjectCounter(jsonSite, key);
-            jsonSite = updateJSONObjectCounter(jsonSite, sumKey);
             jsonSitesCombined = updateJSONObjectCounter(jsonSitesCombined, key);
-            jsonSitesCombined = updateJSONObjectCounter(jsonSitesCombined, sumKey);
+            // Include all consents except missing in summed count
+            if (consent != null)
+            {
+              jsonSite = updateJSONObjectCounter(jsonSite, sumKey);
+              jsonSitesCombined = updateJSONObjectCounter(jsonSitesCombined, sumKey);
+            }
           }
           if (consentDate == null)
           {
-            // Include consents with unknown date 
-            jsonSite = updateJSONObjectCounter(jsonSite, noDateKey);
-            jsonSitesCombined = updateJSONObjectCounter(jsonSitesCombined, noDateKey);
-            jsonStatistics = updateJSONObjectCounter(jsonStatistics, noDateKey);
-          }
-          // Increase the counter for total consents for the site, regardless of creation date
-          jsonSite = updateJSONObjectCounter(jsonSite, totalKey);
-
-          // Increase the counter for total consents for all sites
-          jsonSitesCombined = updateJSONObjectCounter(jsonSitesCombined, totalKey);
+            // Include consents with unknown date for site, but not missing consents
+            if (consent != null)
+            {
+              jsonSite = updateJSONObjectCounter(jsonSite, noDateKey);
+              jsonSitesCombined = updateJSONObjectCounter(jsonSitesCombined, noDateKey);
+              jsonStatistics = updateJSONObjectCounter(jsonStatistics, noDateKey);
+            }
+            else
+            {
+              jsonStatistics = updateJSONObjectCounter(jsonStatistics, missingKey);
+            }
+            jsonSite = updateJSONObjectCounter(jsonSite, noDateOrMissingKey);
+            jsonSitesCombined = updateJSONObjectCounter(jsonSitesCombined, noDateOrMissingKey);
+            jsonStatistics = updateJSONObjectCounter(jsonStatistics, noDateOrMissingKey);
+          }
+          // Include all consents except missing in total count
+          if (consent != null)
+          {
+            // Increase the counter for total consents for the site, regardless of creation date
+            jsonSite = updateJSONObjectCounter(jsonSite, totalKey);
+
+            // Increase the counter for total consents for all sites
+            jsonSitesCombined = updateJSONObjectCounter(jsonSitesCombined, totalKey);
+          }
         }
         else