feat: added get_profile_url function to get the profile url in templates

This takes care of generating the correct profile URL depending on the
`profile_url_prefix` setting.

Issue #192

README.md

@@ -63,7 +63,7 @@ To setup the repository locally follow the steps mentioned below:
 1. Run bench get-app https://github.com/fossunited/community.
 1. Run bench --site community.test install-app community.
 1. Map your site to localhost with the command ```bench --site community.test add-to-hosts```
-1. Now open the URL http://community.test:8000/docs in your browser, you should see the app running.
+1. Now open the URL http://community.test:8000/ in your browser, you should see the app running.
 
 ### Contribution Guidelines (for The Hard Way)
 

community/community/doctype/discussion_message/discussion_message.js

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

community/community/doctype/discussion_message/discussion_message.py

@@ -1,22 +0,0 @@
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe.model.document import Document
-from community.widgets import Widget, Widgets
-
-class DiscussionMessage(Document):
-    def after_insert(self):
-        data = {
-            "message": self,
-            "widgets": Widgets()
-        }
-        template = frappe.render_template("community/templates/message_card.html", data)
-        thread_info = frappe.db.get_value("Discussion Thread", self.thread, ["reference_doctype", "reference_docname"], as_dict=True)
-        frappe.publish_realtime(event="publish_message",
-                                message = {
-                                    "thread": self.thread,
-                                    "template": template,
-                                    "thread_info": thread_info
-                                },
-                                after_commit=True)

community/community/doctype/discussion_message/test_discussion_message.py

@@ -1,8 +0,0 @@
-# Copyright (c) 2021, FOSS United and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-class TestDiscussionMessage(unittest.TestCase):
-	pass

community/community/doctype/discussion_reply/discussion_reply.js

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

community/community/doctype/discussion_reply/discussion_reply.json

