diff --git a/community/community/widgets/Avatar.html b/community/community/widgets/Avatar.html index 862419a4..59f59a91 100644 --- a/community/community/widgets/Avatar.html +++ b/community/community/widgets/Avatar.html @@ -1,5 +1,5 @@ {% set color = member.get_palette() %} - + {% if member.user_image %} diff --git a/community/event_management/__init__.py b/community/event_management/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/doctype/__init__.py b/community/event_management/doctype/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/doctype/attendee/__init__.py b/community/event_management/doctype/attendee/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/doctype/attendee/attendee.js b/community/event_management/doctype/attendee/attendee.js new file mode 100644 index 00000000..ffd0ce8e --- /dev/null +++ b/community/event_management/doctype/attendee/attendee.js @@ -0,0 +1,14 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Attendee', { + onload: function (frm) { + frm.set_query('user', function (doc) { + return { + filters: { + "ignore_user_type": 1, + } + }; + }); + } +}); diff --git a/community/event_management/doctype/attendee/attendee.json b/community/event_management/doctype/attendee/attendee.json new file mode 100644 index 00000000..5152edaa --- /dev/null +++ b/community/event_management/doctype/attendee/attendee.json @@ -0,0 +1,80 @@ +{ + "actions": [], + "creation": "2021-08-11 10:07:53.262504", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "user", + "full_name", + "column_break_3", + "company", + "is_paid", + "section_break_6", + "what_are_you_hoping_to_learn" + ], + "fields": [ + { + "fieldname": "company", + "fieldtype": "Data", + "label": "Company" + }, + { + "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 + }, + { + "default": "0", + "fieldname": "is_paid", + "fieldtype": "Check", + "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 17:03:09.741997", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Attendee", + "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", + "title_field": "user", + "track_changes": 1 +} \ No newline at end of file diff --git a/community/event_management/doctype/attendee/attendee.py b/community/event_management/doctype/attendee/attendee.py new file mode 100644 index 00000000..e883ee2a --- /dev/null +++ b/community/event_management/doctype/attendee/attendee.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 Attendee(Document): + pass diff --git a/community/event_management/doctype/attendee/test_attendee.py b/community/event_management/doctype/attendee/test_attendee.py new file mode 100644 index 00000000..92678d90 --- /dev/null +++ b/community/event_management/doctype/attendee/test_attendee.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and Contributors +# See license.txt + +# import frappe +import unittest + +class TestAttendee(unittest.TestCase): + pass diff --git a/community/event_management/doctype/event_details/__init__.py b/community/event_management/doctype/event_details/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/doctype/event_details/event_details.js b/community/event_management/doctype/event_details/event_details.js new file mode 100644 index 00000000..1d2a2098 --- /dev/null +++ b/community/event_management/doctype/event_details/event_details.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Event Details', { + // refresh: function(frm) { + + // } +}); diff --git a/community/event_management/doctype/event_details/event_details.json b/community/event_management/doctype/event_details/event_details.json new file mode 100644 index 00000000..d9566509 --- /dev/null +++ b/community/event_management/doctype/event_details/event_details.json @@ -0,0 +1,68 @@ +{ + "actions": [], + "autoname": "field:event_name", + "creation": "2021-08-11 10:05:41.072432", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "event_name", + "start_date", + "end_date", + "event_description" + ], + "fields": [ + { + "fieldname": "event_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Event Name", + "reqd": 1, + "unique": 1 + }, + { + "fieldname": "start_date", + "fieldtype": "Date", + "in_list_view": 1, + "label": "Start Date", + "reqd": 1 + }, + { + "fieldname": "end_date", + "fieldtype": "Date", + "in_list_view": 1, + "label": "End Date", + "reqd": 1 + }, + { + "fieldname": "event_description", + "fieldtype": "Markdown Editor", + "in_list_view": 1, + "label": "Event Description" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2021-08-18 23:51:30.432691", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Event Details", + "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/event_details/event_details.py b/community/event_management/doctype/event_details/event_details.py new file mode 100644 index 00000000..7e2f9c9b --- /dev/null +++ b/community/event_management/doctype/event_details/event_details.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 EventDetails(Document): + pass diff --git a/community/event_management/doctype/event_details/test_event_details.py b/community/event_management/doctype/event_details/test_event_details.py new file mode 100644 index 00000000..00aa9a67 --- /dev/null +++ b/community/event_management/doctype/event_details/test_event_details.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and Contributors +# See license.txt + +# import frappe +import unittest + +class TestEventDetails(unittest.TestCase): + pass diff --git a/community/event_management/doctype/event_ticket/__init__.py b/community/event_management/doctype/event_ticket/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/doctype/event_ticket/event_ticket.js b/community/event_management/doctype/event_ticket/event_ticket.js new file mode 100644 index 00000000..48656188 --- /dev/null +++ b/community/event_management/doctype/event_ticket/event_ticket.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Event Ticket', { + // refresh: function(frm) { + + // } +}); diff --git a/community/event_management/doctype/event_ticket/event_ticket.json b/community/event_management/doctype/event_ticket/event_ticket.json new file mode 100644 index 00000000..5709601c --- /dev/null +++ b/community/event_management/doctype/event_ticket/event_ticket.json @@ -0,0 +1,55 @@ +{ + "actions": [], + "creation": "2021-08-11 11:17:28.452289", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "event", + "ticket", + "attendee" + ], + "fields": [ + { + "fieldname": "ticket", + "fieldtype": "Data", + "label": "Ticket" + }, + { + "fieldname": "attendee", + "fieldtype": "Link", + "label": "attendee", + "options": "Attendee" + }, + { + "fieldname": "event", + "fieldtype": "Link", + "label": "Event", + "options": "Event Details" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2021-08-20 13:38:28.688115", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Event Ticket", + "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/event_ticket/event_ticket.py b/community/event_management/doctype/event_ticket/event_ticket.py new file mode 100644 index 00000000..063eca2f --- /dev/null +++ b/community/event_management/doctype/event_ticket/event_ticket.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 EventTicket(Document): + pass diff --git a/community/event_management/doctype/event_ticket/test_event_ticket.py b/community/event_management/doctype/event_ticket/test_event_ticket.py new file mode 100644 index 00000000..987b32dc --- /dev/null +++ b/community/event_management/doctype/event_ticket/test_event_ticket.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and Contributors +# See license.txt + +# import frappe +import unittest + +class TestEventTicket(unittest.TestCase): + pass diff --git a/community/event_management/doctype/exhibitor/__init__.py b/community/event_management/doctype/exhibitor/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/doctype/exhibitor/exhibitor.js b/community/event_management/doctype/exhibitor/exhibitor.js new file mode 100644 index 00000000..598b4d31 --- /dev/null +++ b/community/event_management/doctype/exhibitor/exhibitor.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Exhibitor', { + // refresh: function(frm) { + + // } +}); diff --git a/community/event_management/doctype/exhibitor/exhibitor.json b/community/event_management/doctype/exhibitor/exhibitor.json new file mode 100644 index 00000000..f5562c10 --- /dev/null +++ b/community/event_management/doctype/exhibitor/exhibitor.json @@ -0,0 +1,87 @@ +{ + "actions": [], + "creation": "2021-08-16 16:26:46.189119", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "event", + "is_paid", + "column_break_3", + "user", + "full_name", + "company", + "section_break_7", + "description" + ], + "fields": [ + { + "fetch_from": "user.full_name", + "fieldname": "full_name", + "fieldtype": "Data", + "label": "Full Name", + "read_only": 1 + }, + { + "fieldname": "company", + "fieldtype": "Data", + "label": "Company " + }, + { + "fieldname": "description", + "fieldtype": "Text Editor", + "label": "Description" + }, + { + "default": "0", + "fieldname": "is_paid", + "fieldtype": "Check", + "label": "Is Paid" + }, + { + "fieldname": "user", + "fieldtype": "Link", + "label": "User", + "options": "User" + }, + { + "fieldname": "event", + "fieldtype": "Link", + "label": "Event", + "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 16:32:58.031324", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Exhibitor", + "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", + "title_field": "user", + "track_changes": 1 +} \ No newline at end of file diff --git a/community/event_management/doctype/exhibitor/exhibitor.py b/community/event_management/doctype/exhibitor/exhibitor.py new file mode 100644 index 00000000..d75e2e20 --- /dev/null +++ b/community/event_management/doctype/exhibitor/exhibitor.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 Exhibitor(Document): + pass diff --git a/community/event_management/doctype/exhibitor/test_exhibitor.py b/community/event_management/doctype/exhibitor/test_exhibitor.py new file mode 100644 index 00000000..9c391d62 --- /dev/null +++ b/community/event_management/doctype/exhibitor/test_exhibitor.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and Contributors +# See license.txt + +# import frappe +import unittest + +class TestExhibitor(unittest.TestCase): + pass diff --git a/community/event_management/doctype/host/__init__.py b/community/event_management/doctype/host/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/doctype/host/host.js b/community/event_management/doctype/host/host.js new file mode 100644 index 00000000..ab3acc05 --- /dev/null +++ b/community/event_management/doctype/host/host.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Host', { + // refresh: function(frm) { + + // } +}); diff --git a/community/event_management/doctype/host/host.json b/community/event_management/doctype/host/host.json new file mode 100644 index 00000000..cbb96c7e --- /dev/null +++ b/community/event_management/doctype/host/host.json @@ -0,0 +1,57 @@ +{ + "actions": [], + "creation": "2021-08-11 10:51:47.234690", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "event", + "user", + "full_name" + ], + "fields": [ + { + "fieldname": "event", + "fieldtype": "Link", + "label": "Event", + "options": "Event Details" + }, + { + "fieldname": "full_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Full Name", + "unique": 1 + }, + { + "fieldname": "user", + "fieldtype": "Data", + "label": "User" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2021-08-20 17:03:26.733195", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Host", + "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", + "title_field": "user", + "track_changes": 1 +} \ No newline at end of file diff --git a/community/event_management/doctype/host/host.py b/community/event_management/doctype/host/host.py new file mode 100644 index 00000000..f2cc77df --- /dev/null +++ b/community/event_management/doctype/host/host.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 Host(Document): + pass diff --git a/community/event_management/doctype/host/test_host.py b/community/event_management/doctype/host/test_host.py new file mode 100644 index 00000000..f3b03f13 --- /dev/null +++ b/community/event_management/doctype/host/test_host.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and Contributors +# See license.txt + +# import frappe +import unittest + +class TestHost(unittest.TestCase): + pass diff --git a/community/event_management/doctype/speaker/__init__.py b/community/event_management/doctype/speaker/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/doctype/speaker/speaker.js b/community/event_management/doctype/speaker/speaker.js new file mode 100644 index 00000000..1b1da984 --- /dev/null +++ b/community/event_management/doctype/speaker/speaker.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Speaker', { + // refresh: function(frm) { + + // } +}); diff --git a/community/event_management/doctype/speaker/speaker.json b/community/event_management/doctype/speaker/speaker.json new file mode 100644 index 00000000..e000c4a3 --- /dev/null +++ b/community/event_management/doctype/speaker/speaker.json @@ -0,0 +1,72 @@ +{ + "actions": [], + "creation": "2021-08-11 10:37:32.124651", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "event", + "company", + "column_break_8", + "user", + "full_name" + ], + "fields": [ + { + "fieldname": "user", + "fieldtype": "Link", + "in_list_view": 1, + "label": "User", + "options": "User" + }, + { + "fetch_from": "user.full_name", + "fieldname": "full_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Full Name", + "read_only": 1 + }, + { + "fieldname": "company", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Company" + }, + { + "fieldname": "column_break_8", + "fieldtype": "Column Break" + }, + { + "fieldname": "event", + "fieldtype": "Link", + "label": "Event", + "options": "Event Details" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2021-08-20 16:53:43.968260", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Speaker", + "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", + "title_field": "user", + "track_changes": 1 +} \ No newline at end of file diff --git a/community/event_management/doctype/speaker/speaker.py b/community/event_management/doctype/speaker/speaker.py new file mode 100644 index 00000000..fb99b3d5 --- /dev/null +++ b/community/event_management/doctype/speaker/speaker.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 Speaker(Document): + pass diff --git a/community/event_management/doctype/speaker/test_speaker.py b/community/event_management/doctype/speaker/test_speaker.py new file mode 100644 index 00000000..0e802137 --- /dev/null +++ b/community/event_management/doctype/speaker/test_speaker.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and Contributors +# See license.txt + +# import frappe +import unittest + +class TestSpeaker(unittest.TestCase): + pass diff --git a/community/event_management/doctype/talk/__init__.py b/community/event_management/doctype/talk/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/doctype/talk/talk.js b/community/event_management/doctype/talk/talk.js new file mode 100644 index 00000000..3550ddcd --- /dev/null +++ b/community/event_management/doctype/talk/talk.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Talk', { + // refresh: function(frm) { + + // } +}); diff --git a/community/event_management/doctype/talk/talk.json b/community/event_management/doctype/talk/talk.json new file mode 100644 index 00000000..6966b079 --- /dev/null +++ b/community/event_management/doctype/talk/talk.json @@ -0,0 +1,139 @@ +{ + "actions": [], + "creation": "2021-08-18 08:42:58.711932", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "event", + "title", + "url", + "column_break_5", + "speaker", + "category", + "thumbnail", + "schedule_section", + "date", + "status", + "column_break_11", + "start_time", + "end_time", + "section_break_9", + "about", + "attachment", + "name_of_the_speaker" + ], + "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" + }, + { + "fieldname": "about", + "fieldtype": "Text", + "label": "About the Talk" + }, + { + "fieldname": "attachment", + "fieldtype": "Attach", + "label": "Attachment" + }, + { + "fieldname": "speaker", + "fieldtype": "Link", + "label": "Speaker", + "options": "Speaker" + }, + { + "default": "Pending", + "fieldname": "status", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Status", + "options": "Pending\nApproved\nRejected" + }, + { + "fieldname": "column_break_5", + "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_9", + "fieldtype": "Section Break" + }, + { + "fieldname": "category", + "fieldtype": "Data", + "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 17:02:51.609288", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Talk", + "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", + "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 new file mode 100644 index 00000000..b7356242 --- /dev/null +++ b/community/event_management/doctype/talk/talk.py @@ -0,0 +1,29 @@ +# Copyright (c) 2021, FOSS United and contributors +# For license information, please see license.txt + +import frappe +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 + }) + + if exists: + self.speaker = frappe.db.get_value( + 'Speaker', {'user': frappe.session.user}, ["name"]) + + 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/doctype/talk/test_talk.py b/community/event_management/doctype/talk/test_talk.py new file mode 100644 index 00000000..5be72d5e --- /dev/null +++ b/community/event_management/doctype/talk/test_talk.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and Contributors +# See license.txt + +# import frappe +import unittest + +class TestTalk(unittest.TestCase): + pass diff --git a/community/event_management/web_form/__init__.py b/community/event_management/web_form/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/web_form/attendee_registration/__init__.py b/community/event_management/web_form/attendee_registration/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/web_form/attendee_registration/attendee_registration.js b/community/event_management/web_form/attendee_registration/attendee_registration.js new file mode 100644 index 00000000..434ef10e --- /dev/null +++ b/community/event_management/web_form/attendee_registration/attendee_registration.js @@ -0,0 +1,7 @@ +frappe.ready(function () { + frappe.web_form.after_save = () => { + setTimeout(function () { + window.location.href = '/about'; + }, 2000); + } +}) \ No newline at end of file diff --git a/community/event_management/web_form/attendee_registration/attendee_registration.json b/community/event_management/web_form/attendee_registration/attendee_registration.json new file mode 100644 index 00000000..7e4f5a80 --- /dev/null +++ b/community/event_management/web_form/attendee_registration/attendee_registration.json @@ -0,0 +1,76 @@ +{ + "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": "", + "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", + "docstatus": 0, + "doctype": "Web Form", + "idx": 0, + "is_standard": 1, + "login_required": 1, + "max_attachment_size": 0, + "modified": "2021-08-23 10:13:19.224367", + "modified_by": "Administrator", + "module": "Event Management", + "name": "attendee-registration", + "owner": "Administrator", + "payment_button_label": "Buy Now", + "published": 1, + "route": "/attendee-registration", + "route_to_success_link": 1, + "show_attachments": 0, + "show_in_grid": 0, + "show_sidebar": 0, + "sidebar_items": [], + "success_url": "/about", + "title": "Attendee Registration", + "web_form_fields": [ + { + "allow_read_on_all_link_options": 0, + "fieldname": "user", + "fieldtype": "Data", + "hidden": 0, + "label": "User", + "max_length": 0, + "max_value": 0, + "options": "User", + "read_only": 1, + "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": "what_are_you_hoping_to_learn", + "fieldtype": "Text", + "hidden": 0, + "label": "What are you hoping to learn", + "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_form/attendee_registration/attendee_registration.py b/community/event_management/web_form/attendee_registration/attendee_registration.py new file mode 100644 index 00000000..e1ada619 --- /dev/null +++ b/community/event_management/web_form/attendee_registration/attendee_registration.py @@ -0,0 +1,5 @@ +import frappe + +def get_context(context): + # do your magic here + pass diff --git a/community/event_management/web_form/exhibitor_registration/__init__.py b/community/event_management/web_form/exhibitor_registration/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/web_form/exhibitor_registration/exhibitor_registration.js b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.js new file mode 100644 index 00000000..434ef10e --- /dev/null +++ b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.js @@ -0,0 +1,7 @@ +frappe.ready(function () { + frappe.web_form.after_save = () => { + setTimeout(function () { + window.location.href = '/about'; + }, 2000); + } +}) \ No newline at end of file diff --git a/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json new file mode 100644 index 00000000..cba14dfe --- /dev/null +++ b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json @@ -0,0 +1,76 @@ +{ + "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": "Save", + "creation": "2021-08-16 16:27:06.566564", + "custom_css": "[data-doctype=\"Web Form\"] {\n max-width: 720px;\n margin: 6rem auto;\n}", + "doc_type": "Exhibitor", + "docstatus": 0, + "doctype": "Web Form", + "idx": 0, + "is_standard": 1, + "login_required": 1, + "max_attachment_size": 0, + "modified": "2021-08-23 10:12:24.038572", + "modified_by": "Administrator", + "module": "Event Management", + "name": "exhibitor-registration", + "owner": "Administrator", + "payment_button_label": "Buy Now", + "published": 1, + "route": "exhibitor-registration", + "route_to_success_link": 0, + "show_attachments": 0, + "show_in_grid": 0, + "show_sidebar": 0, + "sidebar_items": [], + "success_url": "", + "title": "Exhibitor Registration", + "web_form_fields": [ + { + "allow_read_on_all_link_options": 0, + "fieldname": "user", + "fieldtype": "Data", + "hidden": 0, + "label": "User", + "max_length": 0, + "max_value": 0, + "options": "User", + "read_only": 1, + "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": "description", + "fieldtype": "Text Editor", + "hidden": 0, + "label": "Description", + "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_form/exhibitor_registration/exhibitor_registration.py b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.py new file mode 100644 index 00000000..e1ada619 --- /dev/null +++ b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.py @@ -0,0 +1,5 @@ +import frappe + +def get_context(context): + # do your magic here + pass diff --git a/community/event_management/web_form/purpose_a_talk/__init__.py b/community/event_management/web_form/purpose_a_talk/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/web_form/purpose_a_talk/purpose_a_talk.js b/community/event_management/web_form/purpose_a_talk/purpose_a_talk.js new file mode 100644 index 00000000..434ef10e --- /dev/null +++ b/community/event_management/web_form/purpose_a_talk/purpose_a_talk.js @@ -0,0 +1,7 @@ +frappe.ready(function () { + frappe.web_form.after_save = () => { + setTimeout(function () { + window.location.href = '/about'; + }, 2000); + } +}) \ No newline at end of file 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 new file mode 100644 index 00000000..e064d75d --- /dev/null +++ b/community/event_management/web_form/purpose_a_talk/purpose_a_talk.json @@ -0,0 +1,102 @@ +{ + "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", + "client_script": "", + "creation": "2021-08-19 15:16:22.341723", + "custom_css": "[data-doctype=\"Web Form\"] {\n max-width: 720px;\n margin: 6rem auto;\n}", + "doc_type": "Talk", + "docstatus": 0, + "doctype": "Web Form", + "idx": 0, + "is_standard": 1, + "login_required": 1, + "max_attachment_size": 0, + "modified": "2021-08-23 10:18:17.486228", + "modified_by": "Administrator", + "module": "Event Management", + "name": "purpose-a-talk", + "owner": "Administrator", + "payment_button_label": "Buy Now", + "published": 1, + "route": "propose-talk", + "route_to_success_link": 0, + "show_attachments": 0, + "show_in_grid": 0, + "show_sidebar": 0, + "sidebar_items": [], + "success_message": "Talk Submitted!", + "success_url": "/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", + "fieldtype": "Data", + "hidden": 0, + "label": "Event", + "max_length": 0, + "max_value": 0, + "options": "Event Details", + "read_only": 1, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "about", + "fieldtype": "Text Editor", + "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 + } + ] +} \ No newline at end of file diff --git a/community/event_management/web_form/purpose_a_talk/purpose_a_talk.py b/community/event_management/web_form/purpose_a_talk/purpose_a_talk.py new file mode 100644 index 00000000..e1ada619 --- /dev/null +++ b/community/event_management/web_form/purpose_a_talk/purpose_a_talk.py @@ -0,0 +1,5 @@ +import frappe + +def get_context(context): + # do your magic here + pass diff --git a/community/event_management/web_form/speaker_registration/__init__.py b/community/event_management/web_form/speaker_registration/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/web_form/speaker_registration/speaker_registration.js b/community/event_management/web_form/speaker_registration/speaker_registration.js new file mode 100644 index 00000000..a50c3b37 --- /dev/null +++ b/community/event_management/web_form/speaker_registration/speaker_registration.js @@ -0,0 +1,7 @@ +frappe.ready(function () { + frappe.web_form.after_save = () => { + setTimeout(function () { + window.location.href = '/event/conference2021/propose-talk'; + }, 2000); + } +}) \ No newline at end of file diff --git a/community/event_management/web_form/speaker_registration/speaker_registration.json b/community/event_management/web_form/speaker_registration/speaker_registration.json new file mode 100644 index 00000000..d2e0ccfa --- /dev/null +++ b/community/event_management/web_form/speaker_registration/speaker_registration.json @@ -0,0 +1,89 @@ +{ + "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": "Register", + "creation": "2021-08-19 15:29:01.167930", + "custom_css": "[data-doctype=\"Web Form\"] {\n max-width: 720px;\n margin: 6rem auto;\n}", + "doc_type": "Speaker", + "docstatus": 0, + "doctype": "Web Form", + "idx": 0, + "is_standard": 1, + "login_required": 1, + "max_attachment_size": 0, + "modified": "2021-08-20 16:16:51.107177", + "modified_by": "Administrator", + "module": "Event Management", + "name": "speaker-registration", + "owner": "Administrator", + "payment_button_label": "Buy Now", + "published": 1, + "route": "speaker-registration", + "route_to_success_link": 1, + "show_attachments": 0, + "show_in_grid": 0, + "show_sidebar": 0, + "sidebar_items": [], + "success_url": "/speaker-registration", + "title": "Speaker Registration", + "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": 1, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "user", + "fieldtype": "Link", + "hidden": 0, + "label": "User", + "max_length": 0, + "max_value": 0, + "options": "User", + "read_only": 1, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "full_name", + "fieldtype": "Data", + "hidden": 0, + "label": "Full Name", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "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": 1, + "show_in_filter": 0 + } + ] +} \ No newline at end of file diff --git a/community/event_management/web_form/speaker_registration/speaker_registration.py b/community/event_management/web_form/speaker_registration/speaker_registration.py new file mode 100644 index 00000000..e1ada619 --- /dev/null +++ b/community/event_management/web_form/speaker_registration/speaker_registration.py @@ -0,0 +1,5 @@ +import frappe + +def get_context(context): + # do your magic here + pass diff --git a/community/event_management/web_template/__init__.py b/community/event_management/web_template/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/web_template/exhibitor_section/__init__.py b/community/event_management/web_template/exhibitor_section/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/web_template/exhibitor_section/exhibitor_section.html b/community/event_management/web_template/exhibitor_section/exhibitor_section.html new file mode 100644 index 00000000..c43f6d55 --- /dev/null +++ b/community/event_management/web_template/exhibitor_section/exhibitor_section.html @@ -0,0 +1,43 @@ + + {{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 + + diff --git a/community/event_management/web_template/exhibitor_section/exhibitor_section.json b/community/event_management/web_template/exhibitor_section/exhibitor_section.json new file mode 100644 index 00000000..a0a87fa8 --- /dev/null +++ b/community/event_management/web_template/exhibitor_section/exhibitor_section.json @@ -0,0 +1,49 @@ +{ + "__unsaved": 1, + "creation": "2021-08-13 15:05:41.606772", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title", + "reqd": 0 + }, + { + "fieldname": "subtitle", + "fieldtype": "Data", + "label": "Subtitle", + "reqd": 0 + }, + { + "fieldname": "event", + "fieldtype": "Link", + "label": "Event", + "options": "Event Details", + "reqd": 0 + }, + { + "fieldname": "exhibitor_details", + "fieldtype": "Table Break", + "label": "Exhibitor Details", + "reqd": 0 + }, + { + "fieldname": "exhibitor", + "fieldtype": "Link", + "label": "Exhibitor", + "options": "Exhibitor", + "reqd": 0 + } + ], + "idx": 1, + "modified": "2021-08-20 16:28:22.779057", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Exhibitor Section", + "owner": "Administrator", + "standard": 1, + "template": "", + "type": "Section" +} \ No newline at end of file diff --git a/community/event_management/web_template/host_section/__init__.py b/community/event_management/web_template/host_section/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/web_template/host_section/host_section.html b/community/event_management/web_template/host_section/host_section.html new file mode 100644 index 00000000..8fdcf95b --- /dev/null +++ b/community/event_management/web_template/host_section/host_section.html @@ -0,0 +1,3 @@ + + {{title}} + \ No newline at end of file diff --git a/community/event_management/web_template/host_section/host_section.json b/community/event_management/web_template/host_section/host_section.json new file mode 100644 index 00000000..c423e397 --- /dev/null +++ b/community/event_management/web_template/host_section/host_section.json @@ -0,0 +1,43 @@ +{ + "__unsaved": 1, + "creation": "2021-08-20 08:12:29.549625", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title", + "reqd": 0 + }, + { + "fieldname": "subtitle", + "fieldtype": "Data", + "label": "Subtitle", + "reqd": 0 + }, + { + "__unsaved": 1, + "fieldname": "hosts", + "fieldtype": "Table Break", + "label": "Hosts", + "reqd": 0 + }, + { + "fieldname": "host", + "fieldtype": "Link", + "label": "Host", + "options": "Host", + "reqd": 0 + } + ], + "idx": 0, + "modified": "2021-08-20 08:16:25.805456", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Host Section", + "owner": "Administrator", + "standard": 1, + "template": "", + "type": "Section" +} \ No newline at end of file diff --git a/community/event_management/web_template/speaker_section/__init__.py b/community/event_management/web_template/speaker_section/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/web_template/speaker_section/speaker_section.html b/community/event_management/web_template/speaker_section/speaker_section.html new file mode 100644 index 00000000..84d6b3dc --- /dev/null +++ b/community/event_management/web_template/speaker_section/speaker_section.html @@ -0,0 +1,44 @@ + + {{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/speaker_section/speaker_section.json b/community/event_management/web_template/speaker_section/speaker_section.json new file mode 100644 index 00000000..21a597b1 --- /dev/null +++ b/community/event_management/web_template/speaker_section/speaker_section.json @@ -0,0 +1,49 @@ +{ + "__unsaved": 1, + "creation": "2021-08-12 21:15:14.492000", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "section_title", + "fieldtype": "Data", + "label": "Section Title", + "reqd": 1 + }, + { + "fieldname": "subtitle", + "fieldtype": "Data", + "label": "Subtitle", + "reqd": 0 + }, + { + "fieldname": "event_", + "fieldtype": "Link", + "label": "Event ", + "options": "Event Details", + "reqd": 0 + }, + { + "fieldname": "speaker_details", + "fieldtype": "Table Break", + "label": "Speaker Details", + "reqd": 0 + }, + { + "fieldname": "speaker", + "fieldtype": "Link", + "label": "Speaker", + "options": "Speaker", + "reqd": 0 + } + ], + "idx": 1, + "modified": "2021-08-20 10:59:54.965714", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Speaker Section", + "owner": "Administrator", + "standard": 1, + "template": "", + "type": "Section" +} \ No newline at end of file diff --git a/community/event_management/web_template/talk_section/__init__.py b/community/event_management/web_template/talk_section/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/event_management/web_template/talk_section/talk_section.html b/community/event_management/web_template/talk_section/talk_section.html new file mode 100644 index 00000000..5a98159b --- /dev/null +++ b/community/event_management/web_template/talk_section/talk_section.html @@ -0,0 +1,53 @@ + + {{title}} + {%- if subtitle -%} + {{ subtitle }} + {%- endif -%} + + {% 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/event_management/web_template/talk_section/talk_section.json b/community/event_management/web_template/talk_section/talk_section.json new file mode 100644 index 00000000..273624dd --- /dev/null +++ b/community/event_management/web_template/talk_section/talk_section.json @@ -0,0 +1,49 @@ +{ + "__unsaved": 1, + "creation": "2021-08-13 11:34:07.611034", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title", + "reqd": 1 + }, + { + "fieldname": "subtitle", + "fieldtype": "Data", + "label": "Subtitle", + "reqd": 0 + }, + { + "fieldname": "event", + "fieldtype": "Link", + "label": "Event", + "options": "Event Details", + "reqd": 1 + }, + { + "fieldname": "talk_details", + "fieldtype": "Table Break", + "label": "Talk Details", + "reqd": 0 + }, + { + "fieldname": "talk", + "fieldtype": "Link", + "label": "Talk", + "options": "Talk", + "reqd": 0 + } + ], + "idx": 1, + "modified": "2021-08-20 10:58:45.556636", + "modified_by": "Administrator", + "module": "Event Management", + "name": "Talk Section", + "owner": "Administrator", + "standard": 1, + "template": "", + "type": "Section" +} \ No newline at end of file diff --git a/community/hooks.py b/community/hooks.py index 718dc554..5b2ef4c1 100644 --- a/community/hooks.py +++ b/community/hooks.py @@ -133,7 +133,7 @@ fixtures = ["Custom Field"] primary_rules = [ {"from_route": "/sketches/", "to_route": "sketches/sketch"}, {"from_route": "/courses/", "to_route": "courses/course"}, - {"from_route": "/courses//", "to_route": "courses/certificate"}, + {"from_route": "/courses//", "to_route": "courses/topic"}, {"from_route": "/hackathons/", "to_route": "hackathons/hackathon"}, {"from_route": "/hackathons//", "to_route": "hackathons/project"}, {"from_route": "/add-a-new-batch", "to_route": "add-a-new-batch"}, @@ -146,7 +146,7 @@ primary_rules = [ {"from_route": "/courses//about", "to_route": "batch/about"}, {"from_route": "/courses//progress", "to_route": "batch/progress"}, {"from_route": "/courses//join", "to_route": "batch/join"}, - {"from_route": "/discussions/", "to_route": "discussions/discussion"} + {"from_route": "/discussions/", "to_route": "discussions/discussion"}, ] # Any frappe default URL is blocked by profile-rules, add it here to unblock it @@ -169,7 +169,14 @@ whitelist = [ "/message", "/about", "/edit-profile", - "/discussions" + "/attendee-registration", + "/speaker-registration", + "/event", + "/hello", + "/exhibitor-registration", + "/discussions", + "/propose-talk", + ] whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist] diff --git a/community/lms/web_form/profile/profile.js b/community/lms/web_form/profile/profile.js index 286ed9b5..c9869a5c 100644 --- a/community/lms/web_form/profile/profile.js +++ b/community/lms/web_form/profile/profile.js @@ -8,7 +8,7 @@ frappe.ready(function () { frappe.web_form.after_save = () => { setTimeout(() => { - window.location.href = `/${frappe.web_form.get_value(["username"])}`; + window.location.href = `/user/${frappe.web_form.get_value(["username"])}`; }) } }) diff --git a/community/lms/widgets/CourseTeaser.html b/community/lms/widgets/CourseTeaser.html index 64ecb5ec..2b7b54ec 100644 --- a/community/lms/widgets/CourseTeaser.html +++ b/community/lms/widgets/CourseTeaser.html @@ -12,7 +12,7 @@ {% endif %} {% with author = course.get_instructor() %} - {{ widgets.Avatar(member=author, avatar_class="avatar-medium") }} {{ author.full_name }} + {{ widgets.Avatar(member=author, avatar_class="avatar-medium") }} {{ author.full_name }} {% endwith %} diff --git a/community/lms/widgets/InstructorSection.html b/community/lms/widgets/InstructorSection.html index 367148dd..9c96c294 100644 --- a/community/lms/widgets/InstructorSection.html +++ b/community/lms/widgets/InstructorSection.html @@ -1,6 +1,6 @@ {{ widgets.Avatar(member=instructor, avatar_class="avatar-medium") }} - {{ instructor.full_name }} + {{ instructor.full_name }} Course Creator diff --git a/community/lms/widgets/MemberCard.html b/community/lms/widgets/MemberCard.html index d780eb34..77f00556 100644 --- a/community/lms/widgets/MemberCard.html +++ b/community/lms/widgets/MemberCard.html @@ -11,5 +11,5 @@ Created {{ course_count }} {{ suffix }} {% endif %} - + diff --git a/community/lms/widgets/Reviews.html b/community/lms/widgets/Reviews.html index 73073f8d..b5302ca3 100644 --- a/community/lms/widgets/Reviews.html +++ b/community/lms/widgets/Reviews.html @@ -18,7 +18,7 @@ diff --git a/community/www/new-sign-up.html b/community/www/new-sign-up.html index 05a6c3d8..1990dc3b 100644 --- a/community/www/new-sign-up.html +++ b/community/www/new-sign-up.html @@ -67,4 +67,4 @@ }) -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/mockups/base.html b/mockups/base.html index b7da0aae..4a48a7ed 100644 --- a/mockups/base.html +++ b/mockups/base.html @@ -10,6 +10,7 @@ {% block title %}FOSS United{% endblock %} +
{{ subtitle }}