WCE/NAFKA-crm-gui
1
0
Fork 0
generated from dopt-python/py311
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

prepare new loading scheme for auto form data (not working yet)

Browse Source
This commit is contained in:
Florian Förster
2026-07-15 17:28:24 +02:00
parent f4a4d2d98e
commit a40213a1ed
3 changed files with 316 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wce_crm/gui.py
+48 -19
View File
@@ -86,6 +86,7 @@ from wce_crm.data_models import (
Beratungsgespraech_Vorgang,
Grunderfassung_Personen,
Grunderfassung_Unternehmen,
Initrec,
Page_CompanyProfile_State,
Page_Consulting_ConsultingSession_State,
Page_Consulting_State,
@@ -111,7 +112,7 @@ from wce_crm.logging import (
logger_gui,
logger_page_consulting,
)
from wce_crm.types import CompanyProfileConsultationEntry, ConsultingType
from wce_crm.types import CompanyProfileConsultationEntry, ConsultingType, RecId
if TYPE_CHECKING:
from wce_crm.data_models import AutoForm_State, Module, WrapperModule
@@ -1417,7 +1418,7 @@ class AutoForm(QWidget):
self.main_layout.addWidget(self.registry_button)
self.test_button = QPushButton("Initialisiere Laden")
self.test_button.clicked.connect(self._load_data)
self.test_button.clicked.connect(self._load_from_id)
self.test_button.setFixedHeight(35)
self.test_button.setSizePolicy(
QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed
@@ -1535,9 +1536,9 @@ class AutoForm(QWidget):
self.update_triggered.emit()
self.reset_form()
def _load_data(
def _load_from_id(
self,
lookup_id: int | None,
id_: RecId | None,
) -> None:
if DEBUG_NO_DATABASE:
return
@@ -1545,28 +1546,33 @@ class AutoForm(QWidget):
logger_auto_form.info("[Auto-Form] Load data method...")
self.reset_form()
logger_auto_form.debug("[Auto-Form] Lookup ID: %s", lookup_id)
logger_auto_form.debug("[Auto-Form] Lookup ID: %s", id_)
if lookup_id is not None:
if id_ is not None:
logger_auto_form.debug("Load from DB:")
loaded_data = self.cfg.data_get(lookup_id)
returned = self.cfg.from_db(id_)
# loaded_data = self.cfg.data_get(lookup_id)
# TODO add path to avoid unnecessary loading (where the same ID is loaded
# twice in a row) -- use an internal marker (not state-related)
else:
logger_auto_form.debug("[Auto-Form] Loading: Lookup ID NULL. Do nothing!")
return
# logger_auto_form.debug(
# "[Auto-Form] Loaded data dict:\n%s Passing to Pydantic...", pformat(loaded_data)
# )
logger_auto_form.debug(
"[Auto-Form] Loaded data dict:\n%s Passing to Pydantic...", pformat(loaded_data)
"[Auto-Form] Loaded data dict:\n%s Passing to Pydantic...",
pformat(returned.form_data),
)
model = self.cfg.model(**loaded_data)
model = self.cfg.model(**returned.form_data)
logger_auto_form.debug("[Auto-Form] Loaded to Pydantic.")
logger_auto_form.debug("[Auto-Form] Convert to GUI structure...")
form_data = model.to_gui()
logger_auto_form.debug("[Auto-Form] Set form data...")
logger_auto_form.debug("[Auto-Form] Form data:\n%s", pformat(form_data))
self._set_form_data(form_data)
self.STATE.rec_id = lookup_id
self.STATE.rec_id = id_
self._activate_delete()
def reset_form(self) -> None:
@@ -1608,7 +1614,7 @@ class AutoForm(QWidget):
section: Literal["form", "locking"] | None,
) -> None:
if section is None or section == "form":
self._load_data(self.STATE.rec_id)
self._load_from_id(self.STATE.rec_id)
if section is None or section == "locking":
if self.STATE.locked:
@@ -1641,6 +1647,13 @@ class AutoForm(QWidget):
return self.STATE
def _load_from_pydantic(self, data: Initrec) -> None:
self.STATE.rec_id = data.rec_id
self.STATE.form_data = data.form_data
self.STATE.geloescht = True if data.geloescht else False
self._sync_state_to_GUI(None) # TODO change to correct loading
def save_data(self) -> None:
self._disable_save()
errors = self.validate()
@@ -1679,15 +1692,27 @@ class AutoForm(QWidget):
"[Auto-Form] Form data with 'exlude' (must be saved in the database):\n%s",
pformat(db_data),
)
deleted_datetime: datetime.datetime | None = None
if self.STATE.geloescht:
deleted_datetime = datetime.datetime.now(datetime.UTC)
try:
if self.STATE.rec_id is None:
logger_auto_form.debug("[Auto-Form] Insert triggered...")
init_rec_id = self.cfg.data_insert(db_data)
assert isinstance(init_rec_id, int)
self.STATE.rec_id = init_rec_id
else:
logger_auto_form.debug("[Auto-Form] Update triggered...")
self.cfg.data_update(self.STATE.rec_id, db_data)
to_db = Initrec(
rec_id=self.STATE.rec_id,
geloescht=deleted_datetime,
form_data=db_data,
)
returned = self.cfg.to_db(to_db)
self._load_from_pydantic(returned)
# if self.STATE.rec_id is None:
# logger_auto_form.debug("[Auto-Form] Insert triggered...")
# init_rec_id = self.cfg.data_insert(db_data)
# assert isinstance(init_rec_id, int)
# self.STATE.rec_id = init_rec_id
# else:
# logger_auto_form.debug("[Auto-Form] Update triggered...")
# self.cfg.data_update(self.STATE.rec_id, db_data)
self.update_triggered.emit()
self._activate_delete()
@@ -2876,6 +2901,8 @@ class Page_NewInitRec(QWidget):
CONFIG_GRUNDERFASSUNG_UNTERNEHMEN: Final[AutoFormConfig] = AutoFormConfig(
model=Grunderfassung_Unternehmen,
to_db=backend.initrec_company_to_db,
from_db=backend.initrec_company_from_db,
data_insert=backend.initrec_company_insert_initial_recording,
data_update=backend.initrec_company_update_initial_recording,
data_get=backend.initrec_company_get_initial_recording,
@@ -2889,6 +2916,8 @@ CONFIG_GRUNDERFASSUNG_UNTERNEHMEN: Final[AutoFormConfig] = AutoFormConfig(
CONFIG_GRUNDERFASSUNG_PERSONEN: Final[AutoFormConfig] = AutoFormConfig(
model=Grunderfassung_Personen,
to_db=backend.initrec_person_to_db,
from_db=backend.initrec_person_from_db,
data_insert=backend.initrec_person_insert_initial_recording,
data_update=backend.initrec_person_update_initial_recording,
data_get=backend.initrec_person_get_initial_recording,