Changeset 1498

Timestamp:

Jan 12, 2012, 10:53:12 AM (12 years ago)

Author:

Martin Svensson

Message:

References #339 Added information about latest registration to the table-header

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

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

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

@@ -175 +175 @@
     var reportTable = getReportTable();
     var sdString = report.beginDate;
-    var edString = report.endDate;    
+    var edString = report.endDate;
+    var ldString = report.latestDate;
     var startDate = new Date();
     startDate.setYear(sdString.substr(0,4));
@@ -184 +185 @@
     endDate.setMonth(edString.substr(4,2)-1);
     endDate.setDate(edString.substr(6));
+    var latestDate;
+    if (ldString != null)
+    {
+      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;   
   
@@ -222 +232 @@
       
     // Set table header
-    headerText += '\n(' + startDate.getFullYear()+'-';
+    headerText += ' (' + startDate.getFullYear()+'-';
     if ((startDate.getMonth()+1) < 10) headerText += '0' + (startDate.getMonth()+1);
     else headerText += (startDate.getMonth()+1);
@@ -235 +245 @@
     if (endDate.getDate() < 10) headerText += '0' + endDate.getDate();
     else headerText += endDate.getDate();
-    headerText += ')';    
+    headerText += ')';
+    if (latestDate != null)
+    {
+      headerText += '\nLast registration ' + latestDate.getFullYear();
+      headerText += '-';
+      if ((latestDate.getMonth()+1) < 10) headerText += '0';
+      headerText += (latestDate.getMonth()+1);
+      headerText += '-';
+      if (latestDate.getDate()<10) headerText += '0';
+      headerText += latestDate.getDate();
+    }   
     headerRow.appendChild(getTableCellElement(headerText, 'reportheader', (numCols+3)));
     

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

@@ -182 +182 @@
           jsonReport.put("beginDate", date2StringConverter.convert(startDate));
           jsonReport.put("endDate", date2StringConverter.convert(endDate));
+          jsonReport.put("latestDate", date2StringConverter.convert(latestDate));
           json.put("report", jsonReport);
         }