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

[minor] fixes to schools

Browse Source
This commit is contained in:
Rushabh Mehta 2017-02-06 14:28:40 +05:30
parent 259489572d
commit 50862039dc
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/schools/doctype/assessment_criteria/assessment_criteria.json
View File

@ -22,7 +22,6 @@
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Assessment Criteria", "label": "Assessment Criteria",
@ -42,7 +41,7 @@
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 1,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "assessment_criteria_group", "fieldname": "assessment_criteria_group",
@ -50,7 +49,6 @@
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Assessment Criteria Group", "label": "Assessment Criteria Group",
@ -80,7 +78,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-01 17:41:48.994388", "modified": "2017-02-03 05:53:39.248759",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Schools", "module": "Schools",
"name": "Assessment Criteria", "name": "Assessment Criteria",

5
erpnext/schools/doctype/grading_scale/grading_scale.py
View File

@ -5,6 +5,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import cint
from frappe.model.document import Document from frappe.model.document import Document
class GradingScale(Document): class GradingScale(Document):
@ -12,8 +13,8 @@ class GradingScale(Document):
thresholds = [] thresholds = []
for d in self.intervals: for d in self.intervals:
if d.threshold in thresholds: if d.threshold in thresholds:
frappe.throw(_("Treshold {0}% appears more than once.".format(d.threshold))) frappe.throw(_("Treshold {0}% appears more than once".format(d.threshold)))
else: else:
thresholds.append(d.threshold) thresholds.append(cint(d.threshold))
if 0 not in thresholds: if 0 not in thresholds:
frappe.throw(_("Please define grade for treshold 0%")) frappe.throw(_("Please define grade for treshold 0%"))

15
erpnext/schools/doctype/student/student.py
View File

@ -5,9 +5,9 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe.model.document import Document from frappe.model.document import Document
from frappe import _
class Student(Document): class Student(Document):
def validate(self): def validate(self):
self.title = " ".join(filter(None, [self.first_name, self.middle_name, self.last_name])) self.title = " ".join(filter(None, [self.first_name, self.middle_name, self.last_name]))
@ -19,7 +19,7 @@ class Student(Document):
"""Validates if the Student Applicant is Unique""" """Validates if the Student Applicant is Unique"""
student = frappe.db.sql("select name from `tabStudent` where student_applicant=%s and name!=%s", (self.student_applicant, self.name)) student = frappe.db.sql("select name from `tabStudent` where student_applicant=%s and name!=%s", (self.student_applicant, self.name))
if student: if student:
frappe.throw("Student {0} exist against student applicant {1}".format(student[0][0], self.student_applicant)) frappe.throw(_("Student {0} exist against student applicant {1}").format(student[0][0], self.student_applicant))
def update_applicant_status(self): def update_applicant_status(self):
"""Updates Student Applicant status to Admitted""" """Updates Student Applicant status to Admitted"""
@ -28,10 +28,9 @@ class Student(Document):
def get_timeline_data(doctype, name): def get_timeline_data(doctype, name):
'''Return timeline for attendance''' '''Return timeline for attendance'''
return dict(frappe.db.sql('''select unix_timestamp(cs.schedule_date), count(*) return dict(frappe.db.sql('''select unix_timestamp(`date`), count(*)
from `tabCourse Schedule` as cs , `tabStudent Attendance` as sa where from `tabStudent Attendance` where
sa.course_schedule = cs.name student=%s
and sa.student=%s and `date` > date_sub(curdate(), interval 1 year)
and cs.schedule_date > date_sub(curdate(), interval 1 year)
and status = 'Present' and status = 'Present'
group by cs.schedule_date''', name)) group by date''', name))