Changeset 1739

Timestamp:

Nov 20, 2012, 4:20:29 PM (9 years ago)

Author:

olle

Message:

Refs #421. JSP script samplereportgenerator.jsp in reggie/resources/ updated in function createSampleCountReport(report) to calculate the number of columns correctly for quarterly view, when the start and end dates lie in the same year (this could never happen in the original version, where quarterly view was used only for time periods between 13 months and 3 years). The original calculation assumed that the start and end years where different, and therefore resulted in 4 extra quarter columns.

File:

• extensions/net.sf.basedb.reggie/trunk/resources/samplereportgenerator.jsp (modified) (1 diff)

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

@@ -305 +305 @@
     else if (viewType == 'QUARTER')
     {
-      //First year
+      // First year (from start quarter to end of year)
       numCols = 4 - Math.floor(periodStartDate.getMonth()/3);
+      // Last year (from start of year to end quarter) 
       numCols += Math.floor(endDate.getMonth()/3)+1;
+      // If first and last year is the same, subtract 4 quarters
+      if (endDate.getFullYear() - periodStartDate.getFullYear() == 0)
+      {
+        numCols -= 4;
+      }
+      // Full years between start and end dates
       if((endDate.getFullYear() - periodStartDate.getFullYear()) > 1)
       {