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

chore: minor improvements

Browse Source
This commit is contained in:
scmmishra 2019-04-22 14:46:26 +05:30
parent ac8d3479c9
commit 5079e6c1c1
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/education/utils.py
View File

@ -96,6 +96,8 @@ def get_program_and_enrollment_status(program_name):
def get_course_enrollment(course_name): def get_course_enrollment(course_name):
student = get_current_student() student = get_current_student()
if not student:
return None
enrollment_name = frappe.get_all("Course Enrollment", filters={'student': student.name, 'course':course_name}) enrollment_name = frappe.get_all("Course Enrollment", filters={'student': student.name, 'course':course_name})
try: try:
name = enrollment_name[0].name name = enrollment_name[0].name
@ -114,7 +116,6 @@ def create_student_from_current_user():
"user": frappe.session.user "user": frappe.session.user
}) })
student.save(ignore_permissions=True) student.save(ignore_permissions=True)
frappe.db.commit()
return student return student
def enroll_in_course(course_name, program_name): def enroll_in_course(course_name, program_name):

8
erpnext/www/lms.py
View File

@ -119,7 +119,7 @@ def evaluate_quiz(course, quiz_response, quiz_name):
def enroll_in_program(program_name): def enroll_in_program(program_name):
student = utils.get_current_student() student = utils.get_current_student()
if not student: if not student:
utils.create_student_from_current_user() student = utils.create_student_from_current_user()
program_enrollment = student.enroll_in_program(program_name) program_enrollment = student.enroll_in_program(program_name)
return program_name return program_name
@ -215,11 +215,9 @@ def get_program_progress(program_name):
@frappe.whitelist() @frappe.whitelist()
def get_joining_date(): def get_joining_date():
current_student = utils.get_current_student() student = utils.get_current_student()
if current_student: if student:
return student.joining_date return student.joining_date
else:
return None
@frappe.whitelist() @frappe.whitelist()
def get_quiz_progress(program_name): def get_quiz_progress(program_name):