add deleting and required field checking for plan documents

Author: nmaarnio

arho_feature_template/core/plan_manager.py

@@ -498,27 +498,32 @@ def save_plan(plan: Plan) -> QgsFeature:
         edit_text="Kaavan muokkaus" if editing else "Kaavan luominen",
     )
 
-    # Check for deleted general regulations
+    plan_id = feature["id"]
     if editing:
+        # Check for deleted general regulations
         for association in RegulationGroupAssociationLayer.get_dangling_associations(
-            plan.general_regulations, feature["id"], PlanLayer.name
+            plan.general_regulations, plan_id, PlanLayer.name
         ):
             _delete_feature(
                 association,
                 RegulationGroupAssociationLayer.get_from_project(),
                 "Kaavamääräysryhmän assosiaation poisto",
             )
 
+        # Check for documents to be deleted
+        doc_layer = DocumentLayer.get_from_project()
+        for doc_feature in DocumentLayer.get_documents_to_delete(plan.documents, plan):
+            _delete_feature(doc_feature, doc_layer, "Asiakirjan poisto")
+
     # Save general regulations
     if plan.general_regulations:
         for regulation_group in plan.general_regulations:
-            plan_id = feature["id"]
             regulation_group_feature = save_regulation_group(regulation_group, plan_id)
             save_regulation_group_association(regulation_group_feature["id"], PlanLayer.name, plan_id)
 
     # Save documents
     for document in plan.documents:
-        document.plan_id = feature["id"]
+        document.plan_id = plan_id
         save_document(document)
 
     return feature

arho_feature_template/gui/components/plan_document_widget.py

@@ -33,6 +33,7 @@
 class DocumentWidget(QWidget, FormClass):  # type: ignore
     """A widget representation of a plan document."""
 
+    document_edited = pyqtSignal()
     delete_signal = pyqtSignal(QWidget)
 
     def __init__(self, document: Document, parent=None):
@@ -73,6 +74,13 @@ def __init__(self, document: Document, parent=None):
         self.retention_time.populate_from_code_layer(RetentionTimeLayer)
         self.personal_data_content.populate_from_code_layer(PersonalDataContentLayer)
 
+        self.name.textChanged.connect(self.document_edited.emit)
+        self.document_type.currentIndexChanged.connect(self.document_edited.emit)
+        self.publicity.currentIndexChanged.connect(self.document_edited.emit)
+        self.language.currentIndexChanged.connect(self.document_edited.emit)
+        self.retention_time.currentIndexChanged.connect(self.document_edited.emit)
+        self.personal_data_content.currentIndexChanged.connect(self.document_edited.emit)
+
         # List of widgets for hiding / showing
         self.widgets: list[tuple[QLabel, QWidget]] = [
             (self.url_label, self.url),
@@ -113,6 +121,16 @@ def __init__(self, document: Document, parent=None):
         if document.confirmation_date:
             self._add_confirmation_date(document.confirmation_date)
 
+    def is_ok(self) -> bool:
+        return (
+            self.name.text() != ""
+            and self.document_type.value() is not None
+            and self.publicity.value() is not None
+            and self.language.value() is not None
+            and self.retention_time.value() is not None
+            and self.personal_data_content.value() is not None
+        )
+
     def _add_widgets(self, label: QLabel, widget: QWidget):
         self.form_layout.addRow(label, widget)
         self.widgets.append((label, widget))

arho_feature_template/gui/dialogs/plan_attribute_form.py

@@ -122,6 +122,7 @@ def _check_required_fields(self) -> None:
             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 all(document_widget.is_ok() for document_widget in self.document_widgets)
         ):
             ok_button.setEnabled(True)
         else:
@@ -176,18 +177,22 @@ def init_plan_regulation_group_library(self, library: RegulationGroupLibrary):
 
     def add_new_document(self):
         self.add_document(Document())
+        self._check_required_fields()
 
     def add_document(self, document: Document):
         widget = DocumentWidget(document, parent=self.documents_scroll_contents)
         widget.delete_signal.connect(self.delete_document)
+        widget.document_edited.connect(self._check_required_fields)
         self.documents_layout.insertWidget(1, widget)
         self.document_widgets.append(widget)
 
     def delete_document(self, document_widget: DocumentWidget):
         document_widget.delete_signal.disconnect()
+        document_widget.document_edited.disconnect()
         self.documents_layout.removeWidget(document_widget)
         self.document_widgets.remove(document_widget)
         document_widget.deleteLater()
+        self._check_required_fields()
 
     # ---
 

arho_feature_template/project/layers/plan_layers.py

@@ -446,6 +446,15 @@ def model_from_feature(cls, feature: QgsFeature) -> Document:
             id_=feature["id"],
         )
 
+    @classmethod
+    def get_documents_to_delete(cls, documents: list[Document], plan: Plan) -> list[QgsFeature]:
+        updated_document_ids = [doc.id_ for doc in documents]
+        return [
+            doc
+            for doc in cls.get_features_by_attribute_value("plan_id", str(plan.id_))
+            if doc["id"] not in updated_document_ids
+        ]
+
 
 class SourceDataLayer(AbstractPlanLayer):
     name = "Lähtötietoaineistot"