diff --git a/community/event_management/doctype/event_details/event_details.json b/community/event_management/doctype/event_details/event_details.json index c7719ecd..d9566509 100644 --- a/community/event_management/doctype/event_details/event_details.json +++ b/community/event_management/doctype/event_details/event_details.json @@ -9,7 +9,7 @@ "event_name", "start_date", "end_date", - "event_details" + "event_description" ], "fields": [ { @@ -35,15 +35,15 @@ "reqd": 1 }, { - "fieldname": "event_details", + "fieldname": "event_description", "fieldtype": "Markdown Editor", "in_list_view": 1, - "label": "Event Details" + "label": "Event Description" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-18 09:46:06.455633", + "modified": "2021-08-18 23:51:30.432691", "modified_by": "Administrator", "module": "Event Management", "name": "Event Details", diff --git a/community/event_management/doctype/exhibitor_registration/exhibitor_registration.json b/community/event_management/doctype/exhibitor_registration/exhibitor_registration.json index ff9f1f75..8be120d4 100644 --- a/community/event_management/doctype/exhibitor_registration/exhibitor_registration.json +++ b/community/event_management/doctype/exhibitor_registration/exhibitor_registration.json @@ -19,8 +19,7 @@ { "fieldname": "company", "fieldtype": "Data", - "label": "Company ", - "unique": 1 + "label": "Company " }, { "fieldname": "logo", @@ -30,7 +29,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-16 17:01:51.344097", + "modified": "2021-08-18 20:08:31.591935", "modified_by": "Administrator", "module": "Event Management", "name": "Exhibitor Registration", diff --git a/community/event_management/doctype/schedule/schedule.py b/community/event_management/doctype/schedule/schedule.py index 4a8cdec0..e14b9cd4 100644 --- a/community/event_management/doctype/schedule/schedule.py +++ b/community/event_management/doctype/schedule/schedule.py @@ -1,8 +1,18 @@ # Copyright (c) 2021, FOSS United and contributors # For license information, please see license.txt -# import frappe +import frappe from frappe.model.document import Document class Schedule(Document): - pass + 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/slot/slot.json b/community/event_management/doctype/slot/slot.json index a65a8756..60aa330a 100644 --- a/community/event_management/doctype/slot/slot.json +++ b/community/event_management/doctype/slot/slot.json @@ -15,28 +15,36 @@ { "fieldname": "event", "fieldtype": "Link", + "in_list_view": 1, "label": "Event", - "options": "Event Details" + "options": "Event Details", + "reqd": 1 }, { "fieldname": "date", "fieldtype": "Date", - "label": "Date" + "in_list_view": 1, + "label": "Date", + "reqd": 1 }, { "fieldname": "start_time", "fieldtype": "Time", - "label": "Start Time" + "in_list_view": 1, + "label": "Start Time", + "reqd": 1 }, { "fieldname": "end_time", "fieldtype": "Time", - "label": "End Time" + "in_list_view": 1, + "label": "End Time", + "reqd": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-16 17:13:28.144260", + "modified": "2021-08-18 23:51:47.850435", "modified_by": "Administrator", "module": "Event Management", "name": "Slot", diff --git a/community/event_management/doctype/slot/slot.py b/community/event_management/doctype/slot/slot.py index d2cb8dfe..159044aa 100644 --- a/community/event_management/doctype/slot/slot.py +++ b/community/event_management/doctype/slot/slot.py @@ -1,8 +1,14 @@ # Copyright (c) 2021, FOSS United and contributors # For license information, please see license.txt -# import frappe +import frappe from frappe.model.document import Document +from frappe.utils import getdate class Slot(Document): - pass + + 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/web_form/speaker_registration/speaker_registration.json b/community/event_management/web_form/speaker_registration/speaker_registration.json index c4724118..4877540e 100644 --- a/community/event_management/web_form/speaker_registration/speaker_registration.json +++ b/community/event_management/web_form/speaker_registration/speaker_registration.json @@ -15,10 +15,11 @@ "docstatus": 0, "doctype": "Web Form", "idx": 0, + "introduction_text": "


", "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2021-08-18 14:54:32.498739", + "modified": "2021-08-18 20:00:46.756407", "modified_by": "Administrator", "module": "Event Management", "name": "speaker-registration", 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 4d8bb6f8..9181f21f 100644 --- a/community/event_management/web_template/schedule_section/schedule_section.html +++ b/community/event_management/web_template/schedule_section/schedule_section.html @@ -2,20 +2,23 @@ '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) %} {% set slot_data = 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 - }) %} +"slot": slot.name|string, +"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, +"email": speaker.email +}) %} {% endfor %} +
{{title}}
@@ -37,29 +40,30 @@
{% for day in slot_data %} + {% set outer_loop = loop %}
{{day}}
{% for slot in slot_data[day] %}
-
- {{ frappe.format(slot.start_time, {'fieldtype': 'Time'})}} - {{ - frappe.format(slot.end_time, {'fieldtype': 'Time'}) }} -
-
{{slot.title}}
- - -
-
-

{{slot.about}}

{{slot.full_name}}
 -
+
{{slot.title}}
+
+ {{ frappe.format(slot.start_time, {'fieldtype': 'Time'})}} - {{ + frappe.format(slot.end_time, {'fieldtype': 'Time'}) }} +
+ +
+
+

{{slot.about}}

{% endfor %} diff --git a/community/public/css/style.css b/community/public/css/style.css index dd5fc1f6..21096b30 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -1329,7 +1329,7 @@ a.talk-link { .schedule-inner-container { display: grid; - grid-template-columns: 1.2fr 3fr 0.4fr; + grid-template-columns: 1.2fr 2fr 1fr 0.2fr; padding: 0 20px 0; } @@ -1342,7 +1342,7 @@ a.talk-link { } .schedule-info{ - display: none; + /* display: none; */ padding: 20px; } @@ -1374,10 +1374,10 @@ a.talk-link { object-fit: contain; } -.schedule-container:hover > .schedule-info { +/* .schedule-container:hover > .schedule-info { display: block; transition: all 0.3s ease-in-out; -} +} */ .info-speaker-avatar { display: flex;