From 7a9e2e42eecbe8b0709f53b19377c96c1ba93cee Mon Sep 17 00:00:00 2001 From: Ashwini Save Date: Fri, 19 May 2017 11:42:08 +0530 Subject: [PATCH 1/5] =?UTF-8?q?=E2=80=9CLeave=20Chapter=E2=80=9D=20button?= =?UTF-8?q?=20added=20for=20Foundation=20->=20Chapter=20section.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doctype/chapter/templates/chapter.html | 6 +++--- .../doctype/chapter_member/chapter_member.json | 8 ++++---- foundation/www/join-chapter.html | 4 ++-- foundation/www/leave-chapter.html | 16 ++++++++++++++++ foundation/www/leave_chapter.py | 14 ++++++++++++++ 5 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 foundation/www/leave-chapter.html create mode 100644 foundation/www/leave_chapter.py diff --git a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html index 10b0f95b..c6691f38 100644 --- a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html +++ b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html @@ -8,14 +8,14 @@ {% if members %} + - {% for user in members %} + - - {% endfor %}
Serial No. Member NameMember Email Website URL
{{ i }} {{ frappe.db.get_value('User', user.user, 'full_name') }}{{ frappe.db.get_value('User', user.user, 'email') }} {% if user.website_url %} {{ user.website_url }} @@ -29,7 +29,6 @@ {{ user.introduction }}
{% else %} @@ -55,6 +54,7 @@

{{ address }}

Join this Chapter

+

Leave this Chapter

{% endblock %} diff --git a/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json b/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json index eefae909..c681087c 100644 --- a/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json +++ b/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json @@ -68,7 +68,7 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -98,7 +98,7 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -128,7 +128,7 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -144,7 +144,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-05-12 16:36:07.139907", + "modified": "2017-05-16 15:24:25.355107", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "Chapter Member", diff --git a/foundation/www/join-chapter.html b/foundation/www/join-chapter.html index 4850376a..0cc1ab12 100644 --- a/foundation/www/join-chapter.html +++ b/foundation/www/join-chapter.html @@ -35,12 +35,12 @@
-
-
diff --git a/foundation/www/leave-chapter.html b/foundation/www/leave-chapter.html new file mode 100644 index 00000000..2f8452d5 --- /dev/null +++ b/foundation/www/leave-chapter.html @@ -0,0 +1,16 @@ +{% extends "templates/web.html" %} + +{% block page_content %} + + {% if member_deleted %} +

You are not a member of {{ chapter.title }}!

+

Please signup and login to join this chapter

+ +

Become Member agian

+ {% endif %} +{% endblock %} \ No newline at end of file diff --git a/foundation/www/leave_chapter.py b/foundation/www/leave_chapter.py new file mode 100644 index 00000000..96932bba --- /dev/null +++ b/foundation/www/leave_chapter.py @@ -0,0 +1,14 @@ +import frappe + +def get_context(context): + context.no_cache = True + chapter = frappe.get_doc('Chapter', frappe.form_dict.name) + # if frappe.session.user!='Guest': + if frappe.session.user in [d.user for d in chapter.members]: + user = frappe.session.user + parent = frappe.form_dict.name + frappe.db.sql("""delete from `tabChapter Member` where parent = %s and user = %s """, (parent, user)) + + context.member_deleted = True + + context.chapter = chapter From c52a249740c7ec5ad1e791031bbea056fa648f78 Mon Sep 17 00:00:00 2001 From: Ashwini Save Date: Mon, 22 May 2017 16:19:54 +0530 Subject: [PATCH 2/5] Foundation > Chapter > View Chapter details page changes for displaying user details. --- .../doctype/chapter/templates/chapter.html | 28 +++++++++---------- foundation/www/join-chapter.html | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html index c6691f38..f2c9058c 100644 --- a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html +++ b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html @@ -9,26 +9,26 @@ - - + {% for user in members %} - - + - - - {% endfor %}
Serial No.Member NameWebsite URLMember Details
{{ i }}{{ frappe.db.get_value('User', user.user, 'full_name') }}{{ loop.index }} - {% if user.website_url %} - {{ user.website_url }} - {% else %} - {{ user.website_url }} - {% endif %} +
+
{{ frappe.db.get_value('User', user.user, 'full_name') }}
+
+ {% if user.website_url %} + {{ user.website_url }} + {% else %} + {{ user.website_url }} + {% endif %} +
+
+ {{ user.introduction }}
+
- {{ user.introduction }} -
{% else %} diff --git a/foundation/www/join-chapter.html b/foundation/www/join-chapter.html index 0cc1ab12..973c7ead 100644 --- a/foundation/www/join-chapter.html +++ b/foundation/www/join-chapter.html @@ -24,9 +24,9 @@
- -
From cac5b3e0162758a677e9a17b5f6a4adac3160b75 Mon Sep 17 00:00:00 2001 From: Ashwini Save Date: Mon, 22 May 2017 16:33:51 +0530 Subject: [PATCH 3/5] Updated docType for Chapter Member. --- .../chapter_member/chapter_member.json | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json b/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json index c681087c..dbc5f5af 100644 --- a/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json +++ b/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json @@ -50,13 +50,13 @@ "collapsible": 0, "columns": 0, "fieldname": "introduction", - "fieldtype": "Text", + "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 1, + "in_list_view": 0, "in_standard_filter": 0, "label": "Introduction", "length": 0, @@ -68,37 +68,7 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "enabled", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Enabled", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, + "reqd": 0, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -128,7 +98,37 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "enabled", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Enabled", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -144,7 +144,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-05-16 15:24:25.355107", + "modified": "2017-05-22 16:29:01.536405", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "Chapter Member", From 7670e92af545055b7263cb27a818da90e4f9546a Mon Sep 17 00:00:00 2001 From: Ashwini Save Date: Mon, 22 May 2017 16:53:46 +0530 Subject: [PATCH 4/5] Change for Chapter Member details --- .../doctype/chapter/templates/chapter.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html index f2c9058c..00cff4b5 100644 --- a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html +++ b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html @@ -8,7 +8,7 @@ {% if members %} - + {% for user in members %} @@ -16,12 +16,12 @@
Serial No.Serial No. Member Details
{{ loop.index }}
-
{{ frappe.db.get_value('User', user.user, 'full_name') }}
-
+
{{ frappe.db.get_value('User', user.user, 'full_name') }}
+
{% if user.website_url %} {{ user.website_url }} {% else %} - {{ user.website_url }} + {% endif %}
From 2219a4d8404d3d0d2a13230342060fb271fff9e4 Mon Sep 17 00:00:00 2001 From: Ashwini Save Date: Mon, 22 May 2017 17:24:21 +0530 Subject: [PATCH 5/5] =?UTF-8?q?Chapter=20view=20removing=20=E2=80=9Cnone?= =?UTF-8?q?=E2=80=9D=20from=20view.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doctype/chapter/templates/chapter.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html index 00cff4b5..2cefe11a 100644 --- a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html +++ b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html @@ -8,7 +8,7 @@ {% if members %} - + {% for user in members %} @@ -25,7 +25,11 @@ {% endif %}
- {{ user.introduction }}
+ {% if user.website_url %} + + {{ user.introduction }} + {% endif %} +
Serial No. Member Details