Merge branch 'main' into community-member-to-user-refactor

Added "Resume Course" button to the course teaser

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -3,4 +3,5 @@
 *.egg-info
 *.swp
 tags
-community/docs/current
+community/docs/current
+community/public/dist

community/community/doctype/community_course_member/community_course_member.js

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

community/community/doctype/community_course_member/community_course_member.json

@@ -1,96 +0,0 @@
-{
- "actions": [],
- "autoname": "field:user_name",
- "creation": "2021-03-02 11:24:49.612530",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "enabled",
-  "full_name",
-  "user_name",
-  "email",
-  "short_intro",
-  "bio",
-  "photo",
-  "route"
- ],
- "fields": [
-  {
-   "default": "1",
-   "fieldname": "enabled",
-   "fieldtype": "Check",
-   "label": "Enabled"
-  },
-  {
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Full Name",
-   "reqd": 1
-  },
-  {
-   "fieldname": "user_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "User Name",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "email",
-   "fieldtype": "Data",
-   "label": "Email",
-   "options": "Email",
-   "reqd": 1
-  },
-  {
-   "fieldname": "short_intro",
-   "fieldtype": "Data",
-   "label": "Short Intro"
-  },
-  {
-   "fieldname": "bio",
-   "fieldtype": "Markdown Editor",
-   "label": "Bio"
-  },
-  {
-   "fieldname": "photo",
-   "fieldtype": "Attach Image",
-   "label": "Photo"
-  },
-  {
-   "fieldname": "route",
-   "fieldtype": "Data",
-   "label": "Route"
-  }
- ],
- "has_web_view": 1,
- "index_web_pages_for_search": 1,
- "is_published_field": "enabled",
- "links": [],
- "modified": "2021-04-06 11:50:41.551665",
- "modified_by": "Administrator",
- "module": "Community",
- "name": "Community Course Member",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "route": "community-course-member",
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

community/community/doctype/community_course_member/community_course_member.py

@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, Frappe and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-import re
-from frappe.website.website_generator import WebsiteGenerator
-from frappe import _
-
-class CommunityCourseMember(WebsiteGenerator):
-
-	def get_context(self, context):
-		context.abbr = ("").join([ s[0] for s in self.full_name.split() ])
-		return context
-
-	def validate(self):
-		self.validate_user_name()
-		if not self.route:
-			self.route = self.user_name	
-	
-	def validate_user_name(self):
-		if len(self.user_name) < 4:
-			frappe.throw(_("Username must be atleast 4 characters long."))
-		if not re.match("^[A-Za-z0-9_]*$", self.user_name):
-			frappe.throw(_("Username can only contain alphabets, numbers, and underscore."))
-		self.user_name = self.user_name.lower()
-
-	def after_insert(self):
-		if frappe.db.exists("User", self.email):
-			user = frappe.get_doc("User", self.email)
-		else:
-			user, update_password_link = self.create_user()
-			self.send_email(update_password_link)
-
-	def send_email(self, update_password_link):
-
-		args = {
-			'update_password_link': update_password_link,
-			'full_name': self.full_name,
-		}
-
-		frappe.sendmail(
-			recipients=self.email,
-			sender="Administrator",
-			subject=_("Set your Password"), 
-			template="community_course_membership",
-			reference_doctype=self.doctype, 
-			reference_name=self.name,
-			send_priority=0, 
-			queue_separately=True, 
-			args=args)

community/community/doctype/community_course_member/templates/community_course_member.html

@@ -1,25 +0,0 @@
-{% extends "templates/web.html" %}
-{% block page_content %}
-<div class="py-20 row">
-    {% if photo %}
-    <div class="col-sm-2 border border-dark">
-        <img src="{{ photo }}" alt="{{ full_name }}">
-    </div>
-    {% else %}
-    <div class="col-sm-2">
-        <div class="standard-image" style="font-size: 30px;">{{ abbr }}</div>
-    </div>
-    {% endif %}
-    <div class="col">
-        <h1>{{ full_name }}</h1>
-        {% if short_intro %}
-        <p class="lead"> {{ short_intro }} </p>
-        {% endif %}
-        {% if bio %}
-        <p class="markdown-style"> {{ frappe.utils.md_to_html(bio) }} </p>
-        {% endif %}
-    </div>
-</div>
-{% endblock %}
-
-<!-- this is a sample default web page template -->

community/community/doctype/community_course_member/templates/community_course_member_row.html

@@ -1,4 +0,0 @@
-<div>
-	<a href="{{ doc.route }}">{{ doc.full_name }}</a>
-</div>
-<!-- this is a sample default list template -->

community/community/doctype/community_course_member/test_community_course_member.py

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

community/community/doctype/community_event_volunteer/community_event_volunteer.json

@@ -13,13 +13,13 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Member",
-   "options": "Community Member"
+   "options": "User"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-02-15 12:03:31.153575",
+ "modified": "2021-05-21 12:15:51.286478",
  "modified_by": "Administrator",
  "module": "Community",
  "name": "Community Event Volunteer",

community/community/doctype/community_member/community_member.js

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

community/community/doctype/community_member/community_member.json