@@ -5,49 +5,31 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "thread",
+  "topic",
-  "column_break_2",
+  "reply"
-  "parent_message",
-  "section_break_4",
-  "message"
  ],
  "fields": [
   {
-   "fieldname": "message",
+   "fieldname": "reply",
    "fieldtype": "Long Text",
    "in_list_view": 1,
-   "label": "Message"
+   "label": "Reply"
   },
   {
-   "fieldname": "thread",
+   "fieldname": "topic",
    "fieldtype": "Link",
    "in_list_view": 1,
    "in_standard_filter": 1,
-   "label": "Thread",
+   "label": "Topic",
-   "options": "Discussion Thread"
+   "options": "Discussion Topic"
-  },
-  {
-   "fieldname": "column_break_2",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "parent_message",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Parent Message",
-   "options": "Discussion Message"
-  },
-  {
-   "fieldname": "section_break_4",
-   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-12 15:59:04.811286",
+ "modified": "2021-08-27 15:06:51.362714",
  "modified_by": "Administrator",
  "module": "Community",
- "name": "Discussion Message",
+ "name": "Discussion Reply",
  "owner": "Administrator",
  "permissions": [
   {

community/community/doctype/discussion_reply/discussion_reply.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
+from community.widgets import Widgets
+
+class DiscussionReply(Document):
+    def after_insert(self):
+        data = {
+            "reply": self,
+            "topic": {
+                "name": self.topic
+            },
+            "widgets": Widgets()
+        }
+        template = frappe.render_template("community/templates/discussions/reply_card.html", data)
+        topic_info = frappe.get_all("Discussion Topic", {"name": self.topic}, ["reference_doctype", "reference_docname", "name", "title", "owner", "creation"])
+        sidebar = frappe.render_template("community/templates/discussions/sidebar.html", { "topic": topic_info[0], "widgets": Widgets() })
+        new_topic_template = frappe.render_template("community/templates/discussions/reply_section.html", { "topics": topic_info, "widgets": Widgets() })
+
+        frappe.publish_realtime(event="publish_message",
+                                message = {
+                                    "template": template,
+                                    "topic_info": topic_info[0],
+                                    "sidebar": sidebar,
+                                    "new_topic_template": new_topic_template
+                                },
+                                after_commit=True)

community/community/doctype/discussion_reply/test_discussion_reply.py

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

community/community/doctype/discussion_thread/discussion_thread.py

@@ -1,48 +0,0 @@
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe.model.document import Document
-
-class DiscussionThread(Document):
-    pass
-
-@frappe.whitelist()
-def submit_discussion(doctype, docname, message, title=None, thread_name=None):
-    thread = []
-    filters = {}
-    if doctype and docname:
-        filters = {
-                    "reference_doctype": doctype,
-                    "reference_docname": docname
-                }
-
-    elif thread_name:
-        filters = {
-            "name": thread_name
-        }
-
-    if filters:
-        thread = frappe.get_all("Discussion Thread",filters)
-    if len(thread):
-        thread = thread[0]
-        save_message(message, thread)
-
-    else:
-        thread = frappe.get_doc({
-                    "doctype": "Discussion Thread",
-                    "title": title,
-                    "reference_doctype": doctype,
-                    "reference_docname": docname
-                })
-        thread.save(ignore_permissions=True)
-        save_message(message, thread)
-
-    return thread.name
-
-def save_message(message, thread):
-        frappe.get_doc({
-            "doctype": "Discussion Message",
-            "message": message,
-            "thread": thread.name
-        }).save(ignore_permissions=True)

community/community/doctype/discussion_topic/discussion_topic.js

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

community/community/doctype/discussion_topic/discussion_topic.json

@@ -33,7 +33,7 @@
  "modified": "2021-08-11 12:29:43.564123",
  "modified_by": "Administrator",
  "module": "Community",
- "name": "Discussion Thread",
+ "name": "Discussion Topic",
  "owner": "Administrator",
  "permissions": [
   {
@@ -54,4 +54,4 @@
  "sort_order": "DESC",
  "title_field": "title",
  "track_changes": 1
-}
+}

community/community/doctype/discussion_topic/discussion_topic.py

@@ -0,0 +1,35 @@
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.model.document import Document
+
+class DiscussionTopic(Document):
+    pass
+
+@frappe.whitelist()
+def submit_discussion(doctype, docname, reply, title, topic_name=None):
+    if topic_name:
+        save_message(reply, topic_name)
+        return topic_name
+
+    topic = frappe.get_doc({
+                "doctype": "Discussion Topic",
+                "title": title,
+                "reference_doctype": doctype,
+                "reference_docname": docname
+            })
+    topic.save(ignore_permissions=True)
+    save_message(reply, topic.name)
+    return topic.name
+
+def save_message(reply, topic):
+    frappe.get_doc({
+        "doctype": "Discussion Reply",
+        "reply": reply,
+        "topic": topic
+    }).save(ignore_permissions=True)
+
+@frappe.whitelist()
+def get_docname(route):
+    return frappe.db.get_value("Web Page", {"route": route}, ["name"])

community/community/doctype/discussion_topic/test_discussion_topic.py

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

community/community/web_template/discussions/discussions.html

@@ -0,0 +1,2 @@
+{% set docname = frappe.db.get_value("Web Page", {"route": ""}, ["name"])%}
+{{ widgets.DiscussionMessage(doctype="Web Page", docname=docname) }}

community/community/web_template/discussions/discussions.json

@@ -0,0 +1,17 @@
+{
+ "__islocal": true,
+ "__unsaved": 1,
+ "creation": "2021-08-30 12:42:31.550200",
+ "docstatus": 0,
+ "doctype": "Web Template",
+ "fields": [],
+ "idx": 0,
+ "modified": "2021-08-30 12:42:31.550200",
+ "modified_by": "Administrator",
+ "module": "Community",
+ "name": "Discussions",
+ "owner": "Administrator",
+ "standard": 1,
+ "template": "",
+ "type": "Section"
+}

community/community/widgets/Avatar.html

@@ -1,5 +1,5 @@
 {% set color = member.get_palette() %}
-<a class="button-links" href="/{{member.username}}">
+<a class="button-links" href="{{ get_profile_url(member.username) }}">
   <span class="avatar {{ avatar_class }}" title="{{ member.full_name }}">
     {% if member.user_image %}
     <img class="avatar-frame standard-image" style="object-fit: cover;" src="{{ member.user_image }}" title="{{ member.full_name }}">

community/community/widgets/CommentBox.html

@@ -0,0 +1,28 @@
+<form class="discussion-form">
+
+  <div class="form-group">
+    <div class="control-input-wrapper">
+      <div class="control-input">
+        <input type="text" autocomplete="off" class="input-with-feedback form-control topic-title" data-fieldtype="Data"
+          data-fieldname="feedback_comments" placeholder="Title" spellcheck="false"></input>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <div class="control-input-wrapper">
+      <div class="control-input">
+        <textarea type="text" autocomplete="off" class="input-with-feedback form-control comment-field"
+          data-fieldtype="Text" data-fieldname="feedback_comments" placeholder="Enter a comment..."
+          spellcheck="false"></textarea>
+      </div>
+    </div>
+  </div>
+
+  <div class="comment-footer">
+    <div class="button is-default pull-right mb-5 submit-discussion" data-doctype="{{ doctype | urlencode }}"
+      data-docname="{{ docname | urlencode }}">
+      Post</div>
+  </div>
+
+</form>

community/community/widgets/DiscussionComment.html

@@ -1,70 +0,0 @@
-<div class="discussions">
-
-  <form class="discussion-form {% if doctype or thread %} discussion-on-page {% endif %}" id="discussion-form">
-
-
-    <div class="form-group" {% if title or thread %} style="display: none;" {% endif %}>
-      <div class="control-input-wrapper">
-        <div class="control-input">
-          <input type="text" autocomplete="off" class="input-with-feedback form-control thread-title"
-            data-fieldtype="Data" data-fieldname="feedback_comments" placeholder="Title" spellcheck="false" {% if title
-            %} value="{{ title }}" {% endif %}></input>
-        </div>
-      </div>
-    </div>
-
-    <div class="form-group">
-      <div class="control-input-wrapper">
-        <div class="control-input">
-          <textarea type="text" autocomplete="off" class="input-with-feedback form-control comment-field"
-            data-fieldtype="Text" data-fieldname="feedback_comments" placeholder="Enter a comment..."
-            spellcheck="false"></textarea>
-        </div>
-      </div>
-    </div>
-    <div class="comment-footer">
-      <div class="button is-secondary pull-right" id="submit-discussion"
-        {% if doctype %} data-doctype="{{ doctype | urlencode}}" {% endif %}
-        {% if docname %} data-docname="{{ docname | urlencode}}" {% endif %}
-        {% if thread %} data-thread="{{ thread }}" {% endif %}>
-        Post</div>
-    </div>
-  </form>
-</div>
-<script>
-  frappe.ready(() => {
-    $("#submit-discussion").click((e) => {
-      submit_discussion(e);
-    })
-  })
-
-  var submit_discussion = (e) => {
-    var message = $(".comment-field").val().trim();
-
-    if (message) {
-      var doctype = $(e.currentTarget).attr("data-doctype");
-      doctype = doctype ? decodeURIComponent(doctype) : doctype;
-
-      var docname = $(e.currentTarget).attr("data-docname");
-      docname = docname ? decodeURIComponent(docname) : docname;
-
-      frappe.call({
-      method: "community.community.doctype.discussion_thread.discussion_thread.submit_discussion",
-      args: {
-        "doctype": doctype ? doctype : "",
-        "docname": docname ? docname : "",
-        "message": $(".comment-field").val(),
-        "title": $(".thread-title").val(),
-        "thread_name": $(e.currentTarget).attr("data-thread")
-      },
-      callback: (data) => {
-        if (! $(".discussion-on-page").length) {
-          $("#discussion-modal").modal("hide");
-          window.location.href = `/discussions/${data.message}`;
-        }
-      }
-    })
-
-    }
-  }
-</script>

community/community/widgets/DiscussionMessage.html

@@ -1,80 +1,54 @@
-{% if doctype and docname and not thread %}
+{% set topics = frappe.get_all("Discussion Topic",
+{"reference_doctype": doctype, "reference_docname": docname}, ["name", "title", "owner", "creation"]) %}
 
-{% set thread_info = frappe.get_all("Discussion Thread", {"reference_doctype": doctype, "reference_docname": docname},
+{% include "community/templates/discussions/topic_modal.html" %}
-["name"]) %}
 
-{% if thread_info | length %}
+<div class="discussions-parent">
-{% set thread = thread_info[0].name %}
+  <div class="discussions-header">
+    <span class="course-home-headings">{{_('Discussions')}}</span>
+    {% if topics %}
+    {% include "community/templates/discussions/button.html" %}
+    {% endif %}
+  </div>
+
+  {% if topics %}
+  <div class="common-card-style thread-card course-content-parent" data-doctype="{{ doctype }}"
+    data-docname="{{ docname }}">
+
+    <div class="discussions-sidebar">
+      {% include "community/templates/discussions/search.html" %}
+      {% for topic in topics %}
+      {% set replies = frappe.get_all("Discussion Reply", {"topic": topic.name})%}
+      {% include "community/templates/discussions/sidebar.html" %}
+      {% endfor %}
+    </div>
+
+    <div class="mr-2" id="discussion-group">
+      {% include "community/templates/discussions/reply_section.html" %}
+    </div>
+  </div>
+  {% else %}
+
+  <div id="no-discussions" class="common-card-style thread-card">
+    <div class="no-discussions">
+      <div class="font-weight-bold">No Discussions</div>
+      <div class="muted-text mt-3 mb-3">There are no discussions for this {{ doctype | lower }}, why don't you start
+        one! </div>
+      {% if frappe.session.user == "Guest" %}
+      <div class="button is-primary mt-3" id="login-from-discussion">Log In</div>
+      {% elif not condition %}
+      <div class="button is-primary mt-3" id="login-from-discussion" data-redirect="{{ redirect_to }}">
+        {{ button_name }}
+      </div>
+      {% else %}
+      {% include "community/templates/discussions/button.html" %}
+      {% endif %}
+    </div>
+  </div>
+</div>
 {% endif %}
-
-{% endif %}
-
-{% if thread %}
-{% set messages = frappe.get_all("Discussion Message", {"thread": thread}, ["name", "message", "owner", "creation"],
-order_by="creation") %}
-{% endif %}
-
-{% if doctype %}
-<div class="course-home-headings mt-5"> Discussions </div>
-{% endif %}
-
-<div class="messages mt-5">
-  {% for message in messages %}
-    {% include "community/templates/message_card.html" %}
-  {% endfor %}
 </div>
 
-{% if frappe.session.user == "Guest" or (condition is defined and not condition) %}
+{% block script %}
-<div class="d-flex flex-column align-items-center font-weight-bold">
+<script>{% include "community/templates/discussions/discussions.js" %}</script>
-  Want to join the discussion?
+{% endblock %}
-  {% if frappe.session.user == "Guest" %}
-  <div class="button is-primary" id="login-from-discussion">Log In</div>
-  {% elif not condition %}
-  <div class="button is-primary" id="login-from-discussion" data-redirect="{{ redirect_to }}">{{ button_name }}</div>
-  {% endif %}
-</div>
-{% else %}
-{{ widgets.DiscussionComment(doctype=doctype, docname=docname, title=title, thread=thread ) }}
-{% endif %}
-
-<script>
-  frappe.ready(() => {
-    setup_socket_io();
-
-    $("#login-from-discussion").click((e) => {
-      login_from_discussion(e);
-    })
-
-  })
-
-  var setup_socket_io = () => {
-    const assets = [
-      "/assets/frappe/js/lib/socket.io.min.js",
-      "/assets/frappe/js/frappe/socketio_client.js",
-    ]
-    frappe.require(assets, () => {
-
-      if (window.dev_server) {
-        frappe.boot.socketio_port = "9000";
-      }
-
-      frappe.socketio.init(9000);
-      var target = $("#submit-discussion");
-
-      frappe.socketio.socket.on("publish_message", (data) => {
-        if (target.attr("data-thread") == data.thread
-          || (decodeURIComponent(target.attr("data-doctype")) == data.thread_info.reference_doctype
-              && decodeURIComponent(target.attr("data-docname")) == data.thread_info.reference_docname)) {
-          $(".comment-field").val("");
-          $(".messages").append(data.template);
-        }
-      })
-    })
-  }
-
-  var login_from_discussion = (e) => {
-    var redirect = $(e.currentTarget).attr("data-redirect") || window.location.href;
-    window.location.href = `/login?redirect-to=${redirect}`;
-  }
-
-</script>

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,
+				}
+			};
+		});
+	}
+});

community/event_management/doctype/attendee/attendee.json

