__init__

init
Patrick Maeght
1 parent ca736263
Showing 5 changed files with 28 additions and 1 deletions Show diff stats
src/dashboard/urls.py
src/dashboard/views.py
src/monitoring/urls.py
src/monitoring/views.py
src/pyros/__init__.py
@@ -11,7 +11,6 @@ urlpatterns = [
     path('routines', views.routines, name="routines"),
     path('weather', views.weather, name="weather"),
     path('weather/current', views.weather_current, name="weather_current"),
-    path('weather/config', views.weather_config, name="weather_config"),
     path('site', views.site, name="site"),
     path('site/current', views.site_current, name="site_current"),
     path('proposal', views.proposal, name='proposal'),
@@ -267,6 +267,7 @@ def weather_current(request):
 def weather_config(request):
     """ PM 20180926 prototype without database
         http://127.0.0.1:8000/dashboard/weather/config
+        Moved to monitoring
     """
     try:
         # Import PLC status sensor parser
 from django.conf.urls import url
+from django.urls import path
 from . import views
  
 urlpatterns = [
+    path('', views.index, name='index'),
+    path('weather/config', views.weather_config, name="weather_config"),
               ]
+from django.http import HttpResponse
 from django.shortcuts import render
  
 # Create your views here.
+
+def index(request):
+    return HttpResponse("Hello, world. You're at the polls index.")
+
+def weather_config(request):
+    """ PM 20180926 prototype without database
+        http://127.0.0.1:8000/dashboard/weather/config
+        Moved to monitoring
+    """
+    try:
+        # Import PLC status sensor parser
+        from monitoring.plc_checker import PlcChecker
+        # Parse PLC status in colibri-new-fixed-2.json
+        #colibri_json = open("../simulators/plc/colibri-new-fixed-2.json")
+        #colibri_struct = json.load(colibri_json)
+        #plc_status = colibri_struct["statuses"][1]["entities"][0]
+        plc_checker = PlcChecker()
+        _struct = {"origin":plc_checker.origin, "sensors_table":plc_checker.sensors_table}
+        # Return template with sensors list
+        return render(request, 'dashboard/config_weather.html', {'weather_config' : _struct, 'base_template' : "base.html"})
+    except Config.DoesNotExist:
+        return render(request, 'dashboard/config_weather.html', {'weather_info' : None})