2022-12 Change filter wastewater structures

qgepqwat2ili/gui/__init__.py

@@ -255,7 +255,9 @@ def action_do_export():
         log_handler.setLevel(logging.INFO)
         log_handler.setFormatter(logging.Formatter("%(levelname)-8s %(message)s"))
         with LoggingHandlerContext(log_handler):
-            qgep_export(selection=export_dialog.selected_ids, labels_file=labels_file_path)
+            # 12.12.2022
+            #qgep_export(selection=export_dialog.selected_ids, labels_file=labels_file_path)
+            qgep_export(selection=export_dialog.selected_ids, selection2=export_dialog.selected_wws, labels_file=labels_file_path)
         progress_dialog.setValue(50)
 
         # Cleanup

qgepqwat2ili/gui/gui_export.py

@@ -80,6 +80,17 @@ def selected_ids(self):
         else:
             return None
 
+    # neu 12.12.2022
+    @property
+    def selected_wws(self):
+        if self.limit_checkbox.isChecked():
+            ids = []
+            for struct in self.structures:
+                ids.append(str(struct["obj_id"]))
+            return ids
+        else:
+            return None
+
     @property
     def limit_to_selection(self):
         return self.limit_checkbox.isChecked()

qgepqwat2ili/qgep/export.py

@@ -10,12 +10,15 @@
 from .model_qgep import get_qgep_model
 
 
-def qgep_export(selection=None, labels_file=None):
+# 12.12.2022
+# def qgep_export(selection=None, labels_file=None):
+def qgep_export(selection=None, selection2=None, labels_file=None):
     """
     Export data from the QGEP model into the ili2pg model.
 
     Args:
         selection:      if provided, limits the export to networkelements that are provided in the selection
+        selection2:      if provided, adds additional wastewater_nodes of selected wastewater_structures
     """
 
     QGEP = get_qgep_model()
@@ -31,6 +34,8 @@ def qgep_export(selection=None, labels_file=None):
     # Filtering
     filtered = selection is not None
     subset_ids = selection if selection is not None else []
+    # 12.12.2022
+    wws_ids = selection2 if selection2 is not None else []
 
     def get_tid(relation):
         """
@@ -464,6 +469,7 @@ def textpos_common(row, t_type, geojson_crs_def):
                 QGEP.reach_point.obj_id == QGEP.reach.fk_reach_point_to,
             ),
         ).filter(QGEP.wastewater_networkelement.obj_id.in_(subset_ids))
+        logger.info("filtered query: " + str(query))
     for row in query:
 
         # AVAILABLE FIELDS IN QGEP.reach_point
@@ -501,7 +507,24 @@ def textpos_common(row, t_type, geojson_crs_def):
     logger.info("Exporting QGEP.wastewater_node -> ABWASSER.abwasserknoten, ABWASSER.metaattribute")
     query = qgep_session.query(QGEP.wastewater_node)
     if filtered:
-        query = query.filter(QGEP.wastewater_networkelement.obj_id.in_(subset_ids))
+        # 12.12.2022
+        # filtering on fk_wastewater_structure.in_(subset_ids) to get all wastewater_nodes
+        # query = query.filter(QGEP.wastewater_networkelement.obj_id.in_(subset_ids))
+        # query = query.filter(QGEP.wastewater_networkelement.fk_wastewater_structure.in_(wws_ids))
+        # https://docs.sqlalchemy.org/en/14/orm/tutorial.html#common-filter-operators
+        # from sqlalchemy import or_
+        # query.filter(or_(User.name == 'ed', User.name == 'wendy'))
+        #query = query.filter(or_(QGEP.wastewater_networkelement.fk_wastewater_structure.in_(wws_ids)),(QGEP.wastewater_networkelement.obj_id.in_(subset_ids)))
+        #query = query.filter(or_((QGEP.wastewater_networkelement.fk_wastewater_structure.in_(wws_ids)),(QGEP.wastewater_networkelement.obj_id.in_(subset_ids))))
+        query1 = query.filter(QGEP.wastewater_networkelement.obj_id.in_(subset_ids))
+        query2 = query.filter(QGEP.wastewater_networkelement.fk_wastewater_structure.in_(wws_ids))
+        logger.info("filtered query1: " + str(query1))
+        logger.info("filtered query2: " + str(query2))
+        # q3 = q1.union(q2)
+        query = query1.union(query2)
+        logger.info("filter wastewater_node: wws_ids" + str(wws_ids))
+        logger.info("filter wastewater_node: subset_ids" + str(subset_ids))
+        logger.info("filtered query: " + str(query))
     for row in query:
 
         # AVAILABLE FIELDS IN QGEP.wastewater_node
@@ -534,7 +557,11 @@ def textpos_common(row, t_type, geojson_crs_def):
             sohlenkote=row.bottom_level,
         )
         abwasser_session.add(abwasserknoten)
+        logger.info("abwasser_session.add(abwasserknoten): " + str(abwasserknoten))
         create_metaattributes(row)
+
+        logger.info("create_metaattributes(row): " + str(row))
+
         print(".", end="")
     logger.info("done")
     abwasser_session.flush()