eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #64 from fossunited/miscellaneous-fixes

Browse Source 
fix: Miscellaneous fixes
This commit is contained in:
Anand Chitipothu
2021-05-04 19:18:17 +05:30
committed by GitHub
parent 1a06e2c0aa 45ec16d9e4
commit b58a685e7a
21 changed files with 140 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
community/community/doctype/community_member/community_member.py
View File

@@ -42,7 +42,7 @@ class CommunityMember(Document):
return frappe.db.count( return frappe.db.count(
'LMS Batch Membership', { 'LMS Batch Membership', {
'member': self.name, 'member': self.name,
'member_role': 'Mentor' 'member_type': 'Mentor'
}) })
def __repr__(self): def __repr__(self):

4
community/hooks.py
View File

@@ -136,7 +136,6 @@ primary_rules = [
{"from_route": "/sketches/<sketch>", "to_route": "sketches/sketch"}, {"from_route": "/sketches/<sketch>", "to_route": "sketches/sketch"},
{"from_route": "/courses/<course>", "to_route": "courses/course"}, {"from_route": "/courses/<course>", "to_route": "courses/course"},
{"from_route": "/courses/<course>/<topic>", "to_route": "courses/topic"}, {"from_route": "/courses/<course>/<topic>", "to_route": "courses/topic"},
{"from_route": "/hackathons", "to_route": "hackathons"},
{"from_route": "/hackathons/<hackathon>", "to_route": "hackathons/hackathon"}, {"from_route": "/hackathons/<hackathon>", "to_route": "hackathons/hackathon"},
{"from_route": "/hackathons/<hackathon>/<project>", "to_route": "hackathons/project"}, {"from_route": "/hackathons/<hackathon>/<project>", "to_route": "hackathons/project"},
{"from_route": "/dashboard", "to_route": ""}, {"from_route": "/dashboard", "to_route": ""},
@@ -164,7 +163,8 @@ whitelist = [
"/dashboard", "/dashboard",
"/join-request" "/join-request"
"/add-a-new-batch", "/add-a-new-batch",
"/new-sign-up" "/new-sign-up",
"/message"
] ]
whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist] whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]

3
community/lms/doctype/invite_request/invite_request.py
View File

@@ -11,7 +11,7 @@ from frappe.utils.password import get_decrypted_password
class InviteRequest(Document): class InviteRequest(Document):
def on_update(self): def on_update(self):
if self.has_value_changed('status') and self.status == "Approved": if self.has_value_changed("status") and self.status == "Approved":
self.send_email() self.send_email()
def create_user(self, password): def create_user(self, password):
@@ -55,6 +55,7 @@ def create_invite_request(invite_email):
except frappe.UniqueValidationError: except frappe.UniqueValidationError:
frappe.throw(_("Email {0} has already been used to request an invite").format(invite_email)) frappe.throw(_("Email {0} has already been used to request an invite").format(invite_email))
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)
def update_invite(data): def update_invite(data):
data = frappe._dict(json.loads(data)) if type(data) == str else frappe._dict(data) data = frappe._dict(json.loads(data)) if type(data) == str else frappe._dict(data)

27
community/lms/doctype/lms_batch/lms_batch.py
View File

@@ -8,14 +8,25 @@ from frappe.model.document import Document
from community.www.courses.utils import get_member_with_email from community.www.courses.utils import get_member_with_email
class LMSBatch(Document): class LMSBatch(Document):
def validate(self): def validate(self):
if not self.code: if not self.code:
self.generate_code() self.generate_code()
def generate_code(self): def generate_code(self):
short_code = frappe.db.get_value("LMS Course", self.course, "short_code") short_code = frappe.db.get_value("LMS Course", self.course, "short_code")
course_batches = frappe.get_all("LMS Batch",{"course":self.course}) course_batches = frappe.get_all("LMS Batch",{"course":self.course})
self.code = short_code + str(len(course_batches) + 1) self.code = short_code + str(len(course_batches) + 1)
def get_mentors(self):
mentors = []
memberships = frappe.get_all(
"LMS Batch Membership",
{"batch": self.name, "member_type": "Mentor"},
["member"])
for membership in memberships:
member = frappe.db.get_value("Community Member", membership.member, ["full_name", "photo", "abbr"], as_dict=1)
mentors.append(member)
return mentors
@frappe.whitelist() @frappe.whitelist()
def get_messages(batch): def get_messages(batch):
@@ -36,4 +47,4 @@ def save_message(message, batch):
"author": get_member_with_email(), "author": get_member_with_email(),
"message": message "message": message
}) })
doc.save(ignore_permissions=True) doc.save(ignore_permissions=True)

