agriculture: dashboard works completely without any weather condition controls.

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

Author: victorcoman

agriculture/agriculturecore/drm_requests.py

@@ -56,7 +56,8 @@
 ID_WIND = "wind_speed"
 ID_WIND_DIR = "wind_direction"
 ID_RADIATION = "radiation"
-ID_RAIN = "rain"
+ID_RAIN_ACC = "rain_acc"
+ID_RAIN = "rain_diff"
 ID_LEVEL = "level"
 ID_VALVE = "valve"
 ID_TEMPERATURE = "temperature"
@@ -603,10 +604,14 @@ def get_general_farm_status(request, device_id, stations):
             status[ID_WEATHER][ID_WIND_DIR] = data
         elif stream_id == STREAM_FORMAT_CONTROLLER.format(device_id, ID_LUMINOSITY):
             status[ID_WEATHER][ID_LUMINOSITY] = data
+        elif stream_id == STREAM_FORMAT_CONTROLLER.format(device_id, ID_RAIN_ACC):
+            status[ID_WEATHER][ID_RAIN_ACC] = data
         elif stream_id == STREAM_FORMAT_CONTROLLER.format(device_id, ID_RAIN):
             status[ID_WEATHER][ID_RAIN] = data
         elif stream_id == STREAM_FORMAT_CONTROLLER.format(device_id, ID_RADIATION):
             status[ID_WEATHER][ID_RADIATION] = data
+        elif stream_id == STREAM_FORMAT_CONTROLLER.format(device_id, ID_TEMPERATURE):
+            status[ID_WEATHER][ID_TEMPERATURE] = data
         # Water tank.
         elif stream_id == STREAM_FORMAT_CONTROLLER.format(device_id, ID_LEVEL):
             status[ID_TANK][ID_LEVEL] = data

agriculture/agriculturecore/templates/dashboard.html

@@ -89,7 +89,7 @@ <h6 class="card-title">Weather station</h6>
                                                                 </tr>
                                                                 <tr>
                                                                     <td><span id="wind_speed"><i class="fas fa-circle-notch fa-spin"></i></span> km/h</td>
-                                                                    <td><span id="rain"><i class="fas fa-circle-notch fa-spin"></i></span> L/m²</td>
+                                                                    <td><span id="rain_diff"><i class="fas fa-circle-notch fa-spin"></i></span> L/m²</td>
                                                                     <td><span id="luminosity"><i class="fas fa-circle-notch fa-spin"></i></span> lux</td>
                                                                 </tr>
                                                             </tbody>

agriculture/static/js/dashboard.js

@@ -89,7 +89,8 @@ const CLASS_BUTTON_STATUS_OFF = "marker-info-button-off";
 const ID_WIND = "wind_speed";
 const ID_RADIATION = "radiation";
 const ID_LUMINOSITY = "luminosity";
-const ID_RAIN = "rain";
+const ID_RAIN = "rain_diff";
+const ID_RAIN_ACC = "rain";
 const ID_LEVEL = "level";
 const ID_VALVE = "valve";
 const ID_TEMPERATURE = "temperature";
@@ -135,6 +136,7 @@ var controllerWind = null;
 var controllerRain = null;
 var controllerRadiation = null;
 var controllerLuminosity = null;
+var controllerTemperature = null;
 
 var tankValve;
 var waterLevel;
@@ -148,7 +150,6 @@ var currentWeatherIcon;
 var currentWeatherStatus;
 var avgTemp = 23.0;  // Define initial value for the temperature so if no stations are registered the weather forecast can be displayed.
 
-
 var bounds;
 
 var markersZIndex = 0;
@@ -275,13 +276,13 @@ function processFarmStatusResponse(response, first) {
             updateCurrentWeather();
         });
         drawDevices(response);
-        updateWeatherWidget();
     }
     updateStationsStatus(response);
     updateStationCounters(response);
     updateWeatherStation(response);
     updateWaterTank(response);
     updateCurrentWeather();
+    updateWeatherWidget();
 
     // Hide the station loading.
     loadingStationsStatus = false;
@@ -533,6 +534,13 @@ function updateWeatherStation(response) {
     let controllerLuminosityInfowElement = document.getElementById("infow-luminosity");
     if (controllerLuminosityInfowElement != null)
         controllerLuminosityInfowElement.innerText = weatherStationStatus[ID_LUMINOSITY];
+
+    // Update the temperature value.
+    controllerTemperature = weatherStationStatus[ID_TEMPERATURE];
+    avgTemp = weatherStationStatus[ID_TEMPERATURE];
+    let controllerTemperatureElement = document.getElementById("current-temp");
+    if (controllerTemperatureElement != null)
+        controllerTemperatureElement.innerText = weatherStationStatus[ID_TEMPERATURE];
 }
 
 // Updates the water tank information based on the given response.
