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

renamed 'active' in Student Batch to 'enabled'

Browse Source
This commit is contained in:
Neil Trini Lasrado 2016-12-01 13:28:21 +05:30
parent c6e74680ee
commit 19e8bd2221
14 changed files with 313 additions and 395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
erpnext/schools/doctype/assessment/assessment.js
View File

@ -6,19 +6,9 @@ cur_frm.add_fetch("examiner", "instructor_name", "examiner_name");
cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name");
cur_frm.add_fetch("student", "title", "student_name");
frappe.ui.form.on("Assessment" ,{
onload: function(frm){
cur_frm.set_query("student_batch", function(){
return{
"filters": {
"active": 1
}
};
});
},
student_group : function(frm) {
frm.set_value("results" ,"");
frappe.ui.form.on("Assessment", {
student_group: function(frm) {
frm.set_value("results", "");
if (frm.doc.student_group) {
frappe.call({
method: "erpnext.schools.api.get_student_group_students",
@ -40,18 +30,18 @@ frappe.ui.form.on("Assessment" ,{
}
});
frappe.ui.form.on("Assessment Result" ,{
result : function(frm, cdt, cdn) {
if(frm.doc.grading_structure){
frappe.ui.form.on("Assessment Result", {
result: function(frm, cdt, cdn) {
if (frm.doc.grading_structure) {
var assessment_result = locals[cdt][cdn];
frappe.call({
method:"erpnext.schools.doctype.assessment.assessment.get_grade",
args:{
method: "erpnext.schools.doctype.assessment.assessment.get_grade",
args: {
grading_structure: frm.doc.grading_structure,
result: assessment_result.result
},
callback: function(r){
if(r.message){
callback: function(r) {
if (r.message) {
frappe.model.set_value(cdt, cdn, 'grade', r.message);
}
}

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

@ -6,15 +6,11 @@ from __future__ import unicode_literals
from frappe.model.document import Document
import frappe
from frappe import _
from erpnext.schools.doctype.student_batch.student_batch import validate_active_student_batch
class Assessment(Document):
def validate(self):
self.validate_overlap()
if self.student_batch:
validate_active_student_batch(self.student_batch)
def validate_overlap(self):
"""Validates overlap for Student Group/Student Batch, Instructor, Room"""

35
erpnext/schools/doctype/course_schedule/course_schedule.js
View File

@ -1,6 +1,6 @@
frappe.provide("schools")
frappe.ui.form.on("Course Schedule" ,{
frappe.ui.form.on("Course Schedule", {
onload: function(frm) {
if (frm.doc.from_datetime && frm.doc.to_datetime) {
var from_datetime = moment(frm.doc.from_datetime);
@ -9,29 +9,20 @@ frappe.ui.form.on("Course Schedule" ,{
frm.doc.from_time = from_datetime.format("HH:mm:ss");
frm.doc.to_time = to_datetime.format("HH:mm:ss");
}
cur_frm.set_query("student_batch", function(){
return{
"filters": {
"active": 1
}
};
});
},
refresh :function(frm) {
if(!frm.doc.__islocal && frm.doc.student_group) {
refresh: function(frm) {
if (!frm.doc.__islocal && frm.doc.student_group) {
frappe.call({
method: "erpnext.schools.api.check_attendance_records_exist",
args: {
"course_schedule": frm.doc.name
},
callback: function(r) {
if(r.message) {
if (r.message) {
hide_field('attendance');
frm.events.view_attendance(frm)
}
else {
} else {
frappe.call({
method: "erpnext.schools.api.get_student_group_students",
args: {
@ -46,8 +37,7 @@ frappe.ui.form.on("Course Schedule" ,{
}
}
});
}
else {
} else {
hide_field('attendance');
}
},
@ -63,7 +53,7 @@ frappe.ui.form.on("Course Schedule" ,{
},
get_students: function(frm, students) {
if(!frm.students_area) {
if (!frm.students_area) {
frm.students_area = $('<div>')
.appendTo(frm.fields_dict.students_html.wrapper);
}
@ -91,7 +81,7 @@ schools.StudentsEditor = Class.extend({
.html(__('Check all'))
.on("click", function() {
$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
if(!$(check).is(":checked")) {
if (!$(check).is(":checked")) {
check.checked = true;
}
});
@ -101,7 +91,7 @@ schools.StudentsEditor = Class.extend({
.html(__('Uncheck all'))
.on("click", function() {
$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
if($(check).is(":checked")) {
if ($(check).is(":checked")) {
check.checked = false;
}
});
@ -113,10 +103,9 @@ schools.StudentsEditor = Class.extend({
var students_present = [];
var students_absent = [];
$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
if($(check).is(":checked")) {
if ($(check).is(":checked")) {
students_present.push(students[i]);
}
else {
} else {
students_absent.push(students[i]);
}
});
@ -139,7 +128,7 @@ schools.StudentsEditor = Class.extend({
<div class="checkbox">\
<label><input type="checkbox" class="students-check" student="%(student)s">\
%(student)s</label>\
</div></div>', {student: m.student_name})).appendTo(me.wrapper);
</div></div>', { student: m.student_name })).appendTo(me.wrapper);
});
}
})

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

@ -6,7 +6,6 @@ from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.model.document import Document
from erpnext.schools.doctype.student_batch.student_batch import validate_active_student_batch
class CourseSchedule(Document):
def validate(self):
@ -18,9 +17,6 @@ class CourseSchedule(Document):
self.validate_date()
self.validate_overlap()
if self.student_batch:
validate_active_student_batch(self.student_batch)
def set_title(self):
"""Set document Title"""
self.title = self.course + " by " + (self.instructor_name if self.instructor_name else self.instructor)

12
erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
View File

@ -14,18 +14,8 @@ frappe.ui.form.on("Course Scheduling Tool", {
frm.page.set_primary_action(__("Schedule Course"), function() {
frappe.call({
method: "schedule_course",
doc:frm.doc
doc: frm.doc
})
});
},
onload: function(frm){
cur_frm.set_query("student_batch", function(){
return{
"filters": {
"active": 1
}
};
});
}
});

14
erpnext/schools/doctype/student_attendance/student_attendance.js
View File

@ -2,16 +2,4 @@
// For license information, please see license.txt
cur_frm.add_fetch("course_schedule", "schedule_date", "date");
cur_frm.add_fetch("course_schedule", "student_batch", "student_batch");
frappe.ui.form.on('Student Attendance', {
onload: function(frm){
cur_frm.set_query("student_batch", function(){
return{
"filters": {
"active": 1
}
};
});
}
});
cur_frm.add_fetch("course_schedule", "student_batch", "student_batch")

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

@ -6,7 +6,6 @@ from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
from frappe import _
from erpnext.schools.doctype.student_batch.student_batch import validate_active_student_batch
class StudentAttendance(Document):
def validate(self):
@ -14,9 +13,6 @@ class StudentAttendance(Document):
self.validate_mandatory()
self.validate_duplication()
if self.student_batch:
validate_active_student_batch(self.student_batch)
def validate_date(self):
if self.course_schedule:
self.date = frappe.db.get_value("Course Schedule", self.course_schedule, "schedule_date")

4
erpnext/schools/doctype/student_batch/student_batch.json
View File

@ -76,7 +76,7 @@
"collapsible": 0,
"columns": 0,
"default": "1",
"fieldname": "active",
"fieldname": "enabled",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
@ -309,7 +309,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2016-12-01 12:56:51.727827",
"modified": "2016-12-01 13:18:12.024001",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Batch",

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

@ -6,7 +6,6 @@ from __future__ import unicode_literals
from frappe.model.document import Document
from erpnext.schools.utils import validate_duplicate_student
import frappe
from frappe import _
class StudentBatch(Document):
def autoname(self):
@ -17,7 +16,3 @@ class StudentBatch(Document):
def validate(self):
validate_duplicate_student(self.students)
def validate_active_student_batch(student_batch):
if not frappe.db.get_value("Student Batch", student_batch, "active"):
frappe.throw(_("Student Batch is not Active."))

32
erpnext/schools/doctype/student_batch_attendance_tool/student_batch_attendance_tool.js
View File

@ -8,18 +8,8 @@ frappe.ui.form.on('Student Batch Attendance Tool', {
hide_field('attendance');
},
onload: function(frm){
cur_frm.set_query("student_batch", function(){
return{
"filters": {
"active": 1
}
};
});
},
student_batch :function(frm) {
if(frm.doc.student_batch && frm.doc.date) {
student_batch: function(frm) {
if (frm.doc.student_batch && frm.doc.date) {
frappe.call({
method: "erpnext.schools.api.check_attendance_records_exist",
args: {
@ -27,11 +17,10 @@ frappe.ui.form.on('Student Batch Attendance Tool', {
"date": frm.doc.date
},
callback: function(r) {
if(r.message) {
if (r.message) {
frappe.msgprint("Attendance already marked.");
hide_field('attendance');
}
else {
} else {
frappe.call({
method: "erpnext.schools.api.get_student_batch_students",
args: {
@ -55,7 +44,7 @@ frappe.ui.form.on('Student Batch Attendance Tool', {
},
get_students: function(frm, students) {
if(!frm.students_area) {
if (!frm.students_area) {
frm.students_area = $('<div>')
.appendTo(frm.fields_dict.students_html.wrapper);
}
@ -83,7 +72,7 @@ schools.StudentsEditor = Class.extend({
.html(__('Check all'))
.on("click", function() {
$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
if(!$(check).is(":checked")) {
if (!$(check).is(":checked")) {
check.checked = true;
}
});
@ -93,7 +82,7 @@ schools.StudentsEditor = Class.extend({
.html(__('Uncheck all'))
.on("click", function() {
$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
if($(check).is(":checked")) {
if ($(check).is(":checked")) {
check.checked = false;
}
});
@ -105,10 +94,9 @@ schools.StudentsEditor = Class.extend({
var students_present = [];
var students_absent = [];
$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
if($(check).is(":checked")) {
if ($(check).is(":checked")) {
students_present.push(students[i]);
}
else {
} else {
students_absent.push(students[i]);
}
});
@ -132,7 +120,7 @@ schools.StudentsEditor = Class.extend({
<div class="checkbox">\
<label><input type="checkbox" class="students-check" student="%(student)s">\
%(student)s</label>\
</div></div>', {student: m.student_name})).appendTo(me.wrapper);
</div></div>', { student: m.student_name })).appendTo(me.wrapper);
});
}
});

18
erpnext/schools/doctype/student_group/student_group.js
View File

@ -2,7 +2,7 @@ cur_frm.add_fetch("student", "title", "student_name");
frappe.ui.form.on("Student Group", {
refresh: function(frm) {
if(!frm.doc.__islocal) {
if (!frm.doc.__islocal) {
frm.add_custom_button(__("Course Schedule"), function() {
frappe.route_options = {
student_group: frm.doc.name
@ -19,19 +19,11 @@ frappe.ui.form.on("Student Group", {
}
},
onload: function(frm){
cur_frm.set_query("academic_term",function(){
return{
"filters":{
"academic_year": (frm.doc.academic_year)
}
};
});
cur_frm.set_query("student_batch", function(){
return{
onload: function(frm) {
cur_frm.set_query("academic_term", function() {
return {
"filters": {
"active": 1
"academic_year": (frm.doc.academic_year)
}
};
});

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

@ -7,7 +7,6 @@ import frappe
from frappe.model.document import Document
from frappe import _
from erpnext.schools.utils import validate_duplicate_student
from erpnext.schools.doctype.student_batch.student_batch import validate_active_student_batch
class StudentGroup(Document):
def autoname(self):
@ -32,9 +31,6 @@ class StudentGroup(Document):
self.validate_student_name()
validate_duplicate_student(self.students)
if self.student_batch:
validate_active_student_batch(self.student_batch)
def validate_strength(self):
if self.max_strength and len(self.students) > self.max_strength:
frappe.throw(_("""Cannot enroll more than {0} students for this student group.""").format(self.max_strength))

5
erpnext/schools/report/absent_student_report/absent_student_report.json
View File

@ -2,16 +2,17 @@
"add_total_row": 0,
"apply_user_permissions": 1,
"creation": "2013-05-13 14:04:03",
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
"idx": 1,
"is_standard": "Yes",
"modified": "2014-06-03 07:18:17.181332",
"modified": "2016-12-01 14:28:27.184668",
"modified_by": "Administrator",
"module": "Schools",
"name": "Absent Student Report",
"owner": "Administrator",
"ref_doctype": "Attendance",
"ref_doctype": "Student Attendance",
"report_name": "Absent Student Report",
"report_type": "Script Report"
}

5
erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
View File

@ -2,16 +2,17 @@
"add_total_row": 0,
"apply_user_permissions": 1,
"creation": "2013-05-13 14:04:03",
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
"idx": 1,
"is_standard": "Yes",
"modified": "2014-06-03 07:18:17.181332",
"modified": "2016-12-01 14:29:53.547378",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Monthly Attendance Sheet",
"owner": "Administrator",
"ref_doctype": "Attendance",
"ref_doctype": "Student Attendance",
"report_name": "Student Monthly Attendance Sheet",
"report_type": "Script Report"
}