Changeset 1737

Timestamp:

Nov 16, 2012, 4:19:51 PM (9 years ago)

Author:

olle

Message:

Fixes #428. Refs #420. Refs #426. Sample count report and consent count report updated to show a table column with latest item dates for each site.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

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

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

@@ -350 +350 @@
       headerText += latestDate.getDate();
     }   
-    headerRow.appendChild(getTableCellElement(headerText, 'reportheader', (numCols+4)));
+    headerRow.appendChild(getTableCellElement(headerText, 'reportheader', (numCols+5)));
     
     // Sub headers
@@ -356 +356 @@
     if (viewType != 'YEAR')
     {
-      subHeaderRowYear.appendChild(getTableCellElement('', 'reportsubheader', 2));
+      subHeaderRowYear.appendChild(getTableCellElement('', 'reportsubheader', 3));
       addYearSubHeaders(periodStartDate, endDate, subHeaderRowYear, viewType);      
       subHeaderRowYear.appendChild(getTableCellElement('', 'reportsubheader', 2));
@@ -364 +364 @@
     var siteHeader = getTableCellElement('Site', 'reportsubheader');      
     var startDateHeader = getTableCellElement('Start date','reportsubheader');
+    var latestDateHeader = getTableCellElement('Latest date','reportsubheader');
     columnHeaderRow.appendChild(siteHeader);
     columnHeaderRow.appendChild(startDateHeader); 
+    columnHeaderRow.appendChild(latestDateHeader);  
     
     if (viewType == 'MONTH') addMonthColumnHeaders(columnHeaderRow, periodStartDate);
@@ -387 +389 @@
     var sitesCombinedRow = document.createElement('tr');
     sitesCombinedRow.appendChild(getTableCellElement('Sites combined', 'colsummary'));
-    sitesCombinedRow.appendChild(getTableCellElement('', 'colsummary'));
+    sitesCombinedRow.appendChild(getTableCellElement('', 'colsummary', 2));
     // Get combined numbers for all sites for each period
     var statistics = report.statistics;
@@ -452 +454 @@
     var numDecimals = 0;
     var headerText = '# Consent forms of different types for cases and blood samples';
-    headerRow.appendChild(getTableCellElement(headerText, 'reportheader', (numCols+3)));
+    headerRow.appendChild(getTableCellElement(headerText, 'reportheader', (numCols+4)));
     
     // Subheader    
     subHeaderRow.appendChild(getTableCellElement('', 'reportsubheader'));
-    subHeaderRow.appendChild(getTableCellElement('', 'reportsubheader'));
+    subHeaderRow.appendChild(getTableCellElement('', 'reportsubheader', 2));
     
     //subHeaderRow.appendChild(getTableCellElement('Yes', 'reportsubheader'));
@@ -474 +476 @@
     var siteHeader = getTableCellElement('Site', 'reportsubheader');      
     var startDateHeader = getTableCellElement('Start date','reportsubheader');
+    var latestDateHeader = getTableCellElement('Latest date','reportsubheader');
     columnHeaderRow.appendChild(siteHeader);
     columnHeaderRow.appendChild(startDateHeader); 
+    columnHeaderRow.appendChild(latestDateHeader);  
     
     //columnHeaderRow.appendChild(getTableCellElement('Yes', 'reportsubheader'));
@@ -501 +505 @@
     var sitesCombinedRow = document.createElement('tr');
     sitesCombinedRow.appendChild(getTableCellElement('Sites combined', 'colsummary'));
-    sitesCombinedRow.appendChild(getTableCellElement('', 'colsummary'));
+    sitesCombinedRow.appendChild(getTableCellElement('', 'colsummary', 2));
     // Get combined numbers for all sites for each period
     var sumKey = 'sumKey';
@@ -630 +634 @@
       
       var siteData = statistics[namePrefix];      
+      var siteLatestDate = siteData['latestDateKey'];
+      var siteLatestDateYear = siteLatestDate.substr(0,4);
+      var siteLatestDateMonth = siteLatestDate.substr(4,2);
+      var siteLatestDateDate = siteLatestDate.substr(6,2);
+      var siteLatestDateStr = siteLatestDateYear + '-' + siteLatestDateMonth + '-' + siteLatestDateDate;
       var tableRow = document.createElement('tr');
       var tableCol = getTableCellElement(siteName, 'rowtitle');
       tableRow.appendChild(tableCol);
       tableRow.appendChild(getTableCellElement(year+'-'+(month)+'-'+date, 'reportdata'));
+      tableRow.appendChild(getTableCellElement(siteLatestDateStr, 'reportdata'));
       //var currentDate = new Date(periodStartDate.getFullYear(), periodStartDate.getMonth(), periodStartDate.getDate());     
       var sumKey = 'sumKey';
@@ -899 +909 @@
       var siteStartDate = new Date(year, month-1, date);
       
-      var siteData = statistics[namePrefix];      
+      var siteData = statistics[namePrefix];
+      var siteLatestDate = siteData['latestDateKey'];
+      var siteLatestDateYear = siteLatestDate.substr(0,4);
+      var siteLatestDateMonth = siteLatestDate.substr(4,2);
+      var siteLatestDateDate = siteLatestDate.substr(6,2);
+      var siteLatestDateStr = siteLatestDateYear + '-' + siteLatestDateMonth + '-' + siteLatestDateDate;
       var tableRow = document.createElement('tr');
       var tableCol = getTableCellElement(siteName, 'rowtitle');
       tableRow.appendChild(tableCol);
       tableRow.appendChild(getTableCellElement(year+'-'+(month)+'-'+date, 'reportdata'));
+      tableRow.appendChild(getTableCellElement(siteLatestDateStr, 'reportdata'));
       var currentDate = new Date(periodStartDate.getFullYear(), periodStartDate.getMonth(), periodStartDate.getDate());     
       var columnCounter = 0;

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

@@ -216 +216 @@
     String sumKey = "sumKey";
     String totalKey = "totalKey";
+    String latestDateKey = "latestDateKey";
     String noDateKey = "noDate";
     String duplicateKey = "duplicateKey";
@@ -251 +252 @@
     HashMap<String, Set<Date>>patientDateSetHashMap = new HashMap<String, Set<Date>>();
     JSONObject jsonPatientnamePatientid = new JSONObject();
+    // Create HashMap to keep track of latest consent date for each site
+    HashMap<String, Date> sitePrefixDateHashMap = new HashMap<String, Date>();
     while (sampleIterator.hasNext())
     {
@@ -335 +338 @@
             key = otherKey;
           }
+
+          // Keep track of latest consent date for site
+          if (consentDate != null)
+          {
+            Date siteLatestDate = sitePrefixDateHashMap.get(site.getPrefix());
+            if (siteLatestDate == null || siteLatestDate.before(consentDate))
+            {
+              sitePrefixDateHashMap.put(site.getPrefix(), consentDate);
+            }
+          }
         }
         // Note that items with duplicate == false include missing consent items
