feat: added topic progress api

This commit is contained in:
Shivam Mishra 2019-06-03 14:41:05 +05:30
parent 8ddb63adae
commit 6d4c666476
3 changed files with 27 additions and 4 deletions

View File

@ -239,6 +239,25 @@ def get_quiz(quiz_name, course):
status, score, result = check_quiz_completion(quiz, course_enrollment)
return {'questions': questions, 'activity': {'is_complete': status, 'score': score, 'result': result}}
def get_student_topic_details(topic, course_name, program):
"""
Return the porgress of a course in a program as well as the content to continue from.
:param topic_name:
:param course_name:
"""
student = get_current_student()
course_enrollment = get_or_create_course_enrollment(course_name, program)
progress = student.get_topic_progress(course_enrollment.name, topic)
if not progress:
return {'label':'Open', 'indicator': 'blue'}
count = sum([activity['is_complete'] for activity in progress])
if count == 0:
return {'label':'Open', 'indicator': 'blue'}
elif count == len(progress):
return {'label':'Completed', 'indicator': 'green'}
elif count < len(progress):
return {'label':'In Progress', 'indicator': 'orange'}
def create_student_from_current_user():
user = frappe.get_doc("User", frappe.session.user)

View File

@ -67,9 +67,7 @@
</div>
{% if has_access %}
<div class='card-footer'>
{% if index==1 %} <span class="indicator green"> Completed </span>
{% else %} <span class="indicator orange"> Completed </span>
{% endif %}
<span class="indicator {{ progress[topic.name].indicator }}"> {{ progress[topic.name].label }} </span>
</div>
</a>
{% else %}

View File

@ -9,5 +9,11 @@ def get_context(context):
course = frappe.get_doc('Course', frappe.form_dict['name'])
context.program = frappe.form_dict['program']
context.course = course
context.topics = course.get_topics()
context.has_access = utils.allowed_program_access(context.program)
context.has_access = utils.allowed_program_access(context.program)
context.progress = get_topic_progress(context.topics, course, context.program)
def get_topic_progress(topics, course, program):
progress = {topic.name: utils.get_student_topic_details(topic, course.name, program) for topic in topics}
return progress