meichthys/church
1
0
Fork 0
mirror of https://github.com/meichthys/church.git synced 2026-05-03 02:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolves Add Requestor field to Prayer/Alms requests

Browse Source 
Fixes #108
This commit is contained in:
meichthys 2026-02-20 06:00:50 +00:00
parent f355cc4f57
commit 72a3b0b233
5 changed files with 97 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
church/church_finances/doctype/church_alms_request/church_alms_request.json
View File

@ -8,10 +8,11 @@
"documentation": "/app/manual%3A-finances",
"engine": "InnoDB",
"field_order": [
"status",
"recipient_type",
"recipient",
"column_break_ixvv",
"status",
"requestor",
"amount",
"expense_type",
"section_break_olzm",
@ -19,6 +20,7 @@
],
"fields": [
{
"description": "The entity that would be receiving the alms.",
"fieldname": "recipient",
"fieldtype": "Dynamic Link",
"in_list_view": 1,
@ -78,17 +80,28 @@
},
{
"default": "Church Person",
"description": "The type of entity for which alms are being requested.",
"fieldname": "recipient_type",
"fieldtype": "Link",
"label": "Recipient Type",
"link_filters": "[[\"DocType\",\"name\",\"in\",[\"Church Person\",\"Church Family\"]]]",
"options": "DocType"
},
{
"description": "The person making the alms request.",
"fieldname": "requestor",
"fieldtype": "Link",
"in_filter": 1,
"in_preview": 1,
"label": "Requestor",
"options": "Church Person",
"reqd": 1
}
],
"grid_page_length": 50,
"index_web_pages_for_search": 1,
"links": [],
"modified": "2025-11-15 01:28:05.457851",
"modified": "2026-02-20 00:03:30.229450",
"modified_by": "Administrator",
"module": "Church Finances",
"name": "Church Alms Request",

55
church/church_finances/web_form/alms_request/alms_request.json
View File

@ -46,7 +46,7 @@
"list_title": "Your Alms Requests",
"login_required": 1,
"max_attachment_size": 0,
"modified": "2025-11-16 00:07:44.428695",
"modified": "2026-02-20 00:59:47.260837",
"modified_by": "Administrator",
"module": "Church Finances",
"name": "alms-request",
@ -86,6 +86,45 @@
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "column_break_ixvv",
"fieldtype": "Column Break",
"hidden": 0,
"max_length": 0,
"max_value": 0,
"precision": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"description": "The person making the request.",
"fieldname": "requestor",
"fieldtype": "Link",
"hidden": 0,
"label": "Requestor",
"max_length": 0,
"max_value": 0,
"options": "Church Person",
"precision": "",
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "section_break_olzm",
"fieldtype": "Section Break",
"hidden": 0,
"max_length": 0,
"max_value": 0,
"precision": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "description",
@ -98,20 +137,6 @@
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 1,
"fieldname": "recipient",
"fieldtype": "Link",
"hidden": 0,
"label": "Recipient",
"max_length": 0,
"max_value": 0,
"options": "Church Person",
"precision": "",
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
}
]
}

6
church/church_prayers/doctype/church_prayer_request/church_prayer_request.js
View File

@ -2,6 +2,12 @@
// For license information, please see license.txt
frappe.ui.form.on('Church Prayer Request', {
recipient_type: function(frm) {
// Dynamically update the Recipient field description based on the Recipient Type that is selected
if (frm.doc.recipient_type) {
frm.set_df_property('recipient', 'description', `Prayers are requested for this ${frm.doc.recipient_type}.`);
}
},
onload: function(frm) {
// Pre-populate the requestor field with the current user's name
if (frm.is_new()) {

20
church/church_prayers/doctype/church_prayer_request/church_prayer_request.json
View File

@ -10,10 +10,11 @@
"field_order": [
"status",
"type",
"is_private",
"recipient_type",
"recipient",
"column_break_ynvf",
"requestor",
"recipient",
"is_private",
"section_break_usaz",
"request"
],
@ -87,14 +88,23 @@
"allow_in_quick_entry": 1,
"description": "The person for whom prayers will be prayed.",
"fieldname": "recipient",
"fieldtype": "Link",
"fieldtype": "Dynamic Link",
"in_filter": 1,
"in_list_view": 1,
"in_preview": 1,
"in_standard_filter": 1,
"label": "Recipient",
"options": "Church Person",
"options": "recipient_type",
"search_index": 1
},
{
"default": "Church Person",
"description": "The type of entity for which prayer is being requested.",
"fieldname": "recipient_type",
"fieldtype": "Link",
"label": "Recipient Type",
"link_filters": "[[\"DocType\",\"name\",\"like\",\"%Church%\"]]",
"options": "DocType"
}
],
"grid_page_length": 50,
@ -105,7 +115,7 @@
"table_fieldname": "topics"
}
],
"modified": "2026-02-19 23:26:19.972696",
"modified": "2026-02-19 23:47:54.971006",
"modified_by": "Administrator",
"module": "Church Prayers",
"name": "Church Prayer Request",

42
church/church_prayers/web_form/prayer_request/prayer_request.json
View File

@ -8,6 +8,7 @@
"anonymous": 0,
"apply_document_permissions": 1,
"button_label": "Save",
"client_script": "",
"condition_json": "[]",
"creation": "2025-09-13 22:28:01.939717",
"doc_type": "Church Prayer Request",
@ -56,7 +57,7 @@
"list_title": "Your Prayer Requests",
"login_required": 1,
"max_attachment_size": 0,
"modified": "2025-12-18 23:45:59.150941",
"modified": "2026-02-20 00:57:34.930575",
"modified_by": "Administrator",
"module": "Church Prayers",
"name": "prayer-request",
@ -112,19 +113,33 @@
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 1,
"allow_read_on_all_link_options": 0,
"default": "",
"depends_on": "eval:frappe.session.user!='Guest';",
"description": "If this request is for a specific person and the person is in this list, please select the person.",
"fieldname": "related_person",
"description": "The person making the request.",
"fieldname": "requestor",
"fieldtype": "Link",
"hidden": 0,
"label": "Related Person",
"label": "Requestor",
"max_length": 0,
"max_value": 0,
"options": "Church Person",
"precision": "",
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"default": "",
"description": "Check this if you don't want this shared with the church body.",
"fieldname": "is_private",
"fieldtype": "Check",
"hidden": 0,
"label": "Is Private",
"max_length": 0,
"max_value": 0,
"precision": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
@ -153,21 +168,6 @@
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"default": "",
"description": "Check this if you don't want this shared with the church body.",
"fieldname": "is_private",
"fieldtype": "Check",
"hidden": 0,
"label": "Is Private",
"max_length": 0,
"max_value": 0,
"precision": "",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
}
],
"website_sidebar": ""