diff --git a/erpnext/patches/v7_2/update_assessment_modules.py b/erpnext/patches/v7_2/update_assessment_modules.py index da0c54c4c73..a8ee865ec66 100644 --- a/erpnext/patches/v7_2/update_assessment_modules.py +++ b/erpnext/patches/v7_2/update_assessment_modules.py @@ -7,7 +7,7 @@ def execute(): frappe.rename_doc("DocType", "Grade Interval", "Grading Scale Interval", force=True) frappe.reload_doc("schools", "doctype", "grading_scale_interval") - rename_field("Grading Scale Interval", "to_score", "min_score") + rename_field("Grading Scale Interval", "to_score", "threshold") #Rename Assessment Results frappe.reload_doc("schools", "doctype", "assessment") diff --git a/erpnext/schools/api.py b/erpnext/schools/api.py index a1e4a490b00..912a75dfc26 100644 --- a/erpnext/schools/api.py +++ b/erpnext/schools/api.py @@ -191,8 +191,8 @@ def get_grade(grading_scale, percentage): :param Percentage: Score Percentage Percentage """ grading_scale_intervals = {} - for d in frappe.get_all("Grading Scale Interval", fields=["grade_code", "min_score"], filters={"parent": grading_scale}): - grading_scale_intervals.update({d.min_score:d.grade_code}) + for d in frappe.get_all("Grading Scale Interval", fields=["grade_code", "threshold"], filters={"parent": grading_scale}): + grading_scale_intervals.update({d.threshold:d.grade_code}) intervals = sorted(grading_scale_intervals.keys(), key=float, reverse=True) for interval in intervals: if flt(percentage) >= interval: diff --git a/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json b/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json index 87cdeec8419..10b229c8c0c 100644 --- a/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json +++ b/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json @@ -45,7 +45,7 @@ "collapsible": 0, "columns": 0, "default": "0", - "fieldname": "min_score", + "fieldname": "threshold", "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, @@ -53,7 +53,7 @@ "in_filter": 0, "in_list_view": 1, "in_standard_filter": 0, - "label": "Min Score", + "label": "Threshold", "length": 0, "no_copy": 0, "permlevel": 0, @@ -107,7 +107,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-12-29 17:10:26.153591", + "modified": "2017-01-04 15:27:56.729286", "modified_by": "Administrator", "module": "Schools", "name": "Grading Scale Interval", @@ -119,5 +119,6 @@ "read_only_onload": 0, "sort_field": "modified", "sort_order": "DESC", + "track_changes": 1, "track_seen": 0 } \ No newline at end of file