add codecombobox for type of underground in plan feature form

Author: nmaarnio

Diff for: arho_feature_template/core/models.py

@@ -320,7 +320,7 @@ def save_data(self):
 class PlanFeature:
     geom: QgsGeometry
     feature_layer_class: type[PlanFeatureLayer]
-    type_of_underground: int
+    type_of_underground_id: str
     name: str | None = None
     description: str | None = None
     plan_id: int | None = None

Diff for: arho_feature_template/gui/template_attribute_form.py

@@ -22,6 +22,7 @@
 
 from arho_feature_template.core.models import PlanFeature, RegulationGroup, RegulationGroupLibrary
 from arho_feature_template.gui.plan_regulation_group_widget import RegulationGroupWidget
+from arho_feature_template.project.layers.code_layers import UndergroundTypeLayer
 from arho_feature_template.project.layers.plan_layers import LandUseAreaLayer, PlanFeatureLayer
 from arho_feature_template.qgis_plugin_tools.tools.resources import resources_path
 
@@ -30,6 +31,7 @@
     from qgis.PyQt.QtWidgets import QWidget
 
     from arho_feature_template.core.template_library_config import FeatureTemplate
+    from arho_feature_template.gui.code_combobox import CodeComboBox
 
 ui_path = resources.files(__package__) / "template_attribute_form.ui"
 FormClass, _ = uic.loadUiType(ui_path)
@@ -52,14 +54,18 @@ def __init__(
         self.feature_layer_class = feature_layer_class
         self.feature_name: QLineEdit
         self.feature_description: QTextEdit
-        self.feature_type_of_underground: QComboBox
+        self.feature_type_of_underground: CodeComboBox
         self.plan_regulation_group_scrollarea: QScrollArea
         self.plan_regulation_group_scrollarea_contents: QWidget
         self.plan_regulation_group_libraries_combobox: QComboBox
         self.plan_regulation_groups_tree: QTreeWidget
         self.button_box: QDialogButtonBox
 
         # INIT
+        self.feature_type_of_underground.populate_from_code_layer(UndergroundTypeLayer)
+        self.feature_type_of_underground.removeItem(0)  # Remove NULL from combobox as underground data is required
+        self.feature_type_of_underground.setCurrentIndex(1)  # Set default to Maanpäällinen (index 1)
+
         self.regulation_group_widgets: list[RegulationGroupWidget] = []
         self.scroll_area_spacer = None
         self.setWindowTitle(feature_template_config.name)
@@ -116,7 +122,7 @@ def init_plan_regulation_group_library(self, library: RegulationGroupLibrary):
     def into_model(self) -> PlanFeature:
         return PlanFeature(
             name=self.feature_name.text(),
-            type_of_underground=self.feature_type_of_underground.currentIndex(),
+            type_of_underground_id=self.feature_type_of_underground.value(),
             description=self.feature_description.toPlainText(),
             geom=self.geom,
             feature_layer_class=self.feature_layer_class,

Diff for: arho_feature_template/gui/template_attribute_form.ui

@@ -20,7 +20,7 @@
       <string>Kaavakohteen tiedot</string>
      </property>
      <property name="collapsed">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
@@ -58,18 +58,7 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QComboBox" name="feature_type_of_underground">
-        <item>
-         <property name="text">
-          <string>Maanpäällinen</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Maanalainen</string>
-         </property>
-        </item>
-       </widget>
+       <widget class="CodeComboBox" name="feature_type_of_underground"/>
       </item>
      </layout>
     </widget>
@@ -172,7 +161,7 @@
              <x>0</x>
              <y>0</y>
              <width>596</width>
-             <height>600</height>
+             <height>325</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_2"/>
@@ -205,6 +194,11 @@
    <extends>QLineEdit</extends>
    <header>qgsfilterlineedit.h</header>
   </customwidget>
+  <customwidget>
+   <class>CodeComboBox</class>
+   <extends>QComboBox</extends>
+   <header>arho_feature_template.gui.code_combobox</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>

Diff for: arho_feature_template/project/layers/code_layers.py

@@ -18,4 +18,8 @@ class OrganisationLayer(AbstractCodeLayer):
     name = "Toimija"
 
 
+class UndergroundTypeLayer(AbstractCodeLayer):
+    name = "Maanalaisuuden tyyppi"
+
+
 code_layers = AbstractCodeLayer.__subclasses__()

Diff for: arho_feature_template/project/layers/plan_layers.py

@@ -84,7 +84,7 @@ def feature_from_model(cls, model: PlanFeature) -> QgsFeature:
 
         feature = QgsVectorLayerUtils.createFeature(layer, model.geom)
         feature["name"] = {"fin": model.name if model.name else ""}
-        feature["type_of_underground_id"] = "adbf1d95-ce21-40c2-ae83-a82c13591e78"  # TODO: change
+        feature["type_of_underground_id"] = model.type_of_underground_id
         feature["description"] = {"fin": model.description if model.description else ""}
         feature["plan_id"] = QgsExpressionContextUtils.projectScope(QgsProject.instance()).variable("active_plan_id")