From 214e6906e5b7f25188446a39d72ce10493b6aa67 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Wed, 7 Jun 2017 11:53:41 +0530 Subject: [PATCH] Addition of field 'group based on' in the student attendance tool (#9152) --- .../student_attendance_tool.js | 10 ++++++ .../student_attendance_tool.json | 35 ++++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js index 6f8c6cd7da..8fe8f8c442 100644 --- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js @@ -3,6 +3,16 @@ frappe.provide("schools") frappe.ui.form.on('Student Attendance Tool', { + onload: function(frm) { + frm.set_query("student_group", function() { + return { + "filters": { + "group_based_on": frm.doc.group_based_on + } + }; + }); + }, + refresh: function(frm) { frm.disable_save(); }, diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json index 291e027adf..265ac8ca0b 100644 --- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json +++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json @@ -44,6 +44,39 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "Batch", + "depends_on": "eval:doc.based_on == \"Student Group\"", + "fieldname": "group_based_on", + "fieldtype": "Select", + "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": "Group Based On", + "length": 0, + "no_copy": 0, + "options": "Batch\nCourse\nActivity", + "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_bulk_edit": 0, "allow_on_submit": 0, @@ -240,7 +273,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2017-05-01 15:09:55.740005", + "modified": "2017-06-05 23:16:43.127216", "modified_by": "Administrator", "module": "Schools", "name": "Student Attendance Tool",