From 47aba953e2a6efc9a4a60630a11e1b9aa486beef Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Tue, 21 Feb 2017 15:22:52 +0530 Subject: [PATCH] Added student language doctype --- .../assessment_result/assessment_result.json | 59 +++++++++++- .../student_attendance_tool.py | 2 +- .../doctype/student_language/__init__.py | 0 .../student_language/student_language.js | 8 ++ .../student_language/student_language.json | 92 +++++++++++++++++++ .../student_language/student_language.py | 12 +++ .../student_language/test_student_language.py | 12 +++ .../student_applicant/student_applicant.json | 3 +- 8 files changed, 185 insertions(+), 3 deletions(-) create mode 100644 erpnext/schools/doctype/student_language/__init__.py create mode 100644 erpnext/schools/doctype/student_language/student_language.js create mode 100644 erpnext/schools/doctype/student_language/student_language.json create mode 100644 erpnext/schools/doctype/student_language/student_language.py create mode 100644 erpnext/schools/doctype/student_language/test_student_language.py diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.json b/erpnext/schools/doctype/assessment_result/assessment_result.json index 87f4f44685..d56c941ae9 100644 --- a/erpnext/schools/doctype/assessment_result/assessment_result.json +++ b/erpnext/schools/doctype/assessment_result/assessment_result.json @@ -361,6 +361,63 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_13", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "comment", + "fieldtype": "Long Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Comment", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -401,7 +458,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-02-20 13:20:51.700918", + "modified": "2017-02-21 08:03:46.054604", "modified_by": "Administrator", "module": "Schools", "name": "Assessment Result", diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py index 54b0293c6f..073474769d 100644 --- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py +++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py @@ -38,5 +38,5 @@ def get_student_attendance_records(based_on, date=None, student_batch=None, cour for student in student_list: if student.student == attendance.student: student.status = attendance.status - print student_list + return student_list \ No newline at end of file diff --git a/erpnext/schools/doctype/student_language/__init__.py b/erpnext/schools/doctype/student_language/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/schools/doctype/student_language/student_language.js b/erpnext/schools/doctype/student_language/student_language.js new file mode 100644 index 0000000000..6239ed1e44 --- /dev/null +++ b/erpnext/schools/doctype/student_language/student_language.js @@ -0,0 +1,8 @@ +// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Student Language', { + refresh: function(frm) { + + } +}); diff --git a/erpnext/schools/doctype/student_language/student_language.json b/erpnext/schools/doctype/student_language/student_language.json new file mode 100644 index 0000000000..b9de961e7e --- /dev/null +++ b/erpnext/schools/doctype/student_language/student_language.json @@ -0,0 +1,92 @@ +{ + "allow_copy": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "", + "beta": 0, + "creation": "2017-02-21 01:55:00.366273", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "student_language", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Student Language", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "in_dialog": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-02-21 02:23:47.196351", + "modified_by": "Administrator", + "module": "Schools", + "name": "Student Language", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Academics User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/schools/doctype/student_language/student_language.py b/erpnext/schools/doctype/student_language/student_language.py new file mode 100644 index 0000000000..748b9fd276 --- /dev/null +++ b/erpnext/schools/doctype/student_language/student_language.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class StudentLanguage(Document): + + def validate(self): + self.name = self.student_language diff --git a/erpnext/schools/doctype/student_language/test_student_language.py b/erpnext/schools/doctype/student_language/test_student_language.py new file mode 100644 index 0000000000..592b94a4fc --- /dev/null +++ b/erpnext/schools/doctype/student_language/test_student_language.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +# test_records = frappe.get_test_records('Student Language') + +class TestStudentLanguage(unittest.TestCase): + pass diff --git a/erpnext/schools/web_form/student_applicant/student_applicant.json b/erpnext/schools/web_form/student_applicant/student_applicant.json index 1feb1596c5..f87a147dde 100644 --- a/erpnext/schools/web_form/student_applicant/student_applicant.json +++ b/erpnext/schools/web_form/student_applicant/student_applicant.json @@ -16,7 +16,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2017-02-12 01:28:57.997942", + "modified": "2017-02-21 04:44:46.022738", "modified_by": "Administrator", "module": "Schools", "name": "student-applicant", @@ -133,6 +133,7 @@ "reqd": 0 }, { + "default": "INDIAN", "fieldname": "nationality", "fieldtype": "Data", "hidden": 0,