Changeset 1491

Timestamp:

Dec 2, 2011, 8:30:26 AM (11 years ago)

Author:

Martin Svensson

Message:

References #339 The generation of Week-view is now available.
The report needs to have some kind of limitation on the number of column so it not causes an overflow of the GUI.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/reggie.js (modified) (1 diff)
• resources/samplereportgenerator.jsp (modified) (10 diffs)
• src/net/sf/basedb/reggie/servlet/SampleReportServlet.java (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/reggie.js

@@ -177 +177 @@
   return fullTimeString;
 }
+
+function getWeekByDate(currentDate)
+{
+  var weeknum;  
+  var newYear = new Date(currentDate.getFullYear(),0,1);
+  var numdays = Math.ceil((currentDate.getTime() - newYear.getTime()) / (1000 * 60 * 60 * 24));
+  var day = newYear.getDay()-1;
+  day = day>=0 ? day : day+7;
+  var offset = day < 3 ? day : day-7;
+  
+  if ( (numdays+offset) > 0 )
+  {
+    weeknum = Math.ceil((numdays + offset) / 7);
+  }
+  else
+  {
+    // Current week belongs to the year before.
+    weeknum = getWeekByDate(new Date(currentDate.getFullYear()-1, 11, 31));
+  }
+      
+  // If the last day of the year is on a monday or thuesday. 
+  if (weeknum > 52)
+  {
+    var nYear = new Date(newYear.getFullYear()+1, 0, 1);
+    var nday = nYear.getDay()-1;
+    nday = nday >=0 ? nday : nday+7;
+    weeknum = nday < 4 ? 1 : 53;
+  }
+  
+    
+  
+  return weeknum;
+}

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

@@ -27 +27 @@
   <script language="JavaScript">
   var currentStep = 1;
-  var debug = false;
+  var debug = true;
+  var maxCols = 30;
   var sitesCombined;
   var numCols;
@@ -98 +99 @@
       {
         var numYears = latestDate.getFullYear() - firstDate.getFullYear();
-        numCols = (12*(numYears-1)) + (12-parseInt(fdString.substr(4,2)) + 1) + parseInt(ldString.substr(4,2));
+        numCols = (12*(numYears-1)) + (12-parseInt(firstDate.getMonth())) + parseInt(ldString.substr(4,2));               
       }
       else
