feat: include membership info in page context

Added `is_member` field to page_context of learn page. This is required to
disable exercises to non-members.

.gitignore

@@ -5,3 +5,6 @@
 tags
 community/docs/current
 community/public/dist
+__pycache__/
+*.py[cod]
+*$py.class

community/fixtures/custom_field.json

@@ -0,0 +1,108 @@
+[
+ {
+  "allow_in_quick_entry": 0,
+  "allow_on_submit": 0,
+  "bold": 0,
+  "collapsible": 0,
+  "collapsible_depends_on": null,
+  "columns": 0,
+  "default": null,
+  "depends_on": null,
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Custom Field",
+  "dt": "User",
+  "fetch_from": null,
+  "fetch_if_empty": 0,
+  "fieldname": "linkedin",
+  "fieldtype": "Data",
+  "hidden": 0,
+  "hide_border": 0,
+  "hide_days": 0,
+  "hide_seconds": 0,
+  "ignore_user_permissions": 0,
+  "ignore_xss_filter": 0,
+  "in_global_search": 0,
+  "in_list_view": 0,
+  "in_preview": 0,
+  "in_standard_filter": 0,
+  "insert_after": "mobile_no",
+  "label": "LinkedIn ID",
+  "length": 0,
+  "mandatory_depends_on": null,
+  "modified": "2021-06-30 14:46:55.834145",
+  "name": "User-linkedin",
+  "no_copy": 0,
+  "non_negative": 0,
+  "options": null,
+  "parent": null,
+  "parentfield": null,
+  "parenttype": null,
+  "permlevel": 0,
+  "precision": "",
+  "print_hide": 0,
+  "print_hide_if_no_value": 0,
+  "print_width": null,
+  "read_only": 0,
+  "read_only_depends_on": null,
+  "report_hide": 0,
+  "reqd": 0,
+  "search_index": 0,
+  "translatable": 1,
+  "unique": 0,
+  "width": null
+ },
+ {
+  "allow_in_quick_entry": 0,
+  "allow_on_submit": 0,
+  "bold": 0,
+  "collapsible": 0,
+  "collapsible_depends_on": null,
+  "columns": 0,
+  "default": null,
+  "depends_on": null,
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Custom Field",
+  "dt": "User",
+  "fetch_from": null,
+  "fetch_if_empty": 0,
+  "fieldname": "github",
+  "fieldtype": "Data",
+  "hidden": 0,
+  "hide_border": 0,
+  "hide_days": 0,
+  "hide_seconds": 0,
+  "ignore_user_permissions": 0,
+  "ignore_xss_filter": 0,
+  "in_global_search": 0,
+  "in_list_view": 0,
+  "in_preview": 0,
+  "in_standard_filter": 0,
+  "insert_after": "linkedin",
+  "label": "Github ID",
+  "length": 0,
+  "mandatory_depends_on": null,
+  "modified": "2021-06-30 14:46:55.834145",
+  "name": "User-github",
+  "no_copy": 0,
+  "non_negative": 0,
+  "options": null,
+  "parent": null,
+  "parentfield": null,
+  "parenttype": null,
+  "permlevel": 0,
+  "precision": "",
+  "print_hide": 0,
+  "print_hide_if_no_value": 0,
+  "print_width": null,
+  "read_only": 0,
+  "read_only_depends_on": null,
+  "report_hide": 0,
+  "reqd": 0,
+  "search_index": 0,
+  "translatable": 1,
+  "unique": 0,
+  "width": null
+ }
+]

community/hackathon/doctype/community_project_member/community_project_member.py

@@ -3,13 +3,14 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-# import frappe
+import frappe
 from frappe.model.document import Document
+from frappe import _
 
 class CommunityProjectMember(Document):
     def validate(self):
         self.validate_if_already_member()
-    
+
     def validate_if_already_member(self):
         if frappe.get_all("Community Project Member", {"owner": self.owner}):
             frappe.throw(_("You have already applied for the membership of this project."))

community/hooks.py

@@ -104,6 +104,8 @@ doc_events = {
 #	]
 #}
 
+fixtures = ["Custom Field"]
+
 # Testing
 # -------
 
@@ -136,13 +138,15 @@ primary_rules = [
     {"from_route": "/hackathons/<hackathon>/<project>", "to_route": "hackathons/project"},
     {"from_route": "/dashboard", "to_route": ""},
     {"from_route": "/add-a-new-batch", "to_route": "add-a-new-batch"},
-    {"from_route": "/courses/<course>/<batch>/learn", "to_route": "batch/learn"},
-    {"from_route": "/courses/<course>/<batch>/learn/<int:chapter>.<int:lesson>", "to_route": "batch/learn"},
-    {"from_route": "/courses/<course>/<batch>/schedule", "to_route": "batch/schedule"},
-    {"from_route": "/courses/<course>/<batch>/members", "to_route": "batch/members"},
-    {"from_route": "/courses/<course>/<batch>/discuss", "to_route": "batch/discuss"},
-    {"from_route": "/courses/<course>/<batch>/about", "to_route": "batch/about"},
-    {"from_route": "/courses/<course>/<batch>/progress", "to_route": "batch/progress"}
+    {"from_route": "/courses/<course>/home", "to_route": "batch/home"},
+    {"from_route": "/courses/<course>/learn", "to_route": "batch/learn"},
+    {"from_route": "/courses/<course>/learn/<int:chapter>.<int:lesson>", "to_route": "batch/learn"},
+    {"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"}
 ]
 
 # Any frappe default URL is blocked by profile-rules, add it here to unblock it
@@ -159,10 +163,11 @@ whitelist = [
     "/socket.io",
     "/hackathons",
     "/dashboard",
-    "/join-request"
+    "/join-request",
     "/add-a-new-batch",
     "/new-sign-up",
-    "/message"
+    "/message",
+    "/about"
 ]
 whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]
 
@@ -174,3 +179,23 @@ profile_rules = [
 website_route_rules = primary_rules + whitelist_rules + profile_rules
 
 update_website_context = 'community.widgets.update_website_context'
+
+## 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 = []
+
+## Specify the extension to be used to control what scripts and stylesheets
+## to be included in lesson pages. The specified value must be be a
+## subclass of community.community.plugins.PageExtension
+# community_lesson_page_extension = None
+
+community_lesson_page_extensions = [
+	"community.plugins.LiveCodeExtension"
+]
+
+## Markdown Macros for Lessons
+community_markdown_macro_renderers = {
+	"Exercise": "community.plugins.exercise_renderer",
+	"Quiz": "community.plugins.quiz_renderer",
+	"YouTubeVideo": "community.plugins.youtube_video_renderer",
+}

community/lms/api.py

@@ -15,13 +15,6 @@ def autosave_section(section, code):
     doc.insert()
     return {"name": doc.name}
 
-@frappe.whitelist()
-def get_section(name):
-    """Saves the code edited in one of the sections.
-    """
-    doc = frappe.get_doc("LMS Section", name)
-    return doc and doc.as_dict()
-
 @frappe.whitelist()
 def submit_solution(exercise, code):
     """Submits a solution.
@@ -34,3 +27,21 @@ def submit_solution(exercise, code):
         return
     doc = ex.submit(code)
     return {"name": doc.name, "creation": doc.creation}
+
+@frappe.whitelist()
+def save_current_lesson(course_name, lesson_name):
+    """Saves the current lesson for a student/mentor.
+    """
+    name = frappe.get_value(
+        doctype="LMS Batch Membership",
+        filters={
+            "course": course_name,
+            "member": frappe.session.user
+        },
+        fieldname="name")
+    if not name:
+        return
+    doc = frappe.get_doc("LMS Batch Membership", name)
+    doc.current_lesson = lesson_name
+    doc.save(ignore_permissions=True)
+    return {"current_lesson": doc.current_lesson}

community/lms/doctype/chapter/chapter.py

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

community/lms/doctype/exercise/exercise.json

@@ -15,7 +15,9 @@
   "hints",
   "tests",
   "image",
-  "lesson"
+  "lesson",
+  "index_",
+  "index_label"
  ],
  "fields": [
   {
@@ -27,6 +29,7 @@
   {
    "fieldname": "course",
    "fieldtype": "Link",
+   "in_list_view": 1,
    "label": "Course",
    "options": "LMS Course"
   },
@@ -73,13 +76,27 @@
   {
    "fieldname": "lesson",
    "fieldtype": "Link",
+   "in_list_view": 1,
    "label": "Lesson",
    "options": "Lesson"
+  },
+  {
+   "fieldname": "index_",
+   "fieldtype": "Int",
+   "label": "Index",
+   "read_only": 1
+  },
+  {
+   "fieldname": "index_label",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Index Label",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-05-20 13:23:12.340928",
+ "modified": "2021-06-01 05:22:15.656013",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Exercise",
@@ -99,8 +116,8 @@
   }
  ],
  "search_fields": "title",
- "sort_field": "modified",
- "sort_order": "DESC",
+ "sort_field": "index_label",
+ "sort_order": "ASC",
  "title_field": "title",
  "track_changes": 1
 }

community/lms/doctype/exercise/exercise.py

@@ -3,12 +3,8 @@
 
 import frappe
 from frappe.model.document import Document
-from ..lms_sketch.livecode import livecode_to_svg
 
 class Exercise(Document):
-    def before_save(self):
-        self.image = livecode_to_svg(None, self.answer)
-
     def get_user_submission(self):
         """Returns the latest submission for this user.
         """
@@ -25,7 +21,6 @@ class Exercise(Document):
             order_by="creation desc",
             page_length=1)
 
-        print("get_user_submission", result)
         if result:
             return result[0]
 
@@ -43,8 +38,6 @@ class Exercise(Document):
         course = frappe.get_doc("LMS Course", self.course)
         batch = course.get_student_batch(user)
 
-        image = livecode_to_svg(None, code)
-
         doc = frappe.get_doc(
             doctype="Exercise Submission",
             exercise=self.name,
@@ -52,8 +45,8 @@ class Exercise(Document):
             course=self.course,
             lesson=self.lesson,
             batch=batch and batch.name,
-            image=image,
             solution=code)
         doc.insert(ignore_permissions=True)
+
         return doc
 

community/lms/doctype/exercise/test_exercise.py

@@ -14,7 +14,9 @@ class TestExercise(unittest.TestCase):
         course = frappe.get_doc({
             "doctype": "LMS Course",
             "name": "test-course",
-            "title": "Test Course"
+            "title": "Test Course",
+            "short_introduction": "Test Course",
+            "description": "Test Course"
         })
         course.insert()
         e = frappe.get_doc({

community/lms/doctype/exercise_submission/exercise_submission.json

@@ -6,12 +6,17 @@
  "engine": "InnoDB",
  "field_order": [
   "exercise",
-  "solution",
+  "status",
+  "batch",
+  "column_break_4",
   "exercise_title",
   "course",
-  "batch",
   "lesson",
-  "image"
+  "section_break_8",
+  "solution",
+  "image",
+  "test_results",
+  "comments"
  ],
  "fields": [
   {
@@ -21,12 +26,6 @@
    "label": "Exercise",
    "options": "Exercise"
   },
-  {
-   "fieldname": "solution",
-   "fieldtype": "Code",
-   "in_list_view": 1,
-   "label": "Solution"
-  },
   {
    "fetch_from": "exercise.title",
    "fieldname": "exercise_title",
@@ -61,11 +60,41 @@
    "fieldtype": "Code",
    "label": "Image",
    "read_only": 1
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "label": "Status",
+   "options": "Correct\nIncorrect"
+  },
+  {
+   "fieldname": "test_results",
+   "fieldtype": "Small Text",
+   "label": "Test Results"
+  },
+  {
+   "fieldname": "comments",
+   "fieldtype": "Small Text",
+   "label": "Comments"
+  },
+  {
+   "fieldname": "solution",
+   "fieldtype": "Code",
+   "in_list_view": 1,
+   "label": "Solution"
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_8",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-05-21 11:28:45.833018",
+ "modified": "2021-06-24 16:22:50.570845",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Exercise Submission",

community/lms/doctype/exercise_submission/exercise_submission.py

@@ -1,8 +1,13 @@
 # Copyright (c) 2021, FOSS United and contributors
 # For license information, please see license.txt
 
-# import frappe
+import frappe
 from frappe.model.document import Document
+from ..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/invite_request/invite_request.py

@@ -58,7 +58,8 @@ def create_invite_request(invite_email):
 
     frappe.get_doc({
             "doctype": "Invite Request",
-            "invite_email": invite_email
+            "invite_email": invite_email,
+            "status": "Approved"
         }).save(ignore_permissions=True)
     return "OK"
 

community/lms/doctype/invite_request/test_invite_request.py

@@ -18,7 +18,7 @@ class TestInviteRequest(unittest.TestCase):
                         filters={"invite_email": "test_invite@example.com"},
                         fieldname=["invite_email", "status", "signup_email"],
                         as_dict=True)
-            self.assertEqual(invite.status, "Pending")
+            self.assertEqual(invite.status, "Approved")
             self.assertEqual(invite.signup_email, None)
 
     def test_create_invite_request_update(self):

community/lms/doctype/lesson/lesson.js

@@ -2,7 +2,47 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Lesson', {
-	// refresh: function(frm) {
+  setup: function (frm) {
+    frm.trigger('setup_help');
+  },
+  setup_help(frm) {
+    frm.get_field('help').html(`
+<p>You can add some more additional content to the lesson using a special syntax. The table below mentions all types of dynamic content that you can add to the lessons and the syntax for the same.</p>
+<div class="row font-weight-bold mb-3">
+	<div class="col-sm-4">
+		Content Type
+	</div>
+	<div class="col-sm-4">
+		Syntax
+	</div>
+</div>
 
-	// }
+<div class="row mb-3">
+	<div class="col-sm-4">
+		YouTube Video
+	</div>
+	<div class="col-sm-4">
+		{{ YouTubeVideo("unique_embed_id") }}
+	</div>
+</div>
+
+<div class="row mb-3">
+	<div class="col-sm-4">
+		Exercise
+	</div>
+	<div class="col-sm-4">
+		{{ Exercise("exercise_name") }}
+	</div>
+</div>
+
+<div class="row mb-3">
+	<div class="col-sm-4">
+		Quiz
+	</div>
+	<div class="col-sm-4">
+		{{ Quiz("lms_quiz_name") }}
+	</div>
+</div>
+`);
+  }
 });

community/lms/doctype/lesson/lesson.json

@@ -7,11 +7,15 @@
  "engine": "InnoDB",
  "field_order": [
   "chapter",
-  "lesson_type",
+  "include_in_preview",
+  "column_break_4",
   "title",
   "index_",
+  "index_label",
+  "section_break_6",
   "body",
-  "sections"
+  "help_section",
+  "help"
  ],
  "fields": [
   {
@@ -21,14 +25,6 @@
    "label": "Chapter",
    "options": "Chapter"
   },
-  {
-   "default": "Video",
-   "fieldname": "lesson_type",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Lesson Type",
-   "options": "Video\nText\nQuiz"
-  },
   {
    "fieldname": "title",
    "fieldtype": "Data",
@@ -39,6 +35,7 @@
    "default": "1",
    "fieldname": "index_",
    "fieldtype": "Int",
+   "in_list_view": 1,
    "label": "Index"
   },
   {
@@ -47,15 +44,38 @@
    "label": "Body"
   },
   {
-   "fieldname": "sections",
-   "fieldtype": "Table",
-   "label": "Sections",
-   "options": "LMS Section"
+   "fieldname": "index_label",
+   "fieldtype": "Data",
+   "label": "Index Label",
+   "read_only": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "include_in_preview",
+   "fieldtype": "Check",
+   "label": "Include In Preview"
+  },
+  {
+   "fieldname": "section_break_6",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "help_section",
+   "fieldtype": "Section Break",
+   "label": "Help"
+  },
+  {
+   "fieldname": "help",
+   "fieldtype": "HTML"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-05-13 20:03:51.510605",
+ "modified": "2021-06-29 13:34:49.077363",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Lesson",

community/lms/doctype/lesson/lesson.py

@@ -5,41 +5,128 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
-from ...section_parser import SectionParser
+from ...md import markdown_to_html, find_macros
 
 class Lesson(Document):
     def before_save(self):
-        sections = SectionParser().parse(self.body or "")
-        self.sections = [self.make_lms_section(i, s) for i, s in enumerate(sections)]
-        for s in self.sections:
-            if s.type == "exercise":
-                e = s.get_exercise()
-                e.lesson = self.name
-                e.save()
+        dynamic_documents = ["Exercise", "Quiz"]
+        for section in dynamic_documents:
+            self.update_lesson_name_in_document(section)
 
-    def get_sections(self):
-        return sorted(self.get('sections'), key=lambda s: s.index)
+    def update_lesson_name_in_document(self, section):
+        doctype_map= {
+            "Exercise": "Exercise",
+            "Quiz": "LMS Quiz"
+        }
+        macros = find_macros(self.body)
+        documents = [value for name, value in macros if name == section]
+        index = 1
+        for name in documents:
+            e = frappe.get_doc(doctype_map[section], name)
+            e.lesson = self.name
+            e.index_ = index
+            e.save()
+            index += 1
+        self.update_orphan_documents(doctype_map[section], documents)
 
-    def make_lms_section(self, index, section):
-            s = frappe.new_doc('LMS Section', parent_doc=self, parentfield='sections')
-            s.type = section.type
-            s.id = section.id
-            s.label = section.label
-            s.contents = section.contents
-            s.index = index
-            return s
-
-    def get_next(self):
-        """Returns the number for the next lesson.
-
-        The return value would be like 1.2, 2.1 etc.
-        It will be None if there is no next lesson.
+    def update_orphan_documents(self, doctype, documents):
+        """Updates the documents that were previously part of this lesson,
+        but not any more.
         """
+        linked_documents = {row['name'] for row in frappe.get_all(doctype, {"lesson": self.name})}
+        active_documents = set(documents)
+        orphan_documents = linked_documents - active_documents
+        for name in orphan_documents:
+            ex = frappe.get_doc(doctype, name)
+            ex.lesson = None
+            ex.index_ = 0
+            ex.index_label = ""
+            ex.save()
 
+    def render_html(self):
+        return markdown_to_html(self.body)
 
-    def get_prev(self):
-        """Returns the number for the prev lesson.
+    def get_exercises(self):
+        if not self.body:
+            return []
 
-        The return value would be like 1.2, 2.1 etc.
-        It will be None if there is no next lesson.
-        """
+        macros = find_macros(self.body)
+        exercises = [value for name, value in macros if name == "Exercise"]
+        return [frappe.get_doc("Exercise", name) for name in exercises]
+
+    def get_progress(self):
+        return frappe.db.get_value("LMS Course Progress", {"lesson": self.name, "owner": frappe.session.user}, "status")
+
+    def get_slugified_class(self):
+        if self.get_progress():
+            return ("").join([ s for s in self.get_progress().lower().split() ])
+        return
+
+@frappe.whitelist()
+def save_progress(lesson, course, status):
+    if not frappe.db.exists("LMS Batch Membership",
+            {
+                "member": frappe.session.user,
+                "course": course
+            }):
+        return
+
+    if frappe.db.exists("LMS Course Progress",
+            {
+                "lesson": lesson,
+                "owner": frappe.session.user,
+                "course": course
+            }):
+        doc = frappe.get_doc("LMS Course Progress",
+                {
+                    "lesson": lesson,
+                    "owner": frappe.session.user,
+                    "course": course
+                })
+        doc.status = status
+        doc.save(ignore_permissions=True)
+    else:
+        frappe.get_doc({
+            "doctype": "LMS Course Progress",
+            "lesson": lesson,
+            "status": status,
+        }).save(ignore_permissions=True)
+    return "OK"
+
+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/lms_batch/lms_batch.json

@@ -6,11 +6,10 @@
  "engine": "InnoDB",
  "field_order": [
   "course",
-  "title",
   "start_date",
   "start_time",
   "column_break_3",
-  "code",
+  "title",
   "sessions_on",
   "end_time",
   "section_break_5",
@@ -31,18 +30,10 @@
    "label": "Course",
    "options": "LMS Course"
   },
-  {
-   "fieldname": "code",
-   "fieldtype": "Data",
-   "label": "Code",
-   "read_only": 1,
-   "unique": 1
-  },
   {
    "fieldname": "title",
    "fieldtype": "Data",
-   "label": "Title",
-   "unique": 1
+   "label": "Title"
   },
   {
    "fieldname": "description",
@@ -84,7 +75,8 @@
   },
   {
    "fieldname": "section_break_5",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "label": "Batch Description"
   },
   {
    "fieldname": "column_break_9",
@@ -92,7 +84,8 @@
   },
   {
    "fieldname": "section_break_7",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "label": "Batch Settings"
   },
   {
    "fieldname": "start_date",
@@ -126,7 +119,7 @@
    "link_fieldname": "batch"
   }
  ],
