From 60334ca04ac1fe06c0e6927096ca72699bdade4b Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 30 May 2025 13:00:00 +0530
Subject: [PATCH 1/5] feat: show quiz in between videos

---
 frontend/components.d.ts                      |   1 +
 .../src/components/Modals/QuizInVideo.vue     | 167 +++++++++++++++++
 frontend/src/components/VideoBlock.vue        | 169 ++++++++++--------
 frontend/src/utils/index.js                   |  11 +-
 frontend/src/utils/upload.js                  |   7 +
 lms/patches/v2_0/move_zoom_settings.py        |   4 +
 6 files changed, 284 insertions(+), 75 deletions(-)
 create mode 100644 frontend/src/components/Modals/QuizInVideo.vue

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index c2c899fa..2212eb18 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -81,6 +81,7 @@ declare module 'vue' {
     Question: typeof import('./src/components/Modals/Question.vue')['default']
     Quiz: typeof import('./src/components/Quiz.vue')['default']
     QuizBlock: typeof import('./src/components/QuizBlock.vue')['default']
+    QuizInVideo: typeof import('./src/components/Modals/QuizInVideo.vue')['default']
     Rating: typeof import('./src/components/Controls/Rating.vue')['default']
     ReviewModal: typeof import('./src/components/Modals/ReviewModal.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/frontend/src/components/Modals/QuizInVideo.vue b/frontend/src/components/Modals/QuizInVideo.vue
new file mode 100644
index 00000000..889a3c39
--- /dev/null
+++ b/frontend/src/components/Modals/QuizInVideo.vue
@@ -0,0 +1,167 @@
+<template>
+	<Dialog
+		v-model="show"
+		:options="{
+			title: __('Add quiz to this video'),
+			size: 'xl',
+			actions: [
+				{
+					label: __('Save'),
+					variant: 'solid',
+					onClick({ close }) {
+						addQuizToVideo(close)
+					},
+				},
+			],
+		}"
+	>
+		<template #body-content>
+			<div class="text-base">
+				<div class="flex items-end gap-4">
+					<FormControl
+						:label="__('Time in Video (seconds)')"
+						v-model="quiz.time"
+						type="number"
+						placeholder="Time"
+						class="flex-1"
+					/>
+					<Link
+						v-model="quiz.quiz"
+						:label="__('Quiz')"
+						doctype="LMS Quiz"
+						class="flex-1"
+					/>
+					<Button @click="addQuiz()">
+						<template #prefix>
+							<Plus class="w-4 h-4 stroke-1.5" />
+						</template>
+						{{ __('Add') }}
+					</Button>
+				</div>
+
+				<ListView
+					v-if="quizzes.length"
+					class="mt-10"
+					:columns="columns"
+					:rows="allQuizzes"
+					row-key="name"
+					:options="{
+						showTooltip: false,
+						selectable: false,
+					}"
+				>
+					<ListHeader
+						class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
+					>
+						<ListHeaderItem :item="item" v-for="item in columns">
+							<template #prefix="{ item }">
+								<component
+									v-if="item.icon"
+									:is="item.icon"
+									class="h-4 w-4 stroke-1.5 ml-4"
+								/>
+							</template>
+						</ListHeaderItem>
+					</ListHeader>
+
+					<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] }}
+									</div>
+								</ListRowItem>
+							</template>
+						</ListRow>
+					</ListRows>
+				</ListView>
+			</div>
+		</template>
+	</Dialog>
+</template>
+<script setup lang="ts">
+import {
+	Dialog,
+	Button,
+	FormControl,
+	ListView,
+	ListHeader,
+	ListHeaderItem,
+	ListRows,
+	ListRow,
+	ListRowItem,
+	toast,
+} from 'frappe-ui'
+import { computed, reactive, ref, watch } from 'vue'
+import { Plus } from 'lucide-vue-next'
+import Link from '@/components/Controls/Link.vue'
+
+type Quiz = {
+	time: number
+	quiz: string
+}
+
+const show = defineModel()
+const allQuizzes = ref<Quiz[]>([])
+const quiz = reactive<Quiz>({
+	time: 0,
+	quiz: '',
+})
+
+const props = defineProps({
+	quizzes: {
+		type: Array as () => Quiz[],
+		default: () => [],
+	},
+	saveQuizzes: {
+		type: Function,
+		required: true,
+	},
+	duration: {
+		type: Number,
+		default: 0,
+	},
+})
+
+const addQuizToVideo = (close: () => void) => {
+	props.saveQuizzes(allQuizzes.value)
+	close()
+}
+
+const addQuiz = () => {
+	if (quiz.time > props.duration) {
+		toast.error(__('Time in video exceeds the total duration of the video.'))
+		return
+	}
+	allQuizzes.value.push({
+		time: quiz.time,
+		quiz: quiz.quiz,
+	})
+
+	quiz.time = 0
+	quiz.quiz = ''
+}
+
+watch(
+	() => props.quizzes,
+	(newQuizzes) => {
+		allQuizzes.value = newQuizzes
+	},
+	{ immediate: true }
+)
+
+const columns = computed(() => {
+	return [
+		{
+			key: 'quiz',
+			label: __('Quiz'),
+		},
+		{
+			key: 'time',
+			label: __('Time in Video (seconds)'),
+			align: 'center',
+		},
+	]
+})
+</script>
diff --git a/frontend/src/components/VideoBlock.vue b/frontend/src/components/VideoBlock.vue
index f5b3ac45..7e75e16b 100644
--- a/frontend/src/components/VideoBlock.vue
+++ b/frontend/src/components/VideoBlock.vue
@@ -1,80 +1,103 @@
 <template>
