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

dashboard and patch for lesson

Browse Source
This commit is contained in:
Jannat Patel
2022-03-14 19:07:02 +05:30
parent c8af6d3672 ffe5370264
commit aa9ef65375
34 changed files with 389 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@@ -26,4 +26,4 @@ indent_style = tab
# HTML, CSS, javascript, JSON and YAML
[*.{html,css,js,json,yml,yaml}]
indent_size = 2
indent_size = 4

4
school/fixtures/custom_field.json
View File

@@ -80,10 +80,10 @@
"in_standard_filter": 0,
"insert_after": "country",
"is_virtual": 0,
"label": "Acceptance for Terms of Use and/or Privacy Policy",
"label": "Acceptance for Terms and/or Policies",
"length": 0,
"mandatory_depends_on": null,
"modified": "2021-12-31 19:15:34.932910",
"modified": "2021-12-31 19:15:34.932911",
"module": null,
"name": "User-verify_terms",
"no_copy": 0,

6
school/hooks.py
View File

@@ -162,6 +162,8 @@ update_website_context = [
jinja = {
"methods": [
"school.page_renderers.get_profile_url",
"school.overrides.user.get_enrolled_courses",
"school.overrides.user.get_course_membership",
"school.overrides.user.get_authored_courses",
"school.overrides.user.get_palette",
"school.lms.utils.get_membership",
@@ -185,7 +187,9 @@ jinja = {
"school.lms.utils.get_initial_members",
"school.lms.utils.get_sorted_reviews",
"school.lms.utils.is_instructor",
"school.lms.utils.convert_number_to_character"
"school.lms.utils.convert_number_to_character",
"school.lms.utils.get_signup_optin_checks",
"school.lms.utils.get_popular_courses"
],
"filters": []
}

3
school/lms/doctype/course_chapter/course_chapter.json
View File

@@ -59,7 +59,7 @@
"link_fieldname": "chapter"
}
],
"modified": "2022-03-08 15:21:10.389729",
"modified": "2022-03-14 17:57:00.707416",
"modified_by": "Administrator",
"module": "LMS",
"name": "Course Chapter",
@@ -93,6 +93,7 @@
}
],
"search_fields": "title",
"show_title_field_in_link": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": [],

12
school/lms/doctype/course_lesson/course_lesson.json
View File

@@ -9,6 +9,7 @@
"engine": "InnoDB",
"field_order": [
"chapter",
"course",
"include_in_preview",
"column_break_4",
"title",
@@ -69,11 +70,20 @@
{
"fieldname": "help",
"fieldtype": "HTML"
},
{
"fetch_from": "chapter.course",
"fieldname": "course",
"fieldtype": "Link",
"hidden": 1,
"label": "Course",
"options": "LMS Course",
"read_only": 1
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-03-08 17:56:50.504143",
"modified": "2022-03-14 18:56:31.969801",
"modified_by": "Administrator",
"module": "LMS",
"name": "Course Lesson",

9
school/lms/doctype/lms_batch_membership/lms_batch_membership.json
View File

@@ -1,6 +1,6 @@
{
"actions": [],
"creation": "2021-03-18 19:52:10.673835",
"creation": "2022-02-07 12:01:40.929633",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
@@ -24,8 +24,6 @@
{
"fieldname": "batch",
"fieldtype": "Link",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Batch",
"options": "LMS Batch"
},
@@ -117,7 +115,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-12-16 14:49:25.964853",
"modified": "2022-03-09 15:17:15.386067",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Batch Membership",
@@ -138,5 +136,6 @@
],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC"
"sort_order": "DESC",
"states": []
}

46
school/lms/doctype/lms_course/lms_course.json
View File

@@ -20,13 +20,14 @@
"column_break_3",
"instructors",
"tags",
"status",
"section_break_7",
"is_published",
"column_break_9",
"column_break_10",
"upcoming",
"column_break_11",
"column_break_12",
"disable_self_learning",
"section_break_5",
"section_break_18",
"short_introduction",
"description",
"chapters",
@@ -42,7 +43,8 @@
"in_list_view": 1,
"label": "Title",
"reqd": 1,
"unique": 1
"unique": 1,
"width": "200"
},
{
"fieldname": "description",
@@ -65,10 +67,6 @@
"fieldtype": "Data",
"label": "Video Embed Link"
},
{
"fieldname": "section_break_5",
"fieldtype": "Section Break"
},
{
"fieldname": "short_introduction",
"fieldtype": "Small Text",
@@ -108,6 +106,7 @@
"fieldtype": "Table MultiSelect",
"in_standard_filter": 1,
"label": "Instructors",
"max_height": "50px",
"options": "Course Instructor"
},
{
@@ -115,14 +114,6 @@
"fieldtype": "Section Break",
"label": "Course Settings"
},
{
"fieldname": "column_break_9",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_11",
"fieldtype": "Column Break"
},
{
"fieldname": "certification_section",
"fieldtype": "Section Break",
@@ -147,6 +138,27 @@
"fieldtype": "Table",
"label": "Related Courses",
"options": "Related Courses"
},
{
"default": "In Progress",
"fieldname": "status",
"fieldtype": "Select",
"hidden": 1,
"label": "Status",
"options": "In Progress\nReady for Review\nApproved",
"read_only": 1
},
{
"fieldname": "section_break_18",
"fieldtype": "Section Break"
},
{
"fieldname": "column_break_10",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_12",
"fieldtype": "Column Break"
}
],
"is_published_field": "is_published",
@@ -172,7 +184,7 @@
"link_fieldname": "course"
}
],
"modified": "2022-03-08 15:20:58.501082",
"modified": "2022-03-14 17:56:46.514391",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Course",