@@ -5,40 +5,15 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "attendee_info_section",
+  "user",
-  "name1",
+  "full_name",
-  "email",
+  "column_break_3",
-  "phone_number",
-  "occupation",
   "company",
+  "is_paid",
+  "section_break_6",
   "what_are_you_hoping_to_learn"
  ],
  "fields": [
-  {
-   "fieldname": "attendee_info_section",
-   "fieldtype": "Section Break",
-   "label": "Attendee Info"
-  },
-  {
-   "fieldname": "name1",
-   "fieldtype": "Data",
-   "label": "Name"
-  },
-  {
-   "fieldname": "email",
-   "fieldtype": "Data",
-   "label": "Email"
-  },
-  {
-   "fieldname": "phone_number",
-   "fieldtype": "Data",
-   "label": "Phone Number"
-  },
-  {
-   "fieldname": "occupation",
-   "fieldtype": "Data",
-   "label": "Occupation"
-  },
   {
    "fieldname": "company",
    "fieldtype": "Data",
@@ -47,15 +22,42 @@
   {
    "fieldname": "what_are_you_hoping_to_learn",
    "fieldtype": "Text",
-   "label": "What are you hoping to learn"
+   "label": "What are you hoping to learn?"
+  },
+  {
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "label": "User",
+   "options": "User"
+  },
+  {
+   "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-11 10:07:53.262504",
+ "modified": "2021-08-20 17:03:09.741997",
  "modified_by": "Administrator",
  "module": "Event Management",
- "name": "Attendee Registration",
+ "name": "Attendee",
  "owner": "Administrator",
  "permissions": [
   {
@@ -73,5 +75,6 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
+ "title_field": "user",
  "track_changes": 1
 }

community/event_management/doctype/attendee/attendee.py

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

community/event_management/doctype/attendee/test_attendee.py

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

community/event_management/doctype/attendee_registration/attendee_registration.js

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

community/event_management/doctype/attendee_registration/test_attendee_registration.py

@@ -1,8 +0,0 @@
-# Copyright (c) 2021, FOSS United and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-class TestAttendeeRegistration(unittest.TestCase):
-	pass

community/event_management/doctype/event_ticket/event_ticket.json

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

community/event_management/doctype/exhibitor/exhibitor.js

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

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
+}

community/event_management/doctype/exhibitor/exhibitor.py

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

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

community/event_management/doctype/exhibitor_registration/exhibitor_registration.js

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

community/event_management/doctype/exhibitor_registration/exhibitor_registration.json

@@ -1,54 +0,0 @@
-{
- "actions": [],
- "autoname": "Exhibitor-Regis-.####.",
- "creation": "2021-08-16 16:26:46.189119",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "full_name",
-  "company",
-  "logo"
- ],
- "fields": [
-  {
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "label": "Full Name"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Data",
-   "label": "Company "
-  },
-  {
-   "fieldname": "logo",
-   "fieldtype": "Attach Image",
-   "label": "Logo"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-08-18 20:08:31.591935",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Exhibitor Registration",
- "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
-}

community/event_management/doctype/exhibitor_registration/test_exhibitor_registration.py

@@ -1,8 +0,0 @@
-# Copyright (c) 2021, FOSS United and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-class TestExhibitorRegistration(unittest.TestCase):
-	pass

community/event_management/doctype/host/host.json

@@ -1,15 +1,13 @@
 {
  "actions": [],
- "autoname": "field:full_name",
  "creation": "2021-08-11 10:51:47.234690",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "event",
-  "full_name",
+  "user",
-  "user_image",
+  "full_name"
-  "title"
  ],
  "fields": [
   {
@@ -18,29 +16,22 @@
    "label": "Event",
    "options": "Event Details"
   },
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title"
-  },
   {
    "fieldname": "full_name",
    "fieldtype": "Data",
    "in_list_view": 1,
    "label": "Full Name",
-   "reqd": 1,
    "unique": 1
   },
   {
-   "fieldname": "user_image",
+   "fieldname": "user",
-   "fieldtype": "Attach Image",
+   "fieldtype": "Data",
-   "label": "Image"
+   "label": "User"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-11 23:54:17.790263",
+ "modified": "2021-08-20 17:03:26.733195",
  "modified_by": "Administrator",
  "module": "Event Management",
  "name": "Host",
@@ -61,5 +52,6 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
+ "title_field": "user",
  "track_changes": 1
 }

community/event_management/doctype/schedule/schedule.json

@@ -1,63 +0,0 @@
-{
- "actions": [],
- "autoname": "Schedule-.####",
- "creation": "2021-08-11 10:50:23.522178",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "event",
-  "speaker",
-  "slot"
- ],
- "fields": [
-  {
-   "fieldname": "speaker",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Speaker",
-   "options": "Speaker Registration",
-   "reqd": 1
-  },
-  {
-   "fieldname": "slot",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Slot",
-   "options": "Slot",
-   "reqd": 1
-  },
-  {
-   "fieldname": "event",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Event",
-   "options": "Event Details",
-   "reqd": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-08-18 09:46:18.694910",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Schedule",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

community/event_management/doctype/schedule/schedule.py

@@ -1,18 +0,0 @@
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe.model.document import Document
-
-class Schedule(Document):
-	def before_save(self):
-		exists = frappe.db.exists(
-            "Schedule",
-            {
-                "Event": self.event,
-                "slot": self.slot
-            },
-        )
-
-		if exists:
-			frappe.throw("Slot already Assigned")

community/event_management/doctype/slot/slot.json

@@ -1,69 +0,0 @@
-{
- "actions": [],
- "autoname": "format:SLOT-{date}-{start_time}",
- "creation": "2021-08-11 11:19:50.276917",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "event",
-  "date",
-  "start_time",
-  "end_time"
- ],
- "fields": [
-  {
-   "fieldname": "event",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Event",
-   "options": "Event Details",
-   "reqd": 1
-  },
-  {
-   "fieldname": "date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Date",
-   "reqd": 1
-  },
-  {
-   "fieldname": "start_time",
-   "fieldtype": "Time",
-   "in_list_view": 1,
-   "label": "Start Time",
-   "reqd": 1
-  },
-  {
-   "fieldname": "end_time",
-   "fieldtype": "Time",
-   "in_list_view": 1,
-   "label": "End Time",
-   "reqd": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-08-18 23:51:47.850435",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Slot",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

community/event_management/doctype/slot/slot.py

@@ -1,14 +0,0 @@
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe.model.document import Document
-from frappe.utils import getdate
-
-class Slot(Document):
-
-	def before_save(self):
-		event = frappe.get_doc("Event Details", self.event)
-		if getdate(self.date) < event.start_date or getdate(self.date) > event.end_date:
-			frappe.throw("Slot should be in Event's span") 
-

community/event_management/doctype/speaker/speaker.js

@@ -0,0 +1,14 @@
+// Copyright (c) 2021, FOSS United and contributors
+// 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,
+        }
+      };
+    });
+  }
+});

community/event_management/doctype/speaker/speaker.json

@@ -1,37 +1,41 @@
 {
  "actions": [],
- "autoname": "format:PRE-VID-BY-{name_of_the_speaker}-{####}",
+ "creation": "2021-08-11 10:37:32.124651",
- "creation": "2021-08-18 08:42:58.711932",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "event",
-  "title",
+  "company",
-  "name_of_the_speaker",
+  "column_break_8",
-  "url",
+  "user",
-  "thumbnail"
+  "full_name"
  ],
  "fields": [
   {
-   "fieldname": "title",
+   "fieldname": "user",
-   "fieldtype": "Data",
+   "fieldtype": "Link",
-   "label": "Title"
+   "in_list_view": 1,
+   "label": "User",
+   "options": "User"
   },
   {
-   "fieldname": "name_of_the_speaker",
+   "fetch_from": "user.full_name",
+   "fieldname": "full_name",
    "fieldtype": "Data",
-   "label": "Name of the Speaker"
+   "in_list_view": 1,
+   "label": "Full Name",
+   "read_only": 1
   },
   {
-   "fieldname": "url",
+   "fieldname": "company",
    "fieldtype": "Data",
-   "label": "Video Embed Link"
+   "in_list_view": 1,
+   "label": "Company"
   },
   {
-   "fieldname": "thumbnail",
+   "fieldname": "column_break_8",
-   "fieldtype": "Data",
+   "fieldtype": "Column Break"
-   "label": "Preview Image (Link)"
   },
   {
    "fieldname": "event",
@@ -42,10 +46,10 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-18 09:37:03.278439",
+ "modified": "2021-08-20 16:53:43.968260",
  "modified_by": "Administrator",
  "module": "Event Management",
- "name": "Previous Content",
+ "name": "Speaker",
  "owner": "Administrator",
  "permissions": [
   {
@@ -63,5 +67,6 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
+ "title_field": "user",
  "track_changes": 1
 }

community/event_management/doctype/speaker/speaker.py

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

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

community/event_management/doctype/speaker_registration/speaker_registration.js

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

community/event_management/doctype/speaker_registration/speaker_registration.json

@@ -1,149 +0,0 @@
-{
- "actions": [],
- "autoname": "SPEAKER-REGIS.####.",
- "creation": "2021-08-11 10:37:32.124651",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "speaker_info_section",
-  "full_name",
-  "email",
-  "phone_number",
-  "job_title",
-  "company",
-  "column_break_8",
-  "picture",
-  "bio",
-  "talk_info_section",
-  "topic",
-  "title",
-  "column_break_13",
-  "about",
-  "attachment",
-  "status"
- ],
- "fields": [
-  {
-   "fieldname": "speaker_info_section",
-   "fieldtype": "Section Break",
-   "label": "Speaker Info"
-  },
-  {
-   "fieldname": "email",
-   "fieldtype": "Data",
-   "label": "Email",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "phone_number",
-   "fieldtype": "Data",
-   "label": "Phone Number",
-   "unique": 1
-  },
-  {
-   "fieldname": "job_title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Job Title",
-   "reqd": 1
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Company",
-   "reqd": 1
-  },
-  {
-   "fieldname": "picture",
-   "fieldtype": "Attach Image",
-   "label": "Profile Image",
-   "reqd": 1
-  },
-  {
-   "fieldname": "bio",
-   "fieldtype": "Text",
-   "label": "Bio"
-  },
-  {
-   "fieldname": "talk_info_section",
-   "fieldtype": "Section Break",
-   "label": "Talk Info"
-  },
-  {
-   "fieldname": "topic",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Topic",
-   "options": "Delivery\nCloud\nCustomer Success\nMarketing\nDevelopment\nHR\nCustomer Stories",
-   "reqd": 1
-  },
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title",
-   "reqd": 1
-  },
-  {
-   "fieldname": "about",
-   "fieldtype": "Text",
-   "label": "About",
-   "reqd": 1
-  },
-  {
-   "fieldname": "attachment",
-   "fieldtype": "Attach",
-   "label": "Attachment"
-  },
-  {
-   "fieldname": "column_break_8",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "column_break_13",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "Applied",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Status",
-   "options": "Applied\nPending\nApproved\nRejected"
-  },
-  {
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Full Name",
-   "reqd": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-08-18 09:48:19.602309",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Speaker Registration",
- "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
-}

community/event_management/doctype/speaker_registration/speaker_registration.py

@@ -1,10 +0,0 @@
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe.model.document import Document
-
-class SpeakerRegistration(Document):
-	
-	def on_update(self):
-		pass

community/event_management/doctype/speaker_registration/test_speaker_registration.py

@@ -1,8 +0,0 @@
-# Copyright (c) 2021, FOSS United and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-class TestSpeakerRegistration(unittest.TestCase):
-	pass

community/event_management/doctype/talk/talk.js

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

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": "Attach",
+   "label": "Preview Image"
+  },
+  {
+   "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-24 16:47:34.557010",
+ "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
+}

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
+            })
+            speaker.save(ignore_permissions=True)
+            self.speaker = speaker.name

community/event_management/doctype/talk/test_talk.py

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

community/event_management/web_form/attendee_registration/attendee_registration.js

@@ -1,3 +1,11 @@
-frappe.ready(function() {
+frappe.ready(function () {
-	// bind events here
+	frappe.web_form.after_load = () => {
+		frappe.web_form.set_value("user", frappe.session.user);
+	  }
+	  
+	frappe.web_form.after_save = () => {
+		setTimeout(function () {
+			window.location.href = '/about';
+		  }, 2000);
+	}
 })

community/event_management/web_form/attendee_registration/attendee_registration.json

@@ -9,88 +9,43 @@
  "amount": 0.0,
  "amount_based_on_field": 0,
  "apply_document_permissions": 0,
- "button_label": "Register",
+ "button_label": "",
- "creation": "2021-08-11 10:08:24.418743",
+ "creation": "2021-08-19 15:26:56.594526",
- "doc_type": "Attendee Registration",
+ "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-18 11:35:06.067390",
+ "modified": "2021-08-24 19:57:25.516319",
  "modified_by": "Administrator",
  "module": "Event Management",
  "name": "attendee-registration",
  "owner": "Administrator",
  "payment_button_label": "Buy Now",
  "published": 1,
- "route": "event/conference2021/attendee-registration",
+ "route": "attendee-registration",
- "route_to_success_link": 0,
+ "route_to_success_link": 1,
  "show_attachments": 0,
  "show_in_grid": 0,
  "show_sidebar": 0,
  "sidebar_items": [],
- "success_url": "/event/conference20221",
+ "success_url": "/about",
  "title": "Attendee Registration",
  "web_form_fields": [
   {
    "allow_read_on_all_link_options": 0,
-   "fieldname": "attendee_info_section",
+   "default": "",
-   "fieldtype": "Section Break",
+   "fieldname": "user",
-   "hidden": 0,
-   "label": "Attendee Info",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "name1",
    "fieldtype": "Data",
    "hidden": 0,
-   "label": "Name",
+   "label": "User",
    "max_length": 0,
    "max_value": 0,
-   "read_only": 0,
+   "options": "User",
-   "reqd": 1,
+   "read_only": 1,
-   "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": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "phone_number",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Phone Number",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "occupation",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Occupation",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
    "reqd": 0,
    "show_in_filter": 0
   },
@@ -119,4 +74,4 @@
    "show_in_filter": 0
   }
  ]
-}
+}