- "modified": "2021-05-06 05:46:38.469120",
+ "modified": "2021-06-16 10:51:05.403726",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch",

community/lms/doctype/lms_batch/lms_batch.py

@@ -12,8 +12,6 @@ from community.query import find, find_all
 class LMSBatch(Document):
     def validate(self):
         self.validate_if_mentor()
-        if not self.code:
-            self.generate_code()
 
     def validate_if_mentor(self):
         course = frappe.get_doc("LMS Course", self.course)
@@ -21,20 +19,7 @@ class LMSBatch(Document):
            frappe.throw(_("You are not a mentor of the course {0}").format(course.title))
 
     def after_insert(self):
-        create_membership(batch=self.name, member_type="Mentor")
-
-    def generate_code(self):
-        short_code = frappe.db.get_value("LMS Course", self.course, "short_code")
-        course_batches = frappe.get_all("LMS Batch",{"course":self.course})
-        self.code = short_code + str(len(course_batches) + 1)
-
-    def get_mentors(self):
-        memberships = frappe.get_all(
-                    "LMS Batch Membership",
-                    {"batch": self.name, "member_type": "Mentor"},
-                    ["member"])
-        member_names = [m['member'] for m in memberships]
-        return find_all("User", name=["IN", member_names])
+        create_membership(batch=self.name, course=self.course, member_type="Mentor")
 
     def is_member(self, email, member_type=None):
         """Checks if a person is part of a batch.
@@ -50,16 +35,6 @@ class LMSBatch(Document):
             filters['member_type'] = member_type
         return frappe.db.exists("LMS Batch Membership", filters)
 
-    def get_students(self):
-        """Returns (email, full_name, username) of all the students of this batch as a list of dict.
-        """
-        memberships = frappe.get_all(
-                    "LMS Batch Membership",
-                    {"batch": self.name, "member_type": "Student"},
-                    ["member"])
-        member_names = [m['member'] for m in memberships]
-        return find_all("User", name=["IN", member_names])
-
     def get_messages(self):
         messages =  frappe.get_all("LMS Message", {"batch": self.name}, ["*"], order_by="creation")
         for message in messages:
@@ -69,6 +44,24 @@ class LMSBatch(Document):
                 message.is_author = True
         return messages
 
+    def get_membership(self, email):
+        """Returns the membership document of given user.
+        """
+        name = frappe.get_value(
+            doctype="LMS Batch Membership",
+            filters={
+                "batch": self.name,
+                "member": email
+            },
+            fieldname="name")
+        return frappe.get_doc("LMS Batch Membership", name)
+
+    def get_current_lesson(self, user):
+        """Returns the name of the current lesson for the given user.
+        """
+        membership = self.get_membership(user)
+        return membership and membership.current_lesson
+
 @frappe.whitelist()
 def save_message(message, batch):
     doc = frappe.get_doc({
@@ -78,3 +71,38 @@ def save_message(message, batch):
         "message": message
     })
     doc.save(ignore_permissions=True)
+
+def switch_batch(course_name, email, batch_name):
+    """Switches the user from the current batch of the course to a new batch.
+    """
+    membership = frappe.get_last_doc(
+        "LMS Batch Membership",
+        filters={"course": course_name, "member": email})
+
+    batch = frappe.get_doc("LMS Batch", batch_name)
+    if not batch:
+        raise ValueError(f"Invalid Batch: {batch_name}")
+
+    if batch.course != course_name:
+        raise ValueError("Can not switch batches across courses")
+
+    if batch.is_member(email):
+        print(f"{email} is already a member of {batch.title}")
+        return
+
+    old_batch = frappe.get_doc("LMS Batch", membership.batch)
+
+    print("updating membership", membership.name)
+    membership.batch = batch_name
+    membership.save()
+
+    # update exercise submissions
+    filters = {
+        "owner": email,
+        "batch": old_batch.name
+    }
+    for name in frappe.db.get_all("Exercise Submission", filters=filters, pluck='name'):
+        doc = frappe.get_doc("Exercise Submission", name)
+        print("updating exercise submission", name)
+        doc.batch = batch_name
+        doc.save()

community/lms/doctype/lms_batch_membership/lms_batch_membership.js

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

community/lms/doctype/lms_batch_membership/lms_batch_membership.json

@@ -8,11 +8,12 @@
   "batch",
   "member",
   "member_name",
-  "member_email",
+  "member_username",
   "column_break_3",
   "course",
   "member_type",
-  "role"
+  "role",
+  "current_lesson"
  ],
  "fields": [
   {
@@ -59,27 +60,30 @@
    "fieldname": "column_break_3",
    "fieldtype": "Column Break"
   },
-  {
-   "fetch_from": "member.email",
-   "fieldname": "member_email",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Member Email",
-   "read_only": 1,
-   "read_only_depends_on": "member.email"
-  },
   {
    "fetch_from": "batch.course",
    "fieldname": "course",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Course",
+   "label": "Course"
+  },
+  {
+   "fieldname": "current_lesson",
+   "fieldtype": "Link",
+   "label": "Current Lesson",
+   "options": "Lesson"
+  },
+  {
+   "fetch_from": "member.username",
+   "fieldname": "member_username",
+   "fieldtype": "Data",
+   "label": "Memeber Username",
    "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-05-24 09:32:04.128620",
+ "modified": "2021-07-06 20:50:46.885325",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Membership",

community/lms/doctype/lms_batch_membership/lms_batch_membership.py

@@ -14,40 +14,65 @@ class LMSBatchMembership(Document):
         self.validate_membership_in_different_batch_same_course()
 
     def validate_membership_in_same_batch(self):
+        filters={
+            "member": self.member,
+            "course": self.course,
+            "name": ["!=", self.name]
+        }
+        if self.batch:
+            filters["batch"] = self.batch
         previous_membership = frappe.db.get_value("LMS Batch Membership",
-            filters={
-                "member": self.member,
-                "batch": self.batch, "name": ["!=", self.name]
-            },
+            filters,
             fieldname=["member_type","member"],
             as_dict=1)
 
         if previous_membership:
             member_name = frappe.db.get_value("User", self.member, "full_name")
-            frappe.throw(_("{0} is already a {1} of {2}").format(member_name, previous_membership.member_type, self.batch))
+            course_title = frappe.db.get_value("LMS Course", self.course, "title")
+            frappe.throw(_("{0} is already a {1} of the course {2}").format(member_name, previous_membership.member_type, course_title))
 
     def validate_membership_in_different_batch_same_course(self):
-        course = frappe.db.get_value("LMS Batch", self.batch, "course")
-        previous_membership = frappe.get_all("LMS Batch Membership",
-                                    filters={
-                                        "member": self.member
-                                    },
-                                    fields=["batch", "member_type"]
-                                )
+        """Ensures that a studnet is only part of one batch.
+        """
+        # nothing to worry if the member is not a student
+        if self.member_type != "Student":
+            return
 
-        for membership in previous_membership:
-            batch_course = frappe.db.get_value("LMS Batch", membership.batch, "course")
-            if batch_course == course and (membership.member_type == "Student" or self.member_type == "Student"):
-                member_name = frappe.db.get_value("User", self.member, "full_name")
-                frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))
+        course = frappe.db.get_value("LMS Batch", self.batch, "course")
+        memberships = frappe.get_all(
+            "LMS Batch Membership",
+            filters={
+                "member": self.member,
+                "name": ["!=", self.name],
+                "member_type": "Student",
+                "course": self.course
+            },
+            fields=["batch", "member_type", "name"]
+        )
+
+        if memberships:
+            membership = memberships[0]
+            member_name = frappe.db.get_value("User", self.member, "full_name")
+            frappe.throw(_("{0} is already a Student of {1} course through {2} batch").format(member_name, course, membership.batch))
 
 @frappe.whitelist()
-def create_membership(batch, member=None, member_type="Student", role="Member"):
+def create_membership(course, batch=None, member=None, member_type="Student", role="Member"):
     frappe.get_doc({
         "doctype": "LMS Batch Membership",
         "batch": batch,
+        "course": course,
         "role": role,
         "member_type": member_type,
         "member": member or frappe.session.user
     }).save(ignore_permissions=True)
     return "OK"
+
+@frappe.whitelist()
+def update_current_membership(batch, course, member):
+    all_memberships = frappe.get_all("LMS Batch Membership", {"member": member, "course": course})
+    for membership in all_memberships:
+        frappe.db.set_value("LMS Batch Membership", membership.name, "is_current", 0)
+
+    current_membership = frappe.get_all("LMS Batch Membership", {"batch": batch, "member": member})
+    if len(current_membership):
+        frappe.db.set_value("LMS Batch Membership", current_membership[0].name, "is_current", 1)

community/lms/doctype/lms_batch_membership/test_lms_batch_membership.py

@@ -3,8 +3,78 @@
 # See license.txt
 from __future__ import unicode_literals
 
-# import frappe
+import frappe
 import unittest
 
 class TestLMSBatchMembership(unittest.TestCase):
-	pass
+    def setUp(self):
+        frappe.db.sql("DELETE FROM `tabLMS Batch Membership`")
+        frappe.db.sql("DELETE FROM `tabLMS Batch`")
+        frappe.db.sql('delete from `tabLMS Course Mentor Mapping`')
+        frappe.db.sql("DELETE FROM `tabLMS Course`")
+        frappe.db.sql("DELETE FROM `tabUser` where email like '%@test.com'")
+
+    def new_course_batch(self):
+        course = frappe.get_doc({
+            "doctype": "LMS Course",
+            "name": "test-course",
+            "title": "Test Course",
+            "short_code": "XX",
+            "short_introduction": "Test Course",
+            "description": "Test Course"
+        })
+        course.insert()
+
+        self.new_user("mentor@test.com", "Test Mentor")
+        # without this, the creating batch will fail
+        course.add_mentor("mentor@test.com")
+
+        frappe.session.user = "mentor@test.com"
+
+        batch = frappe.get_doc({
+            "doctype": "LMS Batch",
+            "name": "test-batch",
+            "title": "Test Batch",
+            "course": course.name
+        })
+        batch.insert(ignore_permissions=True)
+
+        frappe.session.user = "Administrator"
+        return course, batch
+
+    def new_user(self, email="test@test.com", full_name="Test User"):
+        user = frappe.get_doc({
+            "doctype": "User",
+            "name": email,
+            "email": email,
+            "first_name": full_name,
+        })
+        user.insert()
+        return user
+
+    def add_membership(self, batch_name, member_name, member_type="Student"):
+        doc = frappe.get_doc({
+            "doctype": "LMS Batch Membership",
+            "batch": batch_name,
+            "member": member_name,
+            "member_type": member_type
+        })
+        doc.insert()
+        return doc
+
+    def test_membership(self):
+        course, batch = self.new_course_batch()
+        member = self.new_user("test01@test.com")
+        membership = self.add_membership(batch.name, member.name)
+
+        assert membership.course == course.name
+        assert membership.member_name == member.full_name
+
+    def test_membership_change_role(self):
+        course, batch = self.new_course_batch()
+        member = self.new_user("test01@test.com")
+        membership = self.add_membership(batch.name, member.name)
+
+        # it should be possible to change role
+        membership.role = "Admin"
+        membership.save()

community/lms/doctype/lms_course/lms_course.json

@@ -1,5 +1,18 @@
 {
- "actions": [],
+ "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",
+   "group": "Reindex",
+   "label": "Reindex Exercises"
+  }
+ ],
  "allow_guest_to_view": 1,
  "allow_rename": 1,
  "creation": "2021-03-01 16:49:33.622422",
@@ -8,11 +21,14 @@
  "engine": "InnoDB",
  "field_order": [
   "title",
-  "is_published",
-  "column_break_3",
   "short_code",
   "video_link",
+  "column_break_3",
+  "is_published",
+  "disable_self_learning",
+  "image",
   "section_break_5",
+  "tags",
   "short_introduction",
   "description"
  ],
@@ -28,7 +44,8 @@
   {
    "fieldname": "description",
    "fieldtype": "Markdown Editor",
-   "label": "Description"
+   "label": "Description",
+   "reqd": 1
   },
   {
    "default": "0",
@@ -57,7 +74,24 @@
   {
    "fieldname": "short_introduction",
    "fieldtype": "Small Text",
-   "label": "Short Introduction"
+   "label": "Short Introduction",
+   "reqd": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "disable_self_learning",
+   "fieldtype": "Check",
+   "label": "Disable Self Learning"
+  },
+  {
+   "fieldname": "image",
+   "fieldtype": "Attach Image",
+   "label": "Preview Image"
+  },
+  {
+   "fieldname": "tags",
+   "fieldtype": "Data",
+   "label": "Tags"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -84,7 +118,7 @@
    "link_fieldname": "course"
   }
  ],
- "modified": "2021-05-06 13:37:03.318829",
+ "modified": "2021-07-09 15:05:05.372430",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

community/lms/doctype/lms_course/lms_course.py

@@ -5,8 +5,10 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
+import json
 from ...utils import slugify
 from community.query import find, find_all
+from frappe.utils import flt, cint
 
 class LMSCourse(Document):
     @staticmethod
@@ -80,11 +82,11 @@ class LMSCourse(Document):
         """
         if not email:
             return False