-      {
-        
+      {       
+        var diffTime = latestDate.getTime() - firstDate.getTime();
+        var milliSecPerWeek = 1000*60*60*24*7;
+        numCols = Math.ceil(diffTime/milliSecPerWeek)+1;        
       }
       sitesCombined = Array(numCols);
@@ -131 +134 @@
       columnHeaderRow.appendChild(startDateHeader);     
       if (columnView == 'MONTH') addMonthColumnHeaders(columnHeaderRow, firstDate, latestDate);
-//      else addWeekColumnHeaders(columnHeaderRow, firstDate,latestDate);
+      else addWeekColumnHeaders(columnHeaderRow, firstDate,latestDate);
       columnHeaderRow.appendChild(getTableCellElement('Grand\ntotal', 'reportsubheader'));
 
@@ -148 +151 @@
       var gt = 0;
       for (key in sitesCombined)
-      {       
+      {
         sitesCombinedRow.appendChild(getTableCellElement(sitesCombined[key],'colsummary'));
         gt += sitesCombined[key];
@@ -162 +165 @@
   }
   
-  function addWeekcolumnHeaders(columnHeaderRow, firstDate, latestDate)
-  {
-    var currentDate = firstDate;
+  function addWeekColumnHeaders(columnHeaderRow, firstDate, latestDate)
+  {
+    var currentDate = firstDate;    
+    for (var i=0;i<numCols;i++)
+    {
+      var weekNum = getWeekByDate(currentDate);
+      var columnText = weekNum;
+      if (weekNum < 10) columnText = '0'+columnText;
+      columnHeaderRow.appendChild(getTableCellElement(columnText, 'reportsubheader'));
+      currentDate.setDate(currentDate.getDate()+7);
+    }
   }
   
@@ -217 +228 @@
           colspan = parseInt(latestDate.getMonth()+1);
         else
-          colspan = 12;
-        subHeaderRowYear.appendChild(getTableCellElement(currentYear, 'reportsubheader', colspan));
+          colspan = 12;       
       }
       else
-      {
-        
+      {       
+        if (currentYear == firstDate.getFullYear())
+        {
+          var startWeek = getWeekByDate(firstDate);
+          var lastDay = new Date(firstDate.getFullYear(), 11, 31);
+          var endWeek = getWeekByDate(lastDay);
+          if (endWeek == 1) endWeek = getWeekByDate(lastDay.setDate(lastDay.getDate()-7));
+          colspan = endWeek - startWeek +1;
+        }
+        else if (currentYear == latestDate.getFullYear())
+        {
+          var endWeek = getWeekByDate(latestDate);
+          colspan = endWeek;
+        }
+        else
+        {
+          var dateInLastWeek = new Date(currentYear, 11, 31);
+          var endWeek = getWeekByDate(dateInLastWeek);
+          if (endWeek == 1) endWeek = getWeekByDate(dateInLastWeek.setDate(dateInLastWeek.getDate()-7));
+          colspan = endWeek;
+        }
       }
+      subHeaderRowYear.appendChild(getTableCellElement(currentYear, 'reportsubheader', colspan));
     }while(!(++currentYear>latestDate.getFullYear()));
   }
@@ -246 +276 @@
       var site = sites[namePrefix];
       var siteName = site.name;       
-      var siteStartDate = site.startdate;
+      var year = site.startdate.substr(0,4);
+      var month = site.startdate.substr(5,2);
+      var date = site.startdate.substr(8,2);      
+      var siteStartDate = new Date(year, month-1, date);
       
       var siteData = report[namePrefix];
@@ -252 +285 @@
       var tableCol = getTableCellElement(siteName, 'rowtitle');
       tableRow.appendChild(tableCol);
-      tableRow.appendChild(getTableCellElement(siteStartDate, 'reportdata'));
-      
-      var yearIndex = firstDate.getFullYear();
-      var monthIndex = firstDate.getMonth()+1;
+      tableRow.appendChild(getTableCellElement(year+'-'+(month)+'-'+date, 'reportdata'));
+      
+      var cDate = new Date(firstDate.getFullYear(), firstDate.getMonth(), firstDate.getDate());     
       var grandTotal = 0;
-      for (var i=0;i<numCols;i++)
-      {         
-        var dataCol = getTableCellElement('0', 'reportdata');       
+      do
+      { 
+        var dataCol = getTableCellElement('', 'reportdata');
+        if (!(cDate < siteStartDate)) dataCol = getTableCellElement('0','reportdata');
+        var yearIndex = cDate.getFullYear();        
+        var keyIndex;       
         if (siteData != null)
-        {
-          var rowfill = monthIndex < 10 ? '0' : '';
-          var keyIndex = null;
-          if (viewType == 'MONTH') keyIndex = yearIndex + rowfill + monthIndex;           
+        {                   
+          if (viewType == 'MONTH') 
+          {
+            var monthIndex = cDate.getMonth()+1;
+            var rowfill = monthIndex < 10 ? '0' : '';
+            keyIndex = yearIndex + rowfill + monthIndex;            
+          }
+          else
+          {
+            var weekIndex = getWeekByDate(cDate);
+            var rowfill = weekIndex < 10 ? '0' : '';
+            keyIndex = yearIndex + rowfill + weekIndex;
+          }
           var data = siteData[keyIndex];
-          if (data == null) data = 0;
-          dataCol = getTableCellElement(data, 'reportdata');
+          if (data != null) 
+          {
+            dataCol = getTableCellElement(data, 'reportdata');            
+          }         
+          else
+            data = 0;
           if (sitesCombined[keyIndex] != null)
             sitesCombined[keyIndex] += parseInt(data);
@@ -273 +321 @@
             sitesCombined[keyIndex] = parseInt(data);
           grandTotal += data;
-          monthIndex++;
-          if (monthIndex > 12)
-          {
-            yearIndex++;
-            monthIndex = 1;
-          }
         }
         tableRow.appendChild(dataCol);
-      }
+        
+        var isLastCol;
+        if (viewType == 'MONTH')
+        {
+          cDate.setMonth(cDate.getMonth()+1);         
+          isLastCol = cDate > latestDate;
+        }
+        else
+        {
+          cDate.setDate(cDate.getDate()+7);
+          isLastCol = getWeekByDate(cDate) > getWeekByDate(latestDate);
+          isLastCol = isLastCol && (cDate > latestDate); 
+          
+        }       
+      }while (!isLastCol)     
       tableRow.appendChild(getTableCellElement(grandTotal, 'rowsummary'));
       reportTable.appendChild(tableRow);
@@ -382 +438 @@
               <td class="prompt">View</td>
               <td class="input">
-                per Month<input type="radio" value="MONTH" checked onChange="viewOnChange()" name="view"/>&nbsp;
-                per Week<input type="radio" value="WEEK" onChange="viewOnChange()" name="view" />
+                per Month<input type="radio" value="MONTH" checked name="view"/>&nbsp;
+                per Week<input type="radio" value="WEEK" name="view" />
               </td>
               <td class="status" id="displayInterval.status"></td>

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

@@ -3 +3 @@
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -92 +93 @@
             else
             {
-              DateToStringConverter date2WeekStringConverter = new DateToStringConverter(new SimpleDateFormat("yyyyw"));
+              SimpleDateFormat sdf = new SimpleDateFormat("yyyyw");
+              Calendar c = Calendar.getInstance();
+              c.setFirstDayOfWeek(Calendar.MONDAY);
+              c.setMinimalDaysInFirstWeek(5);
+              sdf.setCalendar(c);
+              DateToStringConverter date2WeekStringConverter = new DateToStringConverter(sdf);
               currentPeriod = date2WeekStringConverter.convert(creationDate).substring(0,6);            
             }         
@@ -118 +124 @@
           }         
         }
-        jsonReport.put("sitesCombined", jsonSitesCombined);
         jsonReport.put("firstDate", date2StringConverter.convert(firstDate));
         jsonReport.put("latestDate", date2StringConverter.convert(latestDate));