update plan proposition model (remove 'name' field)

Author: nmaarnio

arho_feature_template/core/models.py

@@ -286,7 +286,6 @@ class Regulation:
 
 @dataclass
 class Proposition:
-    name: str
     value: str
     theme_id: str | None = None
     proposition_number: int | None = None

arho_feature_template/gui/components/plan_proposition_widget.py

@@ -14,7 +14,7 @@
 from arho_feature_template.project.layers.code_layers import PlanThemeLayer
 
 if TYPE_CHECKING:
-    from qgis.PyQt.QtWidgets import QLineEdit, QPushButton
+    from qgis.PyQt.QtWidgets import QPushButton
 
 ui_path = resources.files(__package__) / "plan_proposition_widget.ui"
 FormClass, _ = uic.loadUiType(ui_path)
@@ -30,7 +30,6 @@ def __init__(self, proposition: Proposition, parent=None):
         self.setupUi(self)
 
         # TYPES
-        self.name: QLineEdit
         self.value_label: QLabel
         self.text_input: QTextEdit
         self.add_field_btn: QPushButton
@@ -58,7 +57,7 @@ def __init__(self, proposition: Proposition, parent=None):
         self.expanded = True
         self.expand_hide_btn.clicked.connect(self._on_expand_hide_btn_clicked)
 
-        self.name.setText(proposition.name)
+        # self.name.setText(proposition.name)
         self.text_input.setText(proposition.value)
         if proposition.theme_id:
             self._add_theme(proposition.theme_id)
@@ -103,7 +102,6 @@ def _on_expand_hide_btn_clicked(self):
 
     def into_model(self) -> Proposition:
         return Proposition(
-            name=self.name.text(),
             value=self.text_input.toPlainText(),
             theme_id=self.theme_widget.value() if self.theme_widget else None,
             proposition_number=self.proposition_number_widget.get_value() if self.proposition_number_widget else None,

arho_feature_template/gui/components/plan_proposition_widget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>441</width>
-    <height>207</height>
+    <height>125</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -87,49 +87,31 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QToolButton" name="expand_hide_btn">
+       <property name="text">
+        <string>Laajenna</string>
+       </property>
+       <property name="autoRaise">
+        <bool>false</bool>
+       </property>
+       <property name="arrowType">
+        <enum>Qt::UpArrow</enum>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
     <layout class="QFormLayout" name="form_layout">
      <item row="0" column="0">
-      <widget class="QLabel" name="name_label">
-       <property name="text">
-        <string>Otsikko</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QLineEdit" name="name">
-         <property name="clearButtonEnabled">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="expand_hide_btn">
-         <property name="text">
-          <string>Laajenna</string>
-         </property>
-         <property name="autoRaise">
-          <bool>false</bool>
-         </property>
-         <property name="arrowType">
-          <enum>Qt::UpArrow</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="1" column="0">
       <widget class="QLabel" name="value_label">
        <property name="text">
         <string>Sisältö</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="0" column="1">
       <widget class="QTextEdit" name="text_input">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">

arho_feature_template/gui/dialogs/plan_regulation_group_form.py

@@ -122,7 +122,7 @@ def delete_regulation(self, regulation_widget: RegulationWidget):
         regulation_widget.deleteLater()
 
     def add_new_proposition(self):
-        proposition = Proposition(name="", value="")
+        proposition = Proposition(value="")
         self.add_proposition(proposition)
 
     def add_proposition(self, proposition: Proposition):

arho_feature_template/project/layers/plan_layers.py

@@ -381,7 +381,6 @@ class PlanPropositionLayer(AbstractPlanLayer):
     def feature_from_model(cls, model: Proposition) -> QgsFeature:
         feature = cls.initialize_feature_from_model(model)
 
-        feature["name"] = {LANGUAGE: model.name}
         feature["text_value"] = {LANGUAGE: model.value}
         feature["plan_regulation_group_id"] = model.regulation_group_id_
         feature["ordering"] = model.proposition_number
@@ -393,7 +392,6 @@ def feature_from_model(cls, model: Proposition) -> QgsFeature:
     @classmethod
     def model_from_feature(cls, feature: QgsFeature) -> Proposition:
         return Proposition(
-            name=feature["name"][LANGUAGE],
             value=feature["text_value"][LANGUAGE],
             regulation_group_id_=feature["plan_regulation_group_id"],
             proposition_number=feature["ordering"],