community/event_management/web_form/exhibitor_registration/exhibitor_registration.js

@@ -1,3 +1,12 @@
-frappe.ready(function() {
+frappe.ready(function () {
-	// bind events here
+
-})
+  frappe.web_form.after_load = () => {
+    frappe.web_form.set_value("user", frappe.session.user);
+  }
+
+  frappe.web_form.after_save = () => {
+    setTimeout(function () {
+      window.location.href = '/about';
+    }, 2000);
+  }
+})

community/event_management/web_form/exhibitor_registration/exhibitor_registration.json

@@ -11,38 +11,40 @@
  "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-23 10:12:24.038572",
  "modified_by": "Administrator",
  "module": "Event Management",
  "name": "exhibitor-registration",
  "owner": "Administrator",
  "payment_button_label": "Buy Now",
  "published": 1,
- "route": "event/conference2021/exhibitor-registration",
+ "route": "exhibitor-registration",
  "route_to_success_link": 0,
  "show_attachments": 0,
  "show_in_grid": 0,
  "show_sidebar": 0,
  "sidebar_items": [],
- "success_url": "/exhibitor-registration",
+ "success_url": "",
  "title": "Exhibitor Registration",
  "web_form_fields": [
   {
    "allow_read_on_all_link_options": 0,
-   "fieldname": "full_name",
+   "fieldname": "user",
    "fieldtype": "Data",
    "hidden": 0,
-   "label": "Full Name",
+   "label": "User",
    "max_length": 0,
    "max_value": 0,
-   "read_only": 0,
+   "options": "User",
+   "read_only": 1,
    "reqd": 0,
    "show_in_filter": 0
   },
@@ -60,10 +62,10 @@
   },
   {
    "allow_read_on_all_link_options": 0,
-   "fieldname": "logo",
+   "fieldname": "description",
-   "fieldtype": "Attach Image",
+   "fieldtype": "Text Editor",
    "hidden": 0,
-   "label": "Logo",
+   "label": "Description",
    "max_length": 0,
    "max_value": 0,
    "read_only": 0,

community/event_management/web_form/purpose_a_talk/purpose_a_talk.js

@@ -0,0 +1,11 @@
+frappe.ready(function () {
+	frappe.web_form.after_load = () => {
+		frappe.web_form.set_value("user", frappe.session.user);
+	  }
+	  
+	frappe.web_form.after_save = () => {
+		setTimeout(function () {
+			window.location.href = '/about';
+		  }, 2000);
+	}
+})

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-24 19:57:06.806994",
+ "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": "thumbnail",
+   "fieldtype": "Attach",
+   "hidden": 0,
+   "label": "Preview Image",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "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
+  }
+ ]
+}

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