@@ -1,155 +0,0 @@
-{
- "actions": [],
- "allow_guest_to_view": 1,
- "allow_rename": 1,
- "creation": "2021-02-12 15:47:23.591567",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "full_name",
-  "email",
-  "enabled",
-  "column_break_4",
-  "username",
-  "email_preference",
-  "section_break_7",
-  "bio",
-  "section_break_9",
-  "role",
-  "photo",
-  "column_break_12",
-  "short_intro",
-  "route",
-  "abbr"
- ],
- "fields": [
-  {
-   "default": "1",
-   "fieldname": "enabled",
-   "fieldtype": "Check",
-   "label": "Enabled"
-  },
-  {
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Full Name",
-   "reqd": 1
-  },
-  {
-   "allow_in_quick_entry": 1,
-   "fieldname": "role",
-   "fieldtype": "Select",
-   "label": "Role",
-   "options": "\nBoard\nDirector\nVolunteer\nSpeaker"
-  },
-  {
-   "allow_in_quick_entry": 1,
-   "fieldname": "photo",
-   "fieldtype": "Attach Image",
-   "label": "Photo"
-  },
-  {
-   "fieldname": "short_intro",
-   "fieldtype": "Data",
-   "label": "Short Intro"
-  },
-  {
-   "allow_in_quick_entry": 1,
-   "fieldname": "bio",
-   "fieldtype": "Markdown Editor",
-   "label": "Bio"
-  },
-  {
-   "fieldname": "route",
-   "fieldtype": "Data",
-   "label": "Route"
-  },
-  {
-   "fieldname": "email",
-   "fieldtype": "Data",
-   "in_standard_filter": 1,
-   "label": "Email",
-   "options": "Email",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "allow_in_quick_entry": 1,
-   "fieldname": "username",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "User Name",
-   "unique": 1
-  },
-  {
-   "fieldname": "email_preference",
-   "fieldtype": "Select",
-   "label": "Email preference",
-   "options": "Email on every Message\nOne Digest Mail per day\nNever"
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_7",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "section_break_9",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_12",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "abbr",
-   "fieldtype": "Data",
-   "label": "Abbr",
-   "read_only": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-04-28 11:22:35.402217",
- "modified_by": "Administrator",
- "module": "Community",
- "name": "Community Member",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Website Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "search_fields": "full_name",
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "full_name",
- "track_changes": 1
-}

community/community/doctype/community_member/community_member.py

@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, Frappe and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-import re
-from frappe import _
-from frappe.model.document import Document
-import random
-from frappe.utils import cint
-import hashlib
-
-class CommunityMember(Document):
-
-    def validate(self):
-        self.validate_username()
-        self.abbr = ("").join([ s[0] for s in self.full_name.split() ])
-        if self.route != self.username:
-            self.route = self.username
-
-    def validate_username(self):
-        if not self.username:
-            self.username = create_username_from_email(self.email)
-
-        if self.username:
-            if len(self.username) < 4:
-                frappe.throw(_("Username must be atleast 4 characters long."))
-            if not re.match("^[A-Za-z0-9_]*$", self.username):
-                frappe.throw(_("Username can only contain alphabets, numbers and underscore."))
-            self.username = self.username.lower()
-
-    def get_course_count(self) -> int:
-        """Returns the number of courses authored by this user.
-        """
-        return frappe.db.count(
-            'LMS Course', {
-                'owner': self.email
-        })
-
-    def get_batch_count(self) -> int:
-        """Returns the number of batches authored by this user.
-        """
-        return frappe.db.count(
-            'LMS Batch Membership', {
-                'member': self.name,
-                'member_type': 'Mentor'
-            })
-
-    def get_photo_url(self):
-        return frappe.db.get_value("User", self.email, ["user_image"])
-
-    def get_palette(self):
-        palette = [
-            ['--orange-avatar-bg', '--orange-avatar-color'],
-            ['--pink-avatar-bg', '--pink-avatar-color'],
-            ['--blue-avatar-bg', '--blue-avatar-color'],
-            ['--green-avatar-bg', '--green-avatar-color'],
-            ['--dark-green-avatar-bg', '--dark-green-avatar-color'],
-            ['--red-avatar-bg', '--red-avatar-color'],
-            ['--yellow-avatar-bg', '--yellow-avatar-color'],
-            ['--purple-avatar-bg', '--purple-avatar-color'],
-            ['--gray-avatar-bg', '--gray-avatar-color0']
-        ]
-
-        encoded_name = str(self.full_name).encode("utf-8")
-        hash_name = hashlib.md5(encoded_name).hexdigest()
-        idx = cint((int(hash_name[4:6], 16) + 1) / 5.33)
-        return palette[idx % 8]
-
-    def __repr__(self):
-        return f"<CommunityMember: {self.email}>"
-
-def create_member_from_user(doc, method):
-    username = doc.username
-
-    if ( doc.username and  username_exists(doc.username)) or not doc.username:
-        username = create_username_from_email(doc.email)
-
-    elif len(doc.username) < 4 and doc.send_welcome_email == 1:
-        username = adjust_username(doc.username)
-
-    if username_exists(username):
-        username = username + str(random.randint(0,9))
-
-    member = frappe.get_doc({
-        "doctype": "Community Member",
-        "full_name": doc.full_name,
-        "username": username,
-        "email": doc.email,
-        "route": doc.username,
-        "owner": doc.email
-    })
-    member.save(ignore_permissions=True)
-
-def username_exists(username):
-    return frappe.db.exists("Community Member", dict(username=username))
-
-def create_username_from_email(email):
-    string = email.split("@")[0]
-    return ''.join(e for e in string if e.isalnum())
-
-def adjust_username(username):
-    return username.ljust(4, str(random.randint(0,9)))

community/community/doctype/community_member/templates/community_member.html

@@ -1,25 +0,0 @@
-{% extends "templates/web.html" %}
-{% block page_content %}
-<div class="py-20 row">
-    {% if photo %}
-    <div class="col-sm-2 border border-dark">
-        <img src="{{ photo }}" alt="{{ full_name }}">
-    </div>
-    {% else %}
-    <div class="col-sm-2">
-        <div class="standard-image" style="font-size: 30px;">{{ abbr }}</div>
-    </div>
-    {% endif %}
-    <div class="col">
-        <h1>{{ full_name }}</h1>
-        {% if short_intro %}
-        <p class="lead"> {{ short_intro }} </p>
-        {% endif %}
-        {% if bio %}
-        <p class="markdown-style"> {{ frappe.utils.md_to_html(bio) }} </p>
-        {% endif %}
-    </div>
-</div>
-{% endblock %}
-
-<!-- this is a sample default web page template -->

community/community/doctype/community_member/templates/community_member_row.html

@@ -1,4 +0,0 @@
-<div>
-	<a href="{{ doc.route }}">{{ doc.title or doc.name }}</a>
-</div>
-<!-- this is a sample default list template -->

community/community/doctype/community_member/test_community_member.py

@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, Frappe and Contributors
-# See license.txt
-from __future__ import unicode_literals
-from community.lms.doctype.lms_course.test_lms_course import new_user
-import frappe
-import unittest
-
-class TestCommunityMember(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(self):
-        users = ["test_user@example.com","test_user1@example.com"]
-
-        for user in users:
-            if not frappe.db.exists("User", user):
-                new_user("Test User", user)
-
-    def test_member_created_from_user(self):
-        user = frappe.db.get_value("User","test_user@example.com", ["full_name", "email", "username"], as_dict=True)
-        self.assertTrue(frappe.db.exists("Community Member", {"username":user.username}))
-
-        member = frappe.db.get_value("Community Member",
-                        filters={"email": user.email},
-                        fieldname=["full_name", "email", "owner", "username", "route"],
-                        as_dict=True
-                    )
-
-        self.assertEqual(user.full_name, member.full_name)
-        self.assertEqual(member.owner, user.email)
-        self.assertEqual(user.username, member.username)
-        self.assertEqual(member.username, member.route)
-        
-    def test_members_with_same_name(self):
-        user1 = frappe.db.get_value("User","test_user@example.com", ["email"], as_dict=True)
-        user2 = frappe.get_doc("User","test_user1@example.com", ["email"], as_dict=True)
-
-        self.assertTrue(frappe.db.exists("Community Member", {"email": user1.email} ))
-        self.assertTrue(frappe.db.exists("Community Member", {"email": user2.email }))
-
-        member1 = frappe.db.get_value("Community Member",
-                        filters={"email": user1.email},
-                        fieldname=["full_name", "email", "owner", "username", "route"],
-                        as_dict=True
-                    )
-        member2 = frappe.db.get_value("Community Member",
-                        filters={"email": user2.email},
-                        fieldname=["full_name", "email", "owner", "username", "route"],
-                        as_dict=True
-                    )
-
-        self.assertEqual(member1.full_name, member2.full_name)
-        self.assertEqual(member1.email, user1.email)
-        self.assertEqual(member2.email, user2.email)
-        self.assertNotEqual(member1.username, member2.username)
-
-    def test_username_validations(self):
-        user = new_user("Tst", "tst@example.com")
-        self.assertTrue(frappe.db.exists("Community Member", {"email":user.email} ))
-
-        member = frappe.db.get_value("Community Member",
-                        filters={"email": user.email},
-                        fieldname=["username"],
-                        as_dict=True
-                    )
-
-        self.assertEqual(len(member.username), 4)
-        frappe.delete_doc("User", user.email)
-
-    def test_user_without_username(self):
-        user = new_user("Test User", "test_user2@example.com")
-        self.assertTrue(frappe.db.exists("Community Member", {"email":user.email} ))
-
-        member = frappe.db.get_value("Community Member",
-                        filters={"email": user.email},
-                        fieldname=["username"],
-                        as_dict=True
-                    )
-
-        self.assertTrue(member.username)
-        frappe.delete_doc("User", user.email)
-
-    @classmethod
-    def tearDownClass(self):
-        users = ["test_user@example.com","test_user1@example.com"]
-
-        for user in users:
-            if frappe.db.exists("User", user):
-                frappe.delete_doc("User", user)
-
-            if frappe.db.exists("Community Member", {"email": user}):
-                frappe.delete_doc("Community Member", {"email": user})

community/community/utils.py

@@ -1,16 +1 @@
 import frappe
-
-def create_members_from_users():
-	users = frappe.get_all("User", {"enabled": 1}, ["email"])
-	for user in users:
-		if not frappe.db.get_value("Community Member", {"email": user.email}, "name"):
-			doc = frappe.get_doc("User", {"email": user.email})
-			username = doc.username if doc.username and len(doc.username) > 3 else ("").join([ s for s in doc.full_name.split() ])
-			if not frappe.db.exists("Community Member", username):
-				member = frappe.new_doc("Community Member")
-				member.full_name = doc.full_name
-				member.username = username
-				member.email = doc.email
-				member.route = username
-				member.owner = doc.email
-				member.insert(ignore_permissions=True)

community/community/web_form/update_profile/update_profile.js

@@ -1,5 +0,0 @@
-frappe.ready(function() {
-	frappe.web_form.after_save = () => {
-		window.location.href = frappe.web_form.get_value("username")
-	}
-})

community/community/web_form/update_profile/update_profile.json

@@ -1,100 +0,0 @@
-{
- "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-03-09 17:34:03.394301",
- "doc_type": "Community Member",
- "docstatus": 0,
- "doctype": "Web Form",
- "idx": 0,
- "is_standard": 1,
- "login_required": 1,
- "max_attachment_size": 0,
- "modified": "2021-03-22 12:04:22.571655",
- "modified_by": "Administrator",
- "module": "Community",
- "name": "update-profile",
- "owner": "Administrator",
- "payment_button_label": "Buy Now",
- "published": 1,
- "route": "edit-profile",
- "route_to_success_link": 0,
- "show_attachments": 0,
- "show_in_grid": 0,
- "show_sidebar": 0,
- "sidebar_items": [],
- "success_message": "Profile updated successfully.",
- "success_url": "/",
- "title": "Update Profile",
- "web_form_fields": [
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Full Name",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "username",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "User Name",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "short_intro",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Short Intro",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "bio",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Bio",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "photo",
-   "fieldtype": "Attach Image",
-   "hidden": 0,
-   "label": "Photo",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  }
- ]
-}

community/community/web_form/update_profile/update_profile.py

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

community/community/widgets/Avatar.html

@@ -1,14 +1,14 @@
 {% set color = member.get_palette() %}
 <a href="/{{member.username}}">
-<span class="avatar {{ avatar_class }}" title="{{ member.full_name }}">
-  {% if member.get_photo_url() %}
-  <img class="avatar-frame standard-image" src="{{ member.get_photo_url() }}" title="{{ member.full_name }}">
-  </img>
-  {% else %}
-  <span class="avatar-frame standard-image" title="{{ member.full_name }}"
-    style="background-color: var({{color[0]}}); color: var({{color[1]}});">
-    {{ member.abbr }}
+  <span class="avatar {{ avatar_class }}" title="{{ member.full_name }}">
+    {% if member.user_image %}
+    <img class="avatar-frame standard-image" style="object-fit: cover;" src="{{ member.user_image }}" title="{{ member.full_name }}">
+    </img>
+    {% else %}
+    <span class="avatar-frame standard-image" title="{{ member.full_name }}"
+      style="background-color: var({{color[0]}}); color: var({{color[1]}});">
+      {{ frappe.utils.get_abbr(member.full_name) }}
+    </span>
+    {% endif %}
   </span>
-  {% endif %}
-  </a>
-</span>
+</a>

community/hackathon/doctype/community_hackathon/community_hackathon.json

@@ -23,7 +23,7 @@
    "fieldname": "organizer",
    "fieldtype": "Link",
    "label": "Organizer",
-   "options": "Community Member"
+   "options": "User"
   },
   {
    "fieldname": "year",
@@ -34,7 +34,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-04-14 11:43:23.515972",
+ "modified": "2021-05-21 12:22:26.619776",
  "modified_by": "Administrator",
  "module": "Hackathon",
  "name": "Community Hackathon",

community/hooks.py

@@ -15,11 +15,11 @@ app_license = "AGPL"
 # ------------------
 
 # include js, css files in header of desk.html
-app_include_css = "/assets/community/css/community.css"
-app_include_js = "/assets/community/js/community.js"
+# app_include_css = "/assets/community/css/community.css"
+# app_include_js = "/assets/community/js/community.js"
 
 # include js, css files in header of web template
-web_include_css = "/assets/css/community.css"
+web_include_css = "community.bundle.css"
 # web_include_css = "/assets/community/css/community.css"
 # web_include_js = "/assets/community/js/community.js"
 
@@ -84,22 +84,17 @@ web_include_css = "/assets/css/community.css"
 # ---------------
 # Override standard doctype classes
 
-# override_doctype_class = {
-# 	"ToDo": "custom_app.overrides.CustomToDo"
-# }
+override_doctype_class = {
+	"User": "community.overrides.user.CustomUser"
+}
 
 # Document Events
 # ---------------
 # Hook on document methods and events
 
 doc_events = {
-	"User": {
-		"after_insert": "community.community.doctype.community_member.community_member.create_member_from_user"
-	},
-    "LMS Message": {
-        "after_insert": "community.lms.doctype.lms_message.lms_message.publish_message"
-    }
- }
+
+}
 
 # Scheduled Tasks
 # ---------------
@@ -141,12 +136,13 @@ 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": "courses/learn"},
-    {"from_route": "/courses/<course>/<batch>/learn/<int:chapter>.<int:lesson>", "to_route": "courses/learn"},
-    {"from_route": "/courses/<course>/<batch>/schedule", "to_route": "courses/schedule"},
-    {"from_route": "/courses/<course>/<batch>/members", "to_route": "courses/members"},
-    {"from_route": "/courses/<course>/<batch>/discuss", "to_route": "courses/discuss"},
-    {"from_route": "/courses/<course>/<batch>/about", "to_route": "courses/about"}
+    {"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"}
 ]
 
 # Any frappe default URL is blocked by profile-rules, add it here to unblock it

community/lms/api.py

@@ -21,3 +21,16 @@ def get_section(name):
     """
     doc = frappe.get_doc("LMS Section", name)
     return doc and doc.as_dict()
+
+@frappe.whitelist()
+def submit_solution(exercise, code):
+    """Submits a solution.
+
+    @exerecise: name of the exercise to submit
+    @code: solution to the exercise
+    """
+    ex = frappe.get_doc("Exercise", exercise)
+    if not ex:
+        return
+    doc = ex.submit(code)
+    return {"name": doc.name, "creation": doc.creation}

community/lms/doctype/exercise/exercise.js

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

community/lms/doctype/exercise/exercise.json

@@ -0,0 +1,106 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2021-05-19 17:43:39.923430",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "title",
+  "description",
+  "code",
+  "answer",
+  "column_break_4",
+  "course",
+  "hints",
+  "tests",
+  "image",
+  "lesson"
+ ],
+ "fields": [
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Title"
+  },
+  {
+   "fieldname": "course",
+   "fieldtype": "Link",
+   "label": "Course",
+   "options": "LMS Course"
+  },
+  {
+   "columns": 4,
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Description"
+  },
+  {
+   "columns": 4,
+   "fieldname": "answer",
+   "fieldtype": "Code",
+   "label": "Answer"
+  },
+  {
+   "fieldname": "tests",
+   "fieldtype": "Code",
+   "label": "Tests"
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
+  {
+   "columns": 4,
+   "fieldname": "hints",
+   "fieldtype": "Small Text",
+   "label": "Hints"
+  },
+  {
+   "columns": 4,
+   "fieldname": "code",
+   "fieldtype": "Code",
+   "label": "Code"
+  },
+  {
+   "fieldname": "image",
+   "fieldtype": "Code",
+   "label": "Image",
+   "read_only": 1
+  },
+  {
+   "fieldname": "lesson",
+   "fieldtype": "Link",
+   "label": "Lesson",
+   "options": "Lesson"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-05-20 13:23:12.340928",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "Exercise",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "search_fields": "title",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "title",
+ "track_changes": 1
+}

community/lms/doctype/exercise/exercise.py

@@ -0,0 +1,59 @@
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+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.
+        """
+        user = frappe.session.user
+        if not user or user == "Guest":
+            return
+
+        result = frappe.get_all('Exercise Submission',
+            fields="*",
+            filters={
+                "owner": user,
+                "exercise": self.name
+            },
+            order_by="creation desc",
+            page_length=1)
+
+        print("get_user_submission", result)
+        if result:
+            return result[0]
+
+    def submit(self, code):
+        """Submits the given code as solution to exercise.
+        """
+        user = frappe.session.user
+        if not user or user == "Guest":
+            return
+
+        old_submission = self.get_user_submission()
+        if old_submission and old_submission.solution == code:
+            return old_submission
+
+        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,
+            exercise_title=self.title,
+            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

@@ -0,0 +1,47 @@
+# Copyright (c) 2021, FOSS United and Contributors
+# See license.txt
+
+import frappe
+import unittest
+
+class TestExercise(unittest.TestCase):
+    def setUp(self):
+        frappe.db.sql('delete from `tabExercise Submission`')
+        frappe.db.sql('delete from `tabExercise`')
+        frappe.db.sql('delete from `tabLMS Course`')
+
+    def new_exercise(self):
+        course = frappe.get_doc({
+            "doctype": "LMS Course",
+            "name": "test-course",
+            "title": "Test Course"
+        })
+        course.insert()
+        e = frappe.get_doc({
+            "doctype": "Exercise",
+            "name": "test-problem",
+            "course": course.name,
+            "title": "Test Problem",
+            "description": "draw a circle",
+            "code": "# draw a single cicle",
+            "answer": (
+                "# draw a single circle\n" +
+                "circle(100, 100, 50)")
+        })
+        e.insert()
+        return e
+
+    def test_exercise(self):
+        e = self.new_exercise()
+        assert e.get_user_submission() is None
+
+    def test_exercise_submission(self):
+        e = self.new_exercise()
+        submission = e.submit("circle(100, 100, 50)")
+        assert submission is not None
+        assert submission.exercise == e.name
+        assert submission.course == e.course
+
+        user_submission = e.get_user_submission()
+        assert user_submission is not None
+        assert user_submission.name == submission.name

