fixed battery graph issue

mycontroller-org · Aug 29, 2016 · ba454f8 · ba454f8
1 parent c12d9aa
commit ba454f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/dist/src/main/package/www/app.css b/dist/src/main/package/www/app.css
@@ -532,7 +532,7 @@ input.mc-color-steel-blue{
 }
 
 .mc-sensor-variable-detail{
-  height:75px;
+  height:80px;
 }
 
 .mc-sensor-action-tiles{

diff --git a/modules/core/src/main/java/org/mycontroller/standalone/api/MetricApi.java b/modules/core/src/main/java/org/mycontroller/standalone/api/MetricApi.java
@@ -231,7 +231,7 @@ public List<MetricsBinaryTypeDevice> getSensorVariableMetricsBinary(Integer sens
     }
 
     public List<MetricsBatteryUsage> getMetricsBattery(Integer nodeId, Long timestampFrom, Long timestampTo,
-            Boolean withMinMax, String bucketDurationString) {
+            String bucketDurationString) {
         timestampFrom = getTimestampFrom(timestampFrom);
         timestampTo = getTimestampTo(timestampTo);
         List<MetricsBatteryUsage> metricsFinal = new ArrayList<MetricsBatteryUsage>();
@@ -439,7 +439,7 @@ public static String getBucketDuration(Long timestampFrom, Long timestampTo, MET
                 return "15mn";
             } else if (duration >= McUtils.ONE_HOUR * 5) {
                 return "5mn";
-            } else if (duration >= McUtils.ONE_MINUTE * 6) {
+            } else if (duration >= McUtils.ONE_MINUTE * 7) {
                 return "1mn";
             } else {
                 return "raw";

diff --git a/modules/core/src/main/java/org/mycontroller/standalone/api/jaxrs/MetricsHandler.java b/modules/core/src/main/java/org/mycontroller/standalone/api/jaxrs/MetricsHandler.java
@@ -467,10 +467,13 @@ private List<MetricsBulletChartNVD3> getMetricsBulletChart(List<Integer> variabl
 
     private MetricsChartDataGroupNVD3 getMetricsBatteryJsonNVD3(Integer nodeId, Long timestampFrom,
             Long timestampTo, Boolean withMinMax, String bucketDuration) {
+        if (bucketDuration == null) {
+            bucketDuration = MetricApi.getBucketDuration(timestampFrom, timestampTo, METRIC_TYPE.DOUBLE);
+        }
         ArrayList<MetricsChartDataNVD3> preDoubleData = new ArrayList<MetricsChartDataNVD3>();
         //Get metrics
         List<MetricsBatteryUsage> batteryMetrics = metricApi.getMetricsBattery(nodeId, timestampFrom, timestampTo,
-                withMinMax, bucketDuration);
+                bucketDuration);
         ArrayList<Object> avgMetricValues = new ArrayList<Object>();
         ArrayList<Object> minMetricValues = new ArrayList<Object>();
         ArrayList<Object> maxMetricValues = new ArrayList<Object>();