-        return frappe.db.exists({
-            "doctype": "LMS Course Mentor Mapping",
-            "course": self.name,
-            "mentor": email
-        })
+        return frappe.db.count("LMS Course Mentor Mapping",
+            {
+                "course": self.name,
+                "mentor": email
+            })
 
     def get_student_batch(self, email):
         """Returns the batch the given student is part of.
@@ -111,7 +113,27 @@ class LMSCourse(Document):
         """Returns all chapters of this course.
         """
         # TODO: chapters should have a way to specify the order
-        return find_all("Chapter", course=self.name, order_by="creation")
+        return find_all("Chapter", course=self.name, order_by="index_")
+
+    def get_lessons(self):
+        """ Returns all lessons of this course """
+        lessons = []
+        chapters = self.get_chapters()
+        for chapter in chapters:
+            lessons.append(frappe.get_all("Lesson", {"chapter": chapter.name}))
+        return lessons
+
+    def get_course_progress(self):
+        """ Returns the course progress of the session user """
+        lesson_count = len(self.get_lessons())
+        completed_lessons = frappe.db.count("LMS Course Progress",
+                                {
+                                    "course": self.name,
+                                    "owner": frappe.session.user,
+                                    "status": "Complete"
+                                })
+        precision = cint(frappe.db.get_default("float_precision")) or 3
+        return flt(((completed_lessons/lesson_count) * 100), precision)
 
     def get_batch(self, batch_name):
         return find("LMS Batch", name=batch_name, course=self.name)
@@ -150,9 +172,146 @@ class LMSCourse(Document):
             "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.get_doc("Lesson", lesson_name)
+        chapter = frappe.get_doc("Chapter", lesson.chapter)
+        return f"{chapter.index_}.{lesson.index_}"
+
+    def reindex_lessons(self):
+        for i, c in enumerate(self.get_chapters(), start=1):
+            c.index_ = i
+            c.save()
+            self._reindex_lessons_in_chapter(c)
+
+    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):
+            if c.index_ != i:
+                c.index_ = i
+                c.save()
+            self._reindex_exercises_in_chapter(c)
+
+    def _reindex_exercises_in_chapter(self, c):
+        i = 1
+        for lesson in c.get_lessons():
+            for exercise in lesson.get_exercises():
+                exercise.index_ = i
+                exercise.index_label = f"{c.index_}.{i}"
+                exercise.save()
+                i += 1
+
+    def get_learn_url(self, lesson_number):
+        if not lesson_number:
+            return
+        return f"/courses/{self.name}/learn/{lesson_number}"
+
+    def get_membership(self, member, batch=None):
+        filters = {
+            "member": member,
+            "course": self.name
+        }
+        if batch:
+            filters["batch"] = batch
+
+        membership = frappe.db.get_value("LMS Batch Membership",
+                        filters,
+                        ["name", "batch", "current_lesson", "member_type"],
+                        as_dict=True)
+
+        if membership and membership.batch:
+            membership.batch_title = frappe.db.get_value("LMS Batch", membership.batch, "title")
+        return membership
+
+    def get_all_memberships(self, member):
+        all_memberships = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name}, ["batch"])
+        for membership in all_memberships:
+            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.
+        """
+        filters = {
+            "course": self.name,
+            "member_type": "Student"
+        }
+        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_tags(self):
+        return self.tags.split(",") if self.tags else []
+
+    def get_reviews(self):
+        reviews = frappe.get_all("LMS Course Review",
+                    {
+                        "course": self.name
+                    },
+                    ["review", "rating", "owner"],
+                    order_by= "creation desc")
+
+        for review in reviews:
+            review.owner_details = frappe.get_doc("User", review.owner)
+
+        return reviews
+
+    def is_eligible_to_review(self, membership):
+        """ Checks if user is eligible to review the course """
+        if not membership:
+            return False
+        if frappe.db.count("LMS Course Review",
+                {
+                    "course": self.name,
+                    "owner": frappe.session.user
+                }):
+            return False
+        return True
+
+    def get_average_rating(self):
+        ratings = [review.rating for review in self.get_reviews()]
+        if not len(ratings):
+            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",
+                {
+                    "course": self.name,
+                    "owner": frappe.session.user,
+                    "lesson": lesson
+                },
+                ["status"])
+
 class CourseOutline:
     def __init__(self, course):
         self.course = course
@@ -160,6 +319,7 @@ class CourseOutline:
         self.lessons = self.get_lessons()
 
     def get_next(self, current):
+        current = flt(current)
         numbers = sorted(lesson['number'] for lesson in self.lessons)
         try:
             index = numbers.index(current)
@@ -168,6 +328,7 @@ class CourseOutline:
             return None
 
     def get_prev(self, current):
+        current = flt(current)
         numbers = sorted(lesson['number'] for lesson in self.lessons)
         try:
             index = numbers.index(current)
@@ -180,7 +341,8 @@ class CourseOutline:
     def get_chapters(self):
         return frappe.db.get_all("Chapter",
             filters={"course": self.course.name},
-            fields=["name", "title", "index_"])
+            fields=["name", "title", "index_"],
+            order_by="index_")
 
     def get_lessons(self):
         chapters = [c['name'] for c in self.chapters]
@@ -190,5 +352,19 @@ class CourseOutline:
 
         chapter_numbers = {c['name']: c['index_'] for c in self.chapters}
         for lesson in lessons:
-            lesson['number'] = "{}.{}".format(chapter_numbers[lesson['chapter']], lesson['index_'])
+            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):
+    course_data = json.loads(doc)
+    course = frappe.get_doc("LMS Course", course_data['name'])
+    course.reindex_exercises()
+    frappe.msgprint("All exercises in this course have been re-indexed.")

community/lms/doctype/lms_course/test_lms_course.py

@@ -15,7 +15,9 @@ class TestLMSCourse(unittest.TestCase):
     def new_course(self, title):
         doc = frappe.get_doc({
             "doctype": "LMS Course",
-            "title": title
+            "title": title,
+            "short_introduction": title,
+            "description": title
         })
         doc.insert()
         return doc
@@ -24,7 +26,6 @@ class TestLMSCourse(unittest.TestCase):
         course = self.new_course("Test Course")
         assert course.title == "Test Course"
         assert course.name == "test-course"
-        assert course.get_mentors() == []
 
     def test_find_all(self):
         courses = LMSCourse.find_all()

community/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.js

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

community/lms/doctype/lms_course_progress/lms_course_progress.js

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

community/lms/doctype/lms_course_progress/lms_course_progress.json