62
community/lms/doctype/lms_batch_membership/lms_batch_membership.py
View File

@@ -8,36 +8,38 @@ from frappe.model.document import Document
from frappe import _ from frappe import _
class LMSBatchMembership(Document): class LMSBatchMembership(Document):
def validate(self):
self.validate_membership_in_same_batch()
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)
if previous_membership:
member_name = frappe.db.get_value("Community Member", 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): def validate(self):
course = frappe.db.get_value("LMS Batch", self.batch, "course") self.validate_membership_in_same_batch()
previous_membership = frappe.get_all("LMS Batch Membership", {"member": self.member}, ["batch", "member_type"]) self.validate_membership_in_different_batch_same_course()
for membership in previous_membership:
batch_course = frappe.db.get_value("LMS Batch", membership.batch, "course") def validate_membership_in_same_batch(self):
if batch_course == course and (membership.member_type == "Student" or self.member_type == "Student"): previous_membership = frappe.db.get_value("LMS Batch Membership", {"member": self.member, "batch": self.batch, "name": ["!=", self.name]}, ["member_type","member"], as_dict=1)
member_name = frappe.db.get_value("Community Member", self.member, "full_name") if previous_membership:
frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch)) member_name = frappe.db.get_value("Community Member", 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"])
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")
frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))
@frappe.whitelist() @frappe.whitelist()
def create_membership(batch, course, member=None, member_type="Student", role="Member"): def create_membership(batch, course=None, member=None, member_type="Student", role="Member"):
if not member: if not member:
member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name") member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name")
frappe.get_doc({ frappe.get_doc({
"doctype": "LMS Batch Membership", "doctype": "LMS Batch Membership",
"batch": batch, "batch": batch,
"role": role, "role": role,
"member_type": member_type, "member_type": member_type,
"member": member "member": member
}).save(ignore_permissions=True) }).save(ignore_permissions=True)
course_slug = frappe.db.get_value("LMS Course", {"title": course}, ["slug"]) if course:
return course_slug course_slug = frappe.db.get_value("LMS Course", {"title": course}, ["slug"])
return course_slug
return "OK"

11
community/lms/doctype/lms_course/lms_course.py
View File

@@ -97,7 +97,7 @@ class LMSCourse(Document):
for mentor in mentors: for mentor in mentors:
member = frappe.get_doc("Community Member", mentor.mentor) member = frappe.get_doc("Community Member", mentor.mentor)
# TODO: change this to count query # TODO: change this to count query
member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member, "member_type": "Mentor"})) member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member.name, "member_type": "Mentor"}))
course_mentors.append(member) course_mentors.append(member)
return course_mentors return course_mentors
@@ -108,9 +108,9 @@ class LMSCourse(Document):
return False return False
member = self.get_community_member(email) member = self.get_community_member(email)
return frappe.db.exists({ return frappe.db.exists({
'doctype': 'LMS Course Mentor Mapping', "doctype": "LMS Course Mentor Mapping",
"course": self.name, "course": self.name,
"member": member "mentor": member
}) })
def get_instructor(self): def get_instructor(self):
@@ -131,15 +131,16 @@ class LMSCourse(Document):
memberships = frappe.db.get_all( memberships = frappe.db.get_all(
"LMS Batch Membership", "LMS Batch Membership",
{"member": member}, {"member": member},
["name"], as_dict=1) ["batch"])
batch_names = {m.batch for m in memberships} batch_names = {m.batch for m in memberships}
return [b for b in batches if b.name in batch_names] return [b for b in batches if b.name in batch_names]
def get_upcoming_batches(self): def get_upcoming_batches(self):
now = frappe.utils.nowdate() now = frappe.utils.nowdate()
return find_all("LMS Batch", batches = find_all("LMS Batch",
course=self.name, course=self.name,
start_date=[">", now]) start_date=[">", now])
return batches
def find_all(doctype, order_by=None, **filters): def find_all(doctype, order_by=None, **filters):
"""Queries the database for documents of a doctype matching given filters. """Queries the database for documents of a doctype matching given filters.

