Changeset 1729

Timestamp:

Oct 23, 2012, 12:31:20 PM (11 years ago)

Author:

olle

Message:

Fixes #420. The sample count report is updated to rename column "Grand total" to "Sum", and add a new column "Total" to the right of the latter with data regardless od creation date.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

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

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

@@ -179 +179 @@
     if (unknownCreation == null) unknownCreation = 0;
     summaryList.appendChild(getListElement(unknownSite + ' specimens registered to unknown sites.'));
-    summaryList.appendChild(getListElement(unknownCreation + ' specimens without creation date.'));
+    summaryList.appendChild(getListElement(unknownCreation + ' specimens without creation date. These are included in the \'Total\' column.'));
     cellElement.appendChild(summaryList);
     Main.show('gorestart');   
@@ -310 +310 @@
       headerText += latestDate.getDate();
     }   
-    headerRow.appendChild(getTableCellElement(headerText, 'reportheader', (numCols+3)));
+    headerRow.appendChild(getTableCellElement(headerText, 'reportheader', (numCols+4)));
     
     // Sub headers
@@ -333 +333 @@
     
     
-    columnHeaderRow.appendChild(getTableCellElement('Grand\ntotal', 'reportsubheader'));
+    columnHeaderRow.appendChild(getTableCellElement('Sum', 'reportsubheader'));
+    columnHeaderRow.appendChild(getTableCellElement('Total', 'reportsubheader'));
 
     // Build table      
@@ -347 +348 @@
     sitesCombinedRow.appendChild(getTableCellElement('Sites combined', 'colsummary'));
     sitesCombinedRow.appendChild(getTableCellElement('', 'colsummary'));
-    var gt = 0;
     for (key in sitesCombined)
     {
+      // Add entry with sample sum for site for selected time period
       sitesCombinedRow.appendChild(getTableCellElement(sitesCombined[key],'colsummary'));
-      if (sitesCombined[key] != '') gt += sitesCombined[key];
-    }
-    sitesCombinedRow.appendChild(getTableCellElement(gt, 'colsummary'));
+    }
+    // Get total number of samples for site for the selected time period
+    var statistics = report.statistics;
+    var sum = statistics.sumKey;
+    // Add entry with total number of samples for site for the selected time period
+    sitesCombinedRow.appendChild(getTableCellElement(sum, 'colsummary'));
+    // Get total number of samples for all sites, regardless of creation date
+    var total = statistics.totalKey;
+    // Add entry with total number of samples for all sites, regardless of creation date
+    sitesCombinedRow.appendChild(getTableCellElement(total, 'colsummary'));
     reportTable.appendChild(sitesCombinedRow);  
 
@@ -526 +534 @@
       tableRow.appendChild(tableCol);
       tableRow.appendChild(getTableCellElement(year+'-'+(month)+'-'+date, 'reportdata'));
-      var grandTotal = 0;
       var currentDate = new Date(periodStartDate.getFullYear(), periodStartDate.getMonth(), periodStartDate.getDate());     
       var columnCounter = 0;
@@ -542 +549 @@
             if (siteData[keyIndex] != null) data = siteData[keyIndex];
           }
-          grandTotal += data;         
           if ( (currentDate.getFullYear() < siteStartDate.getFullYear()))
           {
@@ -561 +567 @@
             if (siteData[keyIndex] != null) data = siteData[keyIndex];            
           }         
-          grandTotal += data;
           if ( (currentDate.getFullYear() <= siteStartDate.getFullYear()) && qIndex<startQuarter)
           {
@@ -580 +585 @@
             if (siteData[keyIndex] != null) data = siteData[keyIndex];
           }
-          grandTotal += data;         
           if (currentDate.getFullYear() <= siteStartDate.getFullYear() && (monthIndex-1) < siteStartDate.getMonth())
           {
@@ -600 +604 @@
             if (siteData[keyIndex] != null) data = siteData[keyIndex];
           }