@@ -0,0 +1,78 @@
+{
+ "actions": [],
+ "creation": "2021-05-31 17:20:13.388453",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "status",
+  "column_break_3",
+  "lesson",
+  "chapter",
+  "course"
+ ],
+ "fields": [
+  {
+   "fetch_from": "chapter.course",
+   "fieldname": "course",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Course",
+   "options": "LMS Course",
+   "read_only": 1
+  },
+  {
+   "fetch_from": "lesson.chapter",
+   "fieldname": "chapter",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Chapter",
+   "options": "Chapter",
+   "read_only": 1
+  },
+  {
+   "fieldname": "lesson",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Lesson",
+   "options": "Lesson"
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Status",
+   "options": "Complete\nPartially Complete\nIncomplete"
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-06-02 13:05:31.114939",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Course Progress",
+ "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_course_progress/lms_course_progress.py

@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2021, FOSS United and contributors
 # For license information, please see license.txt
 
-from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-class CodeRevision(Document):
+class LMSCourseProgress(Document):
 	pass

community/lms/doctype/lms_course_progress/test_lms_course_progress.py

@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2021, FOSS United and Contributors
 # See license.txt
-from __future__ import unicode_literals
 
 # import frappe
 import unittest
 
-class TestLMSSketch(unittest.TestCase):
+class TestLMSCourseProgress(unittest.TestCase):
 	pass

community/lms/doctype/lms_course_review/lms_course_review.js

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

community/lms/doctype/lms_course_review/lms_course_review.json

@@ -1,41 +1,41 @@
 {
  "actions": [],
- "creation": "2021-04-07 00:26:28.806520",
+ "creation": "2021-06-28 13:36:36.146718",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "section",
-  "code",
-  "author"
+  "review",
+  "rating",
+  "course"
  ],
  "fields": [
   {
-   "fieldname": "section",
-   "fieldtype": "Link",
+   "fieldname": "review",
+   "fieldtype": "Small Text",
    "in_list_view": 1,
-   "label": "Section",
-   "options": "LMS Section"
+   "label": "Review"
   },
   {
-   "fieldname": "code",
-   "fieldtype": "Code",
-   "label": "Code"
+   "fieldname": "rating",
+   "fieldtype": "Rating",
+   "in_list_view": 1,
+   "label": "Rating"
   },
   {
-   "fieldname": "author",
+   "fieldname": "course",
    "fieldtype": "Link",
    "in_list_view": 1,
-   "label": "Author",
-   "options": "User"
+   "label": "Course",
+   "options": "LMS Course"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-04-14 11:26:19.628317",
+ "modified": "2021-07-05 14:57:03.841430",
  "modified_by": "Administrator",
  "module": "LMS",
- "name": "Code Revision",
+ "name": "LMS Course Review",
  "owner": "Administrator",
  "permissions": [
   {
@@ -53,6 +53,5 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "title_field": "section",
  "track_changes": 1
 }

community/lms/doctype/lms_course_review/lms_course_review.py

@@ -0,0 +1,18 @@
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.model.document import Document
+
+class LMSCourseReview(Document):
+	pass
+
+@frappe.whitelist()
+def submit_review(rating, review, course):
+    frappe.get_doc({
+        "doctype": "LMS Course Review",
+        "rating": rating,
+        "review": review,
+        "course": course
+    }).save(ignore_permissions=True)
+    return "OK"

community/lms/doctype/lms_course_review/test_lms_course_review.py

@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2021, FOSS United and Contributors
 # See license.txt
-from __future__ import unicode_literals
 
 # import frappe
 import unittest
 
-class TestCodeRevision(unittest.TestCase):
+class TestLMSCourseReview(unittest.TestCase):
 	pass

community/lms/doctype/lms_message/lms_message.py

@@ -18,7 +18,7 @@ class LMSMessage(Document):
         template = self.get_message_template()
         message = frappe._dict({
             "author_name": self.author_name,
-            "message_time": frappe.utils.pretty_date(self.creation),
+            "message_time": frappe.utils.format_datetime(self.creation, "dd-mm-yyyy HH:mm"),
             "message": frappe.utils.md_to_html(self.message)
         })
 
@@ -32,26 +32,28 @@ class LMSMessage(Document):
                 template = frappe.render_template(template, {{
                     "message": message
                 }})
-                $(".message-section").append(template);
+                $(".messages").append(template);
+                var message_element = document.getElementsByClassName("messages")[0]
+		        message_element.scrollTo(0, message_element.scrollHeight);
             """.format(template, message, self.owner)
 
         frappe.publish_realtime(event="eval_js", message=js, after_commit=True)
 
     def get_message_template(self):
         return """
-                <div class="discussion {% if message.is_author %} is-author {% endif %}">
+                <li class="{% if message.is_author %} ours {% endif %}">
                     <div class="d-flex justify-content-between">
                     <div class="font-weight-bold">
                             {{ message.author_name }}
                     </div>
-                    <div class="text-muted">
+                    <small class="">
                         {{ message.message_time }}
+                    </small>
                     </div>
-                    </div>
-                    <div class="mt-5">
+                    <div class="message-para">
                         {{ message.message }}
                     </div>
-                </div>
+                </li>
             """
 
     def send_email(self):
@@ -106,4 +108,3 @@ def send_daily_digest():
             },
             delayed = False
         )
-

community/lms/doctype/lms_option/lms_option.json

@@ -0,0 +1,36 @@
+{
+ "actions": [],
+ "creation": "2021-06-07 10:46:10.402684",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "option",
+  "is_correct"
+ ],
+ "fields": [
+  {
+   "fieldname": "option",
+   "fieldtype": "Data",
+   "label": "Option"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_correct",
+   "fieldtype": "Check",
+   "label": "Is Correct"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2021-06-07 10:48:45.290227",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Option",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

community/lms/doctype/lms_option/lms_option.py

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

community/lms/doctype/lms_quiz/lms_quiz.js

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

community/lms/doctype/lms_quiz/lms_quiz.json

@@ -1,45 +1,41 @@
 {
  "actions": [],
- "autoname": "format:SKETCH-{#}",
- "creation": "2021-03-09 16:31:50.523524",
+ "autoname": "field:title",
+ "creation": "2021-06-07 10:50:17.893625",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "title",
-  "runtime",
-  "code",
-  "svg"
+  "questions",
+  "lesson"
  ],
  "fields": [
   {
    "fieldname": "title",
    "fieldtype": "Data",
-   "label": "Title"
+   "label": "Title",
+   "unique": 1
   },
   {
-   "fieldname": "runtime",
-   "fieldtype": "Data",
-   "label": "Runtime"
+   "fieldname": "questions",
+   "fieldtype": "Table",
+   "label": "Questions",
+   "options": "LMS Quiz Question"
   },
   {
-   "fieldname": "code",
-   "fieldtype": "Code",
-   "label": "Code"
-  },
-  {
-   "fieldname": "svg",
-   "fieldtype": "Code",
-   "label": "SVG",
-   "read_only": 1
+   "fieldname": "lesson",
+   "fieldtype": "Link",
+   "label": "Lesson",
+   "options": "Lesson"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-03-12 08:42:56.671658",
+ "modified": "2021-06-23 17:58:57.642873",
  "modified_by": "Administrator",
  "module": "LMS",
- "name": "LMS Sketch",
+ "name": "LMS Quiz",
  "owner": "Administrator",
  "permissions": [
   {
@@ -57,6 +53,5 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_views": 1
+ "track_changes": 1
 }

community/lms/doctype/lms_quiz/lms_quiz.py

@@ -0,0 +1,79 @@
+# 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):
+        self.validate_correct_answers()
+
+    def validate_correct_answers(self):
+        for question in self.questions:
+            correct_options = self.get_correct_options(question)
+
+            if len(correct_options) > 1:
+                question.multiple = 1
+
+            if not len(correct_options):
+                frappe.throw(_("At least one answer must be correct for this question: {0}").format(frappe.bold(question.question)))
+
+    def get_correct_options(self, question):
+        correct_option_fields = ["is_correct_1", "is_correct_2", "is_correct_3", "is_correct_4"]
+        return list(filter(lambda x: question.get(x) == 1, correct_option_fields))
+
+    def get_last_submission_details(self):
+        """Returns the latest submission for this user.
+        """
+        user = frappe.session.user
+        if not user or user == "Guest":
+            return
+
+        result = frappe.get_all('LMS Quiz Submission',
+            fields="*",
+            filters={
+                "owner": user,
+                "quiz": self.name
+            },
+            order_by="creation desc",
+            page_length=1)
+
+        if result:
+            return result[0]
+
+@frappe.whitelist()
+def submit(quiz, result):
+    score = 0
+    answer_map = {
+        "is_correct_1": "option_1",
+        "is_correct_2": "option_2",
+        "is_correct_3": "option_3",
+        "is_correct_4": "option_4"
+    }
+    result = json.loads(result)
+    quiz_details = frappe.get_doc("LMS Quiz", quiz)
+
+    for response in result:
+        match = list(filter(lambda x: x.question == response.get("question"), quiz_details.questions))[0]
+        correct_options = quiz_details.get_correct_options(match)
+        correct_answers = [ match.get(answer_map[option]) for option in correct_options ]
+
+        if response.get("answer") == correct_answers:
+            response["result"] = "Right"
+            score += 1
+        else:
+            response["result"] = "Wrong"
+        response["answer"] = ("").join([ ans if idx == len(response.get("answer")) -1 else ans + ", "  for idx, ans in enumerate(response.get("answer")) ])
+
+    frappe.get_doc({
+        "doctype": "LMS Quiz Submission",
+        "quiz": quiz,
+        "result": result,
+        "score": score
+    }).save(ignore_permissions=True)
+    update_progress(quiz_details.lesson)
+    return score

community/lms/doctype/lms_quiz/test_lms_quiz.py

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

community/lms/doctype/lms_quiz_question/lms_quiz_question.json

@@ -0,0 +1,118 @@
+{
+ "actions": [],
+ "creation": "2021-06-07 10:48:57.994714",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "question",
+  "options_section",
+  "option_1",
+  "is_correct_1",
+  "section_break_5",
+  "option_2",
+  "is_correct_2",
+  "column_break_4",
+  "option_3",
+  "is_correct_3",
+  "section_break_11",
+  "option_4",
+  "is_correct_4",
+  "multiple"
+ ],
+ "fields": [
+  {
+   "fieldname": "question",
+   "fieldtype": "Text",
+   "in_list_view": 1,
+   "label": "Question",
+   "reqd": 1
+  },
+  {
+   "fieldname": "option_1",
+   "fieldtype": "Data",
+   "label": "Option 1",
+   "reqd": 1
+  },
+  {
+   "fieldname": "option_2",
+   "fieldtype": "Data",
+   "label": "Option 2",
+   "reqd": 1
+  },
+  {
+   "fieldname": "option_3",
+   "fieldtype": "Data",
+   "label": "Option 3"
+  },
+  {
+   "fieldname": "option_4",
+   "fieldtype": "Data",
+   "label": "Option 4"
+  },
+  {
+   "default": "0",
+   "depends_on": "option_1",
+   "fieldname": "is_correct_1",
+   "fieldtype": "Check",
+   "label": "Is Correct"
+  },
+  {
+   "default": "0",
+   "depends_on": "option_2",
+   "fieldname": "is_correct_2",
+   "fieldtype": "Check",
+   "label": "Is Correct"
+  },
+  {
+   "default": "0",
+   "depends_on": "option_3",
+   "fieldname": "is_correct_3",
+   "fieldtype": "Check",
+   "label": "Is Correct"
+  },
+  {
+   "default": "0",
+   "depends_on": "option_4",
+   "fieldname": "is_correct_4",
+   "fieldtype": "Check",
+   "label": "Is Correct"
+  },
+  {
+   "default": "0",
+   "fieldname": "multiple",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Multiple Correct Answers",
+   "read_only": 1
+  },
+  {
+   "fieldname": "options_section",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "section_break_5",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "section_break_11",
+   "fieldtype": "Section Break"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2021-06-22 16:54:13.133859",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Quiz Question",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

community/lms/doctype/lms_quiz_question/lms_quiz_question.py

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

community/lms/doctype/lms_quiz_result/lms_quiz_result.json

@@ -0,0 +1,45 @@
+{
+ "actions": [],
+ "creation": "2021-06-07 14:19:23.683323",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "question",
+  "answer",
+  "result"
+ ],
+ "fields": [
+  {
+   "fieldname": "question",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Question"
+  },
+  {
+   "fieldname": "result",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Result",
+   "options": "Right\nWrong"
+  },
+  {
+   "fieldname": "answer",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Users Response"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2021-06-22 18:32:28.813159",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Quiz Result",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

community/lms/doctype/lms_quiz_result/lms_quiz_result.py

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

community/lms/doctype/lms_quiz_submission/lms_quiz_submission.js

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

community/lms/doctype/lms_quiz_submission/lms_quiz_submission.json

@@ -0,0 +1,55 @@
+{
+ "actions": [],
+ "creation": "2021-06-07 14:19:54.958989",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "quiz",
+  "result",
+  "score"
+ ],
+ "fields": [
+  {
+   "fieldname": "quiz",
+   "fieldtype": "Link",
+   "label": "Quiz",
+   "options": "LMS Quiz"
+  },
+  {
+   "fieldname": "result",
+   "fieldtype": "Table",
+   "label": "Result",
+   "options": "LMS Quiz Result"
+  },
+  {
+   "fieldname": "score",
+   "fieldtype": "Data",
+   "label": "Score"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-06-07 14:19:54.958989",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Quiz Submission",
+ "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_quiz_submission/lms_quiz_submission.py

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

community/lms/doctype/lms_quiz_submission/test_lms_quiz_submission.py

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

community/lms/doctype/lms_section/lms_section.json

@@ -1,66 +0,0 @@
-{
- "actions": [],
- "creation": "2021-03-05 15:10:53.906006",
- "doctype": "DocType",
- "engine": "InnoDB",
- "field_order": [
-  "label",
-  "type",
-  "contents",
-  "code",
-  "attrs",
-  "index",
-  "id"
- ],
- "fields": [
-  {
-   "fieldname": "label",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Label"
-  },
-  {
-   "fieldname": "type",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Type"
-  },
-  {
-   "fieldname": "contents",
-   "fieldtype": "Markdown Editor",
-   "label": "Contents"
-  },
-  {
-   "fieldname": "code",
-   "fieldtype": "Code",
-   "label": "Code"
-  },
-  {
-   "fieldname": "attrs",
-   "fieldtype": "Long Text",
-   "label": "attrs"
-  },
-  {
-   "fieldname": "index",
-   "fieldtype": "Int",
-   "label": "Index"
-  },
-  {
-   "fieldname": "id",
-   "fieldtype": "Data",
-   "label": "id"
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2021-05-19 18:55:26.019625",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "LMS Section",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

community/lms/doctype/lms_section/lms_section.py

@@ -14,6 +14,10 @@ class LMSSection(Document):
         if self.type == "exercise":
             return frappe.get_doc("Exercise", self.id)
 
+    def get_quiz(self):
+        if self.type == "quiz":
+            return frappe.get_doc("LMS Quiz", self.id)
+
     def get_latest_code_for_user(self):
         """Returns the latest code for the logged in user.
         """

community/lms/doctype/lms_sketch/livecode.py

@@ -1,126 +0,0 @@
-"""Utilities to work with livecode service.
-"""
-import websocket
-import json
-from .svg import SVG
-import frappe
-from urllib.parse import urlparse
-
-# Files to pass to livecode server
-# The same code is part of livecode-canvas.js
-# TODO: generate livecode-canvas.js from this file
-START = '''
-import sketch
-code = open("main.py").read()
-env = dict(sketch.__dict__)
-exec(code, env)
-'''
-
-SKETCH = '''
-import json
-
-def sendmsg(msgtype, function, args):
-  """Sends a message to the frontend.
-
-  The frontend will receive the specified message whenever
-  this function is called. The frontend can decide to some
-  action on each of these messages.
-  """
-  msg = dict(msgtype=msgtype, function=function, args=args)
-  print("--MSG--", json.dumps(msg))
-
-def _draw(func, **kwargs):
-  sendmsg(msgtype="draw", function=func, args=kwargs)
-
-def circle(x, y, d):
-    """Draws a circle of diameter d with center (x, y).
-    """
-    _draw("circle", x=x, y=y, d=d)
-
-def line(x1, y1, x2, y2):
-    """Draws a line from point (x1, y1) to point (x2, y2).
-    """
-    _draw("line", x1=x1, y1=y1, x2=x2, y2=y2)
-
-def rect(x, y, w, h):
-    """Draws a rectangle on the canvas.
-
-    Parameters
-    ----------
-    x: x coordinate of the top-left corner of the rectangle
-    y: y coordinate of the top-left corner of the rectangle
-    w: width of the rectangle
-    h: height of the rectangle
-    """
-    _draw("rect", x=x, y=y, w=w, h=h)
-
-def clear():
-    _draw("clear")
-
-# clear the canvas on start
-clear()
-'''
-
-def get_livecode_url():
-    doc = frappe.get_cached_doc("LMS Settings")
-    return doc.livecode_url
-
-def get_livecode_ws_url():
-    url = urlparse(get_livecode_url())
-    protocol = "wss" if url.scheme == "https" else "ws"
-    return protocol + "://" + url.netloc + "/livecode"
-
-def livecode_to_svg(livecode_ws_url, code, *, timeout=3):
-    """Renders the code as svg.
-    """
-    if livecode_ws_url is None:
-        livecode_ws_url = get_livecode_ws_url()
-
-    try:
-        ws = websocket.WebSocket()
-        ws.settimeout(timeout)
-        ws.connect(livecode_ws_url)
-
-        msg = {
-            "msgtype": "exec",
-            "runtime": "python",
-            "code": code,
-            "files": [
-                {"filename": "start.py", "contents": START},
-                {"filename": "sketch.py", "contents": SKETCH},
-            ],
-            "command": ["python", "start.py"]
-        }
-        ws.send(json.dumps(msg))
-
-        messages = _read_messages(ws)
-        commands = [m for m in messages if m['msgtype'] == 'draw']
-        img = draw_image(commands)
-        return img.tostring()
-    except websocket.WebSocketException as e:
-        frappe.log_error(frappe.get_traceback(), 'livecode_to_svg failed')
-
-def _read_messages(ws):
-    messages = []
-    try:
-        while True:
-            msg = ws.recv()
-            if not msg:
-                break
-            messages.append(json.loads(msg))
-    except websocket.WebSocketTimeoutException as e:
-        print("Error:", e)
-        pass
-    return messages
-
-def draw_image(commands):
-    img = SVG(width=300, height=300, viewBox="0 0 300 300", fill='none', stroke='black')
-    for c in commands:
-        args = c['args']
-        if c['function'] == 'circle':
-            img.circle(cx=args['x'], cy=args['y'], r=args['d']/2)
-        elif c['function'] == 'line':
-            img.line(x1=args['x1'], y1=args['y1'], x2=args['x2'], y2=args['y2'])
-        elif c['function'] == 'rect':
-            img.rect(x=args['x'], y=args['y'], width=args['w'], height=args['h'])
-    return img

community/lms/doctype/lms_sketch/lms_sketch.py

@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import hashlib
-from urllib.parse import urlparse
-import frappe
-from frappe.model.document import Document
-from . import livecode
-
-DEFAULT_IMAGE = """
-<svg viewBox="0 0 300 300" width="300" xmlns="http://www.w3.org/2000/svg">
-</svg>
-"""
-
-class LMSSketch(Document):
-    @property
-    def sketch_id(self):
-        """Returns the numeric part of the name.
-
-        For example, the skech_id will be "123" for sketch with name "SKETCH-123".
-        """
-        return self.name.replace("SKETCH-", "")
-
-    def get_owner(self):
-        """Returns the owner of this sketch as a document.
-        """
-        return frappe.get_doc("User", self.owner)
-
-    def get_owner_name(self):
-        return self.get_owner().full_name
-
-    def get_livecode_url(self):
-        doc = frappe.get_cached_doc("LMS Settings")
-        return doc.livecode_url
-
-    def get_livecode_ws_url(self):
-        url = urlparse(self.get_livecode_url())
-        protocol = "wss" if url.scheme == "https" else "ws"
-        return protocol + "://" + url.netloc + "/livecode"
-
-    def to_svg(self):
-        return self.svg or self.render_svg()
-
-    def render_svg(self):
-        h = hashlib.md5(self.code.encode('utf-8')).hexdigest()
-        cache = frappe.cache()
-        key = "sketch-" + h
-        value = cache.get(key)
-        if value:
-            value = value.decode('utf-8')
-        else:
-            ws_url = self.get_livecode_ws_url()
-            value = livecode.livecode_to_svg(ws_url, self.code)
-            if value:
-                cache.set(key, value)
-        return value or DEFAULT_IMAGE
-
-    @staticmethod
-    def get_recent_sketches(limit=100, owner=None):
-        """Returns the recent sketches.
-        """
-        filters = {}
-        if owner:
-            filters = {"owner": owner}
-        sketches = frappe.get_all(
-            "LMS Sketch",
-            filters=filters,
-            fields='*',
-            order_by='modified desc',
-            page_length=limit
-        )
-        return [frappe.get_doc(doctype='LMS Sketch', **doc) for doc in sketches]
-
-    def __repr__(self):
-        return f"<LMSSketch {self.name}>"
-
-@frappe.whitelist()
-def save_sketch(name, title, code):
-    if not name or name == "new":
-        doc = frappe.new_doc('LMS Sketch')
-        doc.title = title
-        doc.code = code
-        doc.runtime = 'python-canvas'
-        doc.insert(ignore_permissions=True)
-        status = "created"
-    else:
-        doc = frappe.get_doc("LMS Sketch", name)
-
-        if doc.owner != frappe.session.user:
-            return {
-                "ok": False,
-                "error": "Permission Denied"
-            }
-        doc.title = title
-        doc.code = code
-        doc.svg = ''
-        doc.save()
-        status = "updated"
-    return {
-        "ok": True,
-        "status": status,
-        "name": doc.name,
-    }

community/lms/doctype/lms_sketch/svg.py

@@ -1,143 +0,0 @@
-"""SVG rendering library.
-
-USAGE:
-    from svg import SVG
-
-    svg = SVG(width=200, height=200)
-    svg.circle(cx=100, cy=200, r=50)
-    print(svg.tostring())
-"""
-from xml.etree import ElementTree
-
-TAGNAMES = set([
-    "circle", "ellipse",
-    "line", "path", "rect", "polygon", "polyline",
-    "text", "textPath", "title",
-    "marker", "defs",
-    "g"
-])
-
-class Node:
-    """SVG Node"""
-    def __init__(self, tag, **attrs):
-        self.tag = tag
-        self.attrs = dict((k.replace('_', '-'), str(v)) for k, v in attrs.items())
-        self.children = []
-
-    def node(self, tag, **attrs):
-        n = Node(tag, **attrs)
-        self.children.append(n)
-        return n
-
-    def apply(self, func):
-        """Applies a function to this node and
-        all the children recursively.
-        """
-        func(self)
-        for n in self.children:
-            n.apply(func)
-
-    def clone(self):
-        node = Node(self.tag, **self.attrs)
-        node.children = [n.clone() for n in self.children]
-        return node
-
-    def add_node(self, node):
-        if not isinstance(node, Node):
-            node = Text(node)
-        self.children.append(node)
-
-    def __getattr__(self, tag):
-        if tag not in TAGNAMES:
-            raise AttributeError(tag)
-        return lambda **attrs: self.node(tag, **attrs)
-
-    def translate(self, x, y):
-        return self.g(transform="translate(%s, %s)" % (x, y))
-
-    def scale(self, *args):
-        return self.g(transform="scale(%s)" % ", ".join(str(a) for a in args))
-
-    def __repr__(self):
-        return "<%s .../>" % self.tag
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, type, value, traceback):
-        pass
-
-    def build_tree(self, builder):
-        builder.start(self.tag, self.attrs)
-        for node in self.children:
-            node.build_tree(builder)
-        return builder.end(self.tag)
-
-    def _indent(self, elem, level=0):
-        """Indent etree node for prettyprinting."""
-
-        i = "\n" + level*"  "
-        if len(elem):
-            if not elem.text or not elem.text.strip():
-                elem.text = i + "  "
-            if not elem.tail or not elem.tail.strip():
-                elem.tail = i
-            for elem in elem:
-                self._indent(elem, level+1)
-            if not elem.tail or not elem.tail.strip():
-                elem.tail = i
-        else:
-            if level and (not elem.tail or not elem.tail.strip()):
-                elem.tail = i
-
-    def save(self, filename, encoding='utf-8'):
-        f = open(filename, 'w')
-        f.write(self.tostring())
-        f.close()
-
-    def tostring(self, encoding='utf-8'):
-        builder = ElementTree.TreeBuilder()
-        self.build_tree(builder)
-        e = builder.close()
-        self._indent(e)
-        return ElementTree.tostring(e, encoding).decode(encoding)
-
-class Text(Node):
-    """Text Node
-
-        >>> p = Node("p")
-        >>> p.add_node("hello, world!")
-        >>> p.tostring()
-        '<p>hello, world!</p>'
-    """
-    def __init__(self, text):
-        Node.__init__(self, "__text__")
-        self._text = text
-
-    def build_tree(self, builder):
-        builder.data(str(self._text))
-
-class SVG(Node):
-    """
-        >>> svg = SVG(width=200, height=200)
-        >>> svg.rect(x=0, y=0, width=200, height=200, fill="blue")
-        <rect .../>
-        >>> with svg.translate(-50, -50) as g:
-        ...     g.rect(x=0, y=0, width=50, height=100, fill="red")
-        ...     g.rect(x=50, y=0, width=50, height=100, fill="green")
-        <rect .../>
-        <rect .../>
-        >>> print(svg.tostring())
-        <svg width="200" height="200" xmlns="http://www.w3.org/2000/svg">
-          <rect x="0" y="0" width="200" height="200" fill="blue" />
-          <g transform="translate(-50, -50)">
-            <rect x="0" y="0" width="50" height="100" fill="red" />
-            <rect x="50" y="0" width="50" height="100" fill="green" />
-          </g>
-        </svg>
-
-    """
-    def __init__(self, **attrs):
-        attrs['xmlns'] = "http://www.w3.org/2000/svg"
-        Node.__init__(self, 'svg', **attrs)
-

community/lms/md.py

@@ -0,0 +1,109 @@
+"""
+The md module extends markdown to add macros.
+
+Macros can be added to the markdown text in the following format.
+
+    {{ MacroName("macro-argument") }}
+
+These macros will be rendered using a pluggable mechanism.
+
+Apps can provide a hook community_markdown_macro_renderers, a
+dictionary mapping the macro name to the function that to render
+that macro. The function will get the argument passed to the macro
+as argument.
+"""
+
+import frappe
+import re
+from bs4 import BeautifulSoup
+import markdown
+from markdown import Extension
+from markdown.inlinepatterns import InlineProcessor
+import xml.etree.ElementTree as etree
+
+def markdown_to_html(text):
+    """Renders markdown text into html.
+    """
+    return markdown.markdown(text, extensions=['fenced_code', MacroExtension()])
+
+def find_macros(text):
+    """Returns all macros in the given text.
+
+        >>> find_macros(text)
+        [
+            ('YouTubeVideo': 'abcd1234')
+            ('Exercise', 'two-circles'),
+            ('Exercise', 'four-circles')
+        ]
+    """
+    if not text:
+        return []
+    macros = re.findall(MACRO_RE, text)
+    # remove the quotes around the argument
+    return [(name, _remove_quotes(arg)) for name, arg in macros]
+
+def _remove_quotes(value):
+    """Removes quotes around a value.
+
+    Also strips the whitespace.
+
+        >>> _remove_quotes('"hello"')
+        'hello'
+        >>> _remove_quotes("'hello'")
+        'hello'
+        >>> _remove_quotes("hello")
+        'hello'
+    """
+    return value.strip(" '\"")
+
+
+def get_macro_registry():
+    d = frappe.get_hooks("community_markdown_macro_renderers") or {}
+    return {name: frappe.get_attr(klass[0]) for name, klass in d.items()}
+
+def render_macro(macro_name, macro_argument):
+    # stripping the quotes on either side of the argument
+    macro_argument = _remove_quotes(macro_argument)
+
+    registry = get_macro_registry()
+    if macro_name in registry:
+        return registry[macro_name](macro_argument)
+    else:
+        return f"<p>Unknown macro: {macro_name}</p>"
+
+MACRO_RE = r'{{ *(\w+)\(([^{}]*)\) *}}'
+
+class MacroExtension(Extension):
+    """MacroExtension is a markdown extension to support macro syntax.
+    """
+    def extendMarkdown(self, md):
+        self.md = md
+        pattern = MacroInlineProcessor(MACRO_RE)
+        pattern.md = md
+        md.inlinePatterns.register(pattern, 'macro', 75)
+
+class MacroInlineProcessor(InlineProcessor):
+    """MacroInlineProcessor is class that is handles the logic
+    of how to render each macro occurence in the markdown text.
+    """
+    def handleMatch(self, m, data):
+        """Handles each macro match and return rendered contents
+        for that macro as an etree node.
+        """
+        macro = m.group(1)
+        arg = m.group(2)
+        html = render_macro(macro, arg)
+        html = sanitize_html(str(html))
+        e = etree.fromstring(html)
+        return e, m.start(0), m.end(0)
+
+def sanitize_html(html):
+    """Sanotize the html using BeautifulSoup.
+
+    The markdown processor request the correct markup and crashes on
+    any broken tags. This makes sures that all those things are fixed
+    before passing to the etree parser.
+    """
+    soup = BeautifulSoup(html, features="lxml")
+    nodes = soup.body.children
+    return "<div>" + "\n".join(str(node) for node in nodes) + "</div>"

community/lms/models.py

@@ -1,5 +1,4 @@
 """Handy module to make access to all doctypes from a single place.
 """
 from .doctype.lms_course.lms_course import LMSCourse as Course
-from .doctype.lms_sketch.lms_sketch import LMSSketch as Sketch
-
+from .doctype.lms_batch_membership.lms_batch_membership import LMSBatchMembership as Membership

community/lms/section_parser.py

@@ -1,84 +0,0 @@
-"""Utility to split the text in the topic into multiple sections.
-
-{{ section(type="example", id="foo") }}
-circle(100, 100, 50)
-{{ end }}
-
-"""
-from __future__ import annotations
-from dataclasses import dataclass
-import re
-from typing import List, Tuple, Dict, Iterator
-
-RE_SECTION = re.compile(r"^\{\{\s(\w+)\s*(?:\((.*)\))?\s*\}\}\s*")
-class SectionParser:
-    def parse(self, text: str) -> Iterator[Section]:
-        """Parses given text into sections and return an iterator over sections.
-        """
-        lines = text.splitlines()
-        marked_lines = self.parse_lines(lines)
-        return self.group_sections(marked_lines)
-
-    def parse_lines(self, lines: List[str]) -> List[Tuple[str, str, str]]:
-        for line in lines:
-            m = RE_SECTION.match(line)
-            if m:
-                yield m.group(1), self.parse_attrs(m.group(2)), None
-            else:
-                yield None, None, line
-
-    def parse_attrs(self, attrs_str: str) -> Dict[str, str]:
-        # XXX-Anand: Hack
-        code = "dict({})".format(attrs_str or "")
-        return eval(code)
-
-    def group_sections(self, marked_lines) -> Iterator[Section]:
-        index = 0
-
-        def make_section(type='text', id=None, label=None, **attrs):
-            nonlocal index
-            index += 1
-
-            id = id or f"section-{index}"
-            label = label or id
-            return Section(
-                type=type,
-                id=id,
-                label=label,
-                attrs=attrs)
-
-        section = make_section("text")
-
-        for mark, attrs, line in marked_lines:
-            if not mark:
-                section.append(line)
-                continue
-
-            yield section
-
-            if mark == 'end':
-                section = make_section(type='text')
-            else:
-                section = make_section(**attrs)
-
-        yield section
-
-@dataclass
-class Section:
-    """One section of the Topic.
-    """
-    type: str
-    id: str
-    label: str
-    contents: str = ""
-    attrs: dict = None
-
-    def append(self, line):
-        if not line.endswith("\n"):
-            line = line + "\n"
-        self.contents += line
-
-    def __repr__(self):
-        attrs = dict(type=self.type, id=self.id, label=self.label, **self.attrs)
-        attrs_str = ", ".join(f'{k}="{v}"' for k, v in attrs.items())
-        return f'<Section({attrs_str})>'

community/lms/web_form/add_a_new_batch/add_a_new_batch.json

@@ -11,7 +11,7 @@
  "apply_document_permissions": 0,
  "button_label": "Save",
  "creation": "2021-04-20 11:37:49.135114",
- "custom_css": ".datepicker.active {\n    background-color: white;\n}",
+ "custom_css": ".datepicker.active {\n    background-color: white;\n}\n\n[data-doctype=\"Web Form\"] {\n    max-width: 720px;\n    margin: 6rem auto;\n}",
  "doc_type": "LMS Batch",
  "docstatus": 0,
  "doctype": "Web Form",
@@ -19,7 +19,7 @@
  "is_standard": 1,
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2021-04-30 11:22:18.188712",
+ "modified": "2021-06-15 18:49:50.530001",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "add-a-new-batch",
@@ -39,12 +39,12 @@
    "allow_read_on_all_link_options": 0,
    "fieldname": "course",
    "fieldtype": "Data",
-   "hidden": 0,
+   "hidden": 1,
    "label": "Course",
    "max_length": 0,
    "max_value": 0,
-   "options": "",
-   "read_only": 1,
+   "options": "LMS Course",
+   "read_only": 0,
    "reqd": 0,
    "show_in_filter": 0
   },
@@ -111,4 +111,4 @@
    "show_in_filter": 0
   }
  ]
-}
+}

community/lms/web_form/join_a_batch/join_a_batch.json

@@ -1,48 +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-04-15 13:32:14.171328",
- "doc_type": "LMS Batch Membership",
- "docstatus": 0,
- "doctype": "Web Form",
- "idx": 0,
- "is_standard": 1,
- "login_required": 1,
- "max_attachment_size": 0,
- "modified": "2021-04-15 13:32:14.171328",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "join-a-batch",
- "owner": "Administrator",
- "payment_button_label": "Buy Now",
- "published": 1,
- "route": "join-a-batch",
- "route_to_success_link": 0,
- "show_attachments": 0,
- "show_in_grid": 0,
- "show_sidebar": 0,
- "sidebar_items": [],
- "success_url": "/join-a-batch",
- "title": "Join a Batch",
- "web_form_fields": [
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldtype": "Attach",
-   "hidden": 0,
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  }
- ]
-}

community/lms/web_form/profile/profile.json

@@ -0,0 +1,125 @@
+{
+ "accept_payment": 0,
+ "allow_comments": 0,
+ "allow_delete": 0,
+ "allow_edit": 1,
+ "allow_incomplete": 0,
+ "allow_multiple": 0,
+ "allow_print": 0,
+ "amount": 0.0,
+ "amount_based_on_field": 0,
+ "apply_document_permissions": 0,
+ "breadcrumbs": "",
+ "button_label": "Save",
+ "creation": "2021-06-30 13:48:13.682851",
+ "doc_type": "User",
+ "docstatus": 0,
+ "doctype": "Web Form",
+ "idx": 0,
+ "is_standard": 1,
+ "login_required": 1,
+ "max_attachment_size": 0,
+ "modified": "2021-06-30 15:53:20.967466",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "profile",
+ "owner": "Administrator",
+ "payment_button_label": "Buy Now",
+ "published": 1,
+ "route": "profile",
+ "route_to_success_link": 0,
+ "show_attachments": 0,
+ "show_in_grid": 0,
+ "show_sidebar": 0,
+ "sidebar_items": [],
+ "success_url": "/profile",
+ "title": "Profile",
+ "web_form_fields": [
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "first_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "First Name",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 1,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "middle_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "Middle Name (Optional)",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "last_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "Last Name",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "description": "Get your globally recognized avatar from Gravatar.com",
+   "fieldname": "user_image",
+   "fieldtype": "Attach Image",
+   "hidden": 0,
+   "label": "User Image",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "username",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "Username",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "mobile_no",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "Mobile No",
+   "max_length": 0,
+   "max_value": 0,
+   "options": "Phone",
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "bio",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "label": "Bio",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  }
+ ]
+}

community/lms/web_form/profile/profile.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import frappe
 
 def get_context(context):

community/lms/widgets/BatchHeader.html

@@ -0,0 +1,4 @@
+<div class="p-5 batch-header">
+  <h3>{{batch_name}}</h3>
+  <div class="text-muted">{{member_count}} members</div>
+</div>

community/lms/widgets/BatchTabs.html

@@ -0,0 +1,67 @@
+<div class="mt-5">
+  <a class="anchor_style" href="/courses">Courses</a> /{% if course.is_mentor(frappe.session.user) %} <a
+    class="anchor_style" href="/courses/{{ course.name }}"> {{ course.title }}</a> {% else %} <span class="text-muted">
+    {{ course.title }}</span> {% endif %}
+  {% set all_memberships = course.get_all_memberships(frappe.session.user) %}
+  {% if membership and membership.batch and all_memberships | length > 1 %}
+  <a class="pull-right dropdown-item border rounded" style="width: 10rem;" href="#" id="navbarDropdown" role="button"
+    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    {{ membership.batch_title }}
+  </a>
+  <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+    {% for data in all_memberships %}
+    {% if data.batch != membership.batch %}
+    <a class="dropdown-item switch-batch"
+      href="/courses/{{ course.name }}/home?batch={{ data.batch }}">{{ data.batch_title }}</a>
+    {% endif %}
+    {% endfor %}
+  </div>
+  {% endif %}
+</div>
+{% if not membership %}
+{% set display_class = "hide" %}
+{% else %}
+{% set display_class = "" %}
+{% endif %}
+
+<ul class="nav nav-tabs mt-4">
+  <li class="nav-item">
+    <a class="nav-link" id="home" href="/courses/{{course.name}}/home{{ course.query_parameter }}">Home</a>
+  </li>
+  <li class="nav-item">
+    {% set lesson_index = course.get_lesson_index(membership.current_lesson) if membership and membership.current_lesson
+    else '1.1' %}
+    <a class="nav-link" id="learn"
+      href="{{ course.get_learn_url(lesson_index) }}{{ course.query_parameter }}">Lessons</a>
+  </li>
+  <!-- <li class="nav-item">
+    <a class="nav-link" id="schedule" href="/courses/{{course.name}}/schedule">Schedule</a>
+  </li> -->
+  <li class="nav-item {{ display_class }}">
+    <a class="nav-link" id="members" href="/courses/{{course.name}}/members{{ course.query_parameter }}">Members</a>
+  </li>
+  <!-- <li class="nav-item {{ display_class }}">
+    <a class="nav-link" id="discussion" href="/courses/{{course.name}}/discuss">Discussion</a>
+  </li> -->
+  <!-- <li class="nav-item">
+    <a class="nav-link" id="about" href="/courses/{{course.name}}/about">About</a>
+  </li> -->
+  {% if membership and membership.batch and course.is_mentor(frappe.session.user) %}
+  <li class="nav-item">
+    <a class="nav-link" id="progress" href="/courses/{{course.name}}/progress{{ course.query_parameter }}">Progress</a>
+  </li>
+  {% endif %}
+</ul>
+{% block script %}
+<script>
+  frappe.ready(() => {
+    var selector = document.querySelector(`a[href="${decodeURIComponent(window.location.pathname)}{{ course.query_parameter }}"]`)
+    if (selector) {
+      selector.classList.add('active');
+    }
+    else {
+      $("#learn").addClass('active')
+    }
+  })
+</script>
+{% endblock %}

community/lms/widgets/BreadCrumb.html

@@ -0,0 +1,19 @@
+<div class="course-instructor breadcrumb">
+  <a class="dark-links" href="/courses">All Courses</a>
+  <img class="ml-1 mr-1" src="/assets/community/icons/chevron-right.svg">
+
+  {% if course %}
+  {% if lesson %}
+  <a class="dark-links" href="/courses/{{ course.name }}">{{ course.title }}</a>
+  <img class="ml-1 mr-1" src="/assets/community/icons/chevron-right.svg">
+  <span class="muted-text"> {{ lesson.title }}</span>
+  {% else %}
+  <span class="muted-text">{{ course.title }}</span>
+  {% endif %}
+  {% endif %}
+
+  {% if member_name %}
+  <span class="muted-text">{{ member_name }}</span>
+  {% endif %}
+
+</div>

community/lms/widgets/ChapterTeaser.html

@@ -1,15 +1,98 @@
-<div class="chapter-teaser">
-  <div class="teaser-body">
-    <h3 class="chapter-title"><span class="chapter-number">{{index}}</span> {{ chapter.title }}</h3>
-    <div class="chapter-description">
-      {{ chapter.description or "" }}
+<div>
+
+  <div class="small-title chapter-title" data-target="#{{ chapter.get_slugified_chapter_title() }}"
+    data-toggle="collapse" aria-expanded="false">
+    <img class="chapter-icon" src="/assets/community/icons/chevron-right.svg">
+    {{ index }}. {{ chapter.title }}
+  </div>
+
+  <div class="chapter-content collapse navbar-collapse" id="{{ chapter.get_slugified_chapter_title() }}">
+
+    <div class="chapter-description muted-text">
+      {{ chapter.description }}
     </div>
-    <div class="chapter-lessons">
+
+    <div class="lessons">
+
       {% for lesson in chapter.get_lessons() %}
-        <div class="lesson-teaser">
-          {{lesson.title}}
+
+      <div class="lesson-info {% if membership.current_lesson == lesson.name %} active-lesson {% endif %}">
+
+        {% if membership or lesson.include_in_preview %}
+        <a class="lesson-links"
+          href="{{ course.get_learn_url(course.get_lesson_index(lesson.name)) }}{{course.query_parameter}}"
+          data-course="{{ course.name }}">
+          {{ lesson.title }}
+
+          {% if membership %}
+          <img class="{{ course.get_progress(lesson.name) != 'Complete' and 'hide' }}"
+            src="/assets/community/icons/check.svg">
+          {% endif %}
+
+        </a>
+
+        {% else %}
+        <div class="no-preview" title="This lesson is not available for preview">
+          <div class="lesson-links">
+            {{ lesson.title }}
+            <img class="ml-2" src="/assets/community/icons/lock.svg">
+          </div>
         </div>
+        {% endif %}
+
+      </div>
       {% endfor %}
+
     </div>
   </div>
 </div>
+
+{% if index != course.get_chapters() | length %}
+<div class="card-divider"></div>
+{% endif %}
+
+<script>
+  frappe.ready(() => {
+    expand_the_active_chapter();
+  })
+
+  var expand_the_first_chapter = () => {
+    var elements = $(".collapse");
+    elements.each((i, element) => {
+      if (i <= 1) {
+        show_section(element);
+      }
+    });
+  }
+
+  var expand_the_active_chapter = () => {
+
+    /* Find anchor matching the URL for course details page */
+    var selector = $(`a[href="${decodeURIComponent(window.location.pathname)}"]`).parent();
+    if (!selector.length) {
+      selector = $(`a[href^="${decodeURIComponent(window.location.pathname)}"]`).parent();
+    }
+    if (selector.length && $(".course-details-page").length) {
+      $(".lesson-info").removeClass("active-lesson")
+      selector.addClass("active-lesson");
+      show_section(selector.parent().parent());
+    }
+
+    /* For course home page */
+    else if ($(".active-lesson").length) {
+      selector = $(".active-lesson")
+      show_section(selector.parent().parent());
+    }
+
+    /* If no active chapter then exapand the first chapter */
+    else {
+      expand_the_first_chapter();
+    }
+  }
+
+  var show_section = (element) => {
+    $(element).addClass("show");
+    $(element).siblings(".chapter-title").children(".chapter-icon").css("transform", "rotate(90deg)");
+  }
+
+</script>

community/lms/widgets/CourseCard.html

@@ -0,0 +1,63 @@
+<div class="common-card-style course-card">
+  <div class="course-image" style="background-image: url({{ course.image }});">
+    <div class="course-tags">
+      {% for tag in course.get_tags() %}
+      <div class="course-card-pills">{{ tag }}</div>
+      {% endfor %}
+    </div>
+  </div>
+  <div class="course-card-content">
+    <div class="course-card-meta muted-text">
+      {% if course.get_chapters() | length %}
+      <span>
+        {{ course.get_chapters() | length }} Chapters
+      </span>
+      {% endif %}
+      {% if course.get_chapters() | length and course.get_upcoming_batches() | length %}
+      <span class="font-weight-bold ml-3 mr-3"> . </span>
+      {% endif %}
+      {% if course.get_upcoming_batches() | length %}
+      <span class="">
+        {{ course.get_upcoming_batches() | length }} Open Batches
+      </span>
+      {% endif %}
+    </div>
+    <div class="course-card-title">{{ course.title }}</div>
+    <div class="card-divider"></div>
+    <div class="course-card-meta-2">
+      {{ widgets.Avatar(member=course.get_instructor(), avatar_class="avatar-small") }}
+      <span class="course-instructor">
+        {{ course.get_instructor().full_name }}
+      </span>
+      {% if course.get_students() | length %}
+      <span class="course-student-count">
+        <img class="icon-background mr-1" src="/assets/community/icons/user.svg" />
+        {{ course.get_students() | length }}
+      </span>
+      {% endif %}
+    </div>
+    {% set membership = course.get_membership(frappe.session.user) %}
+
+    {% set lesson_index = course.get_lesson_index(membership.current_lesson) if membership and
+    membership.current_lesson
+    else '1.1' %}
+
+    {% set query_parameter = "?batch=" + membership.batch if membership and membership.batch else "" %}
+
+    {% if membership %}
+
+    <div class="view-course-link is-primary">
+      Continue Course <img class="ml-3" src="/assets/community/icons/white-arrow.svg" />
+    </div>
+    <a class="stretched-link" href="{{ course.get_learn_url(lesson_index) }}{{ query_parameter }}"></a>
+
+    {% else %}
+
+    <div class="view-course-link">
+      View Course <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
+    </div>
+    <a class="stretched-link" href="/courses/{{ course.name }}"></a>
+
+    {% endif %}
+  </div>
+</div>

community/lms/widgets/CourseOutline.html

@@ -0,0 +1,12 @@
+{% if course.get_chapters() | length %}
+<div class="">
+  <div class="course-home-headings">
+    Course Outline
+  </div>
+  <div class="coure-outline">
+    {% for chapter in course.get_chapters() %}
+    {{ widgets.ChapterTeaser(index=loop.index, chapter=chapter, course=course, batch=batch, membership=membership) }}
+    {% endfor %}
+  </div>
+</div>
+{% endif %}

community/lms/widgets/Exercise.html

@@ -1,7 +1,7 @@
 {% from "www/macros/livecode.html" import LiveCodeEditorJS, LiveCodeEditor with context %}
 
 <div class="exercise">
-  <h2>{{ exercise.title }}</h2>
+  <h2>Exercise {{exercise.index_label}}: {{ exercise.title }}</h2>
   <div class="exercise-description">{{frappe.utils.md_to_html(exercise.description)}}</div>
 
   {% if exercise.image %}

community/lms/widgets/InstructorSection.html

@@ -0,0 +1,6 @@
+<div class="instructor">
+  {{ widgets.Avatar(member=instructor, avatar_class="avatar-medium") }}
+  <a class="ml-1 instructor-title" href="/{{instructor.username}}">{{ instructor.full_name }}</a>
+  <div class="instructor-subtitle">Course Creator</div>
+  <!-- <div class="instructor-subtitle">Created {{instructor.get_course_count()}} courses</div> -->
+</div>

community/lms/widgets/MemberCard.html

@@ -0,0 +1,15 @@
+<div class="common-card-style member-card {{dimension_class}} ">
+  {% set avatar_class = "avatar-large" if dimension_class == "member-card-medium" else "avatar-xl"%}
+  {{ widgets.Avatar(member=member, avatar_class=avatar_class) }}
+  <div class="small-title member-card-title">
+    {{ member.full_name }}
+  </div>
+  {% set course_count = member.get_authored_courses() | length %}
+  {% if show_course_count and course_count > 0 %}
+  {% set suffix = "Courses" if course_count > 1 else "Course" %}
+  <div class="small-title">
+    Created {{ course_count }} {{ suffix }}
+  </div>
+  {% endif %}
+  <a class="stretched-link" href="/{{ member.username }}"></a>
+</div>

community/lms/widgets/RenderBatch.html

@@ -0,0 +1,30 @@
+<div class="batch">
+  <div class="batch-details">
+    <div class="">Session every {{batch.sessions_on}}</div>
+    <div>{{frappe.utils.format_time(batch.start_time, "short")}} -
+      {{frappe.utils.format_time(batch.end_time, "short")}}
+    </div>
+    <div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
+    <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
+
+    {% for m in course.get_mentors(batch.name) %}
+    <div>
+      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
+      <span class="instructor-title">{{m.full_name}}</span>
+    </div>
+    {% endfor %}
+  </div>
+  {% if can_manage or can_join %}
+  <div class="cta">
+    <div class="">
+      {% if can_manage %}
+      <a href="/courses/{{ course.name }}/home?batch={{ batch.name }}" class="btn btn-primary manage-batch" data-batch="{{ batch.name | urlencode }}"
+        data-course="{{ course.name | urlencode }}">Manage</a>
+      {% elif can_join %}
+      <button class="join-batch btn btn-secondary" data-batch="{{ batch.name | urlencode }}"
+        data-course="{{ course.name | urlencode }}">Join this Batch</button>
+      {% endif %}
+    </div>
+  </div>
+  {% endif %}
+</div>

community/lms/widgets/Reviews.html

@@ -0,0 +1,85 @@
+{% if course.get_reviews() | length %}
+<div class="reviews-parent">
+  <div class="reviews-heading">
+    <div class="course-home-headings">Review</div>
+    {% if course.is_eligible_to_review(membership) %}
+    <a class="review-link" href="">
+      Provide your Feedback
+    </a>
+    {% endif %}
+  </div>
+  <div class="mentors-section">
+    {% for review in course.get_reviews() %}
+    <div class="review-card">
+      <div class="common-card-style review-content small-title"> {{ review.review }} </div>
+      <div class="review-card-footer">
+        <div>
+          {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }}
+          <span class="course-instructor">
+            {{ review.owner_details.full_name }}
+          </span>
+        </div>
+        <div class="rating">
+          {% for i in [1, 2, 3, 4, 5] %}
+          <svg class="icon icon-md {% if i <= review.rating %} star-click {% endif %}" data-rating="{{ i }}">
+            <use href="#icon-star"></use>
+          </svg>
+          {% endfor %}
+        </div>
+      </div>
+    </div>
+    {% endfor %}
+  </div>
+</div>
+
+<div class="modal fade review-modal" id="review-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+  aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <div class="course-home-headings modal-headings">Review</div>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <form class="review-form" id="review-form">
+          <div class="form-group">
+            <div class="clearfix">
+              <label class="control-label reqd" style="padding-right: 0px;">Rating</label>
+            </div>
+            <div class="control-input-wrapper">
+              <div class="control-input">
+                <div class="rating rating-field" id="rating">
+                  {% for i in [1, 2, 3, 4, 5] %}
+                  <svg class="icon icon-md icon-rating" data-rating="{{ i }}">
+                    <use href="#icon-star"></use>
+                  </svg>
+                  {% endfor %}
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <div class="clearfix">
+              <label class="control-label reqd" style="padding-right: 0px;">Review</label>
+            </div>
+            <div class="control-input-wrapper">
+              <div class="control-input">
+                <textarea type="text" autocomplete="off" class="input-with-feedback form-control review-field" data-fieldtype="Text"
+                  data-fieldname="feedback_comments" placeholder="" style="height: 300px;"
+                  spellcheck="false"></textarea>
+              </div>
+            </div>
+          </div>
+          <p class="error-field muted-text"></p>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <div class="button wide-button submit-review is-primary" data-course="{{ course.name | urlencode}}" id="submit-review">Submit</div>
+      </div>
+    </div>
+  </div>
+</div>
+{% endif %}

community/lms/workspace/lms/lms.json

@@ -0,0 +1,160 @@
+{
+ "category": "Modules",
+ "charts": [],
+ "creation": "2021-06-29 13:05:28.741459",
+ "developer_mode_only": 0,
+ "disable_user_customization": 0,
+ "docstatus": 0,
+ "doctype": "Workspace",
+ "extends_another_page": 0,
+ "hide_custom": 0,
+ "icon": "education",
+ "idx": 0,
+ "is_default": 0,
+ "is_standard": 1,
+ "label": "LMS",
+ "links": [
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "LMS",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Card Break"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "LMS Course",
+   "link_to": "LMS Course",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "LMS Batch",
+   "link_to": "LMS Batch",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "LMS Batch Membership",
+   "link_to": "LMS Batch Membership",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "LMS Course Mentor Mapping",
+   "link_to": "LMS Course Mentor Mapping",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Content",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Card Break"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Chapter",
+   "link_to": "Chapter",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Lesson",
+   "link_to": "Lesson",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Exercise",
+   "link_to": "Exercise",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Exercise Submission",
+   "link_to": "Exercise Submission",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "LMS Quiz",
+   "link_to": "LMS Quiz",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "LMS Quiz Submission",
+   "link_to": "LMS Quiz Submission",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  }
+ ],
+ "modified": "2021-06-29 15:11:07.324651",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS",
+ "owner": "Administrator",
+ "pin_to_bottom": 0,
+ "pin_to_top": 1,
+ "shortcuts": [
+  {
+   "color": "#29CD42",
+   "doc_view": "List",
+   "format": "{} Published",
+   "label": "Courses",
+   "link_to": "LMS Course",
+   "stats_filter": "{\"is_published\": 1}",
+   "type": "DocType"
+  },
+  {
+   "color": "#29CD42",
+   "doc_view": "List",
+   "format": "{} Active ",
+   "label": "Batches",
+   "link_to": "LMS Batch",
+   "stats_filter": "{\"status\": \"Active\"}",
+   "type": "DocType"
+  },
+  {
+   "color": "#39E4A5",
+   "doc_view": "List",
+   "format": "{} Students",
+   "label": "Memberships",
+   "link_to": "LMS Batch Membership",
+   "stats_filter": "{\"member_type\": \"Student\"}",
+   "type": "DocType"
+  }
+ ]
+}

community/overrides/user.py

@@ -5,15 +5,18 @@ import hashlib
 
 class CustomUser(User):
 
-    def get_course_count(self) -> int:
+    def get_authored_courses(self) -> int:
         """Returns the number of courses authored by this user.
         """
-        return frappe.db.count(
+        return frappe.get_all(
             'LMS Course', {
-                'owner': self.email
+                'owner': self.name
         })
 
     def get_palette(self):
+        """
+        Returns a color unique to each member for Avatar """
+
         palette = [
             ['--orange-avatar-bg', '--orange-avatar-color'],
             ['--pink-avatar-bg', '--pink-avatar-color'],
@@ -40,3 +43,19 @@ class CustomUser(User):
                 'member_type': 'Mentor'
             })
 
+    def get_user_reviews(self):
+        """ Returns the reviews created by user """
+        return frappe.get_all("LMS Course Review",
+                {
+                    "owner": self.name
+                })
+
+    def get_course_membership(self, member_type=None):
+        """ Returns all memberships of the user  """
+        filters = {
+            "member": self.name
+        }
+        if member_type:
+            filters["member_type"] = member_type
+
+        return frappe.get_all("LMS Batch Membership", filters, ["name", "course"])

community/plugins.py

@@ -0,0 +1,108 @@
+"""
+The plugins module provides various plugins to change the default
+behaviour some parts of the community app.
+
+A site specify what plugins to use using appropriate entries in the frappe
+hooks, written in the `hooks.py`.
+
+This module exposes two plugins: ProfileTab and PageExtension.
+
+The ProfileTab is used to specify any additional tabs to be displayed
+on the profile page of the user.
+
+The PageExtension is used to load additinal stylesheets and scripts to
+be loaded in a webpage.
+"""
+
+import frappe
+
+class PageExtension:
+    """PageExtension is a plugin to inject custom styles and scripts
+    into a web page.
+
+    The subclasses should overwrite the `render_header()` and
+    `render_footer()` methods to inject whatever styles/scripts into
+    the webpage.
+    """
+
+    def render_header(self):
+        """Returns the HTML snippet to be included in the head section
+        of the web page.
+
+        Typically used to include the stylesheets and javascripts to be
+        included in the <head> of the webpage.
+        """
+        return ""
+
+    def render_footer(self):
+        """Returns the HTML snippet to be included in the body tag at
+        the end of web page.
+
+        Typically used to include javascripts that need to be executed
+        after the page is loaded.
+        """
+        return ""
+
+class ProfileTab:
+    """Base class for profile tabs.
+
+    Every subclass of ProfileTab must implement two methods:
+        - get_title()
+        - render()
+    """
+    def __init__(self, user):
+        self.user = user
+
+    def get_title(self):
+        """Returns the title of the tab.
+
+        Every subclass must implement this.
+        """
+        raise NotImplementedError()
+
+    def render(self):
+        """Renders the contents of the tab as HTML.
+
+        Every subclass must implement this.
+        """
+        raise NotImplementedError()
+
+class LiveCodeExtension(PageExtension):
+    def render_header(self):
+        livecode_url = frappe.get_value("LMS Settings", None, "livecode_url")
+        context = {
+            "livecode_url": livecode_url
+        }
+        return frappe.render_template(
+            "templates/livecode/extension_header.html",
+            context)
+
+    def render_footer(self):
+        livecode_url = frappe.get_value("LMS Settings", None, "livecode_url")
+        context = {
+            "livecode_url": livecode_url
+        }
+        return frappe.render_template(
+            "templates/livecode/extension_footer.html",
+            context)
+
+def quiz_renderer(quiz_name):
+    quiz = frappe.get_doc("LMS Quiz", quiz_name)
+    context = dict(quiz=quiz)
+    return frappe.render_template("templates/quiz.html", context)
+
+def exercise_renderer(argument):
+    exercise = frappe.get_doc("Exercise", argument)
+    context = dict(exercise=exercise)
+    return frappe.render_template("templates/exercise.html", context)
+
+def youtube_video_renderer(video_id):
+    return f"""
+    <iframe width="560" height="315"
+        src="https://www.youtube.com/embed/{video_id}"
+        title="YouTube video player"
+        frameborder="0"
+        allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+        allowfullscreen>
+    </iframe>
+    """

community/public/css/style.less

@@ -10,6 +10,7 @@ h2 {
 
   .teaser-body {
     padding: 20px;
+    box-shadow: 0px 5px 10px rgb(0 0 0 / 10%)
   }
   .teaser-footer {
     padding: 20px;
@@ -66,6 +67,15 @@ h2 {
   }
 }
 
+
+.anchor_style {
+  color: inherit;
+}
+
+.anchor_style:hover {
+  text-decoration: none
+}
+
 section {
   padding: 60px 0px;
 }
@@ -128,41 +138,7 @@ section.lightgray {
   color: var(--tag-color);
 }
 
-.course-header {
-  margin-top: 20px;
-}
-
-/*
-.course-header {
-  margin-top: 20px;
-  padding: 20px;
-  background: var(--header-bg);
-  color: var(--header-color);
-  border-radius: 9px;
-}
-
-.course-author-avatar {
-  width: 20px;
-  height: 20px;
-  border-radius: 50%;
-  margin-right: 20px;
-}
-
-.course-header h1 {
-  color: inherit;
-}
-
-*/
-
-// .gray-section {
-//   background:#F6F6F6;
-//   border: 1px solid #C4C4C4;
-//   padding: 20px;
-//   margin: 20px 0px;
-// }
-
 .instructor-title {
-  font-weight: bold;
   color: black;
 }
 
@@ -179,11 +155,8 @@ section.lightgray {
 .chapter-number {
   background: var(--text-color);
   color: white;
-  border-radius: 50%;
   height: 24px;
   min-width: 24px;
-  align-items: center;
-  padding: 5px 8px 2px 8px;
   margin-right: 5px;
 }
 
@@ -257,6 +230,7 @@ section.lightgray {
     background-color: rgba(255, 255, 255, 0);
     max-height: 300px;
     white-space: pre-wrap;
+    word-wrap: break-word;
     margin: 0px;
     margin-left: 20px;
     padding: 4px;
@@ -282,14 +256,8 @@ section.lightgray {
   }
 }
 
-.chapter-description {
-  margin-bottom: 10px;
-}
-
 .lesson-teaser {
-  font-weight: bold;
-  color: black;
-  padding-left: 20px;
+  line-height: 40px;
 }
 
 #hero h1 {
@@ -300,10 +268,6 @@ section.lightgray {
   margin: 20px 0px;
 }
 
-.lesson-pagination {
-  clear: both;
-}
-
 .exercise-image svg {
   width: 200px;
   height: 200px;
@@ -335,3 +299,9 @@ section.lightgray {
     margin: 40px 0px 0px 20px;
   }
 }
+
+.no-preview-message {
+  width: fit-content;
+  margin: 50px 0px 50px;
+  color: black;
+}

community/public/icons/black-arrow.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="8" viewBox="0 0 13 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.9649 0.313118C8.76964 0.117856 8.45306 0.117856 8.2578 0.313118C8.06253 0.50838 8.06253 0.824963 8.2578 1.02023L10.7374 3.49985L1.16683 3.49719C0.890684 3.49712 0.666764 3.72091 0.666687 3.99705C0.66661 4.2732 0.890406 4.49712 1.16655 4.49719L10.7377 4.49985L8.2578 6.97978C8.06253 7.17505 8.06253 7.49163 8.2578 7.68689C8.45306 7.88215 8.76964 7.88215 8.9649 7.68689L12.2982 4.35356C12.4935 4.1583 12.4935 3.84171 12.2982 3.64645L8.9649 0.313118Z" fill="#4C5A67"/>
+</svg>

community/public/icons/calendar.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.8947 2.47619C15.8947 2.2132 15.6885 2 15.4342 2C15.1798 2 14.9737 2.2132 14.9737 2.47619V3.90476H8.52631V2.47619C8.52631 2.2132 8.32013 2 8.06579 2C7.81145 2 7.60526 2.2132 7.60526 2.47619V3.90476H5.30263C4.03092 3.90476 3 4.97074 3 6.28571V10.0952V19.619C3 20.934 4.03092 22 5.30263 22H18.1974C19.4691 22 20.5 20.934 20.5 19.619V10.0952V6.28571C20.5 4.97074 19.4691 3.90476 18.1974 3.90476H15.8947V2.47619ZM19.579 9.61905V6.28571C19.579 5.49673 18.9604 4.85714 18.1974 4.85714H15.8947V6.28572C15.8947 6.54871 15.6885 6.76191 15.4342 6.76191C15.1798 6.76191 14.9737 6.54871 14.9737 6.28572V4.85714H8.52631V6.28572C8.52631 6.54871 8.32013 6.76191 8.06579 6.76191C7.81145 6.76191 7.60526 6.54871 7.60526 6.28572V4.85714H5.30263C4.53961 4.85714 3.92105 5.49673 3.92105 6.28571V9.61905H19.579ZM3.92105 10.5714H19.579V19.619C19.579 20.408 18.9604 21.0476 18.1974 21.0476H5.30263C4.53961 21.0476 3.92105 20.408 3.92105 19.619V10.5714Z" fill="#4C5A67"/>
+</svg>

community/public/icons/check.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM16.8734 10.1402C17.264 9.74969 17.264 9.11652 16.8734 8.726C16.4829 8.33547 15.8498 8.33547 15.4592 8.726L14.6259 9.55933L12.9592 11.226L10.333 13.8522L9.37345 12.8927L8.54011 12.0593C8.14959 11.6688 7.51643 11.6688 7.1259 12.0593C6.73538 12.4499 6.73538 13.083 7.1259 13.4735L7.95923 14.3069L9.6259 15.9735C9.81344 16.1611 10.0678 16.2664 10.333 16.2664C10.5982 16.2664 10.8526 16.1611 11.0401 15.9735L14.3734 12.6402L16.0401 10.9735L16.8734 10.1402Z" fill="#68D391"/>
+</svg>

community/public/icons/chevron-right.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 16L14 12L10 8" stroke="#4C5A67" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

community/public/icons/chevron.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 10L12 14L16 10" stroke="#4C5A67" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

community/public/icons/clock.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 11.9999C3 7.02937 7.02937 3 11.9999 3C16.9703 3 20.9997 7.02937 20.9997 11.9999C20.9997 16.9703 16.9703 20.9997 11.9999 20.9997C7.02937 20.9997 3 16.9703 3 11.9999ZM11.9999 2C6.47709 2 2 6.47709 2 11.9999C2 17.5226 6.47709 21.9997 11.9999 21.9997C17.5226 21.9997 21.9997 17.5226 21.9997 11.9999C21.9997 6.47709 17.5226 2 11.9999 2ZM12.5002 6.30027C12.5002 6.02413 12.2763 5.80027 12.0002 5.80027C11.724 5.80027 11.5002 6.02413 11.5002 6.30027V12.0002C11.5002 12.1896 11.6072 12.3627 11.7766 12.4474L15.5765 14.3474C15.8235 14.4709 16.1238 14.3708 16.2473 14.1238C16.3708 13.8768 16.2707 13.5764 16.0237 13.4529L12.5002 11.6912V6.30027Z" fill="#4C5A67"/>
+</svg>

community/public/icons/down-arrow.svg

@@ -0,0 +1,3 @@
+<svg width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 1L5 5L9 1" stroke="#4C5A67" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

community/public/icons/left-arrow.svg

@@ -0,0 +1,3 @@
+<svg width="4" height="8" viewBox="0 0 4 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.33331 6.66663L0.666646 3.99996L3.33331 1.33329" stroke="#4C5A67" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

community/public/icons/lock.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.7114 3.0002H11.6325C10.4336 2.98895 9.27915 3.45397 8.42278 4.29322C7.5658 5.13306 7.07747 6.27888 7.06517 7.47871L7.06514 7.47871V7.48384V8.17399H5C3.89543 8.17399 3 9.06943 3 10.174V18.9996C3 20.1041 3.89543 20.9996 5 20.9996H18.2602C19.3647 20.9996 20.2602 20.1041 20.2602 18.9996V10.174C20.2602 9.06942 19.3647 8.17399 18.2602 8.17399H16.195V7.56755C16.2063 6.36863 15.7412 5.21421 14.902 4.35784C14.0622 3.50086 12.9163 3.01253 11.7165 3.00023V3.0002H11.7114ZM15.195 8.17399V7.56514V7.56016H15.195C15.2043 6.62548 14.842 5.72537 14.1878 5.05777C13.5341 4.39076 12.6425 4.01043 11.7087 4.0002H11.6301H11.6251V4.00017C10.6904 3.99087 9.79031 4.35318 9.12271 5.00743C8.4557 5.6611 8.07537 6.55271 8.06514 7.48649V8.17399H15.195ZM5 9.17399C4.44772 9.17399 4 9.62171 4 10.174V18.9996C4 19.5518 4.44772 19.9996 5 19.9996H18.2602C18.8124 19.9996 19.2602 19.5518 19.2602 18.9996V10.174C19.2602 9.62171 18.8124 9.17399 18.2602 9.17399H5ZM11.6303 15.804C12.3026 15.804 12.8476 15.259 12.8476 14.5867C12.8476 13.9145 12.3026 13.3694 11.6303 13.3694C10.958 13.3694 10.413 13.9145 10.413 14.5867C10.413 15.259 10.958 15.804 11.6303 15.804ZM13.8476 14.5867C13.8476 15.8113 12.8549 16.804 11.6303 16.804C10.4057 16.804 9.413 15.8113 9.413 14.5867C9.413 13.3622 10.4057 12.3694 11.6303 12.3694C12.8549 12.3694 13.8476 13.3622 13.8476 14.5867Z" fill="#4C5A67"/>
+</svg>

community/public/icons/play.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M8 18L16 12L8 6" stroke="#4C5A67" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

community/public/icons/rating-filled.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 1.5C12.1903 1.5 12.3641 1.60804 12.4484 1.77869L15.4221 7.80323L22.0723 8.77526C22.2606 8.80278 22.4169 8.93478 22.4756 9.11578C22.5343 9.29679 22.4852 9.49541 22.3489 9.62818L17.5373 14.3147L18.6728 20.9355C18.705 21.1231 18.6279 21.3127 18.4739 21.4245C18.3199 21.5364 18.1157 21.5511 17.9473 21.4625L12 18.3349L6.05273 21.4625C5.88427 21.5511 5.68012 21.5364 5.52613 21.4245C5.37214 21.3127 5.29502 21.1231 5.3272 20.9355L6.46274 14.3147L1.65113 9.62818C1.51482 9.49541 1.46569 9.29679 1.52438 9.11578C1.58307 8.93478 1.73941 8.80278 1.92769 8.77526L8.57787 7.80323L11.5516 1.77869C11.6359 1.60804 11.8097 1.5 12 1.5Z" fill="#192734"/>
+</svg>

community/public/icons/rating.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M12 2L15.09 8.26L22 9.27L17 14.14L18.18 21.02L12 17.77L5.82 21.02L7 14.14L2 9.27L8.91 8.26L12 2Z" stroke="#192734" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

community/public/icons/side-arrow-white.svg

@@ -0,0 +1,3 @@
+<svg width="4" height="8" viewBox="0 0 4 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.666626 6.66675L3.33329 4.00008L0.666626 1.33341" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

community/public/icons/tick.svg

@@ -0,0 +1,3 @@
+<svg class="icon">
+  <use href="#icon-tick"></use>
+</svg>