diff --git a/member_management/__init__.py b/member_management/__init__.py index a73339b..b2f0155 100644 --- a/member_management/__init__.py +++ b/member_management/__init__.py @@ -1 +1 @@ -__version__ = "0.0.8" +__version__ = "0.0.11" diff --git a/member_management/member_management/doctype/booked_member/booked_member.json b/member_management/member_management/doctype/booked_member/booked_member.json index dd4cce9..4706cdf 100644 --- a/member_management/member_management/doctype/booked_member/booked_member.json +++ b/member_management/member_management/doctype/booked_member/booked_member.json @@ -1,6 +1,7 @@ { "actions": [], - "autoname": "format:{booked_contact}-{lastname}-{##}", + "allow_rename": 1, + "autoname": "format:BOOKED-{lastname}-{##}", "creation": "2025-11-13 21:19:39.193998", "doctype": "DocType", "editable_grid": 1, @@ -37,6 +38,7 @@ { "fieldname": "password", "fieldtype": "Password", + "in_list_view": 1, "label": "Password", "reqd": 1 }, @@ -48,7 +50,6 @@ "fetch_from": "booked_contact.first_name", "fieldname": "firstname", "fieldtype": "Read Only", - "in_list_view": 1, "label": "First Name", "reqd": 1 }, @@ -56,7 +57,6 @@ "fetch_from": "booked_contact.last_name", "fieldname": "lastname", "fieldtype": "Read Only", - "in_list_view": 1, "label": "Last Name", "reqd": 1 }, @@ -85,7 +85,8 @@ "fieldname": "groupid", "fieldtype": "Table MultiSelect", "label": "Groups", - "options": "Booked GroupId" + "options": "Booked GroupId", + "reqd": 1 }, { "fieldname": "booked_contact", @@ -93,8 +94,7 @@ "in_list_view": 1, "label": "Contact", "options": "Contact", - "reqd": 1, - "unique": 1 + "reqd": 1 } ], "grid_page_length": 50, @@ -112,7 +112,7 @@ "link_fieldname": "member_id" } ], - "modified": "2025-11-15 09:17:57.628694", + "modified": "2025-11-16 17:46:12.905209", "modified_by": "Administrator", "module": "Member Management", "name": "Booked Member", diff --git a/member_management/member_management/doctype/food_protection_manager_record/food_protection_manager_record.json b/member_management/member_management/doctype/food_protection_manager_record/food_protection_manager_record.json index da25e58..f8c5368 100644 --- a/member_management/member_management/doctype/food_protection_manager_record/food_protection_manager_record.json +++ b/member_management/member_management/doctype/food_protection_manager_record/food_protection_manager_record.json @@ -1,7 +1,7 @@ { "actions": [], "allow_rename": 1, - "autoname": "format:Certificate-{issuer}-{expire_date}", + "autoname": "format:Manager-{issuer}-{expire_date}", "creation": "2025-11-09 09:57:03.492727", "doctype": "DocType", "editable_grid": 1, @@ -65,7 +65,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-11-15 13:29:26.039870", + "modified": "2025-11-15 23:01:35.816996", "modified_by": "Administrator", "module": "Member Management", "name": "Food Protection Manager Record", diff --git a/member_management/member_management/doctype/insurance_record/insurance_record.json b/member_management/member_management/doctype/insurance_record/insurance_record.json index 9819b7e..4367135 100644 --- a/member_management/member_management/doctype/insurance_record/insurance_record.json +++ b/member_management/member_management/doctype/insurance_record/insurance_record.json @@ -4,6 +4,7 @@ "autoname": "format:{insurer}-{expire_date}-{#####}", "creation": "2025-11-09 09:57:22.638768", "doctype": "DocType", + "editable_grid": 1, "engine": "InnoDB", "field_order": [ "insurer", @@ -57,7 +58,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-11-15 13:28:31.895939", + "modified": "2025-11-15 22:00:50.511102", "modified_by": "Administrator", "module": "Member Management", "name": "Insurance Record", diff --git a/member_management/member_management/doctype/member_profile/member_profile.json b/member_management/member_management/doctype/member_profile/member_profile.json index 8aabc74..7086bf7 100644 --- a/member_management/member_management/doctype/member_profile/member_profile.json +++ b/member_management/member_management/doctype/member_profile/member_profile.json @@ -1,12 +1,6 @@ { - "actions": [ - { - "action": "Onboarding", - "action_type": "Route", - "group": "User", - "label": "Tasks" - } - ], + "actions": [], + "allow_import": 1, "autoname": "format:{member_id}", "creation": "2025-11-09 09:55:16.302059", "default_view": "List", @@ -31,9 +25,6 @@ "member_join_date", "doh_approve_date", "column_break_ivvj", - "button_tasks", - "access_card_count", - "wifi_codes_issued", "dashboard_tab", "documents", "agreements_section", @@ -52,8 +43,12 @@ "associates_section", "table_associate", "tab_5_tab", + "facility_access_section", "table_unifi", - "table_booked_member" + "schedule_access_section", + "table_booked_member", + "codes_wiifi", + "wifi_codes_issued" ], "fields": [ { @@ -95,8 +90,11 @@ { "description": "Not editable", "fieldname": "member_id", - "fieldtype": "Data", + "fieldtype": "Int", + "in_list_view": 1, "label": "Member ID", + "length": 12, + "non_negative": 1, "reqd": 1, "set_only_once": 1, "unique": 1 @@ -179,22 +177,10 @@ "fieldtype": "Section Break", "label": "Onboarding" }, - { - "fieldname": "button_tasks", - "fieldtype": "Button", - "label": "Codes", - "options": "Onboarding" - }, { "fieldname": "column_break_ivvj", "fieldtype": "Column Break" }, - { - "fieldname": "access_card_count", - "fieldtype": "Int", - "label": "Number of Access Cards Issued", - "non_negative": 1 - }, { "fieldname": "wifi_codes_issued", "fieldtype": "Text", @@ -260,7 +246,6 @@ { "fieldname": "table_menu", "fieldtype": "Table", - "label": "Menus", "options": "Menu" }, { @@ -271,14 +256,29 @@ { "fieldname": "table_unifi", "fieldtype": "Table", - "label": "Facility Access", + "label": "Access Cards", "options": "UniFi Access Profile" }, { "fieldname": "table_booked_member", "fieldtype": "Table", - "label": "Schedule Access", + "label": "Booked Configuration", "options": "Booked Member" + }, + { + "fieldname": "facility_access_section", + "fieldtype": "Section Break", + "label": "Facility Access" + }, + { + "fieldname": "schedule_access_section", + "fieldtype": "Section Break", + "label": "Schedule Access" + }, + { + "fieldname": "codes_wiifi", + "fieldtype": "Section Break", + "label": "Internet Access" } ], "grid_page_length": 50, @@ -299,7 +299,7 @@ "link_fieldname": "member_id" } ], - "modified": "2025-11-15 13:26:03.243484", + "modified": "2025-11-15 23:05:21.558545", "modified_by": "Administrator", "module": "Member Management", "name": "Member Profile", diff --git a/member_management/member_management/doctype/offboarding/offboarding.json b/member_management/member_management/doctype/offboarding/offboarding.json index 45c972c..b2ffcc3 100644 --- a/member_management/member_management/doctype/offboarding/offboarding.json +++ b/member_management/member_management/doctype/offboarding/offboarding.json @@ -13,7 +13,7 @@ "fieldtype": "Link", "in_list_view": 1, "label": "Member", - "link_filters": "[[\"Member Profile\",\"status\",\"=\",\"Offboarding\"]]", + "link_filters": "[[\"Member Profile\",\"membership_status\",\"=\",\"Offboarding\"]]", "options": "Member Profile", "reqd": 1 } @@ -21,7 +21,7 @@ "grid_page_length": 50, "index_web_pages_for_search": 1, "links": [], - "modified": "2025-11-13 22:53:03.268661", + "modified": "2025-11-16 17:25:37.594723", "modified_by": "Administrator", "module": "Member Management", "name": "Offboarding", diff --git a/member_management/member_management/doctype/onboarding/onboarding.json b/member_management/member_management/doctype/onboarding/onboarding.json index 89c6eb4..7e544f4 100644 --- a/member_management/member_management/doctype/onboarding/onboarding.json +++ b/member_management/member_management/doctype/onboarding/onboarding.json @@ -24,7 +24,7 @@ "fieldtype": "Link", "in_list_view": 1, "label": "Member", - "link_filters": "[[\"Member Profile\",\"status\",\"=\",\"Onboarding\"]]", + "link_filters": "[[\"Member Profile\",\"membership_status\",\"=\",\"Onboarding\"]]", "options": "Member Profile", "reqd": 1, "set_only_once": 1, @@ -90,7 +90,7 @@ "link_fieldname": "member_id" } ], - "modified": "2025-11-11 22:47:23.901625", + "modified": "2025-11-16 17:25:17.738693", "modified_by": "Administrator", "module": "Member Management", "name": "Onboarding", diff --git a/member_management/member_management/number_card/active_members/active_members.json b/member_management/member_management/number_card/active_members/active_members.json index 0dc54de..5e2754d 100644 --- a/member_management/member_management/number_card/active_members/active_members.json +++ b/member_management/member_management/number_card/active_members/active_members.json @@ -6,13 +6,13 @@ "doctype": "Number Card", "document_type": "Member Profile", "dynamic_filters_json": "[]", - "filters_json": "[[\"Member Profile\",\"status\",\"=\",\"Active\",false]]", + "filters_json": "[[\"Member Profile\",\"membership_status\",\"=\",\"Active\",false]]", "function": "Count", "idx": 0, "is_public": 0, "is_standard": 1, "label": "Active Members", - "modified": "2025-11-11 18:38:44.733668", + "modified": "2025-11-15 17:14:57.494989", "modified_by": "Administrator", "module": "Member Management", "name": "Active Members", diff --git a/member_management/member_management/web_form/agreements/agreements.json b/member_management/member_management/web_form/agreements/agreements.json index 8614c0b..81fcdea 100644 --- a/member_management/member_management/web_form/agreements/agreements.json +++ b/member_management/member_management/web_form/agreements/agreements.json @@ -1,7 +1,7 @@ { "allow_comments": 0, "allow_delete": 0, - "allow_edit": 1, + "allow_edit": 0, "allow_incomplete": 0, "allow_multiple": 0, "allow_print": 0, @@ -42,14 +42,14 @@ "list_title": "Member Profile", "login_required": 1, "max_attachment_size": 0, - "modified": "2025-11-14 17:51:47.145410", + "modified": "2025-11-15 22:45:37.938835", "modified_by": "Administrator", "module": "Member Management", "name": "agreements", "owner": "Administrator", "published": 1, "route": "profile-agreement", - "show_attachments": 1, + "show_attachments": 0, "show_list": 0, "show_sidebar": 1, "title": "Agreements", @@ -69,7 +69,7 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "table_cabr", + "fieldname": "table_agreement", "fieldtype": "Table", "hidden": 0, "max_length": 0, diff --git a/member_management/member_management/web_form/associates/associates.json b/member_management/member_management/web_form/associates/associates.json index c4060ce..0c2a9fa 100644 --- a/member_management/member_management/web_form/associates/associates.json +++ b/member_management/member_management/web_form/associates/associates.json @@ -42,14 +42,14 @@ "list_title": "Member Profile", "login_required": 1, "max_attachment_size": 0, - "modified": "2025-11-14 17:46:20.191842", + "modified": "2025-11-15 22:41:22.343092", "modified_by": "Administrator", "module": "Member Management", "name": "associates", "owner": "Administrator", "published": 1, "route": "profile-associate", - "show_attachments": 1, + "show_attachments": 0, "show_list": 0, "show_sidebar": 1, "title": "Associates", @@ -69,7 +69,7 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "table_cdln", + "fieldname": "table_associate", "fieldtype": "Table", "hidden": 0, "max_length": 0, diff --git a/member_management/member_management/web_form/corporate_documents/corporate_documents.json b/member_management/member_management/web_form/corporate_documents/corporate_documents.json index 0c94c2d..ac25191 100644 --- a/member_management/member_management/web_form/corporate_documents/corporate_documents.json +++ b/member_management/member_management/web_form/corporate_documents/corporate_documents.json @@ -42,14 +42,14 @@ "list_title": "Member Profile", "login_required": 1, "max_attachment_size": 0, - "modified": "2025-11-14 17:33:25.426606", + "modified": "2025-11-15 22:44:37.196062", "modified_by": "Administrator", "module": "Member Management", "name": "corporate-documents", "owner": "Administrator", "published": 1, "route": "profile-corporate", - "show_attachments": 1, + "show_attachments": 0, "show_list": 0, "show_sidebar": 1, "title": "Corporate Documents", @@ -71,7 +71,7 @@ { "allow_read_on_all_link_options": 0, "description": "Description", - "fieldname": "table_rkkt", + "fieldname": "table_corpdoc", "fieldtype": "Table", "hidden": 0, "max_length": 0, diff --git a/member_management/member_management/web_form/demographics/demographics.json b/member_management/member_management/web_form/demographics/demographics.json index a736d6b..b89f5b7 100644 --- a/member_management/member_management/web_form/demographics/demographics.json +++ b/member_management/member_management/web_form/demographics/demographics.json @@ -1,7 +1,7 @@ { "allow_comments": 0, "allow_delete": 0, - "allow_edit": 1, + "allow_edit": 0, "allow_incomplete": 0, "allow_multiple": 0, "allow_print": 0, @@ -42,14 +42,14 @@ "list_title": "Member Profile", "login_required": 1, "max_attachment_size": 0, - "modified": "2025-11-14 17:46:51.140689", + "modified": "2025-11-15 22:47:25.825799", "modified_by": "Administrator", "module": "Member Management", "name": "demographics", "owner": "Administrator", "published": 1, "route": "profile-demographic", - "show_attachments": 1, + "show_attachments": 0, "show_list": 0, "show_sidebar": 1, "title": "Demographics", diff --git a/member_management/member_management/web_form/food_manager_records/food_manager_records.json b/member_management/member_management/web_form/food_manager_records/food_manager_records.json index eba8cf2..5bc2108 100644 --- a/member_management/member_management/web_form/food_manager_records/food_manager_records.json +++ b/member_management/member_management/web_form/food_manager_records/food_manager_records.json @@ -42,14 +42,14 @@ "list_title": "Member Profile", "login_required": 1, "max_attachment_size": 0, - "modified": "2025-11-14 16:18:00.648370", + "modified": "2025-11-15 22:47:02.068278", "modified_by": "Administrator", "module": "Member Management", "name": "food-manager-records", "owner": "Administrator", "published": 1, "route": "profile-manager", - "show_attachments": 1, + "show_attachments": 0, "show_list": 0, "show_sidebar": 1, "title": "Food Manager Records", @@ -69,7 +69,7 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "table_wsni", + "fieldname": "table_manager", "fieldtype": "Table", "hidden": 0, "max_length": 0, diff --git a/member_management/member_management/web_form/inspection_records/inspection_records.json b/member_management/member_management/web_form/inspection_records/inspection_records.json index 0197ae4..a2d5946 100644 --- a/member_management/member_management/web_form/inspection_records/inspection_records.json +++ b/member_management/member_management/web_form/inspection_records/inspection_records.json @@ -42,14 +42,14 @@ "list_title": "Member Profile", "login_required": 1, "max_attachment_size": 0, - "modified": "2025-11-14 16:20:08.458609", + "modified": "2025-11-15 22:44:59.335692", "modified_by": "Administrator", "module": "Member Management", "name": "inspection-records", "owner": "Administrator", "published": 1, "route": "profile-inspection", - "show_attachments": 1, + "show_attachments": 0, "show_list": 0, "show_sidebar": 1, "title": "Inspection Records", @@ -69,9 +69,10 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "table_yzvn", + "fieldname": "table_inspection", "fieldtype": "Table", "hidden": 0, + "label": "", "max_length": 0, "max_value": 0, "options": "Inspection Record", diff --git a/member_management/member_management/web_form/insurance/insurance.json b/member_management/member_management/web_form/insurance/insurance.json index 75a7da1..65bd6bd 100644 --- a/member_management/member_management/web_form/insurance/insurance.json +++ b/member_management/member_management/web_form/insurance/insurance.json @@ -42,17 +42,17 @@ "list_title": "Member Profile", "login_required": 1, "max_attachment_size": 0, - "modified": "2025-11-14 16:10:31.673901", + "modified": "2025-11-15 23:08:05.747355", "modified_by": "Administrator", "module": "Member Management", "name": "insurance", "owner": "Administrator", "published": 1, "route": "profile-insurance", - "show_attachments": 1, + "show_attachments": 0, "show_list": 0, "show_sidebar": 1, - "title": "Insurance", + "title": "Insurance Records", "web_form_fields": [ { "allow_read_on_all_link_options": 0, @@ -69,7 +69,7 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "table_wmpy", + "fieldname": "table_insurance", "fieldtype": "Table", "hidden": 0, "max_length": 0, diff --git a/member_management/member_management/web_form/member_profile/member_profile.json b/member_management/member_management/web_form/member_profile/member_profile.json index 45ea66a..107135e 100644 --- a/member_management/member_management/web_form/member_profile/member_profile.json +++ b/member_management/member_management/web_form/member_profile/member_profile.json @@ -42,14 +42,14 @@ "list_title": "Member Profile", "login_required": 1, "max_attachment_size": 0, - "modified": "2025-11-14 17:49:40.577567", + "modified": "2025-11-15 22:47:59.057218", "modified_by": "Administrator", "module": "Member Management", "name": "member-profile", "owner": "Administrator", "published": 1, "route": "profile", - "show_attachments": 1, + "show_attachments": 0, "show_list": 0, "show_sidebar": 1, "title": "Member Profile", @@ -165,7 +165,7 @@ { "allow_read_on_all_link_options": 0, "description": "Description", - "fieldname": "table_rkkt", + "fieldname": "table_corpdoc", "fieldtype": "Table", "hidden": 0, "max_length": 0, @@ -191,7 +191,7 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "table_wsni", + "fieldname": "table_manager", "fieldtype": "Table", "hidden": 0, "max_length": 0, @@ -217,7 +217,7 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "table_wmpy", + "fieldname": "table_insurance", "fieldtype": "Table", "hidden": 0, "max_length": 0, @@ -243,7 +243,7 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "table_yzvn", + "fieldname": "table_inspection", "fieldtype": "Table", "hidden": 0, "max_length": 0, @@ -269,7 +269,7 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "menu", + "fieldname": "table_menu", "fieldtype": "Table", "hidden": 0, "label": "Menus", @@ -296,7 +296,7 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "table_cdln", + "fieldname": "table_associate", "fieldtype": "Table", "hidden": 0, "max_length": 0, @@ -322,7 +322,7 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "table_cabr", + "fieldname": "table_agreement", "fieldtype": "Table", "hidden": 0, "max_length": 0, diff --git a/member_management/member_management/web_form/menu/menu.json b/member_management/member_management/web_form/menu/menu.json index aeb2417..831477a 100644 --- a/member_management/member_management/web_form/menu/menu.json +++ b/member_management/member_management/web_form/menu/menu.json @@ -42,14 +42,14 @@ "list_title": "Member Profile", "login_required": 1, "max_attachment_size": 0, - "modified": "2025-11-14 16:38:22.424003", + "modified": "2025-11-15 22:44:51.360993", "modified_by": "Administrator", "module": "Member Management", "name": "menu", "owner": "Administrator", "published": 1, "route": "profile-menu", - "show_attachments": 1, + "show_attachments": 0, "show_list": 0, "show_sidebar": 1, "title": "Menu", @@ -69,10 +69,10 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "menu", + "fieldname": "table_menu", "fieldtype": "Table", "hidden": 0, - "label": "Menus", + "label": "", "max_length": 0, "max_value": 0, "options": "Menu", diff --git a/member_management/member_management/web_form/provisioning_information/provisioning_information.json b/member_management/member_management/web_form/provisioning_information/provisioning_information.json index 5710809..35393b3 100644 --- a/member_management/member_management/web_form/provisioning_information/provisioning_information.json +++ b/member_management/member_management/web_form/provisioning_information/provisioning_information.json @@ -18,28 +18,29 @@ "list_columns": [], "login_required": 1, "max_attachment_size": 0, - "modified": "2025-11-14 18:05:41.364810", + "modified": "2025-11-15 22:46:20.786299", "modified_by": "Administrator", "module": "Member Management", "name": "provisioning-information", "owner": "Administrator", "published": 1, "route": "profile-provisioning", - "show_attachments": 1, + "show_attachments": 0, "show_list": 0, "show_sidebar": 1, "title": "Provisioning Information", "web_form_fields": [ { "allow_read_on_all_link_options": 0, - "fieldname": "access_card_count", - "fieldtype": "Int", + "fieldname": "table_unifi", + "fieldtype": "Table", "hidden": 0, - "label": "Number of Access Cards Issued", + "label": "Access Cards", "max_length": 0, "max_value": 0, + "options": "UniFi Access Profile", "precision": "", - "read_only": 1, + "read_only": 0, "reqd": 0, "show_in_filter": 0 }, @@ -58,29 +59,15 @@ }, { "allow_read_on_all_link_options": 0, - "fieldname": "unifi_profile", + "fieldname": "table_booked_member", "fieldtype": "Table", "hidden": 0, - "label": "Facility Access", - "max_length": 0, - "max_value": 0, - "options": "UniFi Access Profile", - "precision": "", - "read_only": 1, - "reqd": 0, - "show_in_filter": 0 - }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "booked_member", - "fieldtype": "Table", - "hidden": 0, - "label": "Schedule Access", + "label": "Booked Configuration", "max_length": 0, "max_value": 0, "options": "Booked Member", "precision": "", - "read_only": 1, + "read_only": 0, "reqd": 0, "show_in_filter": 0 } diff --git a/member_management/member_management/workspace/members/members.json b/member_management/member_management/workspace/members/members.json index 09a42c3..55e891d 100644 --- a/member_management/member_management/workspace/members/members.json +++ b/member_management/member_management/workspace/members/members.json @@ -34,7 +34,7 @@ "type": "Link" } ], - "modified": "2025-11-11 19:03:39.248103", + "modified": "2025-11-15 17:14:16.913711", "modified_by": "Administrator", "module": "Member Management", "name": "Members", @@ -51,7 +51,7 @@ { "document_type": "Member Profile", "label": "New Members", - "quick_list_filter": "[[\"Member Profile\",\"status\",\"=\",\"Onboarding\",false]]" + "quick_list_filter": "[[\"Member Profile\",\"membership_status\",\"=\",\"Onboarding\",false]]" } ], "roles": [],