-          grandTotal += data;         
           if (currentDate.getFullYear() <= siteStartDate.getFullYear() && getISOWeekNumber(currentDate) < getISOWeekNumber(siteStartDate))
           {
@@ -614 +617 @@
         columnCounter++;        
       } while (columnCounter < numCols)
-      tableRow.appendChild(getTableCellElement(grandTotal, 'rowsummary'));
+      // Add column with sample sum for site for the selected time period
+      var siteSum = 0;
+      if (siteData != null)
+      {
+        var sumSiteKey = 'sumSiteKey';
+        if (siteData[sumSiteKey] != null)
+        {
+          siteSum = siteData[sumSiteKey];
+        }
+      }
+      tableRow.appendChild(getTableCellElement(siteSum, 'rowsummary'));
+      // Add column with total number of samples for site, regardless of creation date
+      var siteTotal = 0;
+      if (siteData != null)
+      {
+        var totalSiteKey = 'totalSiteKey';
+        if (siteData[totalSiteKey] != null)
+        {
+          siteTotal = siteData[totalSiteKey];
+        }
+      }
+      tableRow.appendChild(getTableCellElement(siteTotal, 'rowsummary'));
       reportTable.appendChild(tableRow);
     }

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

@@ -80 +80 @@
         Date endDate = Reggie.CONVERTER_STRING_TO_DATE.convert(endDateParameter);
         
+        if (startDate == null)
+        {
+          // Get the when the first site started
+          for (Site s : Site.getAllSites())
+          {
+            Date siteDate = Reggie.CONVERTER_STRING_TO_DATE.convert(s.getStartDate().replaceAll("-", ""));
+            if (siteDate != null && (startDate == null || startDate.after(siteDate))) 
+            {
+              startDate = siteDate;           
+            }
+          }
+        }
+        if (endDate == null) 
+        {
+          // Get the date for today
+          endDate = new Date();
+        }
+
         String viewType = null;
         String viewTypeParameter = Values.getString(req.getParameter("vtype"), null);
@@ -86 +104 @@
           viewType = viewTypeParameter;
         }
+        else
+        {
+          viewType = getViewType(startDate, endDate);
+        }
 
         //List<Restriction> restrictions = new ArrayList<Restriction>();
@@ -91 +113 @@
         sampleQuery.joinPermanent(Hql.innerJoin(null, "creationEvent", "ce", true));
         Subtype.SPECIMEN.addFilter(dc, sampleQuery);
-        
-        if (endDate != null) 
-        {
-          sampleQuery.restrict(Restrictions.lteq(Hql.property("ce", "eventDate"), Expressions.parameter("endDate", endDate)));
-        }
-        else 
-        {
-          endDate = new Date();
-        }
-        if (startDate != null)
-        {
-          sampleQuery.restrict(Restrictions.gteq(Hql.property("ce", "eventDate"), Expressions.parameter("startDate", startDate)));
-        }
-        else
-        {
-          // Get the when the first site started
-          for (Site s : Site.getAllSites())
-          {
-            Date siteDate = Reggie.CONVERTER_STRING_TO_DATE.convert(s.getStartDate().replaceAll("-", ""));
-            if (siteDate != null && (startDate == null || startDate.after(siteDate))) 
-            {
-              startDate = siteDate;           
-            }
-          }
-        }
         sampleQuery.setIncludes(Reggie.INCLUDE_IN_CURRENT_PROJECT);
         sampleQuery.order(Orders.asc(Hql.property("name")));
@@ -126 +123 @@
         JSONObject jsonSitesCombined = new JSONObject();
         JSONObject jsonStatistics = new JSONObject();
+        String sumSiteKey = "sumSiteKey";
+        String sumKey = "sumKey";
+        String totalSiteKey = "totalSiteKey";
+        String totalKey = "totalKey";
         while (sampleIterator.hasNext())
         {
@@ -141 +142 @@
             jsonStatistics.put(key, unknownSite);
           }
-          if (creationDate != null)
+          else
           {
-            if (viewType == null) viewType = getViewType(startDate, endDate);
-                        
             // Get site info            
             JSONObject jsonSite = (JSONObject)jsonStatistics.get(site.getPrefix());
@@ -153 +152 @@
             }
             
