Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for the chart (#11460)

Browse Source
This commit is contained in:
Manas Solanki 2017-11-06 17:22:14 +05:30 committed by Nabin Hait
parent bcb7854340
commit 6ba2eda04a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py
View File

@ -173,14 +173,16 @@ def get_column(assessment_criteria, total_maximum_score):
def get_chart_data(grades, assessment_criteria_list, kounter): def get_chart_data(grades, assessment_criteria_list, kounter):
grades = sorted(grades) grades = sorted(grades)
datasets = [] datasets = []
for grade in grades: for grade in grades:
tmp = [] tmp = frappe._dict({"values":[], "title": grade})
for ac in assessment_criteria_list: for criteria in assessment_criteria_list:
if grade in kounter[ac]: if grade in kounter[criteria]:
tmp.append(kounter[ac][grade]) tmp["values"].append(kounter[criteria][grade])
else: else:
tmp.append(0) tmp["values"].append(0)
datasets.append(tmp) datasets.append(tmp)
return { return {
"data": { "data": {
"labels": assessment_criteria_list, "labels": assessment_criteria_list,