@@ -354 +367 @@
         }
       }
+    }
+    // Add latest consent date for site to site JSON object
+    DateToStringConverter date2StringConverter = Reggie.CONVERTER_DATE_TO_STRING;
+    for (Site s: Site.getAllSites())
+    {
+        JSONObject jsonSite = (JSONObject) jsonStatistics.get(s.getPrefix());
+        if (jsonSite == null)
+        {
+          jsonSite = new JSONObject();
+          jsonStatistics.put(s.getPrefix(), jsonSite);
+        }
+        Date siteLatestDate = sitePrefixDateHashMap.get(s.getPrefix());
+        jsonSite.put(latestDateKey, date2StringConverter.convert(siteLatestDate));
     }
     // Create JSONObject (patient, dates) for patients with multiple dates
@@ -534 +560 @@
     String latestDateKey = "latestDateKey";
     jsonStatistics.put(sitesCombinedKey, jsonSitesCombined);
+    // Create HashMap to keep track of latest sample date for each site
+    HashMap<String, Date> sitePrefixDateHashMap = new HashMap<String, Date>();
     while (sampleIterator.hasNext())
     {
@@ -578 +606 @@
             }
           }
+
+          // Keep track of latest sample date for site
+          Date siteLatestDate = sitePrefixDateHashMap.get(site.getPrefix());
+          if (siteLatestDate == null || siteLatestDate.before(creationDate))
+          {
+            sitePrefixDateHashMap.put(site.getPrefix(), creationDate);
+          }
         }
         else
@@ -592 +627 @@
       }
     }
+    // Add latest sample date for site to site JSON object
+    DateToStringConverter date2StringConverter = Reggie.CONVERTER_DATE_TO_STRING;
+    for (Site s: Site.getAllSites())
+    {
+        JSONObject jsonSite = (JSONObject) jsonStatistics.get(s.getPrefix());
+        if (jsonSite == null)
+        {
+          jsonSite = new JSONObject();
+          jsonStatistics.put(s.getPrefix(), jsonSite);
+        }
+        Date siteLatestDate = sitePrefixDateHashMap.get(s.getPrefix());
+        jsonSite.put(latestDateKey, date2StringConverter.convert(siteLatestDate));
+    }
     // Add latest date for further transfer to other JSON object
-    DateToStringConverter date2StringConverter = Reggie.CONVERTER_DATE_TO_STRING;
     jsonStatistics.put(latestDateKey, date2StringConverter.convert(latestDate));
     return jsonStatistics;