2
community/lms/doctype/lms_sketch/lms_sketch.py
View File

@@ -55,7 +55,7 @@ class LMSSketch(Document):
def get_recent_sketches(limit=100, owner=None): def get_recent_sketches(limit=100, owner=None):
"""Returns the recent sketches. """Returns the recent sketches.
""" """
filters = {} filters = {}
if owner: if owner:
filters = {"owner": owner} filters = {"owner": owner}
sketches = frappe.get_all( sketches = frappe.get_all(

0
community/lms/web_form/add_messages/__init__.py
View File

12
community/lms/web_form/add_messages/add_messages.js
View File

@@ -1,12 +0,0 @@
frappe.ready(function() {
// bind events here
frappe.web_form.after_load = () => {
frappe.web_form.set_value(["batch"], [frappe.utils.get_url_arg('batch')]);
frappe.web_form.set_value(["author"], [frappe.utils.get_url_arg('author')]);
}
frappe.web_form.success_url = `courses/course?course=${frappe.utils.get_url_arg('course')}`;
$('.breadcrumb-container')
.html(`<a href="${frappe.web_form.success_url}">Back to my course</a>`)
.addClass('py-4');
})

77
community/lms/web_form/add_messages/add_messages.json
View File

@@ -1,77 +0,0 @@
{
"accept_payment": 0,
"allow_comments": 0,
"allow_delete": 0,
"allow_edit": 0,
"allow_incomplete": 0,
"allow_multiple": 0,
"allow_print": 0,
"amount": 0.0,
"amount_based_on_field": 0,
"apply_document_permissions": 0,
"button_label": "Send",
"client_script": "",
"creation": "2021-03-23 13:10:16.814983",
"doc_type": "LMS Message",
"docstatus": 0,
"doctype": "Web Form",
"idx": 0,
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2021-03-23 19:25:54.984968",
"modified_by": "Administrator",
"module": "LMS",
"name": "add-messages",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 0,
"route": "add-messages",
"route_to_success_link": 0,
"show_attachments": 0,
"show_in_grid": 0,
"show_sidebar": 0,
"sidebar_items": [],
"success_url": "",
"title": "Add Messages",
"web_form_fields": [
{
"allow_read_on_all_link_options": 0,
"fieldname": "batch",
"fieldtype": "Link",
"hidden": 0,
"label": "Batch",
"max_length": 0,
"max_value": 0,
"options": "LMS Batch",
"read_only": 1,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "message",
"fieldtype": "Data",
"hidden": 0,
"label": "Message",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "author",
"fieldtype": "Link",
"hidden": 1,
"label": "Author",
"max_length": 0,
"max_value": 0,
"options": "Community Member",
"read_only": 1,
"reqd": 0,
"show_in_filter": 0
}
]
}

7
community/lms/web_form/add_messages/add_messages.py
View File

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

3
community/public/css/style.css
View File

@@ -287,6 +287,7 @@ img.profile-photo {
} }
.message-section { .message-section {
margin-left: 5%; margin-left: 3%;
display: inline-block; display: inline-block;
width: 95%;
} }

4
community/www/courses/about/index.html
View File

@@ -16,7 +16,7 @@
{% if batch.description %} {% if batch.description %}
{{ BatchDetails(batch.description) }} {{ BatchDetails(batch.description) }}
{% endif %} {% endif %}
{{ MentorsSection(mentors, True) }} {{ MentorsSection(mentors, True, course.name) }}
</div> </div>
{% endblock %} {% endblock %}
@@ -43,4 +43,4 @@
{{ frappe.utils.md_to_html(description) }} {{ frappe.utils.md_to_html(description) }}
</div> </div>
</div> </div>
{% endmacro %} {% endmacro %}

6
community/www/courses/about/index.py
View File

@@ -11,13 +11,11 @@ def get_context(context):
context.instructor = get_instructor(context.course.owner) context.instructor = get_instructor(context.course.owner)
context.batch = get_batch(context.batch_code) context.batch = get_batch(context.batch_code)
context.mentors = get_mentors(context.batch.name) context.mentors = get_mentors(context.batch.name)
print(context.mentors)
def get_mentors(batch): def get_mentors(batch):
mentors = [] mentors = []
memberships = frappe.get_all("LMS Batch Membership", {"batch": batch, "member_type": "Mentor"}, ["member"]) memberships = frappe.get_all("LMS Batch Membership", {"batch": batch, "member_type": "Mentor"}, ["member"])
for membership in memberships: for membership in memberships:
member = frappe.db.get_value("Community Member", membership.member, ["name","full_name"], as_dict=True) member = frappe.get_doc("Community Member", membership.member)
member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member.name, "member_type": "Mentor"}))
mentors.append(member) mentors.append(member)
return mentors return mentors

