Changeset 1495

Timestamp:

Jan 9, 2012, 12:48:14 PM (12 years ago)

Author:

Martin Svensson

Message:

References #339 Removed debug-print and corrected a couple of miscalculations when generating estimating the number of columns.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

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

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

@@ -27 +27 @@
   <script language="JavaScript">
   var currentStep = 1;
-  var debug = true;
+  var debug = false;
   var sitesCombined;
   var numCols;
@@ -166 +166 @@
       reportTable = messageTable;     
     }
-    cellElement.appendChild(reportTable);   
+    setInnerHTML('reportcell', '');
+    cellElement.appendChild(reportTable);
     Main.show('gorestart');   
   }
@@ -173 +174 @@
   {
     var reportTable = getReportTable();
-    var sdString = report.startDate;
-    var edString = report.endDate;
-    var ldString = report.latestDate;   
+    var sdString = report.beginDate;
+    var edString = report.endDate;    
     var startDate = new Date();
     startDate.setYear(sdString.substr(0,4));
@@ -184 +184 @@
     endDate.setMonth(edString.substr(4,2)-1);
     endDate.setDate(edString.substr(6));
-    var latestDate = new Date();
-    latestDate.setYear(ldString.substr(0,4));
-    latestDate.setMonth(ldString.substr(4,2)-1);
-    latestDate.setDate(ldString.substr(6));
     var viewType = report.viewType;   
   
@@ -215 +211 @@
     else if (viewType == 'QUARTER')
     {
-      numCols = (endDate.getFullYear()-startDate.getFullYear())*4 + Math.ceil((endDate.getMonth()-startDate.getMonth())/3);
+      numCols = (endDate.getFullYear()-startDate.getFullYear())*4 + Math.ceil((endDate.getMonth()-startDate.getMonth())/3)+1;
       headerText += 'quarters';
     }
@@ -247 +243 @@
     {
       subHeaderRowYear.appendChild(getTableCellElement('', 'reportsubheader', 2));
-      addYearSubHeaders(startDate, endDate, latestDate, subHeaderRowYear, viewType);      
+      addYearSubHeaders(startDate, endDate, subHeaderRowYear, viewType);      
       subHeaderRowYear.appendChild(getTableCellElement('', 'reportsubheader'));
     }   
@@ -260 +256 @@
     else if (viewType == 'WEEK') addWeekColumnHeaders(columnHeaderRow, startDate);
     else if (viewType == 'QUARTER') addQuarterColumnHeaders(columnHeaderRow, startDate);
-    else if (viewType == 'YEAR') addYearSubHeaders(startDate, endDate, latestDate, columnHeaderRow, viewType);
+    else if (viewType == 'YEAR') addYearSubHeaders(startDate, endDate, columnHeaderRow, viewType);
     
     
@@ -281 +277 @@
     {
       sitesCombinedRow.appendChild(getTableCellElement(sitesCombined[key],'colsummary'));
-      gt += sitesCombined[key];
+      if (sitesCombined[key] != '') gt += sitesCombined[key];
     }
     sitesCombinedRow.appendChild(getTableCellElement(gt, 'colsummary'));
@@ -328 +324 @@
   }
   
-  function addYearSubHeaders(startDate, endDate, latestDate, subHeaderRowYear, vt)
+  function addYearSubHeaders(startDate, endDate, subHeaderRowYear, vt)
   {   
     var currentYear = startDate.getFullYear();  
@@ -339 +335 @@
       if (vt == "MONTH")
       {
-        if (currentYear == startDate.getFullYear()) 
-          colspan =  (12-parseInt(startDate.getMonth()+1)+1);
+        if (currentYear == startDate.getFullYear())
+        {
+          colspan =  11-parseInt(startDate.getMonth())+1;
+          if (endDate.getFullYear() == currentYear)
+          {
+            colspan = colspan - (11-parseInt(endDate.getMonth()));
+          }
+        }
         else if (currentYear == endDate.getFullYear()) 
           colspan = parseInt(endDate.getMonth()+1);
@@ -406 +408 @@
   function addDataRowsToTable(report, reportTable)
   {
-    var fdString = report.startDate;
+    var fdString = report.beginDate;
     var ldString = report.endDate;
     var startDate = new Date();
@@ -469 +471 @@
           {
             data = '';
-            sitesCombined[keyIndex] = 0;
-          }
-          else if (sitesCombined[keyIndex] == null) sitesCombined[keyIndex] = data;
+            if (sitesCombined[keyIndex] == null) sitesCombined[keyIndex] = data;
+          }
+          else if (sitesCombined[keyIndex] == null || sitesCombined[keyIndex] == '') sitesCombined[keyIndex] = data;
           else sitesCombined[keyIndex] += data;
           currentDate.setMonth(currentDate.getMonth()+3);         
@@ -487 +489 @@
           if (currentDate.getFullYear() <= siteStartDate.getFullYear() && (monthIndex-1) < siteStartDate.getMonth())
           {
-            data = '';            
-          }
-          else if (sitesCombined[keyIndex] == null) sitesCombined[keyIndex] = data;
+            data = '';
+            if (sitesCombined[keyIndex] == null) sitesCombined[keyIndex] = data;
+          }
+          else if (sitesCombined[keyIndex] == null || sitesCombined[keyIndex] == '') sitesCombined[keyIndex] = data;
           else sitesCombined[keyIndex] += data;
+          
           
           currentDate.setMonth(currentDate.getMonth()+1);
@@ -506 +510 @@
           {
             data = '';
-          }
-          else if (sitesCombined[keyIndex] == null) sitesCombined[keyIndex] = data;
+            if (sitesCombined[keyIndex] == null) sitesCombined[keyIndex] = data;
+          }
+          else if (sitesCombined[keyIndex] == null || sitesCombined[keyIndex] == '') sitesCombined[keyIndex] = data;
           else sitesCombined[keyIndex] += data;
           currentDate.setDate(currentDate.getDate()+7);
@@ -515 +520 @@
         columnCounter++;        
       }while (columnCounter< numCols)     
-      tableRow.appendChild(getTableCellElement(grandTotal, 'rowsummary'));
+      tableRow.appendChild(getTableCellElement(parseInt(grandTotal), 'rowsummary'));
       reportTable.appendChild(tableRow);
     }
@@ -646 +651 @@
         <tr>
           <td id="reportcell" class="stepfields">
+            <i>Generating report...</i>
           </td>
         </tr>

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

@@ -178 +178 @@
         if (jsonReport.size() > 0)
         {
+          if (viewType == null) viewType = getViewType(startDate, endDate);
           jsonReport.put("viewType", viewType);
-          jsonReport.put("startDate", date2StringConverter.convert(startDate));
+          jsonReport.put("beginDate", date2StringConverter.convert(startDate));
           jsonReport.put("endDate", date2StringConverter.convert(endDate));
-          jsonReport.put("latestDate", date2StringConverter.convert(latestDate));
           json.put("report", jsonReport);
         }
@@ -251 +251 @@
     int currentQuarter = limitQuarterView.get(Calendar.MONTH)/3;
     limitQuarterView.add(Calendar.MONTH, (3*currentQuarter)-limitQuarterView.get(Calendar.MONTH));
-    
-    System.out.println(limitWeekView.getTime());        
+                
     if (limitWeekView.after(endCal)) viewType = weekView;
     else if (limitMonthView.after(endCal)) viewType = monthView;