diff --git a/community/event_management/doctype/attendee/attendee.json b/community/event_management/doctype/attendee/attendee.json index c055dcc0..5152edaa 100644 --- a/community/event_management/doctype/attendee/attendee.json +++ b/community/event_management/doctype/attendee/attendee.json @@ -5,33 +5,15 @@ "editable_grid": 1, "engine": "InnoDB", "field_order": [ - "attendee_info_section", "user", "full_name", - "phone_number", - "occupation", + "column_break_3", "company", - "what_are_you_hoping_to_learn", - "is_paid" + "is_paid", + "section_break_6", + "what_are_you_hoping_to_learn" ], "fields": [ - { - "fieldname": "attendee_info_section", - "fieldtype": "Section Break", - "label": "Attendee Info" - }, - { - "fieldname": "phone_number", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Phone Number" - }, - { - "fieldname": "occupation", - "fieldtype": "Data", - "label": "Occupation", - "reqd": 1 - }, { "fieldname": "company", "fieldtype": "Data", @@ -40,14 +22,13 @@ { "fieldname": "what_are_you_hoping_to_learn", "fieldtype": "Text", - "label": "What are you hoping to learn" + "label": "What are you hoping to learn?" }, { "fieldname": "user", "fieldtype": "Link", "label": "User", - "options": "User", - "read_only": 1 + "options": "User" }, { "fetch_from": "user.full_name", @@ -60,12 +41,20 @@ "default": "0", "fieldname": "is_paid", "fieldtype": "Check", - "label": "is_paid" + "label": "Is Paid" + }, + { + "fieldname": "column_break_3", + "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_6", + "fieldtype": "Section Break" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-20 13:40:25.690440", + "modified": "2021-08-20 17:03:09.741997", "modified_by": "Administrator", "module": "Event Management", "name": "Attendee", @@ -86,5 +75,6 @@ ], "sort_field": "modified", "sort_order": "DESC", + "title_field": "user", "track_changes": 1 } \ No newline at end of file diff --git a/community/event_management/doctype/exhibitor/exhibitor.json b/community/event_management/doctype/exhibitor/exhibitor.json index 23506d88..f5562c10 100644 --- a/community/event_management/doctype/exhibitor/exhibitor.json +++ b/community/event_management/doctype/exhibitor/exhibitor.json @@ -1,18 +1,18 @@ { "actions": [], - "autoname": "Exhibitor-Regis-.####.", "creation": "2021-08-16 16:26:46.189119", "doctype": "DocType", "editable_grid": 1, "engine": "InnoDB", "field_order": [ - "user", "event", + "is_paid", + "column_break_3", + "user", "full_name", "company", - "logo", - "description", - "is_paid" + "section_break_7", + "description" ], "fields": [ { @@ -27,11 +27,6 @@ "fieldtype": "Data", "label": "Company " }, - { - "fieldname": "logo", - "fieldtype": "Attach Image", - "label": "Logo" - }, { "fieldname": "description", "fieldtype": "Text Editor", @@ -41,26 +36,32 @@ "default": "0", "fieldname": "is_paid", "fieldtype": "Check", - "label": "is_paid" + "label": "Is Paid" }, { "fieldname": "user", "fieldtype": "Link", "label": "User", - "options": "User", - "read_only": 1 + "options": "User" }, { "fieldname": "event", "fieldtype": "Link", "label": "Event", - "options": "Event Details", - "read_only": 1 + "options": "Event Details" + }, + { + "fieldname": "column_break_3", + "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_7", + "fieldtype": "Section Break" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-20 15:22:38.616972", + "modified": "2021-08-20 16:32:58.031324", "modified_by": "Administrator", "module": "Event Management", "name": "Exhibitor", @@ -81,5 +82,6 @@ ], "sort_field": "modified", "sort_order": "DESC", + "title_field": "user", "track_changes": 1 } \ No newline at end of file diff --git a/community/event_management/doctype/host/host.json b/community/event_management/doctype/host/host.json index 7f019ac9..cbb96c7e 100644 --- a/community/event_management/doctype/host/host.json +++ b/community/event_management/doctype/host/host.json @@ -1,15 +1,13 @@ { "actions": [], - "autoname": "field:full_name", "creation": "2021-08-11 10:51:47.234690", "doctype": "DocType", "editable_grid": 1, "engine": "InnoDB", "field_order": [ "event", - "full_name", - "user_image", - "title" + "user", + "full_name" ], "fields": [ { @@ -18,29 +16,22 @@ "label": "Event", "options": "Event Details" }, - { - "fieldname": "title", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Title" - }, { "fieldname": "full_name", "fieldtype": "Data", "in_list_view": 1, "label": "Full Name", - "reqd": 1, "unique": 1 }, { - "fieldname": "user_image", - "fieldtype": "Attach Image", - "label": "Image" + "fieldname": "user", + "fieldtype": "Data", + "label": "User" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-11 23:54:17.790263", + "modified": "2021-08-20 17:03:26.733195", "modified_by": "Administrator", "module": "Event Management", "name": "Host", @@ -61,5 +52,6 @@ ], "sort_field": "modified", "sort_order": "DESC", + "title_field": "user", "track_changes": 1 } \ No newline at end of file diff --git a/community/event_management/doctype/schedule/__init__.py b/community/event_management/doctype/schedule/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/community/event_management/doctype/schedule/schedule.js b/community/event_management/doctype/schedule/schedule.js deleted file mode 100644 index 61c1528a..00000000 --- a/community/event_management/doctype/schedule/schedule.js +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) 2021, FOSS United and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Schedule', { - onload: function (frm) { - frm.set_query('talk', function (doc) { - return { - filters: { - "status": "Approved", - } - }; - }); - } -}); diff --git a/community/event_management/doctype/schedule/schedule.json b/community/event_management/doctype/schedule/schedule.json deleted file mode 100644 index 63516088..00000000 --- a/community/event_management/doctype/schedule/schedule.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "actions": [], - "autoname": "Schedule-.####", - "creation": "2021-08-11 10:50:23.522178", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "event", - "talk", - "slot" - ], - "fields": [ - { - "fieldname": "slot", - "fieldtype": "Link", - "in_list_view": 1, - "label": "Slot", - "options": "Slot", - "reqd": 1 - }, - { - "fieldname": "event", - "fieldtype": "Link", - "in_list_view": 1, - "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-19 15:23:18.137946", - "modified_by": "Administrator", - "module": "Event Management", - "name": "Schedule", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/community/event_management/doctype/schedule/schedule.py b/community/event_management/doctype/schedule/schedule.py deleted file mode 100644 index e14b9cd4..00000000 --- a/community/event_management/doctype/schedule/schedule.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2021, FOSS United and contributors -# For license information, please see license.txt - -import frappe -from frappe.model.document import Document - -class Schedule(Document): - def before_save(self): - exists = frappe.db.exists( - "Schedule", - { - "Event": self.event, - "slot": self.slot - }, - ) - - if exists: - frappe.throw("Slot already Assigned") diff --git a/community/event_management/doctype/schedule/test_schedule.py b/community/event_management/doctype/schedule/test_schedule.py deleted file mode 100644 index 47d86a7b..00000000 --- a/community/event_management/doctype/schedule/test_schedule.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2021, FOSS United and Contributors -# See license.txt - -# import frappe -import unittest - -class TestSchedule(unittest.TestCase): - pass diff --git a/community/event_management/doctype/slot/__init__.py b/community/event_management/doctype/slot/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/community/event_management/doctype/slot/slot.js b/community/event_management/doctype/slot/slot.js deleted file mode 100644 index dbdaa8ee..00000000 --- a/community/event_management/doctype/slot/slot.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2021, FOSS United and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Slot', { - // refresh: function(frm) { - - // } -}); diff --git a/community/event_management/doctype/slot/slot.json b/community/event_management/doctype/slot/slot.json deleted file mode 100644 index 60aa330a..00000000 --- a/community/event_management/doctype/slot/slot.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "actions": [], - "autoname": "format:SLOT-{date}-{start_time}", - "creation": "2021-08-11 11:19:50.276917", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "event", - "date", - "start_time", - "end_time" - ], - "fields": [ - { - "fieldname": "event", - "fieldtype": "Link", - "in_list_view": 1, - "label": "Event", - "options": "Event Details", - "reqd": 1 - }, - { - "fieldname": "date", - "fieldtype": "Date", - "in_list_view": 1, - "label": "Date", - "reqd": 1 - }, - { - "fieldname": "start_time", - "fieldtype": "Time", - "in_list_view": 1, - "label": "Start Time", - "reqd": 1 - }, - { - "fieldname": "end_time", - "fieldtype": "Time", - "in_list_view": 1, - "label": "End Time", - "reqd": 1 - } - ], - "index_web_pages_for_search": 1, - "links": [], - "modified": "2021-08-18 23:51:47.850435", - "modified_by": "Administrator", - "module": "Event Management", - "name": "Slot", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/community/event_management/doctype/slot/slot.py b/community/event_management/doctype/slot/slot.py deleted file mode 100644 index 159044aa..00000000 --- a/community/event_management/doctype/slot/slot.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2021, FOSS United and contributors -# For license information, please see license.txt - -import frappe -from frappe.model.document import Document -from frappe.utils import getdate - -class Slot(Document): - - def before_save(self): - event = frappe.get_doc("Event Details", self.event) - if getdate(self.date) < event.start_date or getdate(self.date) > event.end_date: - frappe.throw("Slot should be in Event's span") - diff --git a/community/event_management/doctype/slot/test_slot.py b/community/event_management/doctype/slot/test_slot.py deleted file mode 100644 index e04e6593..00000000 --- a/community/event_management/doctype/slot/test_slot.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2021, FOSS United and Contributors -# See license.txt - -# import frappe -import unittest - -class TestSlot(unittest.TestCase): - pass diff --git a/community/event_management/doctype/speaker/speaker.json b/community/event_management/doctype/speaker/speaker.json index f0aa389f..e000c4a3 100644 --- a/community/event_management/doctype/speaker/speaker.json +++ b/community/event_management/doctype/speaker/speaker.json @@ -1,35 +1,23 @@ { "actions": [], - "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", "event", - "user", - "full_name", - "phone_number", - "job_title", "company", "column_break_8", - "picture", - "bio" + "user", + "full_name" ], "fields": [ - { - "fieldname": "speaker_info_section", - "fieldtype": "Section Break", - "label": "Speaker Info" - }, { "fieldname": "user", "fieldtype": "Link", "in_list_view": 1, "label": "User", - "options": "User", - "read_only": 1 + "options": "User" }, { "fetch_from": "user.full_name", @@ -39,54 +27,26 @@ "label": "Full Name", "read_only": 1 }, - { - "fieldname": "phone_number", - "fieldtype": "Data", - "label": "Phone Number", - "reqd": 1, - "unique": 1 - }, - { - "fieldname": "job_title", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Job Title", - "reqd": 1 - }, { "fieldname": "company", "fieldtype": "Data", "in_list_view": 1, - "label": "Company", - "reqd": 1 + "label": "Company" }, { "fieldname": "column_break_8", "fieldtype": "Column Break" }, - { - "fetch_from": "user.banner_image", - "fieldname": "picture", - "fieldtype": "Attach Image", - "label": "Profile Image", - "reqd": 1 - }, - { - "fieldname": "bio", - "fieldtype": "Text", - "label": "Bio" - }, { "fieldname": "event", "fieldtype": "Link", "label": "Event", - "options": "Event Details", - "read_only": 1 + "options": "Event Details" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-20 12:06:54.852070", + "modified": "2021-08-20 16:53:43.968260", "modified_by": "Administrator", "module": "Event Management", "name": "Speaker", @@ -107,5 +67,6 @@ ], "sort_field": "modified", "sort_order": "DESC", + "title_field": "user", "track_changes": 1 } \ No newline at end of file diff --git a/community/event_management/doctype/talk/talk.json b/community/event_management/doctype/talk/talk.json index 05b21732..6966b079 100644 --- a/community/event_management/doctype/talk/talk.json +++ b/community/event_management/doctype/talk/talk.json @@ -1,22 +1,27 @@ { "actions": [], - "autoname": "format:TALK-BY-{speaker}-{####}", "creation": "2021-08-18 08:42:58.711932", "doctype": "DocType", "editable_grid": 1, "engine": "InnoDB", "field_order": [ "event", - "company", - "topic", "title", + "url", + "column_break_5", + "speaker", + "category", + "thumbnail", + "schedule_section", + "date", + "status", + "column_break_11", + "start_time", + "end_time", + "section_break_9", "about", "attachment", - "url", - "thumbnail", - "name_of_the_speaker", - "status", - "speaker" + "name_of_the_speaker" ], "fields": [ { @@ -45,11 +50,6 @@ "label": "Event", "options": "Event Details" }, - { - "fieldname": "topic", - "fieldtype": "Data", - "label": "Category" - }, { "fieldname": "about", "fieldtype": "Text", @@ -63,27 +63,57 @@ { "fieldname": "speaker", "fieldtype": "Link", - "hidden": 1, "label": "Speaker", "options": "Speaker" }, { - "default": "Applied", + "default": "Pending", "fieldname": "status", "fieldtype": "Select", "in_list_view": 1, "label": "Status", - "options": "Applied\nPending\nApproved\nRejected\nPrevious Talk" + "options": "Pending\nApproved\nRejected" }, { - "fieldname": "company", + "fieldname": "column_break_5", + "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_9", + "fieldtype": "Section Break" + }, + { + "fieldname": "category", "fieldtype": "Data", - "label": "Company" + "label": "Category" + }, + { + "fieldname": "schedule_section", + "fieldtype": "Section Break" + }, + { + "fieldname": "date", + "fieldtype": "Date", + "label": "Date" + }, + { + "fieldname": "column_break_11", + "fieldtype": "Column Break" + }, + { + "fieldname": "start_time", + "fieldtype": "Time", + "label": "Start Time" + }, + { + "fieldname": "end_time", + "fieldtype": "Time", + "label": "End Time" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-20 12:08:11.304322", + "modified": "2021-08-20 17:02:51.609288", "modified_by": "Administrator", "module": "Event Management", "name": "Talk", @@ -104,5 +134,6 @@ ], "sort_field": "modified", "sort_order": "DESC", + "title_field": "title", "track_changes": 1 } \ No newline at end of file diff --git a/community/event_management/doctype/talk/talk.py b/community/event_management/doctype/talk/talk.py index b877bc3a..b7356242 100644 --- a/community/event_management/doctype/talk/talk.py +++ b/community/event_management/doctype/talk/talk.py @@ -7,21 +7,23 @@ from frappe.model.document import Document class Talk(Document): def before_save(self): + if not self.speaker: + self.save_speaker() + + def save_speaker(self): exists = frappe.db.exists({ - 'doctype': 'Speaker', - 'user': frappe.session.user - }) - speaker = None + 'doctype': 'Speaker', + 'user': frappe.session.user + }) - if(exists): - speaker = frappe.db.get_value( - 'Speaker', {'user': frappe.session.user}) + if exists: + self.speaker = frappe.db.get_value( + 'Speaker', {'user': frappe.session.user}, ["name"]) - elif(not exists): - speaker = frappe.get_doc(dict( - event=self.event, - user=frappe.session.user, - company=self.company, - )).insert(ignore_permissions=True) - - self.speaker = speaker + else: + speaker = frappe.get_doc({ + "doctype": "Speaker", + "event": self.event, + "user": frappe.session.user + }).save(ignore_permissions=True) + self.speaker = speaker diff --git a/community/event_management/web_form/attendee_registration/attendee_registration.json b/community/event_management/web_form/attendee_registration/attendee_registration.json index 208d4150..d609f9f9 100644 --- a/community/event_management/web_form/attendee_registration/attendee_registration.json +++ b/community/event_management/web_form/attendee_registration/attendee_registration.json @@ -9,17 +9,17 @@ "amount": 0.0, "amount_based_on_field": 0, "apply_document_permissions": 0, - "button_label": "Get Ticket", + "button_label": "", "creation": "2021-08-19 15:26:56.594526", "custom_css": "[data-doctype=\"Web Form\"] {\n max-width: 720px;\n margin: 6rem auto;\n}", - "doc_type": "Attendee Registration", + "doc_type": "Attendee", "docstatus": 0, "doctype": "Web Form", "idx": 0, "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2021-08-19 22:03:24.454348", + "modified": "2021-08-20 16:16:12.986658", "modified_by": "Administrator", "module": "Event Management", "name": "attendee-registration", @@ -44,7 +44,7 @@ "max_length": 0, "max_value": 0, "options": "User", - "read_only": 0, + "read_only": 1, "reqd": 0, "show_in_filter": 0 }, @@ -60,42 +60,6 @@ "reqd": 0, "show_in_filter": 0 }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "email", - "fieldtype": "Data", - "hidden": 0, - "label": "Email", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 0, - "show_in_filter": 0 - }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "phone_number", - "fieldtype": "Data", - "hidden": 0, - "label": "Phone Number", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 0, - "show_in_filter": 0 - }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "occupation", - "fieldtype": "Data", - "hidden": 0, - "label": "Occupation", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 1, - "show_in_filter": 0 - }, { "allow_read_on_all_link_options": 0, "fieldname": "company", diff --git a/community/event_management/web_form/exhibitor_registration/exhibitor_registration.js b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.js index 52fc3614..64f7fd4b 100644 --- a/community/event_management/web_form/exhibitor_registration/exhibitor_registration.js +++ b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.js @@ -1,7 +1,7 @@ frappe.ready(function () { - frappe.web_form.after_save = () => { - setTimeout(function () { - window.location.href = '/event/conference2021/about'; - }, 2000); - } -}) \ No newline at end of file + frappe.web_form.after_save = () => { + setTimeout(function () { + window.location.href = '/event/conference2021/about'; + }, 2000); + } +}) diff --git a/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json index 4fb1ba84..a3dd6ec1 100644 --- a/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json +++ b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json @@ -19,7 +19,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2021-08-20 15:25:57.712882", + "modified": "2021-08-20 17:01:45.096818", "modified_by": "Administrator", "module": "Event Management", "name": "exhibitor-registration", @@ -32,7 +32,7 @@ "show_in_grid": 0, "show_sidebar": 0, "sidebar_items": [], - "success_url": "/exhibitor-registration", + "success_url": "", "title": "Exhibitor Registration", "web_form_fields": [ { @@ -44,7 +44,7 @@ "max_length": 0, "max_value": 0, "options": "User", - "read_only": 0, + "read_only": 1, "reqd": 0, "show_in_filter": 0 }, @@ -56,7 +56,7 @@ "label": "Full Name", "max_length": 0, "max_value": 0, - "read_only": 0, + "read_only": 1, "reqd": 0, "show_in_filter": 0 }, @@ -72,18 +72,6 @@ "reqd": 0, "show_in_filter": 0 }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "logo", - "fieldtype": "Attach Image", - "hidden": 0, - "label": "Logo", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 0, - "show_in_filter": 0 - }, { "allow_read_on_all_link_options": 0, "fieldname": "description", diff --git a/community/event_management/web_form/purpose_a_talk/purpose_a_talk.json b/community/event_management/web_form/purpose_a_talk/purpose_a_talk.json index 4972e2c3..15fe0420 100644 --- a/community/event_management/web_form/purpose_a_talk/purpose_a_talk.json +++ b/community/event_management/web_form/purpose_a_talk/purpose_a_talk.json @@ -20,7 +20,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2021-08-20 13:33:49.508780", + "modified": "2021-08-20 17:19:04.894724", "modified_by": "Administrator", "module": "Event Management", "name": "purpose-a-talk", @@ -35,8 +35,32 @@ "sidebar_items": [], "success_message": "Talk Submitted!", "success_url": "/purpose-a-talk", - "title": "Purpose a Talk", + "title": "Propose a Talk", "web_form_fields": [ + { + "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": "category", + "fieldtype": "Data", + "hidden": 0, + "label": "Category", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, { "allow_read_on_all_link_options": 0, "fieldname": "event", @@ -50,46 +74,10 @@ "reqd": 0, "show_in_filter": 0 }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "company", - "fieldtype": "Data", - "hidden": 0, - "label": "Company", - "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": "Data", - "hidden": 0, - "label": "Category", - "max_length": 0, - "max_value": 0, - "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": "about", - "fieldtype": "Data", + "fieldtype": "Text Editor", "hidden": 0, "label": "About", "max_length": 0, diff --git a/community/event_management/web_form/speaker_registration/speaker_registration.json b/community/event_management/web_form/speaker_registration/speaker_registration.json index e70e0a04..d2e0ccfa 100644 --- a/community/event_management/web_form/speaker_registration/speaker_registration.json +++ b/community/event_management/web_form/speaker_registration/speaker_registration.json @@ -19,7 +19,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2021-08-20 11:24:52.350955", + "modified": "2021-08-20 16:16:51.107177", "modified_by": "Administrator", "module": "Event Management", "name": "speaker-registration", @@ -49,7 +49,7 @@ "show_in_filter": 0 }, { - "allow_read_on_all_link_options": 1, + "allow_read_on_all_link_options": 0, "fieldname": "user", "fieldtype": "Link", "hidden": 0, @@ -57,7 +57,7 @@ "max_length": 0, "max_value": 0, "options": "User", - "read_only": 0, + "read_only": 1, "reqd": 0, "show_in_filter": 0 }, @@ -73,30 +73,6 @@ "reqd": 0, "show_in_filter": 0 }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "phone_number", - "fieldtype": "Data", - "hidden": 0, - "label": "Phone Number", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 1, - "show_in_filter": 0 - }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "job_title", - "fieldtype": "Data", - "hidden": 0, - "label": "Job Title", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 1, - "show_in_filter": 0 - }, { "allow_read_on_all_link_options": 0, "fieldname": "company", @@ -108,30 +84,6 @@ "read_only": 0, "reqd": 1, "show_in_filter": 0 - }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "picture", - "fieldtype": "Attach Image", - "hidden": 0, - "label": "Profile Image", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 1, - "show_in_filter": 0 - }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "bio", - "fieldtype": "Text", - "hidden": 0, - "label": "Bio", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 0, - "show_in_filter": 0 } ] } \ No newline at end of file diff --git a/community/event_management/web_template/exhibitor_section/exhibitor_section.html b/community/event_management/web_template/exhibitor_section/exhibitor_section.html index 821a5913..8aa45659 100644 --- a/community/event_management/web_template/exhibitor_section/exhibitor_section.html +++ b/community/event_management/web_template/exhibitor_section/exhibitor_section.html @@ -1,24 +1,43 @@
-

{{title}}

- {%- if subtitle -%} -

{{ subtitle }}

- {%- endif -%} -
-
- {% for exhibitor in exhibitor_details %} - {% set exhibitor_doc = frappe.get_doc("Exhibitor", exhibitor.exhibitor) %} - -
- - - -
{{exhibitor_doc.company}}
-
- - {% endfor %} -
-
Become an Exhibitor
+

{{title}}

+ {%- if subtitle -%} +

{{ subtitle }}

+ {%- endif -%} +
+
+ {% for exhibitor in exhibitor_details %} + {% set exhibitor_doc = frappe.db.get_value("Exhibitor", exhibitor.exhibitor, ["user", "company"], as_dict= True) + %} + {% set member = frappe.get_doc("User", exhibitor_doc.user) %} +
+ {% set color = member.get_palette() %} + + + {% if member.user_image %} + + + {% else %} + + {{ frappe.utils.get_abbr(member.full_name) }} + + {% endif %} + + + +
+ {{ member.full_name }} +
+
+ {{exhibitor_doc.company}} +
+ +
+ {% endfor %} +
+
Become an Exhibitor
+
- -
\ No newline at end of file diff --git a/community/event_management/web_template/exhibitor_section/exhibitor_section.json b/community/event_management/web_template/exhibitor_section/exhibitor_section.json index 961ddabe..a0a87fa8 100644 --- a/community/event_management/web_template/exhibitor_section/exhibitor_section.json +++ b/community/event_management/web_template/exhibitor_section/exhibitor_section.json @@ -33,12 +33,12 @@ "fieldname": "exhibitor", "fieldtype": "Link", "label": "Exhibitor", - "options": "Exhibitor Registration", + "options": "Exhibitor", "reqd": 0 } ], "idx": 1, - "modified": "2021-08-20 15:23:13.419285", + "modified": "2021-08-20 16:28:22.779057", "modified_by": "Administrator", "module": "Event Management", "name": "Exhibitor Section", diff --git a/community/event_management/web_template/schedule_section/__init__.py b/community/event_management/web_template/schedule_section/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/community/event_management/web_template/schedule_section/schedule_section.html b/community/event_management/web_template/schedule_section/schedule_section.html deleted file mode 100644 index ea8b9405..00000000 --- a/community/event_management/web_template/schedule_section/schedule_section.html +++ /dev/null @@ -1,82 +0,0 @@ -{% set schedule_docs = frappe.get_all("Schedule", fields =["talk", "slot"], filters={ -'event': event -},) %} -{% set slot_data = {} %} - -{% for schedule in schedule_docs %} -{% set talk = frappe.get_doc("Talk", schedule.talk) %} -{% set speaker = frappe.get_doc("Speaker", talk.speaker) %} -{% set slot = frappe.get_doc("Slot", schedule.slot) %} -{% set slot_data = slot_data.setdefault(slot.date, []).append({ -"slot": slot.name|string, -"start_time": slot.start_time, -"end_time": slot.end_time, -"picture": speaker.picture, -"about": talk.about, -"title": talk.title, -"full_name": speaker.full_name, -}) %} -{% endfor %} - -
{{title}}
-{%- if subtitle -%} -

{{ subtitle }}

-{%- endif -%} -
-
-
-
-
-
-
- {% for day in slot_data %} - -
-
- {% endfor %} -
-
-
- {% for day in slot_data %} - {% set outer_loop = loop %} -
-
-
{{frappe.utils.format_date(day, "dd MMMM, YYYY")}}
- {% for slot in slot_data[day] %} -
-
- - - - -
{{slot.full_name}}
- -
{{slot.title}}
-
- {{ frappe.format(slot.start_time, {'fieldtype': 'Time'})}} - {{ - frappe.format(slot.end_time, {'fieldtype': 'Time'}) }} -
- -
-
-

{{slot.about}}

-
-
- {% endfor %} -
-
- {% endfor %} -
-
-
-
-
-
\ No newline at end of file diff --git a/community/event_management/web_template/schedule_section/schedule_section.json b/community/event_management/web_template/schedule_section/schedule_section.json deleted file mode 100644 index c990266a..00000000 --- a/community/event_management/web_template/schedule_section/schedule_section.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "__unsaved": 1, - "creation": "2021-08-17 16:43:49.506200", - "docstatus": 0, - "doctype": "Web Template", - "fields": [ - { - "fieldname": "title", - "fieldtype": "Data", - "label": "Title", - "reqd": 1 - }, - { - "fieldname": "subtitle", - "fieldtype": "Data", - "label": "Subtitle", - "reqd": 0 - }, - { - "__unsaved": 1, - "fieldname": "event", - "fieldtype": "Link", - "label": "Event", - "options": "Event Details", - "reqd": 1 - } - ], - "idx": 0, - "modified": "2021-08-18 10:13:49.300196", - "modified_by": "Administrator", - "module": "Event Management", - "name": "Schedule Section", - "owner": "Administrator", - "standard": 1, - "template": "", - "type": "Section" -} \ No newline at end of file diff --git a/community/event_management/web_template/speaker_section/speaker_section.html b/community/event_management/web_template/speaker_section/speaker_section.html index b3905711..3ccf64fb 100644 --- a/community/event_management/web_template/speaker_section/speaker_section.html +++ b/community/event_management/web_template/speaker_section/speaker_section.html @@ -1,25 +1,44 @@
-