26
school/lms/doctype/lms_course/lms_course.py
View File

@@ -12,6 +12,24 @@ from school.lms.utils import get_chapters
class LMSCourse(Document):
def validate(self):
self.validate_instructors()
self.validate_status()
def validate_instructors(self):
if self.is_new() and not self.instructors:
frappe.get_doc({
"doctype": "Course Instructor",
"instructor": self.owner,
"parent": self.name,
"parentfield": "instructors",
"parenttype": "LMS Course"
}).save(ignore_permissions=True)
def validate_status(self):
if self.is_published:
self.status = "Approved"
def on_update(self):
if not self.upcoming and self.has_value_changed("upcoming"):
self.send_email_to_interested_users()
@@ -184,3 +202,11 @@ def search_course(text):
}) """
return courses
@frappe.whitelist()
def submit_for_review(course):
chapters = frappe.get_all("Chapter Reference", {"parent": course})
if not len(chapters):
return "No Chp"
frappe.db.set_value("LMS Course", course, "status", "Ready for Review")
return "OK"

2
school/lms/doctype/lms_course/test_lms_course.py
View File

@@ -12,8 +12,6 @@ class TestLMSCourse(unittest.TestCase):
frappe.db.sql('delete from `tabLMS Course Mentor Mapping`')
frappe.db.sql('delete from `tabLMS Course`')
def test_new_course(self):
course = new_course("Test Course")
assert course.title == "Test Course"

24
school/lms/doctype/lms_settings/lms_settings.json
View File

@@ -14,9 +14,12 @@
"signup_settings_section",
"terms_of_use",
"terms_page",
"column_break_12",
"column_break_9",
"privacy_policy",
"privacy_policy_page",
"column_break_12",
"cookie_policy",
"cookie_policy_page",
"mentor_request_section",
"mentor_request_creation",
"mentor_request_status_update"
@@ -97,6 +100,7 @@
"fieldname": "privacy_policy_page",
"fieldtype": "Link",
"label": "Privacy Policy Page",
"mandatory_depends_on": "privacy_policy",
"options": "Web Page"
},
{
@@ -108,6 +112,24 @@
"fieldname": "portal_course_creation",
"fieldtype": "Check",
"label": "Enable Course Creation from Portal"
},
{
"fieldname": "column_break_9",
"fieldtype": "Column Break"
},
{
"default": "0",
"fieldname": "cookie_policy",
"fieldtype": "Check",
"label": "Show Cookie Policy on Signup"
},
{
"depends_on": "cookie_policy",
"fieldname": "cookie_policy_page",
"fieldtype": "Link",
"label": "Cookie Policy Page",
"mandatory_depends_on": "cookie_policy",
"options": "Web Page"
}
],
"index_web_pages_for_search": 1,

3
school/lms/doctype/lms_settings/lms_settings.py
View File

@@ -5,9 +5,10 @@
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
from frappe import _
class LMSSettings(Document):
pass
pass
@frappe.whitelist()
def check_profile_restriction():

41
school/lms/utils.py
View File

@@ -3,6 +3,7 @@ import frappe
from frappe.utils import flt, cint, cstr
from school.lms.md import markdown_to_html
import string
from frappe import _
RE_SLUG_NOTALLOWED = re.compile("[^a-z0-9]+")
@@ -296,3 +297,43 @@ def is_instructor(course):
def convert_number_to_character(number):
return string.ascii_uppercase[number]
def get_signup_optin_checks():
mapper = frappe._dict({
"terms_of_use": {
"page_name": "terms_page",
"title": _("Terms of Use")
},
"privacy_policy": {
"page_name": "privacy_policy_page",
"title": _("Privacy Policy")
},
"cookie_policy": {
"page_name": "cookie_policy_page",
"title": _("Cookie Policy")
}
})
checks = ["terms_of_use", "privacy_policy", "cookie_policy"]
links = []
for check in checks:
if frappe.db.get_single_value("LMS Settings", check):
page = frappe.db.get_single_value("LMS Settings", mapper[check].get("page_name"))
route = frappe.db.get_value("Web Page", page, "route")
links.append("<a href='/" + route + "'>" + mapper[check].get("title") + "</a>")
return (", ").join(links)
def get_popular_courses():
courses = frappe.get_all("LMS Course", {"is_published": 1, "upcoming": 0})
course_membership = []
for course in courses:
course_membership.append({
"course": course.name,
"members": cint(frappe.db.count("LMS Batch Membership", {"course": course.name}))
})
course_membership = sorted(course_membership, key = lambda x: x.get("members"), reverse=True)
return course_membership[:3]

6
school/lms/web_form/chapter/chapter.js
View File

@@ -1,3 +1,5 @@
frappe.ready(function() {
// bind events here
})
frappe.web_form.after_save = () => {
window.location.href = `/courses/${frappe.web_form.doc.course}`;
}
});

4
school/lms/web_form/chapter/chapter.json
View File

@@ -8,7 +8,7 @@
"allow_print": 0,
"amount": 0.0,
"amount_based_on_field": 0,
"apply_document_permissions": 0,
"apply_document_permissions": 1,
"button_label": "Save",
"creation": "2022-03-07 18:41:07.058806",
"doc_type": "Course Chapter",
@@ -19,7 +19,7 @@
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2022-03-07 18:41:07.058806",
"modified": "2022-03-14 18:48:01.704325",
"modified_by": "Administrator",
"module": "LMS",
"name": "chapter",

8
school/lms/web_form/course/course.js
View File

@@ -1,7 +1,5 @@
frappe.ready(function() {
frappe.web_form.after_save = () => {
setTimeout(() => {
window.location.href = `/courses/${frappe.web_form.doc.name}`;
})
}
frappe.web_form.after_save = () => {
window.location.href = `/dashboard#courses-created`;
}
});

4
school/lms/web_form/course/course.json
View File

@@ -20,7 +20,7 @@
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2022-03-09 10:10:30.069458",
"modified": "2022-03-11 12:32:22.512115",
"modified_by": "Administrator",
"module": "LMS",
"name": "course",
@@ -121,7 +121,7 @@
{
"allow_read_on_all_link_options": 0,
"fieldname": "description",
"fieldtype": "Data",
"fieldtype": "Text",
"hidden": 0,
"label": "Description",
"max_length": 0,

16
school/lms/web_form/lesson/lesson.js
View File

@@ -1,17 +1,5 @@
frappe.ready(function() {
frappe.web_form.after_save = () => {
setTimeout(() => {
frappe.call({
method: "school.lms.doctype.course_lesson.course_lesson.get_lesson_info",
args: {
"lesson_name": frappe.web_form.doc.name
},
callback: (data) => {
window.location.href = data.message;
}
});
});
frappe.web_form.after_save = () => {
window.location.href = `/courses/`
};
});

6
school/lms/web_form/lesson/lesson.json
View File

@@ -21,7 +21,7 @@
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2022-03-09 09:55:58.406164",
"modified": "2022-03-14 18:49:33.526455",
"modified_by": "Administrator",
"module": "LMS",
"name": "lesson",
@@ -38,7 +38,7 @@
"title": "Lesson",
"web_form_fields": [
{
"allow_read_on_all_link_options": 1,
"allow_read_on_all_link_options": 0,
"fieldname": "chapter",
"fieldtype": "Link",
"hidden": 0,
@@ -78,7 +78,7 @@
{
"allow_read_on_all_link_options": 0,
"fieldname": "body",
"fieldtype": "Data",
"fieldtype": "Text",
"hidden": 0,
"label": "Body",
"max_length": 0,

60
school/lms/web_template/courses_enrolled/courses_enrolled.html
View File

@@ -1,35 +1,27 @@
{% set member = frappe.get_doc("User", frappe.session.user) %}
<div class="mt-10">
{% set enrolled = member.get_enrolled_courses().in_progress + member.get_enrolled_courses().completed %}
{% if enrolled | length %}
<div class="mt-8">
<div class="course-home-headings">
{{ _("Courses Enrolled") }}
</div>
<div class="cards-parent">
{% for course in enrolled %}
{{ widgets.CourseCard(course=course) }}
{% endfor %}
</div>
</div>
{% else %}
{% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
<div class="empty-state">
<div class="empty-state-text">
<div class="text-center">
<div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
<div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
</div>
{% set recommended_courses = [course1, course2, course3] %}
<div class="cards-parent">
{% for recommended_course in recommended_courses %}
{% if recommended_course %}
{% set course_details = frappe.get_doc("LMS Course", recommended_course) %}
{{ widgets.CourseCard(course=course_details) }}
{% endif %}
{% endfor %}
</div>
</div>
</div>
{% endif %}
{% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %}
{% if enrolled | length %}
<div class="cards-parent">
{% for course in enrolled %}
{{ widgets.CourseCard(course=course) }}
{% endfor %}
</div>
{% else %}
{% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
<div class="empty-state">
<div class="empty-state-text">
<div class="text-center">
<div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
<div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
</div>
{% set recommended_courses = get_popular_courses() %}
<div class="cards-parent">
{% for course in recommended_courses %}
{% if course %}
{% set course_details = frappe.get_doc("LMS Course", course.course) %}
{{ widgets.CourseCard(course=course_details) }}
{% endif %}
{% endfor %}
</div>
</div>
</div>
{% endif %}

36
school/lms/web_template/courses_enrolled/courses_enrolled.json
View File

@@ -3,41 +3,9 @@
"creation": "2021-10-21 11:29:50.424865",
"docstatus": 0,
"doctype": "Web Template",
"fields": [
{
"__unsaved": 1,
"fieldname": "recommended_courses",
"fieldtype": "Section Break",
"label": "Recommended Courses for new users",
"reqd": 0
},
{
"__unsaved": 1,
"fieldname": "course1",
"fieldtype": "Link",
"label": "Course 1",
"options": "LMS Course",
"reqd": 1
},
{
"__unsaved": 1,
"fieldname": "course2",
"fieldtype": "Link",
"label": "Course 2",
"options": "LMS Course",
"reqd": 1
},
{
"__unsaved": 1,
"fieldname": "course3",
"fieldtype": "Link",
"label": "Course 3",
"options": "LMS Course",
"reqd": 1
}
],
"fields": [],
"idx": 0,
"modified": "2021-10-28 19:36:11.372396",
"modified": "2022-03-14 09:44:28.266320",
"modified_by": "Administrator",
"module": "LMS",
"name": "Courses Enrolled",

18
school/lms/widgets/Reviews.html
View File

@@ -92,14 +92,16 @@
<div class="course-meta">{{ _("Help us improve our course material.") }}</div>
</div>
<div>
{% if is_eligible_to_review(course.name, membership) %}
<span class="review-link button is-secondary">
{{ _("Write a review") }}
</span>
{% elif frappe.session.user == "Guest" %}
<a class="button is-primary" href="/login?redirect-to=/courses/{{ course.name }}"> {{ _("Login") }} </a>
{% elif not membership %}
<div class="button is-primary join-batch" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
{% if not is_instructor(course.name) %}
{% if is_eligible_to_review(course.name, membership) %}
<span class="review-link button is-secondary">
{{ _("Write a review") }}
</span>
{% elif frappe.session.user == "Guest" %}
<a class="button is-primary" href="/login?redirect-to=/courses/{{ course.name }}"> {{ _("Login") }} </a>
{% elif not membership %}
<div class="button is-primary join-batch" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
{% endif %}
{% endif %}
</div>
</div>

76
school/overrides/user.py
View File

@@ -102,16 +102,6 @@ class CustomUser(User):
"owner": self.name
})
def get_course_membership(self, member_type=None):
""" Returns all memberships of the user """
filters = {
"member": self.name
}
if member_type:
filters["member_type"] = member_type
return frappe.get_all("LMS Batch Membership", filters, ["name", "course", "progress"])
def get_mentored_courses(self):
""" Returns all courses mentored by this user """
mentored_courses = []
@@ -130,31 +120,53 @@ class CustomUser(User):
return mentored_courses
def get_enrolled_courses(self):
in_progress = []
completed = []
memberships = self.get_course_membership("Student")
for membership in memberships:
course = frappe.db.get_value("LMS Course", membership.course,
["name", "upcoming", "title", "image", "enable_certification"], as_dict=True)
progress = cint(membership.progress)
if progress < 100:
in_progress.append(course)
else:
completed.append(course)
return {
"in_progress": in_progress,
"completed": completed
}
def get_authored_courses(member):
def get_enrolled_courses():
in_progress = []
completed = []
memberships = get_course_membership(member_type="Student")
for membership in memberships:
course = frappe.db.get_value("LMS Course", membership.course,
["name", "upcoming", "title", "image", "enable_certification"], as_dict=True)
progress = cint(membership.progress)
if progress < 100:
in_progress.append(course)
else:
completed.append(course)
return {
"in_progress": in_progress,
"completed": completed
}
def get_course_membership(member=frappe.session.user, member_type=None):
""" Returns all memberships of the user """
filters = {
"member": member
}
if member_type:
filters["member_type"] = member_type
return frappe.get_all("LMS Batch Membership", filters, ["name", "course", "progress"])
def get_authored_courses(member=frappe.session.user, only_published=True):
"""Returns the number of courses authored by this user.
"""
return frappe.get_all(
'LMS Course', {
'instructor': member,
'is_published': True
})
course_details = []
filters = {
"instructor": member
}
if only_published:
filters["is_published"] = True
courses = frappe.get_all('LMS Course', filters)
for course in courses:
course_details.append(frappe.db.get_value("LMS Course", course,
["name", "upcoming", "title", "image", "enable_certification"], as_dict=True))
return course_details
def get_palette(full_name):
"""

