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/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 = ['*']
 
 
 # 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,7 @@
 from django.urls import include, path
 
 urlpatterns = [
+
     path("access/", include("login.urls")),
 
     path("", include("agriculturecore.urls")),

diff --git a/agriculture/agriculturecore/drm_requests.py b/agriculture/agriculturecore/drm_requests.py
@@ -53,22 +53,25 @@
 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"
 
 ID_CONTROLLERS = "controllers"
+ID_ERROR = "error"
 ID_STATIONS = "stations"
 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>.*"
 
@@ -150,10 +153,8 @@ 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.
@@ -629,10 +630,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,9 @@ <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/sidebar.html b/agriculture/agriculturecore/templates/sidebar.html
@@ -20,22 +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>
-                <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>
-                    <div class="widget-button-container">
-                        <button id="weather-sunny" class="btn widget-button weather-button" type="button" value="0">
-                            <span id="weather-sunny-logo" class="icon-widget weather-icon fas fa-sun fa-2x" title="Change weather to sunny"></span>
-                        </button>
-                        <button id="weather-cloudy" class="btn widget-button weather-button" type="button" value="1">
-                            <span id="weather-cloudy-logo" class="icon-widget weather-icon fas fa-cloud fa-2x" title="Change weather to cloudy"></span>
-                        </button>
-                        <button id="weather-rainy" class="btn widget-button weather-button" type="button" value="2">
-                            <span id="weather-rainy-logo" class="icon-widget weather-icon fas fa-cloud-rain fa-2x" title="Change weather to rainy"></span>
-                        </button>
-                    </div>
-                </div>
+                <p>Simulation control</p>
                 <div class="card">
                     <p class="widget-title">Time</p>
                     <p class="widget-desc">Control how the time elapses in the farm. You can change it to see the irrigation events faster.</p>
@@ -188,15 +173,16 @@
         });
 
         // Add 'click' callbacks to the weather and time buttons.
-        $(".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.
         getTimeFactor();
+
+        // Check farm connectivity in 5 secs.
+        setTimeout(checkFarmConnected, 5000, "schedule");
     });
 
     // Sets the selected section.
@@ -223,7 +209,7 @@
     function getControllerID() {
         return '{{ controller_id }}';
     }
-    
+
     // Gets the status of the farm.
     function verifyParameters() {
         let url = new URL(window.location.href);

diff --git a/agriculture/agriculturecore/urls.py b/agriculture/agriculturecore/urls.py
@@ -35,6 +35,9 @@
     path('ajax/get_stations', views.get_irrigation_stations, name='get_irrigation_stations'),
     path('ajax/set_valve', views.set_valve, name='set_valve'),
     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"),