diff --git a/community/event_management/doctype/event_details/event_details.json b/community/event_management/doctype/event_details/event_details.json index 2c0cf532..c7719ecd 100644 --- a/community/event_management/doctype/event_details/event_details.json +++ b/community/event_management/doctype/event_details/event_details.json @@ -9,64 +9,41 @@ "event_name", "start_date", "end_date", - "event_details", - "hero_section", - "title", - "description", - "illustration", - "cta" + "event_details" ], "fields": [ { "fieldname": "event_name", "fieldtype": "Data", + "in_list_view": 1, "label": "Event Name", + "reqd": 1, "unique": 1 }, { "fieldname": "start_date", "fieldtype": "Date", - "label": "Start Date" + "in_list_view": 1, + "label": "Start Date", + "reqd": 1 }, { "fieldname": "end_date", "fieldtype": "Date", - "label": "End Date" + "in_list_view": 1, + "label": "End Date", + "reqd": 1 }, { "fieldname": "event_details", "fieldtype": "Markdown Editor", + "in_list_view": 1, "label": "Event Details" - }, - { - "fieldname": "hero_section", - "fieldtype": "Section Break", - "label": "Hero " - }, - { - "fieldname": "description", - "fieldtype": "Data", - "label": "Description" - }, - { - "fieldname": "illustration", - "fieldtype": "Attach Image", - "label": "Illustration" - }, - { - "fieldname": "cta", - "fieldtype": "Data", - "label": "CTA" - }, - { - "fieldname": "title", - "fieldtype": "Data", - "label": "Title" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-12 12:06:51.911680", + "modified": "2021-08-18 09:46:06.455633", "modified_by": "Administrator", "module": "Event Management", "name": "Event Details", diff --git a/community/event_management/doctype/event_ticket/event_ticket.json b/community/event_management/doctype/event_ticket/event_ticket.json index d0f94b66..ae5d99a3 100644 --- a/community/event_management/doctype/event_ticket/event_ticket.json +++ b/community/event_management/doctype/event_ticket/event_ticket.json @@ -5,6 +5,7 @@ "editable_grid": 1, "engine": "InnoDB", "field_order": [ + "event", "ticket", "attendee" ], @@ -19,11 +20,17 @@ "fieldtype": "Link", "label": "attendee", "options": "Attendee Registration" + }, + { + "fieldname": "event", + "fieldtype": "Link", + "label": "Event", + "options": "Event Details" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-11 11:17:28.452289", + "modified": "2021-08-18 09:51:14.654098", "modified_by": "Administrator", "module": "Event Management", "name": "Event Ticket", diff --git a/community/event_management/doctype/previous_content/__init__.py b/community/event_management/doctype/previous_content/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/doctype/previous_content/previous_content.js b/community/event_management/doctype/previous_content/previous_content.js new file mode 100644 index 00000000..f1eba0ac --- /dev/null +++ b/community/event_management/doctype/previous_content/previous_content.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Previous Content', { + // refresh: function(frm) { + + // } +}); diff --git a/community/event_management/doctype/previous_content/previous_content.json b/community/event_management/doctype/previous_content/previous_content.json new file mode 100644 index 00000000..7a948a33 --- /dev/null +++ b/community/event_management/doctype/previous_content/previous_content.json @@ -0,0 +1,67 @@ +{ + "actions": [], + "autoname": "format:PRE-VID-BY-{name_of_the_speaker}-{####}", + "creation": "2021-08-18 08:42:58.711932", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "event", + "title", + "name_of_the_speaker", + "url", + "thumbnail" + ], + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "name_of_the_speaker", + "fieldtype": "Data", + "label": "Name of the Speaker" + }, + { + "fieldname": "url", + "fieldtype": "Data", + "label": "Video Embed Link" + }, + { + "fieldname": "thumbnail", + "fieldtype": "Data", + "label": "Preview Image (Link)" + }, + { + "fieldname": "event", + "fieldtype": "Link", + "label": "Event", + "options": "Event Details" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2021-08-18 09:37:03.278439", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Previous Content", + "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/previous_content/previous_content.py b/community/event_management/doctype/previous_content/previous_content.py new file mode 100644 index 00000000..999968fb --- /dev/null +++ b/community/event_management/doctype/previous_content/previous_content.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class PreviousContent(Document): + pass diff --git a/community/event_management/doctype/previous_content/test_previous_content.py b/community/event_management/doctype/previous_content/test_previous_content.py new file mode 100644 index 00000000..9ae2d19c --- /dev/null +++ b/community/event_management/doctype/previous_content/test_previous_content.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and Contributors +# See license.txt + +# import frappe +import unittest + +class TestPreviousContent(unittest.TestCase): + pass diff --git a/community/event_management/doctype/schedule/schedule.json b/community/event_management/doctype/schedule/schedule.json index 0536c291..6ca96fb0 100644 --- a/community/event_management/doctype/schedule/schedule.json +++ b/community/event_management/doctype/schedule/schedule.json @@ -6,6 +6,7 @@ "editable_grid": 1, "engine": "InnoDB", "field_order": [ + "event", "speaker", "slot" ], @@ -13,19 +14,31 @@ { "fieldname": "speaker", "fieldtype": "Link", + "in_list_view": 1, "label": "Speaker", - "options": "Speaker Registration" + "options": "Speaker Registration", + "reqd": 1 }, { "fieldname": "slot", "fieldtype": "Link", + "in_list_view": 1, "label": "Slot", - "options": "Slot" + "options": "Slot", + "reqd": 1 + }, + { + "fieldname": "event", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Event", + "options": "Event Details", + "reqd": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-16 18:45:44.945527", + "modified": "2021-08-18 09:46:18.694910", "modified_by": "Administrator", "module": "Event Management", "name": "Schedule", diff --git a/community/event_management/doctype/speaker_registration/speaker_registration.json b/community/event_management/doctype/speaker_registration/speaker_registration.json index 58e064c2..f3021129 100644 --- a/community/event_management/doctype/speaker_registration/speaker_registration.json +++ b/community/event_management/doctype/speaker_registration/speaker_registration.json @@ -46,18 +46,21 @@ "fieldname": "job_title", "fieldtype": "Data", "in_list_view": 1, - "label": "Job Title" + "label": "Job Title", + "reqd": 1 }, { "fieldname": "company", "fieldtype": "Data", "in_list_view": 1, - "label": "Company" + "label": "Company", + "reqd": 1 }, { "fieldname": "picture", "fieldtype": "Attach Image", - "label": "Picture" + "label": "Profile Image", + "reqd": 1 }, { "fieldname": "bio", @@ -121,7 +124,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-17 00:31:28.656127", + "modified": "2021-08-18 09:48:19.602309", "modified_by": "Administrator", "module": "Event Management", "name": "Speaker Registration", 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 b7a9e934..025c0b0d 100644 --- a/community/event_management/web_form/attendee_registration/attendee_registration.json +++ b/community/event_management/web_form/attendee_registration/attendee_registration.json @@ -18,7 +18,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2021-08-17 11:51:17.008322", + "modified": "2021-08-18 11:35:06.067390", "modified_by": "Administrator", "module": "Event Management", "name": "attendee-registration", @@ -31,7 +31,7 @@ "show_in_grid": 0, "show_sidebar": 0, "sidebar_items": [], - "success_url": "/attendee-registration", + "success_url": "/event/conference20221", "title": "Attendee Registration", "web_form_fields": [ { 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 a8d0998d..c0fc31f6 100644 --- a/community/event_management/web_template/exhibitor_section/exhibitor_section.html +++ b/community/event_management/web_template/exhibitor_section/exhibitor_section.html @@ -11,7 +11,9 @@ {% endfor %} + {%- if cta_link -%}
Become an Exhibitor
+ {%- endif -%} \ 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 59788e97..0b8c5629 100644 --- a/community/event_management/web_template/exhibitor_section/exhibitor_section.json +++ b/community/event_management/web_template/exhibitor_section/exhibitor_section.json @@ -17,8 +17,14 @@ "reqd": 0 }, { - "__islocal": 1, "__unsaved": 1, + "fieldname": "event", + "fieldtype": "Link", + "label": "Event", + "options": "Event Details", + "reqd": 0 + }, + { "fieldname": "cta_link", "fieldtype": "Data", "label": "CTA Link", @@ -38,8 +44,8 @@ "reqd": 0 } ], - "idx": 0, - "modified": "2021-08-17 11:44:49.998871", + "idx": 1, + "modified": "2021-08-18 10:05:11.753576", "modified_by": "Administrator", "module": "Event Management", "name": "Exhibitor Section", diff --git a/community/event_management/web_template/previous_talk/previous_talk.html b/community/event_management/web_template/previous_talk/previous_talk.html index e940721f..d49195df 100644 --- a/community/event_management/web_template/previous_talk/previous_talk.html +++ b/community/event_management/web_template/previous_talk/previous_talk.html @@ -1,46 +1,38 @@ -{% set thumbnail_url = 'https://img.youtube.com/vi/JmOJtYW-0GI/maxresdefault.jpg' %} - - -
{{title}}
-
-
-
-
+
+
{{title}}
+
+ {% for video in talk_details %} + {% set video_details = frappe.get_doc('Previous Content', video.previous_content, filters={ + 'event': event + }) %} +
+
+
+
+
+
+ ERPNext
-
-
- {{topic}} -
-
{{topic_title}}
-
-
- - - - - - {{name}} - {{ - -
- -
- Vew Talk - -
- +
{{video_details.title}}
+
+
+ + + + + + {{video_details.name_of_the_speaker}} +
+
+ Vew Talk + +
+
- + {% endfor %} +
+
\ No newline at end of file diff --git a/community/event_management/web_template/previous_talk/previous_talk.json b/community/event_management/web_template/previous_talk/previous_talk.json index 936f24f0..f819f8d1 100644 --- a/community/event_management/web_template/previous_talk/previous_talk.json +++ b/community/event_management/web_template/previous_talk/previous_talk.json @@ -8,7 +8,7 @@ "fieldname": "title", "fieldtype": "Data", "label": "Title", - "reqd": 0 + "reqd": 1 }, { "fieldname": "subtitle", @@ -16,6 +16,14 @@ "label": "Subtitle", "reqd": 0 }, + { + "__unsaved": 1, + "fieldname": "event", + "fieldtype": "Link", + "label": "Event", + "options": "Event Details", + "reqd": 1 + }, { "fieldname": "talk_details", "fieldtype": "Table Break", @@ -23,62 +31,17 @@ "reqd": 0 }, { - "fieldname": "thumbnail", - "fieldtype": "Attach Image", - "label": "Thumbnail", - "reqd": 0 - }, - { - "fieldname": "thumbnail_url", - "fieldtype": "Data", - "label": "Thumbnail URL", - "reqd": 0 - }, - { - "fieldname": "topic", - "fieldtype": "Data", - "label": "Topic", - "reqd": 0 - }, - { - "fieldname": "topic_title", - "fieldtype": "Data", - "label": "Title", - "reqd": 0 - }, - { - "fieldname": "talk_url", - "fieldtype": "Data", - "label": "Talk URL", - "reqd": 0 - }, - { - "fieldname": "speaker_details", - "fieldtype": "Section Break", - "label": "Speaker Details", - "reqd": 0 - }, - { - "fieldname": "name", - "fieldtype": "Data", - "label": "Name", - "reqd": 0 - }, - { - "fieldname": "image", - "fieldtype": "Attach Image", - "label": "Image", - "reqd": 0 - }, - { - "fieldname": "cta_label", - "fieldtype": "Data", - "label": "CTA Label", + "__islocal": 1, + "__unsaved": 1, + "fieldname": "previous_content", + "fieldtype": "Link", + "label": "Previous Content", + "options": "Previous Content", "reqd": 0 } ], - "idx": 0, - "modified": "2021-08-13 23:02:42.424577", + "idx": 1, + "modified": "2021-08-18 10:03:50.193908", "modified_by": "Administrator", "module": "Event Management", "name": "Previous Talk", diff --git a/community/event_management/web_template/schedule_section/schedule_section.html b/community/event_management/web_template/schedule_section/schedule_section.html index af3780bb..f341d2f0 100644 --- a/community/event_management/web_template/schedule_section/schedule_section.html +++ b/community/event_management/web_template/schedule_section/schedule_section.html @@ -1,28 +1,27 @@ -{% set schedule_docs = frappe.get_all("Schedule", fields =["speaker", "slot"]) %} +{% set schedule_docs = frappe.get_all("Schedule", fields =["speaker", "slot"], filters={ +'event': event +},) %} {% set slot_data = {} %} {% for schedule in schedule_docs %} - {% set speaker = frappe.get_doc("Speaker Registration", schedule.speaker) %} - {% set slot = frappe.get_doc("Slot", schedule.slot) %} -
{{ slot_data.setdefault(slot.date, []).append({ - "slot": slot.name, - "start_time": slot.start_time, - "end_time": slot.end_time, - "speaker": speaker.name, - "picture": speaker.picture, - "about": speaker.about, - "title": speaker.title, - "full_name": speaker.full_name - }) }}
- {% endfor %} +{% set speaker = frappe.get_doc("Speaker Registration", schedule.speaker) %} +{% set slot = frappe.get_doc("Slot", schedule.slot) %} +
{{ slot_data.setdefault(slot.date, []).append({ + "slot": slot.name, + "start_time": slot.start_time, + "end_time": slot.end_time, + "speaker": speaker.name, + "picture": speaker.picture, + "about": speaker.about, + "title": speaker.title, + "full_name": speaker.full_name + }) }}
+{% endfor %} +
{{title}}
- -
- {{title}} -
{% for day in slot_data %} @@ -44,27 +43,26 @@ {% for slot in slot_data[day] %}
-
- {{ frappe.format(slot.start_time, {'fieldtype': 'Time'})}} - {{ - frappe.format(slot.end_time, {'fieldtype': 'Time'}) }} +
+ {{ frappe.format(slot.start_time, {'fieldtype': 'Time'})}} - {{ + frappe.format(slot.end_time, {'fieldtype': 'Time'}) }} +
+
{{slot.title}}
+ +
-
{{slot.title}}
- - -
-
-

