fix: remove references to old styles in the hooks

Old styles were removed in #157, but a reference to it was hanging
around in the hooks.

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.json

@@ -1,69 +0,0 @@
-{
- "actions": [],
- "creation": "2021-08-11 10:59:38.597046",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "thread",
-  "column_break_2",
-  "parent_message",
-  "section_break_4",
-  "message"
- ],
- "fields": [
-  {
-   "fieldname": "message",
-   "fieldtype": "Long Text",
-   "in_list_view": 1,
-   "label": "Message"
-  },
-  {
-   "fieldname": "thread",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Thread",
-   "options": "Discussion Thread"
-  },
-  {
-   "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_by": "Administrator",
- "module": "Community",
- "name": "Discussion Message",
- "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/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_thread/discussion_thread.js

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

community/community/doctype/discussion_thread/discussion_thread.json

@@ -1,57 +0,0 @@
-{
- "actions": [],
- "creation": "2021-08-11 10:55:29.341674",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "title",
-  "reference_doctype",
-  "reference_docname"
- ],
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "label": "Title"
-  },
-  {
-   "fieldname": "reference_doctype",
-   "fieldtype": "Link",
-   "label": "Reference Doctype",
-   "options": "DocType"
-  },
-  {
-   "fieldname": "reference_docname",
-   "fieldtype": "Dynamic Link",
-   "label": "Reference Docname",
-   "options": "reference_doctype"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-08-11 12:29:43.564123",
- "modified_by": "Administrator",
- "module": "Community",
- "name": "Discussion Thread",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "search_fields": "title",
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "title",
- "track_changes": 1
-}

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_thread/test_discussion_thread.py

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

community/community/widgets/Avatar.html

@@ -1,5 +1,5 @@
 {% set color = member.get_palette() %}
-<a class="button-links" href="/user/{{member.username}}">
+<a href="/{{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/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 +0,0 @@
-{% if doctype and docname and not thread %}
-
-{% set thread_info = frappe.get_all("Discussion Thread", {"reference_doctype": doctype, "reference_docname": docname},
-["name"]) %}
-
-{% if thread_info | length %}
-{% set thread = thread_info[0].name %}
-{% 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) %}
-<div class="d-flex flex-column align-items-center font-weight-bold">
-  Want to join the discussion?
-  {% if frappe.session.user == "Guest" %}
-  <div class="button is-primary mt-5" id="login-from-discussion">Log In</div>
-  {% elif not condition %}
-  <div class="button is-primary mt-5" 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

@@ -1,14 +0,0 @@
-// 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.py

@@ -1,8 +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 Attendee(Document):
-	pass

community/event_management/doctype/attendee/test_attendee.py

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

community/event_management/doctype/event_details/event_details.js

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

community/event_management/doctype/event_details/event_details.json