community/event_management/web_form/speaker_registration/speaker_registration.js

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

community/event_management/web_form/speaker_registration/speaker_registration.json

@@ -9,41 +9,55 @@
  "amount": 0.0,
  "amount_based_on_field": 0,
  "apply_document_permissions": 0,
- "button_label": "Submit",
+ "button_label": "Register",
- "creation": "2021-08-11 20:52:20.308925",
+ "creation": "2021-08-19 15:29:01.167930",
- "doc_type": "Speaker Registration",
+ "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,
- "introduction_text": "<div class=\"ql-editor read-mode\"><p><br></p></div>",
  "is_standard": 1,
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2021-08-18 20:00:46.756407",
+ "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": "event/conference2021/speaker-registration",
+ "route": "speaker-registration",
  "route_to_success_link": 1,
  "show_attachments": 0,
  "show_in_grid": 0,
  "show_sidebar": 0,
  "sidebar_items": [],
- "success_url": "/event/conference2021/about",
+ "success_url": "/speaker-registration",
  "title": "Speaker Registration",
  "web_form_fields": [
   {
    "allow_read_on_all_link_options": 0,
-   "fieldname": "speaker_info_section",
+   "fieldname": "event",
-   "fieldtype": "Section Break",
+   "fieldtype": "Link",
    "hidden": 0,
-   "label": "Speaker Info",
+   "label": "Event",
    "max_length": 0,
    "max_value": 0,
-   "read_only": 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
   },
@@ -56,42 +70,6 @@
    "max_length": 0,
    "max_value": 0,
    "read_only": 0,
-   "reqd": 1,
-   "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": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "phone_number",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Phone Number",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "job_title",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Job Title",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
    "reqd": 0,
    "show_in_filter": 0
   },
@@ -104,115 +82,8 @@
    "max_length": 0,
    "max_value": 0,
    "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "column_break_8",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "picture",
-   "fieldtype": "Attach Image",
-   "hidden": 0,
-   "label": "Picture",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "bio",
-   "fieldtype": "Text",
-   "hidden": 0,
-   "label": "Bio",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "talk_info_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "label": "Talk Info",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "topic",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "label": "Topic",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "Delivery\nCloud\nCustomer Success\nMarketing\nDevelopment\nHR\nCustomer Stories",
-   "read_only": 0,
    "reqd": 1,
    "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Title",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "column_break_13",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "about",
-   "fieldtype": "Data",
-   "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
   }
  ]
 }

community/event_management/web_template/exhibitor_section/exhibitor_section.html

@@ -1,20 +1,28 @@
 <div class="section-with-cards">
-  <div class="courses-header">
+  <h1 class="course-home-headings">{{title}}</h1>
-    <span>{{ title }}</span>
+  {%- if subtitle -%}
-    {% set cta_link = "/exhibitor-registration" if frappe.session.user != "Guest" else
+  <p class="section-description">{{ subtitle }}</p>
-    "/login?redirect_to=exhibitor-registration" %}
+  {%- endif -%}
-    <a href={{cta_link}} class="button is-primary pull-right">Become an Exhibitor</a>
+  <div>
-  </div>
+    <div class="mentors-section">
-  <div class="speaker-cards-parent">
+      {% for exhibitor in exhibitor_details %}
-    {% for exhibitor in exhibitor_details %}
+      {% set exhibitor_doc = frappe.db.get_value("Exhibitor", exhibitor.exhibitor, ["user", "company"], as_dict= True)
-    {% set exhibitor_doc = frappe.db.get_value("Exhibitor Registration", exhibitor.exhibitor, ["logo", "company"],
+      %}
-    as_dict=True) %}
+      {% set member = frappe.get_doc("User", exhibitor_doc.user) %}
-    <div class="common-card-style flex-column exhibitor-card">
+
-      <span>
+      <div class="common-card-style member-card">
-        <img class="standard-image company-logo" src="{{exhibitor_doc.logo}}" />
+        {{ widgets.Avatar(member=member, avatar_class="avatar-large")}}
-      </span>
+        <div class="small-title member-card-title">
-      <div class="font-weight-bold mt-5">{{exhibitor_doc.company}}</div>
+          {{ member.full_name }}
+        </div>
+        <div class="small-title">
+          {{exhibitor_doc.company}}
+        </div>
+        <a class="stretched-link" href=""></a>
+      </div>
+      {% endfor %}
     </div>
-    {% endfor %}
+    <div class="event-btn"><a href="/exhibitor-registration?new=1&user={{ frappe.session.user }}&event={{ event }}"
+        class="btn btn-primary ">Become an Exhibitor</a></div>
   </div>
 </div>

community/event_management/web_template/exhibitor_section/exhibitor_section.json

@@ -33,12 +33,12 @@
    "fieldname": "exhibitor",
    "fieldtype": "Link",
    "label": "Exhibitor",
-   "options": "Exhibitor Registration",
+   "options": "Exhibitor",
    "reqd": 0
   }
  ],
  "idx": 1,
- "modified": "2021-08-19 10:57:20.815230",
+ "modified": "2021-08-20 16:28:22.779057",
  "modified_by": "Administrator",
  "module": "Event Management",
  "name": "Exhibitor Section",

community/event_management/web_template/host_section/host_section.html

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

community/event_management/web_template/host_section/host_section.json

@@ -1,6 +1,6 @@
 {
  "__unsaved": 1,
- "creation": "2021-08-17 16:43:49.506200",
+ "creation": "2021-08-20 08:12:29.549625",
  "docstatus": 0,
  "doctype": "Web Template",
  "fields": [
@@ -8,7 +8,7 @@
    "fieldname": "title",
    "fieldtype": "Data",
    "label": "Title",
-   "reqd": 1
+   "reqd": 0
   },
   {
    "fieldname": "subtitle",
@@ -18,18 +18,24 @@
   },
   {
    "__unsaved": 1,
-   "fieldname": "event",
+   "fieldname": "hosts",
+   "fieldtype": "Table Break",
+   "label": "Hosts",
+   "reqd": 0
+  },
+  {
+   "fieldname": "host",
    "fieldtype": "Link",
-   "label": "Event",
+   "label": "Host",
-   "options": "Event Details",
+   "options": "Host",
-   "reqd": 1
+   "reqd": 0
   }
  ],
  "idx": 0,
- "modified": "2021-08-18 10:13:49.300196",
+ "modified": "2021-08-20 08:16:25.805456",
  "modified_by": "Administrator",
  "module": "Event Management",
- "name": "Schedule Section",
+ "name": "Host Section",
  "owner": "Administrator",
  "standard": 1,
  "template": "",

community/event_management/web_template/previous_talk/previous_talk.html

