nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-28 01:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add labels to chart datasets in course wise assessment

Browse Source
This commit is contained in:
Rucha Mahabal
2020-07-24 14:07:00 +05:30
parent 1010feefe0
commit 27835b7789
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py
View File

@@ -42,7 +42,7 @@ def execute(filters=None):
# create the list of possible grades # create the list of possible grades
if student_row[scrub_criteria] not in grades: if student_row[scrub_criteria] not in grades:
grades.append(student_row[scrub_criteria]) grades.append(student_row[scrub_criteria])
# create the dict of for gradewise analysis # create the dict of for gradewise analysis
if student_row[scrub_criteria] not in grade_wise_analysis[criteria]: if student_row[scrub_criteria] not in grade_wise_analysis[criteria]:
grade_wise_analysis[criteria][student_row[scrub_criteria]] = 1 grade_wise_analysis[criteria][student_row[scrub_criteria]] = 1
@@ -152,7 +152,7 @@ def get_formatted_result(args, get_assessment_criteria=False, get_course=False,
elif create_total_dict: elif create_total_dict:
if get_all_assessment_groups: if get_all_assessment_groups:
formatted_assessment_result[result.student][result.course][result.assessment_group]\ formatted_assessment_result[result.student][result.course][result.assessment_group]\
[result.assessment_criteria] = assessment_criteria_details [result.assessment_criteria] = assessment_criteria_details
if not formatted_assessment_result[result.student][result.course][args.assessment_group]: if not formatted_assessment_result[result.student][result.course][args.assessment_group]:
formatted_assessment_result[result.student][result.course][args.assessment_group] = defaultdict(dict) formatted_assessment_result[result.student][result.course][args.assessment_group] = defaultdict(dict)
formatted_assessment_result[result.student][result.course][args.assessment_group]\ formatted_assessment_result[result.student][result.course][args.assessment_group]\
@@ -220,7 +220,7 @@ def get_chart_data(grades, criteria_list, kounter):
datasets = [] datasets = []
for grade in grades: for grade in grades:
tmp = frappe._dict({"values":[], "title": grade}) tmp = frappe._dict({"name": grade, "values":[], "title": grade})
for criteria in criteria_list: for criteria in criteria_list:
if grade in kounter[criteria]: if grade in kounter[criteria]:
tmp["values"].append(kounter[criteria][grade]) tmp["values"].append(kounter[criteria][grade])