fix: columns
This commit is contained in:
@@ -33,8 +33,10 @@ def get_data(filters=None):
|
|||||||
|
|
||||||
course_details = frappe.get_doc("LMS Course", current_course)
|
course_details = frappe.get_doc("LMS Course", current_course)
|
||||||
summary.append(frappe._dict({
|
summary.append(frappe._dict({
|
||||||
"course": course_details.title,
|
"course": course_details.name,
|
||||||
"member": membership.member_name,
|
"course_name": course_details.title,
|
||||||
|
"member": membership.member,
|
||||||
|
"member_name": membership.member_name,
|
||||||
"progress": rounded(course_details.get_course_progress(membership.member))
|
"progress": rounded(course_details.get_course_progress(membership.member))
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -47,6 +49,12 @@ def get_columns():
|
|||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": _("Course"),
|
"label": _("Course"),
|
||||||
"options": "LMS Course",
|
"options": "LMS Course",
|
||||||
|
"width": 200
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "course_name",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"label": _("Course Name"),
|
||||||
"width": 300
|
"width": 300
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -54,13 +62,19 @@ def get_columns():
|
|||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": _("Member"),
|
"label": _("Member"),
|
||||||
"options": "User",
|
"options": "User",
|
||||||
|
"width": 200
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "member_name",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"label": _("Member Name"),
|
||||||
"width": 150
|
"width": 150
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "progress",
|
"fieldname": "progress",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": _("Progress (%)"),
|
"label": _("Progress (%)"),
|
||||||
"width": 150
|
"width": 120
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -68,14 +82,12 @@ def get_charts(data):
|
|||||||
if not data:
|
if not data:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
labels = []
|
|
||||||
completed = 0
|
completed = 0
|
||||||
less_than_hundred = 0
|
less_than_hundred = 0
|
||||||
less_than_seventy = 0
|
less_than_seventy = 0
|
||||||
less_than_forty = 0
|
less_than_forty = 0
|
||||||
less_than_ten = 0
|
less_than_ten = 0
|
||||||
|
|
||||||
|
|
||||||
for row in data:
|
for row in data:
|
||||||
if row.progress == 100:
|
if row.progress == 100:
|
||||||
completed += 1
|
completed += 1
|
||||||
@@ -88,8 +100,6 @@ def get_charts(data):
|
|||||||
elif row.progress < 10:
|
elif row.progress < 10:
|
||||||
less_than_ten += 1
|
less_than_ten += 1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
charts = {
|
charts = {
|
||||||
"data": {
|
"data": {
|
||||||
"labels": ["0-10", "10-40", "40-70", "70-99", "100"],
|
"labels": ["0-10", "10-40", "40-70", "70-99", "100"],
|
||||||
|
|||||||
Reference in New Issue
Block a user