fix x channels

utils/csv/data_preparation.py

@@ -99,16 +99,18 @@ def make_ain_din_matrix(cfg: object, id: int) -> list:
         for riga in [riga for riga in righe if re.match(pattern, riga)]:
             timestamp, batlevel, temperature, analog_input1, analog_input2, digital_input1, digital_input2  = riga.split(';')
             EventDate, EventTime = timestamp.split(' ')
+            if any(node_ains):
+                for node_num, analog_act in enumerate([analog_input1, analog_input2], start=1):
+                    matrice_valori.append([UnitName, ToolNameID, node_num, date_check.conforma_data(EventDate), EventTime, batlevel, temperature] + [analog_act] + ([None] * (19 - 1)))
+            else:
+                logger.info(f"Nessun Ingresso analogico per {UnitName} {ToolNameID}")
             if any(node_dins):
-                for node_num, digital_act in enumerate([digital_input1, digital_input2], start=1):
+                start_node = 3 if any(node_ains) else 1
+                for node_num, digital_act in enumerate([digital_input1, digital_input2], start=start_node):
                     matrice_valori.append([UnitName, ToolNameID, node_num, date_check.conforma_data(EventDate), EventTime, batlevel, temperature] + [digital_act] + ([None] * (19 - 1)))
             else:
                 logger.info(f"Nessun Ingresso digitale per {UnitName} {ToolNameID}")
-                if any(node_ains):
-                    for node_num, analog_act in enumerate([analog_input1, analog_input2], start=1):
-                        matrice_valori.append([UnitName, ToolNameID, node_num, date_check.conforma_data(EventDate), EventTime, batlevel, temperature] + [analog_act] + ([None] * (19 - 1)))
-                else:
-                    logger.info(f"Nessun Ingresso analogico per {UnitName} {ToolNameID}")
+
     return matrice_valori
 
 def make_channels_matrix(cfg: object, id: int) -> list:

utils/parsers/by_type/g201_g201.py

@@ -1,16 +1,4 @@
-#!.venv/bin/python
-# Import necessary modules
-from utils.database.loader_action import load_data, update_status
-from utils.database import DATA_LOADED
-from utils.csv.data_preparation import make_matrix
-import logging
+from utils.csv.loaders import main_loader as channels_main_loader
 
-logger = logging.getLogger(__name__)
-
-# Define the main function for loading data
 async def main_loader(cfg: object, id: int) -> None:
-    # Create a matrix of values from the data
-    matrice_valori = make_matrix(cfg, id)
-    # Load the data into the database
-    if load_data(cfg, matrice_valori):
-        update_status(cfg, id, DATA_LOADED)
+    await channels_main_loader(cfg, id, "channels")

utils/parsers/by_type/g801_mux.py

@@ -1,16 +1,4 @@
-#!.venv/bin/python
-# Import necessary modules
-from utils.database.loader_action import load_data, update_status
-from utils.database import DATA_LOADED
-from utils.csv.data_preparation import make_matrix
-import logging
+from utils.csv.loaders import main_loader as channels_main_loader
 
-logger = logging.getLogger(__name__)
-
-# Define the main function for loading data
 async def main_loader(cfg: object, id: int) -> None:
-    # Create a matrix of values from the data
-    matrice_valori = make_matrix(cfg, id)
-    # Load the data into the database
-    if load_data(cfg, matrice_valori):
-        update_status(cfg, id, DATA_LOADED)
+    await channels_main_loader(cfg, id, "channels")

utils/parsers/by_type/g802_mux.py

@@ -1,4 +1,4 @@
-from .g801_mux import main_loader as g801_mux_main_loader
+from utils.csv.loaders import main_loader as channels_main_loader
 
 async def main_loader(cfg: object, id: int) -> None:
-    await g801_mux_main_loader(cfg, id)
+    await channels_main_loader(cfg, id, "channels")