Converted lifecycle list view to a table.

Author: Mtk112

arho_feature_template/core/plan_manager.py

@@ -531,6 +531,7 @@ def save_plan(plan: Plan) -> QgsFeature:
         document.plan_id = plan_id
         save_document(document)
 
+    # Save lifecycles
     for lifecycle in plan.lifecycles:
         lifecycle.plan_id = feature["id"]
         save_lifecycle(lifecycle)

arho_feature_template/gui/dialogs/plan_attribute_form.py

@@ -5,19 +5,22 @@
 
 from qgis.core import QgsApplication
 from qgis.PyQt import uic
-from qgis.PyQt.QtCore import Qt
+from qgis.PyQt.QtCore import QDate, Qt
 from qgis.PyQt.QtGui import QStandardItem, QStandardItemModel
 from qgis.PyQt.QtWidgets import (
     QComboBox,
     QDateEdit,
     QDialog,
     QDialogButtonBox,
     QLineEdit,
-    QListView,
     QPushButton,
     QSizePolicy,
     QSpacerItem,
+    QStyledItemDelegate,
+    QTableWidget,
     QTextEdit,
+    QTreeWidgetItem,
+    QWidget,
 )
 
 from arho_feature_template.core.models import Document, Plan, RegulationGroup, RegulationGroupLibrary
@@ -26,6 +29,9 @@
 from arho_feature_template.gui.components.general_regulation_group_widget import GeneralRegulationGroupWidget
 from arho_feature_template.gui.components.plan_document_widget import DocumentWidget
 from arho_feature_template.core.models import LifeCycle, Plan, RegulationGroup, RegulationGroupLibrary
