Merge branch 'vcoman/ces_demo' of github.com:digidotcom/xbee-iot-web-apps into vcoman/ces_demo

Author: victorcoman

agriculture/.configured

@@ -20,7 +20,7 @@
                 <img id="simulation-logo" class="banner-icon" src="{% static 'images/simulation.png' %}">
             </button>
             <div class="dropdown-menu shadow-sm simulation-controls-container" aria-labelledby="simulationMenuButton">
-                <p>Simulation controls</p>
+                <p>Simulation control</p>
 <!--                <div class="card">-->
 <!--                    <p class="widget-title">Weather condition</p>-->
 <!--                    <p class="widget-desc">Control the weather condition of the farm. You can change it to see different temperature and moisture values.</p>-->
@@ -188,14 +188,14 @@
         });
 
         // Add 'click' callbacks to the weather and time buttons.
-        $(".weather-button").click(setWeatherCondition);
+        // $(".weather-button").click(setWeatherCondition);
         $(".time-button").click(setTimeFactor);
 
         // Check the farm connection status.
         checkFarmConnectionStatus();
 
-        // Get the weather condition and time factor from the irrigation controller.
-        getWeatherCondition();
+        // Get the time factor from the irrigation controller.
+        // getWeatherCondition();
         getTimeFactor();
 
         // Check farm connectivity in 5 secs.
@@ -243,9 +243,7 @@
                 if (data["redirect"])
                     window.location.replace(data["redirect"]);
             }
-        ).fail(function(response) {
-            processErrorResponse(response);
-        });
+        );
     }
     </script>
 {% endblock %}

agriculture/agriculturecore/templates/sidebar.html

@@ -37,6 +37,7 @@
     path('ajax/get_wind', views.get_wind, name="get_wind"),
     path('ajax/get_wind_dir', views.get_wind_dir, name="get_wind_dir"),
     path('ajax/get_luminosity', views.get_luminosity, name="get_luminosity"),
+    path('ajax/get_rain_acc', views.get_rain_acc, name="get_rain_acc"),
     path('ajax/get_rain', views.get_rain, name="get_rain"),
     path('ajax/get_radiation', views.get_radiation, name="get_radiation"),
     path('ajax/get_temperature', views.get_temperature, name="get_temperature"),

agriculture/agriculturecore/urls.py

@@ -516,10 +516,23 @@ def get_luminosity(request):
     return get_data_points(request, ID_LUMINOSITY)
 
 
-def get_rain(request):
+def get_rain_acc(request):
     """
     Returns the rain data of the main controller.
 
+    Args:
+        request (:class:`.WSGIRequest`): the AJAX request.
+
+    Returns:
+        A JSON with the list of data points or the error.
+    """
+    return get_data_points(request, ID_RAIN_ACC)
+
+
+def get_rain(request):
+    """
+    Returns the rain accumulated data of the main controller.
+
     Args:
         request (:class:`.WSGIRequest`): the AJAX request.
 

agriculture/agriculturecore/views.py

@@ -108,6 +108,7 @@ const STATION_CHART_HTML = "" +
 var windData;
 var rainData;
 var radiationData;
+var luminosityData;
 var temperatureData = {};
 var moistureData = {};
 var valveData = {};
@@ -163,7 +164,7 @@ function drawAllCharts(refresh=false, showProgress=true) {
     drawWindChart(refresh, showProgress);
     drawRainChart(refresh, showProgress);
     drawLuminosityChart(refresh, showProgress);
-    drawTemperatureChart(refresh, showProgress);
+    drawTemperatureChartG(refresh, showProgress);
 
     for (macAddr in temperatureData) {
         drawTemperatureChart(macAddr, refresh, showProgress);
@@ -200,13 +201,13 @@ function drawRainChart(refresh=false, showProgress=false) {
     if (refresh) {
         if (showProgress)
             $("#rain-chart-loading").show();
-        $.post("/ajax/get_rain", getJsonData(rainInterval), function(response) {
+        $.post("/ajax/get_rain_acc", getJsonData(rainInterval), function(response) {
             rainData = response.data;
             drawRainChart();
             $("#rain-chart-loading").hide();
         });
     } else {
-        drawChart("rain-chart", rainData, "Rain", "mm", "#3399FF");
+        drawChart("rain-chart", rainData, "Rain", "L/m²", "#3399FF");
     }
 }
 
@@ -236,25 +237,40 @@ function drawRadiationChart(refresh=false, showProgress=false) {
             $("#radiation-chart-loading").hide();
         });
     } else {
-        drawChart("radiation-chart", radiationData, "Radiation", "W/m2", "#FFD500");
+        drawChart("radiation-chart", radiationData, "Radiation", "W/m²", "#FFD500");
     }
 }
 
-// Draws the temperature chart.
-function drawTemperatureChart(refresh=false, showProgress=false) {
+// Draws the temperature chart of gateway.
+function drawTemperatureChartG(refresh=false, showProgress=false) {
     if (refresh) {
         if (showProgress)
             $("#temperature-chart-loading").show();
         $.post("/ajax/get_temperature", getJsonData(temperatureInterval), function(response) {
             temperatureData = response.data;
-            drawTemperatureChart();
+            drawTemperatureChartG();
             $("#temperature-chart-loading").hide();
         });
     } else {
         drawChart("temperature-chart", temperatureData, "Temperature", "ºC", "#FF0000");
     }
 }
 
+// Draws the temperature chart of xbees.
+function drawTemperatureChart(macAddr, refresh=false, showProgress=false) {
+    if (refresh) {
+        if (showProgress)
+            $("#temperature-" + macAddr + "-chart-loading").show();
+        $.post("/ajax/get_temperature", getJsonData(temperatureInterval[macAddr], macAddr), function(response) {
+            temperatureData[macAddr] = response.data;
+            drawTemperatureChart(macAddr);
+            $("#temperature-" + macAddr + "-chart-loading").hide();
+        });
+    } else {
+        drawChart("temperature-" + macAddr + "-chart", temperatureData[macAddr], "Temperature", "ºC", "#FF0000");
+    }
+}
+
 // Draws the moisture chart.
 function drawMoistureChart(macAddr, refresh=false, showProgress=false) {
     if (refresh) {
@@ -285,12 +301,6 @@ function drawValveChart(macAddr, refresh=false, showProgress=false) {
     }
 }
 
-//google.charts.load('current', {
-//     callback: drawChart,
-//     packages: ['scatterChart', 'lineChart']
-//});
-
-
 // Draws the chart with the given data.
 function drawChart(id, data, title, units, color=null, data2=null, units2=null, title2=null, color2=null) {
     if (!isHistoryShowing() || id === undefined)
@@ -340,12 +350,7 @@ function drawChart(id, data, title, units, color=null, data2=null, units2=null,
               0: {title: units},
             },
             vAxis: {
-//                viewWindow: {
-//                    min: 0,
-//                    max: 50
-//                }
-                //ticks: [0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50]
-                ticks: [{v: 0}, {v: 8}, {v: 16}, {v: 24}, {v: 32}, {v: 40}, {v: 48}, {v: 56} ]
+                ticks: [{v: 0}, {v: 4}, {v: 8}, {v: 12}, {v: 16}, {v: 20}, {v: 24}, {v: 28} ]
             },
             legend: { position: 'bottom' }
         };