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

[minor] removed whitespaces from get_students method

Browse Source
This commit is contained in:
Makarand Bauskar 2017-06-29 09:25:19 +05:30 committed by GitHub
parent 3959c7c3c1
commit af00c9f70b
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/schools/doctype/program_enrollment/program_enrollment.py
View File

@ -83,15 +83,28 @@ def get_program_courses(doctype, txt, searchfield, start, page_len, filters):
def get_students(doctype, txt, searchfield, start, page_len, filters): def get_students(doctype, txt, searchfield, start, page_len, filters):
if not filters.get("academic_term"): if not filters.get("academic_term"):
filters["academic_term"] = frappe.defaults.get_defaults().academic_term filters["academic_term"] = frappe.defaults.get_defaults().academic_term
if not filters.get("academic_year"): if not filters.get("academic_year"):
filters["academic_year"] = frappe.defaults.get_defaults().academic_year filters["academic_year"] = frappe.defaults.get_defaults().academic_year
enrolled_students = frappe.get_list("Program Enrollment", fields=["student"], filters=
{"academic_term": filters.get('academic_term'), "academic_year": filters.get('academic_year')}) enrolled_students = frappe.get_list("Program Enrollment", filters={
"academic_term": filters.get('academic_term'),
"academic_year": filters.get('academic_year')
}, fields=["student"])
students = [d.student for d in enrolled_students] if enrolled_students else [""] students = [d.student for d in enrolled_students] if enrolled_students else [""]
return frappe.db.sql("""select name, title from tabStudent
where name not in (%s) return frappe.db.sql("""select
and `%s` LIKE %s name, title from tabStudent
order by idx desc, name where
limit %s, %s""" % name not in (%s)
(", ".join(['%s']*len(students)), searchfield, "%s", "%s", "%s"), and
tuple(students + ["%%%s%%" % txt, start, page_len])) `%s` LIKE %s
order by
idx desc, name
limit %s, %s"""%(
", ".join(['%s']*len(students)), searchfield, "%s", "%s", "%s"),
tuple(students + ["%%%s%%" % txt, start, page_len]
)
)