agriculture: fix charts and wind direction

victorcoman · victorcoman · commit 4a20395c9e77 · 2021-12-10T11:45:40.000+01:00
Signed-off-by: Victor Coman &lt;victor.coman@digi.com&gt;
diff --git a/agriculture/agriculturecommon/templates/base.html b/agriculture/agriculturecommon/templates/base.html
@@ -21,7 +21,7 @@
     <script src="https://www.gstatic.com/charts/loader.js"></script>
     <script>
         <!--42 is for version 42 cause there is a bug that causes the charts popups to flicker and version 42 did not have this issue.-->
-        google.charts.load("42", {"packages":["line", "corechart"]});
+        google.charts.load("current", {"packages":["line", "corechart"]});
     </script>
 </head>
 <body>
diff --git a/agriculture/agriculturecore/templates/history.html b/agriculture/agriculturecore/templates/history.html
@@ -155,4 +155,5 @@ <h5 class="card-title">Historic data: Irrigation controller</h5>
         drawAllCharts();
     });
     </script>
+    <style>div.google-visualization-tooltip { width:150px;}</style>
 {% endblock %}
diff --git a/agriculture/static/js/dashboard.js b/agriculture/static/js/dashboard.js
@@ -523,23 +523,25 @@ function updateWeatherStation(response) {
     // Update the wind direction value.
     controllerWindDir = weatherStationStatus[ID_WIND_DIR];
     dir = "";
-    if (controllerWindDir = 0)
+
+    if (controllerWindDir == 0)
         dir = "N"
-    if (controllerWindDir = 8)
+    if (controllerWindDir == 8)
         dir = "NE"
-    if (controllerWindDir = 16)
+    if (controllerWindDir == 16)
         dir = "E"
-    if (controllerWindDir = 24)
+    if (controllerWindDir == 24)
         dir = "SE"
-    if (controllerWindDir = 32)
+    if (controllerWindDir == 32)
         dir = "S"
-    if (controllerWindDir = 40)
+    if (controllerWindDir == 40)
         dir = "SW"
-    if (controllerWindDir = 48)
+    if (controllerWindDir == 48)
         dir = "W"
-    if (controllerWindDir = 56)
+    if (controllerWindDir == 56)
         dir = "NW"
 
+
     let controllerWindDirElement = document.getElementById(ID_WIND_DIR);
     if (controllerWindDirElement != null)
         controllerWindDirElement.innerText = dir;
diff --git a/agriculture/static/js/history.js b/agriculture/static/js/history.js
@@ -309,7 +309,7 @@ function drawChart(id, data, title, units, color=null, data2=null, units2=null,
         return;
 
     var dataTable = new google.visualization.DataTable();
-    dataTable.addColumn("date", "");
+    dataTable.addColumn('date', '');
     dataTable.addColumn("number", title);
     if (data2 != null){
         dataTable.addColumn("number", title2);
@@ -329,8 +329,8 @@ function drawChart(id, data, title, units, color=null, data2=null, units2=null,
     dataTable.addRows(maximumLength);
 
     $.each(data, function(k, v) {
-        dataTable.setCell(k, 0, new Date(v["timestamp"]));
-        dataTable.setCell(k, 1, v["data"]);
+       dataTable.setCell(k, 0, new Date(v["timestamp"]));
+       dataTable.setCell(k, 1, v["data"]);
     });
 
     if(data2 != null){
@@ -345,7 +345,7 @@ function drawChart(id, data, title, units, color=null, data2=null, units2=null,
         options = {
             backgroundColor: "transparent",
             series: {
-              0: {targetAxisIndex: 0, color: color},
+              0: { targetAxisIndex: 0, color: color},
             },
             vAxes: {
               // Adds titles to each axis.
@@ -354,7 +354,8 @@ function drawChart(id, data, title, units, color=null, data2=null, units2=null,
             vAxis: {
                 ticks: [{v: 0}, {v: 8}, {v: 16}, {v: 24}, {v: 32}, {v: 40}, {v: 48}, {v: 56} , {v: 64}]
             },
-            legend: { position: 'bottom' }
+            legend: { position: 'bottom' },
+            tooltip: { ignoreBounds: true, isHtml: true, trigger: 'both' }
         };
     }
     else if(data2 == null && id != "rain-chart"){
@@ -372,7 +373,8 @@ function drawChart(id, data, title, units, color=null, data2=null, units2=null,
                     min: 0
                 }
             },
-            legend: { position: 'bottom' }
+            legend: { position: 'bottom' },
+            tooltip: { ignoreBounds: true, isHtml: true, trigger: 'both' }
         };
     }
     else if(data2 != null){
@@ -396,7 +398,8 @@ function drawChart(id, data, title, units, color=null, data2=null, units2=null,
                 minValue: 0,
                 ticks: [{v: 0, f: 'N'}, {v: 8, f: 'NE'}, {v: 16, f: 'E'}, {v: 24, f: 'SE'}, {v: 32, f: 'S'}, {v: 40, f: 'SW'}, {v: 48, f: 'W'}, {v: 56, f: 'NW'} ]
             }],
-            legend: { position: 'bottom' }
+            legend: { position: 'bottom' },
+            tooltip: { ignoreBounds: true, isHtml: true, trigger: 'both' }
         };
     }
 
