Changeset 2531

Timestamp:

Jun 26, 2014, 12:11:36 PM (9 years ago)

Author:

olle

Message:

Refs #612. Lab environment extension updated to fix problem with overview display showing wrong time offsets when the latest data points are filtered away:

1. Class/file LabEnvironmentDisplayServlet.java in src/net/sf/basedb/labenv/servlet/ updated in private method JSONObject createJsonOverviewPlot(String chartVariant, List<LabEnvironmentData> lthdList, Date startDate, Date endDate, String viewType, String chartSite, String variableType, String weekdayFilter, String daytimeFilterFromTime, String daytimeFilterToTime) to calculate the end date as date for next midnight, get the period string for that time, and then the corresponding period name (which for an overview plot is the number of minutes since midnight of the first day). The latter is added to the jsonPlot JSONObject for key "latestPeriodName".
2. Javascript boxplot.js in resources/reports/ updated in function createGraphPlot(boxPlotJsonObject, canvas, draw_area_wdt, draw_area_hgt, draw_scale_factor, viewType, storageIntervalInSeconds) for an overview plot to get the number of minutes since first midnight from the JSON data for key "latestPeriodName", instead of from the name of the last shown data point.

Location:

extensions/net.sf.basedb.labenv/trunk

Files:

• resources/reports/boxplot.js (modified) (1 diff)
• src/net/sf/basedb/labenv/servlet/LabEnvironmentDisplayServlet.java (modified) (2 diffs)

extensions/net.sf.basedb.labenv/trunk/resources/reports/boxplot.js

@@ -147 +147 @@
       {
         // Name of last data point is number of minutes since midnight of day for first point
-        var num_minutes_since_first_midnight = boxPlotJsonObject.percentileData[num_data_points - 1].name;
+        var num_minutes_since_first_midnight = boxPlotJsonObject.latestPeriodName;
         var num_full_days_since_first_midnight = Math.floor(num_minutes_since_first_midnight/(24*60));
         var days_to_add = 1;

extensions/net.sf.basedb.labenv/trunk/src/net/sf/basedb/labenv/servlet/LabEnvironmentDisplayServlet.java

@@ -1101 +1101 @@
     jsonPlot.put("valueGuideLinesY", jsonPercentilesArray);
     log.debug("jsonPeriodPercentilesArray = " + jsonPeriodPercentilesArray.toJSONString());
+    // Get end date as date for next midnight
+    Calendar calEnd = GregorianCalendar.getInstance();
+    // Get current date-time, reset to midnight, then add one day
+    calEnd.setTime(new Date());
+    calEnd.set(Calendar.HOUR_OF_DAY, 0);
+    calEnd.set(Calendar.MINUTE, 0);
+    calEnd.set(Calendar.SECOND, 0);
+    calEnd.set(Calendar.MILLISECOND, 0);
+    calEnd.add(Calendar.DATE, 1);
+    Date dateEnd = calEnd.getTime();
+    String latestPeriod = tableUtil.getCurrentPeriod(dateEnd, viewType);
+    String latestPeriodName = fetchPeriodNameForPlot(latestPeriod, viewType, startDate);
     // For overview display, add extra JSON data with text for day markers in graph
     if (viewType != null && viewType.equals("overviewDisplay"))
     {
-      // Get end date as date for next midnight
-      Calendar calEnd = GregorianCalendar.getInstance();
-      // Get current date-time, reset to midnight, then add one day
-      calEnd.setTime(new Date());
-      calEnd.set(Calendar.HOUR_OF_DAY, 0);
-      calEnd.set(Calendar.MINUTE, 0);
-      calEnd.set(Calendar.SECOND, 0);
-      calEnd.set(Calendar.MILLISECOND, 0);
-      calEnd.add(Calendar.DATE, 1);
-      Date dateEnd = calEnd.getTime();
-      //
       Calendar cal = GregorianCalendar.getInstance();
       cal.setTime(startDate);
@@ -1204 +1205 @@
       jsonDayInWeekString.put("numMarkers", numRawMarkers);
       jsonPlot.put("dayInWeekString", jsonDayInWeekString);
+      jsonPlot.put("latestPeriodName", latestPeriodName);
     }
     return jsonPlot;