colibri-new-fixed json

Patrick Maeght
1 parent 9bb6a2a9
Showing 5 changed files with 95 additions and 25 deletions Show diff stats
simulators/plc/colibri-new-fixed-2.json
src/dashboard/templates/dashboard/config_weather.html
src/dashboard/urls.py
src/dashboard/views.py
src/monitoring/plc_checker.py
@@ -247,7 +247,7 @@
               "device_name": "VantagePro",
               "device_type": "meteo",
               "serial_number": "ERTRY2344324",
-              "valid": "no",
+              "valid": "yes",
               "device_values": [
                 {
                   "name": "OutsideTemp",
@@ -0,0 +1,47 @@
+<style>
+
+#none {
+    font-family: 'Montserra', sans-serif;
+}
+
+</style>
+    <div class="row">
+
+        <h1 id="none">Weather config</h1>
+
+    <div class="well">
+        Captors list:
+    </div>
+    <div class="row">
+        <h3>Valid meteo devices</h3>
+        <div class="table-responsive">
+            <table
+                class="table table-bordered table-hover table-striped tablesorter" style="font-family: 'Montserra', sans-serif;">
+                <thead>
+                    <tr>
+                        <th>Device type<i class="fa fa-sort"></i></th>
+                        <th>Deice id <i class="fa fa-sort"></i></th>
+                        <th>value <i class="fa fa-sort"></i></th>
+                        <th>Select <i class="fa fa-sort"></i></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for key1, value1 in weather_config.items %}
+                      <tr>
+                                <td>{{key1}}</td>
+                                <td></td>
+                                <td></td>
+                                <td></td
+                        </tr>
+                        {% for key2, value2 in value1.items %}
+                            <tr>
+                                <td></td>
+                                <td>{{key2}}</td>
+                                <td>{{value2}}</td>
+                                <td><input class="form-check-input" name="{{key1}}" id="oR{{key1}}/{{key2}}" value="option1" checked="" type="radio"></td>
+                        {% endfor %}
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
@@ -11,6 +11,7 @@ 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'),
@@ -143,28 +143,44 @@ def weather(request):
 def weather_current(request):
     # PM 20180718
-    if request.is_ajax():
-        try:
-            weather_status = WeatherWatch.objects.latest('updated')
-            plc_device_status = PlcDeviceStatus.objects.exclude(plc_mode=None).latest('created')
-            plc_mode = plc_device_status.plc_mode
-            is_safe = plc_device_status.is_safe
-            weather = serializers.serialize('json', [weather_status])
-            weather = json.loads(weather)
-            ack = Config.objects.get(id=1).ack
-            plc_timeout = Config.objects.get(pk=1).plc_timeout_seconds
-            timeout = (datetime.datetime.now() - plc_device_status.created).total_seconds()
-            weather[0]['max_sunelev'] = SUN_ELEV_DAY_THRESHOLD
-            weather[0]['sunelev'] = get_sunelev()
-            weather[0]["plc_mode"] = plc_mode
-            weather[0]["is_safe"] = is_safe
-            weather[0]["ACK"] = ack
-            weather[0]["plc_timeout"] = timeout
-            weather[0]["max_plc_timeout"] = plc_timeout
-            weather[0]["pyros_mode"] = Config.objects.get(id=1).pyros_state
-            return HttpResponse(json.dumps(weather), content_type="application/json")
-        except WeatherWatch.DoesNotExist:
-            raise Http404("No WeatherWatch matches the given query.")
+    #if request.is_ajax():
+    try:
+        weather_status = WeatherWatch.objects.latest('updated')
+        plc_device_status = PlcDeviceStatus.objects.exclude(plc_mode=None).latest('created')
+        plc_mode = plc_device_status.plc_mode
+        is_safe = plc_device_status.is_safe
+        weather = serializers.serialize('json', [weather_status])
+        weather = json.loads(weather)
+        ack = Config.objects.get(id=1).ack
+        plc_timeout = Config.objects.get(pk=1).plc_timeout_seconds
+        timeout = (datetime.datetime.now() - plc_device_status.created).total_seconds()
+        weather[0]['max_sunelev'] = SUN_ELEV_DAY_THRESHOLD
+        weather[0]['sunelev'] = get_sunelev()
+        weather[0]["plc_mode"] = plc_mode
+        weather[0]["is_safe"] = is_safe
+        weather[0]["ACK"] = ack
+        weather[0]["plc_timeout"] = timeout
+        weather[0]["max_plc_timeout"] = plc_timeout
+        weather[0]["pyros_mode"] = Config.objects.get(id=1).pyros_state
+        return HttpResponse(json.dumps(weather), content_type="application/json")
+    except WeatherWatch.DoesNotExist:
+        raise Http404("No WeatherWatch matches the given query.")
+
+def weather_config(request):
+    # PM 20180926 prototype whithout database
+    try:
+        #import os
+        from src.monitoring.plc_checker import PlcChecker
+        #cur_dir = os.path.abspath(".")
+        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(plc_status)
+        plc_checker.scan_captors()
+
+        return render(request, 'dashboard/config_weather.html', {'weather_config' : plc_checker.captors_conf})
+    except Config.DoesNotExist:
+        return render(request, 'dashboard/config_weather.html', {'weather_info' : None})
 def weather_current_old(request):
     try:
@@ -25,11 +25,17 @@ class PlcChecker(object):
         self.captors_conf = {}
     def scan_captors(self):
-        logger.debug(self.struct["date"])
+        try:
+            logger.debug(self.struct["date"])
+        except Exception as e:
+            logger.debug("No date")
         for captor_type in self.captors:
             self.captors_conf[captor_type] = {}
             logger.debug(captor_type + ":")
-            self.cross_devices_list(captor_type)
+            try:
+                self.cross_devices_list(captor_type)
+            except Exception as e:
+                logger.debug(captor_type + " error")
     def cross_devices_list(self, captor_type):
         """"""