xmas-app 0.13.1__tar.gz → 0.15.0__tar.gz

{xmas_app-0.13.1 → xmas_app-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmas-app
-Version: 0.13.1
+Version: 0.15.0
 Summary: The XLeitstelle model-driven application schema app.
 License: EUPL-1.2-or-later
 License-File: LICENSE
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Dist: nicegui (>=2.20,<3.0)
 Requires-Dist: pydantic-extra-types[semver]
 Requires-Dist: pydantic-settings (>=2.0,<3.0)
-Requires-Dist: xplan-tools (>=1.11.1,<1.12.0)
+Requires-Dist: xplan-tools (>=1.13.1,<1.14.0)
 Project-URL: Homepage, https://gitlab.opencode.de/xleitstelle/xmas-app
 Project-URL: Issues, https://gitlab.opencode.de/xleitstelle/xmas-app/-/issues
 Description-Content-Type: text/markdown
@@ -66,7 +66,7 @@ pixi install
 ## Running
 
 ### Preconditions
-A Postgres DB with PostGIS extension and adequate permissions for the used role. If no database schema was previously created with `xplan-tools`, it will be generated on initialization.
+A Postgres DB with PostGIS extension and adequate permissions for the used role. If required tables were not previously created with `xplan-tools`, they will be generated on initialization.
 
 For convenience, you can run
 
@@ -97,6 +97,7 @@ The database connection parameters can be either user name, password etc. or a s
 | APP_PORT | the port on which the app should run | x | 1337      |
 | APPSCHEMA | the default appschema | x | xplan     |
 | APPSCHEMA_VERSION | the default appschema's version | x | 6.0       |
+| XMAS_DB_SCHEMA | the database schema to use |  | myschema       |
 
 First activate the pixi shell
 

{xmas_app-0.13.1 → xmas_app-0.15.0}/README.md

@@ -44,7 +44,7 @@ pixi install
 ## Running
 
 ### Preconditions
-A Postgres DB with PostGIS extension and adequate permissions for the used role. If no database schema was previously created with `xplan-tools`, it will be generated on initialization.
+A Postgres DB with PostGIS extension and adequate permissions for the used role. If required tables were not previously created with `xplan-tools`, they will be generated on initialization.
 
 For convenience, you can run
 
@@ -75,6 +75,7 @@ The database connection parameters can be either user name, password etc. or a s
 | APP_PORT | the port on which the app should run | x | 1337      |
 | APPSCHEMA | the default appschema | x | xplan     |
 | APPSCHEMA_VERSION | the default appschema's version | x | 6.0       |
+| XMAS_DB_SCHEMA | the database schema to use |  | myschema       |
 
 First activate the pixi shell
 

{xmas_app-0.13.1 → xmas_app-0.15.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xmas-app"
-version = "0.13.1"
+version = "0.15.0"
 description = "The XLeitstelle model-driven application schema app."
 authors = [{ name = "Tobias Kraft", email = "tobias.kraft@gv.hamburg.de" }]
 classifiers = [
@@ -16,11 +16,8 @@ license-files = ["LICENSE"]
 dependencies = [
     "pydantic-settings>=2.0,<3.0",
     "pydantic-extra-types[semver]",
-    "xplan-tools~=1.11.1",
+    "xplan-tools~=1.13.1",
     "nicegui>=2.20,<3.0",
-    # "uvicorn[standard]>=0.29,<0.31"
-    # "pygeoapi @ git+https://github.com/geopython/pygeoapi.git",
-    # if git source is required, git must be installed in OSGeo4W Shell for the complete plugin installation
 ]
 requires-python = ">=3.11,<3.14"
 

{xmas_app-0.13.1 → xmas_app-0.15.0}/xmas_app/components/association.py

@@ -3,7 +3,7 @@ import logging
 from nicegui import app, binding, events, run, ui
 
 from xmas_app.components.buttons import FeatureInteractionButton
-from xmas_app.db import get_ref_candidates, get_ref_objects
+from xmas_app.util.db import get_ref_candidates, get_ref_objects
 
 logger = logging.getLogger("xmas_app")
 
@@ -174,7 +174,7 @@ class AssociationList(ui.button):
             },
             {
                 "name": "updated",
-                "label": "letzte Aktualisierung",
+                "label": "Aktualisierung",
                 "field": "updated",
                 "align": "left",
                 "sortable": True,
@@ -203,6 +203,7 @@ class AssociationList(ui.button):
                 square
                 dense
                 virtual-scroll
+                bordered
             """
             )
             .classes("w-full h-full")
@@ -223,7 +224,7 @@ class AssociationList(ui.button):
                 ui.input("Filter")
                 .bind_value(table, "filter")
                 .tooltip("über alle Spalten nach Ausdruck filtern")
-                .props("clearable square dense")
+                .props("stack-label filled clearable square dense")
                 .classes("w-64")
             )
             with search.add_slot("prepend"):

{xmas_app-0.13.1 → xmas_app-0.15.0}/xmas_app/form.py

@@ -137,6 +137,7 @@ class ModelForm:
                     mode="json",
                     exclude_unset=True,
                     exclude={"id", self.model.get_geom_field()},
+                    context={"datatype": True},
                 ),
                 "featuretype": self.model.get_name(),
                 "id": model_instance.id,
@@ -231,14 +232,16 @@ class ModelForm:
             setattr(feature, geom_field, geom)
         try:
             return self.model.model_validate(feature)
-        except ValidationError as e:
-            message = f"Fehlerhafte Eingabe: {', '.join(set([str(error['loc'][0]) for error in e.errors()]))}"
-            if getattr(self, "current_validation_error", None) != message:
-                self.current_validation_error = message
-                ui.notify(
-                    message,
+        except ValidationError:
+            if not getattr(self, "validation_error_notification", False):
+                self.validation_error_notification = True
+                ui.notification(
+                    "Fehlende Pflichtattribute",
                     type="negative",
                     position="bottom",
+                    on_dismiss=lambda: setattr(
+                        self, "validation_error_notification", False
+                    ),
                 )
 
     async def _set_stylesheetId_and_schriftinhalt(self) -> None:
@@ -502,24 +505,25 @@ class ModelForm:
                     )
                 if not preview:
                     with ui.item_section().props("side"):
-                        delete_button = (
-                            ui.button(
-                                icon="delete",
-                                on_click=partial(delete_form, list_item, item),
-                            )
-                            .props("flat round")
-                            .bind_enabled_from(
+                        delete_button = ui.button(
+                            icon="delete",
+                            on_click=partial(delete_form, list_item, item),
+                        ).props("flat round")
+                        if not self.editable or (
+                            not prop_info["nullable"]
+                            and prop_info["list"]
+                            and index == 0
+                        ):
+                            delete_button.disable()
+                        else:
+                            delete_button.bind_enabled_from(
                                 bind_obj,
                                 key,
                                 backward=lambda x: len(x) > 1
                                 if not prop_info["nullable"] and isinstance(x, list)
-                                else x is not None
-                                if prop_info["nullable"]
-                                else x,
+                                else prop_info["nullable"],
                             )
-                        )
-                        if not self.editable:
-                            delete_button.disable()
+
             return list_item
 
         if not prop_info["nullable"] and not getattr(bind_obj, key, None):
@@ -548,12 +552,6 @@ class ModelForm:
                         sub_model.get_name(), sub_model.__doc__
                     ).classes("text-bold")
                 ui.separator()
-            if value is not None:
-                if isinstance(value, list):
-                    for index, item in enumerate(value):
-                        await build_item(sub_model, item, index)
-                else:
-                    await build_item(sub_model, value)
             if not preview:
                 if prop_info["list"] or (prop_info["nullable"] and not value):
                     with ui.item().classes("justify-center"):
@@ -579,10 +577,16 @@ class ModelForm:
                                             next(x.sender.descendants()).text
                                         ),
                                     )
+            if value is not None:
+                if isinstance(value, list):
+                    for index, item in enumerate(value):
+                        await build_item(sub_model, item, index)
+                else:
+                    await build_item(sub_model, value)
 
     async def _build_model_form(
         self,
-        model: BaseFeature,
+        model: type[BaseFeature],
         bind_obj: type,
         main_form: bool = False,
         preview: bool = False,
@@ -632,7 +636,7 @@ class ModelForm:
                         )
                         self.radio_filter = radio_filter
             class_info.move(self.header if not preview else self.parent, 0)
-        with ui.grid(columns="minmax(0, 1fr) minmax(0, 2fr)"):
+        with ui.grid(columns="minmax(0, 1fr) minmax(0, 2fr)").classes("gap-5"):
             for key, field_info in model.model_fields.items():
                 if key == model.get_geom_field():
                     continue
@@ -1103,7 +1107,7 @@ class ModelForm:
                             else:
                                 input = (
                                     ui.select(
-                                        {},
+                                        [getattr(bind_obj, key)],
                                         multiple=prop_info["list"],
                                         clearable=prop_info["nullable"],
                                         validation=None
@@ -1112,6 +1116,11 @@ class ModelForm:
                                     )
                                     .classes("w-full q-pa-none q-gutter-none")
                                     .props("square filled dense")
+                                    .bind_value(
+                                        bind_obj,
+                                        key,
+                                        backward=lambda x: None if not x else x,
+                                    )
                                 )
                                 targets = await run.io_bound(
                                     self._get_association_targets,
@@ -1126,17 +1135,13 @@ class ModelForm:
                                     )
                                 else:
                                     input.set_options(targets)
-                                if parent_id := app.storage.client.get(
-                                    "parent_id", None
-                                ):
-                                    input.set_value(parent_id)
-                                elif len((keys := list(targets.keys()))) == 1:
-                                    input.set_value(keys[0])
-                                input.bind_value(
-                                    bind_obj,
-                                    key,
-                                    backward=lambda x: None if not x else x,
-                                )
+                                if not input.value:  # only if no value was set
+                                    if parent_id := app.storage.client.get(
+                                        "parent_id", None
+                                    ):
+                                        input.set_value(parent_id)
+                                    elif len((keys := list(targets.keys()))) == 1:
+                                        input.set_value(keys[0])
                                 input.bind_enabled_from(
                                     self,
                                     "editable",
@@ -1164,24 +1169,21 @@ class ModelForm:
                                     )
                         case "Measure":
                             uom = str(prop_info["uom"])
+                            initial_value = isinstance(
+                                getattr(bind_obj, key, None), dict
+                            )
                             input = (
                                 ui.number(
-                                    f"{prop_info['typename']} [{prop_info['uom']}]",
-                                    suffix=prop_info["uom"],
+                                    prop_info["typename"],
+                                    value=getattr(bind_obj, key)["value"]
+                                    if initial_value
+                                    else None,
                                     min=-360.0 if uom == "grad" else None,
                                     max=360.0 if uom == "grad" else None,
                                     validation=None
                                     if prop_info["nullable"]
                                     else {"Pflichtfeld": lambda x: x},
                                 )
-                                .bind_value(
-                                    bind_obj,
-                                    key,
-                                    forward=lambda x, uom=uom: None
-                                    if not x
-                                    else {"value": x, "uom": uom},
-                                    backward=lambda x: None if not x else x["value"],
-                                )
                                 .classes("w-full q-pa-none q-gutter-none")
                                 .props("stack-label square filled dense")
                             )
@@ -1192,6 +1194,43 @@ class ModelForm:
                                     **{"add" if not v else "remove": "readonly"}
                                 ),
                             )
+                            with input.add_slot("after"):
+                                uom_input = (
+                                    ui.input(
+                                        "uom",
+                                        value=getattr(bind_obj, key)["uom"]
+                                        if initial_value
+                                        else uom,
+                                    )
+                                    .classes("w-24 q-pa-none q-gutter-none")
+                                    .props("stack-label square filled dense")
+                                ).tooltip(
+                                    "Vorsicht beim Editieren - in den meisten Fällen ist die Maßeinheit vom Standard vorgegeben"
+                                )
+                                input.bind_value(
+                                    bind_obj,
+                                    key,
+                                    forward=lambda x, uom_input=uom_input: None
+                                    if not x
+                                    else {"value": x, "uom": uom_input.value},
+                                    backward=lambda x: None if not x else x["value"],
+                                )
+                                uom_input.bind_enabled_from(
+                                    self,
+                                    "editable",
+                                    backward=lambda v, input=uom_input: input.props(
+                                        **{"add" if not v else "remove": "readonly"}
+                                    ),
+                                ).bind_value(
+                                    bind_obj,
+                                    key,
+                                    forward=lambda x, input=input: None
+                                    if not input.value
+                                    else {"value": input.value, "uom": x},
+                                    backward=lambda x, uom=uom: uom
+                                    if not x
+                                    else x["uom"],
+                                )
                             input.validate()
                         case _:
                             ui.label("TODO")
@@ -1222,3 +1261,4 @@ class ModelForm:
                 feature[model_geom] = geom
         self.feature = self._get_bindable_object(self.model)(**feature)
         await self._build_model_form(self.model, self.feature, main_form, preview)
+        self._propagate_data()