@@ -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('Previous Content', 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>

community/event_management/web_template/schedule_section/schedule_section.html

@@ -1,78 +0,0 @@
-{% 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) %}
-{% set slot_data = slot_data.setdefault(slot.date, []).append({
-"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 %}
-
-<div class="courses-header">{{title}}</div>
-<div class="common-page-style">
-	<div class="container">
-		<div class="course-content-parent">
-			<div class="course-details-outline">
-				<div class="course-home-outline">
-					<div class="coure-outline">
-						<div>
-							{% for day in slot_data %}
-							<div class="small-title chapter-title" data-target="#apps-sites-and-bench"
-								data-toggle="collapse" aria-expanded="false">
-								<img class="chapter-icon" src="/assets/community/icons/chevron-right.svg" />
-								{{day}}
-							</div>
-							<div class="card-divider"></div>
-						</div>
-						{% endfor %}
-					</div>
-				</div>
-				<div>
-					{% for day in slot_data %}
-					{% set outer_loop = loop %}
-					<div class="course-details-outline">
-						<div class="course-home-headings">{{day}}</div>
-						<div class="coure-outline">
-							{% for slot in slot_data[day] %}
-							<div class="schedule-container">
-								<div class="schedule-inner-container">
-									<span class="info-speaker-avatar">
-										<span class="info-avatar avatar avatar-small">
-											<img class="avatar-frame standard-image" src="{{slot.picture}}" />
-										</span>
-										<h6 class="info-speaker">{{slot.full_name}}</h6>
-									</span>
-									<div class="schedule-title">{{slot.title}}</div>
-									<div class="schedule-slot">
-										{{ frappe.format(slot.start_time, {'fieldtype': 'Time'})}} - {{
-										frappe.format(slot.end_time, {'fieldtype': 'Time'}) }}
-									</div>
-								<div class="chapter-title small-title" data-toggle="collapse" data-target="#slot-{{loop.index}}-{{outer_loop.index}}" aria-expanded="false" aria-controls="collapseExample">
-									<img class="chapter-icon" src="/assets/community/icons/chevron-right.svg">
-								</div>	
-							</div>
-							<div class="collapse" id="slot-{{loop.index}}-{{outer_loop.index}}">
-								<p class="schedule-info">{{slot.about}}</p>
-							</div>
-							<div class="card-divider"></div>
-							{% endfor %}
-						</div>
-					</div>
-					{% endfor %}
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-</div>

community/event_management/web_template/speaker_section/speaker_section.html

@@ -1,23 +1,30 @@
 <div class="section-with-cards">
-	<h1 class="course-home-headings">{{section_title}}</h1>
+  <h1 class="course-home-headings">{{section_title}}</h1>
-	<div class="speaker-cards-parent">
+  {%- if subtitle -%}
-		{% for speaker in speaker_details %}
+  <p class="section-description">{{ subtitle }}</p>
-			{% set speaker_doc = frappe.get_doc("Speaker Registration", speaker.speaker) %}
+  {%- endif -%}
+  <div class="mentors-section">
+    {% 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) %}
 
-			<div class="common-card-style member-card">
+    <div class="common-card-style member-card">
-				<span class="avatar avatar-large">
+      {{ widgets.Avatar(member=member, avatar_class="avatar-large") }}
-					<img class="avatar-frame" src="{{speaker_doc.picture}}" />
-				</span>
-				<div class="small-title talk-title mt-5">
-					{{ speaker_doc.full_name }}
-				</div>
-				<div class="small-title mt-5 bb">{{speaker_doc.job_title}}</div>
-				<div class="small-title company-name">{{speaker_doc.company}}</div>
-			</div>
-			{% endfor %}
 
-		</div>
+      <div class="small-title member-card-title">
-		{%- if cta_link -%}
+        {{ member.full_name }}
-		<div class="event-btn"><a href={{cta_link}} class="btn btn-primary ">Become a Speaker</a></div>
+      </div>
-		{%- endif -%}
+      <div class="small-title">
-	</div>
+        {{speaker_doc.company}}
+      </div>
+      <a class="stretched-link" href=""></a>
+    </div>
+    {% endfor %}
+  </div>
+
+  <div class="event-btn">
+    <a href='/propose-talk?new=1&event={{ event }}' class="btn btn-primary ">Propose a Talk</a>
+  </div>
+
+</div>

community/event_management/web_template/speaker_section/speaker_section.json

@@ -17,19 +17,12 @@
    "reqd": 0
   },
   {
-   "__unsaved": 1,
    "fieldname": "event_",
    "fieldtype": "Link",
    "label": "Event ",
    "options": "Event Details",
    "reqd": 0
   },
-  {
-   "fieldname": "cta_link",
-   "fieldtype": "Data",
-   "label": "CTA Link",
-   "reqd": 0
-  },
   {
    "fieldname": "speaker_details",
    "fieldtype": "Table Break",
@@ -40,12 +33,12 @@
    "fieldname": "speaker",
    "fieldtype": "Link",
    "label": "Speaker",
-   "options": "Speaker Registration",
+   "options": "Speaker",
    "reqd": 0
   }
  ],
  "idx": 1,
- "modified": "2021-08-18 10:06:03.032441",
+ "modified": "2021-08-20 10:59:54.965714",
  "modified_by": "Administrator",
  "module": "Event Management",
  "name": "Speaker Section",

community/event_management/web_template/talk_section/talk_section.html

@@ -0,0 +1,75 @@
+<div class="section-with-cards">
+  <div class="course-home-headings">{{title}}</div>
+  {%- if subtitle -%}
+  <p class="section-description">{{ subtitle }}</p>
+  {%- endif -%}
+  <div class="cards-parent">
+
+    {% for talk in talk_details %}
+
+    {% set talk_doc = frappe.db.get_value('Talk', talk.talk,
+    ["title", "category", "speaker", "url", "thumbnail", "date", "start_time", "end_time"], 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) %}
+
+    {% if talk_doc.thumbnail %}
+    {% set thumbnail = talk_doc.thumbnail %}
+    {% else %}
+    {% set video_id = talk_doc.url and talk_doc.url.split("/")[-1] %}
+    {% set thumbnail = video_id and "https://img.youtube.com/vi/" + video_id + "/maxresdefault.jpg" %}
+    {% endif %}
+
+    <div class="common-card-style flex-column">
+      <div class="course-image {% if not thumbnail %}default-image{% endif %}" {% if thumbnail %}
+        style="background-image: url( {{ thumbnail }} );" {% endif %}>
+        <div class="course-tags">
+          {% for tag in talk_doc.category.split(",") %}
+          <div class="course-card-pills">{{ tag }}</div>
+          {% endfor %}
+        </div>
+        {% if not thumbnail %}
+        <div class="default-image-text">{{ talk_doc.title[0] }}</div>
+        {% endif %}
+      </div>
+      <div class="course-card-content">
+        <div class="course-card-content"></div>
+        <div class="course-card-title">{{talk_doc.title}}</div>
+        <div class="muted-text mb-3">
+          {% if talk_doc.date %}
+          <span>
+            <img src="/assets/community/icons/calendar.svg">
+            {{ frappe.utils.format_date(talk_doc.date, "medium") }}
+          </span>
+          {% endif %}
+          <span class="pull-right">
+            {% if talk_doc.start_time %}
+            <span class="mr-3">
+              <b>From:</b>
+              {{ frappe.utils.format_time(talk_doc.start_time, "HH:mm") }}
+            </span>
+            {% endif %}
+            {% if talk_doc.end_time %}
+            <span>
+              <b>To:</b>
+              {{ frappe.utils.format_time(talk_doc.end_time, "HH:mm") }}
+            </span>
+            {% endif %}
+          </span>
+        </div>
+        <div class="card-divider"></div>
+        <div class="course-card-meta-2">
+          {{ widgets.Avatar(member=member, avatar_class="avatar-small")}}
+          <span class="course-instructor"> {{ member.full_name }} </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>

community/event_management/web_template/talk_section/talk_section.json

