From ea6bd1f59828b0edd753f476b6ad8d63bac3a76a Mon Sep 17 00:00:00 2001 From: pateljannat Date: Tue, 28 Sep 2021 19:58:07 +0530 Subject: [PATCH] fix: columns --- .../course_progress_summary.py | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/community/lms/report/course_progress_summary/course_progress_summary.py b/community/lms/report/course_progress_summary/course_progress_summary.py index 67f5e4cb..efda989f 100644 --- a/community/lms/report/course_progress_summary/course_progress_summary.py +++ b/community/lms/report/course_progress_summary/course_progress_summary.py @@ -33,8 +33,10 @@ def get_data(filters=None): course_details = frappe.get_doc("LMS Course", current_course) summary.append(frappe._dict({ - "course": course_details.title, - "member": membership.member_name, + "course": course_details.name, + "course_name": course_details.title, + "member": membership.member, + "member_name": membership.member_name, "progress": rounded(course_details.get_course_progress(membership.member)) })) @@ -47,6 +49,12 @@ def get_columns(): "fieldtype": "Link", "label": _("Course"), "options": "LMS Course", + "width": 200 + }, + { + "fieldname": "course_name", + "fieldtype": "Data", + "label": _("Course Name"), "width": 300 }, { @@ -54,13 +62,19 @@ def get_columns(): "fieldtype": "Link", "label": _("Member"), "options": "User", + "width": 200 + }, + { + "fieldname": "member_name", + "fieldtype": "Data", + "label": _("Member Name"), "width": 150 }, { "fieldname": "progress", "fieldtype": "Data", "label": _("Progress (%)"), - "width": 150 + "width": 120 } ] @@ -68,14 +82,12 @@ def get_charts(data): if not data: return None - labels = [] completed = 0 less_than_hundred = 0 less_than_seventy = 0 less_than_forty = 0 less_than_ten = 0 - for row in data: if row.progress == 100: completed += 1 @@ -88,8 +100,6 @@ def get_charts(data): elif row.progress < 10: less_than_ten += 1 - - charts = { "data": { "labels": ["0-10", "10-40", "40-70", "70-99", "100"],