+from arho_feature_template.gui.components.code_combobox import CodeComboBox
+from arho_feature_template.gui.components.plan_regulation_group_widget import RegulationGroupWidget
+from arho_feature_template.gui.components.tree_with_search_widget import TreeWithSearchWidget
 from arho_feature_template.project.layers.code_layers import (
     LifeCycleStatusLayer,
     OrganisationLayer,
@@ -36,19 +42,63 @@
 if TYPE_CHECKING:
     from qgis.PyQt.QtWidgets import QLineEdit, QPushButton, QTextEdit, QVBoxLayout
 
-    from arho_feature_template.gui.components.code_combobox import CodeComboBox, HierarchicalCodeComboBox
+    from arho_feature_template.gui.components.code_combobox import HierarchicalCodeComboBox
 
 ui_path = resources.files(__package__) / "plan_attribute_form.ui"
 FormClass, _ = uic.loadUiType(ui_path)
 
 
+class LifecycleTableModel(QStandardItemModel):
+    def __init__(self, status_options, parent=None):
+        super().__init__(parent)
+        self.status_options = status_options
+
+    def flags(self, index):
+        if index.column() == 0:  # "Elinkaaren tila" - editable combo box
+            return Qt.ItemIsSelectable | Qt.ItemIsEnabled
+
+        if index.column() in (1, 2):  # Dates
+            return Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsEditable
+        return super().flags(index)
+
+
+class LifecycleDelegate(QStyledItemDelegate):
+    def create_editor(self, parent, option, index):
+        if index.column() == 0:  # Status column
+            lifecycle_combo_box = CodeComboBox(parent)
+            lifecycle_combo_box.populate_from_code_layer(LifeCycleStatusLayer)
+            return lifecycle_combo_box
+        if index.column() in (1, 2):  # Dates columns
+            date_edit = QDateEdit(parent)
+            date_edit.setDisplayFormat("yyyy-MM-dd")
+            date_edit.setCalendarPopup(True)
+            return date_edit
+        return super().createEditor(parent, option, index)
+
+    def set_editor_data(self, editor, index):
+        if isinstance(editor, CodeComboBox) and index.column() == 0:
+            value = index.data(Qt.EditRole)
+            if value is not None:
+                editor.set_value(value)
+        elif isinstance(editor, QDateEdit) and index.column() in (1, 2):
+            value = index.data(Qt.EditRole)
+            if value:
+                editor.setDate(QDate.fromString(value, "yyyy-MM-dd"))
+
+    def set_model_data(self, editor, model, index):
+        if isinstance(editor, CodeComboBox) and index.column() == 0:
+            model.setData(index, editor.value(), Qt.EditRole)
+        if isinstance(editor, QDateEdit) and index.column() in (1, 2):
+            model.setData(index, editor.date().toString("yyyy-MM-dd"), Qt.EditRole)
+
+
 class PlanAttributeForm(QDialog, FormClass):  # type: ignore
     permanent_identifier_line_edit: QLineEdit
     name_line_edit: QLineEdit
     organisation_combo_box: CodeComboBox
     description_text_edit: QTextEdit
     plan_type_combo_box: HierarchicalCodeComboBox
-    # lifecycle_status_combo_box: CodeComboBox
+    lifecycle_status_combo_box: CodeComboBox
     record_number_line_edit: QLineEdit
     producers_plan_identifier_line_edit: QLineEdit
     matter_management_identifier_line_edit: QLineEdit
@@ -62,11 +112,9 @@ class PlanAttributeForm(QDialog, FormClass):  # type: ignore
     documents_layout: QVBoxLayout
     add_document_btn: QPushButton
 
-    lifecycle_status_combo_box: CodeComboBox
-    lifecycle_start_date: QDateEdit
-    lifecycle_end_date: QDateEdit
-    add_lifecycle_button: QPushButton
-    lifecycle_list: QListView
+    lifecycle_table: QTableWidget
+    add_lifecycle: QPushButton
+    delete_lifecycle: QPushButton
 
     button_box: QDialogButtonBox
 
@@ -124,10 +172,13 @@ def __init__(self, plan: Plan, _regulation_group_libraries: list[RegulationGroup
         self.add_document_btn.clicked.connect(self.add_new_document)
         self.add_document_btn.setIcon(QgsApplication.getThemeIcon("mActionAdd.svg"))
 
-        # Lifecycles
-        self.lifecycle_model = QStandardItemModel()
-        self.lifecycle_list.setModel(self.lifecycle_model)
-        self.add_lifecycle_button.clicked.connect(self.save_lifecycle)
+        # Lifecycle table setup
+        self.lifecycle_table.setColumnCount(3)  # Three columns: Status, Start Date, End Date
+        self.lifecycle_table.setHorizontalHeaderLabels(["Elinkaaren tila", "Alkupvm", "Loppupvm"])
+        self.lifecycle_table.setRowCount(0)  # No rows initially
+
+        self.add_lifecycle_button.clicked.connect(self.add_lifecycle_row)
+        self.delete_lifecycle_button.clicked.connect(self.delete_lifecycle_row)
 
         self.button_box.button(QDialogButtonBox.Ok).setEnabled(False)
         self.button_box.accepted.connect(self._on_ok_clicked)
@@ -136,6 +187,24 @@ def __init__(self, plan: Plan, _regulation_group_libraries: list[RegulationGroup
 
     def _check_required_fields(self) -> None:
         ok_button = self.button_box.button(QDialogButtonBox.Ok)
+
+        # Check if all required fields are filled and lifecycle table has at least one valid row
+        has_valid_lifecycle_row = False
+        for row in range(self.lifecycle_table.rowCount()):
+            status_item = self.lifecycle_table.cellWidget(row, 0)
+            start_date_item = self.lifecycle_table.cellWidget(row, 1)
+            end_date_item = self.lifecycle_table.cellWidget(row, 2)
+
+            if (
+                status_item
+                and status_item.value() is not None
+                and start_date_item
+                and start_date_item.date()
+                and (end_date_item and end_date_item.date() or True)
+            ):
+                has_valid_lifecycle_row = True
+                break
+
         if (
             self.name_line_edit.text() != ""
             and self.plan_type_combo_box.value() is not None
@@ -144,6 +213,7 @@ def _check_required_fields(self) -> None:
             and all(document_widget.is_ok() for document_widget in self.document_widgets)
             # and self.lifecycle_status_combo_box.value() is not None
             # and self.lifecycle_model.rowCount() > 0
+            and has_valid_lifecycle_row  # Ensure there's at least one valid lifecycle row
         ):
             ok_button.setEnabled(True)
         else:
@@ -209,45 +279,72 @@ def delete_document(self, document_widget: DocumentWidget):
 
     # ---
 
-    def save_lifecycle(self):
-        # Get values from the widgets
-        status = self.lifecycle_status_combo_box.currentText()  # Get the selected text from the combo box
-        start_date = self.lifecycle_start_date.date().toString("yyyy-MM-dd")  # Format the QDate as a string
-        end_date = self.lifecycle_end_date.date().toString("yyyy-MM-dd") if self.lifecycle_end_date.date() else None
+    def add_lifecycle_row(self):
+        row_position = self.lifecycle_table.rowCount()
+        self.lifecycle_table.insertRow(row_position)
+
+        status = CodeComboBox(self)
+        status.populate_from_code_layer(LifeCycleStatusLayer)
+        self.lifecycle_table.setCellWidget(row_position, 0, status)
 
-        # Format the lifecycle entry
-        date_range = f"{start_date} - {end_date}" if end_date else start_date
-        lifecycle_entry = f"{status} | {date_range}"
+        start_date_edit = QDateEdit(self)
+        start_date_edit.setDisplayFormat("yyyy-MM-dd")
+        start_date_edit.setCalendarPopup(True)
+        self.lifecycle_table.setCellWidget(row_position, 1, start_date_edit)
 
-        # Add to the model
-        item = QStandardItem(lifecycle_entry)
-        item.setData(self.lifecycle_status_combo_box.value(), Qt.UserRole + 1)
-        self.lifecycle_model.appendRow(item)
+        end_date_edit = QDateEdit(self)
+        end_date_edit.setDisplayFormat("yyyy-MM-dd")
+        end_date_edit.setCalendarPopup(True)
+        self.lifecycle_table.setCellWidget(row_position, 2, end_date_edit)
+
+        self.lifecycle_table.resizeRowsToContents()
+        self.lifecycle_table.resizeColumnsToContents()
+
+    def delete_lifecycle_row(self):
+        selected_rows = self.lifecycle_table.selectionModel().selectedRows()
+
+        if selected_rows:
+            row_position = selected_rows[0].row()
+            self.lifecycle_table.removeRow(row_position)
+            self._check_required_fields()
+
+    def save_lifecycle(self):
+        for row in range(self.lifecycle_table.rowCount()):
+            status = self.lifecycle_table.cellWidget(row, 0)
+            start_date_item = self.lifecycle_table.cellWidget(row, 1)
+            end_date_item = self.lifecycle_table.cellWidget(row, 2)
+
+            if status and start_date_item:
+                status = status.value() if status.value() is not None else ""
+                start_date = start_date_item.date().toString("yyyy-MM-dd") if start_date_item.date() else ""
+                end_date = end_date_item.date().toString("yyyy-MM-dd") if end_date_item.date() else None
+
+                lifecycle_model_item = QStandardItem(status)
+                lifecycle_model_item.setData(status.value(), Qt.UserRole + 1)
+                start_date_model_item = QStandardItem(start_date)
+                end_date_model_item = QStandardItem(end_date if end_date else "")
+
+                self.lifecycle_table.model().appendRow(
+                    [lifecycle_model_item, start_date_model_item, end_date_model_item]
+                )
 
-        # Optionally, check required fields again
         self._check_required_fields()
 
     def into_lifecycle_model(self) -> list[LifeCycle]:
         lifecycles = []
 
-        for row in range(self.lifecycle_model.rowCount()):
-            item = self.lifecycle_model.item(row)
-            if item:
-                lifecycle_entry = item.text()
-                parts = lifecycle_entry.split(" | ")
-                date_range = parts[1]
-                date_parts = date_range.split(" - ")
-                start_date = date_parts[0]
-                end_date = date_parts[1] if len(date_parts) > 1 else None  # End date is optional
-
-                # Add the lifecycle to the list
-                lifecycles.append(
-                    LifeCycle(
-                        status_id=item.data(Qt.UserRole + 1),
-                        starting_at=start_date,
-                        ending_at=end_date,
-                    )
-                )
+        # Iterate through the rows in lifecycle_table
+        for row in range(self.lifecycle_table.rowCount()):
+            status_item = self.lifecycle_table.cellWidget(row, 0)
+            start_date_item = self.lifecycle_table.cellWidget(row, 1)
+            end_date_item = self.lifecycle_table.cellWidget(row, 2)
+
+            if status_item and start_date_item:
+                status_id = status_item.value()
+                start_date = start_date_item.date().toString("yyyy-MM-dd") if start_date_item.date() else ""
+                end_date = end_date_item.date().toString("yyyy-MM-dd") if end_date_item.date() else None
+
+                lifecycles.append(LifeCycle(status_id=status_id, starting_at=start_date, ending_at=end_date))
 
         return lifecycles
 
@@ -271,5 +368,4 @@ def into_model(self) -> Plan:
 
     def _on_ok_clicked(self):
         self.model = self.into_model()
-        # self.lifecycle_model = self.into_lifecycle_model()
         self.accept()

arho_feature_template/gui/dialogs/plan_attribute_form.ui

@@ -61,8 +61,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>218</width>
-            <height>306</height>
+            <width>829</width>
+            <height>569</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -128,16 +128,6 @@
                </property>
               </widget>
              </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="label_5">
-               <property name="text">
-                <string>Organisaatio*:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="1">
-              <widget class="CodeComboBox" name="organisation_combo_box"/>
-             </item>
              <item row="4" column="0">
               <widget class="QLabel" name="tyyppiLabel">
                <property name="text">
@@ -155,6 +145,33 @@
                </property>
               </widget>
              </item>
+             <item row="5" column="0">
+              <widget class="QLabel" name="elinkaarenTilaLabel">
+               <property name="text">
+                <string>Elinkaaren tila*:</string>
+               </property>
+               <property name="buddy">
+                <cstring>lifecycle_status_combo_box</cstring>
+               </property>
+              </widget>
+             </item>
+             <item row="5" column="1">
+              <widget class="CodeComboBox" name="lifecycle_status_combo_box">
+               <property name="toolTip">
+                <string>Kaavan elinkaaren tila</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QLabel" name="label_5">
+               <property name="text">
+                <string>Organisaatio*:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="1">
+              <widget class="CodeComboBox" name="organisation_combo_box"/>
+             </item>
             </layout>
            </item>
            <item>
@@ -321,91 +338,72 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="lifecycle_status_tab">
+     <widget class="QWidget" name="lifecycles_tab">
       <attribute name="title">
        <string>Elinkaaret</string>
       </attribute>
       <widget class="QGroupBox" name="groupBox_2">
        <property name="geometry">
         <rect>
-         <x>10</x>
+         <x>0</x>
          <y>10</y>
-         <width>831</width>
-         <height>571</height>
+         <width>801</width>
+         <height>561</height>
         </rect>
        </property>
        <property name="title">
-        <string>Elinkaarien tilat</string>
+        <string>Elinkaaret</string>
        </property>
        <widget class="QWidget" name="verticalLayoutWidget">
         <property name="geometry">
          <rect>
-          <x>10</x>
+          <x>30</x>
           <y>30</y>
-          <width>301</width>
-          <height>531</height>
+          <width>631</width>
+          <height>461</height>
          </rect>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_8">
+        <layout class="QVBoxLayout" name="verticalLayout_5">
          <item>
-          <layout class="QFormLayout" name="formLayout_3">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_9">
-             <property name="text">
-              <string>Elinkaaren tila:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="CodeComboBox" name="lifecycle_status_combo_box">
-             <property name="toolTip">
-              <string>Kaavan elinkaaren tila</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_10">
-             <property name="text">
-              <string>Alkupäivämäärä:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QDateEdit" name="lifecycle_start_date"/>
-           </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_11">
-             <property name="text">
-              <string>Loppupäivämäärä:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1">
-            <widget class="QDateEdit" name="lifecycle_end_date"/>
-           </item>
-           <item row="3" column="0">
-            <widget class="QPushButton" name="add_lifecycle_button">
-             <property name="text">
-              <string>Tallenna elinkaari</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
+          <widget class="QTableWidget" name="lifecycle_table"/>
          </item>
         </layout>
        </widget>
        <widget class="QWidget" name="verticalLayoutWidget_2">
         <property name="geometry">
          <rect>
-          <x>330</x>
+          <x>689</x>
           <y>30</y>
-          <width>491</width>
-          <height>531</height>
+          <width>81</width>
+          <height>461</height>
          </rect>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_9">
+        <layout class="QVBoxLayout" name="verticalLayout_8">
          <item>
-          <widget class="QListView" name="lifecycle_list"/>
+          <widget class="QPushButton" name="delete_lifecycle_button">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Poista</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="add_lifecycle_button">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Lisää</string>
+           </property>
+          </widget>
          </item>
         </layout>
        </widget>
@@ -449,6 +447,7 @@
   <tabstop>name_line_edit</tabstop>
   <tabstop>description_text_edit</tabstop>
   <tabstop>plan_type_combo_box</tabstop>
+  <tabstop>lifecycle_status_combo_box</tabstop>
   <tabstop>mGroupBox</tabstop>
   <tabstop>record_number_line_edit</tabstop>
   <tabstop>producers_plan_identifier_line_edit</tabstop>