-	<div ref="videoContainer" class="video-block relative group">
-		<video
-			@timeupdate="updateTime"
-			@ended="videoEnded"
-			@click="togglePlay"
-			oncontextmenu="return false"
-			class="rounded-md border border-gray-100 cursor-pointer"
-			ref="videoRef"
-		>
-			<source :src="fileURL" :type="type" />
-		</video>
-		<div
-			v-if="!playing"
-			class="absolute inset-0 flex items-center justify-center cursor-pointer"
-			@click="playVideo"
-		>
-			<div
-				class="rounded-full p-4 pl-4.5"
-				style="
-					background: radial-gradient(
-						circle,
-						rgba(0, 0, 0, 0.3) 0%,
-						rgba(0, 0, 0, 0.4) 50%
-					);
-				"
+	<div>
+		<div ref="videoContainer" class="video-block relative group">
+			<video
+				@timeupdate="updateTime"
+				@ended="videoEnded"
+				@click="togglePlay"
+				oncontextmenu="return false"
+				class="rounded-md border border-gray-100 cursor-pointer"
+				ref="videoRef"
 			>
-				<Play />
+				<source :src="fileURL" :type="type" />
+			</video>
+			<div
+				v-if="!playing"
+				class="absolute inset-0 flex items-center justify-center cursor-pointer"
+				@click="playVideo"
+			>
+				<div
+					class="rounded-full p-4 pl-4.5"
+					style="
+						background: radial-gradient(
+							circle,
+							rgba(0, 0, 0, 0.3) 0%,
+							rgba(0, 0, 0, 0.4) 50%
+						);
+					"
+				>
+					<Play />
+				</div>
+			</div>
+			<div
+				class="flex items-center space-x-2 py-2 px-1 text-ink-white bg-gradient-to-b from-transparent to-black/75 absolute bottom-0 left-0 right-0 mx-auto rounded-md"
+				:class="{
+					'invisible group-hover:visible': playing,
+				}"
+			>
+				<Button variant="ghost" class="hover:bg-transparent">
+					<template #icon>
+						<Play
+							v-if="!playing"
+							@click="playVideo"
+							class="size-4 text-ink-gray-9"
+						/>
+						<Pause v-else @click="pauseVideo" class="size-5 text-ink-white" />
+					</template>
+				</Button>
+				<input
+					type="range"
+					min="0"
+					:max="duration"
+					step="0.1"
+					v-model="currentTime"
+					@input="changeCurrentTime"
+					class="duration-slider w-full h-1"
+				/>
+				<span class="text-sm font-medium">
+					{{ formatSeconds(currentTime) }} / {{ formatSeconds(duration) }}
+				</span>
+				<Button
+					variant="ghost"
+					@click="toggleMute"
+					class="hover:bg-transparent"
+				>
+					<template #icon>
+						<Volume2 v-if="!muted" class="size-5 text-ink-white" />
+						<VolumeX v-else class="size-5 text-ink-white" />
+					</template>
+				</Button>
+				<Button
+					variant="ghost"
+					@click="toggleFullscreen"
+					class="hover:bg-transparent"
+				>
+					<template #icon>
+						<Maximize class="size-5 text-ink-white" />
+					</template>
+				</Button>
 			</div>
 		</div>
-		<div
-			class="flex items-center space-x-2 py-2 px-1 text-ink-white bg-gradient-to-b from-transparent to-black/75 absolute bottom-0 left-0 right-0 mx-auto rounded-md"
-			:class="{
-				'invisible group-hover:visible': playing,
-			}"
-		>
-			<Button variant="ghost">
-				<template #icon>
-					<Play
-						v-if="!playing"
-						@click="playVideo"
-						class="size-4 text-ink-gray-9"
-					/>
-					<Pause v-else @click="pauseVideo" class="size-5 text-ink-white" />
-				</template>
-			</Button>
-			<Button variant="ghost" @click="toggleMute">
-				<template #icon>
-					<Volume2 v-if="!muted" class="size-5 text-ink-white" />
-					<VolumeX v-else class="size-5 text-ink-white" />
-				</template>
-			</Button>
-			<input
-				type="range"
-				min="0"
-				:max="duration"
-				step="0.1"
-				v-model="currentTime"
-				@input="changeCurrentTime"
-				class="duration-slider w-full h-1"
-			/>
-			<span class="text-sm font-semibold">
-				{{ formatTime(currentTime) }} / {{ formatTime(duration) }}
-			</span>
-			<Button variant="ghost" @click="toggleFullscreen">
-				<template #icon>
-					<Maximize class="size-5 text-ink-white" />
-				</template>
+		<div v-if="!readOnly" @click="showQuizModal = true">
+			<Button>
+				{{ __('Add Quiz to Video') }}
 			</Button>
 		</div>
 	</div>
+	<QuizInVideo
+		v-model="showQuizModal"
+		:quizzes="quizzes"
+		:saveQuizzes="saveQuizzes"
+		:duration="duration"
+	/>
 </template>
 <script setup>
 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 Play from '@/components/Icons/Play.vue'
+import QuizInVideo from '@/components/Modals/QuizInVideo.vue'
 
 const videoRef = ref(null)
 const videoContainer = ref(null)
@@ -82,6 +105,7 @@ let playing = ref(false)
 let currentTime = ref(0)
 let duration = ref(0)
 let muted = ref(false)
