eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: link user to speaker/attendee

Browse Source
This commit is contained in:
Summayya
2021-08-19 16:08:54 +05:30
parent eb58b1c149
commit ad0913500c
20 changed files with 247 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
community/event_management/doctype/attendee_registration/attendee_registration.json
View File

@@ -6,7 +6,8 @@
"engine": "InnoDB",
"field_order": [
"attendee_info_section",
"name1",
"user",
"full_name",
"email",
"phone_number",
"occupation",
@@ -20,24 +21,23 @@
"label": "Attendee Info"
},
{
"fieldname": "name1",
"fieldtype": "Data",
"label": "Name"
},
{
"fetch_from": "user.email",
"fieldname": "email",
"fieldtype": "Data",
"label": "Email"
"label": "Email",
"read_only": 1
},
{
"fieldname": "phone_number",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Phone Number"
},
{
"fieldname": "occupation",
"fieldtype": "Data",
"label": "Occupation"
"label": "Occupation",
"reqd": 1
},
{
"fieldname": "company",
@@ -48,11 +48,24 @@
"fieldname": "what_are_you_hoping_to_learn",
"fieldtype": "Text",
"label": "What are you hoping to learn"
},
{
"fieldname": "user",
"fieldtype": "Link",
"label": "User",
"options": "User"
},
{
"fetch_from": "user.full_name",
"fieldname": "full_name",
"fieldtype": "Data",
"label": "Full Name",
"read_only": 1
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-08-11 10:07:53.262504",
"modified": "2021-08-19 15:25:03.305762",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Attendee Registration",

18
community/event_management/doctype/schedule/schedule.json
View File

@@ -7,18 +7,10 @@
"engine": "InnoDB",
"field_order": [
"event",
"speaker",
"talk",
"slot"
],
"fields": [
{
"fieldname": "speaker",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Speaker",
"options": "Speaker Registration",
"reqd": 1
},
{
"fieldname": "slot",
"fieldtype": "Link",
@@ -34,11 +26,17 @@
"label": "Event",
"options": "Event Details",
"reqd": 1
},
{
"fieldname": "talk",
"fieldtype": "Link",
"label": "Talk",
"options": "Talk"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-08-18 09:46:18.694910",
"modified": "2021-08-19 15:23:18.137946",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Schedule",

0
community/event_management/doctype/previous_content/__init__.py → community/event_management/doctype/speaker/__init__.py
View File

2
community/event_management/doctype/previous_content/previous_content.js → community/event_management/doctype/speaker/speaker.js
View File

@@ -1,7 +1,7 @@
// Copyright (c) 2021, FOSS United and contributors
// For license information, please see license.txt
frappe.ui.form.on('Previous Content', {
frappe.ui.form.on('Speaker', {
// refresh: function(frm) {
// }

73
community/event_management/doctype/speaker_registration/speaker_registration.json → community/event_management/doctype/speaker/speaker.json
View File

@@ -1,12 +1,13 @@
{
"actions": [],
"autoname": "SPEAKER-REGIS.####.",
"autoname": "format:Speaker-{full_name}-{####}",
"creation": "2021-08-11 10:37:32.124651",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"speaker_info_section",
"user",
"full_name",
"email",
"phone_number",
@@ -14,14 +15,7 @@
"company",
"column_break_8",
"picture",
"bio",
"talk_info_section",
"topic",
"title",
"column_break_13",
"about",
"attachment",
"status"
"bio"
],
"fields": [
{
@@ -30,16 +24,17 @@
"label": "Speaker Info"
},
{
"fetch_from": "user.email",
"fieldname": "email",
"fieldtype": "Data",
"label": "Email",
"reqd": 1,
"unique": 1
"read_only": 1
},
{
"fieldname": "phone_number",
"fieldtype": "Data",
"label": "Phone Number",
"reqd": 1,
"unique": 1
},
{
@@ -67,67 +62,31 @@
"fieldtype": "Text",
"label": "Bio"
},
{
"fieldname": "talk_info_section",
"fieldtype": "Section Break",
"label": "Talk Info"
},
{
"fieldname": "topic",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Topic",
"options": "Delivery\nCloud\nCustomer Success\nMarketing\nDevelopment\nHR\nCustomer Stories",
"reqd": 1
},
{
"fieldname": "title",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Title",
"reqd": 1
},
{
"fieldname": "about",
"fieldtype": "Text",
"label": "About",
"reqd": 1
},
{
"fieldname": "attachment",
"fieldtype": "Attach",
"label": "Attachment"
},
{
"fieldname": "column_break_8",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_13",
"fieldtype": "Column Break"
},
{
"default": "Applied",
"fieldname": "status",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Status",
"options": "Applied\nPending\nApproved\nRejected"
},
{
"fetch_from": "user.full_name",
"fieldname": "full_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Full Name",
"reqd": 1
"read_only": 1
},
{
"fieldname": "user",
"fieldtype": "Link",
"label": "User",
"options": "User"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-08-18 09:48:19.602309",
"modified": "2021-08-19 15:19:27.351589",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Speaker Registration",
"name": "Speaker",
"owner": "Administrator",
"permissions": [
{

2
community/event_management/doctype/speaker_registration/speaker_registration.py → community/event_management/doctype/speaker/speaker.py
View File

@@ -4,7 +4,7 @@
import frappe
from frappe.model.document import Document
class SpeakerRegistration(Document):
class Speaker(Document):
def on_update(self):
pass

2
community/event_management/doctype/previous_content/test_previous_content.py → community/event_management/doctype/speaker/test_speaker.py
View File

@@ -4,5 +4,5 @@
# import frappe
import unittest
class TestPreviousContent(unittest.TestCase):
class TestSpeaker(unittest.TestCase):
pass

0
community/event_management/doctype/speaker_registration/__init__.py → community/event_management/doctype/talk/__init__.py
View File

2
community/event_management/doctype/speaker_registration/speaker_registration.js → community/event_management/doctype/talk/talk.js
View File

@@ -1,7 +1,7 @@
// Copyright (c) 2021, FOSS United and contributors
// For license information, please see license.txt
frappe.ui.form.on('Speaker Registration', {
frappe.ui.form.on('Talk', {
// refresh: function(frm) {
// }

44
community/event_management/doctype/previous_content/previous_content.json → community/event_management/doctype/talk/talk.json
View File

@@ -1,16 +1,21 @@
{
"actions": [],
"autoname": "format:PRE-VID-BY-{name_of_the_speaker}-{####}",
"autoname": "format:TALK-BY-{speaker}-{####}",
"creation": "2021-08-18 08:42:58.711932",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"event",
"topic",
"title",
"name_of_the_speaker",
"about",
"attachment",
"url",
"thumbnail"
"thumbnail",
"speaker",
"name_of_the_speaker",
"status"
],
"fields": [
{
@@ -38,14 +43,43 @@
"fieldtype": "Link",
"label": "Event",
"options": "Event Details"
},
{
"fieldname": "topic",
"fieldtype": "Data",
"label": "Topic"
},
{
"fieldname": "about",
"fieldtype": "Data",
"label": "About"
},
{
"fieldname": "attachment",
"fieldtype": "Attach",
"label": "Attachment"
},
{
"fieldname": "speaker",
"fieldtype": "Link",
"label": "Speaker",
"options": "Speaker"
},
{
"default": "Applied",
"fieldname": "status",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Status",
"options": "Applied\nPending\nApproved\nRejected"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-08-18 09:37:03.278439",
"modified": "2021-08-19 15:20:07.750884",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Previous Content",
"name": "Talk",
"owner": "Administrator",
"permissions": [
{

2
community/event_management/doctype/previous_content/previous_content.py → community/event_management/doctype/talk/talk.py
View File

@@ -4,5 +4,5 @@
# import frappe
from frappe.model.document import Document
class PreviousContent(Document):
class Talk(Document):
pass

2
community/event_management/doctype/speaker_registration/test_speaker_registration.py → community/event_management/doctype/talk/test_talk.py
View File

@@ -4,5 +4,5 @@
# import frappe
import unittest
class TestSpeakerRegistration(unittest.TestCase):
class TestTalk(unittest.TestCase):
pass

29
community/event_management/web_form/attendee_registration/attendee_registration.json
View File

@@ -9,8 +9,8 @@
"amount": 0.0,
"amount_based_on_field": 0,
"apply_document_permissions": 0,
"button_label": "Register",
"creation": "2021-08-11 10:08:24.418743",
"button_label": "Get Ticket",
"creation": "2021-08-19 15:26:56.594526",
"doc_type": "Attendee Registration",
"docstatus": 0,
"doctype": "Web Form",
@@ -18,44 +18,45 @@
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2021-08-18 11:35:06.067390",
"modified": "2021-08-19 15:34:04.871127",
"modified_by": "Administrator",
"module": "Event Management",
"name": "attendee-registration",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "event/conference2021/attendee-registration",
"route_to_success_link": 0,
"route": "event/conference/attendee-registration",
"route_to_success_link": 1,
"show_attachments": 0,
"show_in_grid": 0,
"show_sidebar": 0,
"sidebar_items": [],
"success_url": "/event/conference20221",
"success_url": "/attendee-registration",
"title": "Attendee Registration",
"web_form_fields": [
{
"allow_read_on_all_link_options": 0,
"fieldname": "attendee_info_section",
"fieldtype": "Section Break",
"fieldname": "user",
"fieldtype": "Link",
"hidden": 0,
"label": "Attendee Info",
"label": "User",
"max_length": 0,
"max_value": 0,
"options": "User",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "name1",
"fieldname": "full_name",
"fieldtype": "Data",
"hidden": 0,
"label": "Name",
"label": "Full Name",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"reqd": 0,
"show_in_filter": 0
},
{
@@ -67,7 +68,7 @@
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"reqd": 0,
"show_in_filter": 0
},
{
@@ -91,7 +92,7 @@
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"reqd": 1,
"show_in_filter": 0
},
{

0
community/event_management/web_form/purpose_a_talk/__init__.py Normal file
View File

3
community/event_management/web_form/purpose_a_talk/purpose_a_talk.js Normal file
View File

@@ -0,0 +1,3 @@
frappe.ready(function() {
// bind events here
})

112
community/event_management/web_form/purpose_a_talk/purpose_a_talk.json Normal file
View File

@@ -0,0 +1,112 @@
{
"accept_payment": 0,
"allow_comments": 0,
"allow_delete": 0,
"allow_edit": 0,
"allow_incomplete": 0,
"allow_multiple": 0,
"allow_print": 0,
"amount": 0.0,
"amount_based_on_field": 0,
"apply_document_permissions": 0,
"button_label": "Submit",
"creation": "2021-08-19 15:16:22.341723",
"doc_type": "Talk",
"docstatus": 0,
"doctype": "Web Form",
"idx": 0,
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2021-08-19 15:22:37.040442",
"modified_by": "Administrator",
"module": "Event Management",
"name": "purpose-a-talk",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "event/conference/purpose-a-talk",
"route_to_success_link": 0,
"show_attachments": 0,
"show_in_grid": 0,
"show_sidebar": 0,
"sidebar_items": [],
"success_url": "/purpose-a-talk",
"title": "Purpose a Talk",
"web_form_fields": [
{
"allow_read_on_all_link_options": 0,
"fieldname": "event",
"fieldtype": "Link",
"hidden": 0,
"label": "Event",
"max_length": 0,
"max_value": 0,
"options": "Event Details",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "speaker",
"fieldtype": "Link",
"hidden": 0,
"label": "Speaker",
"max_length": 0,
"max_value": 0,
"options": "Speaker",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "topic",
"fieldtype": "Data",
"hidden": 0,
"label": "Topic",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 0,
"label": "Title",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "about",
"fieldtype": "Data",
"hidden": 0,
"label": "About",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "attachment",
"fieldtype": "Attach",
"hidden": 0,
"label": "Attachment",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
}
]
}

5
community/event_management/web_form/purpose_a_talk/purpose_a_talk.py Normal file
View File

@@ -0,0 +1,5 @@
import frappe
def get_context(context):
# do your magic here
pass

117
community/event_management/web_form/speaker_registration/speaker_registration.json
View File

@@ -9,40 +9,40 @@
"amount": 0.0,
"amount_based_on_field": 0,
"apply_document_permissions": 0,
"button_label": "Submit",
"creation": "2021-08-11 20:52:20.308925",
"doc_type": "Speaker Registration",
"button_label": "Register",
"creation": "2021-08-19 15:29:01.167930",
"doc_type": "Speaker",
"docstatus": 0,
"doctype": "Web Form",
"idx": 0,
"introduction_text": "<div class=\"ql-editor read-mode\"><p><br></p></div>",
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2021-08-18 20:00:46.756407",
"modified": "2021-08-19 15:30:59.041817",
"modified_by": "Administrator",
"module": "Event Management",
"name": "speaker-registration",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "event/conference2021/speaker-registration",
"route": "event/conference/speaker-registration",
"route_to_success_link": 1,
"show_attachments": 0,
"show_in_grid": 0,
"show_sidebar": 0,
"sidebar_items": [],
"success_url": "/event/conference2021/about",
"success_url": "/speaker-registration",
"title": "Speaker Registration",
"web_form_fields": [
{
"allow_read_on_all_link_options": 0,
"fieldname": "speaker_info_section",
"fieldtype": "Section Break",
"fieldname": "user",
"fieldtype": "Link",
"hidden": 0,
"label": "Speaker Info",
"label": "User",
"max_length": 0,
"max_value": 0,
"options": "User",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
@@ -56,7 +56,7 @@
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"reqd": 0,
"show_in_filter": 0
},
{
@@ -68,7 +68,7 @@
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"reqd": 0,
"show_in_filter": 0
},
{
@@ -80,7 +80,7 @@
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"reqd": 1,
"show_in_filter": 0
},
{
@@ -92,7 +92,7 @@
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"reqd": 1,
"show_in_filter": 0
},
{
@@ -104,18 +104,7 @@
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "column_break_8",
"fieldtype": "Column Break",
"hidden": 0,
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"reqd": 1,
"show_in_filter": 0
},
{
@@ -123,11 +112,11 @@
"fieldname": "picture",
"fieldtype": "Attach Image",
"hidden": 0,
"label": "Picture",
"label": "Profile Image",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"reqd": 1,
"show_in_filter": 0
},
{
@@ -141,78 +130,6 @@
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "talk_info_section",
"fieldtype": "Section Break",
"hidden": 0,
"label": "Talk Info",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "topic",
"fieldtype": "Select",
"hidden": 0,
"label": "Topic",
"max_length": 0,
"max_value": 0,
"options": "Delivery\nCloud\nCustomer Success\nMarketing\nDevelopment\nHR\nCustomer Stories",
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 0,
"label": "Title",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "column_break_13",
"fieldtype": "Column Break",
"hidden": 0,
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "about",
"fieldtype": "Data",
"hidden": 0,
"label": "About",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "attachment",
"fieldtype": "Attach",
"hidden": 0,
"label": "Attachment",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
}
]
}

4
community/event_management/web_template/speaker_section/speaker_section.html
View File

@@ -2,7 +2,7 @@
<h1 class="course-home-headings">{{section_title}}</h1>
<div class="speaker-cards-parent">
{% for speaker in speaker_details %}
{% set speaker_doc = frappe.get_doc("Speaker Registration", speaker.speaker) %}
{% set speaker_doc = frappe.get_doc("Speaker", speaker.speaker) %}
<div class="common-card-style member-card talk-card">
<span class="avatar avatar-large">
@@ -18,6 +18,6 @@
</div>
{%- if cta_link -%}
<div class="event-btn"><a href={{cta_link}} class="btn btn-primary ">Become a Speaker</a></div>
<div class="event-btn"><a href={{cta_link}} class="btn btn-primary ">Propose a Talk</a></div>
{%- endif -%}
</div>

5
community/event_management/web_template/speaker_section/speaker_section.json
View File

@@ -17,7 +17,6 @@
"reqd": 0
},
{
"__unsaved": 1,
"fieldname": "event_",
"fieldtype": "Link",
"label": "Event ",
@@ -40,12 +39,12 @@
"fieldname": "speaker",
"fieldtype": "Link",
"label": "Speaker",
"options": "Speaker Registration",
"options": "Speaker",
"reqd": 0
}
],
"idx": 1,
"modified": "2021-08-18 10:06:03.032441",
"modified": "2021-08-19 16:06:45.811889",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Speaker Section",