From 70b0b4ef9cecf19afd9efaef74edfd7890dc5bfc Mon Sep 17 00:00:00 2001 From: Damiano Lombardi Date: Mon, 29 Jul 2024 12:20:46 +0200 Subject: [PATCH] Same with baseclass --- .../interlis_exporter_to_intermediate_schema.py | 10 +++------- .../model_interlis_sia405_abwasser.py | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/plugin/teksi_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py b/plugin/teksi_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py index 2d24fbda4..90bc21759 100644 --- a/plugin/teksi_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py +++ b/plugin/teksi_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py @@ -2854,20 +2854,16 @@ def base_common(self, row, type_name): "t_type": type_name, "t_id": self.get_tid(row), } - # if self.current_basket: - # base["t_basket"] = self.current_basket.t_id + if self.current_basket: + base["t_basket_baseclass"] = self.current_basket.t_id return base def sia_405_base_common(self, row, type_name): - base = { + return { **self.base_common(row, type_name), "letzte_aenderung": row.last_modification, } - if self.current_basket: - base["t_basket_sia405_baseclass"] = self.current_basket.t_id - - return base def vsa_base_common(self, row, type_name): """ diff --git a/plugin/teksi_wastewater/interlis/interlis_model_mapping/model_interlis_sia405_abwasser.py b/plugin/teksi_wastewater/interlis/interlis_model_mapping/model_interlis_sia405_abwasser.py index 33bbad432..a94057a03 100644 --- a/plugin/teksi_wastewater/interlis/interlis_model_mapping/model_interlis_sia405_abwasser.py +++ b/plugin/teksi_wastewater/interlis/interlis_model_mapping/model_interlis_sia405_abwasser.py @@ -11,6 +11,7 @@ def __init__(self): class baseclass(self.Base): __tablename__ = "baseclass" __table_args__ = {"schema": config.ABWASSER_SCHEMA} + t_basket_baseclass = Column("t_basket", Integer) ModelInterlisSia405Abwasser.baseclass = baseclass