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

Quiz: Quiz now displays correctly on the portal

Browse Source 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
This commit is contained in:
scmmishra 2018-10-17 12:41:50 +05:30 committed by Aditya Hase
parent 3757a4eab8
commit 685584bf56
5 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/education/doctype/question/question.json
View File

@ -4,7 +4,7 @@
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
"autoname": "format:{question}",
"autoname": "format:QUESTION-{#####}",
"beta": 0,
"creation": "2018-10-01 15:58:00.696815",
"custom": 0,
@ -91,7 +91,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2018-10-15 14:39:40.576374",
"modified": "2018-10-17 12:08:05.649254",
"modified_by": "Administrator",
"module": "Education",
"name": "Question",

15
erpnext/education/utils.py
View File

@ -200,6 +200,16 @@ def get_student_id(email):
frappe.throw("Student Account with email:{0} does not exist".format(email))
def get_quiz(content):
try:
quiz_doc = frappe.get_doc("Content", content)
if quiz_doc.content_type != "Quiz":
frappe.throw("<b>{0}</b> is not a Quiz".format(content))
quiz = [frappe.get_doc("Question", item.question_link) for item in quiz_doc.questions]
return quiz
except frappe.DoesNotExistError:
frappe.throw("The quiz \"{0}\" does not exist".format(content))
def get_quiz_as_dict(content):
"""Helper Function to get questions for a quiz
:params content: name of a Content doctype with content_type quiz"""
@ -213,8 +223,9 @@ def get_quiz(content):
data = []
for question in quiz:
d = {}
d['Question'] = question.question
d['Options'] = [item.option for item in quiz[0].options]
d['id'] = question.name
d['question'] = question.question
d['options'] = [item.option for item in quiz[0].options]
data.append(d)
return data
except frappe.DoesNotExistError:

2
erpnext/www/lms/course.html
View File

@ -10,7 +10,7 @@
{% block content %}
<div id="content-holder" data-type="{{current_content.content_type}}" data-content="{{ current_content.name }}" data-course="{{ current_course.name }}" data-program="{{ current_program }}">
{% with current_content = current_content, next_content = next_content, course_name = current_course.name, program=current_program%}
{% with quiz = quiz, current_content = current_content, next_content = next_content, course_name = course_name, program=current_program%}
{% include "www/lms/templates/includes/" + current_content.content_type.lower() + ".html" %}
{% endwith %}
</div>

8
erpnext/www/lms/course.py
View File

@ -1,18 +1,22 @@
from __future__ import unicode_literals
import erpnext.education.utils as utils
import frappe
def get_context(context):
if frappe.form_dict['course']:
context.current_course = frappe.get_doc("Course", frappe.form_dict["course"])
context.current_content = frappe.get_doc("Content", frappe.form_dict["content"])
context.course_name = frappe.form_dict["course"]
context.current_course = utils.get_contents_in_course(context.course_name)
context.current_program = frappe.form_dict["program"]
context.next_content = get_next_content(context)
if context.current_content.content_type == "Quiz":
context.questions = utils.get_quiz_as_dict(context.current_content.name)
def get_next_content(context):
if context.current_course:
course_data = [content_item.content for content_item in context.current_course.course_content]
course_data = [content.name for content in context.current_course]
try:
return course_data[course_data.index(context.current_content.name) + 1]
except IndexError:

30
erpnext/www/lms/templates/includes/quiz.html
View File

@ -1,13 +1,13 @@
{% macro quiz(loop_index, question_id, question, options) %}
<div class="question mt-4" id="question" data-question="{{ question_id }}">
<h5>{{ loop_index }}{{ question }}</h5>
{% macro quiz(loop_index, question) %}
<div class="question mt-4" id="question['question']" data-question="{{ question['id'] }}">
<h5>{{ loop_index }}{{ question['question'] }}</h5>
<div class="options ml-2">
<div class="form-check pb-1 hidden">
<input class="form-check-input" type="radio" name="{{ question_id }}" value="0" checked>
<input class="form-check-input" type="radio" name="{{ question['id'] }}" value="0" checked>
</div>
{% for option in options %}
{% for option in question['options'] %}
<div class="form-check pb-1">
<input class="form-check-input" type="radio" name="{{ question_id }}" id="{{loop_index}}-{{ option }}" value="{{ loop.index|str }}">
<input class="form-check-input" type="radio" name="{{ question['id'] }}" id="{{loop_index}}-{{ option }}" value="{{ option }}">
<label class="form-check-label" for="{{loop_index}}-{{ option }}">
{{ option }}
</label>
@ -16,7 +16,6 @@
</div>
</div>
{% endmacro %}
<section class="quiz-section">
<div class='container'>
<div class="mt-3 row">
@ -28,9 +27,8 @@
<hr>
<form id="quiz" name="{{ current_content.name }}">
<div id="quiz-body">
{% for quiz_item in current_content.quiz %}
{{ quiz(loop.index|str +". ", quiz_item.name, quiz_item.question, [ quiz_item.option_1, quiz_item.option_2,
quiz_item.option_3, quiz_item.option_4]) }}
{% for q in questions %}
{{ quiz(loop.index|str +". ", q) }}
{% endfor %}
</div>
<div class="mt-3">
@ -43,12 +41,12 @@
<h3>Your Score: <span id="result"></span></h3>
</div>
<div class="col-md-4 text-right">
<a class='btn btn-outline-secondary' href="#">Previous</a>
{% if next_content != None %}
<a class='btn btn-primary' href="/lms/course?program={{ program }}&course={{ course_name }}&content={{ next_content }}">Next</a>
{% else %}
<a class='btn btn-primary' href="/lms/program?program={{ program }}">Finish Course</a>
{% endif %}
<a class='btn btn-outline-secondary' href="#">Previous</a>
{% if next_content != None %}
<a class='btn btn-primary' href="/lms/course?program={{ program }}&course={{ course_name }}&content={{ next_content }}">Next</a>
{% else %}
<a class='btn btn-primary' href="/lms/program?program={{ program }}">Finish Course</a>
{% endif %}
</div>
</div>
</div>