Enable basket export for kek

qgepqwat2ili/__init__.py

@@ -201,34 +201,41 @@ def main(args):
             ILI_EXPORT_MODEL_NAME = None
 
         if args.direction == "export":
+            basket_enabled = True
+            if args.export_sia405 or args.export_dss:
+                basket_enabled = False
+
             utils.ili2db.create_ili_schema(
                 SCHEMA,
                 ILI_MODEL,
                 make_log_path(log_path, "ilicreate"),
                 recreate_schema=args.recreate_schema,
-                create_basket_col=False,
+                create_basket_col=basket_enabled,
             )
-            # add model dependency
+
             if args.export_sia405:
                 # SIA405_ABWASSER_2015_LV95
                 qgep_export_sia405(
                     selection=args.selection.split(",") if args.selection else None,
                     labels_file=args.labels_file,
                     orientation=args.labels_orientation,
+                    basket_enabled=basket_enabled,
                 )
             elif args.export_dss:
                 # DSS_2015_LV95 expor5t
                 qgep_export_dss(
                     selection=args.selection.split(",") if args.selection else None,
                     labels_file=args.labels_file,
                     orientation=args.labels_orientation,
+                    basket_enabled=basket_enabled,
                 )
             else:
                 # VSA_KEK_2019_LV95 export
                 qgep_export_kek(
                     selection=args.selection.split(",") if args.selection else None,
                     labels_file=args.labels_file,
                     orientation=args.labels_orientation,
+                    basket_enabled=basket_enabled,
                 )
 
             utils.ili2db.export_xtf_data(

qgepqwat2ili/config.py

@@ -51,6 +51,6 @@
 WASSER_ILI_MODEL_NAME = "SIA405_WASSER_2015_LV95"
 
 TOPIC_NAME_SIA405_ADMINISTRATION = "SIA405_Base_Abwasser_LV95.Administration"
-TOPIC_NAME_SIA405_ABWASSER = "SIA405_ABWASSER_2015.SIA405_Abwasser"
+TOPIC_NAME_SIA405_ABWASSER = "SIA405_ABWASSER_2015_LV95.SIA405_Abwasser"
 TOPIC_NAME_DSS = "DSS_2015.Siedlungsentwaesserung"
 TOPIC_NAME_KEK = "VSA_KEK_2019_LV95.KEK"

qgepqwat2ili/gui/__init__.py

@@ -549,7 +549,7 @@ def action_do_export():
                 config.ABWASSER_ILI_MODEL,
                 log_path,
                 recreate_schema=True,
-                create_basket_col=False,
+                create_basket_col=True,
             )
         elif emodel == "SIA405_ABWASSER_2015_LV95":
             create_ili_schema(
@@ -663,6 +663,7 @@ def action_do_export():
                     selection=export_dialog.selected_ids,
                     labels_file=labels_file_path,
                     orientation=eorientation,
+                    basket_enabled=True,
                 )
             # 22.3.2023 / 28.3.2023 adjusted to qgepsia405_export
             elif emodel == "SIA405_ABWASSER_2015_LV95":
@@ -673,6 +674,7 @@ def action_do_export():
                     selection=export_dialog.selected_ids,
                     labels_file=labels_file_path,
                     orientation=eorientation,
+                    basket_enabled=False,
                 )
             elif emodel == "DSS_2015_LV95":
                 logger.info("Start Exporting DSS_2015_LV95 - qgepdss_export")
@@ -682,6 +684,7 @@ def action_do_export():
                     selection=export_dialog.selected_ids,
                     labels_file=labels_file_path,
                     orientation=eorientation,
+                    basket_enabled=False,
                 )
             else:
                 progress_dialog.close()

qgepqwat2ili/utils/qgep_export_utils.py

@@ -149,7 +149,7 @@ def create_metaattributes(self, row):
         )
 
         if self.current_basket is not None:
-            metaattribute["t_basket"] = self.current_basket.t_id
+            metaattribute.t_basket = self.current_basket.t_id
 
         self.abwasser_session.add(metaattribute)
 
@@ -165,7 +165,7 @@ def base_common(self, row, type_name):
             "t_id": self.get_tid(row),
         }
 
-        if self.current_basket is not None:
+        if self.current_basket is not None and type_name != "organisation":
             base["t_basket"] = self.current_basket.t_id
 
         return base
@@ -281,6 +281,11 @@ def export_organisation(self):
                 bemerkung=self.truncate(self.emptystr_to_null(row.remark), 80),
                 bezeichnung=self.null_to_emptystr(row.identifier),
             )
+
+            print(f"Current basket id: {self.current_basket.t_id}")
+            if self.current_basket is not None:
+                organisation.t_basket = self.current_basket.t_id
+
             self.abwasser_session.add(organisation)
             self.create_metaattributes(row)
             print(".", end="")