@@ -1,68 +0,0 @@
-{
- "actions": [],
- "autoname": "field:event_name",
- "creation": "2021-08-11 10:05:41.072432",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "event_name",
-  "start_date",
-  "end_date",
-  "event_description"
- ],
- "fields": [
-  {
-   "fieldname": "event_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Event Name",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "start_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Start Date",
-   "reqd": 1
-  },
-  {
-   "fieldname": "end_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "End Date",
-   "reqd": 1
-  },
-  {
-   "fieldname": "event_description",
-   "fieldtype": "Markdown Editor",
-   "in_list_view": 1,
-   "label": "Event Description"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-08-18 23:51:30.432691",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Event Details",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

community/event_management/doctype/event_details/event_details.py

@@ -1,8 +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 EventDetails(Document):
-	pass

community/event_management/doctype/event_ticket/event_ticket.js

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

community/event_management/doctype/event_ticket/event_ticket.json

@@ -1,55 +0,0 @@
-{
- "actions": [],
- "creation": "2021-08-11 11:17:28.452289",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "event",
-  "ticket",
-  "attendee"
- ],
- "fields": [
-  {
-   "fieldname": "ticket",
-   "fieldtype": "Data",
-   "label": "Ticket"
-  },
-  {
-   "fieldname": "attendee",
-   "fieldtype": "Link",
-   "label": "attendee",
-   "options": "Attendee"
-  },
-  {
-   "fieldname": "event",
-   "fieldtype": "Link",
-   "label": "Event",
-   "options": "Event Details"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-08-20 13:38:28.688115",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Event Ticket",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

community/event_management/doctype/event_ticket/event_ticket.py

@@ -1,8 +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 EventTicket(Document):
-	pass

community/event_management/doctype/event_ticket/test_event_ticket.py

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

community/event_management/doctype/exhibitor/exhibitor.json

@@ -1,87 +0,0 @@
-{
- "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

@@ -1,8 +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 Exhibitor(Document):
-	pass

community/event_management/doctype/exhibitor/test_exhibitor.py

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

community/event_management/doctype/host/host.js

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

community/event_management/doctype/host/host.json

@@ -1,57 +0,0 @@
-{
- "actions": [],
- "creation": "2021-08-11 10:51:47.234690",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "event",
-  "user",
-  "full_name"
- ],
- "fields": [
-  {
-   "fieldname": "event",
-   "fieldtype": "Link",
-   "label": "Event",
-   "options": "Event Details"
-  },
-  {
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Full Name",
-   "unique": 1
-  },
-  {
-   "fieldname": "user",
-   "fieldtype": "Data",
-   "label": "User"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-08-20 17:03:26.733195",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Host",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "user",
- "track_changes": 1
-}

community/event_management/doctype/host/host.py

@@ -1,8 +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 Host(Document):
-	pass

community/event_management/doctype/host/test_host.py

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

community/event_management/doctype/speaker/speaker.js

@@ -1,14 +0,0 @@
-// 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,72 +0,0 @@
-{
- "actions": [],
- "creation": "2021-08-11 10:37:32.124651",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "event",
-  "company",
-  "column_break_8",
-  "user",
-  "full_name"
- ],
- "fields": [
-  {
-   "fieldname": "user",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "User",
-   "options": "User"
-  },
-  {
-   "fetch_from": "user.full_name",
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Full Name",
-   "read_only": 1
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Company"
-  },
-  {
-   "fieldname": "column_break_8",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "event",
-   "fieldtype": "Link",
-   "label": "Event",
-   "options": "Event Details"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-08-20 16:53:43.968260",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Speaker",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "user",
- "track_changes": 1
-}

community/event_management/doctype/speaker/speaker.py

@@ -1,8 +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 Speaker(Document):
-	pass

community/event_management/doctype/speaker/test_speaker.py

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

community/event_management/doctype/talk/talk.js

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

community/event_management/doctype/talk/talk.json

@@ -1,139 +0,0 @@
-{
- "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

@@ -1,29 +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 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

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

community/event_management/web_form/attendee_registration/attendee_registration.js

@@ -1,11 +0,0 @@
-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/attendee_registration/attendee_registration.json

@@ -1,77 +0,0 @@
-{
- "accept_payment": 0,
- "allow_comments": 0,
- "allow_delete": 0,
- "allow_edit": 0,
- "allow_incomplete": 0,
- "allow_multiple": 0,
- "allow_print": 0,
- "amount": 0.0,
- "amount_based_on_field": 0,
- "apply_document_permissions": 0,
- "button_label": "",
- "creation": "2021-08-19 15:26:56.594526",
- "custom_css": "[data-doctype=\"Web Form\"] {\n    max-width: 720px;\n    margin: 6rem auto;\n}",
- "doc_type": "Attendee",
- "docstatus": 0,
- "doctype": "Web Form",
- "idx": 0,
- "is_standard": 1,
- "login_required": 1,
- "max_attachment_size": 0,
- "modified": "2021-08-24 19:57:25.516319",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "attendee-registration",
- "owner": "Administrator",
- "payment_button_label": "Buy Now",
- "published": 1,
- "route": "attendee-registration",
- "route_to_success_link": 1,
- "show_attachments": 0,
- "show_in_grid": 0,
- "show_sidebar": 0,
- "sidebar_items": [],
- "success_url": "/about",
- "title": "Attendee Registration",
- "web_form_fields": [
-  {
-   "allow_read_on_all_link_options": 0,
-   "default": "",
-   "fieldname": "user",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "User",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "User",
-   "read_only": 1,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "company",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Company",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "what_are_you_hoping_to_learn",
-   "fieldtype": "Text",
-   "hidden": 0,
-   "label": "What are you hoping to learn",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  }
- ]
-}

community/event_management/web_form/attendee_registration/attendee_registration.py

@@ -1,5 +0,0 @@
-import frappe
-
-def get_context(context):
-	# do your magic here
-	pass

community/event_management/web_form/exhibitor_registration/exhibitor_registration.js

@@ -1,12 +0,0 @@
-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/exhibitor_registration/exhibitor_registration.json

@@ -1,76 +0,0 @@
-{
- "accept_payment": 0,
- "allow_comments": 0,
- "allow_delete": 0,
- "allow_edit": 0,
- "allow_incomplete": 0,
- "allow_multiple": 0,
- "allow_print": 0,
- "amount": 0.0,
- "amount_based_on_field": 0,
- "apply_document_permissions": 0,
- "button_label": "Save",
- "creation": "2021-08-16 16:27:06.566564",
- "custom_css": "[data-doctype=\"Web Form\"] {\n    max-width: 720px;\n    margin: 6rem auto;\n}",
- "doc_type": "Exhibitor",
- "docstatus": 0,
- "doctype": "Web Form",
- "idx": 0,
- "is_standard": 1,
- "login_required": 1,
- "max_attachment_size": 0,
- "modified": "2021-08-23 10:12:24.038572",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "exhibitor-registration",
- "owner": "Administrator",
- "payment_button_label": "Buy Now",
- "published": 1,
- "route": "exhibitor-registration",
- "route_to_success_link": 0,
- "show_attachments": 0,
- "show_in_grid": 0,
- "show_sidebar": 0,
- "sidebar_items": [],
- "success_url": "",
- "title": "Exhibitor Registration",
- "web_form_fields": [
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "user",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "User",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "User",
-   "read_only": 1,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "company",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Company ",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "label": "Description",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  }
- ]
-}

community/event_management/web_form/exhibitor_registration/exhibitor_registration.py

@@ -1,5 +0,0 @@
-import frappe
-
-def get_context(context):
-	# do your magic here
-	pass

community/event_management/web_form/purpose_a_talk/purpose_a_talk.js

@@ -1,11 +0,0 @@
-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

@@ -1,102 +0,0 @@
-{
- "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

@@ -1,5 +0,0 @@
-import frappe
-
-def get_context(context):
-	# do your magic here
-	pass

community/event_management/web_form/speaker_registration/speaker_registration.js

@@ -1,10 +0,0 @@
-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 = '/event/conference2021/propose-talk';
-		  }, 2000);
-	}
-})

community/event_management/web_form/speaker_registration/speaker_registration.json

@@ -1,89 +0,0 @@
-{
- "accept_payment": 0,
- "allow_comments": 0,
- "allow_delete": 0,
- "allow_edit": 0,
- "allow_incomplete": 0,
- "allow_multiple": 0,
- "allow_print": 0,
- "amount": 0.0,
- "amount_based_on_field": 0,
- "apply_document_permissions": 0,
- "button_label": "Register",
- "creation": "2021-08-19 15:29:01.167930",
- "custom_css": "[data-doctype=\"Web Form\"] {\n    max-width: 720px;\n    margin: 6rem auto;\n}",
- "doc_type": "Speaker",
- "docstatus": 0,
- "doctype": "Web Form",
- "idx": 0,
- "is_standard": 1,
- "login_required": 1,
- "max_attachment_size": 0,
- "modified": "2021-08-20 16:16:51.107177",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "speaker-registration",
- "owner": "Administrator",
- "payment_button_label": "Buy Now",
- "published": 1,
- "route": "speaker-registration",
- "route_to_success_link": 1,
- "show_attachments": 0,
- "show_in_grid": 0,
- "show_sidebar": 0,
- "sidebar_items": [],
- "success_url": "/speaker-registration",
- "title": "Speaker Registration",
- "web_form_fields": [
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "event",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "label": "Event",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "Event Details",
-   "read_only": 1,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "user",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "label": "User",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "User",
-   "read_only": 1,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Full Name",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "company",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Company",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  }
- ]
-}

community/event_management/web_form/speaker_registration/speaker_registration.py

@@ -1,5 +0,0 @@
-import frappe
-
-def get_context(context):
-	# do your magic here
-	pass

community/event_management/web_template/exhibitor_section/exhibitor_section.html

@@ -1,28 +0,0 @@
-<div class="section-with-cards">
-  <h1 class="course-home-headings">{{title}}</h1>
-  {%- if subtitle -%}
-  <p class="section-description">{{ subtitle }}</p>
-  {%- endif -%}
-  <div>
-    <div class="mentors-section">
-      {% for exhibitor in exhibitor_details %}
-      {% set exhibitor_doc = frappe.db.get_value("Exhibitor", exhibitor.exhibitor, ["user", "company"], as_dict= True)
-      %}
-      {% set member = frappe.get_doc("User", exhibitor_doc.user) %}
-
-      <div class="common-card-style member-card">
-        {{ widgets.Avatar(member=member, avatar_class="avatar-large")}}
-        <div class="small-title member-card-title">
-          {{ member.full_name }}
-        </div>
-        <div class="small-title">
-          {{exhibitor_doc.company}}
-        </div>
-        <a class="stretched-link" href=""></a>
-      </div>
-      {% endfor %}
-    </div>
-    <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

@@ -1,49 +0,0 @@
-{
- "__unsaved": 1,
- "creation": "2021-08-13 15:05:41.606772",
- "docstatus": 0,
- "doctype": "Web Template",
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "label": "Title",
-   "reqd": 0
-  },
-  {
-   "fieldname": "subtitle",
-   "fieldtype": "Data",
-   "label": "Subtitle",
-   "reqd": 0
-  },
-  {
-   "fieldname": "event",
-   "fieldtype": "Link",
-   "label": "Event",
-   "options": "Event Details",
-   "reqd": 0
-  },
-  {
-   "fieldname": "exhibitor_details",
-   "fieldtype": "Table Break",
-   "label": "Exhibitor Details",
-   "reqd": 0
-  },
-  {
-   "fieldname": "exhibitor",
-   "fieldtype": "Link",
-   "label": "Exhibitor",
-   "options": "Exhibitor",
-   "reqd": 0
-  }
- ],
- "idx": 1,
- "modified": "2021-08-20 16:28:22.779057",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Exhibitor Section",
- "owner": "Administrator",
- "standard": 1,
- "template": "",
- "type": "Section"
-}

community/event_management/web_template/host_section/host_section.html

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

community/event_management/web_template/host_section/host_section.json

@@ -1,43 +0,0 @@
-{
- "__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"
-}

community/event_management/web_template/speaker_section/speaker_section.html

@@ -1,30 +0,0 @@
-<div class="section-with-cards">
-  <h1 class="course-home-headings">{{section_title}}</h1>
-  {%- if subtitle -%}
-  <p class="section-description">{{ subtitle }}</p>
-  {%- 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">
-      {{ widgets.Avatar(member=member, avatar_class="avatar-large") }}
-
-      <div class="small-title member-card-title">
-        {{ member.full_name }}
-      </div>
-      <div class="small-title">
-        {{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

@@ -1,49 +0,0 @@
-{
- "__unsaved": 1,
- "creation": "2021-08-12 21:15:14.492000",
- "docstatus": 0,
- "doctype": "Web Template",
- "fields": [
-  {
-   "fieldname": "section_title",
-   "fieldtype": "Data",
-   "label": "Section Title",
-   "reqd": 1
-  },
-  {
-   "fieldname": "subtitle",
-   "fieldtype": "Data",
-   "label": "Subtitle",
-   "reqd": 0
-  },
-  {
-   "fieldname": "event_",
-   "fieldtype": "Link",
-   "label": "Event ",
-   "options": "Event Details",
-   "reqd": 0
-  },
-  {
-   "fieldname": "speaker_details",
-   "fieldtype": "Table Break",
-   "label": "Speaker Details",
-   "reqd": 0
-  },
-  {
-   "fieldname": "speaker",
-   "fieldtype": "Link",
-   "label": "Speaker",
-   "options": "Speaker",
-   "reqd": 0
-  }
- ],
- "idx": 1,
- "modified": "2021-08-20 10:59:54.965714",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Speaker Section",
- "owner": "Administrator",
- "standard": 1,
- "template": "",
- "type": "Section"
-}

community/event_management/web_template/talk_section/talk_section.html

@@ -1,75 +0,0 @@
-<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

@@ -1,49 +0,0 @@
-{
- "__unsaved": 1,
- "creation": "2021-08-13 11:34:07.611034",
- "docstatus": 0,
- "doctype": "Web Template",
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "label": "Title",
-   "reqd": 1
-  },
-  {
-   "fieldname": "subtitle",
-   "fieldtype": "Data",
-   "label": "Subtitle",
-   "reqd": 0
-  },
-  {
-   "fieldname": "event",
-   "fieldtype": "Link",
-   "label": "Event",
-   "options": "Event Details",
-   "reqd": 1
-  },
-  {
-   "fieldname": "talk_details",
-   "fieldtype": "Table Break",
-   "label": "Talk Details",
-   "reqd": 0
-  },
-  {
-   "fieldname": "talk",
-   "fieldtype": "Link",
-   "label": "Talk",
-   "options": "Talk",
-   "reqd": 0
-  }
- ],
- "idx": 1,
- "modified": "2021-08-20 10:58:45.556636",
- "modified_by": "Administrator",
- "module": "Event Management",
- "name": "Talk Section",
- "owner": "Administrator",
- "standard": 1,
- "template": "",
- "type": "Section"
-}

community/hooks.py

@@ -19,7 +19,6 @@ app_license = "AGPL"
 # app_include_js = "/assets/community/js/community.js"
 
 # include js, css files in header of web template
-web_include_css = "community.bundle.css"
 # web_include_css = "/assets/community/css/community.css"
 # web_include_js = "/assets/community/js/community.js"
 
@@ -85,8 +84,7 @@ 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
@@ -131,28 +129,57 @@ fixtures = ["Custom Field"]
 # auto_cancel_exempted_doctypes = ["Auto Repeat"]
 
 # Add all simple route rules here
-website_route_rules = [
+primary_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>/<certificate>", "to_route": "courses/certificate"},
+    {"from_route": "/courses/<course>/<topic>", "to_route": "courses/topic"},
-	{"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": "/dashboard", "to_route": ""},
-	{"from_route": "/courses/<course>/home", "to_route": "batch/home"},
+    {"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>/schedule", "to_route": "batch/schedule"},
+    {"from_route": "/courses/<course>/learn/<int:chapter>.<int:lesson>", "to_route": "batch/learn"},
-	{"from_route": "/courses/<course>/members", "to_route": "batch/members"},
+    {"from_route": "/courses/<course>/schedule", "to_route": "batch/schedule"},
-	{"from_route": "/courses/<course>/discuss", "to_route": "batch/discuss"},
+    {"from_route": "/courses/<course>/members", "to_route": "batch/members"},
-	{"from_route": "/courses/<course>/about", "to_route": "batch/about"},
+    {"from_route": "/courses/<course>/discuss", "to_route": "batch/discuss"},
-	{"from_route": "/courses/<course>/progress", "to_route": "batch/progress"},
+    {"from_route": "/courses/<course>/about", "to_route": "batch/about"},
-	{"from_route": "/courses/<course>/join", "to_route": "batch/join"},
+    {"from_route": "/courses/<course>/progress", "to_route": "batch/progress"},
-	{"from_route": "/discussions/<discussion>", "to_route": "discussions/discussion"},
+    {"from_route": "/courses/<course>/join", "to_route": "batch/join"}
-	{"from_route": "/user/<string(minlength=4):username>", "to_route": "profiles/profile"},
 ]
 
+# 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"
+]
+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'
@@ -175,5 +202,4 @@ 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"
 }