24
community/www/courses/course.html
View File

@@ -10,7 +10,7 @@
<div class="container"> <div class="container">
<div class="course-header"> <div class="course-header">
<div class="course-type">course</div> <div class="course-type">course</div>
<h1>{{course.title}}</h1> <h1 id="course-title" data-course="{{course.name}}">{{course.title}}</h1>
</div> </div>
<div class="row"> <div class="row">
@@ -28,7 +28,7 @@
</div> </div>
<div class="sidebar"> <div class="sidebar">
{{ MentorsSection(course.get_mentors(), course.is_mentor(frappe.session.user)) }} {{ MentorsSection(course.get_mentors(), course.is_mentor(frappe.session.user), course.name) }}
</div> </div>
</div> </div>
</div> </div>
@@ -74,7 +74,7 @@
<div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div> <div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
<div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div> <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
{% for m in batch.mentors %} {% for m in batch.get_mentors() %}
<div> <div>
{% if m.photo_url %} {% if m.photo_url %}
<img class="profile-photo" src="{{m.photo_url}}"> <img class="profile-photo" src="{{m.photo_url}}">
@@ -86,9 +86,9 @@
<div class="cta"> <div class="cta">
<div class=""> <div class="">
{% if can_manage %} {% if can_manage %}
<button type="button">Manage</button> <button >Manage</button>
{% else %} {% else %}
<button type="button">Join this Batch</button> <button class="join-batch" data-batch="{{ batch.name | urlencode }}">Join this Batch</button>
{% endif %} {% endif %}
</div> </div>
</div> </div>
@@ -111,11 +111,11 @@
{% endfor %} {% endfor %}
</div> </div>
<a class="btn btn-primary add-batch margin-bottom" href="/add-a-new-batch?new=1&course={{course.name}}">Add a new batch</a> <a class="btn btn-primary add-batch margin-bottom" href="/add-a-new-batch?new=1&course={{course.title}}">Add a new batch</a>
{% else %} {% else %}
<div class="mentor_message"> <div class="mentor_message">
<p> You are a mentor for this course. </p> <p> You are a mentor for this course. </p>
<a class="btn btn-primary" href="/add-a-new-batch?new=1&course={{course.name}}" >Create your first batch</a> <a class="btn btn-primary" href="/add-a-new-batch?new=1&course={{course.title}}" >Create your first batch</a>
</div> </div>
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
@@ -123,11 +123,13 @@
{% macro BatchSectionForStudents(course, upcoming_batches) %} {% macro BatchSectionForStudents(course, upcoming_batches) %}
<h2>Upcoming Batches</h2> <h2>Upcoming Batches</h2>
{% for batch in upcoming_batches %} <div class="row">
<div class="col-lg-4 col-md-6"> {% for batch in upcoming_batches %}
{{ RenderBatch(batch, can_manage=False) }} <div class="col-lg-4 col-md-6">
{{ RenderBatch(batch, can_manage=False) }}
</div>
{% endfor %}
</div> </div>
{% endfor %}
{% endmacro %} {% endmacro %}
{% macro CourseOutline(course) %} {% macro CourseOutline(course) %}

22
community/www/courses/course.js
View File

