Changeset 1728

Timestamp:

Oct 23, 2012, 9:21:24 AM (11 years ago)

Author:

olle

Message:

Fixes #419. Added menu for manual selection of view type for the table.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

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

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

@@ -131 +131 @@
     frm.fromdate.disabled = true;
     frm.todate.disabled = true;
+    frm.viewtype.disabled = true;
     Main.hide('gocreate');
     Main.show('reportSection');
@@ -140 +141 @@
       if (frm.fromdate.value != null) url += '&fdate='+frm.fromdate.value;
       if (frm.todate.value != null) url += '&tdate='+frm.todate.value;
+      if (frm.viewtype.value != null) url += '&vtype='+frm.viewtype.value;
     }
     var request = Ajax.getXmlHttpRequest();
@@ -351 +353 @@
       if (sitesCombined[key] != '') gt += sitesCombined[key];
     }
-    sitesCombinedRow.appendChild(getTableCellElement(gt,'colsummary'));
+    sitesCombinedRow.appendChild(getTableCellElement(gt, 'colsummary'));
     reportTable.appendChild(sitesCombinedRow);  
 
@@ -524 +526 @@
       tableRow.appendChild(tableCol);
       tableRow.appendChild(getTableCellElement(year+'-'+(month)+'-'+date, 'reportdata'));
-      var grandTotal = 0;   
+      var grandTotal = 0;
       var currentDate = new Date(periodStartDate.getFullYear(), periodStartDate.getMonth(), periodStartDate.getDate());     
       var columnCounter = 0;
@@ -747 +749 @@
                 <span id="displayInterval.message" class="message" style="display: none;"></span>
                 Define which period the report should cover. Empty fields will include all tubes.<br>
-                The report will adjust itself depending on the size of the period.
+              </td>
+            </tr> 
+            <tr>          
+              <td valign="top" class="prompt">View type</td>
+              <td valign="top" class="input">
+                <select name="viewtype">
+                  <option value="AUTO" selected="yes">Auto</option>
+                  <option value="WEEK">Week</option>
+                  <option value="MONTH">Month</option>
+                  <option value="QUARTER">Quarter</option>
+                  <option value="YEAR">Year</option>
+                </select>
+              </td>
+              <td valign="top" class="status" id="displayViewType.status"></td>
+              <td class="help">
+                <span id="displayViewType.message" class="message" style="display: none;"></span>
+                Auto will adjust the report depending on the size of the period.
                 <ul>
                   <li>Period shorter then 3 months - specimens per week</li>

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);
         
+        String viewType = null;
+        String viewTypeParameter = Values.getString(req.getParameter("vtype"), null);
+        if (viewTypeParameter != null && !viewTypeParameter.equals("AUTO"))
+        {
+          viewType = viewTypeParameter;
+        }
+
         //List<Restriction> restrictions = new ArrayList<Restriction>();
         ItemQuery<Sample> sampleQuery = Sample.getQuery();
@@ -118 +125 @@
         Date latestDate = null;
         JSONObject jsonSitesCombined = new JSONObject();
-        String viewType = null;
         JSONObject jsonStatistics = new JSONObject();
         while (sampleIterator.hasNext())