digidotcom · victorcoman · Nov 16, 2021 · Nov 16, 2021 · Nov 17, 2021 · Nov 24, 2021
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,8 @@ media
 # Backup files # 
 *.bak 
 
-# If you are using PyCharm # 
+# If you are using PyCharm # 
+.idea/*
 */.idea/*
 *.iws /out/ 
 
@@ -103,3 +104,4 @@ GitHub.sublime-settings
 !.vscode/launch.json 
 !.vscode/extensions.json 
 .history
+
diff --git a/agriculture/.configured b/agriculture/.configured
diff --git a/agriculture/.ebextensions/django.config b/agriculture/.ebextensions/django.config
@@ -0,0 +1,5 @@
+option_settings:
+  aws:elasticbeanstalk:container:python:
+    WSGIPath: agriculturecommon.wsgi:application
+  aws:elasticbeanstalk:environment:proxy:staticfiles:
+    /static: static
diff --git a/agriculture/.gitignore b/agriculture/.gitignore
@@ -0,0 +1,5 @@
+
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml
diff --git a/agriculture/Procfile.config b/agriculture/Procfile.config
@@ -0,0 +1,2 @@
+web: gunicorn --bind :8000 --workers 3 --threads 2 agriculturecommon.wsgi:application
+websocket: daphne -b :: -p 5000 agriculturecommon.asgi:application
diff --git a/agriculture/agriculturecommon/settings.py b/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', 'django-env5.us-west-2.elasticbeanstalk.com', '172.31.27.57']
 
 
 # Application definition
@@ -93,7 +93,7 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
 

diff --git a/agriculture/agriculturecommon/templates/base.html b/agriculture/agriculturecommon/templates/base.html
@@ -20,7 +20,8 @@
     <script defer src="https://cdn.sobekrepository.org/includes/gmaps-markerwithlabel/1.9.1/gmaps-markerwithlabel-1.9.1.js"></script>
     <script src="https://www.gstatic.com/charts/loader.js"></script>
     <script>
-        google.charts.load("current", {"packages":["line"]});
+        <!--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("current", {"packages":["line", "corechart"]});
     </script>
 </head>
 <body>

diff --git a/agriculture/agriculturecommon/urls.py b/agriculture/agriculturecommon/urls.py
@@ -31,6 +31,9 @@
 from django.urls import include, path
 
 urlpatterns = [
+
+    # path("index.html", include("app.urls")),
+
     path("access/", include("login.urls")),
 
     path("", include("agriculturecore.urls")),

diff --git a/agriculture/agriculturecore/drm_requests.py b/agriculture/agriculturecore/drm_requests.py
@@ -53,12 +53,16 @@
 DO_CMD_XBEE_DISCOVER = "<discover option='current' />"
 DO_CMD_XBEE_SETTING = "<radio_command addr='{}' id='{}' format='{}' timeout='1000' />"
 
-ID_WIND = "wind"
+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"
+ID_PRESSURE = "pressure"
+ID_LUMINOSITY = "luminosity"
 ID_BATTERY = "battery"
 ID_MOISTURE = "moisture"
 
@@ -67,8 +71,6 @@
 ID_WEATHER = "weather"
 ID_TANK = "tank"
 
-ID_ERROR = "error"
-
 REGEX_DEV_REQUEST_RESPONSE = ".*<device_request .*>(.*)<\\/device_request>.*"
 REGEX_DO_CMD_RESPONSE = ".*<do_command target=[^>]*>(.*)<\\/do_command>.*"
 
@@ -146,41 +148,6 @@ def get_device_cloud_session(session):
                        base_url=user_serialized.server)
 
 
-def check_ajax_request(request):
-    """
-    Checks whether the given AJAX request is valid and the user is
-    authenticated.
-
-    Args:
-        request (:class:`.WSGIRequest`): The HTTP request.
-
-    Returns:
-        `None` if the request is valid, or a `JsonResponse` with the error
-            if it is not.
-    """
-    if is_authenticated(request):
-        if not request.is_ajax or request.method != "POST":
-            return JsonResponse({ID_ERROR: "AJAX request must be sent using POST"}, status=400)
-        return None
-    else:
-        return JsonResponse({ID_ERROR: "Not authenticated"}, status=401)
-
-
-def get_exception_response(e):
-    """
-    Returns the JSON response with the error contained in the given exception.
-
-    Args:
-        e (:class:`.Exception`): The exception.
-
-    Returns:
-        A JSON response with the details of the exception.
-    """
-    return JsonResponse({ID_ERROR: ("Error in the DRM request: {}.".format(e.response.text)
-                                    if isinstance(e, DeviceCloudHttpException) else str(e))},
-                        status=400)
-
-
 def send_device_request(request, target):
     """
     Sends a Device Request to DRM to the device with the given ID.
@@ -192,12 +159,13 @@ def send_device_request(request, target):
     Returns:
         A JSON with the response or the error.
     """
-    # Check if the AJAX request is valid.
-    error = check_ajax_request(request)
-    if error is not None:
-        return error
+    if not request.is_ajax or request.method != "POST":
+        return JsonResponse({"error": "AJAX request must be sent using POST"},
+                            status=400)
 
     dc = get_device_cloud(request)
+    if dc is None:
+        return JsonResponse({"error": "Invalid credentials."}, status=400)
 
     device_id = request.POST[views.PARAM_CONTROLLER_ID]
     data = request.POST[PARAM_DATA] if PARAM_DATA in request.POST else None
@@ -208,7 +176,9 @@ def send_device_request(request, target):
             return JsonResponse({"data": resp}, status=200)
         return JsonResponse({"valid": True}, status=200)
     except DeviceCloudHttpException as e:
-        return get_exception_response(e)
+        return JsonResponse(
+            {"error": "Error in the DRM request: {}.".format(e.response.text)},
+            status=e.response.status_code)
 
 
 def send_request(dc, device_id, target, data=None):
@@ -564,12 +534,13 @@ def get_data_points(request, stream_name):
     Returns:
         A JSON with the data points or the error.
     """
-    # Check if the AJAX request is valid.
-    error = check_ajax_request(request)
-    if error is not None:
-        return error
+    if not request.is_ajax or request.method != "POST":
+        return JsonResponse({"error": "AJAX request must be sent using POST"},
+                            status=400)
 
     dc = get_device_cloud(request)
+    if dc is None:
+        return JsonResponse({"error": "Invalid credentials."}, status=400)
 
     device_id = request.POST[views.PARAM_CONTROLLER_ID]
     interval = int(
@@ -629,10 +600,18 @@ def get_general_farm_status(request, device_id, stations):
         # Weather station.
         if stream_id == STREAM_FORMAT_CONTROLLER.format(device_id, ID_WIND):
             status[ID_WEATHER][ID_WIND] = data
+        elif stream_id == STREAM_FORMAT_CONTROLLER.format(device_id, ID_WIND_DIR):
+            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

diff --git a/agriculture/agriculturecore/templates/dashboard.html b/agriculture/agriculturecore/templates/dashboard.html
@@ -88,9 +88,11 @@ <h6 class="card-title">Weather station</h6>
                                                                     <td><span class="digi-icon-color fas fa-sun fa-2x"></span></td>
                                                                 </tr>
                                                                 <tr>
-                                                                    <td><span id="wind"><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="radiation"><i class="fas fa-circle-notch fa-spin"></i></span> W/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>)
+
+                                                                    </td>
+                                                                    <td><span id="rain_acc"><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>
                                                         </table>

diff --git a/agriculture/agriculturecore/templates/history.html b/agriculture/agriculturecore/templates/history.html
@@ -10,10 +10,10 @@
                         <div class="card-body">
                             <h5 class="card-title">Historic data: Irrigation controller</h5>
                             <div class="row">
-                                <div class="col-xl-4 chart-container">
+                                <div class="col-xl-6 chart-container">
                                     <div class="d-flex justify-content-center align-items-center">
                                         <span class="fas fa-wind fa-2x mr-3"></span>
-                                        <span>Wind speed</span>
+                                        <span>Wind</span>
                                     </div>
                                     <div class="chart-wrapper">
                                         <div id="wind-chart" class="big-chart"></div>
@@ -36,7 +36,7 @@ <h5 class="card-title">Historic data: Irrigation controller</h5>
                                         </label>
                                     </div>
                                 </div>
-                                <div class="col-xl-4 chart-container">
+                                <div class="col-xl-6 chart-container">
                                     <div class="d-flex justify-content-center align-items-center">
                                         <span class="fas fa-cloud-rain fa-2x mr-3"></span>
                                         <span>Rain</span>
@@ -62,32 +62,58 @@ <h5 class="card-title">Historic data: Irrigation controller</h5>
                                         </label>
                                     </div>
                                 </div>
-                                <div class="col-xl-4 chart-container">
+                                <div class="col-xl-6 chart-container">
                                     <div class="d-flex justify-content-center align-items-center">
                                         <span class="fas fa-sun fa-2x mr-3"></span>
-                                        <span>Solar radiation</span>
+                                        <span>Luminosity</span>
                                     </div>
                                     <div class="chart-wrapper">
-                                        <div id="radiation-chart" class="big-chart"></div>
-                                        <div id="radiation-chart-loading" class="chart-loading">
+                                        <div id="luminosity-chart" class="big-chart"></div>
+                                        <div id="luminosity-chart-loading" class="chart-loading">
                                             <img class="loading-chart-image" src="{% static 'images/loading.gif' %}" alt="Loading..." />
                                         </div>
                                     </div>
                                     <div class="btn-group btn-group-toggle d-flex justify-content-center" data-toggle="buttons">
                                         <label class="btn btn-secondary btn-sm active">
-                                            <input type="radio" name="radiation-interval" value="1" checked> Hour
+                                            <input type="radio" name="luminosity-interval" value="1" checked> Hour
                                         </label>
                                         <label class="btn btn-secondary btn-sm">
-                                            <input type="radio" name="radiation-interval" value="24"> Day
+                                            <input type="radio" name="luminosity-interval" value="24"> Day
                                         </label>
                                         <label class="btn btn-secondary btn-sm">
-                                            <input type="radio" name="radiation-interval" value="168"> Week
+                                            <input type="radio" name="luminosity-interval" value="168"> Week
                                         </label>
                                         <label class="btn btn-secondary btn-sm">
-                                            <input type="radio" name="radiation-interval" value="720"> Month
+                                            <input type="radio" name="luminosity-interval" value="720"> Month
                                         </label>
                                     </div>
                                 </div>
+                                <div class='col-xl-6 chart-container'>
+                                   <div class='d-flex justify-content-center align-items-center'>
+                                       <span class='fas fa-thermometer-half fa-2x mr-3'></span>
+                                       <span>Temperature</span>
+                                   </div>
+                                   <div class='chart-wrapper'>
+                                       <div id='temperature-chart' class='big-chart'></div>
+                                       <div id='temperature-chart-loading' class='chart-loading'>
+                                           <img class='loading-chart-image' src='../static/images/loading.gif' alt='Loading...' />
+                                       </div>
+                                   </div>
+                                   <div class='btn-group btn-group-toggle d-flex justify-content-center' data-toggle='buttons'>
+                                       <label class='btn btn-secondary btn-sm active'>
+                                           <input type='radio' name='temperature-interval' value='1' checked> Hour
+                                       </label>
+                                       <label class='btn btn-secondary btn-sm'>
+                                           <input type='radio' name='temperature-interval' value='24'> Day
+                                       </label>
+                                       <label class='btn btn-secondary btn-sm'>
+                                           <input type='radio' name='temperature-interval' value='168'> Week
+                                       </label>
+                                       <label class='btn btn-secondary btn-sm'>
+                                           <input type='radio' name='temperature-interval' value='720'> Month
+                                       </label>
+                                   </div>
+                               </div>
                             </div>
                         </div>
                     </div>
@@ -113,9 +139,14 @@ <h5 class="card-title">Historic data: Irrigation controller</h5>
             drawRainChart(true, true);
         });
 
-        $("input[type=radio][name=radiation-interval]").change(function() {
-            radiationInterval = this.value;
-            drawRadiationChart(true, true);
+        $("input[type=radio][name=luminosity-interval]").change(function() {
+            luminosityInterval = this.value;
+            drawLuminosityChart(true, true);
+        });
+
+        $("input[type=radio][name=temperature-interval]").change(function() {
+            temperatureInterval = this.value;
+            drawTemperatureChartG(true, true);
         });
     });
 
@@ -124,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/agriculturecore/templates/index.html b/agriculture/agriculturecore/templates/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		web: gunicorn --bind :8000 --workers 3 --threads 2 agriculturecommon.wsgi:application
		websocket: daphne -b :: -p 5000 agriculturecommon.asgi:application