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

chore: Minor code improvements

Browse Source
This commit is contained in:
Shivam Mishra 2019-05-14 11:16:48 +05:30
parent d2c4af154b
commit f2d62195b0
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/education/doctype/course/course.py
View File

@ -20,9 +20,9 @@ class Course(Document):
frappe.throw(_("Total Weightage of all Assessment Criteria must be 100%")) frappe.throw(_("Total Weightage of all Assessment Criteria must be 100%"))
def get_topics(self): def get_topics(self):
try: topic_data= []
topic_list = self.get_all_children() for topic in self.topics:
topic_data = [frappe.get_doc("Topic", topic.topic) for topic in topic_list] topic_doc = frappe.get_doc("Topic", topic.topic)
except frappe.DoesNotExistError: if topic_doc.topic_content:
return None topic_data.append(topic_doc)
return topic_data return topic_data

2
erpnext/education/doctype/program/program.py
View File

@ -9,6 +9,6 @@ from frappe.model.document import Document
class Program(Document): class Program(Document):
def get_course_list(self): def get_course_list(self):
program_course_list = self.get_all_children() program_course_list = self.courses
course_list = [frappe.get_doc("Course", program_course.course) for program_course in program_course_list] course_list = [frappe.get_doc("Course", program_course.course) for program_course in program_course_list]
return course_list return course_list

15
erpnext/education/doctype/student/student.py
View File

@ -90,13 +90,14 @@ class Student(Document):
""" """
contents = topic.get_contents() contents = topic.get_contents()
progress = [] progress = []
for content in contents: if contents:
if content.doctype in ('Article', 'Video'): for content in contents:
status = check_content_completion(content.name, content.doctype, course_enrollment_name) if content.doctype in ('Article', 'Video'):
progress.append({'content': content.name, 'content_type': content.doctype, 'is_complete': status}) status = check_content_completion(content.name, content.doctype, course_enrollment_name)
elif content.doctype == 'Quiz': progress.append({'content': content.name, 'content_type': content.doctype, 'is_complete': status})
status, score, result = check_quiz_completion(content, course_enrollment_name) elif content.doctype == 'Quiz':
progress.append({'content': content.name, 'content_type': content.doctype, 'is_complete': status, 'score': score, 'result': result}) status, score, result = check_quiz_completion(content, course_enrollment_name)
progress.append({'content': content.name, 'content_type': content.doctype, 'is_complete': status, 'score': score, 'result': result})
return progress return progress
def enroll_in_program(self, program_name): def enroll_in_program(self, program_name):