From 67c4f1713bd9b9ad8043d7b6cd8377a8b728327e Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Wed, 14 Jun 2017 17:34:36 +0530 Subject: [PATCH] Minor changes in the UX and courses automatically fetched upon saving (#9264) --- .../program_course/program_course.json | 8 ++- .../program_enrollment/program_enrollment.js | 27 +++---- .../program_enrollment.json | 70 ++++++------------- 3 files changed, 36 insertions(+), 69 deletions(-) diff --git a/erpnext/schools/doctype/program_course/program_course.json b/erpnext/schools/doctype/program_course/program_course.json index 8c82666591..cfe167d460 100644 --- a/erpnext/schools/doctype/program_course/program_course.json +++ b/erpnext/schools/doctype/program_course/program_course.json @@ -13,6 +13,7 @@ "engine": "InnoDB", "fields": [ { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -43,6 +44,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -71,6 +73,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -101,6 +104,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -114,7 +118,7 @@ "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 0, - "label": "Required", + "label": "Mandatory", "length": 0, "no_copy": 0, "permlevel": 0, @@ -141,7 +145,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2017-04-07 17:59:12.504949", + "modified": "2017-06-12 18:20:59.255302", "modified_by": "Administrator", "module": "Schools", "name": "Program Course", diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.js b/erpnext/schools/doctype/program_enrollment/program_enrollment.js index b843d445bc..dcdaabc83d 100644 --- a/erpnext/schools/doctype/program_enrollment/program_enrollment.js +++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.js @@ -43,6 +43,7 @@ frappe.ui.form.on("Program Enrollment", { callback: function(r) { if(r.message) { frm.set_value("fees" ,r.message); + frm.events.get_courses(frm); } } }); @@ -54,23 +55,15 @@ frappe.ui.form.on("Program Enrollment", { }, get_courses: function(frm) { - if (frm.doc.program) { - frm.set_value("courses",[]); - frappe.call({ - method: "get_courses", - doc:frm.doc, - callback: function(r) { - if(r.message) { - frm.set_value("courses", r.message); - } - else { - frappe.msgprint(__("There is no mandatory course for the program {0}",[frm.doc.program])); - } + frm.set_value("courses",[]); + frappe.call({ + method: "get_courses", + doc:frm.doc, + callback: function(r) { + if(r.message) { + frm.set_value("courses", r.message); } - }) - } - else { - frappe.throw(__("Select the Program to fetch mandatory courses.")) - } + } + }) } }); diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.json b/erpnext/schools/doctype/program_enrollment/program_enrollment.json index f2bc416c8e..d8c6861c9d 100644 --- a/erpnext/schools/doctype/program_enrollment/program_enrollment.json +++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.json @@ -81,19 +81,19 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "academic_year", + "fieldname": "student_category", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Academic Year", + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Student Category", "length": 0, "no_copy": 0, - "options": "Academic Year", + "options": "Student Category", "permlevel": 0, "precision": "", "print_hide": 0, @@ -101,7 +101,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 @@ -112,7 +112,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "academic_term", + "fieldname": "school_house", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, @@ -121,10 +121,10 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Academic Term", + "label": "School House", "length": 0, "no_copy": 0, - "options": "Academic Term", + "options": "School House", "permlevel": 0, "precision": "", "print_hide": 0, @@ -243,7 +243,7 @@ "in_global_search": 1, "in_list_view": 0, "in_standard_filter": 0, - "label": "Batch", + "label": "Student Batch", "length": 0, "no_copy": 0, "options": "Student Batch Name", @@ -265,19 +265,19 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "student_category", + "fieldname": "academic_year", "fieldtype": "Link", "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 Category", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Academic Year", "length": 0, "no_copy": 0, - "options": "Student Category", + "options": "Academic Year", "permlevel": 0, "precision": "", "print_hide": 0, @@ -285,7 +285,7 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -296,7 +296,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "school_house", + "fieldname": "academic_term", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, @@ -305,10 +305,10 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "School House", + "label": "Academic Term", "length": 0, "no_copy": 0, - "options": "School House", + "options": "Academic Term", "permlevel": 0, "precision": "", "print_hide": 0, @@ -472,36 +472,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "get_courses", - "fieldtype": "Button", - "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": "Get Courses", - "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_bulk_edit": 0, "allow_on_submit": 1, @@ -668,7 +638,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-06-02 15:29:05.812335", + "modified": "2017-06-12 18:14:35.875103", "modified_by": "Administrator", "module": "Schools", "name": "Program Enrollment",