From aba4c034fc295368dda51d9692ddf80aa8e5abd2 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 10 Oct 2024 14:48:59 +0530
Subject: [PATCH 01/13] fix: misc issues

---
 frontend/src/components/CourseOutline.vue | 26 +++++--
 frontend/src/components/VideoBlock.vue    | 13 +++-
 frontend/src/main.js                      |  2 +
 frontend/src/pages/JobDetail.vue          | 86 +++++++++++++++++------
 4 files changed, 98 insertions(+), 29 deletions(-)

diff --git a/frontend/src/components/CourseOutline.vue b/frontend/src/components/CourseOutline.vue
index 98ef25b51..c2ce04591 100644
--- a/frontend/src/components/CourseOutline.vue
+++ b/frontend/src/components/CourseOutline.vue
@@ -76,7 +76,7 @@
 										<Trash2
 											v-if="allowEdit"
 											@click.prevent="trashLesson(lesson.name, chapter.name)"
-											class="h-4 w-4 stroke-1.5 text-gray-700 ml-auto invisible group-hover:visible"
+											class="h-4 w-4 text-red-500 ml-auto invisible group-hover:visible"
 										/>
 										<Check
 											v-if="lesson.is_complete"
@@ -119,7 +119,7 @@
 </template>
 <script setup>
 import { Button, createResource } from 'frappe-ui'
