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

chnages in the assessment report

Browse Source
This commit is contained in:
Manas Solanki 2017-07-11 23:02:24 +05:30
parent 860144feb7
commit 79ed58fd36
2 changed files with 121 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/schools/doctype/assessment_plan/assessment_plan.js
View File

@ -4,6 +4,7 @@
cur_frm.add_fetch("student_group", "course", "course");
cur_frm.add_fetch("examiner", "instructor_name", "examiner_name");
cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name");
cur_frm.add_fetch("course", "default_grading_scale", "grading_scale");
frappe.ui.form.on("Assessment Plan", {
onload: function(frm) {

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

@ -4,9 +4,14 @@
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import flt
from collections import defaultdict
from erpnext.schools.api import get_grade
def execute(filters=None):
data = []
args = frappe._dict()
args["assessment_group"] = filters.get("assessment_group")
if args["assessment_group"] == "All Assessment Groups":
@ -14,15 +19,18 @@ def execute(filters=None):
args["course"] = filters.get("course")
args["student_group"] = filters.get("student_group")
# find all assessment plan and related details linked with the given filters
def get_assessment_details():
if args["student_group"]:
cond = "and ap.student_group=%(student_group)s"
else:
cond = ''
# find all assessment plan linked with the filters provided
assessment_plan = frappe.db.sql('''
select
ap.name, ap.student_group, apc.assessment_criteria, apc.maximum_score as max_score
ap.name, ap.student_group, ap.grading_scale, apc.assessment_criteria, apc.maximum_score as max_score
from
`tabAssessment Plan` ap, `tabAssessment Plan Criteria` apc
where
@ -31,27 +39,62 @@ def execute(filters=None):
order by
apc.assessment_criteria'''.format(cond), (args), as_dict=1)
assessment_plan_list = set([d["name"] for d in assessment_plan])
assessment_plan_list = list(set([d["name"] for d in assessment_plan]))
if not assessment_plan_list:
frappe.throw(_("No assessment plan linked with this assessment group"))
student_group_list = set([d["student_group"] for d in assessment_plan])
assessment_criteria_list = list(set([(d["assessment_criteria"],d["max_score"]) for d in assessment_plan]))
student_group_list = list(set([d["student_group"] for d in assessment_plan]))
total_maximum_score = flt(sum([flt(d[1]) for d in assessment_criteria_list]))
grading_scale = assessment_plan[0]["grading_scale"]
return assessment_plan_list, assessment_criteria_list, total_maximum_score, grading_scale, student_group_list
# get all the result and make a dict map student as the key and value as dict of result
def get_result_map():
result_dict = defaultdict(dict)
kounter = defaultdict(dict)
assessment_result = frappe.db.sql('''select ar.student, ard.assessment_criteria, ard.grade, ard.score
from `tabAssessment Result` ar, `tabAssessment Result Detail` ard
where ar.assessment_plan in (%s) and ar.name=ard.parent and ar.docstatus=1
order by ard.assessment_criteria''' %', '.join(['%s']*len(assessment_plan_list)),
tuple(assessment_plan_list), as_dict=1)
tuple(assessment_plan_list), as_dict=1, debug=True)
result_dict = defaultdict(dict)
kounter = defaultdict(dict)
for result in assessment_result:
result_dict[result.student].update({frappe.scrub(result.assessment_criteria): result.grade,
frappe.scrub(result.assessment_criteria)+"_score": result.score})
if "total_score" in result_dict[result.student]:
total_score = result_dict[result.student]["total_score"] + result.score
else:
total_score = result.score
total = get_grade(grading_scale, (total_score/total_maximum_score)*100)
if result.grade in kounter[result.assessment_criteria]:
kounter[result.assessment_criteria][result.grade] += 1
else:
kounter[result.assessment_criteria].update({result.grade: 1})
if "Total" not in kounter:
kounter["Total"] = {}
if "total" in result_dict[result.student]:
prev_grade = result_dict[result.student]["total"]
prev_grade_count = kounter["Total"].get(prev_grade) - 1
kounter["Total"].update({prev_grade: prev_grade_count})
latest_grade_count = kounter["Total"].get(total)+1 if kounter["Total"].get(total) else 1
kounter["Total"].update({total: latest_grade_count})
result_dict[result.student].update({
frappe.scrub(result.assessment_criteria): result.grade,
frappe.scrub(result.assessment_criteria)+"_score": result.score,
"total_score": total_score,
"total": total
})
print (kounter)
return result_dict, kounter
# make data from the result dict
def get_data():
student_list = frappe.db.sql('''select sgs.student, sgs.student_name
from `tabStudent Group` sg, `tabStudent Group Student` sgs
where sg.name = sgs.parent and sg.name in (%s)
@ -60,19 +103,33 @@ def execute(filters=None):
for student in student_list:
student.update(result_dict[student.student])
data = student_list
return student_list
columns = get_column(list(set([(d["assessment_criteria"],d["max_score"]) for d in assessment_plan])))
# get chart data
def get_chart():
grading_scale = frappe.db.get_value("Assessment Plan", list(assessment_plan_list)[0], "grading_scale")
grades = frappe.db.sql_list('''select grade_code from `tabGrading Scale Interval` where parent=%s''',
(grading_scale))
assessment_criteria_list = list(set([d["assessment_criteria"] for d in assessment_plan]))
chart = get_chart_data(grades, assessment_criteria_list, kounter)
criteria_list = [d[0] for d in assessment_criteria_list] + ["Total"]
print (criteria_list)
return get_chart_data(grades, criteria_list, kounter)
assessment_plan_list, assessment_criteria_list, total_maximum_score, grading_scale,\
student_group_list = get_assessment_details()
result_dict, kounter = get_result_map()
print (kounter)
data = get_data()
print (assessment_criteria_list)
columns = get_column(assessment_criteria_list, total_maximum_score)
chart = get_chart()
print (chart)
return columns, data, None, chart
def get_column(assessment_criteria):
def get_column(assessment_criteria, total_maximum_score):
columns = [{
"fieldname": "student",
"label": _("Student ID"),
@ -99,6 +156,20 @@ def get_column(assessment_criteria):
"fieldtype": "Float",
"width": 100
})
columns += [{
"fieldname": "total",
"label": "Total",
"fieldtype": "Data",
"width": 100
},
{
"fieldname": "total_score",
"label": "Total Score("+ str(int(total_maximum_score)) + ")",
"fieldtype": "Float",
"width": 110
}]
return columns
def get_chart_data(grades, assessment_criteria_list, kounter):