Work In progress

Work in progress saving lifecycle dates

Author: Mtk112

arho_feature_template/core/models.py

@@ -14,6 +14,8 @@
 from arho_feature_template.utils.misc_utils import LANGUAGE, get_layer_by_name, iface
 
 if TYPE_CHECKING:
+    from datetime import datetime
+
     from qgis.core import QgsFeature, QgsGeometry
 
 
@@ -321,6 +323,24 @@ def from_config_data(cls, data: dict) -> RegulationGroup:
         )
 
 
+@dataclass
+class LifeCycle:
+    status_id: str | None
+    id_: int | None = None
+    plan_id: str | None = None
+    # plan_id_: int | None = None
+    plan_regulation_id: str | None = None
+    plan_proposition_id: str | None = None
+    starting_at: datetime | None = None
+    ending_at: datetime | None = None
+    # might not need the following
+    land_use_are_id: str | None = None
+    other_area_id: str | None = None
+    line_id: str | None = None
+    land_use_point_id: str | None = None
+    other_point_id: str | None = None
+
+
 @dataclass
 class PlanFeature:
     geom: QgsGeometry | None = None  # Need to allow None for feature templates
@@ -344,6 +364,7 @@ class Plan:
     description: str | None = None
     plan_type_id: str | None = None
     lifecycle_status_id: str | None = None
+    # lifecycle: list[LifeCycle] = field(default_factory=list)
     record_number: str | None = None
     matter_management_identifier: str | None = None
     permanent_plan_identifier: str | None = None

arho_feature_template/core/plan_manager.py