community/lms/doctype/chapter/chapter.js

@@ -2,15 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Chapter', {
+	// refresh: function(frm) {
 
-  onload: function (frm) {
+	// }
-    frm.set_query("lesson", "lessons", function () {
-      return {
-        filters: {
-          "chapter": frm.doc.name,
-        }
-      };
-    });
-  }
-
 });

community/lms/doctype/chapter/chapter.json

@@ -8,10 +8,9 @@
  "field_order": [
   "course",
   "title",
-  "column_break_3",
   "description",
-  "section_break_5",
+  "locked",
-  "lessons"
+  "index_"
  ],
  "fields": [
   {
@@ -22,9 +21,15 @@
   },
   {
    "fieldname": "description",
-   "fieldtype": "Small Text",
+   "fieldtype": "Markdown Editor",
    "label": "Description"
   },
+  {
+   "default": "0",
+   "fieldname": "locked",
+   "fieldtype": "Check",
+   "label": "Locked"
+  },
   {
    "fieldname": "course",
    "fieldtype": "Link",
@@ -33,18 +38,10 @@
    "options": "LMS Course"
   },
   {
-   "fieldname": "lessons",
+   "default": "1",
-   "fieldtype": "Table",
+   "fieldname": "index_",
-   "label": "Lessons",
+   "fieldtype": "Int",
-   "options": "Lessons"
+   "label": "Index"
-  },
-  {
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -55,7 +52,7 @@
    "link_fieldname": "chapter"
   }
  ],