@@ -905,15 +913,22 @@ function updateWeatherWidget() {
 // Updates the current weather data (icon, temperature and status).
 function updateCurrentWeather() {
     // Calculate average temperature.
-    calculateAvgTemp();
+    //calculateAvgTemp();
 
     // Identify the current weather icon to use.
     currentWeatherIcon = SUN_GREEN;
     currentWeatherStatus = "sunny";
-    if ($("#weather-rainy-logo").hasClass("selected-icon-widget")) {
+
+    rain = document.getElementById("rain_diff").innerText;
+    rain = parseInt(rain)
+    luminosity = document.getElementById("luminosity").innerText;
+    luminosity = parseInt(luminosity)
+
+    if(rain != 0){
         currentWeatherIcon = RAIN_GREEN;
         currentWeatherStatus = "rainy";
-    } else if ($("#weather-cloudy-logo").hasClass("selected-icon-widget")) {
+    }
+    else if(rain == 0 && luminosity < 4000){
         currentWeatherIcon = CLOUD_GREEN;
         currentWeatherStatus = "cloudy";
     }
@@ -923,11 +938,6 @@ function updateCurrentWeather() {
     if (currentWeather != null)
         currentWeather.innerHTML = currentWeatherIcon;
 
-    // Update current temperature.
-    let currentTemp = document.getElementById("current-temp");
-    if (currentTemp != null)
-        currentTemp.innerText = avgTemp;
-
     // Update current weather status.
     let currentStatus = document.getElementById("current-status");
     if (currentStatus != null)

agriculture/static/js/widgets.js

@@ -14,36 +14,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+
 var currentTime;
 var currentTimeFactor;
 var timeWorker;
 
-// Sets the new weather condition.
-function setWeatherCondition(e) {
-    e.preventDefault();
-
-    var selected = $(this).attr("value");
-    selectWeatherIcon(selected);
-
-    $.post("/ajax/set_condition", getJsonData(selected)).fail(function(response) {
-        // If the operation fails, get the real condition.
-        getWeatherCondition();
-    }).fail(function(response) {
-        processErrorResponse(response);
-    });
-}
-
-// Gets the current weather condition.
-function getWeatherCondition() {
-    var data = getJsonData();
-
-    $.post("/ajax/get_condition", getJsonData(), function(response) {
-        var resp = response["data"];
-        selectWeatherIcon(resp);
-    }).fail(function(response) {
-        processErrorResponse(response);
-    });
-}
 
 // Sets the new time factor.
 function setTimeFactor(e) {
@@ -59,8 +34,6 @@ function setTimeFactor(e) {
     $.post("/ajax/set_factor", getJsonData(selected)).fail(function(response) {
         // If the operation fails, get the real factor.
         getTimeFactor();
-    }).fail(function(response) {
-        processErrorResponse(response);
     });
 }
 
@@ -72,8 +45,6 @@ function getTimeFactor() {
             selectTimeIcon(currentTimeFactor);
             getCurrentTime();
         }
-    }).fail(function(response) {
-        processErrorResponse(response);
     });
 }
 
@@ -88,27 +59,9 @@ function getCurrentTime() {
             };
             timeWorker.postMessage(currentTime + "@@@" + currentTimeFactor);
         }
-    }).fail(function(response) {
-        processErrorResponse(response);
     });
 }
 
-// Marks the weather icon with the given value as selected.
-function selectWeatherIcon(value) {
-    unselectWeatherIcons();
-    if (value == document.getElementById("weather-sunny").value)
-        $("#weather-sunny-logo").addClass("selected-icon-widget");
-    else if (value == document.getElementById("weather-cloudy").value)
-        $("#weather-cloudy-logo").addClass("selected-icon-widget");
-    else if (value == document.getElementById("weather-rainy").value)
-        $("#weather-rainy-logo").addClass("selected-icon-widget");
-}
-
-// Unselects all the weather icons.
-function unselectWeatherIcons() {
-    $(".weather-icon").removeClass("selected-icon-widget");
-}
-
 // Marks the time icon with the given value as selected.
 function selectTimeIcon(value) {
     unselectTimeIcons();