From 2c8ce133f7b4245a62f377b532fbc4ef0a87a096 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 2 Jun 2025 19:12:13 +0530
Subject: [PATCH] fix: quiz and time validation before linking to video

---
 .../src/components/Modals/QuizInVideo.vue     | 58 +++++++++++++++----
 frontend/src/components/VideoBlock.vue        | 11 +---
 frontend/src/pages/LessonForm.vue             |  2 +-
 frontend/src/utils/index.js                   |  7 +++
 .../doctype/course_lesson/course_lesson.py    |  3 -
 5 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/frontend/src/components/Modals/QuizInVideo.vue b/frontend/src/components/Modals/QuizInVideo.vue
index 18575fa3..623d8220 100644
--- a/frontend/src/components/Modals/QuizInVideo.vue
+++ b/frontend/src/components/Modals/QuizInVideo.vue
@@ -60,9 +60,15 @@
 						<ListRows>
 							<ListRow :row="row" v-for="row in allQuizzes">
 								<template #default="{ column, item }">
-									<ListRowItem :item="row[column.key]" :align="column.align">
-										<div class="leading-5 text-sm">
-											{{ row[column.key] }}
+									<ListRowItem
+										:item="row[column.key as keyof Quiz]"
+										:align="column.align"
+									>
+										<div v-if="column.key == 'time'" class="leading-5 text-sm">
+											{{ formatTimestamp(row[column.key as keyof Quiz]) }}
+										</div>
+										<div v-else class="leading-5 text-sm">
+											{{ row[column.key as keyof Quiz] }}
 										</div>
 									</ListRowItem>
 								</template>
@@ -107,17 +113,18 @@ import {
 } from 'frappe-ui'
 import { computed, reactive, ref, watch } from 'vue'
 import { Plus, Trash2 } from 'lucide-vue-next'
+import { formatTimestamp } from '@/utils'
 import Link from '@/components/Controls/Link.vue'
 
 type Quiz = {
-	time: number
+	time: string
 	quiz: string
 }
 
 const show = defineModel()
 const allQuizzes = ref<Quiz[]>([])
 const quiz = reactive<Quiz>({
-	time: 0,
+	time: '',
 	quiz: '',
 })
 
@@ -137,10 +144,9 @@ const props = defineProps({
 })
 
 const addQuiz = () => {
-	if (quiz.time > props.duration) {
-		toast.error(__('Time in video exceeds the total duration of the video.'))
-		return
-	}
+	quiz.time = `${getTimeInSeconds()}`
+	if (!isTimeValid() || !isFormComplete()) return
+
 	allQuizzes.value.push({
 		time: quiz.time,
 		quiz: quiz.quiz,
@@ -148,10 +154,42 @@ const addQuiz = () => {
 
 	props.saveQuizzes(allQuizzes.value)
 
-	quiz.time = 0
+	quiz.time = ''
 	quiz.quiz = ''
 }
 
+const getTimeInSeconds = () => {
+	if (quiz.time && !quiz.time.includes(':')) {
+		quiz.time = `${quiz.time}:00`
+	}
+	const timeParts = quiz.time.split(':')
+	const timeInSeconds = parseInt(timeParts[0]) * 60 + parseInt(timeParts[1])
+
+	return timeInSeconds
+}
+
+const isTimeValid = () => {
+	if (parseInt(quiz.time) > props.duration) {
+		toast.error(__('Time in video exceeds the total duration of the video.'))
+		return false
+	}
+	return true
+}
+
+const isFormComplete = () => {
+	if (!quiz.time) {
+		toast.error(__('Please enter a valid timestamp'))
+		return false
+	}
+
+	if (!quiz.quiz) {
+		toast.error(__('Please select a quiz'))
+		return false
+	}
+
+	return true
+}
+
 const removeQuiz = (selections: string, unselectAll: () => void) => {
 	Array.from(selections).forEach((selection) => {
 		const index = allQuizzes.value.findIndex((q) => q.quiz === selection)
diff --git a/frontend/src/components/VideoBlock.vue b/frontend/src/components/VideoBlock.vue
index e5c06a76..edfd3ae8 100644
--- a/frontend/src/components/VideoBlock.vue
+++ b/frontend/src/components/VideoBlock.vue
@@ -118,10 +118,10 @@
 	/>
 </template>
 <script setup>
-import { ref, onMounted, computed, watch } from 'vue'
+import { ref, onMounted, computed } from 'vue'
 import { Pause, Maximize, Volume2, VolumeX } from 'lucide-vue-next'
 import { Button } from 'frappe-ui'
-import { formatSeconds } from '@/utils'
+import { formatSeconds, formatTimestamp } from '@/utils'
 import Play from '@/components/Icons/Play.vue'
 import QuizInVideo from '@/components/Modals/QuizInVideo.vue'
 
@@ -259,13 +259,6 @@ const toggleFullscreen = () => {
 		videoContainer.value.requestFullscreen()
 	}
 }
-
-const formatTimestamp = (seconds) => {
-	const date = new Date(seconds * 1000)
-	const minutes = String(date.getUTCMinutes()).padStart(2, '0')
-	const secs = String(date.getUTCSeconds()).padStart(2, '0')
-	return `${minutes}:${secs}`
-}
 </script>
 
 <style scoped>
diff --git a/frontend/src/pages/LessonForm.vue b/frontend/src/pages/LessonForm.vue
index c7bab62b..68b1ed95 100644
--- a/frontend/src/pages/LessonForm.vue
+++ b/frontend/src/pages/LessonForm.vue
@@ -210,7 +210,7 @@ const addInstructorNotes = (data) => {
 const enableAutoSave = () => {
 	autoSaveInterval = setInterval(() => {
 		saveLesson({ showSuccessMessage: false })
-	}, 10000)
+	}, 5000)
 }
 
 const keyboardShortcut = (e) => {
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 62d543a7..e69c7747 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -615,3 +615,10 @@ export const updateMetaInfo = (type, route, meta) => {
 		console.error(error)
 	})
 }
+
+export const formatTimestamp = (seconds) => {
+	const date = new Date(seconds * 1000)
+	const minutes = String(date.getUTCMinutes()).padStart(2, '0')
+	const secs = String(date.getUTCSeconds()).padStart(2, '0')
+	return `${minutes}:${secs}`
+}
diff --git a/lms/lms/doctype/course_lesson/course_lesson.py b/lms/lms/doctype/course_lesson/course_lesson.py
index c9734d5b..572baf19 100644
--- a/lms/lms/doctype/course_lesson/course_lesson.py
+++ b/lms/lms/doctype/course_lesson/course_lesson.py
@@ -56,7 +56,6 @@ def save_progress(lesson, course):
 	)
 
 	quiz_completed = get_quiz_progress(lesson)
-	print("quiz_completed", quiz_completed)
 	assignment_completed = get_assignment_progress(lesson)
 
 	if not already_completed and quiz_completed and assignment_completed:
@@ -115,10 +114,8 @@ def get_quiz_progress(lesson):
 		macros = find_macros(lesson_details.body)
 		quizzes = [value for name, value in macros if name == "Quiz"]
 
-	print(quizzes)
 	for quiz in quizzes:
 		passing_percentage = frappe.db.get_value("LMS Quiz", quiz, "passing_percentage")
-		print(quiz, passing_percentage)
 		if not frappe.db.exists(
 			"LMS Quiz Submission",
 			{