diff --git a/erpnext/education/utils.py b/erpnext/education/utils.py index 9314da2c17..b12ad0c71d 100644 --- a/erpnext/education/utils.py +++ b/erpnext/education/utils.py @@ -162,8 +162,9 @@ def get_program(): else: return None -def get_featured_program(): - featured_list = frappe.get_list("Program", filters={"is_published": True, "is_featured": True}) +def get_featured_programs(): + featured_programs_name = frappe.get_list("Program", filters={"is_published": True, "is_featured": True}) + featured_list = [frappe.get_doc("Program", program["name"]) for program in featured_programs_name] if featured_list: return featured_list else: diff --git a/erpnext/www/lms/index.py b/erpnext/www/lms/index.py index 16772a4f5d..1bba69f470 100644 --- a/erpnext/www/lms/index.py +++ b/erpnext/www/lms/index.py @@ -1,5 +1,6 @@ from __future__ import unicode_literals import frappe +import erpnext.education.utils as utils def get_context(context): - context.featured = frappe.get_all('Program', filters={'is_featured': 1}, fields=['program_name', 'program_code', 'description', 'hero_image']) \ No newline at end of file + context.featured = utils.get_featured_programs() \ No newline at end of file diff --git a/erpnext/www/lms/program.html b/erpnext/www/lms/program.html index 23f2e5c528..5c1f15994c 100644 --- a/erpnext/www/lms/program.html +++ b/erpnext/www/lms/program.html @@ -6,23 +6,23 @@ {% endblock %} -{% macro course_card(name) %} +{% macro course_card(course) %}
-
{{ name }}
+
{{ course.name }}
Course Content
    - {% for content in course_data[name] %} -
  • {{ content }}
  • + {% for content in course.course_content %} +
  • {{ content.content }}
  • {% endfor %}
diff --git a/erpnext/www/lms/program.py b/erpnext/www/lms/program.py index c61aee53f6..c5bf018878 100644 --- a/erpnext/www/lms/program.py +++ b/erpnext/www/lms/program.py @@ -1,17 +1,8 @@ from __future__ import unicode_literals -from erpnext.education.utils import get_student_name +import erpnext.education.utils as utils import frappe def get_context(context): - print(get_student_name(frappe.session.user)) context.program = frappe.get_doc("Program", frappe.form_dict["program"]) - context.course_list, context.course_data = get_courses(context) - -def get_courses(context): - course_data = {} - course_names = [program.course_name for program in context.program.courses] - program_courses = [frappe.get_doc('Course', name) for name in course_names] - for course_item in program_courses: - course_data[course_item.name] = [content_item.content for content_item in course_item.course_content if content_item.content_type in ('Video', 'Article')] - return course_names, course_data + context.course_list = utils.get_courses_in_program(frappe.form_dict["program"]) \ No newline at end of file