From e4903b77b6435838a8442f9ae6bcbd1ca3a015c3 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 13 Feb 2017 19:40:27 +0530 Subject: [PATCH] Added New Doctype - Assessment Code --- erpnext/config/schools.py | 3 +- erpnext/public/css/website.css | 6 +- .../doctype/assessment_code/__init__.py | 0 .../assessment_code/assessment_code.js | 8 ++ .../assessment_code/assessment_code.json | 89 ++++++++++++++ .../assessment_code/assessment_code.py | 10 ++ .../assessment_code/test_assessment_code.py | 12 ++ .../assessment_group/assessment_group.js | 4 +- .../assessment_group/assessment_group.json | 109 ++++++++++++++++-- .../assessment_group/assessment_group_tree.js | 3 + .../assessment_plan/assessment_plan.json | 5 +- 11 files changed, 229 insertions(+), 20 deletions(-) create mode 100644 erpnext/schools/doctype/assessment_code/__init__.py create mode 100644 erpnext/schools/doctype/assessment_code/assessment_code.js create mode 100644 erpnext/schools/doctype/assessment_code/assessment_code.json create mode 100644 erpnext/schools/doctype/assessment_code/assessment_code.py create mode 100644 erpnext/schools/doctype/assessment_code/test_assessment_code.py create mode 100644 erpnext/schools/doctype/assessment_group/assessment_group_tree.js diff --git a/erpnext/config/schools.py b/erpnext/config/schools.py index e95b73495c..b1e0472f62 100644 --- a/erpnext/config/schools.py +++ b/erpnext/config/schools.py @@ -116,7 +116,8 @@ def get_data(): }, { "type": "doctype", - "name": "Assessment Group" + "name": "Assessment Group", + "link": "Tree/Assessment Group", }, { "type": "doctype", diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css index 4f419377b0..0370dd023b 100644 --- a/erpnext/public/css/website.css +++ b/erpnext/public/css/website.css @@ -254,7 +254,7 @@ display: inline-block; color: white; background: #8FD288; - padding: 2px; + padding: 3px; } .duration-invisible { visibility: hidden; @@ -269,5 +269,5 @@ border: none; } .bom-spec { - margin-bottom: 20px; -} \ No newline at end of file + margin-bottom: 20px; +} diff --git a/erpnext/schools/doctype/assessment_code/__init__.py b/erpnext/schools/doctype/assessment_code/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/schools/doctype/assessment_code/assessment_code.js b/erpnext/schools/doctype/assessment_code/assessment_code.js new file mode 100644 index 0000000000..143791b8a8 --- /dev/null +++ b/erpnext/schools/doctype/assessment_code/assessment_code.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('Assessment Code', { + refresh: function(frm) { + + } +}); diff --git a/erpnext/schools/doctype/assessment_code/assessment_code.json b/erpnext/schools/doctype/assessment_code/assessment_code.json new file mode 100644 index 0000000000..d3acf7a910 --- /dev/null +++ b/erpnext/schools/doctype/assessment_code/assessment_code.json @@ -0,0 +1,89 @@ +{ + "allow_copy": 0, + "allow_import": 1, + "allow_rename": 1, + "autoname": "field:assessment_code", + "beta": 0, + "creation": "2017-02-13 19:33:43.843028", + "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": "assessment_code", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Assessment Code", + "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-13 19:33:47.037170", + "modified_by": "Administrator", + "module": "Schools", + "name": "Assessment Code", + "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, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 0, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/schools/doctype/assessment_code/assessment_code.py b/erpnext/schools/doctype/assessment_code/assessment_code.py new file mode 100644 index 0000000000..175564e04e --- /dev/null +++ b/erpnext/schools/doctype/assessment_code/assessment_code.py @@ -0,0 +1,10 @@ +# -*- 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 AssessmentCode(Document): + pass diff --git a/erpnext/schools/doctype/assessment_code/test_assessment_code.py b/erpnext/schools/doctype/assessment_code/test_assessment_code.py new file mode 100644 index 0000000000..d6ccb8f57d --- /dev/null +++ b/erpnext/schools/doctype/assessment_code/test_assessment_code.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('Assessment Code') + +class TestAssessmentCode(unittest.TestCase): + pass diff --git a/erpnext/schools/doctype/assessment_group/assessment_group.js b/erpnext/schools/doctype/assessment_group/assessment_group.js index 8847472dd9..6be51023ab 100644 --- a/erpnext/schools/doctype/assessment_group/assessment_group.js +++ b/erpnext/schools/doctype/assessment_group/assessment_group.js @@ -2,7 +2,7 @@ // For license information, please see license.txt frappe.ui.form.on('Assessment Group', { - refresh: function(frm) { - + onload: function(frm) { + frm.list_route = "Tree/Assessment Group"; } }); diff --git a/erpnext/schools/doctype/assessment_group/assessment_group.json b/erpnext/schools/doctype/assessment_group/assessment_group.json index de057eab00..55b5ee7324 100644 --- a/erpnext/schools/doctype/assessment_group/assessment_group.json +++ b/erpnext/schools/doctype/assessment_group/assessment_group.json @@ -44,15 +44,15 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "assessment_group_code", - "fieldtype": "Data", + "fieldname": "is_group", + "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Assessment Group Code", + "label": "Is Group", "length": 0, "no_copy": 0, "permlevel": 0, @@ -62,7 +62,7 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 1, + "reqd": 0, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -72,9 +72,9 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "column_break_3", - "fieldtype": "Column Break", - "hidden": 0, + "fieldname": "section_break_2", + "fieldtype": "Section Break", + "hidden": 1, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, @@ -99,7 +99,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "academic_term", + "fieldname": "parent_assessment_group", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, @@ -107,10 +107,10 @@ "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Academic Term", + "label": "Parent Assessment Group", "length": 0, "no_copy": 0, - "options": "Academic Term", + "options": "Assessment Group", "permlevel": 0, "precision": "", "print_hide": 0, @@ -118,7 +118,92 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "lft", + "fieldtype": "Int", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "lft", + "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": "rgt", + "fieldtype": "Int", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "rgt", + "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": "old_parent", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "old_parent", + "length": 0, + "no_copy": 0, + "options": "Assessment Group", + "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 @@ -134,7 +219,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-02-13 19:31:27.827069", + "modified": "2017-02-15 12:44:47.198945", "modified_by": "Administrator", "module": "Schools", "name": "Assessment Group", diff --git a/erpnext/schools/doctype/assessment_group/assessment_group_tree.js b/erpnext/schools/doctype/assessment_group/assessment_group_tree.js new file mode 100644 index 0000000000..e4676831a3 --- /dev/null +++ b/erpnext/schools/doctype/assessment_group/assessment_group_tree.js @@ -0,0 +1,3 @@ +frappe.treeview_settings["Assessment Group"] = { + +} \ No newline at end of file diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.json b/erpnext/schools/doctype/assessment_plan/assessment_plan.json index bf1f2c29ab..a5bcc705c5 100644 --- a/erpnext/schools/doctype/assessment_plan/assessment_plan.json +++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.json @@ -47,7 +47,7 @@ "collapsible": 0, "columns": 0, "fieldname": "assessment_code", - "fieldtype": "Data", + "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -58,6 +58,7 @@ "label": "Assessment Code", "length": 0, "no_copy": 0, + "options": "Assessment Code", "permlevel": 0, "precision": "", "print_hide": 0, @@ -727,7 +728,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-02-17 17:15:26.824469", + "modified": "2017-02-13 19:34:09.724549", "modified_by": "Administrator", "module": "Schools", "name": "Assessment Plan",