-import { ref } from 'vue'
+import { ref, getCurrentInstance } from 'vue'
 import Draggable from 'vuedraggable'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue'
 import {
@@ -138,6 +138,8 @@ const route = useRoute()
 const expandAll = ref(true)
 const showChapterModal = ref(false)
 const currentChapter = ref(null)
+const app = getCurrentInstance()
+const { $dialog } = app.appContext.config.globalProperties
 
 const props = defineProps({
 	courseName: {
@@ -202,9 +204,23 @@ const updateLessonIndex = createResource({
 })
 
 const trashLesson = (lessonName, chapterName) => {
-	deleteLesson.submit({
-		lesson: lessonName,
-		chapter: chapterName,
+	$dialog({
+		title: __('Delete Lesson'),
+		message: __('Are you sure you want to delete this lesson?'),
+		actions: [
+			{
+				label: __('Delete'),
+				theme: 'red',
+				variant: 'solid',
+				onClick(close) {
+					deleteLesson.submit({
+						lesson: lessonName,
+						chapter: chapterName,
+					})
+					close()
+				},
+			},
+		],
 	})
 }
 
diff --git a/frontend/src/components/VideoBlock.vue b/frontend/src/components/VideoBlock.vue
index 5026edfe2..9241bf5ba 100644
--- a/frontend/src/components/VideoBlock.vue
+++ b/frontend/src/components/VideoBlock.vue
@@ -3,13 +3,14 @@
 		<video
 			@timeupdate="updateTime"
 			@ended="videoEnded"
-			class="rounded-lg border border-gray-100"
+			@click="togglePlay"
+			class="rounded-lg border border-gray-100 group cursor-pointer"
 			ref="videoRef"
 		>
 			<source :src="fileURL" :type="type" />
 		</video>
 		<div
-			class="flex items-center space-x-2 bg-gray-200 rounded-md p-0.5 absolute bottom-3 w-[98%] left-0 right-0 mx-auto"
+			class="flex items-center space-x-2 bg-gray-200 rounded-md p-0.5 absolute bottom-3 w-[98%] left-0 right-0 mx-auto invisible group-hover:visible"
 		>
 			<Button variant="ghost">
 				<template #icon>
@@ -106,6 +107,14 @@ const pauseVideo = () => {
 	playing.value = false
 }
 
+const togglePlay = () => {
+	if (playing.value) {
+		pauseVideo()
+	} else {
+		playVideo()
+	}
+}
+
 const videoEnded = () => {
 	playing.value = false
 }
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 72dce29aa..f906db329 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -5,6 +5,7 @@ import router from './router'
 import App from './App.vue'
 import { createPinia } from 'pinia'
 import dayjs from '@/utils/dayjs'
+import { createDialog } from '@/utils/dialogs'
 import translationPlugin from './translation'
 import { usersStore } from './stores/user'
 import { sessionStore } from './stores/session'
@@ -36,3 +37,4 @@ let { isLoggedIn } = sessionStore()
 app.provide('$user', userResource)
 app.provide('$allUsers', allUsers)
 app.config.globalProperties.$user = userResource
+app.config.globalProperties.$dialog = createDialog
diff --git a/frontend/src/pages/JobDetail.vue b/frontend/src/pages/JobDetail.vue
index f8483e809..deb41e808 100644
--- a/frontend/src/pages/JobDetail.vue
+++ b/frontend/src/pages/JobDetail.vue
@@ -52,46 +52,88 @@
 		</header>
 		<div v-if="job.data" class="max-w-3xl mx-auto">
 			<div class="p-4">
-				<div class="flex mb-10">
-					<img
-						:src="job.data.company_logo"
-						class="w-16 h-16 rounded-lg object-contain mr-4"
-						:alt="job.data.company_name"
-					/>
-					<div>
+				<div class="space-y-5 mb-10">
+					<div class="flex items-center">
+						<img
+							:src="job.data.company_logo"
+							class="w-16 h-16 rounded-lg object-contain mr-4"
+							:alt="job.data.company_name"
+						/>
 						<div class="text-2xl font-semibold mb-4">
 							{{ job.data.job_title }}
 						</div>
+					</div>
+					<div>
 						<div
-							class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-2 md:gap-y-4"
+							class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-5 md:gap-y-5"
 						>
 							<div class="flex items-center space-x-2">
-								<Building2 class="h-4 w-4 stroke-1.5" />
-								<span>{{ job.data.company_name }}</span>
+								<span class="p-4 bg-green-50 rounded-full">
+									<Building2 class="h-4 w-4 text-green-500" />
+								</span>
+								<div class="flex flex-col space-y-2">
+									<span class="text-xs text-gray-600 font-medium uppercase">
+										{{ __('Organisation') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ job.data.company_name }}
+									</span>
+								</div>
 							</div>
 							<div class="flex items-center space-x-2">
-								<MapPin class="h-4 w-4 stroke-1.5" />
-								<span>{{ job.data.location }}</span>
+								<span class="p-4 bg-red-50 rounded-full">
+									<MapPin class="h-4 w-4 text-red-500" />
+								</span>
+								<div class="flex flex-col space-y-2">
+									<span class="text-xs text-gray-600 font-medium uppercase">
+										{{ __('Location') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ job.data.location }}
+									</span>
+								</div>
 							</div>
 							<div class="flex items-center space-x-2">
-								<ClipboardType class="h-4 w-4 stroke-1.5" />
-								<span>{{ job.data.type }}</span>
+								<span class="p-4 bg-yellow-50 rounded-full">
+									<ClipboardType class="h-4 w-4 text-yellow-500" />
+								</span>
+								<div class="flex flex-col space-y-2">
+									<span class="text-xs font-medium text-gray-600 uppercase">
+										{{ __('Category') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ job.data.type }}
+									</span>
+								</div>
 							</div>
 							<div class="flex items-center space-x-2">
-								<CalendarDays class="h-4 w-4 stroke-1.5" />
-								<span>
-									{{ dayjs(job.data.creation).format('DD MMM YYYY') }}
+								<span class="p-4 bg-blue-50 rounded-full">
+									<CalendarDays class="h-4 w-4 text-blue-500" />
 								</span>
+								<div class="flex flex-col space-y-2">
+									<span class="text-xs text-gray-600 font-medium uppercase">
+										{{ __('Posted on') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ dayjs(job.data.creation).format('DD MMM YYYY') }}
+									</span>
+								</div>
 							</div>
 							<div
 								v-if="applicationCount.data"
 								class="flex items-center space-x-2"
 							>
-								<SquareUserRound class="h-4 w-4 stroke-1.5" />
-								<span
-									>{{ applicationCount.data }}
-									{{ __('applications received') }}</span
-								>
+								<span class="p-4 bg-purple-50 rounded-full">
+									<SquareUserRound class="h-4 w-4 text-purple-500" />
+								</span>
+								<div class="flex flex-col space-y-2">
+									<span class="text-xs text-gray-600 font-medium uppercase">
+										{{ __('Applications Received') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ applicationCount.data }}
+									</span>
+								</div>
 							</div>
 						</div>
 					</div>

From 675bcc8956cbaa665568eab480c5e1693a62bc20 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 10 Oct 2024 16:20:53 +0530
Subject: [PATCH 02/13] test: replaced FrappeTestCase with UnitTestCase

---
 .../doctype/lms_job_application/test_lms_job_application.py   | 4 ++--
 lms/lms/doctype/batch_student/test_batch_student.py           | 4 ++--
 lms/lms/doctype/course_evaluator/test_course_evaluator.py     | 4 ++--
 lms/lms/doctype/lms_assignment/test_lms_assignment.py         | 4 ++--
 lms/lms/doctype/lms_badge/test_lms_badge.py                   | 4 ++--
 .../doctype/lms_badge_assignment/test_lms_badge_assignment.py | 4 ++--
 lms/lms/doctype/lms_batch/test_lms_batch.py                   | 4 ++--
 .../doctype/lms_batch_timetable/test_lms_batch_timetable.py   | 4 ++--
 lms/lms/doctype/lms_category/test_lms_category.py             | 4 ++--
 .../test_lms_certificate_evaluation.py                        | 4 ++--
 .../lms_certificate_request/test_lms_certificate_request.py   | 4 ++--
 lms/lms/doctype/lms_live_class/test_lms_live_class.py         | 4 ++--
 lms/lms/doctype/lms_payment/test_lms_payment.py               | 4 ++--
 lms/lms/doctype/lms_question/test_lms_question.py             | 4 ++--
 lms/lms/doctype/lms_quiz/lms_quiz.py                          | 2 +-
 lms/lms/doctype/lms_sidebar_item/test_lms_sidebar_item.py     | 4 ++--
 lms/lms/doctype/lms_source/test_lms_source.py                 | 4 ++--
 .../doctype/lms_timetable_legend/test_lms_timetable_legend.py | 4 ++--
 .../lms_timetable_template/test_lms_timetable_template.py     | 4 ++--
 lms/lms/doctype/payment_country/test_payment_country.py       | 4 ++--
 lms/lms/doctype/zoom_settings/test_zoom_settings.py           | 4 ++--
 21 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/lms/job/doctype/lms_job_application/test_lms_job_application.py b/lms/job/doctype/lms_job_application/test_lms_job_application.py
index acc28b345..532abbbff 100644
--- a/lms/job/doctype/lms_job_application/test_lms_job_application.py
+++ b/lms/job/doctype/lms_job_application/test_lms_job_application.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSJobApplication(FrappeTestCase):
+class TestLMSJobApplication(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/batch_student/test_batch_student.py b/lms/lms/doctype/batch_student/test_batch_student.py
index 88c576e41..8a5e8bb1c 100644
--- a/lms/lms/doctype/batch_student/test_batch_student.py
+++ b/lms/lms/doctype/batch_student/test_batch_student.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestBatchStudent(FrappeTestCase):
+class TestBatchStudent(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/course_evaluator/test_course_evaluator.py b/lms/lms/doctype/course_evaluator/test_course_evaluator.py
index cde3cf75f..9b798a982 100644
--- a/lms/lms/doctype/course_evaluator/test_course_evaluator.py
+++ b/lms/lms/doctype/course_evaluator/test_course_evaluator.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestCourseEvaluator(FrappeTestCase):
+class TestCourseEvaluator(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_assignment/test_lms_assignment.py b/lms/lms/doctype/lms_assignment/test_lms_assignment.py
index e230054de..b2e2bfdb5 100644
--- a/lms/lms/doctype/lms_assignment/test_lms_assignment.py
+++ b/lms/lms/doctype/lms_assignment/test_lms_assignment.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSAssignment(FrappeTestCase):
+class TestLMSAssignment(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_badge/test_lms_badge.py b/lms/lms/doctype/lms_badge/test_lms_badge.py
index fc84ce8d9..edcea67c1 100644
--- a/lms/lms/doctype/lms_badge/test_lms_badge.py
+++ b/lms/lms/doctype/lms_badge/test_lms_badge.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSBadge(FrappeTestCase):
+class TestLMSBadge(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_badge_assignment/test_lms_badge_assignment.py b/lms/lms/doctype/lms_badge_assignment/test_lms_badge_assignment.py
index 9a037eda3..6dc92c62e 100644
--- a/lms/lms/doctype/lms_badge_assignment/test_lms_badge_assignment.py
+++ b/lms/lms/doctype/lms_badge_assignment/test_lms_badge_assignment.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSBadgeAssignment(FrappeTestCase):
+class TestLMSBadgeAssignment(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_batch/test_lms_batch.py b/lms/lms/doctype/lms_batch/test_lms_batch.py
index 6e1f2659a..074981c07 100644
--- a/lms/lms/doctype/lms_batch/test_lms_batch.py
+++ b/lms/lms/doctype/lms_batch/test_lms_batch.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSClass(FrappeTestCase):
+class TestLMSBatch(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_batch_timetable/test_lms_batch_timetable.py b/lms/lms/doctype/lms_batch_timetable/test_lms_batch_timetable.py
index 68754a5fd..706143267 100644
--- a/lms/lms/doctype/lms_batch_timetable/test_lms_batch_timetable.py
+++ b/lms/lms/doctype/lms_batch_timetable/test_lms_batch_timetable.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+import unittest
 
 
-class TestLMSBatchTimetable(FrappeTestCase):
+class TestLMSBatchTimetable(unittest.TestCase):
 	pass
diff --git a/lms/lms/doctype/lms_category/test_lms_category.py b/lms/lms/doctype/lms_category/test_lms_category.py
index 224a9e7c2..1ba8de750 100644
--- a/lms/lms/doctype/lms_category/test_lms_category.py
+++ b/lms/lms/doctype/lms_category/test_lms_category.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSCategory(FrappeTestCase):
+class TestLMSCategory(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_certificate_evaluation/test_lms_certificate_evaluation.py b/lms/lms/doctype/lms_certificate_evaluation/test_lms_certificate_evaluation.py
index 06e6996e2..3dc5293e9 100644
--- a/lms/lms/doctype/lms_certificate_evaluation/test_lms_certificate_evaluation.py
+++ b/lms/lms/doctype/lms_certificate_evaluation/test_lms_certificate_evaluation.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSCertificateEvaluation(FrappeTestCase):
+class TestLMSCertificateEvaluation(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_certificate_request/test_lms_certificate_request.py b/lms/lms/doctype/lms_certificate_request/test_lms_certificate_request.py
index 871492428..804cad77f 100644
--- a/lms/lms/doctype/lms_certificate_request/test_lms_certificate_request.py
+++ b/lms/lms/doctype/lms_certificate_request/test_lms_certificate_request.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSCertificateRequest(FrappeTestCase):
+class TestLMSCertificateRequest(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_live_class/test_lms_live_class.py b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
index b169369a1..9345684d3 100644
--- a/lms/lms/doctype/lms_live_class/test_lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSLiveClass(FrappeTestCase):
+class TestLMSLiveClass(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_payment/test_lms_payment.py b/lms/lms/doctype/lms_payment/test_lms_payment.py
index 3589140d7..15c12c839 100644
--- a/lms/lms/doctype/lms_payment/test_lms_payment.py
+++ b/lms/lms/doctype/lms_payment/test_lms_payment.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSPayment(FrappeTestCase):
+class TestLMSPayment(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_question/test_lms_question.py b/lms/lms/doctype/lms_question/test_lms_question.py
index 0832daa97..e16f21bbb 100644
--- a/lms/lms/doctype/lms_question/test_lms_question.py
+++ b/lms/lms/doctype/lms_question/test_lms_question.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSQuestion(FrappeTestCase):
+class TestLMSQuestion(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.py b/lms/lms/doctype/lms_quiz/lms_quiz.py
index 82d9dc06d..6ce5a4ae2 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.py
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.py
@@ -113,7 +113,7 @@ def quiz_summary(quiz, results):
 		result["question"] = question_details.question_detail
 		result["marks_out_of"] = question_details.marks
 
-		quiz_details = frappe.get_doc(
+		quiz_details = frappe.db.get_value(
 			"LMS Quiz",
 			quiz,
 			["total_marks", "passing_percentage", "lesson", "course"],
diff --git a/lms/lms/doctype/lms_sidebar_item/test_lms_sidebar_item.py b/lms/lms/doctype/lms_sidebar_item/test_lms_sidebar_item.py
index 2747cc914..858d9a951 100644
--- a/lms/lms/doctype/lms_sidebar_item/test_lms_sidebar_item.py
+++ b/lms/lms/doctype/lms_sidebar_item/test_lms_sidebar_item.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSSidebarItem(FrappeTestCase):
+class TestLMSSidebarItem(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_source/test_lms_source.py b/lms/lms/doctype/lms_source/test_lms_source.py
index 99b7e97f9..7017c13aa 100644
--- a/lms/lms/doctype/lms_source/test_lms_source.py
+++ b/lms/lms/doctype/lms_source/test_lms_source.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSSource(FrappeTestCase):
+class TestLMSSource(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_timetable_legend/test_lms_timetable_legend.py b/lms/lms/doctype/lms_timetable_legend/test_lms_timetable_legend.py
index 816b17932..1ab48cca4 100644
--- a/lms/lms/doctype/lms_timetable_legend/test_lms_timetable_legend.py
+++ b/lms/lms/doctype/lms_timetable_legend/test_lms_timetable_legend.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSTimetableLegend(FrappeTestCase):
+class TestLMSTimetableLegend(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/lms_timetable_template/test_lms_timetable_template.py b/lms/lms/doctype/lms_timetable_template/test_lms_timetable_template.py
index 090d1a580..0d651dfa7 100644
--- a/lms/lms/doctype/lms_timetable_template/test_lms_timetable_template.py
+++ b/lms/lms/doctype/lms_timetable_template/test_lms_timetable_template.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestLMSTimetableTemplate(FrappeTestCase):
+class TestLMSTimetableTemplate(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/payment_country/test_payment_country.py b/lms/lms/doctype/payment_country/test_payment_country.py
index 994c246d3..057560591 100644
--- a/lms/lms/doctype/payment_country/test_payment_country.py
+++ b/lms/lms/doctype/payment_country/test_payment_country.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestPaymentCountry(FrappeTestCase):
+class TestPaymentCountry(UnitTestCase):
 	pass
diff --git a/lms/lms/doctype/zoom_settings/test_zoom_settings.py b/lms/lms/doctype/zoom_settings/test_zoom_settings.py
index 3162d3dc1..ed2b3b1ad 100644
--- a/lms/lms/doctype/zoom_settings/test_zoom_settings.py
+++ b/lms/lms/doctype/zoom_settings/test_zoom_settings.py
@@ -2,8 +2,8 @@
 # See license.txt
 
 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase
 
 
-class TestZoomSettings(FrappeTestCase):
+class TestZoomSettings(UnitTestCase):
 	pass

From 6e97449bf72b6c6d9d4df7d794ed523ae9b1d42c Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 11 Oct 2024 13:39:30 +0530
Subject: [PATCH 03/13] fix: misc ux issues

---
 frontend/package.json                         |   1 +
 frontend/src/components/BrandSettings.vue     |  28 ++-
 .../src/components/Controls/CodeEditor.vue    | 204 ++++++++++++++++++
 frontend/src/components/CourseCardOverlay.vue |  24 +--
 frontend/src/components/Modals/Settings.vue   |  41 ++--
 frontend/src/components/SettingDetails.vue    |   2 +-
 frontend/src/components/SettingFields.vue     |  43 ++--
 frontend/src/pages/JobCreation.vue            |   2 +-
 frontend/src/utils/index.js                   |  11 +-
 frontend/yarn.lock                            |   5 +
 10 files changed, 295 insertions(+), 66 deletions(-)
 create mode 100644 frontend/src/components/Controls/CodeEditor.vue

diff --git a/frontend/package.json b/frontend/package.json
index e5c1e94c5..3f2a2bb7c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -18,6 +18,7 @@
     "@editorjs/nested-list": "^1.4.2",
     "@editorjs/paragraph": "^2.11.3",
     "@editorjs/simple-image": "^1.6.0",
+    "ace-builds": "^1.36.2",
     "chart.js": "^4.4.1",
     "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
diff --git a/frontend/src/components/BrandSettings.vue b/frontend/src/components/BrandSettings.vue
index 630dce554..e8debd769 100644
--- a/frontend/src/components/BrandSettings.vue
+++ b/frontend/src/components/BrandSettings.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex flex-col justify-between h-full">
+	<div class="flex flex-col justify-between min-h-0">
 		<div>
 			<div class="flex items-center justify-between">
 				<div class="font-semibold mb-1">
@@ -16,11 +16,13 @@
 				{{ __(description) }}
 			</div>
 		</div>
-		<SettingFields :fields="fields" :data="data.data" />
-		<div class="flex flex-row-reverse mt-auto">
-			<Button variant="solid" :loading="saveSettings.loading" @click="update">
-				{{ __('Update') }}
-			</Button>
+		<div class="overflow-y-auto">
+			<SettingFields :fields="fields" :data="data.data" />
+			<div class="flex flex-row-reverse mt-auto">
+				<Button variant="solid" :loading="saveSettings.loading" @click="update">
+					{{ __('Update') }}
+				</Button>
+			</div>
 		</div>
 	</div>
 </template>
@@ -70,12 +72,20 @@ const update = () => {
 			fieldsToSave[f.name] = f.value
 		}
 	})
-	saveSettings.submit({
-		fields: fieldsToSave,
-	})
+	saveSettings.submit(
+		{
+			fields: fieldsToSave,
+		},
+		{
+			onSuccess(data) {
+				isDirty.value = false
+			},
+		}
+	)
 }
 
 watch(props.data, (newData) => {
+	console.log(newData)
 	if (newData && !isDirty.value) {
 		isDirty.value = true
 	}
diff --git a/frontend/src/components/Controls/CodeEditor.vue b/frontend/src/components/Controls/CodeEditor.vue
new file mode 100644
index 000000000..4ed4a5641
--- /dev/null
+++ b/frontend/src/components/Controls/CodeEditor.vue
@@ -0,0 +1,204 @@
+<template>
+	<div
+		class="editor flex flex-col gap-1"
+		:style="{
+			height: height,
+		}"
+	>
+		<span class="text-xs" v-if="label">
+			{{ label }}
+		</span>
+		<div
+			ref="editor"
+			class="h-auto flex-1 overflow-hidden overscroll-none !rounded border border-outline-gray-2 bg-surface-gray-2 dark:bg-gray-900"
+		/>
+		<span
+			class="mt-1 text-xs text-gray-600"
+			v-show="description"
+			v-html="description"
+		></span>
+		<Button
+			v-if="showSaveButton"
+			@click="emit('save', aceEditor?.getValue())"
+			class="mt-3"
+		>
+			{{ __('Save') }}
+		</Button>
+	</div>
+</template>
+<script setup lang="ts">
+import { useDark } from '@vueuse/core'
+import ace from 'ace-builds'
+import 'ace-builds/src-min-noconflict/ext-searchbox'
+import 'ace-builds/src-min-noconflict/theme-chrome'
+import 'ace-builds/src-min-noconflict/theme-twilight'
+import { PropType, onMounted, ref, watch } from 'vue'
+import { Button } from 'frappe-ui'
+
+const isDark = useDark({
+	attribute: 'data-theme',
+})
+
+const props = defineProps({
+	modelValue: {
+		type: [Object, String, Array],
+	},
+	type: {
+		type: String as PropType<'JSON' | 'HTML' | 'Python' | 'JavaScript' | 'CSS'>,
+		default: 'JSON',
+	},
+	label: {
+		type: String,
+		default: '',
+	},
+	readonly: {
+		type: Boolean,
+		default: false,
+	},
+	height: {
+		type: String,
+		default: '250px',
+	},
+	showLineNumbers: {
+		type: Boolean,
+		default: false,
+	},
+	autofocus: {
+		type: Boolean,
+		default: true,
+	},
+	showSaveButton: {
+		type: Boolean,
+		default: false,
+	},
+	description: {
+		type: String,
+		default: '',
+	},
+})
+
+const emit = defineEmits(['save', 'update:modelValue'])
+const editor = ref<HTMLElement | null>(null)
+let aceEditor = null as ace.Ace.Editor | null
+
+onMounted(() => {
+	setupEditor()
+})
+
+const setupEditor = () => {
+	aceEditor = ace.edit(editor.value as HTMLElement)
+	resetEditor(props.modelValue as string, true)
+	aceEditor.setReadOnly(props.readonly)
+	aceEditor.setOptions({
+		fontSize: '12px',
+		useWorker: false,
+		showGutter: props.showLineNumbers,
+		wrap: props.showLineNumbers,
+	})
+	if (props.type === 'CSS') {
+		import('ace-builds/src-noconflict/mode-css').then(() => {
+			aceEditor?.session.setMode('ace/mode/css')
+		})
+	} else if (props.type === 'JavaScript') {
+		import('ace-builds/src-noconflict/mode-javascript').then(() => {
+			aceEditor?.session.setMode('ace/mode/javascript')
+		})
+	} else if (props.type === 'Python') {
+		import('ace-builds/src-noconflict/mode-python').then(() => {
+			aceEditor?.session.setMode('ace/mode/python')
+		})
+	} else if (props.type === 'JSON') {
+		import('ace-builds/src-noconflict/mode-json').then(() => {
+			aceEditor?.session.setMode('ace/mode/json')
+		})
+	} else {
+		import('ace-builds/src-noconflict/mode-html').then(() => {
+			aceEditor?.session.setMode('ace/mode/html')
+		})
+	}
+	aceEditor.on('blur', () => {
+		try {
+			let value = aceEditor?.getValue() || ''
+			if (props.type === 'JSON') {
+				value = JSON.parse(value)
+			}
+			if (value === props.modelValue) return
+			if (!props.showSaveButton && !props.readonly) {
+				emit('update:modelValue', value)
+			}
+		} catch (e) {
+			// do nothing
+		}
+	})
+}
+
+const getModelValue = () => {
+	let value = props.modelValue || ''
+	try {
+		if (props.type === 'JSON' || typeof value === 'object') {
+			value = JSON.stringify(value, null, 2)
+		}
+	} catch (e) {
+		// do nothing
+	}
+	return value as string
+}
+
+function resetEditor(value: string, resetHistory = false) {
+	value = getModelValue()
+	aceEditor?.setValue(value)
+	aceEditor?.clearSelection()
+	aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
+	props.autofocus && aceEditor?.focus()
+	if (resetHistory) {
+		aceEditor?.session.getUndoManager().reset()
+	}
+}
+
+watch(isDark, () => {
+	aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
+})
+
+watch(
+	() => props.type,
+	() => {
+		setupEditor()
+	}
+)
+
+watch(
+	() => props.modelValue,
+	() => {
+		resetEditor(props.modelValue as string)
+	}
+)
+
+defineExpose({ resetEditor })
+</script>
+<style scoped>
+.editor .ace_editor {
+	height: 100%;
+	width: 100%;
+	border-radius: 5px;
+	overscroll-behavior: none;
+}
+.editor :deep(.ace_scrollbar-h) {
+	display: none;
+}
+.editor :deep(.ace_search) {
+	@apply dark:bg-gray-800 dark:text-gray-200;
+	@apply dark:border-gray-800;
+}
+.editor :deep(.ace_searchbtn) {
+	@apply dark:bg-gray-800 dark:text-gray-200;
+	@apply dark:border-gray-800;
+}
+.editor :deep(.ace_button) {
+	@apply dark:bg-gray-800 dark:text-gray-200;
+}
+
+.editor :deep(.ace_search_field) {
+	@apply dark:bg-gray-900 dark:text-gray-200;
+	@apply dark:border-gray-800;
+}
+</style>
diff --git a/frontend/src/components/CourseCardOverlay.vue b/frontend/src/components/CourseCardOverlay.vue
index 98f82fb23..d2a1ee30a 100644
--- a/frontend/src/components/CourseCardOverlay.vue
+++ b/frontend/src/components/CourseCardOverlay.vue
@@ -116,7 +116,7 @@
 import { BookOpen, Users, Star } from 'lucide-vue-next'
 import { computed, inject } from 'vue'
 import { Button, createResource } from 'frappe-ui'
-import { createToast } from '@/utils/'
+import { showToast } from '@/utils/'
 import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
 
@@ -139,11 +139,11 @@ const video_link = computed(() => {
 
 function enrollStudent() {
 	if (!user.data) {
-		createToast({
-			title: 'Please Login',
-			icon: 'alert-circle',
-			iconClasses: 'text-yellow-600 bg-yellow-100',
-		})
+		showToast(
+			__('Please Login'),
+			__('You need to login first to enroll for this course'),
+			'circle-warn'
+		)
 		setTimeout(() => {
 			window.location.href = `/login?redirect-to=${window.location.pathname}`
 		}, 2000)
@@ -159,11 +159,11 @@ function enrollStudent() {
 				capture('enrolled_in_course', {
 					course: props.course.data.name,
 				})
-				createToast({
-					title: 'Enrolled Successfully',
-					icon: 'check',
-					iconClasses: 'text-green-600 bg-green-100',
-				})
+				showToast(
+					__('Success'),
+					__('You have been enrolled in this course'),
+					'check'
+				)
 				setTimeout(() => {
 					router.push({
 						name: 'Lesson',
@@ -173,7 +173,7 @@ function enrollStudent() {
 							lessonNumber: 1,
 						},
 					})
-				}, 3000)
+				}, 2000)
 			})
 	}
 }
diff --git a/frontend/src/components/Modals/Settings.vue b/frontend/src/components/Modals/Settings.vue
index 79717118b..f8854df2b 100644
--- a/frontend/src/components/Modals/Settings.vue
+++ b/frontend/src/components/Modals/Settings.vue
@@ -179,26 +179,6 @@ const tabsStructure = computed(() => {
 							name: 'app_name',
 							type: 'text',
 						},
-						{
-							label: 'Copyright',
-							name: 'copyright',
-							type: 'text',
-						},
-						{
-							label: 'Address',
-							name: 'address',
-							type: 'textarea',
-							rows: 4,
-						},
-						{
-							label: 'Footer "Powered By"',
-							name: 'footer_powered',
-							type: 'textarea',
-							rows: 4,
-						},
-						{
-							type: 'Column Break',
-						},
 						{
 							label: 'Logo',
 							name: 'banner_image',
@@ -214,6 +194,23 @@ const tabsStructure = computed(() => {
 							name: 'footer_logo',
 							type: 'Upload',
 						},
+						{
+							label: 'Address',
+							name: 'address',
+							type: 'textarea',
+							rows: 2,
+						},
+						{
+							label: 'Footer "Powered By"',
+							name: 'footer_powered',
+							type: 'textarea',
+							rows: 4,
+						},
+						{
+							label: 'Copyright',
+							name: 'copyright',
+							type: 'text',
+						},
 					],
 				},
 				{
@@ -292,9 +289,11 @@ const tabsStructure = computed(() => {
 							rows: 10,
 						},
 						{
-							label: 'Ask user category',
+							label: 'Ask for Occupation',
 							name: 'user_category',
 							type: 'checkbox',
+							description:
+								'Enable this option to ask users to select their occupation during the signup process.',
 						},
 					],
 				},
diff --git a/frontend/src/components/SettingDetails.vue b/frontend/src/components/SettingDetails.vue
index e337ce589..87a80f263 100644
--- a/frontend/src/components/SettingDetails.vue
+++ b/frontend/src/components/SettingDetails.vue
@@ -2,7 +2,7 @@
 	<div class="flex flex-col justify-between h-full">
 		<div>
 			<div class="flex itemsc-center justify-between">
-				<div class="font-semibold mb-1">
+				<div class="text-xl font-semibold leading-none mb-1">
 					{{ __(label) }}
 				</div>
 				<Badge
diff --git a/frontend/src/components/SettingFields.vue b/frontend/src/components/SettingFields.vue
index af1745789..2cee55e99 100644
--- a/frontend/src/components/SettingFields.vue
+++ b/frontend/src/components/SettingFields.vue
@@ -17,17 +17,16 @@
 					/>
 
 					<div v-else-if="field.type == 'Code'">
-						<div>
-							{{ __(field.label) }}
-						</div>
-						<Codemirror
-							v-model:value="data[field.name]"
-							:height="200"
-							:options="{
-								mode: field.mode,
-								theme: 'seti',
-							}"
-						/>
+						<CodeEditor
+							:label="__(field.label)"
+							type="HTML"
+							description="The HTML you add here will be shown on your sign up page."
+							v-model="data[field.name]"
+							height="250px"
+							class="shrink-0"
+							:showLineNumbers="true"
+						>
+						</CodeEditor>
 					</div>
 
 					<div v-else-if="field.type == 'Upload'">
@@ -53,9 +52,11 @@
 							</template>
 						</FileUploader>
 						<div v-else>
-							<div class="flex items-center text-sm">
-								<div class="border rounded-md p-2 mr-2">
-									<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
+							<div class="flex items-center text-sm space-x-2">
+								<div
+									class="flex items-center justify-center rounded border border-outline-gray-1 w-[15rem] py-5"
+								>
+									<img :src="data[field.name]?.file_url" class="h-6 rounded" />
 								</div>
 								<div class="flex flex-col flex-wrap">
 									<span class="break-all">
@@ -73,6 +74,14 @@
 						</div>
 					</div>
 
+					<Switch
+						v-else-if="field.type == 'checkbox'"
+						size="sm"
+						:label="__(field.label)"
+						:description="__(field.description)"
+						v-model="data[field.name]"
+					/>
+
 					<FormControl
 						v-else
 						:key="field.name"
@@ -88,14 +97,12 @@
 	</div>
 </template>
 <script setup>
-import { FormControl, FileUploader, Button } from 'frappe-ui'
+import { FormControl, FileUploader, Button, Switch } from 'frappe-ui'
 import { computed } from 'vue'
 import { getFileSize, validateFile } from '@/utils'
 import { X, FileText } from 'lucide-vue-next'
 import Link from '@/components/Controls/Link.vue'
-import Codemirror from 'codemirror-editor-vue3'
-import 'codemirror/theme/seti.css'
-import 'codemirror/mode/htmlmixed/htmlmixed.js'
+import CodeEditor from '@/components/Controls/CodeEditor.vue'
 
 const props = defineProps({
 	fields: {
diff --git a/frontend/src/pages/JobCreation.vue b/frontend/src/pages/JobCreation.vue
index a03ec3ced..656e35998 100644
--- a/frontend/src/pages/JobCreation.vue
+++ b/frontend/src/pages/JobCreation.vue
@@ -149,7 +149,7 @@ const newJob = createResource({
 		return {
 			doc: {
 				doctype: 'Job Opportunity',
-				company_logo: job.image.file_url,
+				company_logo: job.image?.file_url,
 				...job,
 			},
 		}
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index b27f7982a..4ebb58f7a 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -82,10 +82,13 @@ export function getFileSize(file_size) {
 
 export function showToast(title, text, icon, iconClasses = null) {
 	if (!iconClasses) {
-		iconClasses =
-			icon == 'check'
-				? 'bg-green-600 text-white rounded-md p-px'
-				: 'bg-red-600 text-white rounded-md p-px'
+		if (icon == 'check') {
+			iconClasses = 'bg-green-600 text-white rounded-md p-px'
+		} else if (icon == 'circle-warn') {
+			iconClasses = 'bg-yellow-600 text-white rounded-md p-px'
+		} else {
+			iconClasses = 'bg-red-600 text-white rounded-md p-px'
+		}
 	}
 	createToast({
 		title: title,
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 97bdf0815..ca5cac630 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -852,6 +852,11 @@
   dependencies:
     vue-demi ">=0.14.8"
 
+ace-builds@^1.36.2:
+  version "1.36.2"
+  resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.36.2.tgz#9499bd59e839a335ac4850e74549ca8d849dc554"
+  integrity sha512-eqqfbGwx/GKjM/EnFu4QtQ+d2NNBu84MGgxoG8R5iyFpcVeQ4p9YlTL+ZzdEJqhdkASqoqOxCSNNGyB6lvMm+A==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"

From fa566514aae6f313c1ec02a037a9271901a75c54 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 11 Oct 2024 15:32:41 +0530
Subject: [PATCH 04/13] fix: image fetch for settings

---
 lms/lms/api.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lms/lms/api.py b/lms/lms/api.py
index 5ae8f074b..2f45f2d6c 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -293,7 +293,10 @@ def get_branding():
 	image_fields = ["banner_image", "footer_logo", "favicon"]
 
 	for field in image_fields:
-		website_settings.update({field: get_file_info(website_settings.get(field))})
+		if website_settings.get(field):
+			website_settings.update({field: get_file_info(website_settings.get(field))})
+		else:
+			website_settings.update({field: None})
 
 	return website_settings
 
@@ -322,7 +325,7 @@ def get_evaluator_details(evaluator):
 		)
 
 	if frappe.db.exists("Course Evaluator", {"evaluator": evaluator}):
-		doc = frappe.get_doc("Course Evaluator", evaluator, as_dict=1)
+		doc = frappe.get_doc("Course Evaluator", evaluator)
 	else:
 		doc = frappe.new_doc("Course Evaluator")
 		doc.evaluator = evaluator
@@ -576,14 +579,17 @@ def get_members(start=0, search=""):
 	"""
 
 	filters = {"enabled": 1, "name": ["not in", ["Administrator", "Guest"]]}
+	or_filters = {}
 
 	if search:
-		filters["full_name"] = ["like", f"%{search}%"]
+		or_filters["full_name"] = ["like", f"%{search}%"]
+		or_filters["email"] = ["like", f"%{search}%"]
 
 	members = frappe.get_all(
 		"User",
 		filters=filters,
 		fields=["name", "full_name", "user_image", "username", "last_active"],
+		or_filters=or_filters,
 		page_length=20,
 		start=start,
 	)

From eb350c5a20e71c37a95750673d6ebb9eb0df0cc1 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 11 Oct 2024 19:16:40 +0530
Subject: [PATCH 05/13] fix: batch self enrollment

---
 frontend/src/components/Assessments.vue       |  1 +
 frontend/src/components/BatchOverlay.vue      | 37 ++++++++++++++++++-
 frontend/src/components/BrandSettings.vue     |  1 -
 .../lms_assessment/lms_assessment.json        |  8 ++--
 lms/lms/utils.py                              | 14 ++++---
 5 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Assessments.vue b/frontend/src/components/Assessments.vue
index 55c849dd7..d7e4c1412 100644
--- a/frontend/src/components/Assessments.vue
+++ b/frontend/src/components/Assessments.vue
@@ -140,6 +140,7 @@ const removeAssessments = (selections, unselectAll) => {
 }
 
 const getRowRoute = (row) => {
+	console.log(row)
 	if (row.assessment_type == 'LMS Assignment') {
 		if (row.submission) {
 			return {
diff --git a/frontend/src/components/BatchOverlay.vue b/frontend/src/components/BatchOverlay.vue
index 670548a41..43f687f79 100644
--- a/frontend/src/components/BatchOverlay.vue
+++ b/frontend/src/components/BatchOverlay.vue
@@ -75,6 +75,7 @@
 			variant="solid"
 			class="w-full mt-2"
 			v-else-if="batch.data.allow_self_enrollment && batch.data.seats_left"
+			@click="enrollInBatch()"
 		>
 			{{ __('Enroll Now') }}
 		</Button>
@@ -97,11 +98,13 @@
 </template>
 <script setup>
 import { inject, computed } from 'vue'
-import { Badge, Button } from 'frappe-ui'
+import { Badge, Button, createResource } from 'frappe-ui'
 import { BookOpen, Clock, Globe } from 'lucide-vue-next'
-import { formatNumberIntoCurrency, formatTime } from '@/utils'
+import { formatNumberIntoCurrency, formatTime, showToast } from '@/utils'
 import DateRange from '@/components/Common/DateRange.vue'
+import { useRouter } from 'vue-router'
 
+const router = useRouter()
 const user = inject('$user')
 
 const props = defineProps({
@@ -111,6 +114,36 @@ const props = defineProps({
 	},
 })
 
+const enroll = createResource({
+	url: 'lms.lms.utils.enroll_in_batch',
+	makeParams(values) {
+		return {
+			batch: props.batch.data.name,
+		}
+	},
+})
+
+const enrollInBatch = () => {
+	enroll.submit(
+		{},
+		{
+			onSuccess(data) {
+				showToast(
+					__('Success'),
+					__('You have been enrolled in this batch'),
+					'check'
+				)
+				router.push({
+					name: 'Batch',
+					params: {
+						batchName: props.batch.data.name,
+					},
+				})
+			},
+		}
+	)
+}
+
 const seats_left = computed(() => {
 	if (props.batch.data?.seat_count) {
 		return props.batch.data?.seat_count - props.batch.data?.students?.length
diff --git a/frontend/src/components/BrandSettings.vue b/frontend/src/components/BrandSettings.vue
index e8debd769..0257637d4 100644
--- a/frontend/src/components/BrandSettings.vue
+++ b/frontend/src/components/BrandSettings.vue
@@ -85,7 +85,6 @@ const update = () => {
 }
 
 watch(props.data, (newData) => {
-	console.log(newData)
 	if (newData && !isDirty.value) {
 		isDirty.value = true
 	}
diff --git a/lms/lms/doctype/lms_assessment/lms_assessment.json b/lms/lms/doctype/lms_assessment/lms_assessment.json
index cab085f99..9a2fec8a8 100644
--- a/lms/lms/doctype/lms_assessment/lms_assessment.json
+++ b/lms/lms/doctype/lms_assessment/lms_assessment.json
@@ -15,20 +15,22 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Assessment Type",
-   "options": "DocType"
+   "options": "DocType",
+   "reqd": 1
   },
   {
    "fieldname": "assessment_name",
    "fieldtype": "Dynamic Link",
    "in_list_view": 1,
    "label": "Assessment Name",
-   "options": "assessment_type"
+   "options": "assessment_type",
+   "reqd": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-05-29 14:56:36.602399",
+ "modified": "2024-10-11 19:16:01.630524",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Assessment",
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index ca81644bc..de0fdf670 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1702,21 +1702,23 @@ def enroll_in_course(payment_name, course):
 		enrollment.save(ignore_permissions=True)
 
 
-def enroll_in_batch(payment_name, batch):
+@frappe.whitelist()
+def enroll_in_batch(batch, payment_name=None):
 	if not frappe.db.exists(
 		"Batch Student", {"parent": batch, "student": frappe.session.user}
 	):
 		student = frappe.new_doc("Batch Student")
 		current_count = frappe.db.count("Batch Student", {"parent": batch})
-		payment = frappe.db.get_value(
-			"LMS Payment", payment_name, ["name", "source"], as_dict=True
-		)
+		if payment_name:
+			payment = frappe.db.get_value(
+				"LMS Payment", payment_name, ["name", "source"], as_dict=True
+			)
 
 		student.update(
 			{
 				"student": frappe.session.user,
-				"payment": payment.name,
-				"source": payment.source,
+				"payment": payment.name if payment_name else None,
+				"source": payment.source if payment_name else None,
 				"parent": batch,
 				"parenttype": "LMS Batch",
 				"parentfield": "students",

From e56b28abadfc1ecd6d84b091b71aee48e3d20387 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 11 Oct 2024 19:17:56 +0530
Subject: [PATCH 06/13] chore: removed unnecessary lines

---
 frontend/src/components/Assessments.vue       | 1 -
 frontend/src/components/AudioBlock.vue        | 1 -
 frontend/src/components/CourseCardOverlay.vue | 1 -
 3 files changed, 3 deletions(-)

diff --git a/frontend/src/components/Assessments.vue b/frontend/src/components/Assessments.vue
index d7e4c1412..55c849dd7 100644
--- a/frontend/src/components/Assessments.vue
+++ b/frontend/src/components/Assessments.vue
@@ -140,7 +140,6 @@ const removeAssessments = (selections, unselectAll) => {
 }
 
 const getRowRoute = (row) => {
-	console.log(row)
 	if (row.assessment_type == 'LMS Assignment') {
 		if (row.submission) {
 			return {
diff --git a/frontend/src/components/AudioBlock.vue b/frontend/src/components/AudioBlock.vue
index 5d20e421d..06f33725c 100644
--- a/frontend/src/components/AudioBlock.vue
+++ b/frontend/src/components/AudioBlock.vue
@@ -56,7 +56,6 @@ const props = defineProps({
 onMounted(() => {
 	setTimeout(() => {
 		audio.value = document.querySelector('audio')
-		console.log(audio.value)
 		audio.value.onloadedmetadata = () => {
 			duration.value = audio.value.duration
 		}
diff --git a/frontend/src/components/CourseCardOverlay.vue b/frontend/src/components/CourseCardOverlay.vue
index d2a1ee30a..ea8d44090 100644
--- a/frontend/src/components/CourseCardOverlay.vue
+++ b/frontend/src/components/CourseCardOverlay.vue
@@ -206,7 +206,6 @@ const certificate = createResource({
 		}
 	},
 	onSuccess(data) {
-		console.log(data)
 		window.open(
 			`/api/method/frappe.utils.print_format.download_pdf?doctype=LMS+Certificate&name=${
 				data.name

From deba6aa845fa35fdf90ac370f6f4d73dbca5c124 Mon Sep 17 00:00:00 2001
From: frappe-pr-bot <developers@erpnext.com>
Date: Fri, 11 Oct 2024 16:04:13 +0000
Subject: [PATCH 07/13] chore: update POT file

---
 lms/locale/main.pot | 288 ++++++++++++++++++++++++++++++--------------
 1 file changed, 197 insertions(+), 91 deletions(-)

diff --git a/lms/locale/main.pot b/lms/locale/main.pot
index 538b1576a..737052296 100644
--- a/lms/locale/main.pot
+++ b/lms/locale/main.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Frappe LMS VERSION\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-10-04 16:04+0000\n"
-"PO-Revision-Date: 2024-10-04 16:04+0000\n"
+"POT-Creation-Date: 2024-10-11 16:04+0000\n"
+"PO-Revision-Date: 2024-10-11 16:04+0000\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: jannat@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -128,8 +128,8 @@ msgstr ""
 msgid "Add a course"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:137
-#: frontend/src/pages/QuizForm.vue:147
+#: frontend/src/components/Modals/Question.vue:141
+#: frontend/src/pages/QuizForm.vue:175
 msgid "Add a new question"
 msgstr ""
 
@@ -193,7 +193,7 @@ msgstr ""
 msgid "All Submissions"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:41
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:46
 msgid "All questions should have the same marks if the limit is set."
 msgstr ""
 
@@ -267,6 +267,10 @@ msgstr ""
 msgid "Answer"
 msgstr ""
 
+#: frontend/src/pages/JobDetail.vue:131
+msgid "Applications Received"
+msgstr ""
+
 #: frontend/src/pages/JobDetail.vue:42
 msgid "Apply"
 msgstr ""
@@ -298,6 +302,10 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
+#: frontend/src/components/CourseOutline.vue:209
+msgid "Are you sure you want to delete this lesson?"
+msgstr ""
+
 #. Label of the user_category (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Ask User Category during Signup"
@@ -626,6 +634,7 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Course'
 #: frontend/src/pages/BatchForm.vue:179 frontend/src/pages/Batches.vue:16
 #: frontend/src/pages/CourseForm.vue:116 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/JobDetail.vue:102
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -714,7 +723,7 @@ msgstr ""
 msgid "Chapters"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:176 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:183 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr ""
 
@@ -731,11 +740,13 @@ msgid "Checkout Courses"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'LMS Question'
+#. Option for the 'Type' (Select) field in DocType 'LMS Quiz Question'
 #: lms/lms/doctype/lms_question/lms_question.json
+#: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:76 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:511 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
@@ -743,7 +754,7 @@ msgstr ""
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:77 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:512 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
@@ -973,7 +984,7 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
-#: lms/lms/utils.py:422
+#: lms/lms/utils.py:423
 msgid "Cookie Policy"
 msgstr ""
 
@@ -989,7 +1000,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:150
+#: frontend/src/components/Quiz.vue:143
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1314,6 +1325,14 @@ msgstr ""
 msgid "Degree Type"
 msgstr ""
 
+#: frontend/src/components/CourseOutline.vue:212
+msgid "Delete"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:208
+msgid "Delete Lesson"
+msgstr ""
+
 #. Label of the description (Text Editor) field in DocType 'Job Opportunity'
 #. Label of the description (Small Text) field in DocType 'Certification'
 #. Label of the description (Markdown Editor) field in DocType 'Cohort'
@@ -1351,7 +1370,7 @@ msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
 #: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/QuizForm.vue:14
+#: frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr ""
 
@@ -1422,7 +1441,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:92
+#: frontend/src/components/BatchOverlay.vue:93
 #: frontend/src/components/CourseCardOverlay.vue:86
 #: frontend/src/pages/JobDetail.vue:31 frontend/src/pages/Lesson.vue:70
 #: frontend/src/pages/Profile.vue:32
@@ -1438,7 +1457,7 @@ msgstr ""
 msgid "Edit Profile"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:146
+#: frontend/src/pages/QuizForm.vue:174
 msgid "Edit the question"
 msgstr ""
 
@@ -1537,7 +1556,7 @@ msgstr ""
 msgid "End Time"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:79
+#: frontend/src/components/BatchOverlay.vue:80
 msgid "Enroll Now"
 msgstr ""
 
@@ -1560,7 +1579,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1682
+#: lms/lms/utils.py:1683
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1578,7 +1597,7 @@ msgstr ""
 msgid "Enter a URL"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:21
+#: frontend/src/pages/QuizForm.vue:49
 msgid "Enter a title and save the quiz to proceed"
 msgstr ""
 
@@ -1586,11 +1605,12 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:242
-#: frontend/src/components/Modals/Question.vue:262
-#: frontend/src/components/Modals/Question.vue:319
-#: frontend/src/pages/Billing.vue:255 frontend/src/pages/QuizForm.vue:314
-#: frontend/src/pages/QuizForm.vue:329
+#: frontend/src/components/Modals/Question.vue:246
+#: frontend/src/components/Modals/Question.vue:266
+#: frontend/src/components/Modals/Question.vue:323
+#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:342
+#: frontend/src/pages/QuizForm.vue:357
+#: frontend/src/pages/QuizSubmission.vue:117
 msgid "Error"
 msgstr ""
 
@@ -1778,7 +1798,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:427
+#: frontend/src/pages/QuizForm.vue:455
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1992,7 +2012,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:348
+#: frontend/src/pages/QuizForm.vue:376
 msgid "ID"
 msgstr ""
 
@@ -2018,6 +2038,10 @@ msgstr ""
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:62
+msgid "If you want open ended questions then make sure each question in the quiz is of open ended type."
+msgstr ""
+
 #. Option for the 'File Type' (Select) field in DocType 'Course Lesson'
 #. Label of the image (Code) field in DocType 'Exercise Latest Submission'
 #. Label of the image (Code) field in DocType 'Exercise Submission'
@@ -2040,6 +2064,10 @@ msgstr ""
 msgid "Image search powered by"
 msgstr ""
 
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:220
+msgid "Image: Corrupted Data Stream"
+msgstr ""
+
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
@@ -2069,7 +2097,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:155
+#: frontend/src/components/Quiz.vue:148
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2119,7 +2147,7 @@ msgstr ""
 
 #. Label of the instructor_notes (Markdown Editor) field in DocType 'Course
 #. Lesson'
-#: frontend/src/pages/Lesson.vue:129 frontend/src/pages/LessonForm.vue:33
+#: frontend/src/pages/Lesson.vue:130 frontend/src/pages/LessonForm.vue:33
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Instructor Notes"
 msgstr ""
@@ -2559,11 +2587,11 @@ msgid "Letter Grade (e.g. A, B-)"
 msgstr ""
 
 #. Label of the limit_questions_to (Int) field in DocType 'LMS Quiz'
-#: frontend/src/pages/QuizForm.vue:73 lms/lms/doctype/lms_quiz/lms_quiz.json
+#: frontend/src/pages/QuizForm.vue:101 lms/lms/doctype/lms_quiz/lms_quiz.json
 msgid "Limit Questions To"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:35
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:40
 msgid "Limit cannot be greater than or equal to the number of questions in the quiz."
 msgstr ""
 
@@ -2619,7 +2647,7 @@ msgstr ""
 #. Label of the location (Data) field in DocType 'Job Opportunity'
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobCreation.vue:23
+#: frontend/src/pages/JobCreation.vue:23 frontend/src/pages/JobDetail.vue:89
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
@@ -2651,6 +2679,10 @@ msgstr ""
 msgid "Make an Announcement"
 msgstr ""
 
+#: frontend/src/pages/Billing.vue:128
+msgid "Make sure to enter the right billing name as the same will be used in your invoice."
+msgstr ""
+
 #: frontend/src/components/BatchOverlay.vue:54
 msgid "Manage Batch"
 msgstr ""
@@ -2665,7 +2697,7 @@ msgstr ""
 msgid "Manager (Sales/Marketing/Customer)"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:83
+#: frontend/src/components/Quiz.vue:76
 msgid "Mark"
 msgstr ""
 
@@ -2680,20 +2712,31 @@ msgstr ""
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:92
-#: frontend/src/components/Quiz.vue:83 frontend/src/pages/QuizForm.vue:358
+#: frontend/src/components/Modals/Question.vue:96
+#: frontend/src/components/Quiz.vue:76 frontend/src/pages/QuizForm.vue:386
+#: frontend/src/pages/QuizSubmission.vue:52
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
 msgid "Marks"
 msgstr ""
 
+#: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:19
+msgid "Marks for question number {0} cannot be greater than the marks allotted for that question."
+msgstr ""
+
+#. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
+#: frontend/src/pages/QuizSubmission.vue:55
+#: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
+msgid "Marks out of"
+msgstr ""
+
 #. Label of the max_attempts (Int) field in DocType 'LMS Quiz'
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
 msgid "Max Attempts"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:28
+#: frontend/src/pages/QuizForm.vue:56
 msgid "Maximun Attempts"
 msgstr ""
 
@@ -2726,6 +2769,8 @@ msgstr ""
 #. Label of the member (Link) field in DocType 'LMS Mentor Request'
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/QuizSubmission.vue:27
+#: frontend/src/pages/QuizSubmissionList.vue:77
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2913,6 +2958,7 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
+#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:44
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
@@ -2921,12 +2967,11 @@ msgstr ""
 msgid "New Assignment Submission"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:30 lms/public/js/common_functions.js:255
-#: lms/www/lms.py:86
+#: lms/public/js/common_functions.js:255 lms/www/lms.py:86
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:44 lms/www/lms.py:37
+#: lms/www/lms.py:37
 msgid "New Course"
 msgstr ""
 
@@ -2938,11 +2983,11 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:88
+#: frontend/src/pages/QuizForm.vue:116
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:418 frontend/src/pages/QuizForm.vue:426
+#: frontend/src/pages/QuizForm.vue:446 frontend/src/pages/QuizForm.vue:454
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -2951,11 +2996,11 @@ msgstr ""
 msgid "New Sign Up"
 msgstr ""
 
-#: lms/lms/utils.py:612
+#: lms/lms/utils.py:613
 msgid "New comment in batch {0}"
 msgstr ""
 
-#: lms/lms/utils.py:605
+#: lms/lms/utils.py:606
 msgid "New reply on the topic {0} in course {1}"
 msgstr ""
 
@@ -2964,7 +3009,7 @@ msgstr ""
 msgid "New {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:184 frontend/src/pages/Lesson.vue:89
+#: frontend/src/components/Quiz.vue:191 frontend/src/pages/Lesson.vue:89
 msgid "Next"
 msgstr ""
 
@@ -3072,6 +3117,7 @@ msgstr ""
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
+#: frontend/src/pages/QuizSubmission.vue:9
 msgid "Not Saved"
 msgstr ""
 
@@ -3120,12 +3166,13 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:449 frontend/src/utils/index.js:506
+#: frontend/src/pages/CourseForm.vue:449 frontend/src/utils/index.js:509
 msgid "Only image file is allowed."
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
+#: frontend/src/pages/QuizForm.vue:17
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Open"
@@ -3139,6 +3186,13 @@ msgstr ""
 msgid "Open Course"
 msgstr ""
 
+#. Option for the 'Type' (Select) field in DocType 'LMS Question'
+#. Option for the 'Type' (Select) field in DocType 'LMS Quiz Question'
+#: lms/lms/doctype/lms_question/lms_question.json
+#: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
+msgid "Open Ended"
+msgstr ""
+
 #: lms/lms/widgets/MemberCard.html:16
 msgid "Open Network"
 msgstr ""
@@ -3178,6 +3232,10 @@ msgstr ""
 msgid "Ordered Item"
 msgstr ""
 
+#: frontend/src/pages/JobDetail.vue:76
+msgid "Organisation"
+msgstr ""
+
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3254,7 +3312,7 @@ msgstr ""
 
 #. Label of the passing_percentage (Int) field in DocType 'LMS Quiz'
 #. Label of the passing_percentage (Int) field in DocType 'LMS Quiz Submission'
-#: frontend/src/pages/QuizForm.vue:37 frontend/src/pages/Quizzes.vue:109
+#: frontend/src/pages/QuizForm.vue:65 frontend/src/pages/Quizzes.vue:109
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Passing Percentage"
@@ -3344,6 +3402,8 @@ msgid "Pending"
 msgstr ""
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/QuizSubmission.vue:40
+#: frontend/src/pages/QuizSubmissionList.vue:93
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr ""
@@ -3357,6 +3417,10 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
+#: frontend/src/components/CourseCardOverlay.vue:143
+msgid "Please Login"
+msgstr ""
+
 #: lms/lms/doctype/lms_settings/lms_settings.py:33
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -3398,7 +3462,7 @@ msgstr ""
 msgid "Please install the Payments app to create a paid courses."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:247
+#: frontend/src/pages/Billing.vue:256
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
@@ -3432,7 +3496,7 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:79
+#: frontend/src/components/Modals/Question.vue:83
 msgid "Possibility"
 msgstr ""
 
@@ -3465,6 +3529,10 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
+#: frontend/src/pages/JobDetail.vue:115
+msgid "Posted on"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/preferred_function/preferred_function.json
 msgid "Preferred Function"
@@ -3524,7 +3592,7 @@ msgstr ""
 msgid "Primary Subgroup"
 msgstr ""
 
-#: lms/lms/utils.py:421
+#: lms/lms/utils.py:422
 msgid "Privacy Policy"
 msgstr ""
 
@@ -3539,7 +3607,7 @@ msgstr ""
 msgid "Private Information includes your Grade and Work Environment Preferences"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:126
+#: frontend/src/pages/Billing.vue:134
 msgid "Proceed to Payment"
 msgstr ""
 
@@ -3603,7 +3671,7 @@ msgstr ""
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:38
 #: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:353
+#: frontend/src/pages/QuizForm.vue:381
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3628,11 +3696,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:257
+#: frontend/src/components/Modals/Question.vue:261
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:309
+#: frontend/src/components/Modals/Question.vue:313
 msgid "Question updated successfully"
 msgstr ""
 
@@ -3640,22 +3708,23 @@ msgstr ""
 msgid "Question {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:165
+#: frontend/src/components/Quiz.vue:168
 msgid "Question {0} of {1}"
 msgstr ""
 
 #. Label of the questions (Table) field in DocType 'LMS Quiz'
-#: frontend/src/pages/QuizForm.vue:82 lms/lms/doctype/lms_quiz/lms_quiz.json
+#: frontend/src/pages/QuizForm.vue:110 lms/lms/doctype/lms_quiz/lms_quiz.json
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizForm.vue:423
 msgid "Questions deleted successfully"
 msgstr ""
 
 #. Label of the quiz (Link) field in DocType 'LMS Quiz Submission'
 #. Label of a Link in the LMS Workspace
-#: frontend/src/utils/quiz.js:24
+#: frontend/src/pages/QuizSubmission.vue:22
+#: frontend/src/pages/QuizSubmissionList.vue:82 frontend/src/utils/quiz.js:24
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Quiz"
@@ -3667,15 +3736,26 @@ msgid "Quiz ID"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
-#: frontend/src/pages/QuizSubmission.vue:46 lms/lms/workspace/lms/lms.json
+#: frontend/src/pages/QuizPage.vue:47 frontend/src/pages/QuizPage.vue:53
+#: lms/lms/workspace/lms/lms.json
 msgid "Quiz Submission"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:198
+#: frontend/src/pages/QuizSubmission.vue:98
+#: frontend/src/pages/QuizSubmissionList.vue:102
+msgid "Quiz Submissions"
+msgstr ""
+
+#: frontend/src/components/Quiz.vue:205
 msgid "Quiz Summary"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:307
+#. Label of the quiz_title (Data) field in DocType 'LMS Quiz Submission'
+#: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
+msgid "Quiz Title"
+msgstr ""
+
+#: frontend/src/pages/QuizForm.vue:335
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -3683,7 +3763,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:326
+#: frontend/src/pages/QuizForm.vue:354
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -3692,7 +3772,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:406 frontend/src/pages/Quizzes.vue:120
+#: frontend/src/pages/QuizForm.vue:434 frontend/src/pages/Quizzes.vue:120
 #: frontend/src/pages/Quizzes.vue:130
 msgid "Quizzes"
 msgstr ""
@@ -3859,7 +3939,7 @@ msgstr ""
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:29
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:34
 msgid "Rows {0} have the duplicate questions."
 msgstr ""
 
@@ -3874,13 +3954,15 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
+#: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/components/QuizPlugin.vue:23
 #: frontend/src/pages/AssignmentSubmission.vue:7
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:12
 #: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:10
-#: frontend/src/pages/QuizForm.vue:7 lms/public/js/common_functions.js:405
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
+#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
 
@@ -3905,6 +3987,8 @@ msgid "Scope"
 msgstr ""
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/QuizSubmission.vue:35
+#: frontend/src/pages/QuizSubmissionList.vue:87
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -3940,7 +4024,7 @@ msgstr ""
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:87
+#: frontend/src/components/Modals/Question.vue:91
 msgid "Select a question"
 msgstr ""
 
@@ -3969,7 +4053,7 @@ msgstr ""
 
 #: frontend/src/components/Modals/Settings.vue:7
 #: frontend/src/pages/BatchForm.vue:143 frontend/src/pages/CourseForm.vue:128
-#: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:44
+#: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:72
 msgid "Settings"
 msgstr ""
 
@@ -3989,12 +4073,12 @@ msgid "Show Answer"
 msgstr ""
 
 #. Label of the show_answers (Check) field in DocType 'LMS Quiz'
-#: frontend/src/pages/QuizForm.vue:50 lms/lms/doctype/lms_quiz/lms_quiz.json
+#: frontend/src/pages/QuizForm.vue:78 lms/lms/doctype/lms_quiz/lms_quiz.json
 msgid "Show Answers"
 msgstr ""
 
 #. Label of the show_submission_history (Check) field in DocType 'LMS Quiz'
-#: frontend/src/pages/QuizForm.vue:55 lms/lms/doctype/lms_quiz/lms_quiz.json
+#: frontend/src/pages/QuizForm.vue:83 lms/lms/doctype/lms_quiz/lms_quiz.json
 msgid "Show Submission History"
 msgstr ""
 
@@ -4019,11 +4103,11 @@ msgid "Show live class"
 msgstr ""
 
 #. Label of the shuffle_questions (Check) field in DocType 'LMS Quiz'
-#: frontend/src/pages/QuizForm.vue:68 lms/lms/doctype/lms_quiz/lms_quiz.json
+#: frontend/src/pages/QuizForm.vue:96 lms/lms/doctype/lms_quiz/lms_quiz.json
 msgid "Shuffle Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:62
+#: frontend/src/pages/QuizForm.vue:90
 msgid "Shuffle Settings"
 msgstr ""
 
@@ -4306,11 +4390,15 @@ msgstr ""
 msgid "Submission"
 msgstr ""
 
+#: frontend/src/pages/QuizForm.vue:30
+msgid "Submission List"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:331
-#: frontend/src/components/Quiz.vue:189 lms/templates/assignment.html:9
+#: frontend/src/components/Modals/Question.vue:335
+#: frontend/src/components/Quiz.vue:196 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4327,14 +4415,16 @@ msgid "Submitted {0}"
 msgstr ""
 
 #: frontend/src/components/BatchCourses.vue:150
+#: frontend/src/components/BatchOverlay.vue:132
 #: frontend/src/components/BatchStudents.vue:157
+#: frontend/src/components/CourseCardOverlay.vue:163
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/Event.vue:255
 #: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:257
-#: frontend/src/components/Modals/Question.vue:308
-#: frontend/src/pages/QuizForm.vue:307 frontend/src/pages/QuizForm.vue:326
-#: frontend/src/pages/QuizForm.vue:395
+#: frontend/src/components/Modals/Question.vue:261
+#: frontend/src/components/Modals/Question.vue:312
+#: frontend/src/pages/QuizForm.vue:335 frontend/src/pages/QuizForm.vue:354
+#: frontend/src/pages/QuizForm.vue:423
 msgid "Success"
 msgstr ""
 
@@ -4429,7 +4519,7 @@ msgstr ""
 msgid "Temporarily Disabled"
 msgstr ""
 
-#: lms/lms/utils.py:420
+#: lms/lms/utils.py:421
 msgid "Terms of Use"
 msgstr ""
 
@@ -4516,7 +4606,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1562
+#: lms/lms/utils.py:1563
 msgid "This course is free."
 msgstr ""
 
@@ -4614,7 +4704,7 @@ msgstr ""
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
 #: frontend/src/pages/BatchForm.vue:18 frontend/src/pages/CourseForm.vue:24
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/QuizForm.vue:20
+#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/QuizForm.vue:48
 #: frontend/src/pages/Quizzes.vue:98 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
@@ -4650,7 +4740,7 @@ msgstr ""
 msgid "To Date is mandatory in Work Experience."
 msgstr ""
 
-#: lms/lms/utils.py:1573
+#: lms/lms/utils.py:1574
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -4667,7 +4757,7 @@ msgid "Total"
 msgstr ""
 
 #. Label of the total_marks (Int) field in DocType 'LMS Quiz'
-#: frontend/src/pages/QuizForm.vue:32 frontend/src/pages/Quizzes.vue:103
+#: frontend/src/pages/QuizForm.vue:60 frontend/src/pages/Quizzes.vue:103
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
 msgid "Total Marks"
 msgstr ""
@@ -4682,7 +4772,7 @@ msgstr ""
 msgid "Travel"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:220 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:234 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr ""
 
@@ -4701,6 +4791,7 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Assignment'
 #. Label of the type (Select) field in DocType 'LMS Assignment Submission'
 #. Label of the type (Select) field in DocType 'LMS Question'
+#. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
 #: frontend/src/pages/JobCreation.vue:28
@@ -4708,11 +4799,12 @@ msgstr ""
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_question/lms_question.json
+#: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/templates/assessments.html:14
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:71
+#: frontend/src/components/Quiz.vue:513
 msgid "Type your answer"
 msgstr ""
 
@@ -4779,7 +4871,7 @@ msgstr ""
 msgid "Upcoming Evaluations"
 msgstr ""
 
-#: frontend/src/components/BrandSettings.vue:22
+#: frontend/src/components/BrandSettings.vue:23
 #: frontend/src/components/PaymentSettings.vue:27
 #: frontend/src/components/SettingDetails.vue:23
 msgid "Update"
@@ -4817,7 +4909,9 @@ msgid "User Field"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'LMS Question'
+#. Option for the 'Type' (Select) field in DocType 'LMS Quiz Question'
 #: lms/lms/doctype/lms_question/lms_question.json
+#: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 msgid "User Input"
 msgstr ""
 
@@ -5015,7 +5109,7 @@ msgstr ""
 msgid "You got"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:202
+#: frontend/src/components/Quiz.vue:216
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr ""
@@ -5032,6 +5126,14 @@ msgstr ""
 msgid "You have already reviewed this course"
 msgstr ""
 
+#: frontend/src/components/BatchOverlay.vue:133
+msgid "You have been enrolled in this batch"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:164
+msgid "You have been enrolled in this course"
+msgstr ""
+
 #: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
@@ -5040,6 +5142,10 @@ msgstr ""
 msgid "You haven't enrolled for any courses"
 msgstr ""
 
+#: frontend/src/components/CourseCardOverlay.vue:144
+msgid "You need to login first to enroll for this course"
+msgstr ""
+
 #: frontend/src/components/Quiz.vue:11 lms/templates/quiz/quiz.html:11
 #, python-format
 msgid "You will have to get {0}% correct answers in order to pass the quiz."
@@ -5093,20 +5199,20 @@ msgstr ""
 msgid "Your score is"
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:209
+msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/zoom_settings/zoom_settings.json
 msgid "Zoom Settings"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:93
-msgid "applications received"
-msgstr ""
-
 #: lms/templates/emails/mentor_request_creation_email.html:5
 msgid "cancel your application"
 msgstr ""
 
-#: frontend/src/pages/Lesson.vue:174
+#: frontend/src/pages/Lesson.vue:175
 msgid "completed"
 msgstr ""
 
@@ -5138,7 +5244,7 @@ msgstr ""
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:354
+#: frontend/src/pages/QuizForm.vue:382
 msgid "question_detail"
 msgstr ""
 
@@ -5154,7 +5260,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:725 lms/lms/api.py:733
+#: lms/lms/api.py:731 lms/lms/api.py:739
 msgid "{0} Settings not found"
 msgstr ""
 
@@ -5190,7 +5296,7 @@ msgstr ""
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:689
+#: lms/lms/utils.py:690
 msgid "{0} mentioned you in a comment"
 msgstr ""
 
@@ -5198,11 +5304,11 @@ msgstr ""
 msgid "{0} mentioned you in a comment in your batch."
 msgstr ""
 
-#: lms/lms/utils.py:642 lms/lms/utils.py:648
+#: lms/lms/utils.py:643 lms/lms/utils.py:649
 msgid "{0} mentioned you in a comment in {1}"
 msgstr ""
 
-#: lms/lms/utils.py:460
+#: lms/lms/utils.py:461
 msgid "{0}k"
 msgstr ""
 

From 1597054cc9567c2780707b7c55b49a858f4b7013 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 11 Oct 2024 22:18:18 +0530
Subject: [PATCH 08/13] fix: redirect to login before enrollment

---
 frontend/src/components/BatchOverlay.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/components/BatchOverlay.vue b/frontend/src/components/BatchOverlay.vue
index 43f687f79..a9579c8a4 100644
--- a/frontend/src/components/BatchOverlay.vue
+++ b/frontend/src/components/BatchOverlay.vue
@@ -124,6 +124,9 @@ const enroll = createResource({
 })
 
 const enrollInBatch = () => {
+	if (!user.data) {
+		window.location.href = `/login?redirect-to=/batches/details/${props.batch.data.name}`
+	}
 	enroll.submit(
 		{},
 		{

From f33e950e8343b13a0efadfca6433fed600a21760 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 14 Oct 2024 14:31:26 +0530
Subject: [PATCH 09/13] feat: timer in quiz

---
 frontend/src/components/Controls/Rating.vue |   2 +-
 frontend/src/components/Quiz.vue            | 105 ++++++++++++++++----
 frontend/src/pages/QuizForm.vue             |  17 +++-
 lms/lms/doctype/lms_quiz/lms_quiz.json      |  10 +-
 lms/lms/doctype/lms_quiz/lms_quiz.py        |  31 +++---
 5 files changed, 123 insertions(+), 42 deletions(-)

diff --git a/frontend/src/components/Controls/Rating.vue b/frontend/src/components/Controls/Rating.vue
index 77eb39454..f6684a771 100644
--- a/frontend/src/components/Controls/Rating.vue
+++ b/frontend/src/components/Controls/Rating.vue
@@ -21,7 +21,7 @@
 
 <script setup>
 import { Star } from 'lucide-vue-next'
-import { computed, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
 
 const props = defineProps({
 	id: {
diff --git a/frontend/src/components/Quiz.vue b/frontend/src/components/Quiz.vue
index 2d8e9d9d9..1c5f55f25 100644
--- a/frontend/src/components/Quiz.vue
+++ b/frontend/src/components/Quiz.vue
@@ -1,11 +1,27 @@
 <template>
 	<div v-if="quiz.data">
-		<div class="bg-blue-100 py-2 px-2 mb-4 rounded-md text-sm text-blue-800">
-			<div class="leading-relaxed">
+		<div
+			class="bg-blue-100 space-y-2 py-2 px-2 rounded-md text-sm text-blue-800"
+		>
+			<div class="leading-5">
 				{{
 					__('This quiz consists of {0} questions.').format(questions.length)
 				}}
 			</div>
+			<div class="leading-5">
+				{{
+					__(
+						'Please ensure that you complete all the questions in {0} minutes.'
+					).format(quiz.data.duration)
+				}}
+			</div>
+			<div class="leading-5">
+				{{
+					__(
+						'If you fail to do so, the quiz will be automatically submitted when the timer ends.'
+					)
+				}}
+			</div>
 			<div v-if="quiz.data.passing_percentage" class="leading-relaxed">
 				{{
 					__(
@@ -22,14 +38,16 @@
 					)
 				}}
 			</div>
-			<div v-if="quiz.data.time" class="leading-relaxed">
-				{{
-					__(
-						'The quiz has a time limit. For each question you will be given {0} seconds.'
-					).format(quiz.data.time)
-				}}
-			</div>
 		</div>
+
+		<div v-if="quiz.data.duration" class="flex items-center space-x-2 my-4">
+			<span class="text-gray-600 text-xs"> {{ __('Time') }}: </span>
+			<ProgressBar :progress="timerProgress" />
+			<span class="font-semibold">
+				{{ formatTimer(timer) }}
+			</span>
+		</div>
+
 		<div v-if="activeQuestion == 0">
 			<div class="border text-center p-20 rounded-md">
 				<div class="font-semibold text-lg">
@@ -63,7 +81,7 @@
 					class="border rounded-md p-5"
 				>
 					<div class="flex justify-between">
-						<div class="text-sm">
+						<div class="text-sm text-gray-600">
 							<span class="mr-2">
 								{{ __('Question {0}').format(activeQuestion) }}:
 							</span>
@@ -162,8 +180,8 @@
 							editorClass="prose-sm max-w-none border-b border-x bg-gray-100 rounded-b-md py-1 px-2 min-h-[7rem]"
 						/>
 					</div>
-					<div class="flex items-center justify-between mt-5">
-						<div>
+					<div class="flex items-center justify-between mt-4">
+						<div class="text-sm text-gray-600">
 							{{
 								__('Question {0} of {1}').format(
 									activeQuestion,
@@ -250,20 +268,29 @@
 	</div>
 </template>
 <script setup>
-import { Badge, Button, createResource, ListView, TextEditor } from 'frappe-ui'
-import { ref, watch, reactive, inject } from 'vue'
+import {
+	Badge,
+	Button,
+	createResource,
+	ListView,
+	TextEditor,
+	FormControl,
+} from 'frappe-ui'
+import { ref, watch, reactive, inject, computed } from 'vue'
 import { createToast } from '@/utils/'
 import { CheckCircle, XCircle, MinusCircle } from 'lucide-vue-next'
 import { timeAgo } from '@/utils'
-import FormControl from 'frappe-ui/src/components/FormControl.vue'
-const user = inject('$user')
+import ProgressBar from '@/components/ProgressBar.vue'
 
+const user = inject('$user')
 const activeQuestion = ref(0)
 const currentQuestion = ref('')
 const selectedOptions = reactive([0, 0, 0, 0])
 const showAnswers = reactive([])
 let questions = reactive([])
 const possibleAnswer = ref(null)
+const timer = ref(0)
+let timerInterval = null
 
 const props = defineProps({
 	quizName: {
@@ -284,6 +311,7 @@ const quiz = createResource({
 	auto: true,
 	onSuccess(data) {
 		populateQuestions()
+		setupTimer()
 	},
 })
 
@@ -299,6 +327,37 @@ const populateQuestions = () => {
 	}
 }
 
+const setupTimer = () => {
+	if (quiz.data.duration) {
+		timer.value = quiz.data.duration * 60
+	}
+}
+
+const startTimer = () => {
+	timerInterval = setInterval(() => {
+		timer.value--
+		if (timer.value == 0) {
+			clearInterval(timerInterval)
+			submitQuiz()
+		}
+	}, 1000)
+}
+
+const formatTimer = (seconds) => {
+	const hrs = Math.floor(seconds / 3600)
+		.toString()
+		.padStart(2, '0')
+	const mins = Math.floor((seconds % 3600) / 60)
+		.toString()
+		.padStart(2, '0')
+	const secs = (seconds % 60).toString().padStart(2, '0')
+	return hrs != '00' ? `${hrs}:${mins}:${secs}` : `${mins}:${secs}`
+}
+
+const timerProgress = computed(() => {
+	return (timer.value / (quiz.data.duration * 60)) * 100
+})
+
 const shuffleArray = (array) => {
 	for (let i = array.length - 1; i > 0; i--) {
 		const j = Math.floor(Math.random() * (i + 1))
@@ -383,6 +442,7 @@ watch(
 const startQuiz = () => {
 	activeQuestion.value = 1
 	localStorage.removeItem(quiz.data.title)
+	if (quiz.data.duration) startTimer()
 }
 
 const markAnswer = (index) => {
@@ -493,9 +553,15 @@ const submitQuiz = () => {
 }
 
 const createSubmission = () => {
-	quizSubmission.reload().then(() => {
-		if (quiz.data && quiz.data.max_attempts) attempts.reload()
-	})
+	quizSubmission.submit(
+		{},
+		{
+			onSuccess(data) {
+				if (quiz.data && quiz.data.max_attempts) attempts.reload()
+				if (quiz.data.duration) clearInterval(timerInterval)
+			},
+		}
+	)
 }
 
 const resetQuiz = () => {
@@ -504,6 +570,7 @@ const resetQuiz = () => {
 	showAnswers.length = 0
 	quizSubmission.reset()
 	populateQuestions()
+	setupTimer()
 }
 
 const getInstructions = (question) => {
diff --git a/frontend/src/pages/QuizForm.vue b/frontend/src/pages/QuizForm.vue
index 38a3255b1..b1ee47051 100644
--- a/frontend/src/pages/QuizForm.vue
+++ b/frontend/src/pages/QuizForm.vue
@@ -38,7 +38,7 @@
 	<div class="w-3/4 mx-auto py-5">
 		<!-- Details -->
 		<div class="mb-8">
-			<div class="text-sm font-semibold mb-4">
+			<div class="font-semibold mb-4">
 				{{ __('Details') }}
 			</div>
 			<FormControl
@@ -50,11 +50,17 @@
 				"
 			/>
 			<div v-if="quizDetails.data?.name">
-				<div class="grid grid-cols-3 gap-5 mt-4 mb-8">
+				<div class="grid grid-cols-2 gap-5 mt-4 mb-8">
 					<FormControl
+						type="number"
 						v-model="quiz.max_attempts"
 						:label="__('Maximun Attempts')"
 					/>
+					<FormControl
+						type="number"
+						v-model="quiz.duration"
+						:label="__('Duration (in minutes)')"
+					/>
 					<FormControl
 						v-model="quiz.total_marks"
 						:label="__('Total Marks')"
@@ -68,7 +74,7 @@
 
 				<!-- Settings -->
 				<div class="mb-8">
-					<div class="text-sm font-semibold mb-4">
+					<div class="font-semibold mb-4">
 						{{ __('Settings') }}
 					</div>
 					<div class="grid grid-cols-3 gap-5 my-4">
@@ -86,7 +92,7 @@
 				</div>
 
 				<div class="mb-8">
-					<div class="text-sm font-semibold mb-4">
+					<div class="font-semibold mb-4">
 						{{ __('Shuffle Settings') }}
 					</div>
 					<div class="grid grid-cols-3">
@@ -106,7 +112,7 @@
 				<!-- Questions -->
 				<div>
 					<div class="flex items-center justify-between mb-4">
-						<div class="text-sm font-semibold">
+						<div class="font-semibold">
 							{{ __('Questions') }}
 						</div>
 						<Button @click="openQuestionModal()">
@@ -226,6 +232,7 @@ const quiz = reactive({
 	total_marks: 0,
 	passing_percentage: 0,
 	max_attempts: 0,
+	duration: 0,
 	limit_questions_to: 0,
 	show_answers: true,
 	show_submission_history: false,
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.json b/lms/lms/doctype/lms_quiz/lms_quiz.json
index dd5de78da..4b779f27d 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.json
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.json
@@ -10,10 +10,11 @@
   "title",
   "max_attempts",
   "show_answers",
+  "show_submission_history",
   "column_break_gaac",
   "total_marks",
   "passing_percentage",
-  "show_submission_history",
+  "duration",
   "section_break_tzbu",
   "shuffle_questions",
   "column_break_clsh",
@@ -128,11 +129,16 @@
   {
    "fieldname": "column_break_clsh",
    "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "duration",
+   "fieldtype": "Duration",
+   "label": "Duration"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-08-09 12:21:36.256522",
+ "modified": "2024-10-11 22:39:40.381183",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz",
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.py b/lms/lms/doctype/lms_quiz/lms_quiz.py
index 6ce5a4ae2..5441be81a 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.py
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.py
@@ -100,6 +100,16 @@ def quiz_summary(quiz, results):
 	score = 0
 	results = results and json.loads(results)
 	is_open_ended = False
+	percentage = 0
+
+	quiz_details = frappe.db.get_value(
+		"LMS Quiz",
+		quiz,
+		["total_marks", "passing_percentage", "lesson", "course"],
+		as_dict=1,
+	)
+
+	score_out_of = quiz_details.total_marks
 
 	for result in results:
 		question_details = frappe.db.get_value(
@@ -113,17 +123,6 @@ def quiz_summary(quiz, results):
 		result["question"] = question_details.question_detail
 		result["marks_out_of"] = question_details.marks
 
-		quiz_details = frappe.db.get_value(
-			"LMS Quiz",
-			quiz,
-			["total_marks", "passing_percentage", "lesson", "course"],
-			as_dict=1,
-		)
-
-		score = 0
-		percentage = 0
-		score_out_of = quiz_details.total_marks
-
 		if question_details.type != "Open Ended":
 			correct = result["is_correct"][0]
 			for point in result["is_correct"]:
@@ -135,24 +134,26 @@ def quiz_summary(quiz, results):
 			score += marks
 
 			del result["question_name"]
-			percentage = (score / score_out_of) * 100
 		else:
 			result["is_correct"] = 0
 			is_open_ended = True
 
+		percentage = (score / score_out_of) * 100
 		result["answer"] = re.sub(
 			r'<img[^>]*src\s*=\s*["\'](?=data:)(.*?)["\']', _save_file, result["answer"]
 		)
 
-	submission = frappe.get_doc(
+	submission = frappe.new_doc("LMS Quiz Submission")
+	# Score and percentage are calculated by the controller function
+	submission.update(
 		{
 			"doctype": "LMS Quiz Submission",
 			"quiz": quiz,
 			"result": results,
-			"score": score,
+			"score": 0,
 			"score_out_of": score_out_of,
 			"member": frappe.session.user,
-			"percentage": percentage,
+			"percentage": 0,
 			"passing_percentage": quiz_details.passing_percentage,
 		}
 	)

From a9cb52c68ba25b3585b3427952da9f1c08f5864e Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 14 Oct 2024 15:49:27 +0530
Subject: [PATCH 10/13] fix: hide timer instructions if duration is not set

---
 frontend/src/components/Quiz.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Quiz.vue b/frontend/src/components/Quiz.vue
index 1c5f55f25..e6433764d 100644
--- a/frontend/src/components/Quiz.vue
+++ b/frontend/src/components/Quiz.vue
@@ -1,21 +1,21 @@
 <template>
 	<div v-if="quiz.data">
 		<div
-			class="bg-blue-100 space-y-2 py-2 px-2 rounded-md text-sm text-blue-800"
+			class="bg-blue-100 space-y-1 py-2 px-2 rounded-md text-sm text-blue-800"
 		>
 			<div class="leading-5">
 				{{
 					__('This quiz consists of {0} questions.').format(questions.length)
 				}}
 			</div>
-			<div class="leading-5">
+			<div v-if="quiz.data?.duration" class="leading-5">
 				{{
 					__(
 						'Please ensure that you complete all the questions in {0} minutes.'
 					).format(quiz.data.duration)
 				}}
 			</div>
-			<div class="leading-5">
+			<div v-if="quiz.data?.duration" class="leading-5">
 				{{
 					__(
 						'If you fail to do so, the quiz will be automatically submitted when the timer ends.'

From 8fe02b83b8aa02082e99455d04f4c2babbdf1bca Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 17 Oct 2024 09:27:24 +0530
Subject: [PATCH 11/13] fix: batch enrollment after payment completion

---
 lms/lms/utils.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index de0fdf670..7738a3533 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1678,7 +1678,7 @@ def update_payment_record(doctype, docname):
 			if doctype == "LMS Course":
 				enroll_in_course(data.payment, docname)
 			else:
-				enroll_in_batch(data.payment, docname)
+				enroll_in_batch(docname, data.payment)
 		except Exception as e:
 			frappe.log_error(frappe.get_traceback(), _("Enrollment Failed"))
 
@@ -1709,20 +1709,24 @@ def enroll_in_batch(batch, payment_name=None):
 	):
 		student = frappe.new_doc("Batch Student")
 		current_count = frappe.db.count("Batch Student", {"parent": batch})
-		if payment_name:
-			payment = frappe.db.get_value(
-				"LMS Payment", payment_name, ["name", "source"], as_dict=True
-			)
-
+		
 		student.update(
 			{
 				"student": frappe.session.user,
-				"payment": payment.name if payment_name else None,
-				"source": payment.source if payment_name else None,
 				"parent": batch,
 				"parenttype": "LMS Batch",
 				"parentfield": "students",
 				"idx": current_count + 1,
 			}
 		)
+
+		if payment_name:
+			payment = frappe.db.get_value(
+				"LMS Payment", payment_name, ["name", "source"], as_dict=True
+			)
+			student.update({
+				"payment": payment.name,
+				"source": payment.source,
+			})
+
 		student.save(ignore_permissions=True)

From 4d82bc86e80a3497acf1a9d76c0ec07d55d2778f Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 17 Oct 2024 10:30:06 +0530
Subject: [PATCH 12/13] style: fix spacing

---
 lms/lms/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 7738a3533..624d49177 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1728,5 +1728,6 @@ def enroll_in_batch(batch, payment_name=None):
 				"payment": payment.name,
 				"source": payment.source,
 			})
+			
 
 		student.save(ignore_permissions=True)

From 49a765a9a63083fb817c65c23c926cf64d2ac5bf Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 17 Oct 2024 10:31:56 +0530
Subject: [PATCH 13/13] style: fix spacing

---
 lms/lms/utils.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 624d49177..406dc9799 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1709,7 +1709,7 @@ def enroll_in_batch(batch, payment_name=None):
 	):
 		student = frappe.new_doc("Batch Student")
 		current_count = frappe.db.count("Batch Student", {"parent": batch})
-		
+
 		student.update(
 			{
 				"student": frappe.session.user,
@@ -1724,10 +1724,11 @@ def enroll_in_batch(batch, payment_name=None):
 			payment = frappe.db.get_value(
 				"LMS Payment", payment_name, ["name", "source"], as_dict=True
 			)
-			student.update({
-				"payment": payment.name,
-				"source": payment.source,
-			})
-			
+			student.update(
+				{
+					"payment": payment.name,
+					"source": payment.source,
+				}
+			)
 
 		student.save(ignore_permissions=True)