{{slot.about}}

- +
+

{{slot.about}}

+
{{slot.full_name}}
 -
+
{% endfor %} -
{% endfor %} @@ -73,4 +71,4 @@
-
+
\ 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 index 5a24c3dd..c990266a 100644 --- a/community/event_management/web_template/schedule_section/schedule_section.json +++ b/community/event_management/web_template/schedule_section/schedule_section.json @@ -8,7 +8,7 @@ "fieldname": "title", "fieldtype": "Data", "label": "Title", - "reqd": 0 + "reqd": 1 }, { "fieldname": "subtitle", @@ -17,21 +17,16 @@ "reqd": 0 }, { - "fieldname": "schedule_details", - "fieldtype": "Table Break", - "label": "schedule_details", - "reqd": 0 - }, - { - "fieldname": "schedule", + "__unsaved": 1, + "fieldname": "event", "fieldtype": "Link", - "label": "Schedule", - "options": "Schedule", - "reqd": 0 + "label": "Event", + "options": "Event Details", + "reqd": 1 } ], "idx": 0, - "modified": "2021-08-17 16:47:40.356368", + "modified": "2021-08-18 10:13:49.300196", "modified_by": "Administrator", "module": "Event Management", "name": "Schedule Section", 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 9e3e498a..b46cea7b 100644 --- a/community/event_management/web_template/speaker_section/speaker_section.html +++ b/community/event_management/web_template/speaker_section/speaker_section.html @@ -15,7 +15,9 @@
{{speaker_doc.company}}
{% endfor %} - +
+ {%- if cta_link -%}
Become a Speaker
+ {%- endif -%}
\ No newline at end of file diff --git a/community/event_management/web_template/speaker_section/speaker_section.json b/community/event_management/web_template/speaker_section/speaker_section.json index 6125a38e..6b3f2d0e 100644 --- a/community/event_management/web_template/speaker_section/speaker_section.json +++ b/community/event_management/web_template/speaker_section/speaker_section.json @@ -18,6 +18,13 @@ }, { "__unsaved": 1, + "fieldname": "event_", + "fieldtype": "Link", + "label": "Event ", + "options": "Event Details", + "reqd": 0 + }, + { "fieldname": "cta_link", "fieldtype": "Data", "label": "CTA Link", @@ -37,8 +44,8 @@ "reqd": 0 } ], - "idx": 0, - "modified": "2021-08-17 11:13:58.991190", + "idx": 1, + "modified": "2021-08-18 10:06:03.032441", "modified_by": "Administrator", "module": "Event Management", "name": "Speaker Section",