From e27cffd6f307fe8ec845b9501108353e658cea4f Mon Sep 17 00:00:00 2001
From: meichthys <github.com@meichthys.com>
Date: Tue, 30 Sep 2025 05:12:38 +0000
Subject: [PATCH] Allow families with same last name & rename when hoh changes

---
 .../doctype/church_family/church_family.json     | 12 ++++++++----
 .../doctype/church_person/church_person.py       | 16 +++++++++++++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/church/church_people/doctype/church_family/church_family.json b/church/church_people/doctype/church_family/church_family.json
index 1993d8a..0e341f4 100644
--- a/church/church_people/doctype/church_family/church_family.json
+++ b/church/church_people/doctype/church_family/church_family.json
@@ -7,6 +7,7 @@
  "doctype": "DocType",
  "engine": "InnoDB",
  "field_order": [
+  "section_break_acrr",
   "family_name",
   "head_of_household",
   "column_break_pmch",
@@ -31,8 +32,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Name",
-   "reqd": 1,
-   "unique": 1
+   "reqd": 1
   },
   {
    "allow_in_quick_entry": 1,
@@ -47,6 +47,10 @@
    "fieldname": "photo",
    "fieldtype": "Attach Image",
    "label": "Photo"
+  },
+  {
+   "fieldname": "section_break_acrr",
+   "fieldtype": "Section Break"
   }
  ],
  "grid_page_length": 50,
@@ -58,7 +62,7 @@
    "link_fieldname": "family"
   }
  ],
- "modified": "2025-09-04 23:59:50.816837",
+ "modified": "2025-09-30 00:40:03.233398",
  "modified_by": "Administrator",
  "module": "Church People",
  "name": "Church Family",
@@ -86,4 +90,4 @@
  "states": [],
  "title_field": "family_name",
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/church/church_people/doctype/church_person/church_person.py b/church/church_people/doctype/church_person/church_person.py
index 1c51a2e..d2b6ef4 100644
--- a/church/church_people/doctype/church_person/church_person.py
+++ b/church/church_people/doctype/church_person/church_person.py
@@ -14,6 +14,10 @@ class ChurchPerson(Document):
 		self.full_name = f"{self.first_name}" + ((" " + self.last_name) if self.last_name else "")
 
 	def validate(self):
+		# Remove head of household status when family is removed
+		if not self.family and self.is_head_of_household:
+			self.set("is_head_of_household", False)
+		# Remove old head of household when new one is assigned - Also rename family
 		if self.is_head_of_household:
 			old_heads_of_household = frappe.db.get_all(
 				doctype="Church Person",
@@ -24,6 +28,7 @@ class ChurchPerson(Document):
 				],
 			)
 			if old_heads_of_household:
+				# There should only be one head of household, but just in case we loop through all of them.
 				for head in old_heads_of_household:
 					head_doc = frappe.get_doc("Church Person", head["name"])
 					frappe.msgprint(
@@ -31,6 +36,14 @@ class ChurchPerson(Document):
 					)
 					head_doc.is_head_of_household = False
 					head_doc.save()
+				# Rename family with new head of household
+				family_doc = frappe.get_doc("Church Family", self.family)
+				dashes = family_doc.family_name.rfind("-")
+				if dashes == -1:  # If no dashes found, add one
+					family_doc.family_name = f"{self.family} - {self.first_name}"
+				else:
+					family_doc.family_name = f"{family_doc.family_name[: dashes + 1]} {self.first_name}"
+				family_doc.save()
 
 		# Sync spouses
 		if self.spouse and self.is_married:
@@ -58,9 +71,10 @@ class ChurchPerson(Document):
 	@frappe.whitelist()
 	def new_family_from_person(self):
 		doc = frappe.new_doc("Church Family")
-		doc.family_name = self.last_name
+		doc.family_name = f"{self.last_name} - {self.first_name}"
 		doc.save()
 		self.set("family", doc)
+		self.set("is_head_of_household", True)
 		self.save()
 		self.reload()
 		frappe.msgprint(f"New family created: {doc.family_name}")