check captors config page

Patrick Maeght
1 parent 5716be60
Showing 4 changed files with 31 additions and 27 deletions Show diff stats
src/dashboard/templates/dashboard/config_weather.html
src/dashboard/views.py
src/monitoring/plc_checker.py
src/monitoring/tasks.py
@@ -16,28 +16,26 @@
             <table class="table">
                 <thead>
                     <tr>
-                        <th>Device type</th>
-                        <th>Deice id </th>
-                        <th>value </th>
+                        <th>device_name</th>
+                        <th>device_type</th>
+                        <th>serial_number</th>
+                        <th>valid</th>
+                        <th>name</th>
+                        <th>type</th>
                         <th>Select </th>
                     </tr>
                 </thead>
                 <tbody>
-                    {% for key1, value1 in weather_config.items %}
-                      <tr>
-                                <td>{{key1}}</td>
-                                <td></td>
-                                <td></td>
-                                <td></td
+                    {% for line in weather_config%}
+                        <tr class="info">
+                        <td>{{line.0}}</td>
+                        <td>{{line.1}}</td>
+                        <td>{{line.2}}</td>
+                        <td>{{line.3}}</td>
+                        <td>{{line.4}}</td>
+                        <td>{{line.5}}</td>
+                        <td><input class="form-check-input" name="{{line.4}}" value="{{line.6}}" checked="" type="radio"></td>
                         </tr>
-                        {% for key2, value2 in value1.items %}
-                            <tr class="info">
-                                <td></td>
-                                <td>{{key2}}</td>
-                                <td>{{value2}}</td>
-                                <td><input class="form-check-input" name="{{key1}}" id="{{key1}}/{{key2}}" value="{{key1}}/{{key2}}" checked="" type="radio"></td>
-                            </tr>
-                        {% endfor %}
                     {% endfor %}
                 </tbody>
             </table>
@@ -181,7 +181,7 @@ def weather_config(request):
         plc_checker = PlcChecker()
         #plc_checker.scan_sensors()
         # Return template with sensors list
-        return render(request, 'dashboard/config_weather.html', {'weather_config' : plc_checker.captors_conf, 'base_template' : "base.html"})
+        return render(request, 'dashboard/config_weather.html', {'weather_config' : plc_checker.captors_table, 'base_template' : "base.html"})
     except Config.DoesNotExist:
         return render(request, 'dashboard/config_weather.html', {'weather_info' : None})
  
@@ -13,8 +13,6 @@ class PlcChecker(object):
         self.struct = None
         self.path_list = None
         # self.plc_global = copy.copy(self.struct["devices"])
-        #
-        self.load_config()
         self.device_name = None
         self.device_type = None
         self.serial_number = None
@@ -33,11 +31,12 @@ class PlcChecker(object):
         ]
         self.captors_conf = {}
         self.captors_table = []
+        self.load_config()
  
     def load_config(self):
         try:
             colibri_json = open("./monitoring/plc_config.json")
-            self.struct = json.load(colibri_json)
+            self.captors_table = json.load(colibri_json)
             logger.info("Loaded : plc_config.json")
             colibri_json.close
         except:
@@ -46,7 +45,7 @@ class PlcChecker(object):
     def save_config(self):
         #try:
             _file = open("./monitoring/plc_config.json" , 'w')
-            _file.write(json.dumps(self.captors_conf))
+            _file.write(json.dumps(self.captors_table))
             _file.close()
             logger.info("Saved : plc_config.json")
         #except:
@@ -58,17 +57,18 @@ class PlcChecker(object):
             self.struct = struct[0]
         else:
             self.struct = struct
-        if self.struct["entity_name"] == "PLC_STATUS":
-            if not self.same_origin():
+        if not self.same_origin():
                 self.scan_sensors()
                 self.save_config()
-        else:
-            logger.info("No PLC_STATUS")
  
     def same_origin(self):
+        # check new origin
         if self.struct["from"] == self.plc_from and self.struct["site"] == self.plc_site:
             return True
         else:
+            # update origin
+            self.plc_from = self.struct["from"]
+            self.plc_site = self.struct["site"]
             return False
  
     def get_key(self, struct, key):
@@ -80,15 +80,19 @@ class PlcChecker(object):
  
     def scan_sensors(self):
         # return captors table from struct
+        self.captors_table = []
         try:
             logger.debug(self.struct["date"])
         except Exception as e:
             logger.debug("No date")
+        ind1 = 0
         for device in self.struct["devices"]:
             self.device_name = self.get_key(device, "device_name")
             self.device_type = self.get_key(device, "device_type")
             self.serial_number = self.get_key(device, "serial_number")
             self.valid = self.get_key(device, "valid")
+            ind1 += 1
+            ind2 = 0
             for device_values in device["device_values"]:
                 captor = []
                 captor.append(self.device_name)
@@ -97,7 +101,9 @@ class PlcChecker(object):
                 captor.append(self.valid)
                 captor.append(self.get_key(device_values, "name"))
                 captor.append(self.get_key(device_values, "type"))
+                captor.append(str(ind1) + "_" + str(ind2))
                 self.captors_table.append(captor)
+                ind2 += 1
  
  
     # deprecated find captor list in struct
@@ -259,7 +259,7 @@ class Monitoring(Task):
  
     def parseNewStatus(self,status_plc ):
         # """ PM 20181009 parse new status for config
-        if status_plc[:7] != "NOT_SET":
+        if status_plc.find('PLC_STATUS') >= 0:
             self.plc_checker.chk_config(status_plc)
  
     '''