community/lms/doctype/exercise_submission/exercise_submission.js

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

community/lms/doctype/exercise_submission/exercise_submission.json

@@ -0,0 +1,90 @@
+{
+ "actions": [],
+ "creation": "2021-05-19 11:41:18.108316",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "exercise",
+  "solution",
+  "exercise_title",
+  "course",
+  "batch",
+  "lesson",
+  "image"
+ ],
+ "fields": [
+  {
+   "fieldname": "exercise",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Exercise",
+   "options": "Exercise"
+  },
+  {
+   "fieldname": "solution",
+   "fieldtype": "Code",
+   "in_list_view": 1,
+   "label": "Solution"
+  },
+  {
+   "fetch_from": "exercise.title",
+   "fieldname": "exercise_title",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Exercise Title",
+   "read_only": 1
+  },
+  {
+   "fetch_from": "exercise.course",
+   "fieldname": "course",
+   "fieldtype": "Link",
+   "label": "Course",
+   "options": "LMS Course",
+   "read_only": 1
+  },
+  {
+   "fieldname": "batch",
+   "fieldtype": "Link",
+   "label": "Batch",
+   "options": "LMS Batch"
+  },
+  {
+   "fetch_from": "exercise.lesson",
+   "fieldname": "lesson",
+   "fieldtype": "Link",
+   "label": "Lesson",
+   "options": "Lesson"
+  },
+  {
+   "fieldname": "image",
+   "fieldtype": "Code",
+   "label": "Image",
+   "read_only": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-05-21 11:28:45.833018",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "Exercise 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/exercise_submission/exercise_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 ExerciseSubmission(Document):
+	pass

community/lms/doctype/exercise_submission/test_exercise_submission.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 TestLMSTopic(unittest.TestCase):
+class TestExerciseSubmission(unittest.TestCase):
 	pass

community/lms/doctype/invite_request/test_invite_request.py

@@ -52,15 +52,8 @@ class TestInviteRequest(unittest.TestCase):
             self.assertEqual(user.send_welcome_email, 0)
             self.assertEqual(user.user_type, "Website User")
 
-            member = frappe.db.get_value("Community Member", {"email": "test_invite@example.com"})
-            self.assertTrue(member)
-
     @classmethod
     def tearDownClass(self):
-
-        if frappe.db.exists("Community Member", {"email": "test_invite@example.com"}):
-            frappe.delete_doc("Community Member", {"email": "test_invite@example.com"})
-
         if frappe.db.exists("User", "test_invite@example.com"):
             frappe.delete_doc("User", "test_invite@example.com")
 

community/lms/doctype/lesson/lesson.py

@@ -5,12 +5,17 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
-from ..lms_topic.section_parser import SectionParser
+from ...section_parser import SectionParser
 
 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()
 
     def get_sections(self):
         return sorted(self.get('sections'), key=lambda s: s.index)
@@ -18,6 +23,7 @@ class Lesson(Document):
     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

community/lms/doctype/lms_batch/lms_batch.py

@@ -5,7 +5,6 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
-from community.www.courses.utils import get_member_with_email
 from frappe import _
 from community.lms.doctype.lms_batch_membership.lms_batch_membership import create_membership
 from community.query import find, find_all
@@ -35,33 +34,47 @@ class LMSBatch(Document):
                     {"batch": self.name, "member_type": "Mentor"},
                     ["member"])
         member_names = [m['member'] for m in memberships]
-        return find_all("Community Member", name=["IN", member_names])
+        return find_all("User", name=["IN", member_names])
 
-    def is_member(self, email):
+    def is_member(self, email, member_type=None):
         """Checks if a person is part of a batch.
-        """
-        member = find("Community Member", email=email)
-        return member and frappe.db.exists(
-                    "LMS Batch Membership",
-                    {"batch": self.name, "member": member.name})
 
-@frappe.whitelist()
-def get_messages(batch):
-    messages =  frappe.get_all("LMS Message", {"batch": batch}, ["*"], order_by="creation")
-    for message in messages:
-        message.message = frappe.utils.md_to_html(message.message)
-        member_email = frappe.db.get_value("Community Member", message.author, ["email"])
-        if member_email == frappe.session.user:
-            message.author_name = "You"
-            message.is_author = True
-    return messages
+        If member_type is specified, checks if the person is a Student/Mentor.
+        """
+
+        filters = {
+            "batch": self.name,
+            "member": email
+        }
+        if member_type:
+            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:
+            message.message = frappe.utils.md_to_html(message.message)
+            if message.author == frappe.session.user:
+                message.author_name = "You"
+                message.is_author = True
+        return messages
 
 @frappe.whitelist()
 def save_message(message, batch):
     doc = frappe.get_doc({
         "doctype": "LMS Message",
         "batch": batch,
-        "author": get_member_with_email(),
+        "author": frappe.session.user,
         "message": message
     })
     doc.save(ignore_permissions=True)

community/lms/doctype/lms_batch_membership/lms_batch_membership.json

@@ -6,11 +6,13 @@
  "engine": "InnoDB",
  "field_order": [
   "batch",
-  "role",
-  "column_break_3",
   "member",
   "member_name",
-  "member_type"
+  "member_email",
+  "column_break_3",
+  "course",
+  "member_type",
+  "role"
  ],
  "fields": [
   {
@@ -27,9 +29,10 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Member",
-   "options": "Community Member"
+   "options": "User"
   },
   {
+   "default": "Student",
    "fieldname": "member_type",
    "fieldtype": "Select",
    "in_list_view": 1,
@@ -37,6 +40,7 @@
    "options": "\nStudent\nMentor\nStaff"
   },
   {
+   "default": "Member",
    "fieldname": "role",
    "fieldtype": "Select",
    "in_standard_filter": 1,
@@ -54,11 +58,28 @@
   {
    "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",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-04-26 12:52:59.826509",
+ "modified": "2021-05-24 09:32:04.128620",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Membership",

community/lms/doctype/lms_batch_membership/lms_batch_membership.py

@@ -14,28 +14,40 @@ class LMSBatchMembership(Document):
         self.validate_membership_in_different_batch_same_course()
 
     def validate_membership_in_same_batch(self):
-        previous_membership = frappe.db.get_value("LMS Batch Membership", {"member": self.member, "batch": self.batch, "name": ["!=", self.name]}, ["member_type","member"], as_dict=1)
+        previous_membership = frappe.db.get_value("LMS Batch Membership",
+            filters={
+                "member": self.member,
+                "batch": self.batch, "name": ["!=", self.name]
+            },
+            fieldname=["member_type","member"],
+            as_dict=1)
+
         if previous_membership:
-            member_name = frappe.db.get_value("Community Member", self.member, "full_name")
+            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))
 
     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", {"member": self.member}, ["batch", "member_type"])
+        previous_membership = frappe.get_all("LMS Batch Membership",
+                                    filters={
+                                        "member": self.member
+                                    },
+                                    fields=["batch", "member_type"]
+                                )
+
         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("Community Member", self.member, "full_name")
+                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))
 
+@frappe.whitelist()
 def create_membership(batch, member=None, member_type="Student", role="Member"):
-    if not member:
-        member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name")
     frappe.get_doc({
         "doctype": "LMS Batch Membership",
         "batch": batch,
         "role": role,
         "member_type": member_type,
-        "member": member
+        "member": member or frappe.session.user
     }).save(ignore_permissions=True)
     return "OK"

community/lms/doctype/lms_course/lms_course.py

@@ -35,38 +35,15 @@ class LMSCourse(Document):
     def __repr__(self):
         return f"<Course#{self.name}>"
 
-    def get_topic(self, slug):
-        """Returns the topic with given slug in this course as a Document.
-        """
-        result = frappe.get_all(
-            "LMS Topic",
-            filters={"course": self.name, "slug": slug})
-
-        if result:
-            row = result[0]
-            return frappe.get_doc('LMS Topic', row['name'])
-
     def has_mentor(self, email):
         """Checks if this course has a mentor with given email.
         """
         if not email or email == "Guest":
             return False
 
-        member = self.get_community_member(email)
-        if not member:
-            return False
-
-        mapping = frappe.get_all("LMS Course Mentor Mapping", {"course": self.name, "mentor": member})
+        mapping = frappe.get_all("LMS Course Mentor Mapping", {"course": self.name, "mentor": email})
         return mapping != []
 
-    def get_community_member(self, email):
-        """Returns the name of Community Member document for a give user.
-        """
-        try:
-            return frappe.db.get_value("Community Member", {"email": email}, "name")
-        except frappe.DoesNotExistError:
-            return None
-
     def add_mentor(self, email):
         """Adds a new mentor to the course.
         """
@@ -79,14 +56,10 @@ class LMSCourse(Document):
         if self.has_mentor(email):
             return
 
-        member = self.get_community_member(email)
-        if not member:
-            return False
-
         doc = frappe.get_doc({
             "doctype": "LMS Course Mentor Mapping",
             "course": self.name,
-            "mentor": member
+            "mentor": email
         })
         doc.insert()
 
@@ -96,7 +69,7 @@ class LMSCourse(Document):
         course_mentors = []
         mentors = frappe.get_all("LMS Course Mentor Mapping", {"course": self.name}, ["mentor"])
         for mentor in mentors:
-            member = frappe.get_doc("Community Member", mentor.mentor)
+            member = frappe.get_doc("User", mentor.mentor)
             # TODO: change this to count query
             member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member.name, "member_type": "Mentor"}))
             course_mentors.append(member)
@@ -107,11 +80,10 @@ class LMSCourse(Document):
         """
         if not email:
             return False
-        member = self.get_community_member(email)
         return frappe.db.exists({
             "doctype": "LMS Course Mentor Mapping",
             "course": self.name,
-            "mentor": member
+            "mentor": email
         })
 
     def get_student_batch(self, email):
@@ -120,32 +92,20 @@ class LMSCourse(Document):
         Returns None if the student is not part of any batch.
         """
         if not email:
-            return False
-        member = self.get_community_member(email)
-        result = frappe.db.get_all(
-            "LMS Batch Membership",
-            filters={
-                "member": member,
-                "member_type": "Student",
-            },
-            fields=['batch']
-        )
-        batches = [row['batch'] for row in result]
+            return
 
-        # filter the batches that are for this course
-        result = frappe.db.get_all(
-            "LMS Batch",
+        batch_name = frappe.get_value(
+            doctype="LMS Batch Membership",
             filters={
                 "course": self.name,
-                "name": ["IN", batches]
-            })
-        batches = [row['name'] for row in result]
-        if batches:
-            return frappe.get_doc("LMS Batch", batches[0])
+                "member_type": "Student",
+                "member": email
+            },
+            fieldname="batch")
+        return batch_name and frappe.get_doc("LMS Batch", batch_name)
 
     def get_instructor(self):
-        member_name = self.get_community_member(self.owner)
-        return frappe.get_doc("Community Member", member_name)
+        return frappe.get_doc("User", self.owner)
 
     def get_chapters(self):
         """Returns all chapters of this course.
@@ -160,10 +120,9 @@ class LMSCourse(Document):
         batches = find_all("LMS Batch", course=self.name)
         if mentor:
             # TODO: optimize this
-            member = self.get_community_member(email=mentor)
             memberships = frappe.db.get_all(
                 "LMS Batch Membership",
-                {"member": member},
+                {"member": mentor},
                 ["batch"])
             batch_names = {m.batch for m in memberships}
             return [b for b in batches if b.name in batch_names]

community/lms/doctype/lms_course/test_lms_course.py

@@ -11,7 +11,6 @@ class TestLMSCourse(unittest.TestCase):
     def setUp(self):
         frappe.db.sql('delete from `tabLMS Course Mentor Mapping`')
         frappe.db.sql('delete from `tabLMS Course`')
-        frappe.db.sql('delete from `tabCommunity Member`')
 
     def new_course(self, title):
         doc = frappe.get_doc({

community/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.json

@@ -23,7 +23,7 @@
    "fieldtype": "Link",
    "in_standard_filter": 1,
    "label": "Mentor",
-   "options": "Community Member"
+   "options": "User"
   },
   {
    "fetch_from": "mentor.full_name",
@@ -36,7 +36,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-04-20 12:46:48.460934",
+ "modified": "2021-05-21 11:48:43.340315",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course Mentor Mapping",

community/lms/doctype/lms_mentor_request/lms_mentor_request.json

@@ -19,7 +19,7 @@
    "fieldtype": "Link",
    "in_standard_filter": 1,
    "label": "Member",
-   "options": "Community Member"
+   "options": "User"
   },
   {
    "fieldname": "course",
@@ -52,7 +52,7 @@
    "fieldname": "reviewed_by",
    "fieldtype": "Link",
    "label": "Reviewed By",
-   "options": "Community Member"
+   "options": "User"
   },
   {
    "fieldname": "comments",
@@ -62,7 +62,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-04-19 09:27:03.814016",
+ "modified": "2021-05-21 11:49:12.543502",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Mentor Request",

community/lms/doctype/lms_mentor_request/lms_mentor_request.py

@@ -25,7 +25,7 @@ class LMSMentorRequest(Document):
         })
         mapping.save()
 
-    def send_creation_email(self, member):
+    def send_creation_email(self):
         email_template = self.get_email_template('mentor_request_creation')
         if not email_template:
             return
@@ -33,7 +33,7 @@ class LMSMentorRequest(Document):
         course_details = frappe.db.get_value("LMS Course", self.course, ["owner", "slug", "title"], as_dict=True)
         message = frappe.render_template(email_template.response,
                 {
-                    'member_name': member.full_name,
+                    'member_name': frappe.db.get_value("User", frappe.session.user, "full_name"),
                     'course_url': '/courses/' + course_details.slug,
                     'course': course_details.title
                 })
@@ -59,12 +59,10 @@ class LMSMentorRequest(Document):
                     'course': course_details.title
                 })
 
