Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added student type in program enrollment and changes in the student dashboard

Browse Source
This commit is contained in:
Manas Solanki 2017-07-10 16:21:44 +05:30
parent 3d190a15ab
commit 101a021f7b
2 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
erpnext/schools/doctype/program_enrollment/program_enrollment.json
View File

@ -143,9 +143,8 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"default": "Today", "fieldname": "student_type",
"fieldname": "enrollment_date", "fieldtype": "Select",
"fieldtype": "Date",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
@ -153,9 +152,10 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Enrollment Date", "label": "Student Type",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nBoarding\nNon-Boarding",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
@ -163,7 +163,7 @@
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
@ -321,6 +321,37 @@
"set_only_once": 0, "set_only_once": 0,
"unique": 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_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@ -370,7 +401,7 @@
"label": "Mode of Transportation", "label": "Mode of Transportation",
"length": 0, "length": 0,
"no_copy": 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, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
@ -638,7 +669,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2017-06-30 08:21:49.430996", "modified": "2017-07-10 15:28:17.138823",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Schools", "module": "Schools",
"name": "Program Enrollment", "name": "Program Enrollment",

12
erpnext/schools/doctype/student/student_dashboard.py
View File

@ -11,16 +11,20 @@ def get_data():
'items': ['Program Enrollment'] 'items': ['Program Enrollment']
}, },
{ {
'label': _('Fee'), 'label': _('Student Activity'),
'items': ['Fees'] 'items': ['Student Log', 'Student Group', ]
}, },
{ {
'label': _('Assessment'), 'label': _('Assessment'),
'items': ['Assessment Result'] 'items': ['Assessment Result']
}, },
{ {
'label': _('Student Activity'), 'label': _('Attendance'),
'items': ['Student Log', 'Student Group', 'Student Attendance', 'Student Leave Application'] 'items': ['Student Attendance', 'Student Leave Application']
},
{
'label': _('Fee'),
'items': ['Fees']
} }
] ]
} }