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

fix: popularity filter for enrolled and authored courses

Browse Source
This commit is contained in:
Jannat Patel
2023-08-18 12:39:19 +05:30
parent a061a89ee7
commit 982d6c9045
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lms/www/profiles/profile.html
View File

@@ -5,11 +5,6 @@
{% block content %}
{% set read_only = member.name != frappe.session.user %}
{% set user = member.name %}
{% set courses_created = get_authored_courses(member.name, True) %}
{% set certificates = get_certificates(user) %}
<div class="common-page-style profile-page">
{{ ProfileBanner(member) }}
<div class="profile-page-body">
@@ -82,14 +77,19 @@
{% if not read_only %}
<div class="tab-pane fade" id="courses-enrolled" role="tabpanel" aria-labelledby="courses-enrolled">
{% include "lms/lms/web_template/courses_enrolled/courses_enrolled.html" %}
{% set courses = enrolled_courses %}
{% set title = _("Enrolled Courses") %}
{% set classes = "enrolled-courses" %}
{% include "lms/templates/course_list.html" %}
</div>
{% endif %}
{% if courses_created | length %}
{% set only_published = True %}
<div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
{% include "lms/templates/courses_created.html" %}
{% set courses = courses_created %}
{% set title = _("Created Courses") %}
{% set classes = "created-courses" %}
{% include "lms/templates/course_list.html" %}
</div>
{% endif %}
@@ -249,7 +249,9 @@
<!-- Career Preference -->
{% macro CareerPreference(member) %}
{% if member.preferred_functions or member.preferred_industries or member.preferred_location or member.dream_companies %}
<div class="course-home-headings mt-10"> {{ _("Career Preference") }} </div>
<div class="course-home-headings mt-10">
{{ _("Career Preference") }}
</div>
<div class="profile-column-grid">
{% if member.preferred_functions | length %}

12
lms/www/profiles/profile.py
View File

@@ -1,7 +1,8 @@
import frappe
from lms.lms.utils import get_lesson_index
from lms.lms.utils import get_lesson_index, get_certificates
from lms.page_renderers import get_profile_url_prefix
from lms.overrides.user import get_authored_courses, get_enrolled_courses
def get_context(context):
@@ -9,14 +10,23 @@ def get_context(context):
try:
username = frappe.form_dict["username"]
print("username", username)
except KeyError:
username = frappe.db.get_value("User", frappe.session.user, ["username"])
print("except", username)
if username:
frappe.local.flags.redirect_location = get_profile_url_prefix() + username
raise frappe.Redirect
try:
print(username)
context.member = frappe.get_doc("User", {"username": username})
context.courses_created = get_authored_courses(context.member.name, True)
context.enrolled_courses = (
get_enrolled_courses()["in_progress"] + get_enrolled_courses()["completed"]
)
context.read_only = frappe.session.user != context.member.name
context.certificates = get_certificates(context.member.name)
except Exception:
context.template = "www/404.html"
return