@@ -11,6 +11,7 @@
 from arho_feature_template.core.lambda_service import LambdaService
 from arho_feature_template.core.models import (
     FeatureTemplateLibrary,
+    LifeCycle,
     Plan,
     PlanFeature,
     RegulationGroupCategory,
@@ -25,6 +26,7 @@
 from arho_feature_template.gui.docks.new_feature_dock import NewFeatureDock
 from arho_feature_template.gui.tools.inspect_plan_features_tool import InspectPlanFeatures
 from arho_feature_template.project.layers.code_layers import PlanRegulationGroupTypeLayer
+from arho_feature_template.project.layers.lifecycle_layers import LifeCycleLayer
 from arho_feature_template.project.layers.plan_layers import (
     LandUseAreaLayer,
     LandUsePointLayer,
@@ -182,6 +184,7 @@ def edit_plan(self):
         attribute_form = PlanAttributeForm(plan_model, self.get_regulation_group_libraries())
         if attribute_form.exec_():
             feature = save_plan(attribute_form.model)
+            # lifecycle_features = save_lifecycle(attribute_form.lifecycle_model)
 
     def add_new_plan_feature(self):
         if not handle_unsaved_changes():
@@ -213,6 +216,8 @@ def _plan_geom_digitized(self, feature: QgsFeature):
         attribute_form = PlanAttributeForm(plan_model, self.get_regulation_group_libraries())
         if attribute_form.exec_():
             feature = save_plan(attribute_form.model)
+            lifecycle_features = save_lifecycle(attribute_form.lifecycle_model, feature["id"])
+            # print(lifecycle_features)
             plan_to_be_activated = feature["id"]
         else:
             plan_to_be_activated = self.previous_active_plan_id
@@ -241,6 +246,7 @@ def _plan_feature_geom_digitized(self, feature: QgsFeature):
         )
         if attribute_form.exec_():
             save_plan_feature(attribute_form.model)
+            # save_lifecycle(attribute_form.lifecycle_model)
 
     def edit_plan_feature(self, feature: QgsFeature, layer_name: str):
         layer_class = FEATURE_LAYER_NAME_TO_CLASS_MAP[layer_name]
@@ -459,6 +465,19 @@ def save_plan(plan: Plan) -> QgsFeature:
             regulation_group_feature = save_regulation_group(regulation_group, plan_id)
             save_regulation_group_association(regulation_group_feature["id"], PlanLayer.name, plan_id)
 
+    # Save plan lifecycles
+    # if hasattr(plan, "lifecycle"):
+    # print("Has attribute lifecycle!")
+    # if plan.lifecycle:
+    # print("Plan has a lifecycle!")
+    # for lifecycle in plan.lifecycle:
+    # print(f"Lifecycle found: {lifecycle}!")
+    # save_lifecycle(lifecycle)
+    # else:
+    # print("Plan doesnt have any lifecycles!")
+    # else:
+    # print("No attribute lifecycle!")
+
     return feature
 
 
@@ -555,6 +574,23 @@ def save_regulation(regulation: Regulation) -> QgsFeature:
     return feature
 
 
+def save_lifecycle(lifecycles: list[LifeCycle]) -> list[QgsFeature]:
+    """Save a list of LifeCycle objects to the layer."""
+    lifecycle_layer = LifeCycleLayer.get_from_project()
+    if not lifecycle_layer:
+        raise RuntimeError("Lifecycle layer not found in the project.")
+
+    saved_features = []
+    for lifecycle in lifecycles:
+        # Create or update a feature from the model
+        feature = LifeCycleLayer.feature_from_model(lifecycle)
+        lifecycle_layer.addFeature(feature)
+        saved_features.append(feature)
+
+    lifecycle_layer.commitChanges()
+    return saved_features
+
+
 def save_proposition(proposition: Proposition) -> QgsFeature:
     feature = PlanPropositionLayer.feature_from_model(proposition)
     layer = PlanPropositionLayer.get_from_project()

arho_feature_template/gui/dialogs/plan_attribute_form.py

@@ -5,18 +5,22 @@
 
 from qgis.PyQt import uic
 from qgis.PyQt.QtCore import Qt
+from qgis.PyQt.QtGui import QStandardItem, QStandardItemModel
 from qgis.PyQt.QtWidgets import (
     QComboBox,
+    QDateEdit,
     QDialog,
     QDialogButtonBox,
     QLineEdit,
+    QListView,
+    QPushButton,
     QSizePolicy,
     QSpacerItem,
     QTextEdit,
     QTreeWidgetItem,
 )
 
-from arho_feature_template.core.models import Plan, RegulationGroup, RegulationGroupLibrary
+from arho_feature_template.core.models import LifeCycle, Plan, RegulationGroup, RegulationGroupLibrary
 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 (
@@ -40,7 +44,7 @@ class PlanAttributeForm(QDialog, FormClass):  # type: ignore
     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
@@ -49,6 +53,12 @@ class PlanAttributeForm(QDialog, FormClass):  # type: ignore
     plan_regulation_group_libraries_combobox: QComboBox
     regulation_groups_tree_layout: QVBoxLayout
 
+    lifecycle_status_combo_box: CodeComboBox
+    lifecycle_start_date: QDateEdit
+    lifecycle_end_date: QDateEdit
+    add_lifecycle_button: QPushButton
+    lifecycle_list: QListView
+
     button_box: QDialogButtonBox
 
     def __init__(self, plan: Plan, regulation_group_libraries: list[RegulationGroupLibrary], parent=None):
@@ -95,6 +105,10 @@ def __init__(self, plan: Plan, regulation_group_libraries: list[RegulationGroupL
         for regulation_group in plan.general_regulations:
             self.add_plan_regulation_group(regulation_group)
 
+        self.lifecycle_model = QStandardItemModel()
+        self.lifecycle_list.setModel(self.lifecycle_model)
+        self.add_lifecycle_button.clicked.connect(self.save_lifecycle)
+
         self.button_box.button(QDialogButtonBox.Ok).setEnabled(False)
         self.button_box.accepted.connect(self._on_ok_clicked)
 
@@ -106,7 +120,8 @@ def _check_required_fields(self) -> None:
             self.name_line_edit.text() != ""
             and self.plan_type_combo_box.value() is not None
             and self.organisation_combo_box.value() is not None
-            and self.lifecycle_status_combo_box.value() is not None
+            # and self.lifecycle_status_combo_box.value() is not None
+            and self.lifecycle_model.rowCount() > 0
         ):
             ok_button.setEnabled(True)
         else:
@@ -153,6 +168,60 @@ def init_plan_regulation_group_library(self, library: RegulationGroupLibrary):
 
     # ---
 
+    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
+
+        # Format the lifecycle entry
+        date_range = f"{start_date} - {end_date}" if end_date else start_date
+        lifecycle_entry = f"{status} | {date_range}"
+
+        # Add to the model
+        item = QStandardItem(lifecycle_entry)
+        self.lifecycle_model.appendRow(item)
+
+        # Optionally, check required fields again
+        self._check_required_fields()
+
+    def into_lifecycle_model(self) -> list[LifeCycle]:
+        print("Calling into_lifecycle_model at plan_attribute_form.py")
+        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(" | ")
+                status = parts[0]
+                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
+
+                print(f"Got status: {status}")
+                print(f"Got status_id: {LifeCycleStatusLayer.get_id_by_value(status)}")
+
+                # Add the lifecycle to the list
+                lifecycles.append(
+                    LifeCycle(
+                        status_id=LifeCycleStatusLayer.get_id_by_value(status),
+                        plan_id="52aadc88-feb0-443b-a423-f5a50d0bb9fc",
+                        land_use_are_id=None,
+                        other_area_id=None,
+                        line_id=None,
+                        land_use_point_id=None,
+                        other_point_id=None,
+                        starting_at=start_date,
+                        ending_at=end_date,
+                        plan_regulation_id=None,
+                        plan_proposition_id=None,
+                    )
+                )
+
+        return lifecycles
+
     def into_model(self) -> Plan:
         return Plan(
             id_=self.plan.id_,
@@ -164,11 +233,13 @@ def into_model(self) -> Plan:
             record_number=self.record_number_line_edit.text() or None,
             producers_plan_identifier=self.producers_plan_identifier_line_edit.text() or None,
             matter_management_identifier=self.matter_management_identifier_line_edit.text() or None,
-            lifecycle_status_id=self.lifecycle_status_combo_box.value(),
+            lifecycle_status_id=self.lifecycle_status_combo_box.value(),  # Need to get the lifecycle with the latest lifecycle
+            # lifecycle=self.get_lifecycles(),
             general_regulations=[reg_group_widget.into_model() for reg_group_widget in self.regulation_group_widgets],
             geom=self.plan.geom,
         )
 
     def _on_ok_clicked(self):
         self.model = self.into_model()
+        self.lifecycle_model = self.into_lifecycle_model()
         self.accept()