- "modified": "2021-08-19 13:43:51.025072",
+ "modified": "2021-05-13 21:05:20.531890",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Chapter",

community/lms/doctype/chapter/chapter.py

@@ -5,6 +5,15 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
+from ...utils import slugify
 
 class Chapter(Document):
-    pass
+    def get_lessons(self):
+        rows = frappe.db.get_all("Lesson",
+            filters={"chapter": self.name},
+            fields='name',
+            order_by="index_")
+        return [frappe.get_doc('Lesson', row['name']) for row in rows]
+
+    def get_slugified_chapter_title(self):
+        return slugify(self.title)

community/lms/doctype/chapters/chapters.json

@@ -1,32 +0,0 @@
-{
- "actions": [],
- "creation": "2021-07-27 16:25:02.903245",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "chapter"
- ],
- "fields": [
-  {
-   "fieldname": "chapter",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Chapter",
-   "options": "Chapter",
-   "reqd": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2021-07-27 16:25:02.903245",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "Chapters",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

community/lms/doctype/chapters/chapters.py

@@ -1,8 +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 Chapters(Document):
-	pass

community/lms/doctype/exercise_submission/exercise_submission.py

@@ -3,6 +3,11 @@
 
 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,15 +17,6 @@ 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

@@ -10,6 +10,7 @@
   "include_in_preview",
   "column_break_4",
   "title",
+  "index_",
   "index_label",
   "section_break_6",
   "body",
@@ -30,6 +31,13 @@
    "in_list_view": 1,
    "label": "Title"
   },
+  {
+   "default": "1",
+   "fieldname": "index_",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Index"
+  },
   {
    "fieldname": "body",
    "fieldtype": "Markdown Editor",
@@ -67,7 +75,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-07-27 16:28:29.203624",
+ "modified": "2021-06-29 13:34:49.077363",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Lesson",

community/lms/doctype/lesson/lesson.py

@@ -91,5 +91,42 @@ def save_progress(lesson, course, status):
             "lesson": lesson,
             "status": status,
         }).save(ignore_permissions=True)
