From 27e1aec001f481b6a7c2a677bdf79fbf65bac783 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 15 Mar 2022 16:51:39 +0530 Subject: [PATCH] fix: dashboard links, web form redirects and patch for status --- .../chapter_reference/chapter_reference.json | 5 +++- .../doctype/course_lesson/course_lesson.py | 10 ++------ .../lesson_reference/lesson_reference.json | 5 +++- school/lms/doctype/lms_course/lms_course.json | 6 +++-- school/lms/doctype/lms_course/lms_course.py | 2 +- school/lms/web_form/course/course.js | 3 ++- school/lms/web_form/lesson/lesson.js | 14 +++++++++-- school/lms/widgets/CourseCard.html | 8 +++--- school/overrides/user.py | 8 +++--- school/patches.txt | 1 + school/patches/v0_0/set_status_in_course.py | 7 ++++++ school/public/css/style.css | 17 +++++++------ school/templates/courses_created.html | 2 +- school/www/courses/course.html | 21 ++++++++++++---- school/www/courses/course.js | 1 + school/www/courses/course.py | 8 +++--- school/www/dashboard/index.html | 25 ++++++++++++++++--- school/www/profiles/profile.html | 2 +- 18 files changed, 99 insertions(+), 46 deletions(-) create mode 100644 school/patches/v0_0/set_status_in_course.py diff --git a/school/lms/doctype/chapter_reference/chapter_reference.json b/school/lms/doctype/chapter_reference/chapter_reference.json index a251b1a4..0c67d748 100644 --- a/school/lms/doctype/chapter_reference/chapter_reference.json +++ b/school/lms/doctype/chapter_reference/chapter_reference.json @@ -1,5 +1,6 @@ { "actions": [], + "autoname": "hash", "creation": "2021-07-27 16:25:02.903245", "doctype": "DocType", "editable_grid": 1, @@ -20,13 +21,15 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2021-09-30 10:35:30.014950", + "modified": "2022-03-15 09:39:41.937565", "modified_by": "Administrator", "module": "LMS", "name": "Chapter Reference", + "naming_rule": "Random", "owner": "Administrator", "permissions": [], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/school/lms/doctype/course_lesson/course_lesson.py b/school/lms/doctype/course_lesson/course_lesson.py index cd20613e..ee0023b6 100644 --- a/school/lms/doctype/course_lesson/course_lesson.py +++ b/school/lms/doctype/course_lesson/course_lesson.py @@ -110,11 +110,5 @@ def save_progress(lesson, course, status): return progress @frappe.whitelist() -def get_lesson_info(lesson_name): - chapter = frappe.db.get_value("Course Lesson", lesson_name, "chapter") - course = frappe.db.get_value("Course Chapter", chapter, "course") - - lesson_idx = frappe.db.get_value("Lesson Reference", {"lesson": lesson_name}, ["idx"]) - chapter_idx = frappe.db.get_value("Chapter Reference", {"chapter": chapter}, ["idx"]) - - return get_lesson_url(course, f"{chapter_idx}.{lesson_idx}") +def get_lesson_info(chapter): + return frappe.db.get_value("Course Chapter", chapter, "course") diff --git a/school/lms/doctype/lesson_reference/lesson_reference.json b/school/lms/doctype/lesson_reference/lesson_reference.json index a3e77ebb..86129694 100644 --- a/school/lms/doctype/lesson_reference/lesson_reference.json +++ b/school/lms/doctype/lesson_reference/lesson_reference.json @@ -1,5 +1,6 @@ { "actions": [], + "autoname": "hash", "creation": "2021-07-27 16:25:48.269536", "doctype": "DocType", "editable_grid": 1, @@ -20,13 +21,15 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2021-09-30 10:35:47.832547", + "modified": "2022-03-15 09:39:29.495991", "modified_by": "Administrator", "module": "LMS", "name": "Lesson Reference", + "naming_rule": "Random", "owner": "Administrator", "permissions": [], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/school/lms/doctype/lms_course/lms_course.json b/school/lms/doctype/lms_course/lms_course.json index dad39ff4..671e6efb 100644 --- a/school/lms/doctype/lms_course/lms_course.json +++ b/school/lms/doctype/lms_course/lms_course.json @@ -144,8 +144,10 @@ "fieldname": "status", "fieldtype": "Select", "hidden": 1, + "in_list_view": 1, + "in_standard_filter": 1, "label": "Status", - "options": "In Progress\nReady for Review\nApproved", + "options": "In Progress\nUnder Review\nApproved", "read_only": 1 }, { @@ -184,7 +186,7 @@ "link_fieldname": "course" } ], - "modified": "2022-03-14 17:56:46.514391", + "modified": "2022-03-15 10:16:53.796878", "modified_by": "Administrator", "module": "LMS", "name": "LMS Course", diff --git a/school/lms/doctype/lms_course/lms_course.py b/school/lms/doctype/lms_course/lms_course.py index de9bc76f..94648505 100644 --- a/school/lms/doctype/lms_course/lms_course.py +++ b/school/lms/doctype/lms_course/lms_course.py @@ -208,5 +208,5 @@ 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") + frappe.db.set_value("LMS Course", course, "status", "Under Review") return "OK" diff --git a/school/lms/web_form/course/course.js b/school/lms/web_form/course/course.js index 1aae8b5c..ff539e0a 100644 --- a/school/lms/web_form/course/course.js +++ b/school/lms/web_form/course/course.js @@ -1,5 +1,6 @@ frappe.ready(function() { frappe.web_form.after_save = () => { - window.location.href = `/dashboard#courses-created`; + let route = frappe.web_form.doc.name ? `/courses/${frappe.web_form.doc.name}` : `/course`; + window.location.href = route; } }); diff --git a/school/lms/web_form/lesson/lesson.js b/school/lms/web_form/lesson/lesson.js index 49c264fd..bf3a24c8 100644 --- a/school/lms/web_form/lesson/lesson.js +++ b/school/lms/web_form/lesson/lesson.js @@ -1,5 +1,15 @@ frappe.ready(function() { - frappe.web_form.after_save = () => { - window.location.href = `/courses/` + frappe.web_form.after_save = () => { + setTimeout(() => { + frappe.call({ + method: "school.lms.doctype.course_lesson.course_lesson.get_lesson_info", + args: { + "chapter": frappe.web_form.doc.chapter + }, + callback: (data) => { + window.location.href = `/courses/${data.message}`; + } + }); + }); }; }); diff --git a/school/lms/widgets/CourseCard.html b/school/lms/widgets/CourseCard.html index 52f613ed..437d54ab 100644 --- a/school/lms/widgets/CourseCard.html +++ b/school/lms/widgets/CourseCard.html @@ -17,9 +17,11 @@
{% if get_lessons(course.name) | length %} - - {{ get_lessons(course.name) | length }} {{ _("Lessons") }} - + {{ get_lessons(course.name) | length }} {{ _("Lessons") }} + {% endif %} + {% if course.status and course.status != "Approved"%} + {% set pill_color = "gray" if course.status == "In Progress" else "orange" %} + {{ course.status }} {% endif %}
{{ course.title }}
diff --git a/school/overrides/user.py b/school/overrides/user.py index da199318..25bd819c 100644 --- a/school/overrides/user.py +++ b/school/overrides/user.py @@ -124,7 +124,7 @@ class CustomUser(User): def get_enrolled_courses(): in_progress = [] completed = [] - memberships = get_course_membership(member_type="Student") + memberships = get_course_membership(frappe.session.user, 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) @@ -139,7 +139,7 @@ def get_enrolled_courses(): "completed": completed } -def get_course_membership(member=frappe.session.user, member_type=None): +def get_course_membership(member, member_type=None): """ Returns all memberships of the user """ filters = { "member": member @@ -150,7 +150,7 @@ def get_course_membership(member=frappe.session.user, member_type=None): return frappe.get_all("LMS Batch Membership", filters, ["name", "course", "progress"]) -def get_authored_courses(member=frappe.session.user, only_published=True): +def get_authored_courses(member, only_published=True): """Returns the number of courses authored by this user. """ course_details = [] @@ -164,7 +164,7 @@ def get_authored_courses(member=frappe.session.user, only_published=True): for course in courses: course_details.append(frappe.db.get_value("LMS Course", course, - ["name", "upcoming", "title", "image", "enable_certification"], as_dict=True)) + ["name", "upcoming", "title", "image", "enable_certification", "status"], as_dict=True)) return course_details diff --git a/school/patches.txt b/school/patches.txt index a0a0de43..53e9fff4 100644 --- a/school/patches.txt +++ b/school/patches.txt @@ -23,3 +23,4 @@ execute:frappe.delete_doc("Workspace", "LMS", ignore_missing=True, force=True) # 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 +school.patches.v0_0.set_status_in_course diff --git a/school/patches/v0_0/set_status_in_course.py b/school/patches/v0_0/set_status_in_course.py new file mode 100644 index 00000000..e8f54c1a --- /dev/null +++ b/school/patches/v0_0/set_status_in_course.py @@ -0,0 +1,7 @@ +import frappe + +def execute(): + courses = frappe.get_all("LMS Course", {"status": ("is", "not set")}, ["name", "is_published"]) + for course in courses: + status = "Approved" if course.is_published else "In Progress" + frappe.db.set_value("LMS Course", course.name, "status", status) diff --git a/school/public/css/style.css b/school/public/css/style.css index 8ad21492..f4266417 100644 --- a/school/public/css/style.css +++ b/school/public/css/style.css @@ -73,7 +73,7 @@ input[type=checkbox] { } .common-page-style { - padding: 4rem 0 5rem; + padding: 2rem 0 5rem; min-height: 60vh; font-size: var(--text-base); } @@ -347,7 +347,7 @@ input[type=checkbox] { .is-secondary { background: #FFFFFF; - color: inherit; + color: var(--gray-900); } .is-secondary:hover { @@ -357,7 +357,7 @@ input[type=checkbox] { .is-default { background: var(--gray-100); - color: var(--gray-700); + color: var(--gray-900); } .is-default:disabled { @@ -1238,7 +1238,6 @@ pre { } .course-intructor-rating-section .seperator::before { - content: "\00B7"; margin: 0 0.25rem; } } @@ -1428,8 +1427,8 @@ pre { } .dashboard .nav-link { - color: var(--text-muted); - padding: var(--padding-md) 0; + color: var(--text-muted); + padding: 0 0 var(--padding-md); margin-right: var(--margin-xl); } @@ -1443,6 +1442,8 @@ pre { color: inherit; } -.dashboard .nav { - border-bottom: 1px solid var(--border-color); +.dashboard-button { + position: relative; + top: -50px; + margin-left: auto; } diff --git a/school/templates/courses_created.html b/school/templates/courses_created.html index 434474ad..5977fee0 100644 --- a/school/templates/courses_created.html +++ b/school/templates/courses_created.html @@ -1,4 +1,4 @@ -{% set courses = get_authored_courses(only_published=False) %} +{% set courses = get_authored_courses(frappe.session.user, only_published=False) %} {% if courses | length %}
{% for course in courses %} diff --git a/school/www/courses/course.html b/school/www/courses/course.html index f6225b0f..09bd2aa0 100644 --- a/school/www/courses/course.html +++ b/school/www/courses/course.html @@ -29,8 +29,14 @@ {% else %} background-color: var(--gray-200) {% endif %}">
{% if is_instructor(course.name) %} - {{ _("New Lesson") }} - {{ _("New Chapter") }} + + + {{ _("Add Lesson") }} + + + + {{ _("Add Chapter") }} + {{ _("Edit") }} {% endif %} {{ BreadCrumb(course) }} @@ -131,9 +137,15 @@
{{ course.title }}
- You have opted to be notified for this course. You will receive an email when the course becomes available. + {{ _("You have opted to be notified for this course. You will receive an email when the course becomes available.") }}
+ {% if course.status == "Under Review" %} +
+ {{ _("Your course is currently under review. Once the review is complete, the System Admins will publish it on the website.") }} +
+ {% endif %} + {% if get_lessons(course.name) | length %}
@@ -162,14 +174,13 @@ {% set lesson_index = get_lesson_index(membership.current_lesson) if membership and membership.current_lesson else '1.1' %} - {% if show_start_learing_cta %}
{{ _("Start Learning") }}
- {% elif is_instructor(course.name) and not course.is_published and status != "Ready for Review" %} + {% elif is_instructor(course.name) and not course.is_published and course.status != "Under Review" %}
{{ _("Submit for Review") }} diff --git a/school/www/courses/course.js b/school/www/courses/course.js index 66ae4c82..67447feb 100644 --- a/school/www/courses/course.js +++ b/school/www/courses/course.js @@ -274,6 +274,7 @@ const submit_for_review = (e) => { 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.")) + window.location.reload(); } } }) diff --git a/school/www/courses/course.py b/school/www/courses/course.py index 70818259..b8bfc35a 100644 --- a/school/www/courses/course.py +++ b/school/www/courses/course.py @@ -13,7 +13,7 @@ def get_context(context): course = frappe.db.get_value("LMS Course", course_name, ["name", "title", "image", "short_introduction", "description", "is_published", "upcoming", - "disable_self_learning", "video_link", "enable_certification"], + "disable_self_learning", "video_link", "enable_certification", "status"], as_dict=True) related_courses = frappe.get_all("Related Courses", {"parent": course.name}, ["course"]) @@ -33,7 +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.show_start_learing_cta = show_start_learing_cta(course, membership, context.restriction) context.metatags = { "title": course.title, "image": course.image, @@ -48,5 +48,5 @@ def get_user_interest(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) +def show_start_learing_cta(course, membership, restriction): + return not course.disable_self_learning and not membership and not course.upcoming and not restriction.get("restrict") and not is_instructor(course.name) diff --git a/school/www/dashboard/index.html b/school/www/dashboard/index.html index 23bf4ef7..c643915d 100644 --- a/school/www/dashboard/index.html +++ b/school/www/dashboard/index.html @@ -3,23 +3,32 @@ {% endblock %} {% block content %} +{% set portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation") %}
-
    + {% if portal_course_creation %} + + + {{ _("New Course")}} + + {% endif %} + +
    {% include "school/lms/web_template/courses_enrolled/courses_enrolled.html" %}
    - {% if frappe.db.get_single_value("LMS Settings", "portal_course_creation") %} + {% if portal_course_creation %}
    {% include "school/templates/courses_created.html" %}
    @@ -29,4 +38,12 @@
    + {% endblock %} diff --git a/school/www/profiles/profile.html b/school/www/profiles/profile.html index c5e69571..ed661462 100644 --- a/school/www/profiles/profile.html +++ b/school/www/profiles/profile.html @@ -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 = get_course_membership(member_type="Student") | length %} +{% set enrollment = get_course_membership(frappe.session.user, member_type="Student") | length %} {% set enrollment_suffix = _("Courses") if enrollment > 1 else _("Course") %}