MIDNIGHT/enlight-lms
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: quiz max attempts

Browse Source
This commit is contained in:
Jannat Patel
2023-06-21 20:11:30 +05:30
parent da72513f6a
commit 7d18e1d928
14 changed files with 262 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lms/www/assignment_submission/assignment_submission.html
+2
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>
lms/www/batch/learn.js
-1
View File
@@ -3,7 +3,6 @@ frappe.ready(() => {
let self = this;
frappe.telemetry.capture("on_lesson_page", "lms");
localStorage.removeItem($("#quiz-title").data("name"));
fetch_assignments();
lms/www/batch/quiz.html
+19 -3
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 %}
lms/www/batch/quiz.js
+6 -24
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) => {
lms/www/batch/quiz.py
+3 -1
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"
)
lms/www/classes/progress.html
+73 -41
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>
lms/www/quiz_submission/quiz_submission.html
+2 -5
View File
@@ -21,16 +21,13 @@
<div class="page-title">
{{ quiz.title }}
</div>
{% if submission.score %}
<div>
{{ submission.score }}
</div>
{% endif %}
</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>
lms/www/quiz_submission/quiz_submission.py
+18 -1
View File
@@ -24,8 +24,25 @@ def get_context(context):
["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.assignment or not context.submission:
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
)
print(context.no_of_attempts)
lms/www/utils.py
+10 -11
View File
@@ -110,22 +110,21 @@ def get_assignment_details(assessment, member):
def get_quiz_details(assessment, member):
assessment.title = frappe.db.get_value("LMS Quiz", assessment.assessment_name, "title")
existing_submission = frappe.db.exists(
existing_submission = frappe.get_all(
"LMS Quiz Submission",
{
"doctype": "LMS Quiz Submission",
"member": member,
"quiz": assessment.assessment_name,
}
},
["name", "score"],
order_by="creation desc",
)
if existing_submission:
assessment.submission = frappe.db.get_value(
"LMS Quiz Submission",
existing_submission,
["name", "score"],
as_dict=True,
)
if len(existing_submission):
assessment.submission = existing_submission[0]
assessment.edit_url = f"/quizzes/{assessment.assessment_name}"
submission_name = existing_submission if existing_submission else "new-submission"
submission_name = (
existing_submission[0].name if len(existing_submission) else "new-submission"
)
assessment.url = f"/quiz-submission/{assessment.assessment_name}/{submission_name}"