Rename schools to Education (#11524)
* renaming for the docs, demo data and patch * changes in the doctypes and reports * rename the config file * Few name changes in messages and license * rename the school settings to education settings * changes in the documentation * added the setup file for the fixtures * corrected the ui tests file path * fix the codacy * add the patch for renaming few doctypes and fields * changes in the patch
@ -52,6 +52,7 @@
|
||||
"frappe": true,
|
||||
"erpnext": true,
|
||||
"schools": true,
|
||||
"education": true,
|
||||
|
||||
"$": true,
|
||||
"jQuery": true,
|
||||
|
@ -194,12 +194,12 @@ def get_data():
|
||||
"type": "list"
|
||||
},
|
||||
{
|
||||
"module_name": "Student Attendance",
|
||||
"color": "#3aacba",
|
||||
"module_name": "Student Attendance Tool",
|
||||
"color": "#C0392B",
|
||||
"icon": "octicon octicon-checklist",
|
||||
"label": _("Student Attendance"),
|
||||
"link": "List/Student Attendance",
|
||||
"_doctype": "Student Attendance",
|
||||
"label": _("Student Attendance Tool"),
|
||||
"link": "List/Student Attendance Tool",
|
||||
"_doctype": "Student Attendance Tool",
|
||||
"type": "list"
|
||||
},
|
||||
{
|
||||
@ -257,11 +257,11 @@ def get_data():
|
||||
"type": "list"
|
||||
},
|
||||
{
|
||||
"module_name": "Schools",
|
||||
"color": "#DE2B37",
|
||||
"module_name": "Education",
|
||||
"color": "#428B46",
|
||||
"icon": "octicon octicon-mortar-board",
|
||||
"type": "module",
|
||||
"label": _("Schools")
|
||||
"label": _("Education")
|
||||
},
|
||||
{
|
||||
"module_name": "Healthcare",
|
||||
|
@ -217,7 +217,7 @@ def get_data():
|
||||
},
|
||||
{
|
||||
"type": "doctype",
|
||||
"name": "School Settings"
|
||||
"name": "Education Settings"
|
||||
}
|
||||
]
|
||||
},
|
@ -3,7 +3,7 @@ from __future__ import unicode_literals
|
||||
import frappe, sys
|
||||
import erpnext
|
||||
import frappe.utils
|
||||
from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset, schools
|
||||
from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset, education
|
||||
from erpnext.demo.setup import education, manufacture, setup_data, healthcare
|
||||
"""
|
||||
Make a demo
|
||||
@ -83,7 +83,7 @@ def simulate(domain='Manufacturing', days=100):
|
||||
sales.work()
|
||||
manufacturing.work()
|
||||
elif domain=='Education':
|
||||
schools.work()
|
||||
education.work()
|
||||
|
||||
except:
|
||||
frappe.db.set_global('demo_last_date', current_date)
|
||||
|
@ -31,7 +31,7 @@ def make_masters():
|
||||
frappe.db.commit()
|
||||
|
||||
def setup_item():
|
||||
items = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'item_schools.json')).read())
|
||||
items = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'item_education.json')).read())
|
||||
for i in items:
|
||||
item = frappe.new_doc('Item')
|
||||
item.update(i)
|
||||
|
@ -229,10 +229,10 @@ def setup_user_roles():
|
||||
user.add_roles('HR User', 'Projects User')
|
||||
frappe.db.set_global('demo_projects_user', user.name)
|
||||
|
||||
if not frappe.db.get_global('demo_schools_user'):
|
||||
if not frappe.db.get_global('demo_education_user'):
|
||||
user = frappe.get_doc('User', 'aromn@example.com')
|
||||
user.add_roles('Academics User')
|
||||
frappe.db.set_global('demo_schools_user', user.name)
|
||||
frappe.db.set_global('demo_education_user', user.name)
|
||||
|
||||
#Add Expense Approver
|
||||
user = frappe.get_doc('User', 'WanMai@example.com')
|
||||
|
@ -1,3 +1,4 @@
|
||||
|
||||
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
||||
# License: GNU General Public License v3. See license.txt
|
||||
|
||||
@ -8,13 +9,12 @@ import random
|
||||
from frappe.utils import cstr
|
||||
from frappe.utils.make_random import get_random
|
||||
from datetime import timedelta
|
||||
from erpnext.schools.api import get_student_group_students, make_attendance_records, enroll_student, \
|
||||
from erpnext.education.api import get_student_group_students, make_attendance_records, enroll_student, \
|
||||
get_fee_schedule, collect_fees, get_course
|
||||
from erpnext.schools.doctype.program_enrollment.program_enrollment import get_program_courses
|
||||
from erpnext.schools.doctype.student_group.student_group import get_students
|
||||
|
||||
|
||||
def work():
|
||||
frappe.set_user(frappe.db.get_global('demo_schools_user'))
|
||||
frappe.set_user(frappe.db.get_global('demo_education_user'))
|
||||
for d in xrange(20):
|
||||
approve_random_student_applicant()
|
||||
enroll_random_student(frappe.flags.current_date)
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 1.4 MiB |
Before Width: | Height: | Size: 1019 KiB After Width: | Height: | Size: 1019 KiB |
Before Width: | Height: | Size: 2.2 MiB After Width: | Height: | Size: 2.2 MiB |
Before Width: | Height: | Size: 2.5 MiB After Width: | Height: | Size: 2.5 MiB |
Before Width: | Height: | Size: 95 KiB After Width: | Height: | Size: 95 KiB |
Before Width: | Height: | Size: 155 KiB After Width: | Height: | Size: 155 KiB |
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 96 KiB |
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 55 KiB |
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 108 KiB |
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
Before Width: | Height: | Size: 185 KiB After Width: | Height: | Size: 185 KiB |
Before Width: | Height: | Size: 181 KiB After Width: | Height: | Size: 181 KiB |
Before Width: | Height: | Size: 170 KiB After Width: | Height: | Size: 170 KiB |
Before Width: | Height: | Size: 155 KiB After Width: | Height: | Size: 155 KiB |
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 77 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 104 KiB After Width: | Height: | Size: 104 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 94 KiB |
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 101 KiB |
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 112 KiB |
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 75 KiB |
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 85 KiB |
Before Width: | Height: | Size: 150 KiB After Width: | Height: | Size: 150 KiB |
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
Before Width: | Height: | Size: 2.1 MiB After Width: | Height: | Size: 2.1 MiB |
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 87 KiB |
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 86 KiB |
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 63 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 111 KiB After Width: | Height: | Size: 111 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 106 KiB |
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 119 KiB |
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 55 KiB |
Before Width: | Height: | Size: 376 KiB After Width: | Height: | Size: 376 KiB |
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 81 KiB |
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 88 KiB |
Before Width: | Height: | Size: 103 KiB After Width: | Height: | Size: 103 KiB |
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 1.0 MiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 550 KiB After Width: | Height: | Size: 550 KiB |
Before Width: | Height: | Size: 366 KiB After Width: | Height: | Size: 366 KiB |
Before Width: | Height: | Size: 985 KiB After Width: | Height: | Size: 985 KiB |
Before Width: | Height: | Size: 647 KiB After Width: | Height: | Size: 647 KiB |
Before Width: | Height: | Size: 991 KiB After Width: | Height: | Size: 991 KiB |
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
Before Width: | Height: | Size: 173 KiB After Width: | Height: | Size: 173 KiB |
@ -2,12 +2,12 @@
|
||||
|
||||
Assessment Criteria is the parameter based on which you assess the Student.
|
||||
|
||||
<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/schools/assessment/assessment-criteria.png">
|
||||
<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/education/assessment/assessment-criteria.png">
|
||||
|
||||
After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc.
|
||||
|
||||
Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course.
|
||||
|
||||
<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/schools/assessment/assessment-plan-criteria.png">
|
||||
<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
|
||||
|
||||
{next}
|
@ -4,10 +4,10 @@ Assessment Group tree is a master where you can define the hierarchy for examina
|
||||
|
||||
For example, if you conduct two assessment in a academic year, then setup Assessment Group as following.
|
||||
|
||||
<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/schools/assessment/assessment-group-term.png">
|
||||
<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-term.png">
|
||||
|
||||
On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute.
|
||||
|
||||
<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/schools/assessment/assessment-group-details.png">
|
||||
<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-details.png">
|
||||
|
||||
{next}
|
@ -10,10 +10,10 @@ To schedule an assessment/examination for a Student Group, for specific Course,
|
||||
|
||||
4. Examiner and Supervisor
|
||||
|
||||
<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/schools/assessment/assessment-plan-details.png">
|
||||
<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/education/assessment/assessment-plan-details.png">
|
||||
|
||||
5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned.
|
||||
|
||||
<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/schools/assessment/assessment-plan-criteria.png">
|
||||
<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
|
||||
|
||||
{next}
|
@ -1,7 +1,7 @@
|
||||
#Assessment Result
|
||||
|
||||
Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/schools/assessment/assessment_result_tool.html).
|
||||
Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/education/assessment/assessment_result_tool.html).
|
||||
|
||||
<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/schools/assessment/assessment-result.png">
|
||||
<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/education/assessment/assessment-result.png">
|
||||
|
||||
{next}
|
@ -2,7 +2,7 @@
|
||||
|
||||
Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student.
|
||||
|
||||
<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/schools/assessment/assessment-result-tool.png">
|
||||
<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/education/assessment/assessment-result-tool.png">
|
||||
|
||||
As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student.
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned.
|
||||
|
||||
<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/schools/assessment/grading-scale.png">
|
||||
<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/education/assessment/grading-scale.png">
|
||||
|
||||
{next}
|
@ -10,6 +10,6 @@ To mark the **Attedance* based on Student Group select the group based on
|
||||
|
||||
Student detials will be autofetched and you can mark the attendance of the given date.
|
||||
|
||||
<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/setup/student-attendance-tool.gif">
|
||||
<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/setup/student-attendance-tool.gif">
|
||||
|
||||
{next}
|
@ -8,7 +8,7 @@ To create Attendance record :
|
||||
|
||||
Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save.
|
||||
|
||||
<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-attendance.gif">
|
||||
<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-attendance.gif">
|
||||
|
||||
**Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.
|
||||
|
@ -4,9 +4,9 @@ ERPNext allows you to record the leave application for a student.
|
||||
|
||||
To create a Student Leave application record, enter the Student and the date for the leave is applied and save.
|
||||
|
||||
<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-leave-application.gif">
|
||||
<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-leave-application.gif">
|
||||
|
||||
Incase the student is not attending the school in order to participate or represent school in any event, he/she can be mark as present from the Leave Application itself.
|
||||
Incase the student is not attending the institute in order to participate or represent institute in any event, he/she can be mark as present from the Leave Application itself.
|
||||
|
||||
Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave.
|
||||
|
@ -7,10 +7,10 @@ You can create the the Program Enrollment for :
|
||||
|
||||
1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**.
|
||||
|
||||
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment-tool.gif">
|
||||
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment-tool.gif">
|
||||
|
||||
2. **Program Enrollment** >> You can bulk update the **Program** for the students from one academic year to another in the same **Program** or a new **Program**.
|
||||
|
||||
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment-tool01.gif">
|
||||
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment-tool01.gif">
|
||||
|
||||
{next}
|
@ -4,7 +4,7 @@ Program Enrollment describes an educational model where students must complete a
|
||||
|
||||
Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student.
|
||||
|
||||
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment.gif">
|
||||
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment.gif">
|
||||
|
||||
- A student can be enrolled in multiple Course for a program in a given academeic year.
|
||||
- Based on the Fee structure selected at the time of enrollment Fee detials are created of the student.
|
@ -3,7 +3,7 @@
|
||||
A Student Applicant record needs to be created when a student applies for a program at your institute.
|
||||
You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master.
|
||||
|
||||
<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/admission/student-applicant.png">
|
||||
<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-applicant.png">
|
||||
|
||||
### Application Status
|
||||
|
||||
@ -20,11 +20,11 @@ You can Approve or Reject a student applicant. By accepting a student applicant
|
||||
### Student Enrollment
|
||||
Once the form is submitted you can either approve or reject the application form.
|
||||
|
||||
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/student-application-actions.png">
|
||||
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-application-actions.png">
|
||||
|
||||
Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom,
|
||||
the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/schools/student/program-enrollment.html).
|
||||
the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/education/student/program-enrollment.html).
|
||||
|
||||
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/student-applicant-enroll.png">
|
||||
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-applicant-enroll.png">
|
||||
|
||||
{next}
|
@ -4,10 +4,10 @@ The admission process begins with filling the admission form. The Student Admiss
|
||||
|
||||
To create a Student Admission record go to :
|
||||
|
||||
**Schools** >> **Admissions** >> **Student Admission** >>
|
||||
**education** >> **Admissions** >> **Student Admission** >>
|
||||
|
||||
|
||||
<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/admission/student-admission.gif">
|
||||
<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-admission.gif">
|
||||
|
||||
Once an admission record is created, the age eligibility criteria can be determined for the every program. Similarly, you can also determine the application fee and naming series for every student applicant. If you keep the naming series blank then the default naming series will be applied for every student applicant.
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
List of all different type of fees collected.
|
||||
|
||||
<img class="screenshot" alt="Fees Category" src="/docs/assets/img/schools/fees/fee-category.png">
|
||||
<img class="screenshot" alt="Fees Category" src="/docs/assets/img/education/fees/fee-category.png">
|
||||
|
||||
{next}
|
@ -2,6 +2,6 @@
|
||||
|
||||
A Fee Structure is a template that can be used while making fee records.
|
||||
|
||||
<img class="screenshot" alt="Fees Structure" src="/docs/assets/img/schools/fees/fee-structure.png">
|
||||
<img class="screenshot" alt="Fees Structure" src="/docs/assets/img/education/fees/fee-structure.png">
|
||||
|
||||
{next}
|
8
erpnext/docs/user/manual/en/education/fees/fees.md
Normal file
@ -0,0 +1,8 @@
|
||||
# Fees
|
||||
|
||||
Maintain a record of fees collected from students.
|
||||
The [Fee Structure](/docs/user/manual/en/education/fees/fee-structure.html) is fetched based on the selected Program and Academic Term.
|
||||
|
||||
<img class="screenshot" alt="Fees" src="/docs/assets/img/education/fees/fees.png">
|
||||
|
||||
{next}
|
@ -2,7 +2,7 @@
|
||||
|
||||
This section contains 'Fee' related documents.
|
||||
|
||||
<img class="screenshot" alt="Fees Section" src="/docs/assets/img/schools/fees/fees-section.png">
|
||||
<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/fees/fees-section.png">
|
||||
|
||||
### Topics
|
||||
|
8
erpnext/docs/user/manual/en/education/index.md
Normal file
@ -0,0 +1,8 @@
|
||||
# Education
|
||||
|
||||
|
||||
The Education Domain in ERPNext is designed to meet requirements of any educational Institute whether that is a school, college or any other private firm. ERPNext provides a centralized system, which can be used to maintain and update all the activities related to an Institution. It will provide a complete package for every funcationality required in any institute like Online Admission, Fees, Attendance, Examination.
|
||||
|
||||
<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/module.png">
|
||||
|
||||
{index}
|