@@ -3,18 +3,19 @@ frappe.ready(() => {
frappe.call({ frappe.call({
'method': 'community.lms.doctype.lms_mentor_request.lms_mentor_request.has_requested', 'method': 'community.lms.doctype.lms_mentor_request.lms_mentor_request.has_requested',
'args': { 'args': {
course: decodeURIComponent($(".course-title").attr("data-course")), course: decodeURIComponent($("#course-title").attr("data-course")),
}, },
'callback': (data) => { 'callback': (data) => {
if (data.message) { if (data.message) {
$(".mentor-request").addClass("hide"); $("#mentor-request").addClass("hide");
$(".already-applied").removeClass("hide") $("#already-applied").removeClass("hide")
} }
} }
}) })
} }
$(".apply-now").click((e) => { $("#apply-now").click((e) => {
e.preventDefault();
if (frappe.session.user == "Guest") { if (frappe.session.user == "Guest") {
window.location.href = "/login"; window.location.href = "/login";
return; return;
@@ -26,14 +27,15 @@ frappe.ready(() => {
}, },
"callback": (data) => { "callback": (data) => {
if (data.message == "OK") { if (data.message == "OK") {
$(".mentor-request").addClass("hide"); $("#mentor-request").addClass("hide");
$(".already-applied").removeClass("hide") $("#already-applied").removeClass("hide")
} }
} }
}) })
}) })
$(".cancel-request").click((e) => { $("#cancel-request").click((e) => {
e.preventDefault()
frappe.call({ frappe.call({
"method": "community.lms.doctype.lms_mentor_request.lms_mentor_request.cancel_request", "method": "community.lms.doctype.lms_mentor_request.lms_mentor_request.cancel_request",
"args": { "args": {
@@ -41,14 +43,15 @@ frappe.ready(() => {
}, },
"callback": (data) => { "callback": (data) => {
if (data.message == "OK") { if (data.message == "OK") {
$(".mentor-request").removeClass("hide"); $("#mentor-request").removeClass("hide");
$(".already-applied").addClass("hide") $("#already-applied").addClass("hide")
} }
} }
}) })
}) })
$(".join-batch").click((e) => { $(".join-batch").click((e) => {
e.preventDefault()
if (frappe.session.user == "Guest") { if (frappe.session.user == "Guest") {
window.location.href = "/login"; window.location.href = "/login";
return; return;
@@ -62,7 +65,6 @@ frappe.ready(() => {
"callback": (data) => { "callback": (data) => {
if (data.message == "OK") { if (data.message == "OK") {
frappe.msgprint(__("You are now a student of this course.")) frappe.msgprint(__("You are now a student of this course."))
$(".upcoming-batches").addClass("hide")
} }
} }
}) })

2
community/www/courses/learn/index.py
View File

@@ -6,5 +6,3 @@ def get_context(context):
context.course = frappe.form_dict["course"] context.course = frappe.form_dict["course"]
context.batch_code = frappe.form_dict["batch"] context.batch_code = frappe.form_dict["batch"]
redirect_if_not_a_member(context.course, context.batch_code) redirect_if_not_a_member(context.course, context.batch_code)
print(context)

62
community/www/dashboard/index.py
View File

@@ -1,38 +1,42 @@
import frappe import frappe
from ...lms.doctype.lms_sketch.lms_sketch import get_recent_sketches from community.lms.models import Sketch
def get_context(context): def get_context(context):
context.no_cache = 1 context.no_cache = 1
context.member = frappe.get_all("Community Member", {"email": frappe.session.user}, ["name", "email", "photo", "full_name", "abbr"])[0] if frappe.session.user == "Guest":
context.memberships = get_memberships(context.member.name) frappe.local.flags.redirect_location = "/login"
context.courses = get_courses(context.memberships) raise frappe.Redirect
context.activity = get_activity(context.memberships) context.member = frappe.get_all("Community Member", {"email": frappe.session.user}, ["name", "email", "photo", "full_name", "abbr"])[0]
context.sketches = list(filter(lambda x: x.owner == frappe.session.user, get_recent_sketches())) context.memberships = get_memberships(context.member.name)
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): def get_memberships(member):
return frappe.get_all("LMS Batch Membership", {"member": member}, ["batch", "member_type", "creation"]) return frappe.get_all("LMS Batch Membership", {"member": member}, ["batch", "member_type", "creation"])
def get_courses(memberships): def get_courses(memberships):
courses = [] courses = []
for membership in memberships: for membership in memberships:
course = frappe.db.get_value("LMS Batch", membership.batch, "course") course = frappe.db.get_value("LMS Batch", membership.batch, "course")
course_details = frappe.get_doc("LMS Course", course) course_details = frappe.get_doc("LMS Course", course)
course_in_list = list(filter(lambda x: x.name == course_details.name, courses)) course_in_list = list(filter(lambda x: x.name == course_details.name, courses))
if not len(course_in_list): if not len(course_in_list):
course_details.description = course_details.description[0:100] + "..." course_details.description = course_details.description[0:100] + "..."
course_details.joining = membership.creation course_details.joining = membership.creation
if membership.member_type != "Student": if membership.member_type != "Student":
course_details.member_type = membership.member_type course_details.member_type = membership.member_type
courses.append(course_details) courses.append(course_details)
return courses return courses
def get_activity(memberships): def get_activity(memberships):
messages, courses = [], {} messages, courses = [], {}
batches = [x.batch for x in memberships] batches = [x.batch for x in memberships]
for batch in batches: for batch in batches:
courses[batch] = frappe.db.get_value("LMS Batch", batch, "course") courses[batch] = frappe.db.get_value("LMS Batch", batch, "course")
messages = frappe.get_all("LMS Message", {"batch": ["in", ",".join(batches)]}, ["message", "author", "creation", "batch"], order_by='creation desc') messages = frappe.get_all("LMS Message", {"batch": ["in", ",".join(batches)]}, ["message", "author", "creation", "batch"], order_by='creation desc')
for message in messages: for message in messages:
message.course = courses[message.batch] 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.profile, message.full_name, message.abbr = frappe.db.get_value("Community Member", message.author, ["photo", "full_name", "abbr"])
return messages return messages

15
community/www/macros/common_macro.html
View File

@@ -6,7 +6,7 @@
</div> </div>
{% endmacro %} {% endmacro %}
{% macro MentorsSection(mentors, is_mentor) %} {% macro MentorsSection(mentors, is_mentor, course_name) %}
<h3>Mentors</h3> <h3>Mentors</h3>
{% for m in mentors %} {% for m in mentors %}
<div class="instructor"> <div class="instructor">
@@ -15,10 +15,15 @@
</div> </div>
{% endfor %} {% endfor %}
{% if not is_mentor %} {% if not is_mentor %}
<div class="notice"> <div id="mentor-request" class="notice">
Interested to become a mentor? Interested to become a mentor?
<div><a href="#">Apply Now!</a></div> <div><a id="apply-now" data-course="{{course_name | urlencode}}" href="">Apply Now!</a></div>
</div>
<div id="already-applied" class="notice hide">
You've applied to become a mentor for this course. Your request is currently under review.
If you are not any more interested to mentor this course, you can <a id="cancel-request" data-course="{{course_name | urlencode}}" href="">cancel your application</a>.
</div> </div>
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
@@ -26,7 +31,7 @@
{% macro BatchHearder(course_name, member_count) %} {% macro BatchHearder(course_name, member_count) %}
<div class="border p-3"> <div class="border p-3">
<h3>{{course_name}}</h3> <h3>{{course_name}}</h3>
<div class="text-muted">{{member_count}} members</div> <div class="text-muted">{{member_count}} members</div>
</div> </div>
{% endmacro %} {% endmacro %}

4
community/www/profiles/profile.py
View File

@@ -1,5 +1,5 @@
import frappe import frappe
from ...lms.doctype.lms_sketch.lms_sketch import get_recent_sketches from community.lms.models import Sketch
def get_context(context): def get_context(context):
context.no_cache = 1 context.no_cache = 1
@@ -8,7 +8,7 @@ def get_context(context):
if not context.member: if not context.member:
context.template = "www/404.html" context.template = "www/404.html"
else: else:
context.sketches = list(filter(lambda x: x.owner == context.member.email, get_recent_sketches())) context.sketches = Sketch.get_recent_sketches(owner=context.member.email)
def get_member(username): def get_member(username):
try: try:

2
license.txt
View File

@@ -1 +1 @@
License: MIT License: AGPL