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

fix: quiz and timetable issues

Browse Source
This commit is contained in:
Jannat Patel
2023-11-24 12:37:34 +05:30
parent ddcb718a3a
commit fd9a638879
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/templates/quiz/quiz.js
View File

@@ -182,7 +182,7 @@ const check_answer = (e = undefined) => {
$(".explanation").removeClass("hide"); $(".explanation").removeClass("hide");
$("#check").addClass("hide"); $("#check").addClass("hide");
if (current_index == total_questions) { if (current_index == total_questions - 1) {
$("#summary").removeClass("hide"); $("#summary").removeClass("hide");
} else if (this.show_answers) { } else if (this.show_answers) {
$("#next").removeClass("hide"); $("#next").removeClass("hide");

12
lms/www/batches/batch.js
View File

@@ -658,7 +658,7 @@ const setup_calendar = (events) => {
const calendar = new Calendar(container, options); const calendar = new Calendar(container, options);
this.calendar_ = calendar; this.calendar_ = calendar;
create_events(calendar, events); create_events(calendar, events, calendar_id);
add_links_to_events(calendar, events); add_links_to_events(calendar, events);
scroll_to_date(calendar, events); scroll_to_date(calendar, events);
set_calendar_range(calendar, events); set_calendar_range(calendar, events);
@@ -710,8 +710,8 @@ const create_events = (calendar, events, calendar_id) => {
id: `event${idx}`, id: `event${idx}`,
calendarId: calendar_id, calendarId: calendar_id,
title: event.title, title: event.title,
start: `${event.date}T${event.start_time}`, start: `${event.date}T${format_time(event.start_time)}`,
end: `${event.date}T${event.end_time}`, end: `${event.date}T${format_time(event.end_time)}`,
isAllday: event.start_time ? false : true, isAllday: event.start_time ? false : true,
borderColor: clr, borderColor: clr,
backgroundColor: "var(--fg-color)", backgroundColor: "var(--fg-color)",
@@ -735,6 +735,12 @@ const create_events = (calendar, events, calendar_id) => {
calendar.createEvents(calendar_events); calendar.createEvents(calendar_events);
}; };
const format_time = (time) => {
let time_arr = time.split(":");
if (time_arr[0] < 10) time_arr[0] = "0" + time_arr[0];
return time_arr.join(":");
};
const add_links_to_events = (calendar) => { const add_links_to_events = (calendar) => {
calendar.on("clickEvent", ({ event }) => { calendar.on("clickEvent", ({ event }) => {
let event_date = event.start.d.d; let event_date = event.start.d.d;

26
lms/www/quiz_submission/quiz_submission.py
View File

@@ -47,9 +47,20 @@ def get_context(context):
quiz.questions.append(details) quiz.questions.append(details)
context.quiz = quiz context.quiz = quiz
context.all_submissions = frappe.get_all(
"LMS Quiz Submission",
{
"quiz": context.quiz.name,
"member": frappe.session.user,
},
["name", "score", "creation"],
order_by="creation desc",
)
context.no_of_attempts = len(context.all_submissions) or 0
if submission == "new-submission": if submission == "new-submission":
context.submission = frappe._dict() context.submission = frappe._dict()
context.no_of_attempts = 0
context.hide_quiz = False context.hide_quiz = False
else: else:
context.submission = frappe.db.get_value( context.submission = frappe.db.get_value(
@@ -65,17 +76,6 @@ def get_context(context):
if not context.quiz or not context.submission: if not context.quiz or not context.submission:
raise frappe.PermissionError(_("Invalid Submission URL")) 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.hide_quiz = (
context.is_moderator and context.submission.member != frappe.session.user context.is_moderator or context.submission.member != frappe.session.user
) )