-            // Increase the counter for current period on the site
-            String currentPeriod = getCurrentPeriod(creationDate, viewType);                        
-            Integer periodCounter = (Integer)jsonSite.get(currentPeriod);
-            if (periodCounter == null) periodCounter = 0;
-            Integer combinedCounter = (Integer)jsonSitesCombined.get(currentPeriod);
-            if (combinedCounter == null) combinedCounter = 0;
-            periodCounter++;
-            combinedCounter++;
-            jsonSite.put(currentPeriod, periodCounter);
-            jsonSitesCombined.put(currentPeriod, combinedCounter);
-            
-            // Find out if current creation-date is the latest so far.
-            if (latestDate == null || latestDate.before(creationDate)) 
-            {
-              latestDate = creationDate;
-            }
-          }
-          else
-          {
-            String noDateKey = "noDate";
-            Integer noDateCounter = (Integer)jsonStatistics.get(noDateKey);
-            if (noDateCounter == null) noDateCounter = 0;
-            noDateCounter++;
-            jsonStatistics.put(noDateKey, noDateCounter);
+            if (creationDate != null)
+            {
+              if ((creationDate.after(startDate) || creationDate.equals(startDate)) &&
+                  (creationDate.before(endDate) || creationDate.equals(endDate)))
+              {
+                // Increase the counter for current period on the site
+                String currentPeriod = getCurrentPeriod(creationDate, viewType);                        
+                Integer periodCounter = (Integer)jsonSite.get(currentPeriod);
+                if (periodCounter == null) periodCounter = 0;
+                Integer combinedCounter = (Integer)jsonSitesCombined.get(currentPeriod);
+                if (combinedCounter == null) combinedCounter = 0;
+                periodCounter++;
+                combinedCounter++;
+                jsonSite.put(currentPeriod, periodCounter);
+                jsonSitesCombined.put(currentPeriod, combinedCounter);
+                
+                // Increase the counter for samples for the site for the selected time period
+                Integer sumSiteCounter = (Integer)jsonSite.get(sumSiteKey);
+                if (sumSiteCounter == null)
+                {
+                  sumSiteCounter = 0;
+                }
+                sumSiteCounter++;
+                jsonSite.put(sumSiteKey, sumSiteCounter);
+
+                // Increase the counter for samples for all sites for the selected time period
+                Integer sumCounter = (Integer) jsonStatistics.get(sumKey);
+                if (sumCounter == null)
+                {
+                  sumCounter = 0;
+                }
+                sumCounter++;
+                jsonStatistics.put(sumKey, sumCounter);
+
+                // Find out if current creation-date is the latest so far.
+                if (latestDate == null || latestDate.before(creationDate)) 
+                {
+                  latestDate = creationDate;
+                }
+              }
+            }
+            else
+            {
+              String noDateKey = "noDate";
+              Integer noDateCounter = (Integer)jsonStatistics.get(noDateKey);
+              if (noDateCounter == null) noDateCounter = 0;
+              noDateCounter++;
+              jsonStatistics.put(noDateKey, noDateCounter);
+            }
+
+            // Get total number of samples per site, regardless of creation date
+            // Increase the counter for total samples for the site
+            Integer totalSiteCounter = (Integer)jsonSite.get(totalSiteKey);
+            if (totalSiteCounter == null)
+            {
+              totalSiteCounter = 0;
+            }
+            totalSiteCounter++;
+            jsonSite.put(totalSiteKey, totalSiteCounter);
+
+            // Increase the counter for total samples for all sites
+            Integer totalCounter = (Integer) jsonStatistics.get(totalKey);
+            if (totalCounter == null)
+            {
+              totalCounter = 0;
+            }
+            totalCounter++;
+            jsonStatistics.put(totalKey, totalCounter);
           }
         }
-
         jsonReport.put("statistics", jsonStatistics);       
         if (viewType == null) viewType = getViewType(startDate, endDate);