@@ -17,7 +17,6 @@
    "reqd": 0
   },
   {
-   "__unsaved": 1,
    "fieldname": "event",
    "fieldtype": "Link",
    "label": "Event",
@@ -31,20 +30,18 @@
    "reqd": 0
   },
   {
-   "__islocal": 1,
+   "fieldname": "talk",
-   "__unsaved": 1,
-   "fieldname": "previous_content",
    "fieldtype": "Link",
-   "label": "Previous Content",
+   "label": "Talk",
-   "options": "Previous Content",
+   "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": "",

community/hooks.py

@@ -85,7 +85,8 @@ web_include_css = "community.bundle.css"
 # Override standard doctype classes
 
 override_doctype_class = {
-	"User": "community.overrides.user.CustomUser"
+	"User": "community.overrides.user.CustomUser",
+	"Web Template": "community.overrides.web_template.CustomWebTemplate"
 }
 
 # Document Events
@@ -130,67 +131,31 @@ fixtures = ["Custom Field"]
 # auto_cancel_exempted_doctypes = ["Auto Repeat"]
 
 # Add all simple route rules here
-primary_rules = [
+website_route_rules = [
-    {"from_route": "/sketches/<sketch>", "to_route": "sketches/sketch"},
+	{"from_route": "/sketches/<sketch>", "to_route": "sketches/sketch"},
-    {"from_route": "/courses/<course>", "to_route": "courses/course"},
+	{"from_route": "/courses/<course>", "to_route": "courses/course"},
-    {"from_route": "/courses/<course>/<topic>", "to_route": "courses/topic"},
+	{"from_route": "/courses/<course>/<certificate>", "to_route": "courses/certificate"},
-    {"from_route": "/hackathons/<hackathon>", "to_route": "hackathons/hackathon"},
+	{"from_route": "/hackathons/<hackathon>", "to_route": "hackathons/hackathon"},
-    {"from_route": "/hackathons/<hackathon>/<project>", "to_route": "hackathons/project"},
+	{"from_route": "/hackathons/<hackathon>/<project>", "to_route": "hackathons/project"},
-    {"from_route": "/add-a-new-batch", "to_route": "add-a-new-batch"},
+	{"from_route": "/courses/<course>/learn", "to_route": "batch/learn"},
-    {"from_route": "/courses/<course>/home", "to_route": "batch/home"},
+	{"from_route": "/courses/<course>/learn/<int:chapter>.<int:lesson>", "to_route": "batch/learn"},
-    {"from_route": "/courses/<course>/learn", "to_route": "batch/learn"},
+	{"from_route": "/courses/<course>/progress", "to_route": "batch/progress"},
-    {"from_route": "/courses/<course>/learn/<int:chapter>.<int:lesson>", "to_route": "batch/learn"},
+	{"from_route": "/courses/<course>/join", "to_route": "batch/join"},
-    {"from_route": "/courses/<course>/schedule", "to_route": "batch/schedule"},
-    {"from_route": "/courses/<course>/members", "to_route": "batch/members"},
-    {"from_route": "/courses/<course>/discuss", "to_route": "batch/discuss"},
-    {"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"}
 ]
 
-# Any frappe default URL is blocked by profile-rules, add it here to unblock it
-whitelist = [
-    "/home",
-    "/login",
-    "/update-password",
-    "/update-profile",
-    "/third-party-apps",
-    "/website_script.js",
-    "/courses",
-    "/sketches",
-    "/admin",
-    "/socket.io",
-    "/hackathons",
-    "/dashboard",
-    "/join-request",
-    "/add-a-new-batch",
-    "/new-sign-up",
-    "/message",
-    "/about",
-    "/edit-profile",
-    "/attendee-registration",
-    "/speaker-registration",
-    "/event",
-    "/hello",
-    "/exhibitor-registration",
-    "/discussions"
-]
-whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]
-
-# regex rule to match all profiles
-profile_rules = [
-    {"from_route": "/<string(minlength=4):username>", "to_route": "profiles/profile"},
-]
-
-website_route_rules = primary_rules + whitelist_rules + profile_rules
-
 website_redirects = [
-    {"source": "/update-profile", "target": "/edit-profile"},
+	{"source": "/update-profile", "target": "/edit-profile"},
 ]
 
-update_website_context = 'community.widgets.update_website_context'
+update_website_context = [
-
+    'community.widgets.update_website_context',
+]
+jinja = {
+    "methods": [
+        "community.page_renderers.get_profile_url"
+    ],
+    "filters": []
+}
 ## Specify the additional tabs to be included in the user profile page.
 ## Each entry must be a subclass of community.community.plugins.ProfileTab
 # profile_tabs = []
@@ -209,4 +174,14 @@ community_markdown_macro_renderers = {
 	"Exercise": "community.plugins.exercise_renderer",
 	"Quiz": "community.plugins.quiz_renderer",
 	"YouTubeVideo": "community.plugins.youtube_video_renderer",
+    "Video": "community.plugins.video_renderer"
 }
+
+# page_renderer to manage profile pages
+page_renderer = [
+	"community.page_renderers.ProfileRedirectPage",
+	"community.page_renderers.ProfilePage"
+]
+
+# set this to "/" to have profiles on the top-level
+profile_url_prefix = "/users/"

community/lms/doctype/chapter/chapter.json

@@ -8,7 +8,9 @@
  "field_order": [
   "course",
   "title",
+  "column_break_3",
   "description",
+  "section_break_5",
   "lessons"
  ],
  "fields": [
@@ -16,11 +18,12 @@
    "fieldname": "title",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Title"
+   "label": "Title",
+   "reqd": 1
   },
   {
    "fieldname": "description",
-   "fieldtype": "Markdown Editor",
+   "fieldtype": "Small Text",
    "label": "Description"
   },
   {
@@ -28,13 +31,22 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Course",
-   "options": "LMS Course"
+   "options": "LMS Course",
+   "reqd": 1
   },
   {
    "fieldname": "lessons",
    "fieldtype": "Table",
    "label": "Lessons",
    "options": "Lessons"
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_5",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -45,7 +57,7 @@
    "link_fieldname": "chapter"
   }
  ],
- "modified": "2021-07-27 16:28:08.667964",
+ "modified": "2021-08-31 10:43:45.866864",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Chapter",

community/lms/doctype/exercise_submission/exercise_submission.py

@@ -3,11 +3,6 @@
 
 import frappe
 from frappe.model.document import Document
-from ..lesson.lesson import update_progress
 
 class ExerciseSubmission(Document):
-
+    pass
-    def after_insert(self):
-        course_details = frappe.get_doc("LMS Course", self.course)
-        if not (course_details.is_mentor(frappe.session.user) or frappe.flags.in_test):
-            update_progress(self.lesson)

community/lms/doctype/lesson/lesson.js

@@ -17,6 +17,15 @@ frappe.ui.form.on('Lesson', {
 	</div>
 </div>
 
+<div class="row mb-3">
+	<div class="col-sm-4">
+		Video
+	</div>
+	<div class="col-sm-4">
+		{{ Video("url_of_source") }}
+	</div>
+</div>
+
 <div class="row mb-3">
 	<div class="col-sm-4">
 		YouTube Video

community/lms/doctype/lesson/lesson.json

@@ -22,18 +22,21 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Chapter",
-   "options": "Chapter"
+   "options": "Chapter",
+   "reqd": 1
   },
   {
    "fieldname": "title",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Title"
+   "label": "Title",
+   "reqd": 1
   },
   {
    "fieldname": "body",
    "fieldtype": "Markdown Editor",
-   "label": "Body"
+   "label": "Body",
+   "reqd": 1
   },
   {
    "fieldname": "index_label",
@@ -67,7 +70,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-07-27 16:28:29.203624",
+ "modified": "2021-08-31 10:44:14.168257",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Lesson",

community/lms/doctype/lesson/lesson.py

@@ -8,7 +8,7 @@ from frappe.model.document import Document
 from ...md import markdown_to_html, find_macros
 
 class Lesson(Document):
-    def before_save(self):
+    def on_update(self):
         dynamic_documents = ["Exercise", "Quiz"]
         for section in dynamic_documents:
             self.update_lesson_name_in_document(section)
@@ -91,42 +91,5 @@ def save_progress(lesson, course, status):
             "lesson": lesson,
             "status": status,
         }).save(ignore_permissions=True)
-    return "OK"
+    course_details = frappe.get_doc("LMS Course", course)
-
+    return course_details.get_course_progress()
-def update_progress(lesson):
-    user = frappe.session.user
-    if not all_dynamic_content_submitted(lesson, user):
-        return
-    if frappe.db.exists("LMS Course Progress", {"lesson": lesson, "owner": user}):
-        course_progress = frappe.get_doc("LMS Course Progress", {"lesson": lesson, "owner": user})
-        course_progress.status = "Complete"
-        course_progress.save(ignore_permissions=True)
-
-def all_dynamic_content_submitted(lesson, user):
-    all_exercises_submitted = check_all_exercise_submission(lesson, user)
-    all_quiz_submitted = check_all_quiz_submitted(lesson, user)
-    return all_exercises_submitted and all_quiz_submitted
-
-def check_all_exercise_submission(lesson, user):
-    exercise_names = frappe.get_list("Exercise", {"lesson": lesson}, pluck="name", ignore_permissions=True)
-    if not len(exercise_names):
-        return True
-    query = {
-        "exercise": ["in", exercise_names],
-        "owner": user
-    }
-    if frappe.db.count("Exercise Submission", query) == len(exercise_names):
-        return True
-    return False
-
-def check_all_quiz_submitted(lesson, user):
-    quizzes = frappe.get_list("LMS Quiz", {"lesson": lesson}, pluck="name", ignore_permissions=True)
-    if not len(quizzes):
-        return True
-    query = {
-        "quiz": ["in", quizzes],
-        "owner": user
-    }
-    if frappe.db.count("LMS Quiz Submission", query) == len(quizzes):
-        return True
-    return False

community/lms/doctype/lessons/lessons.json

