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

feat: learning modes

Browse Source
This commit is contained in:
pateljannat
2021-06-18 18:31:10 +05:30
parent dc7eabefb9
commit eb435261fe
19 changed files with 115 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
community/lms/api.py
View File

@@ -29,13 +29,13 @@ def submit_solution(exercise, code):
return {"name": doc.name, "creation": doc.creation}
@frappe.whitelist()
def save_current_lesson(batch_name, lesson_name):
def save_current_lesson(course_name, lesson_name):
"""Saves the current lesson for a student/mentor.
"""
name = frappe.get_value(
doctype="LMS Batch Membership",
filters={
"batch": batch_name,
"course": course_name,
"member": frappe.session.user
},
fieldname="name")

4
community/lms/doctype/lesson/lesson.py
View File

@@ -55,11 +55,11 @@ class Lesson(Document):
return
@frappe.whitelist()
def save_progress(lesson, batch):
def save_progress(lesson, course):
if not frappe.db.exists("LMS Batch Membership",
{
"member": frappe.session.user,
"batch": batch
"course": course
}):
return
if frappe.db.exists("LMS Course Progress",

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

@@ -21,14 +21,6 @@ class LMSBatch(Document):
def after_insert(self):
create_membership(batch=self.name, member_type="Mentor")
def get_mentors(self):
memberships = frappe.get_all(
"LMS Batch Membership",
{"batch": self.name, "member_type": "Mentor"},
["member"])
member_names = [m['member'] for m in memberships]
return find_all("User", name=["IN", member_names])
def is_member(self, email, member_type=None):
"""Checks if a person is part of a batch.
@@ -43,16 +35,6 @@ class LMSBatch(Document):
filters['member_type'] = member_type
return frappe.db.exists("LMS Batch Membership", filters)
def get_students(self):
"""Returns (email, full_name, username) of all the students of this batch as a list of dict.
"""
memberships = frappe.get_all(
"LMS Batch Membership",
{"batch": self.name, "member_type": "Student"},
["member"])
member_names = [m['member'] for m in memberships]
return find_all("User", name=["IN", member_names])
def get_messages(self):
messages = frappe.get_all("LMS Message", {"batch": self.name}, ["*"], order_by="creation")
for message in messages:

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

@@ -44,10 +44,11 @@ class LMSBatchMembership(Document):
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"):
def create_membership(course, batch=None, member=None, member_type="Student", role="Member"):
frappe.get_doc({
"doctype": "LMS Batch Membership",
"batch": batch,
"course": course,
"role": role,
"member_type": member_type,
"member": member or frappe.session.user

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

@@ -82,11 +82,11 @@ class LMSCourse(Document):
"""
if not email:
return False
return frappe.db.exists({
"doctype": "LMS Course Mentor Mapping",
"course": self.name,
"mentor": email
})
return frappe.db.count("LMS Course Mentor Mapping",
{
"course": self.name,
"mentor": email
})
def get_student_batch(self, email):
"""Returns the batch the given student is part of.
@@ -192,13 +192,11 @@ class LMSCourse(Document):
return
return f"/courses/{self.name}/learn/{lesson_number}"
def get_current_batch(self, member):
current_membership = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name, "is_current": 1}, pluck="batch")
print(current_membership, member, self.name, frappe.session.user)
def get_current_membership(self, member):
current_membership = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name, "is_current": 1}, ["name", "batch"])
if len(current_membership):
return current_membership[0]
print(frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch"))
return frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch")
return frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, ["name","batch"], as_dict=True)
def get_all_memberships(self, member=frappe.session.user):
print(member, frappe.session.user)
@@ -208,6 +206,38 @@ class LMSCourse(Document):
membership.batch_title = frappe.db.get_value("LMS Batch", membership.batch, "title")
return all_memberships
def get_mentors(self, batch):
filters = {
"course": self.name,
"member_type": "Mentor"
}
if batch:
filters["batch"] = batch
print(filters)
memberships = frappe.get_all(
"LMS Batch Membership",
filters,
["member"])
member_names = [m['member'] for m in memberships]
return find_all("User", name=["IN", member_names])
def get_students(self, batch):
"""Returns (email, full_name, username) of all the students of this batch as a list of dict.
"""
filters = {
"course": self.name,
"member_type": "Student"
}
if batch:
filters["batch"] = batch
memberships = frappe.get_all(
"LMS Batch Membership",
filters,
["member"])
member_names = [m['member'] for m in memberships]
return find_all("User", name=["IN", member_names])
def get_outline(self):
return CourseOutline(self)

8
community/lms/widgets/BatchTabs.html
View File

@@ -17,13 +17,13 @@
</div>
{% endif %}
</div>
{% if not batch %}
{% if not membership %}
{% set display_class = "hide" %}
{% else %}
{% set display_class = "" %}
{% endif %}
<ul class="nav nav-tabs mt-4">
<li class="nav-item {{ display_class }}">
<li class="nav-item">
<a class="nav-link" id="home" href="/courses/{{course.name}}/home">Home</a>
</li>
<li class="nav-item">
@@ -35,9 +35,9 @@
<li class="nav-item {{ display_class }}">
<a class="nav-link" id="members" href="/courses/{{course.name}}/members">Members</a>
</li>
<li class="nav-item {{ display_class }}">
<!-- <li class="nav-item {{ display_class }}">
<a class="nav-link" id="discussion" href="/courses/{{course.name}}/discuss">Discussion</a>
</li>
</li> -->
<!-- <li class="nav-item">
<a class="nav-link" id="about" href="/courses/{{course.name}}/about">About</a>
</li> -->

4
community/lms/widgets/RenderBatch.html
View File

@@ -7,7 +7,7 @@
<div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
<div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
{% for m in batch.get_mentors() %}
{% for m in course.get_mentors(batch.name) %}
<div>
{{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
<span class="instructor-title">{{m.full_name}}</span>
@@ -21,7 +21,7 @@
<a href="" class="btn btn-primary manage-batch" data-batch="{{ batch.name | urlencode }}"
data-course="{{ course.name | urlencode }}">Manage</a>
{% elif can_join %}
<button class="join-batch btn btn-primary" data-batch="{{ batch.name | urlencode }}"
<button class="join-batch btn btn-secondary" data-batch="{{ batch.name | urlencode }}"
data-course="{{ course.name | urlencode }}">Join this Batch</button>
{% endif %}
</div>

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

@@ -23,6 +23,7 @@
--cta-color: var(--c4);
--send-message: var(--c7);
--received-message: var(--c8);
--control-bg: var(--gray-100);
}
body {

2
community/www/batch/discuss.html
View File

@@ -11,7 +11,7 @@
{% block content %}
<div class="container">
{{ widgets.BatchTabs(course=course, batch=batch) }}
{{ widgets.BatchTabs(course=course, membership=membership) }}
<div class="messages-container mt-5">
{{ widgets.BatchHeader(batch_name=batch.title, member_count=member_count)}}
<ol class="messages">

2
community/www/batch/discuss.py
View File

@@ -4,5 +4,5 @@ from . import utils
def get_context(context):
utils.get_common_context(context)
context.messages = context.batch.get_messages()
if not context.batch:
if not context.membership:
utils.redirect_to_lesson(context.course)

11
community/www/batch/home.html
View File

@@ -8,15 +8,13 @@
{% endblock %}
{% block content %}
{% set invite_link = frappe.utils.get_url() + "/courses/" + course.name + "/join?batch=" + batch.name %}
<div class="container mt-5">
{{ widgets.BatchTabs(course=course, batch=batch) }}
<!-- <div>
<h1 class="mt-5">{{ batch.title }}</h1>
</div> -->
{{ widgets.BatchTabs(course=course, membership=membership) }}
<div class="course-details mt-5">
{{ widgets.CourseOutline(course=course, batch=batch, show_link=True, show_progress=True) }}
</div>
{% if batch %}
<div class="w-25">
<h3>Batch Schedule</h3>
{{ widgets.RenderBatch(course=course, batch=batch) }}
@@ -28,8 +26,9 @@
{{ frappe.utils.md_to_html(batch.description) }}
</div>
{% endif %}
{% endif %}
{% if course.is_mentor(frappe.session.user) %}
{% set invite_link = frappe.utils.get_url() + "/courses/" + course.name + "/join?batch=" + batch.name %}
<div class="">
<h3> Invite Members </h3>
<a href="" class="" id="invite-link" data-link="{{ invite_link }}">Get Batch Invitation

2
community/www/batch/home.py
View File

@@ -3,5 +3,3 @@ from . import utils
def get_context(context):
utils.get_common_context(context)
if not context.batch:
utils.redirect_to_lesson(context.course)

36
community/www/batch/learn.html
View File

@@ -13,7 +13,7 @@
<link rel="stylesheet" href="/assets/frappe/css/hljs-night-owl.css">
{% for ext in page_extensions %}
{{ ext.render_header() }}
{{ ext.render_header() }}
{% endfor %}
{% endblock %}
@@ -22,17 +22,18 @@
{% block content %}
<div class="container">
{{ widgets.BatchTabs(course=course, batch=batch) }}
{{ widgets.BatchTabs(course=course, membership=membership) }}
<div class="lesson-page">
<h2 class="title {% if course.is_mentor(frappe.session.user) %} is_mentor {% endif %}" data-name="{{ lesson.name }}" {% if batch %} data-batch="{{ batch.name }}" {% endif %}>{{ lesson.title }}</h2>
<h2 class="title {% if course.is_mentor(frappe.session.user) %} is_mentor {% endif %}" data-name="{{ lesson.name }}"
{% if batch %} data-batch="{{ batch.name }}" {% endif %}>{{ lesson.title }}</h2>
{% if batch or lesson.include_in_preview %}
{% if membership or lesson.include_in_preview %}
{{ lesson.render_html() }}
{% else %}
<div class="no-preview-message">
<span>This lesson is not available for Preview. Please join a batch to access the complete course.</span>
<a href="/courses/{{ course.name }}">Checkout Upcoming Batches</a>
<span>This lesson is not available for Preview. Please join the course to access this lesson.</span>
<a href="/courses/{{ course.name }}">Checkout Course Details.</a>
</div>
{% endif %}
@@ -61,7 +62,26 @@
{%- block script %}
{{ super() }}
{% for ext in page_extensions %}
{{ ext.render_footer() }}
{{ ext.render_footer() }}
{% endfor %}
<script>
var membership = {{ membership }};
var is_mentor = {{ course.is_mentor(frappe.session.user) }};
console.log(is_mentor)
if (membership && !is_mentor) {
frappe.call({
method: "community.lms.doctype.lesson.lesson.save_progress",
args: {
lesson: "{{ lesson.name }}",
course: "{{ course.name }}"
}
})
}
if (membership) {
frappe.call("community.lms.api.save_current_lesson", {
"course_name": "{{ course.name }}",
"lesson_name": "{{ lesson.name }}"
})
}
</script>
{%- endblock %}

4
community/www/batch/learn.js
View File

@@ -1,5 +1,5 @@
frappe.ready(() => {
if ($(".title").attr("data-batch") && !$(".title").hasClass("is_mentor")) {
/* if ($(".title").attr("data-batch") && !$(".title").hasClass("is_mentor")) {
frappe.call({
method: "community.lms.doctype.lesson.lesson.save_progress",
args: {
@@ -13,5 +13,5 @@ frappe.ready(() => {
"batch_name": $(".title").attr("data-batch"),
"lesson_name": $(".title").attr("data-name")
})
}
} */
})

2
community/www/batch/members.html
View File

@@ -10,7 +10,7 @@
{% block content %}
<div class="container">
{{ widgets.BatchTabs(course=course, batch=batch) }}
{{ widgets.BatchTabs(course=course, membership=membership) }}
{{ MembersList(members)}}
</div>
{% endblock %}

2
community/www/batch/members.py
View File

@@ -3,5 +3,5 @@ from . import utils
def get_context(context):
utils.get_common_context(context)
if not context.batch:
if not context.membership:
utils.redirect_to_lesson(context.course)

15
community/www/batch/utils.py
View File

@@ -11,11 +11,16 @@ def get_common_context(context):
context.template = "www/404.html"
return
batch_name = course.get_current_batch(frappe.session.user)
batch = course.get_batch(batch_name)
context.batch = batch
if batch_name:
context.members = batch.get_mentors() + batch.get_students()
membership = course.get_current_membership(frappe.session.user)
if membership:
context.membership = membership
batch = course.get_batch(membership.batch)
if batch:
context.batch = batch
context.members = course.get_mentors(membership.batch) + course.get_students(membership.batch)
context.member_count = len(context.members)

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

@@ -12,7 +12,12 @@
<div class="mb-5">
<a class="anchor_style" href="/courses">Courses</a> / <span class="text-muted">{{ course.title }}</span>
</div>
<h2 id="course-title" data-course="{{course.name}}">{{course.title}}</h2>
<div class="d-flex justify-content-between align-items-end">
<h2 id="course-title" data-course="{{course.name}}">{{course.title}}</h2>
<div>
<button class="btn btn-primary join-batch" data-course="{{ course.name | urlencode }}"> Join the Course</button>
</div>
</div>
<div class="course-short-intro">{{ course.short_introduction }}</div>
</div>
@@ -96,8 +101,8 @@
</div>
{% endfor %}
</div>
{% else %}
<div class="mt-5 upcoming">There are no Upcoming Batches for this course currently.</div>
{% endif %}
{% else %}
<div class="mt-5 upcoming">There are no Upcoming Batches for this course currently.</div>
{% endif %}
</div>
{% endmacro %}

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

@@ -57,11 +57,13 @@ frappe.ready(() => {
window.location.href = `/login?redirect-to=/courses/${course}`;
return;
}
batch = decodeURIComponent($(e.currentTarget).attr("data-batch"))
var batch = $(e.currentTarget).attr("data-batch");
batch = batch ? decodeURIComponent(batch) : "";
frappe.call({
"method": "community.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
"args": {
"batch": batch
"batch": batch ? batch : "",
"course": course
},
"callback": (data) => {
if (data.message == "OK") {