Vcoman/ces demo #6

victorcoman · 2021-12-13T09:25:53Z

No description provided.

Signed-off-by: Victor Coman <[email protected]>

- Added some more fixes Signed-off-by: Victor Coman <[email protected]>

Signed-off-by: Victor Coman <[email protected]>

… controls. Signed-off-by: Victor Coman <[email protected]>

…apps into vcoman/ces_demo

…ature intervals Signed-off-by: Victor Coman <[email protected]>

- Wind direction in dashboard - Server errors in history - Accumulated rain in dashboard - Rain limits - Reduce refreshing time Signed-off-by: Victor Coman <[email protected]>

Signed-off-by: Victor Coman <[email protected]>

…instead of the rain accumulated Signed-off-by: Victor Coman <[email protected]>

Signed-off-by: Victor Coman <[email protected]>

rubenmoral · 2021-12-13T09:39:13Z

agriculture/agriculturecommon/settings.py

@@ -39,7 +39,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True

-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['127.0.0.1', 'agriculturedemodigi-env-1.us-west-2.elasticbeanstalk.com', 'django-env5.us-west-2.elasticbeanstalk.com', '172.31.27.57', '172.31.18.186']


Better to use '*', we should not use fixed URLs.

rubenmoral · 2021-12-13T09:40:04Z

agriculture/agriculturecommon/urls.py

@@ -31,6 +31,9 @@
 from django.urls import include, path

 urlpatterns = [
+
+    # path("index.html", include("app.urls")),


This should not be committed.

rubenmoral · 2021-12-13T09:42:26Z

agriculture/agriculturecore/drm_requests.py

@@ -146,41 +148,6 @@ def get_device_cloud_session(session):
                       base_url=user_serialized.server)


-def check_ajax_request(request):


Why all these changes (until line 543)?

rubenmoral · 2021-12-13T09:44:13Z

agriculture/agriculturecore/templates/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>


This file should not be committed, remove it.

rubenmoral · 2021-12-13T09:44:45Z

agriculture/agriculturecore/templates/sidebar.html

@@ -240,9 +243,7 @@
                if (data["redirect"])
                    window.location.replace(data["redirect"]);
            }