{{section_title}}

- {%- if subtitle -%} -

{{ subtitle }}

- {%- endif -%} -
- {% for speaker in speaker_details %} - {% set speaker_doc = frappe.get_doc("Speaker", speaker.speaker) %} -
- - - -
- {{ speaker_doc.full_name }} -
-
{{speaker_doc.job_title}}
-
{{speaker_doc.company}}
-
- {% endfor %} - -
- {%- if cta_link -%} -
Propose a Talk
- {%- endif -%} -
\ No newline at end of file +

{{section_title}}

+ {%- if subtitle -%} +

{{ subtitle }}

+ {%- endif -%} +
+ {% for speaker in speaker_details %} + {% set speaker_doc = frappe.db.get_value("Speaker", speaker.speaker, ["user", "company"], as_dict= True) + %} + {% set member = frappe.get_doc("User", speaker_doc.user) %} + +
+ {% set color = member.get_palette() %} + + + {% if member.user_image %} + + + {% else %} + + {{ frappe.utils.get_abbr(member.full_name) }} + + {% endif %} + + + +
+ {{ member.full_name }} +
+
+ {{speaker_doc.company}} +
+ +
+ {% endfor %} +
+ +
+ Propose a Talk +
+ + diff --git a/community/event_management/web_template/talk_section/talk_section.html b/community/event_management/web_template/talk_section/talk_section.html index 1a817c2a..5a98159b 100644 --- a/community/event_management/web_template/talk_section/talk_section.html +++ b/community/event_management/web_template/talk_section/talk_section.html @@ -1,40 +1,53 @@
-
{{title}}
- {%- if subtitle -%} -