1
school/patches.txt
View File

@@ -22,3 +22,4 @@ school.patches.v0_0.add_progress_to_membership #20-10-2021
execute:frappe.delete_doc("Workspace", "LMS", ignore_missing=True, force=True) #24-10-2021
execute:frappe.delete_doc("Custom Field", "User-verify_age", ignore_missing=True, force=True)
school.patches.v0_0.multiple_instructors #11-02-2022
school.patches.v0_0.set_course_in_lesson #14-03-2022

7
school/patches/v0_0/set_course_in_lesson.py Normal file
View File

@@ -0,0 +1,7 @@
import frappe
def execute():
lessons = frappe.get_all("Course Lesson", fields=["name", "chapter"])
for lesson in lessons:
course = frappe.db.get_value("Course Chapter", lesson.chapter, "course")
frappe.db.set_value("Course Lesson", lesson.name, "course", course)

26
school/public/css/style.css
View File

@@ -73,9 +73,9 @@ input[type=checkbox] {
}
.common-page-style {
padding-bottom: 5rem;
padding: 4rem 0 5rem;
min-height: 60vh;
padding-top: 3rem;
font-size: var(--text-base);
}
.common-card-style {
@@ -1226,7 +1226,7 @@ pre {
width: fit-content;
position: fixed;
top: 40%;
right: 7%;
right: 10%;
max-width: 400px;
z-index: 4;
}
@@ -1426,3 +1426,23 @@ pre {
.carousel-inner {
overflow: inherit;
}
.dashboard .nav-link {
color: var(--text-muted);
padding: var(--padding-md) 0;
margin-right: var(--margin-xl);
}
.dashboard .nav-link.active {
font-weight: 600;
border-bottom: 1px solid var(--primary);
color: var(--text-color);
}
.dashboard .nav-link:hover {
color: inherit;
}
.dashboard .nav {
border-bottom: 1px solid var(--border-color);
}

8
school/public/js/profile.js
View File

@@ -1,10 +1,10 @@
frappe.ready(() => {
hide_profile_for_guest_users();
hide_profile_and_dashboard_for_guest_users();
});
const hide_profile_for_guest_users = () => {
const hide_profile_and_dashboard_for_guest_users = () => {
if (frappe.session.user == "Guest") {
var link_array = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile");
link_array.length && $(link_array[0]).addClass("hide");
let links = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile" || $(elem).text().trim() === "Dashboard");
links.length && links.each((i, elem) => $(elem).addClass("hide"));
}
};

23
school/templates/courses_created.html Normal file
View File

@@ -0,0 +1,23 @@
{% set courses = get_authored_courses(only_published=False) %}
{% if courses | length %}
<div class="cards-parent">
{% for course in courses %}
{{ widgets.CourseCard(course=course) }}
{% endfor %}
</div>
{% else %}
<div class="empty-state">
<div>
<img class="icon icon-xl" src="/assets/school/icons/comment.svg">
</div>
<div class="empty-state-text">
<div class="empty-state-heading">{{ _("No courses created") }}</div>
<div class="course-meta">{{ _("Help others learn something new.") }}</div>
</div>
<div>
<a class="button is-secondary button-links" href="/course?new=1">
{{ _("Create a Course") }}
</a>
</div>
</div>
{% endif %}

21
school/templates/signup-form.html
View File

@@ -10,24 +10,6 @@
<input type="email" id="signup_email" class="form-control"
placeholder="{{ _('jane@example.com') }}" required>
</div>
{% set terms_of_use = frappe.db.get_single_value("LMS Settings", "terms_of_use") %}
{% set privacy_policy = frappe.db.get_single_value("LMS Settings", "privacy_policy") %}
{% if terms_of_use or privacy_policy %}
{% if terms_of_use %}
{% set terms_page = frappe.db.get_single_value("LMS Settings", "terms_page") %}
{% set terms_page_route = frappe.db.get_value("Web Page", terms_page, "route") %}
{% set terms_link = "<a href='/" + terms_page_route +"'>" + _("Terms of Use") + "</a>" %}
{% endif %}
{% if privacy_policy %}
{% set privacy_policy_page = frappe.db.get_single_value("LMS Settings", "privacy_policy_page") %}
{% set privacy_page_route = frappe.db.get_value("Web Page", privacy_policy_page, "route") %}
{% set privacy_link = "<a href='/" + privacy_page_route +"'>" + _("Privacy Policy") + "</a>" %}
{% endif %}
{% set final_link = terms_link + _(" and ") + privacy_link if terms_of_use and privacy_policy else terms_link if terms_of_use else privacy_link %}
<div class="form-group">
<div class="checkbox">
@@ -37,13 +19,12 @@
data-fieldtype="Check" data-fieldname="terms" id="signup-terms" required>
</span>
<span class="label-area">
{{ _("I have read and agree to your {0}").format(final_link) }}
{{ _("I have read and agree to your {0}").format(get_signup_optin_checks()) }}
</span>
</label>
<p class="help-box small text-muted"></p>
</div>
</div>
{% endif %}
</div>
<div class="page-card-actions">
<button class="btn btn-sm btn-primary btn-block btn-signup"

39
school/www/courses/course.html
View File

@@ -159,36 +159,45 @@
</div>
{% endif %}
{% set lesson_index = get_lesson_index(membership.current_lesson) if membership and
membership.current_lesson
else '1.1' %}
{% if not course.disable_self_learning and not membership and not course.upcoming and not restriction.restrict %}
<div class="button wide-button start-learning is-primary join-batch" data-course="{{ course.name | urlencode }}">
{% if show_start_learing_cta %}
<div class="button wide-button is-primary join-batch" data-course="{{ course.name | urlencode }}">
{{ _("Start Learning") }}
<img class="ml-2" src="/assets/school/icons/white-arrow.svg" />
</div>
{% endif %}
{% if membership %}
{% set lesson_index = get_lesson_index(membership.current_lesson) if membership and
membership.current_lesson
else '1.1' %}
{% elif is_instructor(course.name) and not course.is_published and status != "Ready for Review" %}
<div class="button wide-button is-primary" id="submit-for-review" data-course="{{ course.name | urlencode }}">
{{ _("Submit for Review") }}
<img class="ml-2" src="/assets/school/icons/white-arrow.svg" />
</div>
{% elif is_instructor(course.name) %}
<a class="button wide-button is-primary" id="continue-learning"
href="{{ get_lesson_url(course.name, lesson_index) }}{{ course.query_parameter }}">
Continue Learning <img class="ml-2" src="/assets/school/icons/white-arrow.svg" />
{{ _("Checkout Course") }} <img class="ml-2" src="/assets/school/icons/white-arrow.svg" />
</a>
{% endif %}
{% if course.upcoming and not is_user_interested %}
{% elif membership %}
<a class="button wide-button is-primary" id="continue-learning"
href="{{ get_lesson_url(course.name, lesson_index) }}{{ course.query_parameter }}">
{{ _("Continue Learning") }} <img class="ml-2" src="/assets/school/icons/white-arrow.svg" />
</a>
{% elif course.upcoming and not is_user_interested %}
<div class="button wide-button is-default"
id="notify-me" data-course="{{course.name | urlencode}}">
Notify me when available
{{ _("Notify me when available") }}
</div>
{% endif %}
{% if is_cohort_staff(course.name, frappe.session.user) %}
{% elif is_cohort_staff(course.name, frappe.session.user) %}
<a class="button wide-button is-secondary"
href="/courses/{{course.name}}/manage"
style="color: inherit;">
Manage the course
{{ _("Manage the course") }}
</a>
{% endif %}
@@ -252,12 +261,10 @@
<div class="slider-controls">
<a class="carousel-control-prev" href="#carouselExampleControls" role="button" data-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#carouselExampleControls" role="button" data-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>
{% endif %}

24
school/www/courses/course.js
View File

@@ -41,6 +41,10 @@ frappe.ready(() => {
create_certificate(e);
});
$("#submit-for-review").click((e) => {
submit_for_review(e);
});
$(document).scroll(function() {
let timer;
clearTimeout(timer);
@@ -237,7 +241,7 @@ const create_certificate = (e) => {
const element_not_in_viewport = (el) => {
const rect = el.getBoundingClientRect();
return rect.bottom < 0 || rect.right < 0 || rect.left > window.innerWidth || rect.top > window.innerHeight;
}
};
const handle_overlay_display = () => {
const element = $(".related-courses").length && $(".related-courses")[0];
@@ -255,4 +259,22 @@ const handle_overlay_display = () => {
"bottom": "5%"
});
}
};
const submit_for_review = (e) => {
let course = $(e.currentTarget).data("course");
frappe.call({
method: "school.lms.doctype.lms_course.lms_course.submit_for_review",
args: {
"course": course
},
callback: (data) => {
if (data.message == "No Chp") {
frappe.msgprint(__(`There are no chapters in this course.
Please add chapters and lessons to your course before you submit it for review.`));
} else if (data.message == "OK") {
frappe.msgprint(__("Your course has been submitted for review."))
}
}
})
}

6
school/www/courses/course.py
View File

@@ -1,6 +1,6 @@
import frappe
from school.lms.doctype.lms_settings.lms_settings import check_profile_restriction
from school.lms.utils import get_membership
from school.lms.utils import get_membership, is_instructor
def get_context(context):
context.no_cache = 1
@@ -33,6 +33,7 @@ def get_context(context):
if context.course.upcoming:
context.is_user_interested = get_user_interest(context.course.name)
context.restriction = check_profile_restriction()
context.show_start_learing_cta = show_start_learing_cta(course, membership)
context.metatags = {
"title": course.title,
"image": course.image,
@@ -46,3 +47,6 @@ def get_user_interest(course):
"course": course,
"user": frappe.session.user
})
def show_start_learing_cta(course, membership):
return not course.disable_self_learning and not membership and not course.upcoming and not restriction.restrict and not is_instructor(course.name)

0
school/www/dashboard/__init__.py Normal file
View File

32
school/www/dashboard/index.html Normal file
View File

@@ -0,0 +1,32 @@
{% extends "templates/base.html" %}
{% block title %}{{ _("Dashboard")}}
{% endblock %}
{% block content %}
<div class="common-page-style dashboard">
<div class="container">
<ul class="nav mb-8">
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#courses-enrolled"> {{ _("Courses Enrolled") }} </a>
</li>
{% if frappe.db.get_single_value("LMS Settings", "portal_course_creation") %}
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#courses-created">{{ _("Courses Created") }}</a>
</li>
{% endif %}
</ul>
<div class="tab-content">
<div class="tab-pane active" id="courses-enrolled" role="tabpanel" aria-labelledby="courses-enrolled">
{% include "school/lms/web_template/courses_enrolled/courses_enrolled.html" %}
</div>
{% if frappe.db.get_single_value("LMS Settings", "portal_course_creation") %}
<div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
{% include "school/templates/courses_created.html" %}
</div>
{% endif %}
</div>
</div>
</div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
{% endblock %}

8
school/www/profiles/profile.html
View File

@@ -29,7 +29,7 @@
{% macro ProfileBanner(member) %}
{% set cover_image = member.cover_image if member.cover_image else "/assets/school/images/profile-banner.png" %}
{% set enrollment = member.get_course_membership("Student") | length %}
{% set enrollment = get_course_membership(member_type="Student") | length %}
{% set enrollment_suffix = _("Courses") if enrollment > 1 else _("Course") %}
<div class="container">
<div class="profile-banner" style="background-image: url({{ cover_image }})">
@@ -77,9 +77,7 @@
<div class="course-home-headings"> {{ _("Courses Created") }} </div>
<div class="cards-parent">
{% for course in authored_courses %}
{% set course_details = frappe.db.get_value("LMS Course", course,
["name", "upcoming", "title", "image", "enable_certification"], as_dict=True) %}
{{ widgets.CourseCard(course=course_details, read_only=read_only) }}
{{ widgets.CourseCard(course=course, read_only=read_only) }}
{% endfor %}
</div>
</div>
@@ -100,7 +98,7 @@
{% endmacro %}
{% macro CoursesEnrolled(member, read_only) %}
{% set enrolled = member.get_enrolled_courses() %}
{% set enrolled = get_enrolled_courses() %}
{% if enrolled.completed | length %}
<div class="profile-courses">