-        ).fail(function(response) {


rubenmoral · 2021-12-13T09:52:06Z

agriculture/static/js/dashboard.js

        currentWeatherIcon = RAIN_GREEN;
        currentWeatherStatus = "rainy";
-    } else if ($("#weather-cloudy-logo").hasClass("selected-icon-widget")) {
+    }
+    else if(rain == 0 && luminosity < 4000){


NP: whitespace after else if and before {.

rubenmoral · 2021-12-13T09:54:32Z

agriculture/static/js/history.js

-    dataTable.addColumn("number", "");
+    dataTable.addColumn('date', '');
+    dataTable.addColumn("number", title);
+    if (data2 != null){


NP: add whitespace before {.

rubenmoral · 2021-12-13T09:55:23Z

agriculture/static/js/history.js


    $.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"]));


Wrong indentation, it should be 8 spaces.

rubenmoral · 2021-12-13T09:56:07Z

agriculture/static/js/history.js

        return;

    var dataTable = new google.visualization.DataTable();
-    dataTable.addColumn("date", "");
-    dataTable.addColumn("number", "");
+    dataTable.addColumn('date', '');


NP: use double quotes for consistency.

rubenmoral · 2021-12-13T09:56:53Z

agriculture/static/js/history.js

-            y: {
-                Data: {
-                    label: units
+    if(data2 != null){


NP: add whitespaces after all if's and before all {.

rubenmoral · 2021-12-13T09:58:29Z

Do not commit the source.zip file.

Signed-off-by: Victor Coman <[email protected]>

rubenmoral · 2021-12-15T10:04:53Z

agriculture/agriculturecore/views.py

@@ -19,6 +19,7 @@
 PARAM_CONTROLLER_ID = "controller_id"
 PARAM_FARM_NAME = "farm_name"

+ID_ERROR = "error"


rubenmoral · 2021-12-15T10:05:01Z

agriculture/agriculturecore/views.py

@@ -252,10 +253,13 @@ def get_smart_farms(request):
        :class:`.JsonResponse`: A JSON response with the list of the Smart
            Farms within the DRM account.
    """
-    # Check if the AJAX request is valid.


rubenmoral · 2021-12-15T10:05:19Z

agriculture/agriculturecore/views.py

@@ -433,7 +452,7 @@ def refill_tank(request):
    new_value = refill_tank_request(request, controller_id)
    if new_value is not None:
        return JsonResponse({"value": new_value}, status=200)
-    return JsonResponse({ID_ERROR: "Could not set the valve."}, status=400)
+    return JsonResponse({"error": "Could not set the valve."}, status=400)


Revert until here.

rubenmoral · 2021-12-15T10:05:26Z

agriculture/agriculturecore/views.py

@@ -544,10 +605,13 @@ def check_farm_connection_status(request):
    Returns:
        A JSON with the status of the farm or the error.
    """
-    # Check if the AJAX request is valid.


rubenmoral · 2021-12-15T10:05:35Z

agriculture/static/js/dashboard.js

@@ -263,9 +270,7 @@ function getFarmStatus(first=true) {
                return;
            processFarmStatusResponse(data, first);
        }
-    ).fail(function(response) {


rubenmoral · 2021-12-15T10:09:13Z

agriculture/static/js/history.js

@@ -268,64 +297,114 @@ function drawValveChart(macAddr, refresh=false, showProgress=false) {
            valveData[macAddr] = response.data;
            drawValveChart(macAddr);
            $("#valve-" + macAddr + "-chart-loading").hide();
-        }).fail(function(response) {


rubenmoral · 2021-12-15T10:09:25Z

agriculture/static/js/history.js

@@ -353,8 +432,6 @@ function drawStationsCharts() {
            drawMoistureChart(macAddr, true, true);
            drawValveChart(macAddr, true, true);
        }
-    }).fail(function(response) {


rubenmoral · 2021-12-15T10:09:30Z

agriculture/static/js/widgets.js

@@ -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) {


rubenmoral · 2021-12-15T10:09:33Z

agriculture/static/js/widgets.js

@@ -72,8 +45,6 @@ function getTimeFactor() {
            selectTimeIcon(currentTimeFactor);
            getCurrentTime();
        }
-    }).fail(function(response) {


rubenmoral · 2021-12-15T10:09:37Z

agriculture/static/js/widgets.js

@@ -88,27 +59,9 @@ function getCurrentTime() {
            };
            timeWorker.postMessage(currentTime + "@@@" + currentTimeFactor);
        }
-    }).fail(function(response) {


hgonzaleDigi · 2021-12-21T09:26:59Z

agriculture/agriculturecore/views.py

@@ -283,10 +287,13 @@ def get_irrigation_stations(request):
            Stations corresponding to the controller with the ID provided in
            the request.
    """
-    # Check if the AJAX request is valid.
-    error = check_ajax_request(request)


This method does the same as the code you have placed below. Why was the call removed and the code replicated? If you want to change the way the method works, you can always create a new method and reuse it everywhere, that way you just write the code once and reuse everywhere.

hgonzaleDigi · 2021-12-21T09:29:22Z

agriculture/static/js/history.js

+              0: {title: units},
+            },
+            vAxis: {
+//                viewWindow: {


It is better to remove comments that are not useful. This only adds complexity to the code.

hgonzaleDigi · 2021-12-21T09:30:20Z

agriculture/agriculturecore/templates/sidebar.html

-                        </button>
-                    </div>
-                </div>
+<!--                <div class="card">-->


Same as before, just remove this, if we wanted to recover it we can always go back to a previous commit that had this piece of code.

hgonzaleDigi · 2021-12-21T09:34:25Z

agriculture/static/js/dashboard.js

@@ -905,15 +913,22 @@ function updateWeatherWidget() {
 // Updates the current weather data (icon, temperature and status).
 function updateCurrentWeather() {
    // Calculate average temperature.
-    calculateAvgTemp();
+    //calculateAvgTemp();


Remove this

hgonzaleDigi · 2021-12-21T09:38:19Z

agriculture/agriculturecore/templates/sidebar.html

@@ -188,14 +188,14 @@
        });

        // Add 'click' callbacks to the weather and time buttons.
-        $(".weather-button").click(setWeatherCondition);
+        // $(".weather-button").click(setWeatherCondition);


Remove this if it is not necessary

hgonzaleDigi · 2021-12-21T09:38:25Z

agriculture/agriculturecore/templates/sidebar.html

-        // Get the weather condition and time factor from the irrigation controller.
-        getWeatherCondition();
+        // Get the time factor from the irrigation controller.
+        // getWeatherCondition();


Remove this if it is not necessary

hgonzaleDigi · 2021-12-21T09:43:59Z

agriculture/agriculturecore/templates/dashboard.html

-                                                                    <td><span id="wind_speed"><i class="fas fa-circle-notch fa-spin"></i></span> km/h</td>
-                                                                    <td><span id="rain_diff"><i class="fas fa-circle-notch fa-spin"></i></span> L/m²</td>
+                                                                    <td><span id="wind_speed"><i class="fas fa-circle-notch fa-spin"></i></span> km/h (<span id="wind_direction"><i class="fas fa-circle-notch fa-spin"></i></span>)
+


Either fill this space with the tag contained in the or put the tag right after the to avoid having this blank line.

hgonzaleDigi · 2021-12-21T09:44:50Z

agriculture/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>


Is this file required?

hgonzaleDigi · 2021-12-21T09:47:31Z

agriculture/static/js/dashboard.js

@@ -63,7 +63,8 @@ const INFO_WINDOW_CONTENT_CONTROLLER = "" +
    "            <span class='digi-icon-color fas fa-wind fa-2x'></span>" +


Don´t know how to put this comment in source3.zip and source4.zip, so I put it here: Those files should not be committed.

hgonzaleDigi · 2021-12-21T09:48:36Z

agriculture/static/js/dashboard.js

+        dir = "SW"
+    if (controllerWindDir = 48)
+        dir = "W"
+    if (controllerWindDir = 56)


If I remember correctly, this was fixed in a later commit, but just in case, use == to compare in an if block.

hgonzaleDigi · 2021-12-21T09:50:26Z

agriculture/static/js/dashboard.js

@@ -956,7 +958,8 @@ function updateCurrentWeather() {
    currentWeatherIcon = SUN_GREEN;
    currentWeatherStatus = "sunny";

-    rain = document.getElementById("rain_acc").innerText;
+    //rain = document.getElementById("rain_acc").innerText;


Remove this

hgonzaleDigi · 2021-12-21T09:51:45Z

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> )" +


NP: The whitespace at the end may not be needed.

diescalo · 2021-12-21T16:52:06Z

agriculture/static/js/history.js

        });
    } else {
        drawChart("valve-" + macAddr + "-chart", valveData[macAddr], "Valve", "Closed/Open", "#0000CC");
    }
 }

+//google.charts.load('current', {


Remove these lines if they are not needed.

Signed-off-by: Victor Coman <[email protected]>

victorcoman added 11 commits November 16, 2021 13:10

gitignore: do not allow to commit .idea/* files

5e998f0

Signed-off-by: Victor Coman <[email protected]>

agriculture: add support for weather station in agriculture demo

47f7eac

- Added some more fixes Signed-off-by: Victor Coman <[email protected]>

agriculture: remove weather condition control from Simulation Controls.

4cb358e

Signed-off-by: Victor Coman <[email protected]>

agriculture: dashboard works completely without any weather condition…

96697d5

… controls. Signed-off-by: Victor Coman <[email protected]>

agriculture: dashboard works completely without any weather condition…

cdb8ce0

… controls. Signed-off-by: Victor Coman <[email protected]>

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

6c88f65

…apps into vcoman/ces_demo

agriculture: fix little problem that didn´t let choose between temper…

464fdfe

…ature intervals Signed-off-by: Victor Coman <[email protected]>

agriculture: fix small changes

971c6a9

- Wind direction in dashboard - Server errors in history - Accumulated rain in dashboard - Rain limits - Reduce refreshing time Signed-off-by: Victor Coman <[email protected]>

agriculture: fix charts and wind direction

4a20395

Signed-off-by: Victor Coman <[email protected]>

agriculture: change the rain symbol depending on the rain difference …

fcb4c35

…instead of the rain accumulated Signed-off-by: Victor Coman <[email protected]>

agriculture: modify allowed hosts

3c8bbb9

Signed-off-by: Victor Coman <[email protected]>

victorcoman requested review from diescalo, rubenmoral and hgonzaleDigi December 13, 2021 09:25

rubenmoral requested changes Dec 13, 2021

View reviewed changes

victorcoman force-pushed the vcoman/ces_demo branch from 5c940b1 to ab49210 Compare December 13, 2021 11:02

agriculture: change controller direction from number to letters

be00e8b

Signed-off-by: Victor Coman <[email protected]>

victorcoman force-pushed the vcoman/ces_demo branch from ab49210 to be00e8b Compare December 13, 2021 11:28

rubenmoral requested changes Dec 15, 2021

View reviewed changes

victorcoman force-pushed the vcoman/ces_demo branch 3 times, most recently from e09d50c to 98ae006 Compare December 15, 2021 12:20

hgonzaleDigi reviewed Dec 21, 2021

View reviewed changes

agriculture/index.html Outdated

@@ -0,0 +1,10 @@

<!DOCTYPE html>

Copy link

Collaborator

hgonzaleDigi Dec 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file required?

hgonzaleDigi reviewed Dec 21, 2021

View reviewed changes

hgonzaleDigi approved these changes Dec 21, 2021

View reviewed changes

diescalo approved these changes Dec 21, 2021

View reviewed changes

victorcoman requested review from rubenmoral and hgonzaleDigi December 22, 2021 09:20

victorcoman force-pushed the vcoman/ces_demo branch from 98ae006 to 580ba0e Compare December 22, 2021 10:07

agriculture: fix comments from pull request

43d9741

Signed-off-by: Victor Coman <[email protected]>

victorcoman force-pushed the vcoman/ces_demo branch from 580ba0e to 43d9741 Compare December 22, 2021 10:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vcoman/ces demo #6

Vcoman/ces demo #6

victorcoman commented Dec 13, 2021

rubenmoral Dec 13, 2021

rubenmoral Dec 13, 2021

rubenmoral Dec 13, 2021

rubenmoral Dec 13, 2021

rubenmoral Dec 13, 2021 •

edited

Loading

rubenmoral Dec 13, 2021

rubenmoral Dec 13, 2021

rubenmoral Dec 13, 2021

rubenmoral Dec 13, 2021

rubenmoral Dec 13, 2021

rubenmoral commented Dec 13, 2021

rubenmoral Dec 15, 2021

rubenmoral Dec 15, 2021

rubenmoral Dec 15, 2021

rubenmoral Dec 15, 2021

rubenmoral Dec 15, 2021

rubenmoral Dec 15, 2021

rubenmoral Dec 15, 2021

rubenmoral Dec 15, 2021

rubenmoral Dec 15, 2021

rubenmoral Dec 15, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

hgonzaleDigi Dec 21, 2021

diescalo Dec 21, 2021

		@@ -146,41 +148,6 @@ def get_device_cloud_session(session):
		base_url=user_serialized.server)


		def check_ajax_request(request):

		@@ -63,7 +63,8 @@ const INFO_WINDOW_CONTENT_CONTROLLER = "" +
		" <span class='digi-icon-color fas fa-wind fa-2x'></span>" +

Vcoman/ces demo #6

Are you sure you want to change the base?

Vcoman/ces demo #6

Conversation

victorcoman commented Dec 13, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rubenmoral Dec 13, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rubenmoral commented Dec 13, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rubenmoral Dec 13, 2021 •

edited

Loading