+const showQuizModal = ref(false)
 
 const props = defineProps({
 	file: {
@@ -92,6 +116,17 @@ const props = defineProps({
 		type: String,
 		default: 'video/mp4',
 	},
+	readOnly: {
+		type: String,
+		default: true,
+	},
+	quizzes: {
+		type: Array,
+		default: () => [],
+	},
+	saveQuizzes: {
+		type: Function,
+	},
 })
 
 onMounted(() => {
@@ -151,12 +186,6 @@ const changeCurrentTime = () => {
 	videoRef.value.currentTime = currentTime.value
 }
 
-const formatTime = (time) => {
-	const minutes = Math.floor(time / 60)
-	const seconds = Math.floor(time % 60)
-	return `${minutes}:${seconds < 10 ? '0' : ''}${seconds}`
-}
-
 const toggleFullscreen = () => {
 	if (document.fullscreenElement) {
 		document.exitFullscreen()
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index d9407e0e..62d543a7 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -28,20 +28,21 @@ export function timeAgo(date) {
 export function formatTime(timeString) {
 	if (!timeString) return ''
 	const [hour, minute] = timeString.split(':').map(Number)
-
-	// Create a Date object with dummy values for day, month, and year
 	const dummyDate = new Date(0, 0, 0, hour, minute)
-
-	// Use Intl.DateTimeFormat to format the time in 12-hour format
 	const formattedTime = new Intl.DateTimeFormat('en-US', {
 		hour: 'numeric',
 		minute: 'numeric',
 		hour12: true,
 	}).format(dummyDate)
-
 	return formattedTime
 }
 
+export const formatSeconds = (time) => {
+	const minutes = Math.floor(time / 60)
+	const seconds = Math.floor(time % 60)
+	return `${minutes}:${seconds < 10 ? '0' : ''}${seconds}`
+}
+
 export function formatNumber(number) {
 	return number.toLocaleString('en-IN', {
 		maximumFractionDigits: 0,
diff --git a/frontend/src/utils/upload.js b/frontend/src/utils/upload.js
index 7c43462f..d8f5163c 100644
--- a/frontend/src/utils/upload.js
+++ b/frontend/src/utils/upload.js
@@ -46,7 +46,13 @@ export class Upload {
 		if (this.isVideo(file.file_type)) {
 			const app = createApp(VideoBlock, {
 				file: file.file_url,
+				readOnly: this.readOnly,
+				saveQuizzes: (quizzes) => {
+					if (this.readOnly) return
+					this.data.quizzes = quizzes
+				},
 			})
+			app.use(translationPlugin)
 			app.mount(this.wrapper)
 			return
 		} else if (this.isAudio(file.file_type)) {
@@ -93,6 +99,7 @@ export class Upload {
 		return {
 			file_url: this.data.file_url,
 			file_type: this.data.file_type,
+			quizzes: this.data.quizzes || [],
 		}
 	}
 
diff --git a/lms/patches/v2_0/move_zoom_settings.py b/lms/patches/v2_0/move_zoom_settings.py
index 56693c89..99f6f6a1 100644
--- a/lms/patches/v2_0/move_zoom_settings.py
+++ b/lms/patches/v2_0/move_zoom_settings.py
@@ -7,6 +7,10 @@ def execute():
 
 def create_settings():
 	current_settings = frappe.get_single("Zoom Settings")
+
+	if not current_settings.enable:
+		return
+
 	member = current_settings.owner
 	member_name = frappe.get_value("User", member, "full_name")
 

From 622a2ff07221fb1f74f0be647addb72aed9681f0 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 30 May 2025 18:55:26 +0530
Subject: [PATCH 2/5] feat: display quiz when time is reached

---
 .../src/components/Modals/QuizInVideo.vue     | 126 ++++++++++--------
 frontend/src/components/Quiz.vue              |  42 ++++--
 frontend/src/components/Settings/Settings.vue |   2 +-
 frontend/src/components/VideoBlock.vue        |  78 ++++++++++-
 frontend/src/utils/upload.js                  |   1 +
 .../doctype/course_lesson/course_lesson.py    |   5 +
 6 files changed, 184 insertions(+), 70 deletions(-)

diff --git a/frontend/src/components/Modals/QuizInVideo.vue b/frontend/src/components/Modals/QuizInVideo.vue
index 889a3c39..3d12ea15 100644
--- a/frontend/src/components/Modals/QuizInVideo.vue
+++ b/frontend/src/components/Modals/QuizInVideo.vue
@@ -3,23 +3,14 @@
 		v-model="show"
 		:options="{
 			title: __('Add quiz to this video'),
-			size: 'xl',
-			actions: [
-				{
-					label: __('Save'),
-					variant: 'solid',
-					onClick({ close }) {
-						addQuizToVideo(close)
-					},
-				},
-			],
+			size: '2xl',
 		}"
 	>
 		<template #body-content>
 			<div class="text-base">
 				<div class="flex items-end gap-4">
 					<FormControl
-						:label="__('Time in Video (seconds)')"
+						:label="__('Time in Video (minutes)')"
 						v-model="quiz.time"
 						type="number"
 						placeholder="Time"
@@ -31,7 +22,7 @@
 						doctype="LMS Quiz"
 						class="flex-1"
 					/>
-					<Button @click="addQuiz()">
+					<Button @click="addQuiz()" variant="solid">
 						<template #prefix>
 							<Plus class="w-4 h-4 stroke-1.5" />
 						</template>
@@ -39,43 +30,63 @@
 					</Button>
 				</div>
 
-				<ListView
-					v-if="quizzes.length"
-					class="mt-10"
-					:columns="columns"
-					:rows="allQuizzes"
-					row-key="name"
-					:options="{
-						showTooltip: false,
-						selectable: false,
-					}"
-				>
-					<ListHeader
-						class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
+				<div class="mt-10 mb-5">
+					<div class="font-medium mb-4">
+						{{ __('Quizzes in this video') }}
+					</div>
+					<ListView
+						v-if="allQuizzes.length"
+						:columns="columns"
+						:rows="allQuizzes"
+						row-key="quiz"
+						:options="{
+							showTooltip: false,
+						}"
 					>
-						<ListHeaderItem :item="item" v-for="item in columns">
-							<template #prefix="{ item }">
-								<component
-									v-if="item.icon"
-									:is="item.icon"
-									class="h-4 w-4 stroke-1.5 ml-4"
-								/>
-							</template>
-						</ListHeaderItem>
-					</ListHeader>
+						<ListHeader
+							class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
+						>
+							<ListHeaderItem :item="item" v-for="item in columns">
+								<template #prefix="{ item }">
+									<component
+										v-if="item.icon"
+										:is="item.icon"
+										class="h-4 w-4 stroke-1.5 ml-4"
+									/>
+								</template>
+							</ListHeaderItem>
+						</ListHeader>
 
-					<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] }}
-									</div>
-								</ListRowItem>
+						<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] }}
+										</div>
+									</ListRowItem>
+								</template>
+							</ListRow>
+						</ListRows>
+
+						<ListSelectBanner>
+							<template #actions="{ unselectAll, selections }">
+								<div class="flex gap-2">
+									<Button
+										variant="ghost"
+										@click="removeQuiz(selections, unselectAll)"
+									>
+										<Trash2 class="h-4 w-4 stroke-1.5" />
+									</Button>
+								</div>
 							</template>
-						</ListRow>
-					</ListRows>
-				</ListView>
+						</ListSelectBanner>
+					</ListView>
+
+					<div v-else class="text-ink-gray-5 italic text-xs">
+						{{ __('No quizzes added yet.') }}
+					</div>
+				</div>
 			</div>
 		</template>
 	</Dialog>
@@ -91,10 +102,11 @@ import {
 	ListRows,
 	ListRow,
 	ListRowItem,
+	ListSelectBanner,
 	toast,
 } from 'frappe-ui'
 import { computed, reactive, ref, watch } from 'vue'
-import { Plus } from 'lucide-vue-next'
+import { Plus, Trash2 } from 'lucide-vue-next'
 import Link from '@/components/Controls/Link.vue'
 
 type Quiz = {
@@ -124,11 +136,6 @@ const props = defineProps({
 	},
 })
 
-const addQuizToVideo = (close: () => void) => {
-	props.saveQuizzes(allQuizzes.value)
-	close()
-}
-
 const addQuiz = () => {
 	if (quiz.time > props.duration) {
 		toast.error(__('Time in video exceeds the total duration of the video.'))
@@ -139,10 +146,23 @@ const addQuiz = () => {
 		quiz: quiz.quiz,
 	})
 
+	props.saveQuizzes(allQuizzes.value)
+
 	quiz.time = 0
 	quiz.quiz = ''
 }
 
+const removeQuiz = (selections: string, unselectAll: () => void) => {
+	Array.from(selections).forEach((selection) => {
+		const index = allQuizzes.value.findIndex((q) => q.quiz === selection)
+		if (index !== -1) {
+			allQuizzes.value.splice(index, 1)
+		}
+		unselectAll()
+	})
+	props.saveQuizzes(allQuizzes.value)
+}
+
 watch(
 	() => props.quizzes,
 	(newQuizzes) => {
@@ -159,7 +179,7 @@ const columns = computed(() => {
 		},
 		{
 			key: 'time',
-			label: __('Time in Video (seconds)'),
+			label: __('Time in Video (minutes)'),
 			align: 'center',
 		},
 	]
diff --git a/frontend/src/components/Quiz.vue b/frontend/src/components/Quiz.vue
index c1b0f04a..0b483348 100644
--- a/frontend/src/components/Quiz.vue
+++ b/frontend/src/components/Quiz.vue
@@ -1,8 +1,11 @@
 <template>
 	<div v-if="quiz.data">
 		<div
-			class="bg-surface-blue-2 space-y-1 py-2 px-2 mb-4 rounded-md text-sm text-ink-blue-3"
+			class="bg-surface-blue-2 space-y-1 py-2 px-2 mb-4 rounded-md text-sm text-ink-blue-3 leading-5"
 		>
+			<div v-if="inVideo">
+				{{ __('You will have to complete the quiz to continue the video') }}
+			</div>
 			<div class="leading-5">
 				{{
 					__('This quiz consists of {0} questions.').format(questions.length)
@@ -247,18 +250,23 @@
 					)
 				}}
 			</div>
-			<Button
-				@click="resetQuiz()"
-				class="mt-2"
-				v-if="
-					!quiz.data.max_attempts ||
-					attempts?.data.length < quiz.data.max_attempts
-				"
-			>
-				<span>
-					{{ __('Try Again') }}
-				</span>
-			</Button>
+			<div class="space-x-2">
+				<Button
+					@click="resetQuiz()"
+					class="mt-2"
+					v-if="
+						!quiz.data.max_attempts ||
+						attempts?.data.length < quiz.data.max_attempts
+					"
+				>
+					<span>
+						{{ __('Try Again') }}
+					</span>
+				</Button>
+				<Button v-if="inVideo" @click="props.onSubmit()">
+					{{ __('Resume Video') }}
+				</Button>
+			</div>
 		</div>
 		<div
 			v-if="
@@ -315,6 +323,14 @@ const props = defineProps({
 		type: String,
 		required: true,
 	},
+	inVideo: {
+		type: Boolean,
+		default: false,
+	},
+	onSubmit: {
+		type: Function,
+		default: () => {},
+	},
 })
 
 const quiz = createResource({
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index b88abd0c..e21a7c5e 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -293,7 +293,7 @@ const tabsStructure = computed(() => {
 							type: 'checkbox',
 						},
 						{
-							label: 'Certified Participants',
+							label: 'Certified Members',
 							name: 'certified_participants',
 							type: 'checkbox',
 						},
diff --git a/frontend/src/components/VideoBlock.vue b/frontend/src/components/VideoBlock.vue
index 7e75e16b..692195af 100644
--- a/frontend/src/components/VideoBlock.vue
+++ b/frontend/src/components/VideoBlock.vue
@@ -1,6 +1,26 @@
 <template>
 	<div>
-		<div ref="videoContainer" class="video-block relative group">
+		<div
+			v-if="quizzes.length && !showQuiz"
+			class="bg-surface-blue-2 space-y-1 py-3 px-4 rounded-md text-sm text-ink-blue-3 leading-5"
+		>
+			{{
+				__('This video has {0} {1}:').format(
+					quizzes.length,
+					quizzes.length == 1 ? 'quiz' : 'quizzes'
+				)
+			}}
+
+			<div v-for="(quiz, index) in quizzes" class="pl-3 mt-1">
+				<span> {{ index + 1 }}. {{ quiz.quiz }} </span>
+				{{ __('at {0} minutes').format(quiz.time) }}
+			</div>
+		</div>
+		<div
+			v-if="!showQuiz"
+			ref="videoContainer"
+			class="video-block relative group"
+		>
 			<video
 				@timeupdate="updateTime"
 				@ended="videoEnded"
@@ -78,6 +98,12 @@
 				</Button>
 			</div>
 		</div>
+		<Quiz
+			v-if="showQuiz"
+			:quizName="currentQuiz"
+			:inVideo="true"
+			:onSubmit="resumeVideo"
+		/>
 		<div v-if="!readOnly" @click="showQuizModal = true">
 			<Button>
 				{{ __('Add Quiz to Video') }}
@@ -106,6 +132,9 @@ let currentTime = ref(0)
 let duration = ref(0)
 let muted = ref(false)
 const showQuizModal = ref(false)
+const showQuiz = ref(false)
+const currentQuiz = ref(null)
+const nextQuiz = ref({})
 
 const props = defineProps({
 	file: {
@@ -130,15 +159,54 @@ const props = defineProps({
 })
 
 onMounted(() => {
+	updateCurrentTime()
+	updateNextQuiz()
+})
+
+const updateCurrentTime = () => {
 	setTimeout(() => {
 		videoRef.value.onloadedmetadata = () => {
 			duration.value = videoRef.value.duration
 		}
 		videoRef.value.ontimeupdate = () => {
-			currentTime.value = videoRef.value.currentTime
+			currentTime.value = videoRef.value?.currentTime || currentTime.value
+			if (currentTime.value >= nextQuiz.value.time * 60) {
+				videoRef.value.pause()
+				playing.value = false
+				videoRef.value.onTimeupdate = null
+				currentQuiz.value = nextQuiz.value.quiz
+				showQuiz.value = true
+				updateNextQuiz()
+			}
 		}
 	}, 0)
-})
+}
+
+const resumeVideo = () => {
+	showQuiz.value = false
+	currentQuiz.value = null
+	updateCurrentTime()
+	setTimeout(() => {
+		videoRef.value.currentTime = currentTime.value
+		videoRef.value.play()
+		playing.value = true
+	}, 0)
+}
+
+const updateNextQuiz = () => {
+	if (!props.quizzes.length) return
+	props.quizzes.sort((a, b) => a.time - b.time)
+
+	const nextQuizIndex = props.quizzes.findIndex(
+		(quiz) => quiz.time * 60 > currentTime.value
+	)
+
+	if (nextQuizIndex !== -1) {
+		nextQuiz.value = props.quizzes[nextQuizIndex]
+	} else {
+		nextQuiz.value = {}
+	}
+}
 
 const fileURL = computed(() => {
 	if (isYoutube) {
@@ -156,6 +224,7 @@ const isYoutube = computed(() => {
 })
 
 const playVideo = () => {
+	console.log(currentTime.value)
 	videoRef.value.play()
 	playing.value = true
 }
@@ -166,6 +235,7 @@ const pauseVideo = () => {
 }
 
 const togglePlay = () => {
+	console.log(currentTime.value)
 	if (playing.value) {
 		pauseVideo()
 	} else {
@@ -184,6 +254,8 @@ const toggleMute = () => {
 
 const changeCurrentTime = () => {
 	videoRef.value.currentTime = currentTime.value
+	console.log('Current Time:', currentTime.value)
+	updateNextQuiz()
 }
 
 const toggleFullscreen = () => {
diff --git a/frontend/src/utils/upload.js b/frontend/src/utils/upload.js
index d8f5163c..5fe3aca8 100644
--- a/frontend/src/utils/upload.js
+++ b/frontend/src/utils/upload.js
@@ -47,6 +47,7 @@ export class Upload {
 			const app = createApp(VideoBlock, {
 				file: file.file_url,
 				readOnly: this.readOnly,
+				quizzes: file.quizzes || [],
 				saveQuizzes: (quizzes) => {
 					if (this.readOnly) return
 					this.data.quizzes = quizzes
diff --git a/lms/lms/doctype/course_lesson/course_lesson.py b/lms/lms/doctype/course_lesson/course_lesson.py
index 2e178ce6..a24c1032 100644
--- a/lms/lms/doctype/course_lesson/course_lesson.py
+++ b/lms/lms/doctype/course_lesson/course_lesson.py
@@ -96,6 +96,11 @@ def get_quiz_progress(lesson):
 		for block in content.get("blocks"):
 			if block.get("type") == "quiz":
 				quizzes.append(block.get("data").get("quiz"))
+			if block.get("type") == "upload":
+				quizzes_in_video = block.get("data").get("quizzes")
+				if quizzes_in_video and len(quizzes_in_video) > 0:
+					for row in quizzes_in_video:
+						quizzes.append(row.get("quiz"))
 
 	elif lesson_details.body:
 		macros = find_macros(lesson_details.body)

From 7b7484332bd9adb644a24203646238101608b3f1 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 2 Jun 2025 18:18:13 +0530
Subject: [PATCH 3/5] feat: quiz in videos

---
 frontend/src/components/AppSidebar.vue        | 15 +++++-
 frontend/src/components/DiscussionReplies.vue |  8 ++-
 frontend/src/components/Discussions.vue       |  6 ++-
 .../src/components/Modals/QuizInVideo.vue     |  6 +--
 frontend/src/components/Quiz.vue              | 48 ++++++++++-------
 frontend/src/components/VideoBlock.vue        | 51 ++++++++++---------
 frontend/src/pages/Lesson.vue                 |  6 +++
 frontend/src/pages/Notifications.vue          |  6 ++-
 .../doctype/course_lesson/course_lesson.py    | 13 ++++-
 9 files changed, 109 insertions(+), 50 deletions(-)

diff --git a/frontend/src/components/AppSidebar.vue b/frontend/src/components/AppSidebar.vue
index 682a4447..b72d311a 100644
--- a/frontend/src/components/AppSidebar.vue
+++ b/frontend/src/components/AppSidebar.vue
@@ -181,7 +181,16 @@
 import UserDropdown from '@/components/UserDropdown.vue'
 import CollapseSidebar from '@/components/Icons/CollapseSidebar.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
-import { ref, onMounted, inject, watch, reactive, markRaw, h } from 'vue'
+import {
+	ref,
+	onMounted,
+	inject,
+	watch,
+	reactive,
+	markRaw,
+	h,
+	onUnmounted,
+} from 'vue'
 import { getSidebarLinks } from '../utils'
 import { usersStore } from '@/stores/user'
 import { sessionStore } from '@/stores/session'
@@ -626,4 +635,8 @@ watch(userResource, () => {
 const redirectToWebsite = () => {
 	window.open('https://frappe.io/learning', '_blank')
 }
+
+onUnmounted(() => {
+	socket.off('publish_lms_notifications')
+})
 </script>
diff --git a/frontend/src/components/DiscussionReplies.vue b/frontend/src/components/DiscussionReplies.vue
index 9e328587..10ae9a08 100644
--- a/frontend/src/components/DiscussionReplies.vue
+++ b/frontend/src/components/DiscussionReplies.vue
@@ -97,7 +97,7 @@ import { createResource, TextEditor, Button, Dropdown, toast } from 'frappe-ui'
 import { timeAgo } from '../utils'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { ChevronLeft, MoreHorizontal } from 'lucide-vue-next'
-import { ref, inject, onMounted } from 'vue'
+import { ref, inject, onMounted, onUnmounted } from 'vue'
 
 const showTopics = defineModel('showTopics')
 const newReply = ref('')
@@ -251,4 +251,10 @@ const deleteReply = (reply) => {
 		}
 	)
 }
+
+onUnmounted(() => {
+	socket.off('publish_message')
+	socket.off('update_message')
+	socket.off('delete_message')
+})
 </script>
diff --git a/frontend/src/components/Discussions.vue b/frontend/src/components/Discussions.vue
index 95e47efd..04747bba 100644
--- a/frontend/src/components/Discussions.vue
+++ b/frontend/src/components/Discussions.vue
@@ -70,7 +70,7 @@
 import { createResource, Button } from 'frappe-ui'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { singularize, timeAgo } from '../utils'
-import { ref, onMounted, inject } from 'vue'
+import { ref, onMounted, inject, onUnmounted } from 'vue'
 import DiscussionReplies from '@/components/DiscussionReplies.vue'
 import DiscussionModal from '@/components/Modals/DiscussionModal.vue'
 import { MessageSquareText } from 'lucide-vue-next'
@@ -153,4 +153,8 @@ const showReplies = (topic) => {
 const openTopicModal = () => {
 	showTopicModal.value = true
 }
+
+onUnmounted(() => {
+	socket.off('new_discussion_topic')
+})
 </script>
diff --git a/frontend/src/components/Modals/QuizInVideo.vue b/frontend/src/components/Modals/QuizInVideo.vue
index 3d12ea15..18575fa3 100644
--- a/frontend/src/components/Modals/QuizInVideo.vue
+++ b/frontend/src/components/Modals/QuizInVideo.vue
@@ -10,10 +10,10 @@
 			<div class="text-base">
 				<div class="flex items-end gap-4">
 					<FormControl
-						:label="__('Time in Video (minutes)')"
+						:label="__('Time in Video (minutes:seconds)')"
 						v-model="quiz.time"
-						type="number"
-						placeholder="Time"
+						type="text"
+						placeholder="2:15"
 						class="flex-1"
 					/>
 					<Link
diff --git a/frontend/src/components/Quiz.vue b/frontend/src/components/Quiz.vue
index 0b483348..e4ab7df1 100644
--- a/frontend/src/components/Quiz.vue
+++ b/frontend/src/components/Quiz.vue
@@ -58,19 +58,30 @@
 				<div class="font-semibold text-lg text-ink-gray-9">
 					{{ quiz.data.title }}
 				</div>
-				<Button
+				<div class="flex items-center justify-center space-x-2 mt-4">
+					<Button
+						v-if="
+							!quiz.data.max_attempts ||
+							attempts.data?.length < quiz.data.max_attempts
+						"
+						variant="solid"
+						@click="startQuiz"
+					>
+						<span>
+							{{ inVideo ? __('Start the Quiz') : __('Start') }}
+						</span>
+					</Button>
+					<Button v-if="inVideo" @click="props.backToVideo()">
+						{{ __('Resume Video') }}
+					</Button>
+				</div>
+				<div
 					v-if="
-						!quiz.data.max_attempts ||
-						attempts.data?.length < quiz.data.max_attempts
+						quiz.data.max_attempts &&
+						attempts.data?.length >= quiz.data.max_attempts
 					"
-					@click="startQuiz"
-					class="mt-2"
+					class="leading-5 text-ink-gray-7"
 				>
-					<span>
-						{{ __('Start') }}
-					</span>
-				</Button>
-				<div v-else class="leading-5 text-ink-gray-7">
 					{{
 						__(
 							'You have already exceeded the maximum number of attempts allowed for this quiz.'
@@ -263,7 +274,7 @@
 						{{ __('Try Again') }}
 					</span>
 				</Button>
-				<Button v-if="inVideo" @click="props.onSubmit()">
+				<Button v-if="inVideo" @click="props.backToVideo()">
 					{{ __('Resume Video') }}
 				</Button>
 			</div>
@@ -316,7 +327,6 @@ let questions = reactive([])
 const possibleAnswer = ref(null)
 const timer = ref(0)
 let timerInterval = null
-const router = useRouter()
 
 const props = defineProps({
 	quizName: {
@@ -327,7 +337,7 @@ const props = defineProps({
 		type: Boolean,
 		default: false,
 	},
-	onSubmit: {
+	backToVideo: {
 		type: Function,
 		default: () => {},
 	},
@@ -627,11 +637,15 @@ const getInstructions = (question) => {
 }
 
 const markLessonProgress = () => {
-	if (router.currentRoute.value.name == 'Lesson') {
+	let pathname = window.location.pathname.split('/')
+	if (pathname[2] != 'courses') return
+	let lessonIndex = pathname.pop().split('-')
+
+	if (lessonIndex.length == 2) {
 		call('lms.lms.api.mark_lesson_progress', {
-			course: router.currentRoute.value.params.courseName,
-			chapter_number: router.currentRoute.value.params.chapterNumber,
-			lesson_number: router.currentRoute.value.params.lessonNumber,
+			course: pathname[3],
+			chapter_number: lessonIndex[0],
+			lesson_number: lessonIndex[1],
 		})
 	}
 }
diff --git a/frontend/src/components/VideoBlock.vue b/frontend/src/components/VideoBlock.vue
index 692195af..e5c06a76 100644
--- a/frontend/src/components/VideoBlock.vue
+++ b/frontend/src/components/VideoBlock.vue
@@ -1,11 +1,11 @@
 <template>
 	<div>
 		<div
-			v-if="quizzes.length && !showQuiz"
+			v-if="quizzes.length && !showQuiz && readOnly"
 			class="bg-surface-blue-2 space-y-1 py-3 px-4 rounded-md text-sm text-ink-blue-3 leading-5"
 		>
 			{{
-				__('This video has {0} {1}:').format(
+				__('This video contains {0} {1}:').format(
 					quizzes.length,
 					quizzes.length == 1 ? 'quiz' : 'quizzes'
 				)
@@ -13,7 +13,7 @@
 
 			<div v-for="(quiz, index) in quizzes" class="pl-3 mt-1">
 				<span> {{ index + 1 }}. {{ quiz.quiz }} </span>
-				{{ __('at {0} minutes').format(quiz.time) }}
+				{{ __('at {0}').format(formatTimestamp(quiz.time)) }}
 			</div>
 		</div>
 		<div
@@ -102,7 +102,7 @@
 			v-if="showQuiz"
 			:quizName="currentQuiz"
 			:inVideo="true"
-			:onSubmit="resumeVideo"
+			:backToVideo="resumeVideo"
 		/>
 		<div v-if="!readOnly" @click="showQuizModal = true">
 			<Button>
@@ -118,7 +118,7 @@
 	/>
 </template>
 <script setup>
-import { ref, onMounted, computed } from 'vue'
+import { ref, onMounted, computed, watch } from 'vue'
 import { Pause, Maximize, Volume2, VolumeX } from 'lucide-vue-next'
 import { Button } from 'frappe-ui'
 import { formatSeconds } from '@/utils'
@@ -170,37 +170,45 @@ const updateCurrentTime = () => {
 		}
 		videoRef.value.ontimeupdate = () => {
 			currentTime.value = videoRef.value?.currentTime || currentTime.value
-			if (currentTime.value >= nextQuiz.value.time * 60) {
+			if (currentTime.value >= nextQuiz.value.time) {
 				videoRef.value.pause()
 				playing.value = false
 				videoRef.value.onTimeupdate = null
 				currentQuiz.value = nextQuiz.value.quiz
 				showQuiz.value = true
-				updateNextQuiz()
 			}
 		}
 	}, 0)
 }
 
-const resumeVideo = () => {
+const resumeVideo = (restart = false) => {
 	showQuiz.value = false
 	currentQuiz.value = null
 	updateCurrentTime()
 	setTimeout(() => {
-		videoRef.value.currentTime = currentTime.value
+		videoRef.value.currentTime = restart ? 0 : currentTime.value
 		videoRef.value.play()
 		playing.value = true
+		updateNextQuiz()
 	}, 0)
 }
 
 const updateNextQuiz = () => {
 	if (!props.quizzes.length) return
+
+	props.quizzes.forEach((quiz) => {
+		if (typeof quiz.time == 'string' && quiz.time.includes(':')) {
+			let time = quiz.time.split(':')
+			let timeInSeconds = parseInt(time[0]) * 60 + parseInt(time[1])
+			quiz.time = timeInSeconds
+		}
+	})
+
 	props.quizzes.sort((a, b) => a.time - b.time)
 
 	const nextQuizIndex = props.quizzes.findIndex(
-		(quiz) => quiz.time * 60 > currentTime.value
+		(quiz) => quiz.time > currentTime.value
 	)
-
 	if (nextQuizIndex !== -1) {
 		nextQuiz.value = props.quizzes[nextQuizIndex]
 	} else {
@@ -209,22 +217,10 @@ const updateNextQuiz = () => {
 }
 
 const fileURL = computed(() => {
-	if (isYoutube) {
-		let url = props.file
-		if (url.includes('watch?v=')) {
-			url = url.replace('watch?v=', 'embed/')
-		}
-		return `${url}?autoplay=0&controls=0&disablekb=1&playsinline=1&cc_load_policy=1&cc_lang_pref=auto`
-	}
 	return props.file
 })
 
-const isYoutube = computed(() => {
-	return props.type == 'video/youtube'
-})
-
 const playVideo = () => {
-	console.log(currentTime.value)
 	videoRef.value.play()
 	playing.value = true
 }
@@ -235,7 +231,6 @@ const pauseVideo = () => {
 }
 
 const togglePlay = () => {
-	console.log(currentTime.value)
 	if (playing.value) {
 		pauseVideo()
 	} else {
@@ -254,7 +249,6 @@ const toggleMute = () => {
 
 const changeCurrentTime = () => {
 	videoRef.value.currentTime = currentTime.value
-	console.log('Current Time:', currentTime.value)
 	updateNextQuiz()
 }
 
@@ -265,6 +259,13 @@ 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/Lesson.vue b/frontend/src/pages/Lesson.vue
index af6a34ce..f84dcc85 100644
--- a/frontend/src/pages/Lesson.vue
+++ b/frontend/src/pages/Lesson.vue
@@ -303,6 +303,7 @@ import ProgressBar from '@/components/ProgressBar.vue'
 import CertificationLinks from '@/components/CertificationLinks.vue'
 
 const user = inject('$user')
+const socket = inject('$socket')
 const router = useRouter()
 const route = useRoute()
 const allowDiscussions = ref(false)
@@ -335,6 +336,11 @@ const props = defineProps({
 onMounted(() => {
 	startTimer()
 	document.addEventListener('fullscreenchange', attachFullscreenEvent)
+	socket.on('update_lesson_progress', (data) => {
+		if (data.course === props.courseName) {
+			lessonProgress.value = data.progress
+		}
+	})
 })
 
 const attachFullscreenEvent = () => {
diff --git a/frontend/src/pages/Notifications.vue b/frontend/src/pages/Notifications.vue
index 36fdf8a7..aa4e1be4 100644
--- a/frontend/src/pages/Notifications.vue
+++ b/frontend/src/pages/Notifications.vue
@@ -68,7 +68,7 @@ import {
 	usePageMeta,
 } from 'frappe-ui'
 import { sessionStore } from '../stores/session'
-import { computed, inject, ref, onMounted } from 'vue'
+import { computed, inject, ref, onMounted, onUnmounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { X } from 'lucide-vue-next'
 
@@ -135,6 +135,10 @@ const markAllAsRead = createResource({
 	},
 })
 
+onUnmounted(() => {
+	socket.off('publish_lms_notifications')
+})
+
 const breadcrumbs = computed(() => {
 	let crumbs = [
 		{
diff --git a/lms/lms/doctype/course_lesson/course_lesson.py b/lms/lms/doctype/course_lesson/course_lesson.py
index a24c1032..c9734d5b 100644
--- a/lms/lms/doctype/course_lesson/course_lesson.py
+++ b/lms/lms/doctype/course_lesson/course_lesson.py
@@ -2,12 +2,13 @@
 # For license information, please see license.txt
 
 import frappe
+import json
 from frappe import _
 from frappe.model.document import Document
 from frappe.utils.telemetry import capture
 from lms.lms.utils import get_course_progress
 from ...md import find_macros
-import json
+from frappe.realtime import get_website_room
 
 
 class CourseLesson(Document):
@@ -55,6 +56,7 @@ 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:
@@ -76,6 +78,13 @@ def save_progress(lesson, course):
 	enrollment.save()
 	enrollment.run_method("on_change")
 
+	frappe.publish_realtime(
+		event="update_lesson_progress",
+		room=get_website_room(),
+		message={"course": course, "lesson": lesson, "progress": progress},
+		after_commit=True,
+	)
+
 	return progress
 
 
@@ -106,8 +115,10 @@ 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",
 			{

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 4/5] 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",
 			{

From 7be1562fa41fe1a620ecd04364f8b6f84f174df5 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 2 Jun 2025 19:18:27 +0530
Subject: [PATCH 5/5] fix: simplified timestamp label

---
 frontend/src/components/Modals/QuizInVideo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Modals/QuizInVideo.vue b/frontend/src/components/Modals/QuizInVideo.vue
index 623d8220..af003e29 100644
--- a/frontend/src/components/Modals/QuizInVideo.vue
+++ b/frontend/src/components/Modals/QuizInVideo.vue
@@ -10,7 +10,7 @@
 			<div class="text-base">
 				<div class="flex items-end gap-4">
 					<FormControl
-						:label="__('Time in Video (minutes:seconds)')"
+						:label="__('Time in Video')"
 						v-model="quiz.time"
 						type="text"
 						placeholder="2:15"