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

minor fix

Browse Source
This commit is contained in:
Nabin Hait 2017-02-22 13:05:46 +05:30
parent 1e3a0b4632
commit 08847bd06a
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/schools/api.py
View File

@ -74,15 +74,15 @@ def make_attendance_records(student, student_name, status, course_schedule=None,
:param course_schedule: Course Schedule. :param course_schedule: Course Schedule.
:param status: Status (Present/Absent) :param status: Status (Present/Absent)
""" """
student_attendance = frappe.db.get_value("Student Attendance", filters = { student_attendance_list = frappe.get_list("Student Attendance", fields = ['name'], filters = {
"student": student, "student": student,
"course_schedule": course_schedule, "course_schedule": course_schedule,
"student_batch": student_batch, "student_batch": student_batch,
"date": date "date": date
}) })
if student_attendance: if student_attendance_list:
student_attendance = frappe.get_doc("Student Attendance", student_attendance) student_attendance = frappe.get_doc("Student Attendance", student_attendance_list[0])
else: else:
student_attendance = frappe.new_doc("Student Attendance") student_attendance = frappe.new_doc("Student Attendance")
student_attendance.student = student student_attendance.student = student

2
erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
View File

@ -121,7 +121,7 @@ schools.StudentsEditor = Class.extend({
return !stud.disabled && !stud.checked; return !stud.disabled && !stud.checked;
}); });
frappe.confirm(__("Do you want to save attendance?<br>Present: {0}\ frappe.confirm(__("Do you want to update attendance?<br>Present: {0}\
<br>Absent: {1}", [students_present.length, students_absent.length]), function() { <br>Absent: {1}", [students_present.length, students_absent.length]), function() {
frappe.call({ frappe.call({
method: "erpnext.schools.api.mark_attendance", method: "erpnext.schools.api.mark_attendance",

8
erpnext/schools/doctype/student_language/student_language.json
View File

@ -2,7 +2,7 @@
"allow_copy": 0, "allow_copy": 0,
"allow_import": 0, "allow_import": 0,
"allow_rename": 0, "allow_rename": 0,
"autoname": "", "autoname": "field:language_name",
"beta": 0, "beta": 0,
"creation": "2017-02-21 01:55:00.366273", "creation": "2017-02-21 01:55:00.366273",
"custom": 0, "custom": 0,
@ -17,7 +17,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "student_language", "fieldname": "language_name",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
@ -26,7 +26,7 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Student Language", "label": "Language Name",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
@ -52,7 +52,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-21 02:23:47.196351", "modified": "2017-02-22 13:03:48.600707",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Schools", "module": "Schools",
"name": "Student Language", "name": "Student Language",

4
erpnext/schools/doctype/student_language/student_language.py
View File

@ -7,6 +7,4 @@ import frappe
from frappe.model.document import Document from frappe.model.document import Document
class StudentLanguage(Document): class StudentLanguage(Document):
pass
def validate(self):
self.name = self.student_language