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

create course enrollment if not already enrolled for a program

Browse Source
This commit is contained in:
scmmishra 2018-11-26 14:41:15 +05:30 committed by Aditya Hase
parent affbfe7d0c
commit 97c994f394
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/education/utils.py
View File

@ -109,7 +109,12 @@ def create_student():
}) })
student.save(ignore_permissions=True) student.save(ignore_permissions=True)
frappe.db.commit() frappe.db.commit()
return student_name return student
def enroll_in_course(course_name, program_name):
student_id = get_current_student()
student = frappe.get_doc("Student", student_id)
student.enroll_in_course(course_name=course_name, program_enrollment=get_program_enrollment(program_name))
def enroll_all_courses_in_program(program_enrollment, student): def enroll_all_courses_in_program(program_enrollment, student):
program = frappe.get_doc("Program", program_enrollment.program) program = frappe.get_doc("Program", program_enrollment.program)

8
erpnext/public/js/education/lms/components/CourseCard.vue
View File

@ -67,7 +67,7 @@ export default {
}, },
isLogin() { isLogin() {
return lms.store.checkLogin() return lms.store.checkLogin()
} },
}, },
methods: { methods: {
iconClass(content_type) { iconClass(content_type) {
@ -77,9 +77,10 @@ export default {
}, },
getCourseMeta() { getCourseMeta() {
return lms.call('get_course_meta', { return lms.call('get_course_meta', {
course_name: this.course.name course_name: this.course.name,
program_name: this.program_name
}) })
} },
} }
}; };
</script> </script>
@ -92,6 +93,7 @@ export default {
} }
li { li {
list-style-type: none; list-style-type: none;
padding: 0;
} }
.fa { .fa {
font-size: 0.8em; font-size: 0.8em;

17
erpnext/www/lms.py
View File

@ -199,9 +199,10 @@ def check_quiz_completion(quiz, enrollment_name):
return status, score, result return status, score, result
@frappe.whitelist() @frappe.whitelist()
def get_course_meta(course_name): def get_course_meta(course_name, program_name):
course_enrollment = utils.get_course_enrollment(course_name) course_enrollment = utils.get_course_enrollment(course_name)
# course_enrollment = frappe.get_doc("Course Enrollment", course_enrollment_name) if not course_enrollment:
utils.enroll_in_course(course_name, program_name)
progress = get_course_progress(course_enrollment) progress = get_course_progress(course_enrollment)
count = sum([act['is_complete'] for act in progress]) count = sum([act['is_complete'] for act in progress])
if count == 0: if count == 0:
@ -215,7 +216,11 @@ def get_course_meta(course_name):
@frappe.whitelist() @frappe.whitelist()
def get_program_meta(program_name): def get_program_meta(program_name):
program = frappe.get_doc("Program", program_name) program = frappe.get_doc("Program", program_name)
program_meta = {} program_enrollment = frappe.get_list("Program Enrollment", filters={'student': utils.get_current_student(), 'program': program_name })[0].name
for course in program.get_all_children(): if not program_enrollment:
program_meta[course.course] = get_course_meta(course.course) return None
return program_meta else:
program_meta = {}
for course in program.get_all_children():
program_meta[course.course] = get_course_meta(course.course, program_name)
return program_meta