-    course_details = frappe.get_doc("LMS Course", course)
+    return "OK"
-    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

@@ -1,31 +0,0 @@
-{
- "actions": [],
- "creation": "2021-07-27 16:25:48.269536",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "lesson"
- ],
- "fields": [
-  {
-   "fieldname": "lesson",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Lesson",
-   "options": "Lesson"
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2021-07-27 16:53:52.732191",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "Lessons",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

community/lms/doctype/lessons/lessons.py

@@ -1,8 +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 Lessons(Document):
-	pass

community/lms/doctype/lms_batch/lms_batch.py

@@ -35,6 +35,14 @@ 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_batch_membership/lms_batch_membership.json

@@ -37,7 +37,6 @@
    "fieldname": "member_type",
    "fieldtype": "Select",
    "in_list_view": 1,
-   "in_standard_filter": 1,
    "label": "Member Type",
    "options": "\nStudent\nMentor\nStaff"
   },
@@ -45,6 +44,7 @@
    "default": "Member",
    "fieldname": "role",
    "fieldtype": "Select",
+   "in_standard_filter": 1,
    "label": "Role",
    "options": "\nMember\nAdmin"
   },
@@ -63,10 +63,9 @@
   {
    "fetch_from": "batch.course",
    "fieldname": "course",
-   "fieldtype": "Link",
+   "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Course",
+   "label": "Course"
-   "options": "LMS Course"
   },
   {
    "fieldname": "current_lesson",
@@ -84,7 +83,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-04 17:10:42.708479",
+ "modified": "2021-07-06 20:50:46.885325",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Membership",

community/lms/doctype/lms_certification/lms_certification.js

@@ -1,14 +0,0 @@
-// 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

@@ -1,70 +0,0 @@
-{
- "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

@@ -1,45 +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 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

@@ -1,8 +0,0 @@
-# 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

@@ -2,24 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('LMS Course', {
+	// refresh: function(frm) {
 
-  onload: function (frm) {
+	// }
-
-    frm.set_query("chapter", "chapters", function () {
-      return {
-        filters: {
-          "course": frm.doc.name,
-        }
-      };
-    });
-
-    frm.set_query("instructor", function (doc) {
-      return {
-        filters: {
-          "ignore_user_type": 1,
-        }
-      };
-    });
-  }
-
 });

community/lms/doctype/lms_course/lms_course.json

@@ -1,5 +1,11 @@
 {
  "actions": [
+  {
+   "action": "community.lms.doctype.lms_course.lms_course.reindex_lessons",
+   "action_type": "Server Action",
+   "group": "Reindex",
+   "label": "Reindex Lessons"
+  },
   {
    "action": "community.lms.doctype.lms_course.lms_course.reindex_exercises",
    "action_type": "Server Action",
@@ -15,24 +21,16 @@
  "engine": "InnoDB",
  "field_order": [
   "title",
+  "short_code",
   "video_link",
-  "image",
   "column_break_3",
-  "instructor",
-  "tags",
-  "section_break_7",
   "is_published",
-  "column_break_9",
-  "upcoming",
-  "column_break_11",
   "disable_self_learning",
+  "image",
   "section_break_5",
+  "tags",
   "short_introduction",
-  "description",
+  "description"
-  "chapters",
-  "certification_section",
-  "enable_certification",
-  "expiry"
  ],
  "fields": [
   {
@@ -55,6 +53,11 @@
    "fieldtype": "Check",
    "label": "Published"
   },
+  {
+   "fieldname": "short_code",
+   "fieldtype": "Data",
+   "label": "Short Code"
+  },
   {
    "fieldname": "column_break_3",
    "fieldtype": "Column Break"
@@ -89,58 +92,6 @@
    "fieldname": "tags",
    "fieldtype": "Data",
    "label": "Tags"
-  },
-  {
-   "default": "0",
-   "fieldname": "upcoming",
-   "fieldtype": "Check",
-   "label": "Is an Upcoming Course"
-  },
-  {
-   "fieldname": "chapters",
-   "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,
@@ -160,9 +111,14 @@
    "group": "Mentors",
    "link_doctype": "LMS Course Mentor Mapping",
    "link_fieldname": "course"
+  },
+  {
+   "group": "Mentors",
+   "link_doctype": "LMS Mentor Request",
+   "link_fieldname": "course"
   }
  ],
- "modified": "2021-08-25 11:04:57.211898",
+ "modified": "2021-07-09 15:05:05.372430",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",
@@ -185,5 +141,6 @@
  "sort_field": "creation",
  "sort_order": "DESC",
  "title_field": "title",
- "track_changes": 1
+ "track_changes": 1,
+ "track_views": 1
 }

community/lms/doctype/lms_course/lms_course.py

@@ -9,42 +9,8 @@ import json
 from ...utils import slugify
 from community.query import find, find_all
 from frappe.utils import flt, cint
-from ...utils import slugify
 
 class LMSCourse(Document):
-
-    def on_update(self):
-        if not self.upcoming and self.has_value_changed("upcoming"):
-            self.send_email_to_interested_users()
-
-    def send_email_to_interested_users(self):
-        interested_users = frappe.get_all("LMS Course Interest",
-                                            {
-                                                "course": self.name
-                                            },
-                                            ["name", "user"])
-        subject = self.title + " is available!"
-        args = {
-            "title": self.title,
-            "course_link": "/courses/{0}".format(self.name),
-            "app_name": frappe.db.get_single_value("System Settings", "app_name"),
-            "site_url": frappe.utils.get_url()
-        }
-
-        for user in interested_users:
-            args["first_name"] = frappe.db.get_value("User", user.user, "first_name")
-            email_args = frappe._dict(
-                            recipients = user.user,
-                            sender = frappe.db.get_single_value("LMS Settings", "email_sender"),
-                            subject = subject,
-                            header = [subject, "green"],
-                            template = "lms_course_interest",
-                            args = args,
-                            now = True
-                        )
-            frappe.enqueue(method=frappe.sendmail, queue='short', timeout=300, is_async=True, **email_args)
-            frappe.db.set_value("LMS Course Interest", user.name, "email_sent", True)
-
     @staticmethod
     def find(name):
         """Returns the course with specified name.
@@ -106,11 +72,8 @@ class LMSCourse(Document):
         mentors = frappe.get_all("LMS Course Mentor Mapping", {"course": self.name}, ["mentor"])
         for mentor in mentors:
             member = frappe.get_doc("User", mentor.mentor)
-            member.batch_count = frappe.db.count("LMS Batch Membership",
+            # TODO: change this to count query
-                                    {
+            member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member.name, "member_type": "Mentor"}))
-                                        "member": member.name,
-                                        "member_type": "Mentor"
-                                    })
             course_mentors.append(member)
         return course_mentors
 
@@ -144,49 +107,22 @@ 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):
         """Returns all chapters of this course.
         """
-        chapters = []
+        # TODO: chapters should have a way to specify the order
-        for row in self.chapters:
+        return find_all("Chapter", course=self.name, order_by="index_")
-            chapter_details = frappe.db.get_value("Chapter", row.chapter,
-                                                ["name", "title", "description"],
-                                                as_dict=True)
-            chapter_details.idx = row.idx
-            chapters.append(chapter_details)
-        return chapters
 
-    def get_lessons(self, chapter=None):
+    def get_lessons(self):
-        """ If chapter is passed, returns lessons of only that chapter.
+        """ Returns all lessons of this course """
-        Else returns lessons of all chapters of the course """
         lessons = []
-
+        chapters = self.get_chapters()
-        if chapter:
+        for chapter in chapters:
-            return self.get_lesson_details(chapter)
+            lessons.append(frappe.get_all("Lesson", {"chapter": chapter.name}))
-
-        for chapter in self.get_chapters():
-            lesson = self.get_lesson_details(chapter)
-            lessons += lesson
-
         return lessons
 
-    def get_lesson_details(self, chapter):
-        lessons = []
-        lesson_list = frappe.get_all("Lessons", {"parent": chapter.name},
-                                        ["lesson", "idx"], order_by="idx")
-        for row in lesson_list:
-            lesson_details = frappe.get_doc("Lesson", row.lesson)
-            lesson_details.number = flt("{}.{}".format(chapter.idx, row.idx))
-            lessons.append(lesson_details)
-        return lessons
-
-    def get_slugified_chapter_title(self, chapter):
-        return slugify(chapter)
-
     def get_course_progress(self):
         """ Returns the course progress of the session user """
         lesson_count = len(self.get_lessons())
@@ -224,18 +160,38 @@ class LMSCourse(Document):
             visibility="Public")
         return batches
 
+    def get_chapter(self, index):
+        return find("Chapter", course=self.name, index_=index)
+
+    def get_lesson(self, chapter_index, lesson_index):
+        chapter_name = frappe.get_value(
+            "Chapter",
+            {"course": self.name, "index_": chapter_index},
+            "name")
+        lesson_name = chapter_name and frappe.get_value(
+            "Lesson",
+            {"chapter": chapter_name, "index_": lesson_index},
+            "name")
+        return lesson_name and frappe.get_doc("Lesson", lesson_name)
+
     def get_lesson_index(self, lesson_name):
         """Returns the {chapter_index}.{lesson_index} for the lesson.
         """
-        lesson = frappe.db.get_value("Lessons", {"lesson": lesson_name}, ["idx", "parent"], as_dict=True)
+        lesson = frappe.get_doc("Lesson", lesson_name)
-        if not lesson:
+        chapter = frappe.get_doc("Chapter", lesson.chapter)
-            return None
+        return f"{chapter.index_}.{lesson.index_}"
 
-        chapter = frappe.db.get_value("Chapters", {"chapter": lesson.parent}, ["idx"], as_dict=True)
+    def reindex_lessons(self):
-        if not chapter:
+        for i, c in enumerate(self.get_chapters(), start=1):
-            return None
+            c.index_ = i
+            c.save()
+            self._reindex_lessons_in_chapter(c)
 
-        return f"{chapter.idx}.{lesson.idx}"
+    def _reindex_lessons_in_chapter(self, c):
+        for i, lesson in enumerate(c.get_lessons(), start=1):
+            lesson.index = i
+            lesson.index_label = f"{c.index_}.{i}"
+            lesson.save()
 
     def reindex_exercises(self):
         for i, c in enumerate(self.get_chapters(), start=1):
@@ -246,7 +202,7 @@ class LMSCourse(Document):
 
     def _reindex_exercises_in_chapter(self, c):
         i = 1
-        for lesson in self.get_lessons(c):
+        for lesson in c.get_lessons():
             for exercise in lesson.get_exercises():
                 exercise.index_ = i
                 exercise.index_label = f"{c.index_}.{i}"
@@ -281,6 +237,21 @@ class LMSCourse(Document):
             membership.batch_title = frappe.db.get_value("LMS Batch", membership.batch, "title")
         return all_memberships
 
+    def get_mentors(self, batch=None):
+        filters = {
+            "course": self.name,
+            "member_type": "Mentor"
+        }
+        if batch:
+            filters["batch"] = batch
+
+        memberships = frappe.get_all(
+                    "LMS Batch Membership",
+                    filters,
+                    ["member"])
+        member_names = [m['member'] for m in memberships]
+        return find_all("User", name=["IN", member_names])
+
     def get_students(self, batch=None):
         """Returns (email, full_name, username) of all the students of this batch as a list of dict.
         """
@@ -331,6 +302,9 @@ class LMSCourse(Document):
             return None
         return sum(ratings)/len(ratings)
 
+    def get_outline(self):
+        return CourseOutline(self)
+
     def get_progress(self, lesson):
         return frappe.db.get_value("LMS Course Progress",
                 {
@@ -340,24 +314,55 @@ class LMSCourse(Document):
                 },
                 ["status"])
 
-    def get_neighbours(self, current, lessons):
+class CourseOutline:
-        current = flt(current)
+    def __init__(self, course):
-        numbers = sorted(lesson.number for lesson in lessons)
+        self.course = course
-        index = numbers.index(current)
+        self.chapters = self.get_chapters()
-        return {
+        self.lessons = self.get_lessons()
-                "prev": numbers[index-1] if index-1 >= 0 else None,
-                "next": numbers[index+1] if index+1 < len(numbers) else None
-            }
 
-    def is_certified(self):
+    def get_next(self, current):
-        certificate = frappe.get_all("LMS Certification",
+        current = flt(current)
-                        {
+        numbers = sorted(lesson['number'] for lesson in self.lessons)
-                            "student": frappe.session.user,
+        try:
-                            "course": self.name
+            index = numbers.index(current)
-                        })
+            return numbers[index+1]
-        if len(certificate):
+        except IndexError:
-            return certificate[0].name
+            return None
-        return
+
+    def get_prev(self, current):
+        current = flt(current)
+        numbers = sorted(lesson['number'] for lesson in self.lessons)
+        try:
+            index = numbers.index(current)
+            if index == 0:
+                return None
+            return numbers[index-1]
+        except IndexError:
+            return None
+
+    def get_chapters(self):
+        return frappe.db.get_all("Chapter",
+            filters={"course": self.course.name},
+            fields=["name", "title", "index_"],
+            order_by="index_")
+
+    def get_lessons(self):
+        chapters = [c['name'] for c in self.chapters]
+        lessons = frappe.db.get_all("Lesson",
+            filters={"chapter": ["IN", chapters]},
+            fields=["name", "title", "chapter", "index_"])
+
+        chapter_numbers = {c['name']: c['index_'] for c in self.chapters}
+        for lesson in lessons:
+            lesson['number'] = flt("{}.{}".format(chapter_numbers[lesson['chapter']], lesson['index_']))
+        return lessons
+
+@frappe.whitelist()
+def reindex_lessons(doc):
+    course_data = json.loads(doc)
+    course = frappe.get_doc("LMS Course", course_data['name'])
+    course.reindex_lessons()
+    frappe.msgprint("All lessons in this course have been re-indexed.")
 
 @frappe.whitelist()
 def reindex_exercises(doc):