-        member_email = frappe.db.get_value("Community Member", self.member, "email")
         if self.status == 'Approved' or self.status == 'Rejected':
-            reviewed_by = frappe.db.get_value('Community Member', self.reviewed_by, 'email')
             email_args = {
-                "recipients": member_email,
-                "cc": [course_details.owner, reviewed_by],
+                "recipients": self.member,
+                "cc": [course_details.owner, self.reviewed_by],
                 "subject": email_template.subject,
                 "header": email_template.subject,
                 "message": message
@@ -73,7 +71,7 @@ class LMSMentorRequest(Document):
 
         elif self.status == 'Withdrawn':
             email_args = {
-                "recipients": [member_email, course_details.owner],
+                "recipients": [self.member, course_details.owner],
                 "subject": email_template.subject,
                 "header": email_template.subject,
                 "message": message
@@ -89,7 +87,7 @@ class LMSMentorRequest(Document):
 def has_requested(course):
     return frappe.db.count('LMS Mentor Request',
                 filters = {
-                    'member': get_member().name,
+                    'member': frappe.session.user,
                     'course': course,
                     'status': ['in', ('Pending', 'Approved')]
                 }
@@ -98,15 +96,14 @@ def has_requested(course):
 @frappe.whitelist()
 def create_request(course):
     if not has_requested(course):
-        member = get_member()
         request = frappe.get_doc({
                     'doctype': 'LMS Mentor Request',
-                    'member': member.name,
+                    'member': frappe.session.user,
                     'course': course,
                     'status': 'Pending'
                 })
         request.save(ignore_permissions=True)
-        request.send_creation_email(member)
+        request.send_creation_email()
         return 'OK'
 
     else:
@@ -114,13 +111,12 @@ def create_request(course):
 
 @frappe.whitelist()
 def cancel_request(course):
-    request = frappe.get_doc('LMS Mentor Request', {'member': get_member().name, 'course': course, 'status': ['in', ('Pending', 'Approved')]})
+    request = frappe.get_doc('LMS Mentor Request',{
+                    'member': frappe.session.user,
+                    'course': course,
+                    'status': ['in', ('Pending', 'Approved')]
+                }
+            )
     request.status = 'Withdrawn'
     request.save(ignore_permissions=True)
     return 'OK'
-
-def get_member():
-    try:
-        return frappe.get_doc('Community Member', {'email': frappe.session.user})
-    except frappe.DoesNotExistError:
-        return

community/lms/doctype/lms_message/lms_message.json

@@ -26,7 +26,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Author",
-   "options": "Community Member"
+   "options": "User"
   },
   {
    "fieldname": "message",
@@ -58,7 +58,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-04-28 10:17:57.618127",
+ "modified": "2021-05-21 11:49:34.911479",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Message",
@@ -82,4 +82,4 @@
  "sort_order": "DESC",
  "title_field": "author",
  "track_changes": 1
-}
+}

community/lms/doctype/lms_message/lms_message.py

@@ -7,98 +7,103 @@ import frappe
 from frappe.model.document import Document
 from frappe import _
 from frappe.utils import add_days, nowdate
-from community.www.courses.utils import get_batch_members
 
 class LMSMessage(Document):
-	""" def after_insert(self):
-		self.send_email() """
+    def after_insert(self):
+        self.publish_message()
+        #Todo: Adding email preference field for users
+        #self.send_email()
+
+    def publish_message(self):
+        template = self.get_message_template()
+        message = frappe._dict({
+            "author_name": self.author_name,
+            "message_time": frappe.utils.pretty_date(self.creation),
+            "message": frappe.utils.md_to_html(self.message)
+        })
+
+        js = """
+                $(".msger-input").val("");
+                var template = `{0}`;
+                var message = {1};
+                var session_user = ("{2}" == frappe.session.user) ? true : false;
+                message.author_name = session_user ? "You" : message.author_name
+                message.is_author = session_user;
+                template = frappe.render_template(template, {{
+                    "message": message
+                }})
+                $(".message-section").append(template);
+            """.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 %}">
+                    <div class="d-flex justify-content-between">
+                    <div class="font-weight-bold">
+                            {{ message.author_name }}
+                    </div>
+                    <div class="text-muted">
+                        {{ message.message_time }}
+                    </div>
+                    </div>
+                    <div class="mt-5">
+                        {{ message.message }}
+                    </div>
+                </div>
+            """
+
+    def send_email(self):
+        membership = frappe.get_all("LMS Batch Membership", {"batch": self.batch}, ["member"])
+        for entry in membership:
+            member = frappe.get_doc("User", entry.member)
+            if member.name != self.author:
+                #Todo: wrap sendmail in frappe.enqueue, else messages takes long to display.
+                frappe.sendmail(
+                    recipients = member.email,
+                    subject = _("New Message on ") + self.batch,
+                    header = _("New Message on ") + self.batch,
+                    template = "lms_message",
+                    args = {
+                        "author": self.author,
+                        "message": frappe.utils.md_to_html(self.message),
+                        "creation": frappe.utils.format_datetime(self.creation, "medium"),
+                        "course": frappe.db.get_value("LMS Batch", self.batch, ["course"])
+                    }
+                )
 
-	def send_email(self):
-		membership = frappe.get_all("LMS Batch Membership", {"batch": self.batch}, ["member"])
-		for entry in membership:
-			member = frappe.get_doc("Community Member", entry.member)
-			if member.name != self.author and member.email_preference == "Email on every Message":
-				frappe.sendmail(
-					recipients = member.email,
-					subject = _("New Message on ") + self.batch,
-					header = _("New Message on ") + self.batch,
-					template = "lms_message",
-					args = {
-						"author": self.author,
-						"message": frappe.utils.md_to_html(self.message),
-						"creation": frappe.utils.format_datetime(self.creation, "medium"),
-						"course": frappe.db.get_value("LMS Batch", self.batch, ["course"])
-					}
-				)
 def send_daily_digest():
-	emails = frappe._dict()
-	messages = frappe.get_all("LMS Message", {"creation": [">=", add_days(nowdate(), -1)]}, ["message", "batch", "author", "creation"])
-	for message in messages:
-		membership = frappe.get_all("LMS Batch Membership", {"batch": message.batch}, ["member"])
-		for entry in membership:
-			member = frappe.db.get_value("Community Member", entry.member, ["name", "email_preference", "email"], as_dict=1)
-			if member.name != message.author and member.email_preference == "One Digest Mail per day":
-				if member.name in emails.keys():
-					emails[member.name]["messages"].append(message)
-				else:
-					emails[member.name] = frappe._dict({
-						"email": member.email,
-						"messages": [message]
-					})
-	for email in emails:
-		group_by_batch = frappe._dict()
-		for message in emails[email]["messages"]:
-			if message.batch in group_by_batch.keys():
-				group_by_batch[message.batch].append(message)
-			else:
-				group_by_batch[message.batch] = [message]
-		frappe.sendmail(
-			recipients = frappe.db.get_value("Community Member", email, "email"),
-			subject = _("Message Digest"),
-			header = _("Message Digest"),
-			template = "lms_daily_digest",
-			args = {
-				"batches": group_by_batch
-			},
-			delayed = False
-		)
+    #Todo: Optimize this
+    emails = frappe._dict()
+    messages = frappe.get_all("LMS Message", {"creation": [">=", add_days(nowdate(), -1)]}, ["message", "batch", "author", "creation"])
+    for message in messages:
+        membership = frappe.get_all("LMS Batch Membership", {"batch": message.batch}, ["member"])
+        for entry in membership:
+            member = frappe.db.get_value("User", entry.member, ["name", "email"], as_dict=1)
+            if member.name != message.author:
+                if member.name in emails.keys():
+                    emails[member.name]["messages"].append(message)
+                else:
+                    emails[member.name] = frappe._dict({
+                        "email": member.email,
+                        "messages": [message]
+                    })
+    for email in emails:
+        group_by_batch = frappe._dict()
+        for message in emails[email]["messages"]:
+            if message.batch in group_by_batch.keys():
+                group_by_batch[message.batch].append(message)
+            else:
+                group_by_batch[message.batch] = [message]
+        frappe.sendmail(
+            recipients = frappe.db.get_value("User", email, "email"),
+            subject = _("Message Digest"),
+            header = _("Message Digest"),
+            template = "lms_daily_digest",
+            args = {
+                "batches": group_by_batch
+            },
+            delayed = False
+        )
 
-def publish_message(doc, method):
-	email = frappe.db.get_value("Community Member", doc.author, "email")
-	template = get_message_template()
-	message = frappe._dict()
-	message.author_name = doc.author_name
-	message.message_time = frappe.utils.pretty_date(doc.creation)
-	message.message = frappe.utils.md_to_html(doc.message)
-
-	js = """
-			$(".msger-input").val("");
-			var template = `{0}`;
-			var message = {1};
-			var session_user = ("{2}" == frappe.session.user) ? true : false;
-			message.author_name = session_user ? "You" : message.author_name
-			message.is_author = session_user;
-			template = frappe.render_template(template, {{
-				"message": message
-			}})
-			$(".message-section").append(template);
-		""".format(template, message, email)
-
-	frappe.publish_realtime(event="eval_js", message=js, after_commit=True)
-
-def get_message_template():
-	return """  
-			<div class="discussion {% if message.is_author %} is-author {% endif %}">
-				<div class="d-flex justify-content-between">
-				<div class="font-weight-bold">
-						{{ message.author_name }}
-				</div>
-				<div class="text-muted">
-					{{ message.message_time }}
-				</div>
-				</div>
-				<div class="mt-5">
-					{{ message.message }}
-				</div>
-			</div>
-		"""

community/lms/doctype/lms_section/lms_section.json

@@ -9,7 +9,8 @@
   "contents",
   "code",
   "attrs",
-  "index"
+  "index",
+  "id"
  ],
  "fields": [
   {
@@ -43,12 +44,17 @@
    "fieldname": "index",
    "fieldtype": "Int",
    "label": "Index"
+  },
+  {
+   "fieldname": "id",
+   "fieldtype": "Data",
+   "label": "id"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-03-12 17:56:23.118854",
+ "modified": "2021-05-19 18:55:26.019625",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Section",

community/lms/doctype/lms_section/lms_section.py

@@ -10,6 +10,10 @@ class LMSSection(Document):
     def __repr__(self):
         return f"<LMSSection {self.label!r}>"
 
+    def get_exercise(self):
+        if self.type == "exercise":
+            return frappe.get_doc("Exercise", 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

@@ -4,6 +4,7 @@ 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
@@ -60,9 +61,21 @@ def clear():
 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)

community/lms/doctype/lms_topic/lms_topic.json

@@ -1,89 +0,0 @@
-{
- "actions": [],
- "allow_guest_to_view": 1,
- "creation": "2021-03-02 07:20:41.686573",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "course",
-  "title",
-  "slug",
-  "preview",
-  "description",
-  "order",
-  "sections"
- ],
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title",
-   "reqd": 1
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Markdown Editor",
-   "label": "Description"
-  },
-  {
-   "fieldname": "course",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Course",
-   "options": "LMS Course",
-   "reqd": 1
-  },
-  {
-   "fieldname": "order",
-   "fieldtype": "Int",
-   "label": "Order"
-  },
-  {
-   "fieldname": "preview",
-   "fieldtype": "Markdown Editor",
-   "label": "Preview"
-  },
-  {
-   "fieldname": "sections",
-   "fieldtype": "Table",
-   "label": "Sections",
-   "options": "LMS Section"
-  },
-  {
-   "description": "The slug of the topic. Autogenerated from the title if not specified.",
-   "fieldname": "slug",
-   "fieldtype": "Data",
-   "label": "Slug"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-04-06 14:12:48.514062",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "LMS Topic",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "search_fields": "title",
- "sort_field": "creation",
- "sort_order": "ASC",
- "title_field": "title",
- "track_changes": 1,
- "track_seen": 1,
- "track_views": 1
-}

community/lms/doctype/lms_topic/lms_topic.py

@@ -1,43 +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 frappe
-from frappe.model.document import Document
-from .section_parser import SectionParser
-from ...utils import slugify
-
-class LMSTopic(Document):
-    def before_save(self):
-        course = self.get_course()
-        if not self.slug:
-            self.slug = self.generate_slug(title=self.title)
-
-        sections = SectionParser().parse(self.description or "")
-        self.sections = [self.make_lms_section(i, s) for i, s in enumerate(sections)]
-
-    def get_course(self):
-        return frappe.get_doc("LMS Course", self.course)
-
-    def generate_slug(self, title):
-        result = frappe.get_all(
-            'LMS Topic',
-            filters={'course': self.course},
-            fields=['slug'])
-        slugs = set([row['slug'] for row in result])
-        return slugify(title, used_slugs=slugs)
-
-    def get_sections(self):
-        return sorted(self.sections, key=lambda s: s.index)
-
-    def make_lms_section(self, index, section):
-            s = frappe.new_doc('LMS Section', parent_doc=self, parentfield='sections')
-            s.type = section.type
-            s.label = section.label
-            s.contents = section.contents
-            s.index = index
-            return s
-
-
-

community/lms/widgets/CourseTeaser.html

@@ -6,6 +6,10 @@
     </div>
   </div>
   <div class="course-footer">
+    {% set batch = course.get_student_batch(frappe.session.user) %}
+    {% if batch %}
+      <a class="btn btn-secondary pull-right" href="/courses/{{course.name}}/{{batch.name}}/learn">Resume Course</a>
+    {% endif %}
     <div class="course-author">
       {% with author = course.get_instructor() %}
         {{ widgets.Avatar(member=author, avatar_class="avatar-medium") }} <a href="/{{author.username}}">{{ author.full_name }}</a>

community/lms/widgets/Exercise.html

@@ -0,0 +1,18 @@
+{% from "www/macros/livecode.html" import LiveCodeEditorJS, LiveCodeEditor with context %}
+
+<div class="exercise">
+  <h2>{{ exercise.title }}</h2>
+  <div class="exercise-description">{{frappe.utils.md_to_html(exercise.description)}}</div>
+
+  {% if exercise.image %}
+  <div class="exercise-image">{{exercise.image}}</div>
+  {% endif %}
+
+  {% set submission = exercise.get_user_submission() %}
+
+  {{ LiveCodeEditor(exercise.name,
+        code=submission.solution if submission else exercise.code,
+        reset_code=exercise.code,
+        is_exercise=True,
+        last_submitted=submission and submission.creation) }}
+</div>

community/overrides/user.py

@@ -0,0 +1,42 @@
+import frappe
+from frappe.core.doctype.user.user import User
+from frappe.utils import cint
+import hashlib
+
+class CustomUser(User):
+
+    def get_course_count(self) -> int:
+        """Returns the number of courses authored by this user.
+        """
+        return frappe.db.count(
+            'LMS Course', {
+                'owner': self.email
+        })
+
+    def get_palette(self):
+        palette = [
+            ['--orange-avatar-bg', '--orange-avatar-color'],
+            ['--pink-avatar-bg', '--pink-avatar-color'],
+            ['--blue-avatar-bg', '--blue-avatar-color'],
+            ['--green-avatar-bg', '--green-avatar-color'],
+            ['--dark-green-avatar-bg', '--dark-green-avatar-color'],
+            ['--red-avatar-bg', '--red-avatar-color'],
+            ['--yellow-avatar-bg', '--yellow-avatar-color'],
+            ['--purple-avatar-bg', '--purple-avatar-color'],
+            ['--gray-avatar-bg', '--gray-avatar-color0']
+        ]
+
+        encoded_name = str(self.full_name).encode("utf-8")
+        hash_name = hashlib.md5(encoded_name).hexdigest()
+        idx = cint((int(hash_name[4:6], 16) + 1) / 5.33)
+        return palette[idx % 8]
+
+    def get_batch_count(self) -> int:
+        """Returns the number of batches authored by this user.
+        """
+        return frappe.db.count(
+            'LMS Batch Membership', {
+                'member': self.name,
+                'member_type': 'Mentor'
+            })
+

community/patches.txt

@@ -2,3 +2,7 @@ community.patches.set_email_preferences
 community.patches.change_name_for_community_members
 community.patches.save_abbr_for_community_members
 community.patches.create_mentor_request_email_templates
+community.patches.replace_member_with_user_in_batch_membership
+community.patches.replace_member_with_user_in_course_mentor_mapping
+community.patches.replace_member_with_user_in_lms_message
+community.patches.replace_member_with_user_in_mentor_request

community/patches/replace_member_with_user_in_batch_membership.py

@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+    frappe.reload_doc("lms", "doctype", "lms_batch_membership")
+    memberships = frappe.get_all("LMS Batch Membership", ["member", "name"])
+    for membership in memberships:
+        email = frappe.db.get_value("Community Member", membership.member, "email")
+        frappe.db.set_value("LMS Batch Membership", membership.name, "member", email)

community/patches/replace_member_with_user_in_course_mentor_mapping.py

@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+    frappe.reload_doc("lms", "doctype", "lms_course_mentor_mapping")
+    mappings = frappe.get_all("LMS Course Mentor Mapping", ["mentor", "name"])
+    for mapping in mappings:
+        email = frappe.db.get_value("Community Member", mapping.mentor, "email")
+        frappe.db.set_value("LMS Course Mentor Mapping", mapping.name, "mentor", email)

community/patches/replace_member_with_user_in_lms_message.py

@@ -0,0 +1,10 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+    frappe.reload_doc("lms", "doctype", "lms_message")
+    messages = frappe.get_all("LMS Message", ["author", "name"])
+    for message in messages:
+        user = frappe.db.get_value("Community Member", message.author, ["email", "full_name"], as_dict=True)
+        frappe.db.set_value("LMS Message", message.name, "author", user.email)
+        frappe.db.set_value("LMS Message", message.name, "author_name", user.full_name)

community/patches/replace_member_with_user_in_mentor_request.py

@@ -0,0 +1,10 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+    frappe.reload_doc("lms", "doctype", "lms_mentor_request")
+    requests = frappe.get_all("LMS Mentor Request", ["member", "name"])
+    for request in requests:
+        user = frappe.db.get_value("Community Member", request.member, ["email", "full_name"], as_dict=True)
+        frappe.db.set_value("LMS Mentor Request", request.name, "member", user.email)
+        frappe.db.set_value("LMS Mentor Request", request.name, "member_name", user.full_name)

community/public/build.json

@@ -1,14 +0,0 @@
-{
-  "css/lms.css": [
-    "public/css/lms.css"
-  ],
-  "css/community.css": [
-    "public/css/style.css",
-    "public/css/vars.css",
-    "public/css/style.less"
-  ],
-  "js/livecode-canvas.js": [
-    "public/js/livecode-canvas.js"
-  ]
-
-}

community/public/css/community.bundle.less

@@ -0,0 +1,4 @@
+
+@import "./style.css";
+@import "./vars.css";
+@import "./style.less";

community/public/css/lms.css

@@ -1,26 +0,0 @@
-
-.heading {
-  background: #eee;
-  padding: 10px;
-  clear: both;
-  color: #212529;
-  border: 1px solid #ddd;
-}
-
-.sketch-header h1 {
-  font-size: 1.5em;
-  margin-bottom: 0px;
-}
-
-.sketch-header {
-  margin-bottom: 1em;
-}
-
-.sketch-card .sketch-title a {
-  font-weight: bold;
-  color: inherit;
-}
-
-.hidden {
-  display: none;
-}

community/public/css/style.css

@@ -1,5 +1,3 @@
-@import url("https://cdn.jsdelivr.net/npm/bootstrap-icons@1.4.1/font/bootstrap-icons.css");
-@import url("https://use.fontawesome.com/releases/v5.13.0/css/all.css");
 
 :root {
   --c1: #fefae0;
@@ -25,8 +23,6 @@
   --cta-color: var(--c4);
   --send-message: var(--c7);
   --received-message: var(--c8);
-
-  --primary-color: #08B74F;
 }
 
 body {
@@ -167,7 +163,7 @@ img.profile-photo {
 }
 
 .msger-inputarea {
-  position: absolute;
+  position: fixed;
   bottom: 0;
   width: 100%;
   display: flex;
@@ -229,3 +225,8 @@ img.profile-photo {
   font-weight: 600;
   line-height: 51px;
 }
+
+.anchor_style {
+  text-decoration: none;
+  color: inherit;
+}

community/public/css/style.less

@@ -1,10 +1,3 @@
-@primary-color: #08B74F;
-@import url('https://rsms.me/inter/inter.css');
-
-body {
-  font-family: "Inter", sans-serif;
-}
-
 h2 {
   margin: 20px 0px;
   color: black;
@@ -306,3 +299,39 @@ section.lightgray {
 .lesson-page {
   margin: 20px 0px;
 }
+
+.lesson-pagination {
+  clear: both;
+}
+
+.exercise-image svg {
+  width: 200px;
+  height: 200px;
+  border: 1px solid #ddd;
+  margin-bottom: 20px;
+}
+
+.svg-200 svg {
+  width: 200px;
+  height: 200px;
+}
+
+.livecode-editor-small .livecode-editor {
+  .CodeMirror-scroll {
+    max-height: 160px;
+    min-height: 160px;
+  }
+
+  canvas {
+    width: 150px;
+    height: 150px;
+  }
+}
+
+.mentor-dashboard {
+  margin-top: 20px;
+
+  .submission {
+    margin: 40px 0px 0px 20px;
+  }
+}

community/public/css/vars.css

@@ -1,6 +1,5 @@
 /* Define all your css variables here. */
 :root {
-  --primary-color: #08B74F;
   --tag-color: #737373;
   --sidebar-bg: #F6F6F6;
   --sidebar-border: #C4C4C4;

community/templates/message.html

@@ -0,0 +1,13 @@
+<div class="discussion {% if message.is_author %} is-author {% endif %}">
+  <div class="d-flex justify-content-between">
+    <div class="font-weight-bold">
+      {{ message.author_name }}
+    </div>
+    <div class="text-muted">
+      {{ message.message_time }}
+    </div>
+  </div>
+  <div class="mt-5">
+    {{ message.message }}
+  </div>
+</div>

community/www/batch/about.html

@@ -6,10 +6,13 @@
 {% block head_include %}
 <meta name="description" content="Courses" />
 <meta name="keywords" content="" />
+
+<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course.name, batch.name) }}
+{{ Sidebar(course, batch) }}
+
 <div class="container">
 	{{ CourseBasicDetail(course)}}
 	{{ InstructorsSection(course.get_instructor()) }}

community/www/batch/about.py

@@ -0,0 +1,7 @@
+import frappe
+from . import utils
+
+def get_context(context):
+    utils.get_common_context(context)
+
+    print("context", context)

community/www/batch/discuss.html

@@ -6,13 +6,16 @@
 {% block head_include %}
 <meta name="description" content="Courses" />
 <meta name="keywords" content="" />
+
+<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course_slug, batch_code) }}
+{{ Sidebar(course, batch) }}
+
 <div class="">
   <div class="batch-header">
-    {{ BatchHearder(course.name, member_count) }}
+    {{ BatchHearder(course.title, member_count) }}
   </div>
   <div class="messages">
     <div class="message-section">

community/www/batch/discuss.js

@@ -30,4 +30,4 @@ frappe.ready(() => {
 			$(".msger-input").val("");
 		}
 	})
-})
+})

community/www/batch/discuss.py

@@ -0,0 +1,6 @@
+import frappe
+from . import utils
+
+def get_context(context):
+    utils.get_common_context(context)
+    context.messages = context.batch.get_messages()

community/www/batch/learn.html

@@ -9,6 +9,7 @@
 	<style>
 	</style>
 
+<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 <link rel="stylesheet" href="{{ livecode_url }}/static/codemirror/lib/codemirror.css">
 <link rel="stylesheet" href="/assets/css/lms.css">
 
@@ -22,18 +23,11 @@
 
 
 {% block content %}
-{{ Sidebar(course.name, batch.name) }}
+{{ Sidebar(course, batch) }}
 
 <div class="container">
   <div class="lesson-page">
-    <div class="lesson-pagination">
-      {% if prev_url %}
-        <a href="{{prev_url}}" class="btn">&larr; Prev</a>
-      {% endif %}
-      {% if next_url %}
-        <a href="{{next_url}}" class="btn pull-right">Next &rarr;</a>
-      {% endif %}
-    </div>
+    {{ pagination(prev_url, next_url) }}
 
     <h2>{{ lesson.title }}</h2>
 
@@ -43,10 +37,8 @@
     </div>
     {% endfor %}
 
-    <div class="lesson-pagination">
-      <a href="#" class="btn">&larr; Prev</a>
-      <a href="#" class="btn pull-right">Next &rarr;</a>
-    </div>
+    {{ pagination(prev_url, next_url) }}
+
   </div>
 </div>
 {% endblock %}
@@ -55,8 +47,14 @@
 {% macro render_section(s) %}
   {% if s.type == "text" %}
     {{ render_section_text(s) }}
-  {% elif s.type == "example" or s.type == "code" or s.type == "exercise" %}
-    {{ LiveCodeEditor(s.name, s.get_latest_code_for_user(), s.type=="exercise", "2 hours ago") }}
+  {% elif s.type == "example" or s.type == "code" %}
+    {{ LiveCodeEditor(s.name,
+          code=s.get_latest_code_for_user(),
+          reset_code=s.contents,
+          is_exercise=False)
+    }}
+  {% elif s.type == "exercise" %}
+    {{ widgets.Exercise(exercise=s.get_exercise())}}
   {% else %}
     <div>Unknown section type: {{s.type}}</div>
   {% endif %}
@@ -70,6 +68,18 @@
   </div>
 {% endmacro %}
 
+{% macro pagination(prev_url, next_url) %}
+  <div class="lesson-pagination">
+    {% if prev_url %}
+      <a href="{{prev_url}}" class="btn">&larr; Prev</a>
+    {% endif %}
+    {% if next_url %}
+      <a href="{{next_url}}" class="btn pull-right">Next &rarr;</a>
+    {% endif %}
+    <div style="clear: both;"></div>
+  </div>
+{% endmacro %}
+
 {%- block script %}
   {{ super() }}
   {{ LiveCodeEditorJS() }}

community/www/batch/learn.py

@@ -1,37 +1,25 @@
 import frappe
-from community.lms.models import Course
+from . import utils
 
 def get_context(context):
-    context.no_cache = 1
+    utils.get_common_context(context)
 
-    course_name = frappe.form_dict["course"]
-    batch_name = frappe.form_dict["batch"]
     chapter_index = frappe.form_dict.get("chapter")
     lesson_index = frappe.form_dict.get("lesson")
     lesson_number = f"{chapter_index}.{lesson_index}"
 
-    course = Course.find(course_name)
-    if not course:
-        context.template = "www/404.html"
-        return
-
-    batch = course.get_batch(batch_name)
-    if not batch:
-        frappe.local.flags.redirect_location = "/courses/" + course_name
-        raise frappe.Redirect
+    course_name = context.course.name
+    batch_name = context.batch.name
 
     if not chapter_index or not lesson_index:
         frappe.local.flags.redirect_location = f"/courses/{course_name}/{batch_name}/learn/1.1"
         raise frappe.Redirect
 
-    context.course = course
-    context.batch = batch
-    context.lesson = course.get_lesson(chapter_index, lesson_index)
+    context.lesson = context.course.get_lesson(chapter_index, lesson_index)
     context.lesson_index = lesson_index
     context.chapter_index = chapter_index
-    context.livecode_url = get_livecode_url()
-
-    outline = course.get_outline()
+    print(context.lesson)
+    outline = context.course.get_outline()
     next_ = outline.get_next(lesson_number)
     prev_ = outline.get_prev(lesson_number)
     context.next_url = get_learn_url(course_name, batch_name, next_)
@@ -41,6 +29,3 @@ def get_learn_url(course_name, batch_name, lesson_number):
     if not lesson_number:
         return
     return f"/courses/{course_name}/{batch_name}/learn/{lesson_number}"
-
-def get_livecode_url():
-    return frappe.db.get_single_value("LMS Settings", "livecode_url")

community/www/batch/members.html

@@ -0,0 +1,39 @@
+{% extends "templates/base.html" %}
+{% from "www/macros/sidebar.html" import Sidebar %}
+{% from "www/macros/common_macro.html" import BatchHearder %}
+
+{% block title %}Members{% endblock %}
+{% block head_include %}
+<meta name="description" content="Courses" />
+<meta name="keywords" content="" />
+<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
+{% endblock %}
+
+{% block content %}
+{{ Sidebar(course, batch) }}
+
+<div class="container">
+  {{ BatchHearder(course.title, member_count)}}
+  {{ MembersList(members)}}
+</div>
+{% endblock %}
+
+
+{% macro MembersList(members) %}
+<div class="mt-5">
+  {% for member in members %}
+  <div class="d-flex align-items-center">
+    <div>
+      {{ widgets.Avatar(member=member, avatar_class="avatar-medium") }}
+    </div>
+    <div class="ml-5 mr-5">
+      <a href="/{{member.username}}">{{ member.full_name }}</a>
+    </div>
+    {% if course.is_mentor(member.name) %}
+    <div class="badge badge-success">Mentor</div>
+    {% endif %}
+  </div>
+  <hr>
+  {% endfor %}
+</div>
+{% endmacro %}

community/www/batch/members.py

@@ -0,0 +1,5 @@
+import frappe
+from . import utils
+
+def get_context(context):
+    utils.get_common_context(context)

community/www/batch/progress.html

@@ -0,0 +1,52 @@
+{% extends "templates/base.html" %}
+{% from "www/macros/sidebar.html" import Sidebar %}
+{% from "www/macros/livecode.html" import LiveCodeEditorJS, LiveCodeEditor with context %}
+{% block title %}{{ course.title  }} - Batch Dashboard{% endblock %}
+
+{% block head_include %}
+	<meta name="description" content="{{course.title}} - Batch Dashboard" />
+	<meta name="keywords" content="{{course.title}} - Batch Dashboard" />
+	<style>
+	</style>
+
+<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
+<link rel="stylesheet" href="{{ livecode_url }}/static/codemirror/lib/codemirror.css">
+<link rel="stylesheet" href="/assets/css/lms.css">
+
+<script src="{{ livecode_url }}/static/codemirror/lib/codemirror.js"></script>
+<script src="{{ livecode_url }}/static/codemirror/mode/python/python.js"></script>
+<script src="{{ livecode_url }}/static/codemirror/keymap/sublime.js"></script>
+
+<script src="{{ livecode_url }}/static/codemirror/addon/edit/matchbrackets.js"></script>
+<script src="{{ livecode_url }}/static/codemirror/addon/comment/comment.js"></script>
+{% endblock %}
+
+
+{% block content %}
+{{ Sidebar(course, batch) }}
+
+<div class="container">
+  <div class="mentor-dashboard">
+    <h1>Batch Progress</h1>
+    {% for exercise in report.exercises %}
+      <div class="exercise-submissions">
+        <h2>{{exercise.title}}</h2>
+        {% for s in report.get_submissions_of_exercise(exercise.name) %}
+          <div class="submission">
+            <h4><a href="/{{s.owner.username}}">{{s.owner.full_name}}</a></h4>
+            <div class="livecode-editor-small">
+              {{ LiveCodeEditor(name=s.name, code=s.solution, reset_code=s.solution) }}
+            </div>
+          </div>
+        {% endfor %}
+      </div>
+    {% endfor %}
+  </div>
+</div>
+{% endblock %}
+
+
+{%- block script %}
+  {{ super() }}
+  {{ LiveCodeEditorJS() }}
+{% endblock %}

community/www/batch/progress.py

@@ -0,0 +1,64 @@
+import frappe
+from community.lms.models import Course
+from collections import defaultdict
+from . import utils
+
+def get_context(context):
+    utils.get_common_context(context)
+
+    exercise_name = frappe.form_dict.get("exercise")
+    if exercise_name:
+        exercise = frappe.get_doc("Exercise", exercise_name)
+    else:
+        exercise = None
+
+    context.exercise = exercise
+    context.report = BatchReport(context.course, context.batch)
+
+class BatchReport:
+    def __init__(self, course, batch):
+        self.submissions = get_submissions(batch)
+        self.exercises = self.get_exercises(course.name)
+
+        self.submissions_by_exercise = defaultdict(list)
+        for s in self.submissions:
+            self.submissions_by_exercise[s.exercise].append(s)
+
+    def get_exercises(self, course_name):
+        return frappe.get_all("Exercise", {"course": course_name}, ["name", "title"])
+
+    def get_submissions_of_exercise(self, exercise_name):
+        return self.submissions_by_exercise[exercise_name]
+
+def get_submissions(batch):
+    students = batch.get_students()
+    students_map = {s['email']: s for s in students}
+
+    names, values = nparams("s", students_map.keys())
+
+    sql = """
+    select owner, exercise, name, solution, creation, image
+    from (
+        select owner, exercise, name, solution, creation, image,
+            row_number() over (partition by owner, exercise order by creation desc) as ix
+        from `tabExercise Submission`) as t
+    where t.ix=1 and owner IN {}
+    """.format(names)
+
+    data = frappe.db.sql(sql, values=values, as_dict=True)
+
+    for row in data:
+        row['owner'] = students_map[row['owner']]
+    return data
+
+def nparams(name, values):
+    """Creates n paramters from a list of values for a db query.
+
+    >>> nparams("name", ["a", "b])
+    ("(%(name_1)s, %(name_2)s)", {"name_1": "a", "name_2": "b"})
+    """
+    keys = [f"{name}_{i}" for i, _ in enumerate(values, start=1)]
+    param_names = [f"%({k})s" for k in keys]
+    param_values = dict(zip(keys, values))
+    joined_names = "(" + ", ".join(param_names) + ")"
+    return joined_names, param_values

community/www/batch/schedule.html

@@ -4,10 +4,11 @@
 {% block head_include %}
 <meta name="description" content="Courses" />
 <meta name="keywords" content="" />
+<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course, batch_code) }}
+{{ Sidebar(course, batch) }}
 <div class="container">
 </div>
 {% endblock %}

community/www/batch/schedule.py

@@ -3,7 +3,6 @@ from community.lms.models import Course
 
 def get_context(context):
     context.no_cache = 1
-
     course_name = frappe.form_dict["course"]
     batch_name = frappe.form_dict["batch"]
 

community/www/batch/utils.py

@@ -0,0 +1,28 @@
+import frappe
+from community.lms.models import Course
+
+def get_common_context(context):
+    context.no_cache = 1
+
+    course_name = frappe.form_dict["course"]
+    batch_name = frappe.form_dict["batch"]
+
+    course = Course.find(course_name)
+    if not course:
+        context.template = "www/404.html"
+        return
+
+    batch = course.get_batch(batch_name)
+    if not batch:
+        frappe.local.flags.redirect_location = "/courses/" + course_name
+        raise frappe.Redirect
+
+    context.course = course
+    context.batch = batch
+    context.members = batch.get_mentors() + batch.get_students()
+    context.member_count = len(context.members)
+    context.livecode_url = get_livecode_url()
+
+def get_livecode_url():
+    return frappe.db.get_single_value("LMS Settings", "livecode_url")
+

community/www/courses/course.py

@@ -1,6 +1,4 @@
 import frappe
-from community.www.courses.utils import get_instructor
-from frappe.utils import nowdate, getdate
 from community.lms.models import Course
 
 def get_context(context):

community/www/courses/discuss/index.py

@@ -1,15 +0,0 @@
-import frappe
-from community.www.courses.utils import redirect_if_not_a_member, get_course, get_batch_members, get_batch
-from community.lms.doctype.lms_batch.lms_batch import get_messages
-
-def get_context(context):
-    context.no_cache = 1
-    context.course_slug = frappe.form_dict["course"]
-    context.course = get_course(context.course_slug)
-    context.batch_code = frappe.form_dict["batch"]
-    redirect_if_not_a_member(context.course_slug, context.batch_code)
-    
-    context.batch = get_batch(context.batch_code)
-    context.members = get_batch_members(context.batch.name)
-    context.member_count = len(context.members)
-    context.messages = get_messages(context.batch.name)

community/www/courses/index.py

@@ -7,6 +7,6 @@ def get_context(context):
 def get_courses():
     courses = frappe.get_all(
         "LMS Course",
-        fields=['name', 'slug', 'title', 'description']
+        fields=['name', 'title', 'description']
     )
     return courses

community/www/courses/members/index.html

@@ -1,38 +0,0 @@
-{% extends "templates/base.html" %}
-{% from "www/macros/sidebar.html" import Sidebar %}
-{% from "www/macros/profile.html" import Profile %}
-{% from "www/macros/common_macro.html" import BatchHearder %}
-
-{% block title %}Members{% endblock %}
-{% block head_include %}
-<meta name="description" content="Courses" />
-<meta name="keywords" content="" />
-{% endblock %}
-
-{% block content %}
-{{ Sidebar(course_slug, batch_code) }}
-<div class="container">
-	{{ BatchHearder(course.name, member_count)}}
-	{{ MembersList(members)}}
-</div>
-{% endblock %}
-
-
-{% macro MembersList(members) %}
-<div class="mt-5">
-	{% for member in members %}
-	<div class="d-flex align-items-center">
-		<div>
-			{{ Profile(member.photo, member.full_name, member.abbr, "small") }}
-		</div>
-		<div class="mr-5">
-			{{member.full_name}}
-		</div>
-		{% if member.is_mentor %}
-		<div class="badge badge-success">Mentor</div>
-		{% endif %}
-	</div>
-	<hr>
-	{% endfor %}
-</div>
-{% endmacro %}

community/www/courses/members/index.py

@@ -1,12 +0,0 @@
-import frappe
-from community.www.courses.utils import redirect_if_not_a_member, get_batch, get_member_with_name, get_course, get_batch_members
-
-def get_context(context):
-    context.no_cache = 1
-    context.course_slug = frappe.form_dict["course"]
-    context.course = get_course(context.course_slug)
-    context.batch_code = frappe.form_dict["batch"]
-    redirect_if_not_a_member(context.course_slug, context.batch_code)
-    context.batch = get_batch(context.batch_code)
-    context.members = get_batch_members(context.batch.name)
-    context.member_count = len(context.members)

community/www/courses/schedule/index.py

@@ -1,8 +0,0 @@
-import frappe
-from community.www.courses.utils import redirect_if_not_a_member
-
-def get_context(context):
-    context.no_cache = 1
-    context.course = frappe.form_dict["course"]
-    context.batch_code = frappe.form_dict["batch"]
-    redirect_if_not_a_member(context.course, context.batch_code)

community/www/courses/topic.html

@@ -1,108 +0,0 @@
-{% extends "templates/base.html" %}
-{% from "www/macros/livecode.html" import LiveCodeEditor with context %}
-{% block title %}{{topic.title}} ({{course.title}}){% endblock %}
-{% block head_include %}
-	<meta name="description" content="Topic {{topic.title}} of the course {{course.title}}" />
-	<meta name="keywords" content="course {{course.title}} {{topic.title}}" />
-	<style>
-	</style>
-
-<link rel="stylesheet" href="{{ livecode_url }}/static/codemirror/lib/codemirror.css">
-<link rel="stylesheet" href="/assets/css/lms.css">
-
-<script src="{{ livecode_url }}/static/codemirror/lib/codemirror.js"></script>
-<script src="{{ livecode_url }}/static/codemirror/mode/python/python.js"></script>
-<script src="{{ livecode_url }}/static/codemirror/keymap/sublime.js"></script>
-
-<script src="{{ livecode_url }}/static/codemirror/addon/edit/matchbrackets.js"></script>
-<script src="{{ livecode_url }}/static/codemirror/addon/comment/comment.js"></script>
-{% endblock %}
-
-{% block content %}
-<section class="top-section" style="padding: 1rem 0rem;">
-	<div class='container pb-5'>
-		<nav aria-label="breadcrumb">
-			<ol class="breadcrumb">
-				<li class="breadcrumb-item" aria-current="page"><a href="/courses">Courses</a></li>
-				<li class="breadcrumb-item" aria-current="page"><a href="/courses/{{course.slug}}">{{course.title}}</a></li>
-			</ol>
-		</nav>
-
-		<h1>{{ topic.title }}</h1>
-
-    {% for s in topic.get_sections() %}
-    <div class="section section-{{ s.type }}">
-      {{ render_section(s) }}
-    </div>
-    {% endfor %}
-
-	</div>
-</section>
-{% endblock %}
-
-{% macro render_section(s) %}
-  {% if s.type == "text" %}
-    {{ render_section_text(s) }}
-  {% elif s.type == "example" or s.type == "code" %}
-    {{ LiveCodeEditor(s.name, s.get_latest_code_for_user()) }}
-  {% else %}
-    <div>Unknown section type: {{s.type}}</div>
-  {% endif %}
-{% endmacro %}
-
-{% macro render_section_text(s) %}
-  <div class="row">
-    <div class="col-md-9">
-      {{ frappe.utils.md_to_html(s.contents) }}
-    </div>
-  </div>
-{% endmacro %}
-
-{%- block script %}
-  {{ super() }}
-  <script type="text/javascript" src="{{ livecode_url }}/static/livecode.js"></script>
-  <script type="text/javascript">
-    $(function() {
-      var editorLookup = {};
-
-      $(".canvas-editor").each((i, e) => {
-        var data = $(e).data();
-        var editor = new LiveCodeEditor(e, {
-          runtime: "python-canvas",
-          base_url: "{{ livecode_url }}",
-          codemirror: true,
-          userdata: data,
-          autosave: function(editor, code) {
-            // can't autosave when user is Guest
-            if (frappe.session.user == "Guest") {
-              return;
-            }
-            var data = editor.options.userdata;
-            var code = editor.codemirror.doc.getValue();
-            // console.log("autosaving...")
-            frappe.call("community.lms.api.autosave_section", {
-              section: data.section,
-              code: code
-            }).then((r) => {
-              // TODO: verify
-            })
-          }
-        })
-        editorLookup[data.section] = editor;
-      })
-
-      $(".canvas-editor .reset").each((i, e) => {
-        $(e).on("click", function(event) {
-          var data = $(this).parents(".canvas-editor").data();
-          var section = data.section;
-          frappe.call("community.lms.api.get_section", {
-            name: section
-          }).then(r => {
-            var editor = editorLookup[data.section];
-            editor.codemirror.doc.setValue(r.message.contents);
-          })
-        })
-      })
-    })
-  </script>
-{%- endblock %}

community/www/courses/topic.py

@@ -1,33 +0,0 @@
-import frappe
-
-def get_context(context):
-    context.no_cache = 1
-
-    try:
-        course_slug = frappe.form_dict['course']
-        topic_slug = frappe.form_dict['topic']
-    except KeyError:
-        context.template = 'www/404.html'
-        return
-
-    course = get_course(course_slug)
-    topic = course and course.get_topic(topic_slug)
-
-    if not topic:
-        context.template = 'www/404.html'
-        return
-
-    context.course = course
-    context.topic = topic
-    context.livecode_url = get_livecode_url()
-
-def notfound(context):
-    context.template = 'www/404.html'
-
-def get_livecode_url():
-    doc = frappe.get_doc("LMS Settings")
-    return doc.livecode_url
-
-def get_course(slug):
-    course = frappe.db.get_value('LMS Course', {"slug": slug}, ["name"], as_dict=1)
-    return course and frappe.get_doc('LMS Course', course['name'])

community/www/courses/utils.py

@@ -1,59 +0,0 @@
-import frappe
-
-def get_member_with_email():
-    try:
-        return frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name")
-    except frappe.DoesNotExistError:
-        return
-
-def get_member_with_name(name):
-    try:
-        return frappe.get_doc("Community Member", name)
-    except frappe.DoesNotExistError:
-        return
-
-def get_batch(code):
-    try:
-        print("get_batch", code)
-        return frappe.db.get_value("LMS Batch", {"name": code}, ["name", "description"], as_dict=True)
-    except frappe.DoesNotExistError:
-        print("Error: notfound")
-        return
-
-def is_member_of_batch(batch_code):
-    membership = frappe.get_all("LMS Batch Membership", {"batch": batch_code, "member": get_member_with_email()})
-    if len(membership):
-        return True
-    return False
-
-def redirect_if_not_a_member(course,batch_code):
-    if not is_member_of_batch(batch_code):
-        frappe.local.flags.redirect_location = "/courses/" + course
-        raise frappe.Redirect
-
-def get_course(name):
-    try:
-        return frappe.get_doc("LMS Course", {"name": name})
-    except frappe.DoesNotExistError:
-        return
-
-def get_instructor(owner):
-    instructor = frappe._dict()
-    try:
-        instructor = frappe.get_doc("Community Member", {"email": owner})
-    except frappe.DoesNotExistError:
-        instructor.full_name = owner
-        instructor.abbr = ("").join([ s[0] for s in owner.split() ])
-    instructor.course_count = len(frappe.get_all("LMS Course", {"owner": owner}))
-    return instructor
-
-def get_batch_members(batch):
-    members = []
-    memberships = frappe.get_all("LMS Batch Membership", {"batch": batch}, ["member", "member_type"])
-
-    for membership in memberships:
-        member = get_member_with_name(membership.member)
-        if membership.member_type == "Mentor":
-            member.is_mentor = True
-        members.append(member)
-    return members

community/www/dashboard/index.html

@@ -1,5 +1,4 @@
 {% extends "templates/base.html" %}
-{% from "www/macros/profile.html" import Profile %}
 {% block title %}{{ _("Community") }}{% endblock %}
 {% block head_include %}
 <meta name="description" content="{{ 'Community' }}" />
@@ -15,34 +14,6 @@
 		height: 200px;
 	}
 
-	.dashboard__profile {
-		width: 150px;
-		height: 155px;
-		border-radius: 50%;
-		object-fit: contain;
-	}
-
-	.dashboard__profileSmall {
-		width: 59px;
-		height: 57px;
-		border-radius: 50%;
-		object-fit: contain;
-	}
-
-	.dashboard__abbr {
-		font-size: 50px;
-		width: 155px;
-		height: 155px;
-		border-radius: 50%;
-	}
-
-	.dashboard__abbrSmall {
-		font-size: 20px;
-		width: 59px;
-		height: 57px;
-		border-radius: 50%;
-	}
-
 	.dashboard__parent {
 		display: flex;
 	}
@@ -90,12 +61,12 @@
 {% block content %}
 <section>
 	<div class="dashboard__parent">
-		<div>
-			{{ Profile(member.photo, member.full_name, member.abbr, "large")}}
+		<div class="mr-5">
+      {{ widgets.Avatar(member=member, avatar_class="avatar-xl") }}
 		</div>
 		<div class="dashboard__details">
 			<div class="dashboard__name">
-				{{member.full_name}}
+				<a class="anchor_style" href="/{{member.username}}">{{ member.full_name }}</a>
 			</div>
 			<div>
 				<ul class="nav nav-tabs mt-4" id="myTab" role="tablist">
@@ -120,20 +91,18 @@
 							{% if activity %}
 							{% for message in activity %}
 							<div class="dashboard__message border m-5 p-3">
+                <a class="anchor_style bold" href="/{{message.member.username}}">{{ message.member.full_name }}</a>
 								<div class="text-muted float-right">
 									{{ message.course }} ({{message.batch}})
 								</div>
 								<div class="d-flex align-items-center w-100">
 									<div>
-										{{ Profile(message.profile, message.full_name, message.abbr, "small")}}
+                    {{ widgets.Avatar(member=message.member, avatar_class="avatar-medium") }}
 									</div>
 									<div class="ml-5 mt-5">{{ frappe.utils.md_to_html(message.message) }}</div>
 								</div>
-								<div class="d-flex  justify-content-between">
-									<div class="">
-										{{message.full_name}}
-									</div>
-									<div class="text-muted">
+								<div class="d-flex">
+									<div class="text-muted float-right">
 										{{ frappe.utils.pretty_date(message.creation) }}
 									</div>
 								</div>
@@ -209,4 +178,4 @@
 	</div>
 
 </section>
-{% endblock %}
+{% endblock %}

community/www/dashboard/index.py

@@ -7,14 +7,14 @@ def get_context(context):
     if frappe.session.user == "Guest":
         frappe.local.flags.redirect_location = "/login"
         raise frappe.Redirect
-    context.member = frappe.get_all("Community Member", {"email": frappe.session.user}, ["name", "email", "photo", "full_name", "abbr"])[0]
-    context.memberships = get_memberships(context.member.name)
+    context.member = frappe.get_doc("User", frappe.session.user)
+    context.memberships = get_memberships()
     context.courses = get_courses(context.memberships)
     context.activity = get_activity(context.memberships)
     context.sketches = list(filter(lambda x: x.owner == frappe.session.user, Sketch.get_recent_sketches(owner=context.member.email)))
 
-def get_memberships(member):
-    return frappe.get_all("LMS Batch Membership", {"member": member}, ["batch", "member_type", "creation"])
+def get_memberships():
+    return frappe.get_all("LMS Batch Membership", {"member": frappe.session.user}, ["batch", "member_type", "creation"])
 
 def get_courses(memberships):
     courses = []
@@ -38,5 +38,5 @@ def get_activity(memberships):
     messages = frappe.get_all("LMS Message", {"batch": ["in", ",".join(batches)]}, ["message", "author", "creation", "batch"], order_by='creation desc')
     for message in messages:
         message.course = courses[message.batch]
-        message.profile, message.full_name, message.abbr = frappe.db.get_value("Community Member", message.author, ["photo", "full_name", "abbr"])
+        message.member = frappe.get_doc("User", message.author)
     return messages

community/www/macros/livecode.html

@@ -24,7 +24,7 @@
 </div>
 {% endmacro %}
 
-{% macro LiveCodeEditor(name, code, is_exercise, last_submitted) %}
+{% macro LiveCodeEditor(name, code, reset_code, is_exercise=False, last_submitted=None) %}
 <div class="livecode-editor livecode-editor-inline" id="editor-{{name}}">
   <div class="row">
     <div class="col-lg-8 col-md-6">
@@ -34,10 +34,13 @@
         {% if is_exercise %}
           <button class="submit pull-right btn-primary">Submit</button>
           {% if last_submitted %}
-          <span class="pull-right" style="padding-right: 10px;">Submitted <span class="human-time" data-timestamp="{{last_submitted}}">on {{last_submitted}}</span></span>
+          <span class="pull-right" style="padding-right: 10px;"><span class="human-time" data-timestamp="{{last_submitted}}"></span></span>
           {% endif %}
         {% endif %}
       </div>
+      <div style="display: none">
+        <pre class="reset-code">{{reset_code}}</pre>
+      </div>
     </div>
   </div>
   <div class="code-editor">
@@ -59,20 +62,67 @@
 
 
 {% macro LiveCodeEditorJS(name, code) %}
+
+<script type="text/javascript" src="/assets/frappe/node_modules/moment/min/moment-with-locales.min.js"></script>
+<script type="text/javascript" src="/assets/frappe/node_modules/moment-timezone/builds/moment-timezone-with-data.min.js"></script>
+<script type="text/javascript" src="/assets/frappe/js/frappe/utils/datetime.js"></script>
+
+<script type="text/javascript">
+// comment_when is failing because of this
+if (!frappe.sys_defaults) {
+  frappe.sys_defaults = {}
+}
+</script>
+
 <script type="text/javascript" src="{{ livecode_url }}/static/livecode.js"></script>
 <script type="text/javascript" src="/assets/community/js/livecode-canvas.js"></script>
 
 <script type="text/javascript">
   var livecodeEditors = [];
+  var livecodeEditorsMap = {};
 
   $(function() {
     $(".livecode-editor").each((i, e) => {
+      var name = e.id.replace("editor-", "");
       var editor = new LiveCodeEditor(e, {
         base_url: "{{ livecode_url }}",
         ...getLiveCodeOptions()
       })
       livecodeEditors.push(editor);
-    })
-  })
+      livecodeEditorsMap[e.id] = editor;
+
+      $(e).find(".reset").on('click', function() {
+        let code = $(e).find(".reset-code").html();
+        editor.codemirror.doc.setValue(code);
+      });
+
+      $(e).find(".submit").on('click', function() {
+        let code = editor.codemirror.doc.getValue();
+        console.log("submit", name, code);
+        frappe.call("community.lms.api.submit_solution", {
+          "exercise": name,
+          "code": code
+        }).then(r => {
+          if (r.message.name) {
+            frappe.msgprint("Submitted successfully!");
+
+            let d = r.message.creation;
+            $(e).find(".human-time").html(__("Submitted {0}", [comment_when(d)]));
+          }
+        });
+      });
+
+    });
+  });
+
+  function updateSubmitTimes() {
+    $(".human-time").each(function(i, e) {
+      var d = $(e).data().timestamp;
+      $(e).html(__("Submitted {0}", [comment_when(d)]));
+    });
+  }
+
+  updateSubmitTimes();
 </script>
+
 {% endmacro %}

community/www/macros/profile.html

@@ -1,10 +0,0 @@
-{% macro Profile(photo, full_name, abbr, icon) %}
-{% if photo %}
-<img class="avatar rounded-circle img-fluid mr-5{% if icon == 'large' %} dashboard__profile {% else %} dashboard__profileSmall {% endif %}"
-	src="{{ photo }}" alt="{{ full_name }}">
-{% else %}
-<div class="standard-image mr-5 {% if icon == 'large' %} dashboard__abbr {% else %} dashboard__abbrSmall {% endif %}">
-	{{ abbr }}
-</div>
-{% endif %}
-{% endmacro %}

community/www/macros/sidebar.html

@@ -1,12 +1,14 @@
-{% macro Sidebar(course, batch_code) %}
+{% macro Sidebar(course, batch, is_mentor=False) %}
 <div class="sidebar-batch">
-    <a href=""><i class="fas fa-bars fa-lg"></i></a>
+    <a href=""><i class="fa fa-bars fa-lg"></i></a>
     <br>
-    <a href="/courses/{{course}}/{{batch_code}}/learn"><i class="fas fa-book fa-lg"></i></a>
-    <a href="/courses/{{course}}/{{batch_code}}/schedule"><i class="fas fa-calendar-alt fa-lg"></i></a>
-    <a href="/courses/{{course}}/{{batch_code}}/members"><i class="fas fa-users fa-lg"></i></a>
-    <a href="/courses/{{course}}/{{batch_code}}/discuss"><i class="fas fa-comments fa-lg"></i></a>
-    <a href="/courses/{{course}}/{{batch_code}}/about"><i class="fas fa-info-circle fa-lg"></i></a>
-    <!-- <a href="#contact"><i class="fas fa-home fa-lg"></i></a> -->
+    <a href="/courses/{{course.name}}/{{batch.name}}/learn"><i class="fa fa-book fa-lg"></i></a>
+    <a href="/courses/{{course.name}}/{{batch.name}}/schedule"><i class="fa fa-calendar fa-lg"></i></a>
+    <a href="/courses/{{course.name}}/{{batch.name}}/members"><i class="fa fa-users fa-lg"></i></a>
+    <a href="/courses/{{course.name}}/{{batch.name}}/discuss"><i class="fa fa-comments fa-lg"></i></a>
+    <a href="/courses/{{course.name}}/{{batch.name}}/about"><i class="fa fa-info-circle fa-lg"></i></a>
+    {% if batch.is_member(frappe.session.user, member_type="Mentor") %}
+      <a href="/courses/{{course.name}}/{{batch.name}}/progress"><i class="fa fa-flag-checkered fa-lg"></i></a>
+    {% endif %}
 </div>
-{% endmacro %}
+{% endmacro %}

community/www/profiles/profile.html

@@ -1,133 +1,103 @@
 {% extends "templates/web.html" %}
-{% from "www/macros/profile.html" import Profile %}
 {% block head_include %}
 <meta name="description" content="{{ 'Community' }}" />
 <meta name="keywords" content="An app that supports Communities." />
 <style>
-    section {
-        padding: 2rem;
-        color: #000000;
-    }
+  section {
+    padding: 2rem;
+    color: #000000;
+  }
 
-    svg {
-        width: 200px;
-        height: 200px;
-    }
+  svg {
+    width: 200px;
+    height: 200px;
+  }
 
-    .dashboard__profile {
-        width: 150px;
-        height: 155px;
-        border-radius: 50%;
-        object-fit: contain;
-    }
+  .dashboard__parent {
+    display: flex;
+  }
 
-    .dashboard__profileSmall {
-        width: 59px;
-        height: 57px;
-        border-radius: 50%;
-        object-fit: contain;
-    }
+  .dashboard__name {
+    font-weight: normal;
+    font-style: normal;
+    font-size: 36px;
+    line-height: 42px;
+  }
 
-    .dashboard__abbr {
-        font-size: 50px;
-        width: 155px;
-        height: 155px;
-        border-radius: 50%;
-    }
+  .dashboard__details {
+    padding-top: 2rem;
+  }
 
-    .dashboard__abbrSmall {
-        font-size: 20px;
-        width: 59px;
-        height: 57px;
-        border-radius: 50%;
-    }
+  .dashboard__course {
+    border: 1px solid black;
+    padding: 1rem;
+    margin: 0.5rem;
+    width: 48%;
+  }
 
+  .dashboard__courseHeader {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    margin-bottom: 3px;
+  }
+
+  .dashboard__badge {
+    background: #D6D6FF;
+    border-radius: 20px;
+    color: #1712FE;
+    padding: 0.5rem;
+    height: fit-content;
+  }
+
+  .dashboard__description {
+    height: 100px;
+  }
+
+  @media (max-width: 900px) {
     .dashboard__parent {
-        display: flex;
+      flex-direction: column;
     }
-
-    .dashboard__name {
-        font-weight: normal;
-        font-style: normal;
-        font-size: 36px;
-        line-height: 42px;
-    }
-
-    .dashboard__details {
-        padding-top: 2rem;
-    }
-
-    .dashboard__course {
-        border: 1px solid black;
-        padding: 1rem;
-        margin: 0.5rem;
-        width: 48%;
-    }
-
-    .dashboard__courseHeader {
-        display: flex;
-        justify-content: space-between;
-        height: 50px;
-        margin-bottom: 3px;
-    }
-
-    .dashboard__badge {
-        background: #D6D6FF;
-        border-radius: 20px;
-        color: #1712FE;
-        padding: 0.5rem;
-        height: fit-content;
-    }
-
-    .dashboard__description {
-        height: 100px;
-    }
-
-    @media (max-width: 900px) {
-      .dashboard__parent {
-        flex-direction: column;
-      }
-    }
-
+  }
 </style>
 {% endblock %}
 {% block page_content %}
-    <div class="dashboard__parent">
-        <div class="dashboard__photo">
-            {{ Profile(member.photo, member.full_name, member.abbr, "large")}}
-        </div>
-        <div class="dashboard__details">
-            <div class="dashboard__name">
-                {{member.full_name}}
-            </div>
-            <div>
-                <ul class="nav nav-tabs mt-4" id="myTab" role="tablist">
-                    <li class="nav-item">
-                        <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab"
-                            aria-controls="home" aria-selected="true">Sketches</a>
-                    </li>
-                </ul>
-            </div>
-            <div>
-                <div class="tab-content">
-                    <div class="tab-pane fade py-4 show active" role="tabpanel" id="home">
-                        <div class="row">
-                          {% if sketches %}
-                            {% for sketch in sketches %}
-                            <div class="col-md-4 col-sm-6">
-                                {{ widgets.SketchTeaser(sketch=sketch) }}
-                            </div>
-                            {% endfor %}
-                          {% endif %}
-                        </div>
-                        {% if not sketches %}
-                          <p class="text-center">{{member.full_name}} has not created any skecth yet.</p>
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-        </div>
+<div class="dashboard__parent">
+  <div class="dashboard__photo mr-5">
+    {{ widgets.Avatar(member=member, avatar_class="avatar-xl") }}
+  </div>
+  <div class="dashboard__details">
+    <div class="dashboard__name">
+      <a class="anchor_style" href="/{{member.username}}">{{ member.full_name }}</a>
     </div>
+    <div>
+      <ul class="nav nav-tabs mt-4" id="myTab" role="tablist">
+        <li class="nav-item">
+          <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home"
+            aria-selected="true">Sketches</a>
+        </li>
+      </ul>
+    </div>
+    <div>
+      <div class="tab-content">
+        <div class="tab-pane fade py-4 show active" role="tabpanel" id="home">
+          <div class="row">
+            {% if sketches %}
+            {% for sketch in sketches %}
+            <div class="col-md-4 col-sm-6">
+              {{ widgets.SketchTeaser(sketch=sketch) }}
+            </div>
+            {% endfor %}
+            {% endif %}
+          </div>
+          {% if not sketches %}
+          <p class="text-center">{{member.full_name}} has not created any skecth yet.</p>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 {% endblock %}
 
 <!-- this is a sample default web page template -->

community/www/profiles/profile.py

@@ -3,15 +3,9 @@ from community.lms.models import Sketch
 
 def get_context(context):
     context.no_cache = 1
-    context.username = frappe.form_dict["username"]
-    context.member = get_member(context.username)
-    if not context.member:
+    try:
+        context.member = frappe.get_doc("User", {"username": frappe.form_dict["username"]})
+    except:
         context.template = "www/404.html"
     else:
         context.sketches = Sketch.get_recent_sketches(owner=context.member.email)
-
-def get_member(username):
-    try:
-        return frappe.get_doc("Community Member", {"username":username})
-    except frappe.DoesNotExistError:
-        return