eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #551 from pateljannat/quiz-in-classes

Browse Source 
feat: quiz in classes
This commit is contained in:
Jannat Patel
2023-06-22 11:51:13 +05:30
committed by GitHub
parent 6f8c161e03 22199da7d4
commit 3d8237008f
22 changed files with 699 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/hooks.py
View File

@@ -184,6 +184,10 @@ website_route_rules = [
"from_route": "/assignment-submission/<assignment>/<submission>",
"to_route": "assignment_submission/assignment_submission",
},
{
"from_route": "/quiz-submission/<quiz>/<submission>",
"to_route": "quiz_submission/quiz_submission",
},
]
website_redirects = [

5
lms/lms/doctype/lms_quiz/lms_quiz.json
View File

@@ -39,7 +39,7 @@
"read_only": 1
},
{
"default": "0",
"default": "1",
"fieldname": "max_attempts",
"fieldtype": "Int",
"label": "Max Attempts"
@@ -48,6 +48,7 @@
"default": "0",
"fieldname": "time",
"fieldtype": "Int",
"hidden": 1,
"label": "Time Per Question (in Seconds)"
},
{
@@ -69,7 +70,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-11-15 15:36:39.585488",
"modified": "2023-06-21 09:13:01.322701",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Quiz",

27
lms/lms/doctype/lms_quiz/lms_quiz.py
View File

@@ -2,12 +2,11 @@
# For license information, please see license.txt
import json
import frappe
from frappe import _
from frappe.model.document import Document
from frappe.utils import cstr
from lms.lms.utils import generate_slug, has_course_moderator_role
from lms.lms.utils import generate_slug, has_course_moderator_role, can_create_courses
class LMSQuiz(Document):
@@ -126,7 +125,7 @@ def quiz_summary(quiz, results):
score += correct
del result["question_index"]
frappe.get_doc(
submission = frappe.get_doc(
{
"doctype": "LMS Quiz Submission",
"quiz": quiz,
@@ -134,19 +133,31 @@ def quiz_summary(quiz, results):
"score": score,
"member": frappe.session.user,
}
).save(ignore_permissions=True)
)
submission.save(ignore_permissions=True)
return score
return {
"score": score,
"submission": submission.name,
}
@frappe.whitelist()
def save_quiz(quiz_title, quiz):
def save_quiz(quiz_title, max_attempts=1, quiz=None):
if not can_create_courses():
return
values = {
"title": quiz_title,
"max_attempts": max_attempts,
}
if quiz:
frappe.db.set_value("LMS Quiz", quiz, "title", quiz_title)
frappe.db.set_value("LMS Quiz", quiz, values)
return quiz
else:
doc = frappe.new_doc("LMS Quiz")
doc.update({"title": quiz_title})
doc.update(values)
doc.save(ignore_permissions=True)
return doc.name

3
lms/overrides/user.py
View File

@@ -1,7 +1,4 @@
import hashlib
import random
import re
import frappe
import requests
from frappe import _

34
lms/plugins.py
View File

@@ -16,6 +16,7 @@ be loaded in a webpage.
import frappe
from urllib.parse import quote
from frappe import _
class PageExtension:
@@ -102,21 +103,36 @@ def set_mandatory_fields_for_profile():
def quiz_renderer(quiz_name):
if frappe.session.user == "Guest":
return " <div class='alert alert-info'>" + _(
"Quiz is not available to Guest users. Please login to continue."
)
+"</div>"
quiz = frappe.get_doc("LMS Quiz", quiz_name)
context = {"quiz": quiz}
no_of_attempts = frappe.db.count(
"LMS Quiz Submission", {"owner": frappe.session.user, "quiz": quiz_name}
)
if quiz.max_attempts and no_of_attempts >= quiz.max_attempts:
last_attempt_score = frappe.db.get_value(
"LMS Quiz Submission", {"owner": frappe.session.user, "quiz": quiz_name}, ["score"]
)
all_submissions = frappe.get_all(
"LMS Quiz Submission",
{
"quiz": quiz.name,
"member": frappe.session.user,
},
["name", "score", "creation"],
order_by="creation desc",
)
context.update({"attempts_exceeded": True, "last_attempt_score": last_attempt_score})
return frappe.render_template("templates/quiz.html", context)
return frappe.render_template(
"templates/quiz/quiz.html",
{
"quiz": quiz,
"no_of_attempts": no_of_attempts,
"all_submissions": all_submissions,
"hide_quiz": False,
},
)
def exercise_renderer(argument):

2
lms/public/css/style.css
View File

@@ -1950,7 +1950,7 @@ select {
}
.modal-title {
font-size: var(--text-base) !important;
font-size: var(--text-lg) !important;
}
.class-form-title {

2
lms/public/js/common_functions.js
View File

@@ -70,7 +70,7 @@ const file_size = (value) => {
const join_course = (e) => {
e.preventDefault();
let course = $("#outline-heading").attr("data-course");
let course = $(e.currentTarget).attr("data-course");
if (frappe.session.user == "Guest") {
window.location.href = `/login?redirect-to=/courses/${course}`;
return;

112
lms/templates/quiz.html → lms/templates/quiz/quiz.html
View File

@@ -1,16 +1,26 @@
{% if attempts_exceeded %}
<div class="">
<h2 class="mt-3">
{{ quiz.title }}
</h2>
<div class="alert alert-info medium mb-0">
{{ _("You have already exceeded the maximum number of attempts allowed for this quiz.") }}
{{ _("Your latest score is {0}.").format(last_attempt_score) }}
</div>
</div>
{% if not hide_quiz %}
<div class="mt-4">
<ul class="alert alert-info pl-8">
<li>
{{ _("This quiz consists of {0} questions.").format(quiz.questions | length) }}
</li>
{% if quiz.max_attempts %}
{% set suffix = "times" if quiz.max_attempts > 1 else "time" %}
<li>
{{ _("You can attempt this quiz only {0} {1}").format(quiz.max_attempts, suffix) }}
</li>
{% endif %}
{% if quiz.time %}
<li class="alert alert-info medium">
{{ _("The quiz has a time limit. For each question you will be given {0} seconds.").format(quiz.time) }}
</li>
{% endif %}
</ul>
{% else %}
<div class="">
<div id="start-banner" class="common-card-style column-card align-items-center">
<div class="text-center my-10">
@@ -18,30 +28,17 @@
{{ quiz.title }}
</div>
<div class="">
{{ _("This quiz consists of {0} questions.").format(quiz.questions | length) }}
{% if not quiz.max_attempts or no_of_attempts < quiz.max_attempts %}
<button class="btn btn-secondary btn-sm btn-start-quiz mt-4">
{{ _("Start") }}
</button>
{% else %}
<div>
{{ _("You have already exceeded the maximum number of attempts allowed for this quiz.") }}
</div>
{% endif %}
</div>
{% if quiz.max_attempts %}
{% set suffix = "times" if quiz.max_attempts > 1 else "time" %}
<div class="alert alert-info medium">
{{ _("This quiz can only be taken {0} {1}. If you attempt the quiz but leave the page before submitting,
the quiz will be automatically submitted.").format(quiz.max_attempts, suffix) }}
</div>
{% endif %}
{% if quiz.time %}
<div class="alert alert-info medium">
{{ _("The quiz has a time limit. For each question you will be given {0} seconds.").format(quiz.time) }}
</div>
{% endif %}
<button class="btn btn-secondary btn-sm btn-start-quiz mt-4">
{{ _("Start the Quiz") }}
</button>
</div>
</div>
<form id="quiz-form" class="common-card-style column-card hide">
@@ -108,23 +105,50 @@
</div>
{% endif %}
<button class="btn btn-secondary btn-sm pull-right" id="check" disabled>
{{ _("Check") }}
</button>
<div class="btn btn-secondary btn-sm hide" id="next">
<button class="btn btn-secondary btn-sm hide" id="next">
{{ _("Next Question") }}
</div>
<div class="btn btn-secondary btn-sm hide" id="summary">
</button>
<button class="btn btn-secondary btn-sm hide" id="summary">
{{ _("Submit") }}
</div>
<small id="submission-message" class="font-weight-bold hide">
{{ _("Please join the course to submit the Quiz.") }}
</small>
<div class="btn btn-secondary btn-sm hide" id="try-again">
</button>
<button class="btn btn-secondary btn-sm mx-auto hide" id="try-again" data-quiz="{{ quiz.name }}">
{{ _("Try Again") }}
</div>
</button>
</div>
</form>
</div>
{% endif %}
{% if all_submissions | length %}
<article class="mt-8">
<div class="field-label">
{{ _("All Submissions") }}
</div>
<div class="form-grid">
<div class="grid-heading-row">
<div class="grid-row">
<div class="data-row row">
<div class="col grid-static-col">{{ _("No.") }}</div>
<div class="col grid-static-col">{{ _("Date") }}</div>
<div class="col grid-static-col text-right">{{ _("Score") }}</div>
</div>
</div>
</div>
<div>
{% for submission in all_submissions %}
<div class="grid-row">
<div class="data-row row">
<div class="col grid-static-col">{{ loop.index }}</div>
<div class="col grid-static-col">{{ frappe.utils.format_datetime(submission.creation, "medium") }}</div>
<div class="col grid-static-col text-right">{{ submission.score }}</div>
</div>
</div>
{% endfor %}
</div>
</div>
</article>
{% endif %}

266
lms/templates/quiz/quiz.js Normal file
View File

@@ -0,0 +1,266 @@
frappe.ready(() => {
this.quiz_submitted = false;
this.answer = [];
this.is_correct = [];
const self = this;
localStorage.removeItem($("#quiz-title").data("name"));
$(".btn-start-quiz").click((e) => {
$("#start-banner").addClass("hide");
$("#quiz-form").removeClass("hide");
mark_active_question();
});
$(".option").click((e) => {
if (!$("#check").hasClass("hide")) enable_check(e);
});
$(".possibility").keyup((e) => {
enable_check(e);
});
$("#summary").click((e) => {
e.preventDefault();
add_to_local_storage();
quiz_summary(e);
});
$("#check").click((e) => {
e.preventDefault();
check_answer(e);
});
$("#next").click((e) => {
e.preventDefault();
add_to_local_storage();
mark_active_question(e);
});
$("#try-again").click((e) => {
try_quiz_again(e);
});
});
const mark_active_question = (e = undefined) => {
$(".timer").addClass("hide");
calculate_and_display_time(100);
$(".timer").removeClass("hide");
let current_index = $(".active-question").attr("data-qt-index") || 0;
let next_index = parseInt(current_index) + 1;
$(".question").addClass("hide").removeClass("active-question");
$(`.question[data-qt-index='${next_index}']`)
.removeClass("hide")
.addClass("active-question");
$(".current-question").text(`${next_index}`);
$("#check").removeClass("hide").attr("disabled", true);
$("#next").addClass("hide");
$(".explanation").addClass("hide");
initialize_timer();
};
const calculate_and_display_time = (percent_time) => {
$(".timer .progress-bar").attr("aria-valuenow", percent_time);
$(".timer .progress-bar").attr("aria-valuemax", percent_time);
$(".timer .progress-bar").css("width", `${percent_time}%`);
let progress_color = percent_time < 20 ? "red" : "var(--primary-color)";
$(".timer .progress-bar").css("background-color", progress_color);
};
const initialize_timer = () => {
this.time_left = $(".timer").data("time");
calculate_and_display_time(100, this.time_left);
$(".timer").removeClass("hide");
const total_time = $(".timer").data("time");
this.start_time = new Date().getTime();
const self = this;
let old_diff;
this.timer = setInterval(function () {
var diff = (new Date().getTime() - self.start_time) / 1000;
var variation = old_diff ? diff - old_diff : diff;
old_diff = diff;
self.time_left -= variation;
let percent_time = (self.time_left / total_time) * 100;
calculate_and_display_time(percent_time);
if (self.time_left <= 0) {
clearInterval(self.timer);
$(".timer").addClass("hide");
check_answer();
}
}, 100);
};
const enable_check = (e) => {
if ($(".option:checked").length || $(".possibility").val().trim()) {
$("#check").removeAttr("disabled");
$(".custom-checkbox").removeClass("active-option");
$(".option:checked")
.closest(".custom-checkbox")
.addClass("active-option");
}
};
const quiz_summary = (e = undefined) => {
e && e.preventDefault();
let quiz_name = $("#quiz-title").data("name");
let total_questions = $(".question").length;
let self = this;
frappe.call({
method: "lms.lms.doctype.lms_quiz.lms_quiz.quiz_summary",
args: {
quiz: quiz_name,
results: localStorage.getItem(quiz_name),
},
callback: (data) => {
$(".question").addClass("hide");
$("#summary").addClass("hide");
$(".quiz-footer span").addClass("hide");
$("#quiz-form").prepend(
`<div class="summary bold-heading text-center">
${__("Your score is")} ${data.message.score}
${__("out of")} ${total_questions}
</div>`
);
$("#try-again").attr("data-submission", data.message.submission);
$("#try-again").removeClass("hide");
self.quiz_submitted = true;
},
});
};
const try_quiz_again = (e) => {
e.preventDefault();
if (window.location.href.includes("new-submission")) {
const target = $(e.currentTarget);
window.location.href = `/quiz-submission/
${target.data("quiz")}/
${target.data("submission")}`;
} else {
window.location.reload();
}
};
const check_answer = (e = undefined) => {
e && e.preventDefault();
let answer = $(".active-question textarea");
if (answer.length && !answer.val().trim()) {
frappe.throw(__("Please enter your answer"));
}
clearInterval(self.timer);
$(".timer").addClass("hide");
let total_questions = $(".question").length;
let current_index = $(".active-question").attr("data-qt-index");
$(".explanation").removeClass("hide");
$("#check").addClass("hide");
if (current_index == total_questions) {
$("#summary").removeClass("hide");
} else {
$("#next").removeClass("hide");
}
parse_options();
};
const parse_options = () => {
let type = $(".active-question").data("type");
if (type == "Choices") {
$(".active-question input").each((i, element) => {
is_answer_correct(type, element);
});
} else {
is_answer_correct(type, $(".active-question textarea"));
}
};
const is_answer_correct = (type, element) => {
let answer = decodeURIComponent($(element).val());
frappe.call({
async: false,
method: "lms.lms.doctype.lms_quiz.lms_quiz.check_answer",
args: {
question: $(".active-question").data("name"),
type: type,
answer: answer,
},
callback: (data) => {
type == "Choices"
? parse_choices(element, data.message)
: parse_possible_answers(element, data.message);
},
});
};
const parse_choices = (element, correct) => {
if ($(element).prop("checked")) {
self.answer.push(decodeURIComponent($(element).val()));
correct && self.is_correct.push(1);
correct ? add_icon(element, "check") : add_icon(element, "wrong");
} else {
correct && self.is_correct.push(0);
correct
? add_icon(element, "minus-circle-green")
: add_icon(element, "minus-circle");
}
};
const parse_possible_answers = (element, correct) => {
self.answer.push(decodeURIComponent($(element).val()));
if (correct) {
self.is_correct.push(1);
show_indicator("success", element);
} else {
self.is_correct.push(0);
show_indicator("failure", element);
}
};
const show_indicator = (class_name, element) => {
let label = class_name == "success" ? "Correct" : "Incorrect";
let icon =
class_name == "success" ? "#icon-solid-success" : "#icon-solid-error";
$(`<div class="answer-indicator ${class_name}">
<svg class="icon icon-md">
<use href=${icon}>
</svg>
<span style="font-weight: 500">${__(label)}</span>
</div>`).insertAfter(element);
};
const add_icon = (element, icon) => {
$(element).closest(".custom-checkbox").removeClass("active-option");
$(element).closest(".option").addClass("hide");
let label = $(element).siblings(".option-text").text();
$(element).siblings(".option-text").html(`
<div>
<img class="d-inline mr-3" src="/assets/lms/icons/${icon}.svg">
${label}
</div>
`);
};
const add_to_local_storage = () => {
let current_index = $(".active-question").attr("data-qt-index");
let quiz_name = $("#quiz-title").data("name");
let quiz_stored = JSON.parse(localStorage.getItem(quiz_name));
let quiz_obj = {
question_index: current_index,
answer: self.answer.join(),
is_correct: self.is_correct,
};
quiz_stored ? quiz_stored.push(quiz_obj) : (quiz_stored = [quiz_obj]);
localStorage.setItem(quiz_name, JSON.stringify(quiz_stored));
self.answer = [];
self.is_correct = [];
};

2
lms/www/assignment_submission/assignment_submission.html
View File

@@ -32,6 +32,8 @@
<a class="dark-links" href="/classes">
{{ _("All Classes") }}
</a>
<img class="icon icon-sm mr-0" src="/assets/lms/icons/chevron-right.svg">
<span class="breadcrumb-destination">{{ _("Assignment Submission") }}</span>
</div>
</div>

4
lms/www/assignment_submission/assignment_submission.py
View File

@@ -5,6 +5,10 @@ from lms.lms.utils import has_course_moderator_role
def get_context(context):
context.no_cache = 1
if frappe.session.user == "Guest":
raise frappe.PermissionError(_("You don't have permission to access this page."))
context.is_moderator = has_course_moderator_role()
submission = frappe.form_dict["submission"]
assignment = frappe.form_dict["assignment"]

4
lms/www/batch/learn.html
View File

@@ -87,8 +87,7 @@
{% endif %}
</div>
<div class="course-home-headings title {% if membership %} is-member {% endif %}
{% if membership or is_instructor %} eligible-for-submission {% endif %}" id="title"
<div class="course-home-headings title {% if membership %} is-member {% endif %}" id="title"
data-index="{{ lesson_index }}" data-course="{{ course.name }}" data-chapter="{{ chapter }}"
{% if lesson.name %} data-lesson="{{ lesson.name }}" {% endif %}
>{% if lesson.title %}{{ lesson.title }}{% endif %}</div>
@@ -246,6 +245,7 @@
{{ super() }}
<script type="text/javascript">
var page_context = {{ page_context | tojson }};
{% include "lms/templates/quiz/quiz.js" %}
</script>
{% for ext in page_extensions %}
{{ ext.render_footer() }}

266
lms/www/batch/learn.js
View File

@@ -1,25 +1,13 @@
frappe.ready(() => {
this.marked_as_complete = false;
this.quiz_submitted = false;
this.answer = [];
this.is_correct = [];
let self = this;
frappe.telemetry.capture("on_lesson_page", "lms");
localStorage.removeItem($("#quiz-title").data("name"));
fetch_assignments();
save_current_lesson();
$(".option").click((e) => {
if (!$("#check").hasClass("hide")) enable_check(e);
});
$(".possibility").keyup((e) => {
enable_check(e);
});
$(window).scroll(() => {
let self = this;
if (
@@ -32,24 +20,6 @@ frappe.ready(() => {
}
});
$("#summary").click((e) => {
add_to_local_storage();
quiz_summary(e);
});
$("#check").click((e) => {
check_answer(e);
});
$("#next").click((e) => {
add_to_local_storage();
mark_active_question(e);
});
$("#try-again").click((e) => {
try_quiz_again(e);
});
$("#certification").click((e) => {
create_certificate(e);
});
@@ -62,12 +32,6 @@ frappe.ready(() => {
clear_work(e);
});
$(".btn-start-quiz").click((e) => {
$("#start-banner").addClass("hide");
$("#quiz-form").removeClass("hide");
mark_active_question();
});
$(".btn-back").click((e) => {
window.location.href = window.location.href.split("?")[0];
});
@@ -76,15 +40,6 @@ frappe.ready(() => {
frappe.utils.copy_to_clipboard($(e.currentTarget).data("link"));
$(".attachments").collapse("hide");
});
if ($("#quiz-title").data("max-attempts")) {
window.addEventListener("beforeunload", (e) => {
e.returnValue = "";
if ($(".active-question").length && !self.quiz_submitted) {
quiz_summary();
}
});
}
});
const save_current_lesson = () => {
@@ -96,35 +51,6 @@ const save_current_lesson = () => {
}
};
const enable_check = (e) => {
if ($(".option:checked").length || $(".possibility").val().trim()) {
$("#check").removeAttr("disabled");
$(".custom-checkbox").removeClass("active-option");
$(".option:checked")
.closest(".custom-checkbox")
.addClass("active-option");
}
};
const mark_active_question = (e = undefined) => {
$(".timer").addClass("hide");
calculate_and_display_time(100);
$(".timer").removeClass("hide");
let current_index = $(".active-question").attr("data-qt-index") || 0;
let next_index = parseInt(current_index) + 1;
$(".question").addClass("hide").removeClass("active-question");
$(`.question[data-qt-index='${next_index}']`)
.removeClass("hide")
.addClass("active-question");
$(".current-question").text(`${next_index}`);
$("#check").removeClass("hide").attr("disabled", true);
$("#next").addClass("hide");
$(".explanation").addClass("hide");
initialize_timer();
};
const mark_progress = () => {
let status = "Complete";
frappe.call({
@@ -155,166 +81,6 @@ const show_certificate_if_course_completed = (data) => {
}
};
const quiz_summary = (e = undefined) => {
e && e.preventDefault();
let quiz_name = $("#quiz-title").data("name");
let total_questions = $(".question").length;
let self = this;
frappe.call({
method: "lms.lms.doctype.lms_quiz.lms_quiz.quiz_summary",
args: {
quiz: quiz_name,
results: localStorage.getItem(quiz_name),
},
callback: (data) => {
$(".question").addClass("hide");
$("#summary").addClass("hide");
$("#quiz-form")
.parent()
.prepend(
`<div class="summary">
<div class="font-weight-bold"> ${__("Score")}: ${
data.message
}/${total_questions} </div>
</div>`
);
$("#try-again").removeClass("hide");
self.quiz_submitted = true;
},
});
};
const try_quiz_again = (e) => {
window.location.reload();
};
const check_answer = (e = undefined) => {
e && e.preventDefault();
let answer = $(".active-question textarea");
if (answer.length && !answer.val().trim()) {
frappe.throw(__("Please enter your answer"));
}
clearInterval(self.timer);
$(".timer").addClass("hide");
let total_questions = $(".question").length;
let current_index = $(".active-question").attr("data-qt-index");
$(".explanation").removeClass("hide");
$("#check").addClass("hide");
if (current_index == total_questions) {
if ($(".eligible-for-submission").length) {
$("#summary").removeClass("hide");
} else {
$("#submission-message").removeClass("hide");
}
} else {
$("#next").removeClass("hide");
}
parse_options();
};
const parse_options = () => {
let type = $(".active-question").data("type");
if (type == "Choices") {
$(".active-question input").each((i, element) => {
is_answer_correct(type, element);
});
} else {
is_answer_correct(type, $(".active-question textarea"));
}
};
const is_answer_correct = (type, element) => {
let answer = decodeURIComponent($(element).val());
frappe.call({
async: false,
method: "lms.lms.doctype.lms_quiz.lms_quiz.check_answer",
args: {
question: $(".active-question").data("name"),
type: type,
answer: answer,
},
callback: (data) => {
type == "Choices"
? parse_choices(element, data.message)
: parse_possible_answers(element, data.message);
},
});
};
const parse_choices = (element, correct) => {
if ($(element).prop("checked")) {
self.answer.push(decodeURIComponent($(element).val()));
correct && self.is_correct.push(1);
correct ? add_icon(element, "check") : add_icon(element, "wrong");
} else {
correct && self.is_correct.push(0);
correct
? add_icon(element, "minus-circle-green")
: add_icon(element, "minus-circle");
}
};
const parse_possible_answers = (element, correct) => {
self.answer.push(decodeURIComponent($(element).val()));
if (correct) {
self.is_correct.push(1);
show_indicator("success", element);
} else {
self.is_correct.push(0);
show_indicator("failure", element);
}
};
const show_indicator = (class_name, element) => {
let label = class_name == "success" ? "Correct" : "Incorrect";
let icon =
class_name == "success" ? "#icon-solid-success" : "#icon-solid-error";
$(`<div class="answer-indicator ${class_name}">
<svg class="icon icon-md">
<use href=${icon}>
</svg>
<span style="font-weight: 500">${__(label)}</span>
</div>`).insertAfter(element);
};
const add_icon = (element, icon) => {
$(element).closest(".custom-checkbox").removeClass("active-option");
$(element).closest(".option").addClass("hide");
let label = $(element).siblings(".option-text").text();
$(element).siblings(".option-text").html(`
<div>
<img class="d-inline mr-3" src="/assets/lms/icons/${icon}.svg">
${label}
</div>
`);
};
const add_to_local_storage = () => {
let current_index = $(".active-question").attr("data-qt-index");
let quiz_name = $("#quiz-title").data("name");
let quiz_stored = JSON.parse(localStorage.getItem(quiz_name));
let quiz_obj = {
question_index: current_index,
answer: self.answer.join(),
is_correct: self.is_correct,
};
quiz_stored ? quiz_stored.push(quiz_obj) : (quiz_stored = [quiz_obj]);
localStorage.setItem(quiz_name, JSON.stringify(quiz_stored));
self.answer = [];
self.is_correct = [];
};
const create_certificate = (e) => {
e.preventDefault();
course = $(".title").attr("data-course");
@@ -483,35 +249,3 @@ const fetch_assignments = () => {
},
});
};
const initialize_timer = () => {
this.time_left = $(".timer").data("time");
calculate_and_display_time(100, this.time_left);
$(".timer").removeClass("hide");
const total_time = $(".timer").data("time");
this.start_time = new Date().getTime();
const self = this;
let old_diff;
this.timer = setInterval(function () {
var diff = (new Date().getTime() - self.start_time) / 1000;
var variation = old_diff ? diff - old_diff : diff;
old_diff = diff;
self.time_left -= variation;
let percent_time = (self.time_left / total_time) * 100;
calculate_and_display_time(percent_time);
if (self.time_left <= 0) {
clearInterval(self.timer);
$(".timer").addClass("hide");
check_answer();
}
}, 100);
};
const calculate_and_display_time = (percent_time) => {
$(".timer .progress-bar").attr("aria-valuenow", percent_time);
$(".timer .progress-bar").attr("aria-valuemax", percent_time);
$(".timer .progress-bar").css("width", `${percent_time}%`);
let progress_color = percent_time < 20 ? "red" : "var(--primary-color)";
$(".timer .progress-bar").css("background-color", progress_color);
};

22
lms/www/batch/quiz.html
View File

@@ -58,13 +58,16 @@
</div>
</div>
{% if quiz.name %}
<div class="align-self-center">
<button class="btn btn-primary btn-sm btn-add-question">
{% if quiz.name %}
<button class="btn btn-secondary btn-sm btn-add-question mr-2">
{{ _("Add Question") }}
</button>
{% endif %}
<button class="btn btn-primary btn-sm btn-save-quiz">
{{ _("Save") }}
</button>
</div>
{% endif %}
</div>
</div>
@@ -86,6 +89,19 @@
<input type="text" class="field-input" id="quiz-title" {% if quiz.name %} value="{{ quiz.title }}" data-title="{{ quiz.title }}" {% endif %}>
</div>
</div>
<div class="field-group">
<div class="field-label">
{{ _("Max Attempts") }}
</div>
<div class="field-description">
{{ _("Enter the maximum number of times a user can attempt this quiz") }}
</div>
<div>
{% set max_attempts = quiz.max_attempts if quiz.name else 1 %}
<input type="number" class="field-input" id="max-attempts" value="{{ max_attempts }}">
</div>
</div>
</div>
{% endmacro %}

30
lms/www/batch/quiz.js
View File

@@ -1,8 +1,9 @@
frappe.ready(() => {
$("#quiz-title").focusout((e) => {
if ($("#quiz-title").val() != $("#quiz-title").data("title")) {
save_quiz({ quiz_title: $("#quiz-title").val() });
}
$(".btn-save-quiz").click((e) => {
save_quiz({
quiz_title: $("#quiz-title").val(),
max_attempts: $("#max-attempts").val(),
});
});
$(".question-row").click((e) => {
@@ -14,26 +15,6 @@ frappe.ready(() => {
});
});
const show_quiz_modal = () => {
let quiz_dialog = new frappe.ui.Dialog({
title: __("Create Quiz"),
fields: [
{
fieldtype: "Data",
label: __("Quiz Title"),
fieldname: "quiz_title",
reqd: 1,
},
],
primary_action: (values) => {
quiz_dialog.hide();
save_quiz(values);
},
});
quiz_dialog.show();
};
const show_question_modal = (values = {}) => {
let fields = get_question_fields(values);
@@ -142,6 +123,7 @@ const save_quiz = (values) => {
method: "lms.lms.doctype.lms_quiz.lms_quiz.save_quiz",
args: {
quiz_title: values.quiz_title,
max_attempts: values.max_attempts,
quiz: $("#quiz-form").data("name") || "",
},
callback: (data) => {

4
lms/www/batch/quiz.py
View File

@@ -20,7 +20,9 @@ def get_context(context):
else:
fields_arr = ["name", "question", "type"]
context.quiz = frappe.db.get_value("LMS Quiz", quizname, ["title", "name"], as_dict=1)
context.quiz = frappe.db.get_value(
"LMS Quiz", quizname, ["title", "name", "max_attempts"], as_dict=1
)
context.quiz.questions = frappe.get_all(
"LMS Quiz Question", {"parent": quizname}, fields_arr, order_by="idx"
)

73
lms/www/classes/class.html
View File

@@ -260,49 +260,58 @@
{{ _("Create New") }}
</div>
<p class="field-description">
{{ _("To create a new assignment for this class, click on the create assignment button. Once you have created the new assignment you can come back to the class and add the assignment from here.") }}
{{ _("To create a new assignment or quiz for this class, click on the buttons below. Once you have created the new assignment or quiz you can come back and add it from here.") }}
</p>
<div>
<div class="flex">
<a class="btn btn-default btn-sm" href="/assignments/new-assignment">
{{ _("Create Assignment") }}
</a>
<a class="btn btn-default btn-sm ml-2" href="/quizzes/new-quiz">
{{ _("Create Quiz") }}
</a>
</div>
</div>
<form class="" id="assessment-form">
{% if all_assignments | length %}
<div>
<div class="field-label mb-2">
{{ _("Assignments") }}
</div>
<p class="field-description">
{{ _("Select the assignments you wish to include for the assessment of this class. Your selections will be automatically saved upon clicking. If you decide to remove an item from the list, simply uncheck it.") }}
</p>
{% for assignment in all_assignments %}
<div>
<label class="vertically-center">
<input type="checkbox" class="assessment-item" {% if assignment.checked %} checked {% endif %} value="{{ assignment.name }}" data-type="LMS Assignment" data-name="{{ assignment.name }}">
{{ assignment.title }}
</label>
<div class="field-label mb-2">
{{ _("Select Assessments") }}
</div>
<p class="field-description">
{{ _("Select the assessments you wish to include for this class. Your selections will be automatically saved upon clicking. If you decide to remove an item from the list, simply uncheck it.") }}
</p>
<div class="flex justify-content-between">
{% if all_assignments | length %}
<div>
<div class="field-label mb-2">
{{ _("Assignments") }}
</div>
{% endfor %}
</div>
{% endif %}
<!-- {% if all_quizzes | length %}
<div>
<div class="field-label mb-2">
{{ _("Quiz") }}
{% for assignment in all_assignments %}
<div>
<label class="vertically-center">
<input type="checkbox" class="assessment-item" {% if assignment.checked %} checked {% endif %} value="{{ assignment.name }}" data-type="LMS Assignment" data-name="{{ assignment.name }}">
{{ assignment.title }}
</label>
</div>
{% endfor %}
</div>
{% for quiz in all_quizzes %}
<div>
<label class="vertically-center">
<input type="checkbox" class="assessment-item" {% if quiz.checked %} checked {% endif %} value="{{ quiz.name }}" data-type="LMS Quiz" data-name="{{ quiz.name }}">
{{ quiz.title }}
</label>
{% endif %}
{% if all_quizzes | length %}
<div>
<div class="field-label mb-2">
{{ _("Quizzes") }}
</div>
{% endfor %}
</div>
{% endif %} -->
{% for quiz in all_quizzes %}
<div>
<label class="vertically-center">
<input type="checkbox" class="assessment-item" {% if quiz.checked %} checked {% endif %} value="{{ quiz.name }}" data-type="LMS Quiz" data-name="{{ quiz.name }}">
{{ quiz.title }}
</label>
</div>
{% endfor %}
</div>
{% endif %}
</div>
</form>
</div>

10
lms/www/classes/class.py
View File

@@ -76,9 +76,8 @@ def get_context(context):
def get_all_quizzes(class_name):
all_quizzes = frappe.get_all(
"LMS Quiz", {"owner": frappe.session.user}, ["name", "title"]
)
filters = {} if has_course_moderator_role() else {"owner": frappe.session.user}
all_quizzes = frappe.get_all("LMS Quiz", filters, ["name", "title"])
for quiz in all_quizzes:
quiz.checked = frappe.db.exists(
{
@@ -92,9 +91,8 @@ def get_all_quizzes(class_name):
def get_all_assignments(class_name):
all_assignments = frappe.get_all(
"LMS Assignment", {"owner": frappe.session.user}, ["name", "title"]
)
filters = {} if has_course_moderator_role() else {"owner": frappe.session.user}
all_assignments = frappe.get_all("LMS Assignment", filters, ["name", "title"])
for assignment in all_assignments:
assignment.checked = frappe.db.exists(
{

114
lms/www/classes/progress.html
View File

@@ -1,6 +1,6 @@
{% extends "lms/templates/lms_base.html" %}
{% block title %}
{{ student.first_name }} 's {{ _("Progress") }}
{{ student.first_name }}'s {{ _("Progress") }}
{% endblock %}
@@ -15,61 +15,93 @@
{% macro Header() %}
<header class="sticky mb-5">
<div class="container form-width">
<div class="edit-header">
<div>
<div class="page-title">
{{ _("{0}'s Progress").format(student.full_name) }}
</div>
<div class="vertically-center small">
<a class="dark-links" href="/classes">
{{ _("All Classes") }}
</a>
<img class="icon icon-sm mr-0" src="/assets/lms/icons/chevron-right.svg">
<div class="container form-width">
<div class="edit-header">
<div>
<div class="page-title">
{{ _("{0}").format(student.full_name) }}
</div>
<div class="vertically-center small">
<a class="dark-links" href="/classes">
{{ _("All Classes") }}
</a>
<img class="icon icon-sm mr-0" src="/assets/lms/icons/chevron-right.svg">
<a class="dark-links" href="/classes/{{ class_info.name }}">
{{ class_info.name }}
</a>
<img class="icon icon-sm mr-0" src="/assets/lms/icons/chevron-right.svg">
<span class="breadcrumb-destination">{{ _("{0}'s Progress").format(student.full_name) }}</span>
</div>
</div>
{{ class_info.name }}
</a>
<img class="icon icon-sm mr-0" src="/assets/lms/icons/chevron-right.svg">
<span class="breadcrumb-destination">{{ _("Student Progress").format(student.full_name) }}</span>
</div>
</div>
{% if is_moderator %}
<div class="align-self-center">
<a class="btn btn-primary btn-sm btn-evaluate" href=/evaluation/new?member={{student.name}}&date={{frappe.utils.getdate()}}&class={{class_info.name}}">
{{ _("Evaluate") }}
<div class="align-self-center">
<a class="btn btn-default btn-sm mr-2" href="/users/{{ student.username }}">
{{ _("View Profile") }}
</a>
</div>
<a class="btn btn-primary btn-sm btn-evaluate" href=/evaluation/new?member={{student.name}}&date={{frappe.utils.getdate()}}&class={{class_info.name}}">
{{ _("Evaluate") }}
</a>
</div>
{% endif %}
</div>
</div>
</div>
</div>
</header>
{% endmacro %}
{% macro Progress(class_info, student) %}
{% if assessments | length %}
<article>
{% for assessment in assessments %}
<div class="list-row level">
<a {% if is_moderator and assessment.submission or frappe.session.user == student.name %} class="clickable" href="{{ assessment.url }}" {% endif %}>
{{ assessment.title }}
</a>
{% if assessment.submission %}
{% set status = assessment.submission.status %}
{% set color = "green" if status == "Pass" else "red" if status == "Fail" else "orange" %}
<div>
<div class="indicator-pill {{ color }}">
{{ assessment.submission.status }}
<article class="form-grid">
<div class="grid-heading-row">
<div class="grid-row">
<div class="data-row row">
<div class="col grid-static-col">
{{ _("Assessment") }}
</div>
<div class="col grid-static-col">
{{ _("Type") }}
</div>
<div class="col grid-static-col">
{{ _("Status/Score") }}
</div>
</div>
{% else %}
<div class="indicator-pill red">
{{ _("Not Attempted") }}
</div>
</div>
{% for assessment in assessments %}
{% set has_access = is_moderator and assessment.submission or frappe.session.user == student.name %}
<div class="grid-row">
<div class="data-row row">
<a class="col grid-static-col {% if has_access %} clickable {% endif %}" {% if has_access %} href="{{ assessment.url }}" {% endif %}>
{{ assessment.title }}
</a>
<div class="col grid-static-col">
{{ (assessment.assessment_type).split("LMS ")[1] }}
</div>
{% endif %}
<div class="col grid-static-col mb-2">
{% if assessment.submission %}
{% if assessment.assessment_type == "LMS Assignment" %}
{% set status = assessment.submission.status %}
{% set color = "green" if status == "Pass" else "red" if status == "Fail" else "orange" %}
<div class="indicator-pill {{ color }}">
{{ status }}
</div>
{% else %}
<div>
{{ assessment.submission.score }}
</div>
{% endif %}
{% else %}
<div class="indicator-pill red">
{{ _("Not Attempted") }}
</div>
{% endif %}
</div>
</div>
</div>
{% endfor %}
</article>

55
lms/www/quiz_submission/quiz_submission.html Normal file
View File

@@ -0,0 +1,55 @@
{% extends "lms/templates/lms_base.html" %}
{% block title %}
{{ quiz.title }}
{% endblock %}
{% block page_content %}
<main class="common-page-style">
{{ Header() }}
<div class="container form-width">
{{ SubmissionForm(quiz) }}
</div>
</main>
{% endblock %}
{% macro Header() %}
<header class="sticky mb-5">
<div class="container form-width">
<div class="edit-header">
<div>
<div class="vertically-center">
<div class="page-title">
{{ quiz.title }}
</div>
</div>
<div class="vertically-center small">
<a class="dark-links" href="/classes">
{{ _("All Classes") }}
</a>
<img class="icon icon-sm mr-0" src="/assets/lms/icons/chevron-right.svg">
<span class="breadcrumb-destination">{{ _("Quiz Submission") }}</span>
</div>
</div>
<div class="align-self-center">
<!-- <button class="btn btn-primary btn-sm btn-save-assignment" {% if quiz.name %} data-quiz="{{ quiz.name }}" {% endif %}
{% if submission.name %} data-submission="{{ submission.name }}" {% endif %}>
{{ _("Save") }}
</button> -->
</div>
</div>
</div>
</header>
{% endmacro %}
{% macro SubmissionForm(quiz) %}
{% include("lms/templates/quiz/quiz.html") %}
{% endmacro %}
{% block script %}
{{ super() }}
<script type="text/javascript">
{% include "lms/templates/quiz/quiz.js" %}
</script>
{% endblock %}

49
lms/www/quiz_submission/quiz_submission.py Normal file
View File

@@ -0,0 +1,49 @@
import frappe
from lms.lms.utils import has_course_moderator_role
from frappe import _
def get_context(context):
context.no_cache = 1
if frappe.session.user == "Guest":
raise frappe.PermissionError(_("You don't have permission to access this page."))
context.is_moderator = has_course_moderator_role()
submission = frappe.form_dict["submission"]
quiz_name = frappe.form_dict["quiz"]
context.quiz = frappe.get_doc("LMS Quiz", quiz_name)
if submission == "new-submission":
context.submission = frappe._dict()
context.no_of_attempts = 0
context.hide_quiz = False
else:
context.submission = frappe.db.get_value(
"LMS Quiz Submission",
submission,
["name", "score", "member", "member_name"],
as_dict=True,
)
if not context.is_moderator and frappe.session.user != context.submission.member:
raise frappe.PermissionError(_("You don't have permission to access this page."))
if not context.quiz or not context.submission:
raise frappe.PermissionError(_("Invalid Submission URL"))
context.all_submissions = frappe.get_all(
"LMS Quiz Submission",
{
"quiz": context.quiz.name,
"member": context.submission.member,
},
["name", "score", "creation"],
order_by="creation desc",
)
context.no_of_attempts = len(context.all_submissions) or 0
context.hide_quiz = (
context.is_moderator and context.submission.member != frappe.session.user
)

83
lms/www/utils.py
View File

@@ -71,35 +71,60 @@ def get_assessments(class_name, member=None):
for assessment in assessments:
if assessment.assessment_type == "LMS Assignment":
assessment.title = frappe.db.get_value(
"LMS Assignment", assessment.assessment_name, "title"
)
existing_submission = frappe.db.exists(
{
"doctype": "LMS Assignment Submission",
"member": member,
"assignment": assessment.assessment_name,
}
)
if existing_submission:
assessment.submission = frappe.db.get_value(
"LMS Assignment Submission",
existing_submission,
["name", "status", "comments"],
as_dict=True,
)
assessment.edit_url = f"/assignments/{assessment.assessment_name}"
submission_name = existing_submission if existing_submission else "new-submission"
assessment.url = (
f"/assignment-submission/{assessment.assessment_name}/{submission_name}"
)
assessment = get_assignment_details(assessment, member)
elif assessment.assessment_type == "LMS Quiz":
assessment.title = frappe.db.get_value(
"LMS Quiz", assessment.assessment_name, "title"
)
assessment.url = f"/quizzes/{assessment.assessment_name}"
assessment = get_quiz_details(assessment, member)
return assessments
def get_assignment_details(assessment, member):
assessment.title = frappe.db.get_value(
"LMS Assignment", assessment.assessment_name, "title"
)
existing_submission = frappe.db.exists(
{
"doctype": "LMS Assignment Submission",
"member": member,
"assignment": assessment.assessment_name,
}
)
if existing_submission:
assessment.submission = frappe.db.get_value(
"LMS Assignment Submission",
existing_submission,
["name", "status", "comments"],
as_dict=True,
)
assessment.edit_url = f"/assignments/{assessment.assessment_name}"
submission_name = existing_submission if existing_submission else "new-submission"
assessment.url = (
f"/assignment-submission/{assessment.assessment_name}/{submission_name}"
)
def get_quiz_details(assessment, member):
assessment.title = frappe.db.get_value("LMS Quiz", assessment.assessment_name, "title")
existing_submission = frappe.get_all(
"LMS Quiz Submission",
{
"member": member,
"quiz": assessment.assessment_name,
},
["name", "score"],
order_by="creation desc",
)
if len(existing_submission):
assessment.submission = existing_submission[0]
assessment.edit_url = f"/quizzes/{assessment.assessment_name}"
submission_name = (
existing_submission[0].name if len(existing_submission) else "new-submission"
)
assessment.url = f"/quiz-submission/{assessment.assessment_name}/{submission_name}"