{{ subtitle }}

+
{{title}}
+ {%- if subtitle -%} +

{{ subtitle }}

{%- endif -%} -
- {% for talk in talk_details %} - {% set talk_doc = frappe.get_doc('Talk', talk.talk, filters={ - 'event': event - }) %} -
-
-
-
-
-
- {{talk_doc.topic}} -
-
{{talk_doc.title}}
-
-
- - - - - - {{talk_doc.name_of_the_speaker}} - -
-
- Vew Talk - -
- -
-
- {% endfor %} -
-
\ No newline at end of file +
+ {% for talk in talk_details %} + {% set talk_doc = frappe.db.get_value('Talk', talk.talk, ["title", "category", "speaker", "url", "thumbnail"], as_dict=True) %} + {% set speaker_info = frappe.db.get_value("Speaker", talk_doc.speaker, ["user"], as_dict=True) %} + + {% set member = frappe.get_doc("User", speaker_info.user) %} +
+
+
+
+
+
+ {{talk_doc.category}} +
+
{{talk_doc.title}}
+
+
+ + {% set color = member.get_palette() %} + + + {% if member.user_image %} + + + {% else %} + + {{ frappe.utils.get_abbr(member.full_name) }} + + {% endif %} + + + + + {{ member.full_name }} + +
+
+ Vew Talk + +
+ +
+
+ {% endfor %} +
+ diff --git a/community/public/css/style.css b/community/public/css/style.css index 5260a838..63bce99e 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -1283,10 +1283,6 @@ pre { font-size: 1rem; } -.talk-card { - width: 16rem; -} - .talk-title { border-bottom: 1px solid #cecdcd; } @@ -1303,10 +1299,6 @@ a.talk-link { text-decoration: none; } -.talk-card { - flex-direction: column; -} - .speaker-cards-parent { display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));