fix: remove speaker-registration

This commit is contained in:
Summayya
2021-08-20 13:41:11 +05:30
parent 2894a5e479
commit dba956e473
37 changed files with 278 additions and 168 deletions

View File

@@ -1,7 +1,7 @@
// Copyright (c) 2021, FOSS United and contributors
// For license information, please see license.txt
frappe.ui.form.on('Attendee Registration', {
frappe.ui.form.on('Attendee', {
onload: function (frm) {
frm.set_query('user', function (doc) {
return {

View File

@@ -8,11 +8,11 @@
"attendee_info_section",
"user",
"full_name",
"email",
"phone_number",
"occupation",
"company",
"what_are_you_hoping_to_learn"
"what_are_you_hoping_to_learn",
"is_paid"
],
"fields": [
{
@@ -20,13 +20,6 @@
"fieldtype": "Section Break",
"label": "Attendee Info"
},
{
"fetch_from": "user.email",
"fieldname": "email",
"fieldtype": "Data",
"label": "Email",
"read_only": 1
},
{
"fieldname": "phone_number",
"fieldtype": "Data",
@@ -53,7 +46,8 @@
"fieldname": "user",
"fieldtype": "Link",
"label": "User",
"options": "User"
"options": "User",
"read_only": 1
},
{
"fetch_from": "user.full_name",
@@ -61,14 +55,20 @@
"fieldtype": "Data",
"label": "Full Name",
"read_only": 1
},
{
"default": "0",
"fieldname": "is_paid",
"fieldtype": "Check",
"label": "is_paid"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-08-19 15:25:03.305762",
"modified": "2021-08-20 13:40:25.690440",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Attendee Registration",
"name": "Attendee",
"owner": "Administrator",
"permissions": [
{

View File

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

View File

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

View File

@@ -19,7 +19,7 @@
"fieldname": "attendee",
"fieldtype": "Link",
"label": "attendee",
"options": "Attendee Registration"
"options": "Attendee"
},
{
"fieldname": "event",
@@ -30,7 +30,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-08-18 09:51:14.654098",
"modified": "2021-08-20 13:38:28.688115",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Event Ticket",

View File

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

View File

@@ -8,7 +8,9 @@
"field_order": [
"full_name",
"company",
"logo"
"logo",
"description",
"is_paid"
],
"fields": [
{
@@ -25,14 +27,25 @@
"fieldname": "logo",
"fieldtype": "Attach Image",
"label": "Logo"
},
{
"fieldname": "description",
"fieldtype": "Text Editor",
"label": "Description"
},
{
"default": "0",
"fieldname": "is_paid",
"fieldtype": "Check",
"label": "is_paid"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-08-18 20:08:31.591935",
"modified": "2021-08-20 13:38:07.709658",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Exhibitor Registration",
"name": "Exhibitor",
"owner": "Administrator",
"permissions": [
{

View File

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

View File

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

View File

@@ -2,13 +2,7 @@
// For license information, please see license.txt
frappe.ui.form.on('Speaker', {
onload: function (frm) {
frm.set_query('user', function (doc) {
return {
filters: {
"ignore_user_type": 1,
}
};
});
}
// refresh: function(frm) {
// }
});

View File

@@ -7,9 +7,9 @@
"engine": "InnoDB",
"field_order": [
"speaker_info_section",
"event",
"user",
"full_name",
"email",
"phone_number",
"job_title",
"company",
@@ -24,10 +24,19 @@
"label": "Speaker Info"
},
{
"fetch_from": "user.email",
"fieldname": "email",
"fieldname": "user",
"fieldtype": "Link",
"in_list_view": 1,
"label": "User",
"options": "User",
"read_only": 1
},
{
"fetch_from": "user.full_name",
"fieldname": "full_name",
"fieldtype": "Data",
"label": "Email",
"in_list_view": 1,
"label": "Full Name",
"read_only": 1
},
{
@@ -52,6 +61,11 @@
"reqd": 1
},
{
"fieldname": "column_break_8",
"fieldtype": "Column Break"
},
{
"fetch_from": "user.banner_image",
"fieldname": "picture",
"fieldtype": "Attach Image",
"label": "Profile Image",
@@ -63,27 +77,16 @@
"label": "Bio"
},
{
"fieldname": "column_break_8",
"fieldtype": "Column Break"
},
{
"fetch_from": "user.full_name",
"fieldname": "full_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Full Name",
"read_only": 1
},
{
"fieldname": "user",
"fieldname": "event",
"fieldtype": "Link",
"label": "User",
"options": "User"
"label": "Event",
"options": "Event Details",
"read_only": 1
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-08-19 15:19:27.351589",
"modified": "2021-08-20 12:06:54.852070",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Speaker",

View File

@@ -1,10 +1,8 @@
# 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 Speaker(Document):
def on_update(self):
pass
pass

View File

@@ -7,7 +7,7 @@
"engine": "InnoDB",
"field_order": [
"event",
"speaker",
"company",
"topic",
"title",
"about",
@@ -15,7 +15,8 @@
"url",
"thumbnail",
"name_of_the_speaker",
"status"
"status",
"speaker"
],
"fields": [
{
@@ -47,12 +48,12 @@
{
"fieldname": "topic",
"fieldtype": "Data",
"label": "Topic"
"label": "Category"
},
{
"fieldname": "about",
"fieldtype": "Text",
"label": "About"
"label": "About the Talk"
},
{
"fieldname": "attachment",
@@ -62,6 +63,7 @@
{
"fieldname": "speaker",
"fieldtype": "Link",
"hidden": 1,
"label": "Speaker",
"options": "Speaker"
},
@@ -72,11 +74,16 @@
"in_list_view": 1,
"label": "Status",
"options": "Applied\nPending\nApproved\nRejected\nPrevious Talk"
},
{
"fieldname": "company",
"fieldtype": "Data",
"label": "Company"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-08-19 16:44:58.181528",
"modified": "2021-08-20 12:08:11.304322",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Talk",

View File

@@ -1,8 +1,27 @@
# 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 Talk(Document):
pass
def before_save(self):
exists = frappe.db.exists({
'doctype': 'Speaker',
'user': frappe.session.user
})
speaker = None
if(exists):
speaker = frappe.db.get_value(
'Speaker', {'user': frappe.session.user})
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

View File

@@ -1,3 +1,7 @@
frappe.ready(function() {
// bind events here
frappe.ready(function () {
frappe.web_form.after_save = () => {
setTimeout(function () {
window.location.href = '/event/conference2021/about';
}, 2000);
}
})

View File

@@ -11,6 +11,7 @@
"apply_document_permissions": 0,
"button_label": "Get Ticket",
"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",
"docstatus": 0,
"doctype": "Web Form",
@@ -18,20 +19,20 @@
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2021-08-19 15:34:04.871127",
"modified": "2021-08-19 22:03:24.454348",
"modified_by": "Administrator",
"module": "Event Management",
"name": "attendee-registration",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "event/conference/attendee-registration",
"route": "event/conference2021/attendee-registration",
"route_to_success_link": 1,
"show_attachments": 0,
"show_in_grid": 0,
"show_sidebar": 0,
"sidebar_items": [],
"success_url": "/attendee-registration",
"success_url": "/event/conference2021/about",
"title": "Attendee Registration",
"web_form_fields": [
{

View File

@@ -1,3 +1,7 @@
frappe.ready(function() {
// bind events here
frappe.ready(function () {
frappe.web_form.after_save = () => {
setTimeout(function () {
window.location.href = '/event/conference2021/about';
}, 2000);
}
})

View File

@@ -11,14 +11,15 @@
"apply_document_permissions": 0,
"button_label": "Save",
"creation": "2021-08-16 16:27:06.566564",
"doc_type": "Exhibitor Registration",
"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-17 11:51:02.929819",
"modified": "2021-08-19 22:05:16.609246",
"modified_by": "Administrator",
"module": "Event Management",
"name": "exhibitor-registration",
@@ -69,6 +70,18 @@
"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
}
]
}

View File

@@ -1,3 +1,7 @@
frappe.ready(function() {
// bind events here
frappe.ready(function () {
frappe.web_form.after_save = () => {
setTimeout(function () {
window.location.href = '/event/conference2021/about';
}, 2000);
}
})

View File

@@ -10,7 +10,9 @@
"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",
@@ -18,19 +20,20 @@
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2021-08-19 15:22:37.040442",
"modified": "2021-08-20 13:33:49.508780",
"modified_by": "Administrator",
"module": "Event Management",
"name": "purpose-a-talk",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "event/conference/purpose-a-talk",
"route": "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": "Purpose a Talk",
"web_form_fields": [
@@ -49,13 +52,12 @@
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "speaker",
"fieldtype": "Link",
"fieldname": "company",
"fieldtype": "Data",
"hidden": 0,
"label": "Speaker",
"label": "Company",
"max_length": 0,
"max_value": 0,
"options": "Speaker",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
@@ -65,11 +67,11 @@
"fieldname": "topic",
"fieldtype": "Data",
"hidden": 0,
"label": "Topic",
"label": "Category",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"reqd": 1,
"show_in_filter": 0
},
{
@@ -81,7 +83,7 @@
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"reqd": 1,
"show_in_filter": 0
},
{
@@ -93,7 +95,7 @@
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"reqd": 1,
"show_in_filter": 0
},
{

View File

@@ -1,3 +1,7 @@
frappe.ready(function() {
// bind events here
frappe.ready(function () {
frappe.web_form.after_save = () => {
setTimeout(function () {
window.location.href = '/event/conference2021/propose-talk';
}, 2000);
}
})

View File

@@ -11,6 +11,7 @@
"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",
@@ -18,14 +19,14 @@
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2021-08-19 15:30:59.041817",
"modified": "2021-08-20 11:24:52.350955",
"modified_by": "Administrator",
"module": "Event Management",
"name": "speaker-registration",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "event/conference/speaker-registration",
"route": "speaker-registration",
"route_to_success_link": 1,
"show_attachments": 0,
"show_in_grid": 0,
@@ -36,6 +37,19 @@
"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": 1,
"fieldname": "user",
"fieldtype": "Link",
"hidden": 0,
@@ -59,18 +73,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",

View File

@@ -1,14 +1,20 @@
<div class="section-with-cards">
<h1 class="course-home-headings">{{title}}</h1>
{%- if subtitle -%}
<p class="section-description">{{ subtitle }}</p>
{%- endif -%}
<div class="speaker-cards-parent">
<div class="speaker-cards-parent">
{% for exhibitor in exhibitor_details %}
{% set exhibitor_doc = frappe.get_doc("Exhibitor Registration", exhibitor.exhibitor) %}
{% set exhibitor_doc = frappe.get_doc("Exhibitor", exhibitor.exhibitor) %}
<a href="/event/conference2021/{{exhibitor_doc.company}}">
<div class="common-card-style talk-card exhibitor-card">
<span>
<img class="standard-image company-logo" src="{{exhibitor_doc.logo}}" />
</span>
<div class="small-title company-name">{{exhibitor_doc.company}}</div>
</div>
</a>
{% endfor %}
</div>
{%- if cta_link -%}

View File

@@ -0,0 +1,3 @@
<div class="section-with-cards">
<h1 class="course-home-headings">{{title}}</h1>
</div>

View File

@@ -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"
}

View File

@@ -1,38 +0,0 @@
<div class="section-with-cards">
<div class="course-home-headings">{{title}}</div>
<div class="speaker-cards-parent">
{% for video in talk_details %}
{% set video_details = frappe.get_doc('Talk', video.previous_content, filters={
'event': event
}) %}
<div class="common-card-style talk-card">
<div class="course-image" style="background-image: url({{video_details.thumbnail}})">
<div class="course-tags"></div>
</div>
<div class="course-card-content">
<div class="course-card-meta muted-text">
<span> ERPNext </span>
</div>
<div class="course-card-title">{{video_details.title}}</div>
<div class="card-divider"></div>
<div class="course-card-meta-2">
<a class="button-links" href="/rushabh">
<span class="avatar avatar-small" title="Rushabh Mehta">
<img class="avatar-frame standard-image" style="object-fit: cover"
src="{{video_details.thumbnail}}"
title={{video_details.name_of_the_speaker}} />
</span>
</a>
<span class="course-instructor"> {{video_details.name_of_the_speaker}} </span>
<span class="small-title company-name"></span>
</div>
<div class="view-talk-link">
Vew Talk
<img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
</div>
<a class="stretched-link" href="{{video_details.url}}"></a>
</div>
</div>
{% endfor %}
</div>
</div>

View File

@@ -19,6 +19,9 @@
{% endfor %}
<div class="courses-header">{{title}}</div>
{%- if subtitle -%}
<p class="section-description">{{ subtitle }}</p>
{%- endif -%}
<div class="common-page-style">
<div class="container">
<div class="course-content-parent">

View File

@@ -1,9 +1,11 @@
<div class="section-with-cards">
<h1 class="course-home-headings">{{section_title}}</h1>
{%- if subtitle -%}
<p class="section-description">{{ subtitle }}</p>
{%- endif -%}
<div class="speaker-cards-parent">
{% for speaker in speaker_details %}
{% for speaker in speaker_details %}
{% set speaker_doc = frappe.get_doc("Speaker", speaker.speaker) %}
<div class="common-card-style member-card talk-card">
<span class="avatar avatar-large">
<img class="avatar-frame" src="{{speaker_doc.picture}}" />
@@ -18,6 +20,6 @@
</div>
{%- if cta_link -%}
<div class="event-btn"><a href={{cta_link}} class="btn btn-primary ">Propose a Talk</a></div>
<div class="event-btn"><a href='/speaker-registration?event={{ event_ }}&user={{ frappe.session.user }}' class="btn btn-primary ">Propose a Talk</a></div>
{%- endif -%}
</div>

View File

@@ -23,12 +23,6 @@
"options": "Event Details",
"reqd": 0
},
{
"fieldname": "cta_link",
"fieldtype": "Data",
"label": "CTA Link",
"reqd": 0
},
{
"fieldname": "speaker_details",
"fieldtype": "Table Break",
@@ -44,7 +38,7 @@
}
],
"idx": 1,
"modified": "2021-08-19 16:06:45.811889",
"modified": "2021-08-20 10:59:54.965714",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Speaker Section",

View File

@@ -0,0 +1,40 @@
<div class="section-with-cards">
<div class="course-home-headings">{{title}}</div>
{%- if subtitle -%}
<p class="section-description">{{ subtitle }}</p>
{%- endif -%}
<div class="speaker-cards-parent">
{% for talk in talk_details %}
{% set talk_doc = frappe.get_doc('Talk', talk.talk, filters={
'event': event
}) %}
<div class="common-card-style talk-card">
<div class="course-image" style="background-image: url({{talk_doc.thumbnail}})">
<div class="course-tags"></div>
</div>
<div class="course-card-content">
<div class="course-card-meta muted-text">
<span> {{talk_doc.topic}} </span>
</div>
<div class="course-card-title">{{talk_doc.title}}</div>
<div class="card-divider"></div>
<div class="course-card-meta-2">
<a class="button-links" href="">
<span class="avatar avatar-small" title={{talk_doc.name_of_the_speaker}}>
<img class="avatar-frame standard-image" style="object-fit: cover" src="{{talk_doc.thumbnail}}"
title={{talk_doc.name_of_the_speaker}} />
</span>
</a>
<span class="course-instructor"> {{talk_doc.name_of_the_speaker}} </span>
<span class="small-title company-name"></span>
</div>
<div class="view-talk-link">
Vew Talk
<img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
</div>
<a class="stretched-link" href="{{talk_doc.url}}"></a>
</div>
</div>
{% endfor %}
</div>
</div>

View File

@@ -17,7 +17,6 @@
"reqd": 0
},
{
"__unsaved": 1,
"fieldname": "event",
"fieldtype": "Link",
"label": "Event",
@@ -31,20 +30,18 @@
"reqd": 0
},
{
"__islocal": 1,
"__unsaved": 1,
"fieldname": "previous_content",
"fieldname": "talk",
"fieldtype": "Link",
"label": "Previous Content",
"options": "Previous Content",
"label": "Talk",
"options": "Talk",
"reqd": 0
}
],
"idx": 1,
"modified": "2021-08-18 10:03:50.193908",
"modified": "2021-08-20 10:58:45.556636",
"modified_by": "Administrator",
"module": "Event Management",
"name": "Previous Talk",
"name": "Talk Section",
"owner": "Administrator",
"standard": 1,
"template": "",

View File

@@ -146,7 +146,7 @@ primary_rules = [
{"from_route": "/courses/<course>/about", "to_route": "batch/about"},
{"from_route": "/courses/<course>/progress", "to_route": "batch/progress"},
{"from_route": "/courses/<course>/join", "to_route": "batch/join"},
{"from_route": "/discussions/<discussion>", "to_route": "discussions/discussion"}
{"from_route": "/discussions/<discussion>", "to_route": "discussions/discussion"},
]
# Any frappe default URL is blocked by profile-rules, add it here to unblock it
@@ -174,7 +174,8 @@ whitelist = [
"/event",
"/hello",
"/exhibitor-registration",
"/discussions"
"/discussions",
"/propose-talk",
]
whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]

View File

@@ -1342,7 +1342,6 @@ a.talk-link {
}
.schedule-info{
/* display: none; */
padding: 20px;
}
@@ -1374,11 +1373,6 @@ a.talk-link {
object-fit: contain;
}
/* .schedule-container:hover > .schedule-info {
display: block;
transition: all 0.3s ease-in-out;
} */
.info-speaker-avatar {
display: flex;
text-align: left;
@@ -1394,9 +1388,6 @@ a.talk-link {
object-fit: contain;
}
.hide{
display: none;
}
.thread-card {
flex-direction: column;
padding: 1.5rem;