agriculture: change controller direction from number to letters

Signed-off-by: Victor Coman <victor.coman@digi.com>

Author: victorcoman

agriculture/Procfile.config renamed to agriculture/Procfile

@@ -1,2 +1,2 @@
 web: gunicorn --bind :8000 --workers 3 --threads 2 agriculturecommon.wsgi:application
-websocket: daphne -b :: -p 5000 agriculturecommon.asgi:application
+websocket: daphne -b :: -p 5000 agriculturecommon.asgi:application

agriculture/static/js/dashboard.js

@@ -64,7 +64,7 @@ const INFO_WINDOW_CONTENT_CONTROLLER = "" +
     "        </div>" +
     "        <div class='marker-info-value'>" +
     "            <span id='infow-wind'>@@WIND@@</span> km/h (" +
-    "            <span id='infow-wind_dir'>@@WIND_DIR@@</span>)" +
+    "            <span id='infow-wind_dir'>@@WIND_DIR@@</span> )" +
     "        </div>" +
     "    </div>" +
     "    <div class='marker-info-element'>" +
@@ -523,32 +523,14 @@ function updateWeatherStation(response) {
 
     // Update the wind direction value.
     controllerWindDir = weatherStationStatus[ID_WIND_DIR];
-    dir = "";
-
-    if (controllerWindDir == 0)
-        dir = "N"
-    if (controllerWindDir == 8)
-        dir = "NE"
-    if (controllerWindDir == 16)
-        dir = "E"
-    if (controllerWindDir == 24)
-        dir = "SE"
-    if (controllerWindDir == 32)
-        dir = "S"
-    if (controllerWindDir == 40)
-        dir = "SW"
-    if (controllerWindDir == 48)
-        dir = "W"
-    if (controllerWindDir == 56)
-        dir = "NW"
-
+    dir = getControllerWindDirString(controllerWindDir);
 
     let controllerWindDirElement = document.getElementById(ID_WIND_DIR);
     if (controllerWindDirElement != null)
         controllerWindDirElement.innerText = dir;
     let controllerWindDirInfowElement = document.getElementById("infow-wind_dir");
     if (controllerWindDirInfowElement != null)
-        controllerWindDirInfowElement.innerText = weatherStationStatus[ID_WIND_DIR];
+        controllerWindDirInfowElement.innerText = dir;
 
     // Update the rain value.
     controllerRainDiff = weatherStationStatus[ID_RAIN];
@@ -577,6 +559,26 @@ function updateWeatherStation(response) {
         controllerTemperatureElement.innerText = weatherStationStatus[ID_TEMPERATURE];
 }
 
+function getControllerWindDirString (controllerWindDir){
+    if (controllerWindDir == 0)
+        return "N";
+    else if (controllerWindDir == 8)
+        return "NE";
+    else if (controllerWindDir == 16)
+        return "E";
+    else if (controllerWindDir == 24)
+        return "SE";
+    else if (controllerWindDir == 32)
+        return "S";
+    else if (controllerWindDir == 40)
+        return "SW";
+    else if (controllerWindDir == 48)
+        return "W";
+    else if (controllerWindDir == 56)
+        return "NW";
+}
+
+
 // Updates the water tank information based on the given response.
 function updateWaterTank(response) {
     if (response[ID_STATUS] == null || response[ID_STATUS][ID_TANK] == null)
@@ -697,7 +699,7 @@ function getControllerInfoWindowContent() {
         content = content.replace("@@WIND@@", "-");
     // Update the wind direction value.
     if (controllerWindDir != null)
-        content = content.replace("@@WIND_DIR@@", controllerWindDir);
+        content = content.replace("@@WIND_DIR@@", getControllerWindDirString(controllerWindDir));
     else
         content = content.replace("@@WIND_DIR@@", "-");
     // Update the rain value.

agriculture/static/js/history.js

@@ -349,11 +349,9 @@ function drawChart(id, data, title, units, color=null, data2=null, units2=null,
             },
             vAxes: {
               // Adds titles to each axis.
-              0: {title: units},
-            },
-            vAxis: {
-                ticks: [{v: 0}, {v: 8}, {v: 16}, {v: 24}, {v: 32}, {v: 40}, {v: 48}, {v: 56} , {v: 64}]
+              0: {title: units, ticks: [{v: 0}, {v: 8}, {v: 16}, {v: 24}, {v: 32}, {v: 40}, {v: 48}, {v: 56} , {v: 64}]}
             },
+            
             legend: { position: 'bottom' },
             tooltip: { ignoreBounds: true, isHtml: true, trigger: 'both' }
         };
@@ -366,13 +364,9 @@ function drawChart(id, data, title, units, color=null, data2=null, units2=null,
             },
             vAxes: {
               // Adds titles to each axis.
-              0: {title: units}
-            },
-            vAxis: {
-                viewWindow: {
-                    min: 0
-                }
+              0: {title: units,  viewWindow: {min: 0}}
             },
+
             legend: { position: 'bottom' },
             tooltip: { ignoreBounds: true, isHtml: true, trigger: 'both' }
         };
@@ -387,17 +381,10 @@ function drawChart(id, data, title, units, color=null, data2=null, units2=null,
             },
             vAxes: {
               // Adds titles to each axis.
-              0: {title: units},
-              1: {title: units2}
+              0: {title: units, minValue: 0, ticks: [{v: 0}, {v: 8}, {v: 16}, {v: 24}, {v: 32}, {v: 40}, {v: 48}, {v: 56}]},
+              1: {title: units2, 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'}]}
             },
 
-            vAxes: [{
-                minValue: 0,
-                ticks: [{v: 0}, {v: 8}, {v: 16}, {v: 24}, {v: 32}, {v: 40}, {v: 48}, {v: 56} ]
-            }, {
-                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' },
             tooltip: { ignoreBounds: true, isHtml: true, trigger: 'both' }
         };