From 3d190a15ab5ee0f7b9014ef098f34a23f5d914f6 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Fri, 7 Jul 2017 17:29:29 +0530 Subject: [PATCH 1/3] changes in the student dashboard --- erpnext/schools/doctype/student/student.json | 124 +++++++++--------- .../doctype/student/student_dashboard.py | 14 +- 2 files changed, 74 insertions(+), 64 deletions(-) diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json index fa6db0d140..75cb758b06 100644 --- a/erpnext/schools/doctype/student/student.json +++ b/erpnext/schools/doctype/student/student.json @@ -589,67 +589,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "section_break_18", - "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, - "label": "Guardian Details", - "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": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "guardians", - "fieldtype": "Table", - "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": "Guardians", - "length": 0, - "no_copy": 0, - "options": "Student Guardian", - "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, @@ -859,6 +798,67 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_18", + "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, + "label": "Guardian Details", + "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": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "guardians", + "fieldtype": "Table", + "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": "Guardians", + "length": 0, + "no_copy": 0, + "options": "Student Guardian", + "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, @@ -1114,7 +1114,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-06-30 08:21:50.423784", + "modified": "2017-07-07 16:30:08.930882", "modified_by": "Administrator", "module": "Schools", "name": "Student", diff --git a/erpnext/schools/doctype/student/student_dashboard.py b/erpnext/schools/doctype/student/student_dashboard.py index cd2314ef12..61f3a6f8e0 100644 --- a/erpnext/schools/doctype/student/student_dashboard.py +++ b/erpnext/schools/doctype/student/student_dashboard.py @@ -7,10 +7,20 @@ def get_data(): 'fieldname': 'student', 'transactions': [ { - 'items': ['Student Log', 'Student Group', 'Program Enrollment'] + 'label': _('Admission'), + 'items': ['Program Enrollment'] }, { - 'items': ['Fees', 'Assessment Result', 'Student Attendance', 'Student Leave Application'] + 'label': _('Fee'), + 'items': ['Fees'] + }, + { + 'label': _('Assessment'), + 'items': ['Assessment Result'] + }, + { + 'label': _('Student Activity'), + 'items': ['Student Log', 'Student Group', 'Student Attendance', 'Student Leave Application'] } ] } \ No newline at end of file From 101a021f7b1b0ec4f3b8ddefd7310865d2c56a4c Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Mon, 10 Jul 2017 16:21:44 +0530 Subject: [PATCH 2/3] added student type in program enrollment and changes in the student dashboard --- .../program_enrollment.json | 45 ++++++++++++++++--- .../doctype/student/student_dashboard.py | 12 +++-- 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.json b/erpnext/schools/doctype/program_enrollment/program_enrollment.json index 0203b2cc25..851bca3f87 100644 --- a/erpnext/schools/doctype/program_enrollment/program_enrollment.json +++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.json @@ -143,9 +143,8 @@ "bold": 0, "collapsible": 0, "columns": 0, - "default": "Today", - "fieldname": "enrollment_date", - "fieldtype": "Date", + "fieldname": "student_type", + "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -153,9 +152,10 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Enrollment Date", + "label": "Student Type", "length": 0, "no_copy": 0, + "options": "\nBoarding\nNon-Boarding", "permlevel": 0, "precision": "", "print_hide": 0, @@ -163,7 +163,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 @@ -321,6 +321,37 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "Today", + "fieldname": "enrollment_date", + "fieldtype": "Date", + "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": "Enrollment Date", + "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 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -370,7 +401,7 @@ "label": "Mode of Transportation", "length": 0, "no_copy": 0, - "options": "\nSchool Bus\nPublic Transport\nSelf-Driving Vehicle\nPick/Drop by Guardian", + "options": "\nWalking\nSchool Bus\nPublic Transport\nSelf-Driving Vehicle\nPick/Drop by Guardian", "permlevel": 0, "precision": "", "print_hide": 0, @@ -638,7 +669,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-06-30 08:21:49.430996", + "modified": "2017-07-10 15:28:17.138823", "modified_by": "Administrator", "module": "Schools", "name": "Program Enrollment", diff --git a/erpnext/schools/doctype/student/student_dashboard.py b/erpnext/schools/doctype/student/student_dashboard.py index 61f3a6f8e0..b36599c2db 100644 --- a/erpnext/schools/doctype/student/student_dashboard.py +++ b/erpnext/schools/doctype/student/student_dashboard.py @@ -11,16 +11,20 @@ def get_data(): 'items': ['Program Enrollment'] }, { - 'label': _('Fee'), - 'items': ['Fees'] + 'label': _('Student Activity'), + 'items': ['Student Log', 'Student Group', ] }, { 'label': _('Assessment'), 'items': ['Assessment Result'] }, { - 'label': _('Student Activity'), - 'items': ['Student Log', 'Student Group', 'Student Attendance', 'Student Leave Application'] + 'label': _('Attendance'), + 'items': ['Student Attendance', 'Student Leave Application'] + }, + { + 'label': _('Fee'), + 'items': ['Fees'] } ] } \ No newline at end of file From 5d202ca31a17e695943f6fae20dc71c4d4c6c64d Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Mon, 10 Jul 2017 18:40:53 +0530 Subject: [PATCH 3/3] change in the student type --- .../program_enrollment/program_enrollment.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.json b/erpnext/schools/doctype/program_enrollment/program_enrollment.json index 851bca3f87..f8a3b9ecc8 100644 --- a/erpnext/schools/doctype/program_enrollment/program_enrollment.json +++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.json @@ -143,8 +143,10 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "student_type", - "fieldtype": "Select", + "default": "0", + "description": "Check this if the Student is residing at the Institute's Hostel.", + "fieldname": "boarding_student", + "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -152,10 +154,10 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Student Type", + "label": "Boarding Student", "length": 0, "no_copy": 0, - "options": "\nBoarding\nNon-Boarding", + "options": "", "permlevel": 0, "precision": "", "print_hide": 0, @@ -669,7 +671,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-07-10 15:28:17.138823", + "modified": "2017-07-10 18:16:15.810616", "modified_by": "Administrator", "module": "Schools", "name": "Program Enrollment",