@@ -13,13 +13,14 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Lesson",
-   "options": "Lesson"
+   "options": "Lesson",
+   "reqd": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-07-27 16:53:52.732191",
+ "modified": "2021-08-31 10:44:42.048232",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Lessons",

community/lms/doctype/lms_batch/lms_batch.py

@@ -35,14 +35,6 @@ class LMSBatch(Document):
             filters['member_type'] = member_type
         return frappe.db.exists("LMS Batch Membership", filters)
 
-    def get_messages(self):
-        messages =  frappe.get_all("LMS Message", {"batch": self.name}, ["*"], order_by="creation")
-        for message in messages:
-            message.message = frappe.utils.md_to_html(message.message)
-            if message.author == frappe.session.user:
-                message.author_name = "You"
-                message.is_author = True
-        return messages
 
     def get_membership(self, email):
         """Returns the membership document of given user.

community/lms/doctype/lms_certification/lms_certification.js

@@ -0,0 +1,14 @@
+// Copyright (c) 2021, FOSS United and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('LMS Certification', {
+  onload: function (frm) {
+    frm.set_query("student", function (doc) {
+      return {
+        filters: {
+          "ignore_user_type": 1,
+        }
+      };
+    });
+  }
+});

community/lms/doctype/lms_certification/lms_certification.json

@@ -0,0 +1,70 @@
+{
+ "actions": [],
+ "creation": "2021-08-16 15:47:19.494055",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "student",
+  "issue_date",
+  "column_break_3",
+  "course",
+  "expiry_date"
+ ],
+ "fields": [
+  {
+   "fieldname": "student",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Student",
+   "options": "User"
+  },
+  {
+   "fieldname": "issue_date",
+   "fieldtype": "Date",
+   "label": "Issue Date"
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "course",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Course",
+   "options": "LMS Course"
+  },
+  {
+   "fieldname": "expiry_date",
+   "fieldtype": "Date",
+   "label": "Expiry Date"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-08-16 15:47:19.494055",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Certification",
+ "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
+}

community/lms/doctype/lms_certification/lms_certification.py

@@ -0,0 +1,45 @@
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.model.document import Document
+from frappe.utils import nowdate, add_years
+from frappe import _
+from frappe.utils.pdf import get_pdf
+
+class LMSCertification(Document):
+
+    def validate(self):
+        certificates = frappe.get_all("LMS Certification", {
+                            "student": self.student,
+                            "course": self.course,
+                            "expiry_date": [">", nowdate()]
+                        })
+        if len(certificates):
+            full_name = frappe.db.get_value("User", self.student, "full_name")
+            course_name = frappe.db.get_value("LMS Course", self.course, "title")
+            frappe.throw(_("There is already a valid certificate for user {0} for the course {1}").format(full_name, course_name))
+
+@frappe.whitelist()
+def create_certificate(course):
+    course_details = frappe.get_doc("LMS Course", course)
+    certificate = course_details.is_certified()
+
+    if certificate:
+        return certificate
+
+    else:
+        expires_after_yrs = int(course_details.expiry)
+        expiry_date = None
+        if expires_after_yrs:
+            expiry_date = add_years(nowdate(), expires_after_yrs)
+
+        certificate = frappe.get_doc({
+                            "doctype": "LMS Certification",
+                            "student": frappe.session.user,
+                            "course": course,
+                            "issue_date": nowdate(),
+                            "expiry_date": expiry_date
+                        })
+        certificate.save(ignore_permissions=True)
+        return certificate.name

community/lms/doctype/lms_certification/test_lms_certification.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2021, FOSS United and Contributors
+# See license.txt
+
+# import frappe
+import unittest
+
+class TestLMSCertification(unittest.TestCase):
+	pass

community/lms/doctype/lms_course/lms_course.js

@@ -4,6 +4,7 @@
 frappe.ui.form.on('LMS Course', {
 
   onload: function (frm) {
+
     frm.set_query("chapter", "chapters", function () {
       return {
         filters: {
@@ -11,6 +12,14 @@ frappe.ui.form.on('LMS Course', {
         }
       };
     });
+
+    frm.set_query("instructor", function (doc) {
+      return {
+        filters: {
+          "ignore_user_type": 1,
+        }
+      };
+    });
   }
 
 });

community/lms/doctype/lms_course/lms_course.json

@@ -18,14 +18,21 @@
   "video_link",
   "image",
   "column_break_3",
+  "instructor",
   "tags",
+  "section_break_7",
   "is_published",
+  "column_break_9",
   "upcoming",
+  "column_break_11",
   "disable_self_learning",
   "section_break_5",
   "short_introduction",
   "description",
-  "chapters"
+  "chapters",
+  "certification_section",
+  "enable_certification",
+  "expiry"
  ],
  "fields": [
   {
@@ -94,6 +101,46 @@
    "fieldtype": "Table",
    "label": "Chapters",
    "options": "Chapters"
+  },
+  {
+   "fieldname": "instructor",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Instructor",
+   "options": "User"
+  },
+  {
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break",
+   "label": "Course Settings"
+  },
+  {
+   "fieldname": "column_break_9",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_11",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "certification_section",
+   "fieldtype": "Section Break",
+   "label": "Certification"
+  },
+  {
+   "default": "0",
+   "fieldname": "enable_certification",
+   "fieldtype": "Check",
+   "label": "Enable Certification"
+  },
+  {
+   "default": "0",
+   "depends_on": "enable_certification",
+   "fieldname": "expiry",
+   "fieldtype": "Select",
+   "label": "Certification Expires After Years",
+   "options": "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -115,7 +162,7 @@
    "link_fieldname": "course"
   }
  ],
- "modified": "2021-07-28 19:01:50.677445",
+ "modified": "2021-08-25 11:04:57.211898",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

community/lms/doctype/lms_course/lms_course.py

@@ -144,6 +144,8 @@ class LMSCourse(Document):
         return batch_name and frappe.get_doc("LMS Batch", batch_name)
 
     def get_instructor(self):
+        if self.instructor:
+            return frappe.get_doc("User", self.instructor)
         return frappe.get_doc("User", self.owner)
 
     def get_chapters(self):
@@ -347,6 +349,16 @@ class LMSCourse(Document):
                 "next": numbers[index+1] if index+1 < len(numbers) else None
             }
 
+    def is_certified(self):
+        certificate = frappe.get_all("LMS Certification",
+                        {
+                            "student": frappe.session.user,
+                            "course": self.name
+                        })
+        if len(certificate):
+            return certificate[0].name
+        return
+
 @frappe.whitelist()
 def reindex_exercises(doc):
     course_data = json.loads(doc)

community/lms/doctype/lms_course_review/lms_course_review.json

@@ -26,13 +26,14 @@
    "fieldname": "course",
    "fieldtype": "Link",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Course",
    "options": "LMS Course"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-07-05 14:57:03.841430",
+ "modified": "2021-08-31 12:37:23.832131",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course Review",

community/lms/doctype/lms_quiz/lms_quiz.py

@@ -1,12 +1,10 @@
 # Copyright (c) 2021, FOSS United and contributors
 # For license information, please see license.txt
 
-from community.lms.doctype.lesson.lesson import update_progress
 import frappe
 from frappe.model.document import Document
 import json
 from frappe import _
-from ..lesson.lesson import update_progress
 
 class LMSQuiz(Document):
     def validate(self):

community/lms/doctype/lms_quiz_submission/lms_quiz_submission.json

@@ -13,6 +13,8 @@
   {
    "fieldname": "quiz",
    "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Quiz",
    "options": "LMS Quiz"
   },
@@ -25,12 +27,13 @@
   {
    "fieldname": "score",
    "fieldtype": "Data",
+   "in_list_view": 1,
    "label": "Score"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-06-07 14:19:54.958989",
+ "modified": "2021-08-26 12:24:15.973829",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz Submission",

community/lms/md.py

@@ -20,6 +20,7 @@ import markdown
 from markdown import Extension
 from markdown.inlinepatterns import InlineProcessor
 import xml.etree.ElementTree as etree
+import html as HTML
 
 def markdown_to_html(text):
     """Renders markdown text into html.
@@ -109,4 +110,5 @@ def sanitize_html(html, macro):
     classname = ""
     if macro == "YouTubeVideo":
         classname = "lesson-video"
+
     return "<div class='" + classname + "'>" + "\n".join(str(node) for node in nodes) + "</div>"

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 = `/profile_/${frappe.web_form.get_value(["username"])}`;
     })
   }
 })