From fa774b0db23a38319cc3a19a3386c18d6ac16820 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 19 Jul 2024 20:05:28 +0530
Subject: [PATCH 01/13] feat: quiz creation

---
 frontend/src/pages/QuizCreation.vue    |  62 +++++++++++++
 frontend/src/pages/Quizzes.vue         | 117 +++++++++++++++++++++++++
 frontend/src/router.js                 |  11 +++
 frontend/src/translation.js            |   1 +
 lms/lms/doctype/lms_quiz/lms_quiz.json |   6 +-
 5 files changed, 196 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/pages/QuizCreation.vue
 create mode 100644 frontend/src/pages/Quizzes.vue

diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
new file mode 100644
index 00000000..99c7447e
--- /dev/null
+++ b/frontend/src/pages/QuizCreation.vue
@@ -0,0 +1,62 @@
+<template>
+	<header
+		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
+	>
+		<Breadcrumbs :items="breadcrumbs" />
+	</header>
+	<div v-if="quizDetails" class="w-3/4 mx-auto py-5">
+		<FormControl v-model="quiz.title" :label="__('Title')" />
+		<FormControl v-model="quiz.total_marks" :label="__('Total Marks')" />
+		<FormControl
+			v-model="quiz.passing_percentage"
+			:label="__('Passing Percentage')"
+		/>
+		<FormControl v-model="quiz.max_attempts" :label="__('Maximun Attempts')" />
+		<FormControl
+			v-model="quiz.limit_questions_to"
+			:label="__('Limit Questions To')"
+		/>
+	</div>
+</template>
+<script setup>
+import { Breadcrumbs, createDocumentResource, FormControl } from 'frappe-ui'
+import { computed, reactive } from 'vue'
+
+const props = defineProps({
+	quizId: {
+		type: String,
+		required: true,
+	},
+})
+
+const quiz = reactive({
+	title: '',
+	total_marks: '',
+	passing_percentage: '',
+	max_attempts: 0,
+	limit_questions_to: 0,
+	show_answers: true,
+	show_submission_history: false,
+	shuffle_questions: false,
+	questions: [],
+})
+
+const quizDetails = createDocumentResource({
+	doctype: 'LMS Quiz',
+	name: props.quiz,
+	auto: true,
+	cache: ['quiz', props.quiz],
+})
+
+const breadcrumbs = computed(() => {
+	let crumbs = [
+		{
+			label: __('Quizzes'),
+			route: {
+				name: 'Quizzes',
+			},
+		},
+	]
+	return crumbs
+})
+</script>
diff --git a/frontend/src/pages/Quizzes.vue b/frontend/src/pages/Quizzes.vue
new file mode 100644
index 00000000..113fde84
--- /dev/null
+++ b/frontend/src/pages/Quizzes.vue
@@ -0,0 +1,117 @@
+<template>
+	<header
+		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
+	>
+		<Breadcrumbs :items="breadcrumbs" />
+	</header>
+	<div v-if="quizzes.data?.length" class="w-3/4 mx-auto py-5">
+		<ListView
+			:columns="quizColumns"
+			:rows="quizzes.data"
+			row-key="name"
+			:options="{ showTooltip: false }"
+		>
+			<ListHeader
+				class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+			>
+				<ListHeaderItem :item="item" v-for="item in quizColumns">
+				</ListHeaderItem>
+			</ListHeader>
+			<ListRows>
+				<router-link
+					v-for="row in quizzes.data"
+					:to="{
+						name: 'QuizCreation',
+						params: {
+							quizID: row.name,
+						},
+					}"
+				>
+					<ListRow :row="row" />
+				</router-link>
+			</ListRows>
+			<ListSelectBanner>
+				<template #actions="{ unselectAll, selections }">
+					<div class="flex gap-2">
+						<Button
+							variant="ghost"
+							@click="removeQuiz(selections, unselectAll)"
+						>
+							<Trash2 class="h-4 w-4 stroke-1.5" />
+						</Button>
+					</div>
+				</template>
+			</ListSelectBanner>
+		</ListView>
+	</div>
+</template>
+<script setup>
+import {
+	Breadcrumbs,
+	createListResource,
+	FormControl,
+	ListView,
+	ListRows,
+	ListRow,
+	ListRowItem,
+	ListHeader,
+	ListHeaderItem,
+	ListSelectBanner,
+	Button,
+} from 'frappe-ui'
+import { computed, inject } from 'vue'
+import { Trash2 } from 'lucide-vue-next'
+
+const user = inject('$user')
+
+const quizFilter = computed(() => {
+	if (user.data?.is_moderator) return {}
+	return {
+		owner: user.data?.name,
+	}
+})
+
+const quizzes = createListResource({
+	doctype: 'LMS Quiz',
+	filters: quizFilter,
+	fields: ['name', 'title', 'passing_percentage', 'total_marks'],
+	auto: true,
+	cache: ['quizzes', user.data?.name],
+	onSuccess(data) {
+		data.forEach((row) => {})
+	},
+})
+
+const quizColumns = computed(() => {
+	return [
+		{
+			label: __('Title'),
+			key: 'title',
+			width: 2,
+		},
+		{
+			label: __('Total Marks'),
+			key: 'total_marks',
+			width: 1,
+			align: 'center',
+		},
+		{
+			label: __('Passing Percentage'),
+			key: 'passing_percentage',
+			width: 1,
+			align: 'center',
+		},
+	]
+})
+
+const breadcrumbs = computed(() => {
+	return [
+		{
+			label: __('Quizzes'),
+			route: {
+				name: 'Quizzes',
+			},
+		},
+	]
+})
+</script>
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 3b53ce19..d93d207a 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -141,6 +141,17 @@ const routes = [
 		component: () => import('@/pages/Badge.vue'),
 		props: true,
 	},
+	{
+		path: '/quizzes',
+		name: 'Quizzes',
+		component: () => import('@/pages/Quizzes.vue'),
+	},
+	{
+		path: '/quizzes/:quizID',
+		name: 'QuizCreation',
+		component: () => import('@/pages/QuizCreation.vue'),
+		props: true,
+	},
 ]
 
 let router = createRouter({
diff --git a/frontend/src/translation.js b/frontend/src/translation.js
index 0f9911dc..f6b9050b 100644
--- a/frontend/src/translation.js
+++ b/frontend/src/translation.js
@@ -2,6 +2,7 @@ import { createResource } from 'frappe-ui'
 
 export default function translationPlugin(app) {
 	app.config.globalProperties.__ = translate
+	window.__ = translate
 	if (!window.translatedMessages) fetchTranslations()
 }
 
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.json b/lms/lms/doctype/lms_quiz/lms_quiz.json
index 9c1b8e95..38d23b9a 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.json
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.json
@@ -74,6 +74,7 @@
    "default": "1",
    "fieldname": "show_answers",
    "fieldtype": "Check",
+   "in_standard_filter": 1,
    "label": "Show Answers"
   },
   {
@@ -98,6 +99,8 @@
   {
    "fieldname": "passing_percentage",
    "fieldtype": "Int",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Passing Percentage",
    "non_negative": 1,
    "reqd": 1
@@ -110,6 +113,7 @@
    "default": "0",
    "fieldname": "total_marks",
    "fieldtype": "Int",
+   "in_list_view": 1,
    "label": "Total Marks",
    "non_negative": 1,
    "read_only": 1,
@@ -133,7 +137,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-06-27 22:03:48.576489",
+ "modified": "2024-07-19 18:21:26.681501",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz",

From a450c846a6996e1d340cb32885b7a8c45a72b345 Mon Sep 17 00:00:00 2001
From: Jannat Patel <jannatpatel@Jannats-MacBook-Air.local>
Date: Mon, 29 Jul 2024 19:44:04 +0530
Subject: [PATCH 02/13] feat: questions table

---
 .gitmodules                                   |   3 +
 frappe-ui                                     |   2 +-
 frontend/src/components/Modals/Question.vue   |  30 ++++
 frontend/src/pages/QuizCreation.vue           | 132 +++++++++++++++---
 frontend/src/pages/Quizzes.vue                |  25 ++--
 frontend/yarn.lock                            |  29 ++--
 .../lms_quiz_question/lms_quiz_question.json  |  23 ++-
 .../certificate_request_creation.html         |   2 +-
 package.json                                  |   2 +-
 9 files changed, 199 insertions(+), 49 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 frontend/src/components/Modals/Question.vue

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..e82154a1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "frappe-ui"]
+	path = frappe-ui
+	url = https://github.com/pateljannat/frappe-ui
diff --git a/frappe-ui b/frappe-ui
index aa44431c..a349ab07 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit aa44431c185b1e4563f2ebf6af380c7743d2cd4c
+Subproject commit a349ab070a73a3d22ead6a33374c9fe44f6ecf57
diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
new file mode 100644
index 00000000..bdecfc4c
--- /dev/null
+++ b/frontend/src/components/Modals/Question.vue
@@ -0,0 +1,30 @@
+<template>
+    <!-- <Dialog
+        v-model="show"
+    >
+        <template>
+            This is life
+        </template>
+    </Dialog> -->
+</template>
+<script setup>
+import { Dialog } from "frappe-ui"
+import { computed } from "vue"
+
+const show = defineModel()
+
+const dialogOptions = computed(() => {
+    return {
+        title: __(props.title),
+        size: 'lg',
+        actions: [
+            {
+                label: __('Submit'),
+                onClick: (close) => {
+                    submitQuestion(close)
+                },
+            },
+        ]
+    }
+})
+</script>
\ No newline at end of file
diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index 99c7447e..dd2b13a5 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -4,31 +4,97 @@
 	>
 		<Breadcrumbs :items="breadcrumbs" />
 	</header>
-	<div v-if="quizDetails" class="w-3/4 mx-auto py-5">
-		<FormControl v-model="quiz.title" :label="__('Title')" />
-		<FormControl v-model="quiz.total_marks" :label="__('Total Marks')" />
-		<FormControl
-			v-model="quiz.passing_percentage"
-			:label="__('Passing Percentage')"
-		/>
-		<FormControl v-model="quiz.max_attempts" :label="__('Maximun Attempts')" />
-		<FormControl
-			v-model="quiz.limit_questions_to"
-			:label="__('Limit Questions To')"
-		/>
+	<div class="w-3/4 mx-auto py-5">
+		<!-- Details -->
+		<div class="mb-8">
+			<div class="text-sm font-semibold mb-4">
+				{{ __("Details") }}
+			</div>
+			<div class="grid grid-cols-2 gap-5">
+				<div class="space-y-2">
+					<FormControl v-model="quiz.title" :label="__('Title')" />
+					<FormControl v-model="quiz.max_attempts" :label="__('Maximun Attempts')" />
+					<FormControl
+						v-model="quiz.limit_questions_to"
+						:label="__('Limit Questions To')"
+					/>
+				</div>
+				<div class="space-y-2">
+					<FormControl v-model="quiz.total_marks" :label="__('Total Marks')" />
+					<FormControl
+						v-model="quiz.passing_percentage"
+						:label="__('Passing Percentage')"
+					/>
+				</div>
+			</div>
+		</div>
+		
+		<!-- Settings -->
+		<div class="mb-8">
+			<div class="text-sm font-semibold mb-4">
+				{{ __("Settings") }}
+			</div>
+			<div class="grid grid-cols-3 gap-5 my-4">
+				<FormControl v-model="quiz.show_answers" type="checkbox" :label="__('Show Answers')"/>
+				<FormControl v-model="quiz.show_submission_history" type="checkbox" :label="__('Show Submission History')"/>
+				<FormControl v-model="quiz.shuffle_questions" type="checkbox" :label="__('Shuffle Questions')"/>
+			</div>
+		</div>
+
+		<!-- Questions -->
+		<div>
+			<div class="flex items-center justify-between mb-4">
+				<div class="text-sm font-semibold">
+					{{ __("Questions") }}
+				</div>
+				<Button @click="openQuestionModal.value = true">
+					<template #prefix>
+						<Plus class="w-4 h-4"/>
+					</template>
+					{{ __("New Question") }}
+				</Button>
+			</div>
+			<ListView
+				:columns="questionColumns"
+				:rows="quiz.questions"
+				row-key="name"
+				:options="{ showTooltip: false }"
+			>
+				<ListHeader
+					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+				>
+					<ListHeaderItem :item="item" v-for="item in questionColumns"/>
+				</ListHeader>
+				<ListRows>
+					<ListRow :row="row" v-slot="{ idx, column, item }" v-for="row in quiz.questions">
+						<ListRowItem :item="item">
+							<div class="text-xs">
+								{{ item }}
+							</div>
+						</ListRowItem>
+					</ListRow>
+				</ListRows>
+			</ListView>
+		</div>
 	</div>
+	<Question/>
 </template>
 <script setup>
-import { Breadcrumbs, createDocumentResource, FormControl } from 'frappe-ui'
-import { computed, reactive } from 'vue'
+import { Breadcrumbs, createDocumentResource, FormControl, ListView, ListHeader, ListHeaderItem, ListRows, ListRow, ListRowItem, Button } from 'frappe-ui'
+import { computed, reactive, ref } from 'vue'
+import { Plus } from "lucide-vue-next"
+import Question from '@/components/Modals/Question.vue';
+
+const openQuestionModal = ref(false)
 
 const props = defineProps({
-	quizId: {
+	quizID: {
 		type: String,
 		required: true,
 	},
 })
 
+
 const quiz = reactive({
 	title: '',
 	total_marks: '',
@@ -43,9 +109,43 @@ const quiz = reactive({
 
 const quizDetails = createDocumentResource({
 	doctype: 'LMS Quiz',
-	name: props.quiz,
+	name: props.quizID,
 	auto: true,
 	cache: ['quiz', props.quiz],
+	onSuccess(data) {
+		Object.keys(data).forEach((key) => {
+			if (Object.hasOwn(quiz, key))
+				quiz[key] = data[key]
+		})
+
+		let checkboxes = ["show_answers", "show_submission_history", "shuffle_questions"]
+		for (let idx in checkboxes) {
+			let key = checkboxes[idx]
+			quiz[key] = quiz[key] ? true : false
+		}
+	}
+})
+
+console.log(quizDetails)
+
+const questionColumns = computed(() => {
+	return [
+		{
+			label: __("ID"),
+			key: "question",
+			width: 1
+		},
+		{
+			label: __("Question"),
+			key: __("question_detail"),
+			width: 3
+		},
+		{
+			label: __("Marks"),
+			key: "marks",
+			width: 1,
+		},
+	]
 })
 
 const breadcrumbs = computed(() => {
diff --git a/frontend/src/pages/Quizzes.vue b/frontend/src/pages/Quizzes.vue
index 113fde84..e7e75b30 100644
--- a/frontend/src/pages/Quizzes.vue
+++ b/frontend/src/pages/Quizzes.vue
@@ -3,13 +3,19 @@
 		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
+		<Button variant="solid">
+			<template #prefix>
+				<Plus class="w-4 h-4"/>
+			</template>
+			{{ __('New Quiz') }}
+		</Button>
 	</header>
 	<div v-if="quizzes.data?.length" class="w-3/4 mx-auto py-5">
 		<ListView
 			:columns="quizColumns"
 			:rows="quizzes.data"
 			row-key="name"
-			:options="{ showTooltip: false }"
+			:options="{ showTooltip: false, selectable: false }"
 		>
 			<ListHeader
 				class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
@@ -30,18 +36,6 @@
 					<ListRow :row="row" />
 				</router-link>
 			</ListRows>
-			<ListSelectBanner>
-				<template #actions="{ unselectAll, selections }">
-					<div class="flex gap-2">
-						<Button
-							variant="ghost"
-							@click="removeQuiz(selections, unselectAll)"
-						>
-							<Trash2 class="h-4 w-4 stroke-1.5" />
-						</Button>
-					</div>
-				</template>
-			</ListSelectBanner>
 		</ListView>
 	</div>
 </template>
@@ -49,18 +43,15 @@
 import {
 	Breadcrumbs,
 	createListResource,
-	FormControl,
 	ListView,
 	ListRows,
 	ListRow,
-	ListRowItem,
 	ListHeader,
 	ListHeaderItem,
-	ListSelectBanner,
 	Button,
 } from 'frappe-ui'
 import { computed, inject } from 'vue'
-import { Trash2 } from 'lucide-vue-next'
+import { Plus } from 'lucide-vue-next'
 
 const user = inject('$user')
 
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 30adce7c..7833087e 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -68,13 +68,6 @@
   dependencies:
     "@codexteam/icons" "^0.0.5"
 
-"@editorjs/image@^2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@editorjs/image/-/image-2.9.2.tgz#c8bea65a578fab65a1a75df1223b4fd8f06b57d5"
-  integrity sha512-n09sMieGW8cksoeflpplzvbmFH2bdVzVTWbnidPWAHaeU467HRteoXU9yfGBB7+eeHZLnmCulQ2dr6ae+G2niw==
-  dependencies:
-    "@codexteam/icons" "^0.3.0"
-
 "@editorjs/inline-code@^1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@editorjs/inline-code/-/inline-code-1.5.0.tgz#ad5849bac3396b9dad22dceeda76198dd991e426"
@@ -1882,8 +1875,16 @@ source-map-js@^1.2.0:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
-  name string-width-cjs
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -1901,8 +1902,14 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  name strip-ansi-cjs
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
diff --git a/lms/lms/doctype/lms_quiz_question/lms_quiz_question.json b/lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
index e14a8d48..5570559f 100644
--- a/lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
+++ b/lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
@@ -6,7 +6,10 @@
  "engine": "InnoDB",
  "field_order": [
   "question",
-  "marks"
+  "column_break_qcpo",
+  "marks",
+  "section_break_huup",
+  "question_detail"
  ],
  "fields": [
   {
@@ -25,12 +28,28 @@
    "label": "Marks",
    "non_negative": 1,
    "reqd": 1
+  },
+  {
+   "fetch_from": "question.question",
+   "fieldname": "question_detail",
+   "fieldtype": "Text",
+   "in_list_view": 1,
+   "label": "Question Detail",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_qcpo",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_huup",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-10-16 19:51:03.893144",
+ "modified": "2024-07-29 15:10:09.662715",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz Question",
diff --git a/lms/lms/notification/certificate_request_creation/certificate_request_creation.html b/lms/lms/notification/certificate_request_creation/certificate_request_creation.html
index 1db1fa13..34e041a1 100644
--- a/lms/lms/notification/certificate_request_creation/certificate_request_creation.html
+++ b/lms/lms/notification/certificate_request_creation/certificate_request_creation.html
@@ -5,5 +5,5 @@
 
 <p> {{ _("Hey {0}").format(doc.member_name) }} </p>
 <p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short"), timezone) }}</p>
-<p> {{ _("Your evaluator is {0}").format(evaluator_name) }}
+<p> {{ _("Your evaluator is {0}").format(evaluator_name) }} </p>
 <p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>
diff --git a/package.json b/package.json
index 01084562..21679ab9 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "frappe_lms",
   "version": "1.0.0",
   "description": "Easy to use, open-source, Learning Management System",
-  "workspaces1": [
+  "workspaces": [
     "frappe-ui",
     "frontend"
   ],

From b8c3bdc0b448d5fabcf9852903788c7f74c258db Mon Sep 17 00:00:00 2001
From: Jannat Patel <jannatpatel@Jannats-MacBook-Air.local>
Date: Wed, 31 Jul 2024 11:07:46 +0530
Subject: [PATCH 03/13] feat: open modal to edit question

---
 .gitignore                                  |   3 +-
 frontend/src/components/Modals/Question.vue | 127 ++++++++++++++++----
 frontend/src/pages/QuizCreation.vue         | 113 +++++++++++------
 3 files changed, 184 insertions(+), 59 deletions(-)

diff --git a/.gitignore b/.gitignore
index 957c519f..95242ce7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ __pycache__/
 node_modules
 package-lock.json
 lms/public/frontend
-lms/www/lms.html
\ No newline at end of file
+lms/www/lms.html
+frappe-ui
\ No newline at end of file
diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
index bdecfc4c..8fa262cd 100644
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -1,30 +1,113 @@
 <template>
-    <!-- <Dialog
-        v-model="show"
-    >
-        <template>
-            This is life
-        </template>
-    </Dialog> -->
+	<Dialog v-model="show" :options="dialogOptions">
+		<template #body-content>
+			<div class="space-y-4">
+				<div>
+					<label class="block text-xs text-gray-600 mb-1">
+						{{ __('Question') }}
+					</label>
+					<TextEditor
+						:content="question.question"
+						@change="(val) => (question.question = val)"
+						:editable="true"
+						:fixedMenu="true"
+						editorClass="prose-sm max-w-none border-b border-x bg-gray-100 rounded-b-md py-1 px-2 min-h-[7rem]"
+					/>
+				</div>
+				<FormControl
+					:label="__('Type')"
+					v-model="question.type"
+					type="select"
+					:options="['Choices', 'User Input']"
+					class="pb-2"
+				/>
+				<div v-if="question.type == 'Choices'" class="divide-y">
+					<div v-for="n in 4" class="space-y-4 py-2">
+						<FormControl
+							:label="__('Option') + ' ' + n"
+							v-model="question[`option_${n}`]"
+						/>
+						<FormControl
+							:label="__('Explanation')"
+							v-model="question[`explanation_${n}`]"
+						/>
+						<FormControl
+							:label="__('Correct Answer')"
+							v-model="question[`correct_answer_${n}`]"
+							type="checkbox"
+						/>
+					</div>
+				</div>
+				<div v-else v-for="n in 4" class="space-y-2">
+					<FormControl
+						:label="__('Possibility') + ' ' + n"
+						v-model="question[`possibility_${n}`]"
+					/>
+				</div>
+			</div>
+		</template>
+	</Dialog>
 </template>
 <script setup>
-import { Dialog } from "frappe-ui"
-import { computed } from "vue"
+import { Dialog, FormControl, TextEditor } from 'frappe-ui'
+import { computed, onMounted, reactive } from 'vue'
 
 const show = defineModel()
+const question = reactive({
+	question: '',
+	type: 'Choices',
+})
+
+onMounted(() => {
+	populateFields()
+	populateQuestionDetail()
+})
+
+const props = defineProps({
+	title: {
+		type: String,
+		default: __('Add a Question'),
+	},
+	questionDetail: {
+		type: Object,
+		default: {},
+	},
+})
+
+const populateFields = () => {
+	let fields = ['option', 'correct_answer', 'explanation', 'possibility']
+	let counter = 1
+	fields.forEach((field) => {
+		while (counter <= 4) {
+			question[`${field}_${counter}`] = field === 'correct_answer' ? false : ''
+			counter++
+		}
+	})
+}
+
+const populateQuestionDetail = () => {
+	if (Object.keys(props.questionDetail).length) {
+		Object.keys(props.questionDetail).forEach((key) => {
+			if (Object.hasOwn(question, key)) {
+				question[key] = props.questionDetail[key]
+			}
+		})
+	}
+}
 
 const dialogOptions = computed(() => {
-    return {
-        title: __(props.title),
-        size: 'lg',
-        actions: [
-            {
-                label: __('Submit'),
-                onClick: (close) => {
-                    submitQuestion(close)
-                },
-            },
-        ]
-    }
+	return {
+		title: __(props.title),
+		size: 'xl',
+		actions: [
+			{
+				label: __('Submit'),
+				variant: 'solid',
+				onClick: (close) => {
+					submitQuestion(close)
+				},
+			},
+		],
+	}
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index dd2b13a5..6a92150f 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -8,12 +8,15 @@
 		<!-- Details -->
 		<div class="mb-8">
 			<div class="text-sm font-semibold mb-4">
-				{{ __("Details") }}
+				{{ __('Details') }}
 			</div>
 			<div class="grid grid-cols-2 gap-5">
 				<div class="space-y-2">
 					<FormControl v-model="quiz.title" :label="__('Title')" />
-					<FormControl v-model="quiz.max_attempts" :label="__('Maximun Attempts')" />
+					<FormControl
+						v-model="quiz.max_attempts"
+						:label="__('Maximun Attempts')"
+					/>
 					<FormControl
 						v-model="quiz.limit_questions_to"
 						:label="__('Limit Questions To')"
@@ -28,16 +31,28 @@
 				</div>
 			</div>
 		</div>
-		
+
 		<!-- Settings -->
 		<div class="mb-8">
 			<div class="text-sm font-semibold mb-4">
-				{{ __("Settings") }}
+				{{ __('Settings') }}
 			</div>
 			<div class="grid grid-cols-3 gap-5 my-4">
-				<FormControl v-model="quiz.show_answers" type="checkbox" :label="__('Show Answers')"/>
-				<FormControl v-model="quiz.show_submission_history" type="checkbox" :label="__('Show Submission History')"/>
-				<FormControl v-model="quiz.shuffle_questions" type="checkbox" :label="__('Shuffle Questions')"/>
+				<FormControl
+					v-model="quiz.show_answers"
+					type="checkbox"
+					:label="__('Show Answers')"
+				/>
+				<FormControl
+					v-model="quiz.show_submission_history"
+					type="checkbox"
+					:label="__('Show Submission History')"
+				/>
+				<FormControl
+					v-model="quiz.shuffle_questions"
+					type="checkbox"
+					:label="__('Shuffle Questions')"
+				/>
 			</div>
 		</div>
 
@@ -45,28 +60,35 @@
 		<div>
 			<div class="flex items-center justify-between mb-4">
 				<div class="text-sm font-semibold">
-					{{ __("Questions") }}
+					{{ __('Questions') }}
 				</div>
-				<Button @click="openQuestionModal.value = true">
+				<Button @click="openQuestionModal()">
 					<template #prefix>
-						<Plus class="w-4 h-4"/>
+						<Plus class="w-4 h-4" />
 					</template>
-					{{ __("New Question") }}
+					{{ __('New Question') }}
 				</Button>
 			</div>
 			<ListView
 				:columns="questionColumns"
 				:rows="quiz.questions"
 				row-key="name"
-				:options="{ showTooltip: false }"
+				:options="{
+					showTooltip: false,
+					onRowClick: (row) => emit('openQuestionModal', row.name),
+				}"
 			>
 				<ListHeader
 					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
 				>
-					<ListHeaderItem :item="item" v-for="item in questionColumns"/>
+					<ListHeaderItem :item="item" v-for="item in questionColumns" />
 				</ListHeader>
 				<ListRows>
-					<ListRow :row="row" v-slot="{ idx, column, item }" v-for="row in quiz.questions">
+					<ListRow
+						:row="row"
+						v-slot="{ idx, column, item }"
+						v-for="row in quiz.questions"
+					>
 						<ListRowItem :item="item">
 							<div class="text-xs">
 								{{ item }}
@@ -77,15 +99,27 @@
 			</ListView>
 		</div>
 	</div>
-	<Question/>
+	<Question v-model="showQuestionModal" :question="currentQuestion" />
 </template>
 <script setup>
-import { Breadcrumbs, createDocumentResource, FormControl, ListView, ListHeader, ListHeaderItem, ListRows, ListRow, ListRowItem, Button } from 'frappe-ui'
+import {
+	Breadcrumbs,
+	createDocumentResource,
+	FormControl,
+	ListView,
+	ListHeader,
+	ListHeaderItem,
+	ListRows,
+	ListRow,
+	ListRowItem,
+	Button,
+} from 'frappe-ui'
 import { computed, reactive, ref } from 'vue'
-import { Plus } from "lucide-vue-next"
-import Question from '@/components/Modals/Question.vue';
+import { Plus } from 'lucide-vue-next'
+import Question from '@/components/Modals/Question.vue'
 
-const openQuestionModal = ref(false)
+const showQuestionModal = ref(false)
+const currentQuestion = ref(null)
 
 const props = defineProps({
 	quizID: {
@@ -94,7 +128,6 @@ const props = defineProps({
 	},
 })
 
-
 const quiz = reactive({
 	title: '',
 	total_marks: '',
@@ -114,16 +147,19 @@ const quizDetails = createDocumentResource({
 	cache: ['quiz', props.quiz],
 	onSuccess(data) {
 		Object.keys(data).forEach((key) => {
-			if (Object.hasOwn(quiz, key))
-				quiz[key] = data[key]
+			if (Object.hasOwn(quiz, key)) quiz[key] = data[key]
 		})
 
-		let checkboxes = ["show_answers", "show_submission_history", "shuffle_questions"]
+		let checkboxes = [
+			'show_answers',
+			'show_submission_history',
+			'shuffle_questions',
+		]
 		for (let idx in checkboxes) {
 			let key = checkboxes[idx]
 			quiz[key] = quiz[key] ? true : false
 		}
-	}
+	},
 })
 
 console.log(quizDetails)
@@ -131,23 +167,28 @@ console.log(quizDetails)
 const questionColumns = computed(() => {
 	return [
 		{
-			label: __("ID"),
-			key: "question",
-			width: 1
-		},
-		{
-			label: __("Question"),
-			key: __("question_detail"),
-			width: 3
-		},
-		{
-			label: __("Marks"),
-			key: "marks",
+			label: __('ID'),
+			key: 'question',
 			width: 1,
 		},
+		{
+			label: __('Question'),
+			key: __('question_detail'),
+			width: 3,
+		},
+		{
+			label: __('Marks'),
+			key: 'marks',
+			width: 0.5,
+		},
 	]
 })
 
+const openQuestionModal = (question = {}) => {
+	currentQuestion.value = question
+	showQuestionModal.value = true
+}
+
 const breadcrumbs = computed(() => {
 	let crumbs = [
 		{

From 471e7d92293bad737a59e9503bf8d7fbaca203c5 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 1 Aug 2024 13:00:37 +0530
Subject: [PATCH 04/13] fix: fetch question details

---
 frontend/src/components/Modals/Question.vue   | 60 +++++++++++++++----
 frontend/src/pages/QuizCreation.vue           | 26 ++++----
 .../lms_certificate_request.py                | 32 ++++++++++
 .../doctype/lms_question/lms_question.json    |  3 +-
 .../certificate_request_creation.json         |  8 +--
 .../certificate_request_notification.html     |  4 ++
 6 files changed, 105 insertions(+), 28 deletions(-)
 create mode 100644 lms/templates/emails/certificate_request_notification.html

diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
index 8fa262cd..231a05f3 100644
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -49,10 +49,11 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, FormControl, TextEditor } from 'frappe-ui'
-import { computed, onMounted, reactive } from 'vue'
+import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
+import { computed, onMounted, reactive, inject } from 'vue'
 
 const show = defineModel()
+const user = inject('$user')
 const question = reactive({
 	question: '',
 	type: 'Choices',
@@ -60,7 +61,19 @@ const question = reactive({
 
 onMounted(() => {
 	populateFields()
-	populateQuestionDetail()
+	console.log(props.questionName)
+	if (
+		props.questionName == 'new' &&
+		!user.data?.is_moderator &&
+		!user.data?.is_instructor
+	) {
+		router.push({ name: 'Courses' })
+	}
+
+	if (props.courseName !== 'new') {
+		questionDoc.reload()
+	}
+	window.addEventListener('keydown', keyboardShortcut)
 })
 
 const props = defineProps({
@@ -68,9 +81,29 @@ const props = defineProps({
 		type: String,
 		default: __('Add a Question'),
 	},
-	questionDetail: {
-		type: Object,
-		default: {},
+	questionName: {
+		type: String,
+	},
+})
+
+const questionDoc = createResource({
+	url: 'frappe.client.get',
+	makeParams: (values) => {
+		return {
+			doctype: 'LMS Question',
+			name: props.questionName,
+		}
+	},
+	onSuccess(data) {
+		let counter = 1
+		Object.keys(data).forEach((key) => {
+			if (Object.hasOwn(question, key)) question[key] = data[key]
+		})
+		while (counter <= 4) {
+			question[`is_correct_${counter}`] = question[`is_correct_${counter}`]
+				? true
+				: false
+		}
 	},
 })
 
@@ -85,13 +118,14 @@ const populateFields = () => {
 	})
 }
 
-const populateQuestionDetail = () => {
-	if (Object.keys(props.questionDetail).length) {
-		Object.keys(props.questionDetail).forEach((key) => {
-			if (Object.hasOwn(question, key)) {
-				question[key] = props.questionDetail[key]
-			}
-		})
+const keyboardShortcut = (e) => {
+	if (
+		e.key === 's' &&
+		(e.ctrlKey || e.metaKey) &&
+		!e.target.classList.contains('ProseMirror')
+	) {
+		submitQuestion()
+		e.preventDefault()
 	}
 }
 
diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index 6a92150f..b53b835e 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -75,7 +75,6 @@
 				row-key="name"
 				:options="{
 					showTooltip: false,
-					onRowClick: (row) => emit('openQuestionModal', row.name),
 				}"
 			>
 				<ListHeader
@@ -88,9 +87,16 @@
 						:row="row"
 						v-slot="{ idx, column, item }"
 						v-for="row in quiz.questions"
+						@click="openQuestionModal(row.question)"
 					>
 						<ListRowItem :item="item">
-							<div class="text-xs">
+							<div
+								v-if="column.key == 'question_detail'"
+								class="text-xs truncate"
+							>
+								{{ item }}
+							</div>
+							<div v-else class="text-xs">
 								{{ item }}
 							</div>
 						</ListRowItem>
@@ -99,7 +105,7 @@
 			</ListView>
 		</div>
 	</div>
-	<Question v-model="showQuestionModal" :question="currentQuestion" />
+	<Question v-model="showQuestionModal" :questionName="currentQuestion" />
 </template>
 <script setup>
 import {
@@ -144,7 +150,7 @@ const quizDetails = createDocumentResource({
 	doctype: 'LMS Quiz',
 	name: props.quizID,
 	auto: true,
-	cache: ['quiz', props.quiz],
+	cache: ['quiz', props.quizID],
 	onSuccess(data) {
 		Object.keys(data).forEach((key) => {
 			if (Object.hasOwn(quiz, key)) quiz[key] = data[key]
@@ -162,29 +168,29 @@ const quizDetails = createDocumentResource({
 	},
 })
 
-console.log(quizDetails)
-
 const questionColumns = computed(() => {
 	return [
 		{
 			label: __('ID'),
 			key: 'question',
-			width: 1,
+			width: '25%',
 		},
 		{
 			label: __('Question'),
 			key: __('question_detail'),
-			width: 3,
+			width: '60%',
 		},
 		{
 			label: __('Marks'),
 			key: 'marks',
-			width: 0.5,
+			width: '10%',
 		},
 	]
 })
 
-const openQuestionModal = (question = {}) => {
+const openQuestionModal = (question = null) => {
+	console.log('called')
+	console.log(question)
 	currentQuestion.value = question
 	showQuestionModal.value = true
 }
diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py
index ef5f9bae..dc9a3718 100644
--- a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py
+++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py
@@ -26,6 +26,9 @@ class LMSCertificateRequest(Document):
 		self.validate_if_existing_requests()
 		self.validate_evaluation_end_date()
 
+	def after_insert(self):
+		self.send_notification()
+
 	def set_evaluator(self):
 		if not self.evaluator:
 			self.evaluator = get_evaluator(self.course, self.batch_name)
@@ -107,6 +110,35 @@ class LMSCertificateRequest(Document):
 						)
 					)
 
+	def send_notification(self):
+		outgoing_email_account = frappe.get_cached_value(
+			"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
+		)
+		if outgoing_email_account or frappe.conf.get("mail_login"):
+			subject = _("Your evaluation slot has been booked")
+			template = "certificate_request_notification"
+
+			args = {
+				"course": frappe.db.get_value("LMS Course", self.course, "title"),
+				"timezone": frappe.db.get_value("LMS Batch", self.batch_name, "timezone")
+				if self.batch_name
+				else "",
+				"date": format_date(self.date, "medium"),
+				"member_name": self.member_name,
+				"start_time": format_time(self.start_time, "short"),
+				"evaluator": frappe.db.get_value("User", self.evaluator, "full_name"),
+			}
+
+			frappe.sendmail(
+				recipients=[self.member],
+				cc=[self.evaluator],
+				subject=subject,
+				template=template,
+				args=args,
+				header=[subject, "green"],
+				retry=3,
+			)
+
 
 def schedule_evals():
 	if frappe.db.get_single_value("LMS Settings", "send_calendar_invite_for_evaluations"):
diff --git a/lms/lms/doctype/lms_question/lms_question.json b/lms/lms/doctype/lms_question/lms_question.json
index 8bd81bac..2a8b45f6 100644
--- a/lms/lms/doctype/lms_question/lms_question.json
+++ b/lms/lms/doctype/lms_question/lms_question.json
@@ -195,7 +195,8 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-05-24 16:12:26.331351",
+ "make_attachments_public": 1,
+ "modified": "2024-08-01 12:53:22.540990",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Question",
diff --git a/lms/lms/notification/certificate_request_creation/certificate_request_creation.json b/lms/lms/notification/certificate_request_creation/certificate_request_creation.json
index 15c58963..ca9c3826 100644
--- a/lms/lms/notification/certificate_request_creation/certificate_request_creation.json
+++ b/lms/lms/notification/certificate_request_creation/certificate_request_creation.json
@@ -6,14 +6,14 @@
  "docstatus": 0,
  "doctype": "Notification",
  "document_type": "LMS Certificate Request",
- "enabled": 1,
+ "enabled": 0,
  "event": "New",
  "idx": 0,
  "is_standard": 1,
- "message": "{% set title = frappe.db.get_value(\"LMS Course\", doc.course, \"title\") %}\n{% set timezone = frappe.db.get_value(\"LMS Batch\", doc.batch, \"timezone\") %}\n{% set timezone = timezone if timezone else '' %}\n{% set evaluator_name = frappe.db.get_value(\"User\", doc.evaluator, \"full_name\") %}\n\n<p> {{ _(\"Hey {0}\").format(doc.member_name) }} </p>\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), timezone) }}</p>\n<p> {{ _(\"Your evaluator is {0}\").format(evaluator_name) }}\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
+ "message": "{% set title = frappe.db.get_value(\"LMS Course\", doc.course, \"title\") %}\n{% set timezone = frappe.db.get_value(\"LMS Batch\", doc.batch, \"timezone\") %}\n{% set timezone = timezone if timezone else '' %}\n{% set evaluator_name = frappe.db.get_value(\"User\", doc.evaluator, \"full_name\") %}\n\n<p> {{ _(\"Hey {0}\").format(doc.member_name) }} </p>\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), timezone) }}</p>\n<p> {{ _(\"Your evaluator is {0}\").format(evaluator_name) }} </p>\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
  "message_type": "HTML",
- "modified": "2024-07-10 15:51:03.429317",
- "modified_by": "sayali@erpnext.com",
+ "modified": "2024-08-01 12:17:40.647724",
+ "modified_by": "jannat@frappe.io",
  "module": "LMS",
  "name": "Certificate Request Creation",
  "owner": "Administrator",
diff --git a/lms/templates/emails/certificate_request_notification.html b/lms/templates/emails/certificate_request_notification.html
new file mode 100644
index 00000000..6e4309bc
--- /dev/null
+++ b/lms/templates/emails/certificate_request_notification.html
@@ -0,0 +1,4 @@
+<p> {{ _("Hey {0}").format(member_name) }} </p>
+<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, date, start_time, timezone) }}</p>
+<p> {{ _("Your evaluator is {0}").format(evaluator) }} </p>
+<p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>

From 27ca13ece6836febd0f7f5b7479884940112addb Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 2 Aug 2024 20:20:43 +0530
Subject: [PATCH 05/13] feat: add questions to quiz

---
 .../src/components/Controls/Autocomplete.vue  |  11 +-
 frontend/src/components/Controls/Link.vue     |   1 +
 frontend/src/components/Modals/Question.vue   | 280 ++++++++++----
 frontend/src/pages/QuizCreation.vue           | 359 +++++++++++++-----
 frontend/src/pages/Quizzes.vue                |  32 +-
 lms/lms/doctype/lms_quiz/lms_quiz.py          |  10 +-
 6 files changed, 509 insertions(+), 184 deletions(-)

diff --git a/frontend/src/components/Controls/Autocomplete.vue b/frontend/src/components/Controls/Autocomplete.vue
index eb9a5b08..980a7fd3 100644
--- a/frontend/src/components/Controls/Autocomplete.vue
+++ b/frontend/src/components/Controls/Autocomplete.vue
@@ -75,7 +75,7 @@
 								>
 									<li
 										:class="[
-											'flex items-center rounded px-2.5 py-1.5 text-base',
+											'flex items-center rounded px-2.5 py-2 text-base',
 											{ 'bg-gray-100': active },
 										]"
 									>
@@ -87,7 +87,14 @@
 											name="item-label"
 											v-bind="{ active, selected, option }"
 										>
-											{{ option.label }}
+											<div class="flex flex-col space-y-1">
+												<div>
+													{{ option.label }}
+												</div>
+												<div class="text-xs text-gray-700">
+													{{ option.description }}
+												</div>
+											</div>
 										</slot>
 									</li>
 								</ComboboxOption>
diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue
index 8ce30846..c5f6f63f 100644
--- a/frontend/src/components/Controls/Link.vue
+++ b/frontend/src/components/Controls/Link.vue
@@ -118,6 +118,7 @@ const options = createResource({
 			return {
 				label: option.value,
 				value: option.value,
+				description: option.description,
 			}
 		})
 	},
diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
index 231a05f3..74e14f13 100644
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -2,46 +2,92 @@
 	<Dialog v-model="show" :options="dialogOptions">
 		<template #body-content>
 			<div class="space-y-4">
-				<div>
-					<label class="block text-xs text-gray-600 mb-1">
-						{{ __('Question') }}
-					</label>
-					<TextEditor
-						:content="question.question"
-						@change="(val) => (question.question = val)"
-						:editable="true"
-						:fixedMenu="true"
-						editorClass="prose-sm max-w-none border-b border-x bg-gray-100 rounded-b-md py-1 px-2 min-h-[7rem]"
-					/>
+				<div class="flex items-center text-xs text-gray-700 space-x-5">
+					<div class="flex items-center space-x-2">
+						<input
+							type="radio"
+							id="existing"
+							value="existing"
+							v-model="questionType"
+							class="w-3 h-3 accent-gray-900"
+						/>
+						<label for="existing">
+							{{ __('Add an existing question') }}
+						</label>
+					</div>
+
+					<div class="flex items-center space-x-2">
+						<input
+							type="radio"
+							id="new"
+							value="new"
+							v-model="questionType"
+							class="w-3 h-3"
+						/>
+						<label for="new">
+							{{ __('Create a new question') }}
+						</label>
+					</div>
 				</div>
-				<FormControl
-					:label="__('Type')"
-					v-model="question.type"
-					type="select"
-					:options="['Choices', 'User Input']"
-					class="pb-2"
-				/>
-				<div v-if="question.type == 'Choices'" class="divide-y">
-					<div v-for="n in 4" class="space-y-4 py-2">
-						<FormControl
-							:label="__('Option') + ' ' + n"
-							v-model="question[`option_${n}`]"
+				<div v-if="questionType == 'new'" class="space-y-2">
+					<div>
+						<label class="block text-xs text-gray-600 mb-1">
+							{{ __('Question') }}
+						</label>
+						<TextEditor
+							:content="question.question"
+							@change="(val) => (question.question = val)"
+							:editable="true"
+							:fixedMenu="true"
+							editorClass="prose-sm max-w-none border-b border-x bg-gray-100 rounded-b-md py-1 px-2 min-h-[7rem]"
 						/>
+					</div>
+					<FormControl
+						v-model="question.marks"
+						:label="__('Marks')"
+						type="number"
+					/>
+					<FormControl
+						:label="__('Type')"
+						v-model="question.type"
+						type="select"
+						:options="['Choices', 'User Input']"
+						class="pb-2"
+					/>
+					<div v-if="question.type == 'Choices'" class="divide-y border-t">
+						<div v-for="n in 4" class="space-y-4 py-2">
+							<FormControl
+								:label="__('Option') + ' ' + n"
+								v-model="question[`option_${n}`]"
+							/>
+							<FormControl
+								:label="__('Explanation')"
+								v-model="question[`explanation_${n}`]"
+							/>
+							<FormControl
+								:label="__('Correct Answer')"
+								v-model="question[`is_correct_${n}`]"
+								type="checkbox"
+							/>
+						</div>
+					</div>
+					<div v-else v-for="n in 4" class="space-y-2">
 						<FormControl
-							:label="__('Explanation')"
-							v-model="question[`explanation_${n}`]"
-						/>
-						<FormControl
-							:label="__('Correct Answer')"
-							v-model="question[`correct_answer_${n}`]"
-							type="checkbox"
+							:label="__('Possibility') + ' ' + n"
+							v-model="question[`possibility_${n}`]"
 						/>
 					</div>
 				</div>
-				<div v-else v-for="n in 4" class="space-y-2">
+				<div v-else-if="questionType == 'existing'" class="space-y-2">
+					<Link
+						v-model="existingQuestion.question"
+						:label="__('Select a question')"
+						doctype="LMS Question"
+					/>
 					<FormControl
-						:label="__('Possibility') + ' ' + n"
-						v-model="question[`possibility_${n}`]"
+						v-model="existingQuestion.marks"
+						:label="__('Marks')"
+						type="number"
 					/>
 				</div>
 			</div>
@@ -49,51 +95,62 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
-import { computed, onMounted, reactive, inject } from 'vue'
+import {
+	Dialog,
+	FormControl,
+	TextEditor,
+	createResource,
+	createDocumentResource,
+} from 'frappe-ui'
+import { computed, watch, reactive, ref } from 'vue'
+import Link from '@/components/Controls/Link.vue'
+import { showToast } from '@/utils'
 
 const show = defineModel()
-const user = inject('$user')
+const quiz = defineModel('quiz')
+const questionType = ref(null)
+const existingQuestion = reactive({
+	question: '',
+	marks: 0,
+})
+
 const question = reactive({
 	question: '',
 	type: 'Choices',
-})
-
-onMounted(() => {
-	populateFields()
-	console.log(props.questionName)
-	if (
-		props.questionName == 'new' &&
-		!user.data?.is_moderator &&
-		!user.data?.is_instructor
-	) {
-		router.push({ name: 'Courses' })
-	}
-
-	if (props.courseName !== 'new') {
-		questionDoc.reload()
-	}
-	window.addEventListener('keydown', keyboardShortcut)
+	marks: 0,
 })
 
 const props = defineProps({
 	title: {
 		type: String,
-		default: __('Add a Question'),
+		default: __('Add a new question'),
 	},
 	questionName: {
 		type: String,
 	},
 })
 
-const questionDoc = createResource({
+const populateFields = () => {
+	let fields = ['option', 'is_correct', 'explanation', 'possibility']
+	let counter = 1
+	fields.forEach((field) => {
+		while (counter <= 4) {
+			question[`${field}_${counter}`] = field === 'is_correct' ? false : ''
+			counter++
+		}
+	})
+}
+
+const questionData = createResource({
 	url: 'frappe.client.get',
-	makeParams: (values) => {
+	makeParams(values) {
 		return {
 			doctype: 'LMS Question',
 			name: props.questionName,
 		}
 	},
+	auto: false,
+	cache: ['question', props.questionName],
 	onSuccess(data) {
 		let counter = 1
 		Object.keys(data).forEach((key) => {
@@ -107,28 +164,100 @@ const questionDoc = createResource({
 	},
 })
 
-const populateFields = () => {
-	let fields = ['option', 'correct_answer', 'explanation', 'possibility']
-	let counter = 1
-	fields.forEach((field) => {
-		while (counter <= 4) {
-			question[`${field}_${counter}`] = field === 'correct_answer' ? false : ''
-			counter++
+const questionRow = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		console.log(values)
+		return {
+			doc: {
+				doctype: 'LMS Quiz Question',
+				parent: quiz.value.data.name,
+				parentfield: 'questions',
+				parenttype: 'LMS Quiz',
+				...values,
+			},
 		}
-	})
+	},
+})
+
+const questionCreation = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'LMS Question',
+				...question,
+			},
+		}
+	},
+})
+
+const submitQuestion = (close) => {
+	if (questionData.data?.name) updateQuestion()
+	else addQuestion(close)
 }
 
-const keyboardShortcut = (e) => {
-	if (
-		e.key === 's' &&
-		(e.ctrlKey || e.metaKey) &&
-		!e.target.classList.contains('ProseMirror')
-	) {
-		submitQuestion()
-		e.preventDefault()
+const addQuestion = (close) => {
+	if (questionType.value == 'existing') {
+		addQuestionRow(
+			{
+				question: existingQuestion.question,
+				marks: existingQuestion.marks,
+			},
+			close
+		)
+	} else {
+		questionCreation.submit(
+			{},
+			{
+				onSuccess(data) {
+					addQuestionRow(
+						{
+							question: data.name,
+							marks: question.marks,
+						},
+						close
+					)
+				},
+				onError(err) {
+					showToast(__('Error'), __(err.message?.[0] || err), 'x')
+				},
+			}
+		)
 	}
 }
 
+const addQuestionRow = (question, close) => {
+	questionRow.submit(
+		{
+			...question,
+		},
+		{
+			onSuccess() {
+				show.value = false
+				showToast(__('Success'), __('Question added successfully'), 'check')
+				quiz.value.reload()
+				close()
+			},
+			onError(err) {
+				showToast(__('Error'), __(err.message?.[0] || err), 'x')
+				close()
+			},
+		}
+	)
+}
+
+watch(
+	() => props.questionName,
+	async (name) => {
+		console.log('name', name)
+		populateFields()
+		if (name != 'new') {
+			questionData.reload()
+		}
+	}
+)
+
 const dialogOptions = computed(() => {
 	return {
 		title: __(props.title),
@@ -145,3 +274,10 @@ const dialogOptions = computed(() => {
 	}
 })
 </script>
+<style>
+input[type='radio']:checked {
+	background-color: theme('colors.gray.900') !important;
+	border-color: theme('colors.gray.900') !important;
+	--tw-ring-color: theme('colors.gray.900') !important;
+}
+</style>
diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index b53b835e..90f6fdcb 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -3,6 +3,9 @@
 		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
+		<Button variant="solid" @click="submitQuiz()">
+			{{ __('Save') }}
+		</Button>
 	</header>
 	<div class="w-3/4 mx-auto py-5">
 		<!-- Details -->
@@ -10,107 +13,128 @@
 			<div class="text-sm font-semibold mb-4">
 				{{ __('Details') }}
 			</div>
-			<div class="grid grid-cols-2 gap-5">
-				<div class="space-y-2">
-					<FormControl v-model="quiz.title" :label="__('Title')" />
-					<FormControl
-						v-model="quiz.max_attempts"
-						:label="__('Maximun Attempts')"
-					/>
-					<FormControl
-						v-model="quiz.limit_questions_to"
-						:label="__('Limit Questions To')"
-					/>
+			<FormControl
+				v-model="quiz.title"
+				:label="
+					quizDetails.data?.name
+						? __('Title')
+						: __('Enter a title and save the quiz to proceed')
+				"
+			/>
+			<div v-if="quizDetails.data?.name">
+				<div class="grid grid-cols-2 gap-5 mt-2 mb-8">
+					<div class="space-y-2">
+						<FormControl
+							v-model="quiz.max_attempts"
+							:label="__('Maximun Attempts')"
+						/>
+						<FormControl
+							v-model="quiz.limit_questions_to"
+							:label="__('Limit Questions To')"
+						/>
+					</div>
+					<div class="space-y-2">
+						<FormControl
+							v-model="quiz.total_marks"
+							:label="__('Total Marks')"
+							disabled
+						/>
+						<FormControl
+							v-model="quiz.passing_percentage"
+							:label="__('Passing Percentage')"
+						/>
+					</div>
 				</div>
-				<div class="space-y-2">
-					<FormControl v-model="quiz.total_marks" :label="__('Total Marks')" />
-					<FormControl
-						v-model="quiz.passing_percentage"
-						:label="__('Passing Percentage')"
-					/>
-				</div>
-			</div>
-		</div>
 
-		<!-- Settings -->
-		<div class="mb-8">
-			<div class="text-sm font-semibold mb-4">
-				{{ __('Settings') }}
-			</div>
-			<div class="grid grid-cols-3 gap-5 my-4">
-				<FormControl
-					v-model="quiz.show_answers"
-					type="checkbox"
-					:label="__('Show Answers')"
-				/>
-				<FormControl
-					v-model="quiz.show_submission_history"
-					type="checkbox"
-					:label="__('Show Submission History')"
-				/>
-				<FormControl
-					v-model="quiz.shuffle_questions"
-					type="checkbox"
-					:label="__('Shuffle Questions')"
-				/>
-			</div>
-		</div>
-
-		<!-- Questions -->
-		<div>
-			<div class="flex items-center justify-between mb-4">
-				<div class="text-sm font-semibold">
-					{{ __('Questions') }}
+				<!-- Settings -->
+				<div class="mb-8">
+					<div class="text-sm font-semibold mb-4">
+						{{ __('Settings') }}
+					</div>
+					<div class="grid grid-cols-3 gap-5 my-4">
+						<FormControl
+							v-model="quiz.show_answers"
+							type="checkbox"
+							:label="__('Show Answers')"
+						/>
+						<FormControl
+							v-model="quiz.show_submission_history"
+							type="checkbox"
+							:label="__('Show Submission History')"
+						/>
+						<FormControl
+							v-model="quiz.shuffle_questions"
+							type="checkbox"
+							:label="__('Shuffle Questions')"
+						/>
+					</div>
 				</div>
-				<Button @click="openQuestionModal()">
-					<template #prefix>
-						<Plus class="w-4 h-4" />
-					</template>
-					{{ __('New Question') }}
-				</Button>
-			</div>
-			<ListView
-				:columns="questionColumns"
-				:rows="quiz.questions"
-				row-key="name"
-				:options="{
-					showTooltip: false,
-				}"
-			>
-				<ListHeader
-					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
-				>
-					<ListHeaderItem :item="item" v-for="item in questionColumns" />
-				</ListHeader>
-				<ListRows>
-					<ListRow
-						:row="row"
-						v-slot="{ idx, column, item }"
-						v-for="row in quiz.questions"
-						@click="openQuestionModal(row.question)"
+
+				<!-- Questions -->
+				<div>
+					<div class="flex items-center justify-between mb-4">
+						<div class="text-sm font-semibold">
+							{{ __('Questions') }}
+						</div>
+						<Button @click="openQuestionModal()">
+							<template #prefix>
+								<Plus class="w-4 h-4" />
+							</template>
+							{{ __('New Question') }}
+						</Button>
+					</div>
+					<ListView
+						:columns="questionColumns"
+						:rows="quiz.questions"
+						row-key="name"
+						:options="{
+							showTooltip: false,
+						}"
 					>
-						<ListRowItem :item="item">
-							<div
-								v-if="column.key == 'question_detail'"
-								class="text-xs truncate"
+						<ListHeader
+							class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+						>
+							<ListHeaderItem :item="item" v-for="item in questionColumns" />
+						</ListHeader>
+						<ListRows>
+							<ListRow
+								:row="row"
+								v-slot="{ idx, column, item }"
+								v-for="row in quiz.questions"
+								@click="openQuestionModal(row.question)"
 							>
-								{{ item }}
-							</div>
-							<div v-else class="text-xs">
-								{{ item }}
-							</div>
-						</ListRowItem>
-					</ListRow>
-				</ListRows>
-			</ListView>
+								<ListRowItem :item="item">
+									<div
+										v-if="column.key == 'question_detail'"
+										class="text-xs truncate"
+									>
+										{{ item }}
+									</div>
+									<div v-else class="text-xs">
+										{{ item }}
+									</div>
+								</ListRowItem>
+							</ListRow>
+						</ListRows>
+					</ListView>
+				</div>
+			</div>
 		</div>
 	</div>
-	<Question v-model="showQuestionModal" :questionName="currentQuestion" />
+	<Question
+		v-model="showQuestionModal"
+		:questionName="currentQuestion"
+		v-model:quiz="quizDetails"
+		:title="
+			currentQuestion ? __('Edit the question') : __('Add a new question')
+		"
+	/>
 </template>
 <script setup>
 import {
 	Breadcrumbs,
 	createDocumentResource,
+	createResource,
 	FormControl,
 	ListView,
 	ListHeader,
@@ -120,12 +144,54 @@ import {
 	ListRowItem,
 	Button,
 } from 'frappe-ui'
-import { computed, reactive, ref } from 'vue'
+import {
+	computed,
+	reactive,
+	ref,
+	onMounted,
+	inject,
+	onBeforeUnmount,
+	watch,
+} from 'vue'
 import { Plus } from 'lucide-vue-next'
 import Question from '@/components/Modals/Question.vue'
+import { showToast } from '../utils'
+import { useRouter } from 'vue-router'
 
 const showQuestionModal = ref(false)
 const currentQuestion = ref(null)
+const user = inject('$user')
+const router = useRouter()
+
+onMounted(() => {
+	if (
+		props.quizID == 'new' &&
+		!user.data?.is_moderator &&
+		!user.data?.is_instructor
+	) {
+		router.push({ name: 'Courses' })
+	}
+	if (props.quizID !== 'new') {
+		console.log('here')
+		quizDetails.reload()
+	}
+	window.addEventListener('keydown', keyboardShortcut)
+})
+
+const keyboardShortcut = (e) => {
+	if (
+		e.key === 's' &&
+		(e.ctrlKey || e.metaKey) &&
+		!e.target.classList.contains('ProseMirror')
+	) {
+		submitQuiz()
+		e.preventDefault()
+	}
+}
+
+onBeforeUnmount(() => {
+	window.removeEventListener('keydown', keyboardShortcut)
+})
 
 const props = defineProps({
 	quizID: {
@@ -136,8 +202,8 @@ const props = defineProps({
 
 const quiz = reactive({
 	title: '',
-	total_marks: '',
-	passing_percentage: '',
+	total_marks: 0,
+	passing_percentage: 0,
 	max_attempts: 0,
 	limit_questions_to: 0,
 	show_answers: true,
@@ -146,11 +212,14 @@ const quiz = reactive({
 	questions: [],
 })
 
-const quizDetails = createDocumentResource({
-	doctype: 'LMS Quiz',
-	name: props.quizID,
-	auto: true,
+const quizDetails = createResource({
+	url: 'frappe.client.get',
+	makeParams(values) {
+		return { doctype: 'LMS Quiz', name: props.quizID }
+	},
 	cache: ['quiz', props.quizID],
+	auto: false,
+
 	onSuccess(data) {
 		Object.keys(data).forEach((key) => {
 			if (Object.hasOwn(quiz, key)) quiz[key] = data[key]
@@ -168,6 +237,82 @@ const quizDetails = createDocumentResource({
 	},
 })
 
+const quizCreate = createResource({
+	url: 'frappe.client.insert',
+	auto: false,
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'LMS Quiz',
+				...quiz,
+			},
+		}
+	},
+})
+
+const quizUpdate = createResource({
+	url: 'frappe.client.set_value',
+	auto: false,
+	makeParams(values) {
+		return {
+			doctype: 'LMS Quiz',
+			name: values.quizID,
+			fieldname: {
+				total_marks: calculateTotalMarks(),
+				...quiz,
+			},
+		}
+	},
+})
+
+const submitQuiz = () => {
+	if (quizDetails.data?.name) updateQuiz()
+	else createQuiz()
+}
+
+const createQuiz = () => {
+	quizCreate.submit(
+		{},
+		{
+			onSuccess(data) {
+				showToast(__('Success'), __('Quiz created successfully', 'check'))
+				router.push({
+					name: 'QuizCreation',
+					params: { quizID: data.name },
+				})
+			},
+			onError(err) {
+				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+			},
+		}
+	)
+}
+
+const updateQuiz = () => {
+	quizUpdate.submit(
+		{ quizID: quizDetails.data?.name },
+		{
+			onSuccess(data) {
+				quiz.total_marks = data.total_marks
+				showToast(__('Success'), __('Quiz updated successfully'), 'check')
+			},
+			onError(err) {
+				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+			},
+		}
+	)
+}
+
+const calculateTotalMarks = () => {
+	let totalMarks = 0
+	if (quiz.limit_questions_to && quiz.questions.length > 0)
+		return quiz.questions[0].marks * quiz.limit_questions_to
+	quiz.questions.forEach((question) => {
+		totalMarks += question.marks
+	})
+	return totalMarks
+}
+
 const questionColumns = computed(() => {
 	return [
 		{
@@ -188,11 +333,20 @@ const questionColumns = computed(() => {
 	]
 })
 
+watch(
+	() => props.quizID !== 'new',
+	(newVal) => {
+		console.log(props.quizID)
+		if (newVal) {
+			quizDetails.reload()
+		}
+	}
+)
+
 const openQuestionModal = (question = null) => {
-	console.log('called')
-	console.log(question)
 	currentQuestion.value = question
 	showQuestionModal.value = true
+	console.log(currentQuestion.value)
 }
 
 const breadcrumbs = computed(() => {
@@ -204,6 +358,15 @@ const breadcrumbs = computed(() => {
 			},
 		},
 	]
+	/* if (quizDetails.data) {
+		crumbs.push({
+			label: quiz.title,
+		})
+	} */
+	crumbs.push({
+		label: props.quizID == 'new' ? 'New Quiz' : quizDetails.data?.title,
+		route: { name: 'QuizCreation', params: { quizID: props.quizID } },
+	})
 	return crumbs
 })
 </script>
diff --git a/frontend/src/pages/Quizzes.vue b/frontend/src/pages/Quizzes.vue
index e7e75b30..3a678e91 100644
--- a/frontend/src/pages/Quizzes.vue
+++ b/frontend/src/pages/Quizzes.vue
@@ -3,12 +3,21 @@
 		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
-		<Button variant="solid">
-			<template #prefix>
-				<Plus class="w-4 h-4"/>
-			</template>
-			{{ __('New Quiz') }}
-		</Button>
+		<router-link
+			:to="{
+				name: 'QuizCreation',
+				params: {
+					quizID: 'new',
+				},
+			}"
+		>
+			<Button variant="solid">
+				<template #prefix>
+					<Plus class="w-4 h-4" />
+				</template>
+				{{ __('New Quiz') }}
+			</Button>
+		</router-link>
 	</header>
 	<div v-if="quizzes.data?.length" class="w-3/4 mx-auto py-5">
 		<ListView
@@ -50,10 +59,18 @@ import {
 	ListHeaderItem,
 	Button,
 } from 'frappe-ui'
-import { computed, inject } from 'vue'
+import { useRouter } from 'vue-router'
+import { computed, inject, onMounted } from 'vue'
 import { Plus } from 'lucide-vue-next'
 
 const user = inject('$user')
+const router = useRouter()
+
+onMounted(() => {
+	if (!user.data?.is_moderator && !user.data?.is_instructor) {
+		router.push({ name: 'Courses' })
+	}
+})
 
 const quizFilter = computed(() => {
 	if (user.data?.is_moderator) return {}
@@ -68,6 +85,7 @@ const quizzes = createListResource({
 	fields: ['name', 'title', 'passing_percentage', 'total_marks'],
 	auto: true,
 	cache: ['quizzes', user.data?.name],
+	orderBy: 'modified desc',
 	onSuccess(data) {
 		data.forEach((row) => {})
 	},
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.py b/lms/lms/doctype/lms_quiz/lms_quiz.py
index ef7f6243..33abac89 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.py
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.py
@@ -5,7 +5,7 @@ import json
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import cstr, comma_and
+from frappe.utils import cstr, comma_and, cint
 from fuzzywuzzy import fuzz
 from lms.lms.doctype.course_lesson.course_lesson import save_progress
 from lms.lms.utils import (
@@ -30,12 +30,12 @@ class LMSQuiz(Document):
 			)
 
 	def validate_limit(self):
-		if self.limit_questions_to and self.limit_questions_to >= len(self.questions):
+		if self.limit_questions_to and cint(self.limit_questions_to) >= len(self.questions):
 			frappe.throw(
 				_("Limit cannot be greater than or equal to the number of questions in the quiz.")
 			)
 
-		if self.limit_questions_to and self.limit_questions_to < len(self.questions):
+		if self.limit_questions_to and cint(self.limit_questions_to) < len(self.questions):
 			marks = [question.marks for question in self.questions]
 			if len(set(marks)) > 1:
 				frappe.throw(_("All questions should have the same marks if the limit is set."))
@@ -43,10 +43,10 @@ class LMSQuiz(Document):
 	def calculate_total_marks(self):
 		if self.limit_questions_to:
 			self.total_marks = sum(
-				question.marks for question in self.questions[: self.limit_questions_to]
+				question.marks for question in self.questions[: cint(self.limit_questions_to)]
 			)
 		else:
-			self.total_marks = sum(question.marks for question in self.questions)
+			self.total_marks = sum(cint(question.marks) for question in self.questions)
 
 	def autoname(self):
 		if not self.name:

From afe7df2989f50b439ea69b9d1bf498ce0a9f6b77 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 5 Aug 2024 16:29:43 +0530
Subject: [PATCH 06/13] fix: fetch question

---
 frontend/src/components/Modals/Question.vue | 49 +++++++--------------
 frontend/src/pages/QuizCreation.vue         | 30 +++++++++++--
 2 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
index 74e14f13..2a7966c1 100644
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -113,23 +113,12 @@ const existingQuestion = reactive({
 	question: '',
 	marks: 0,
 })
-
 const question = reactive({
 	question: '',
 	type: 'Choices',
 	marks: 0,
 })
 
-const props = defineProps({
-	title: {
-		type: String,
-		default: __('Add a new question'),
-	},
-	questionName: {
-		type: String,
-	},
-})
-
 const populateFields = () => {
 	let fields = ['option', 'is_correct', 'explanation', 'possibility']
 	let counter = 1
@@ -141,17 +130,22 @@ const populateFields = () => {
 	})
 }
 
-const questionData = createResource({
-	url: 'frappe.client.get',
-	makeParams(values) {
-		return {
-			doctype: 'LMS Question',
-			name: props.questionName,
-		}
+populateFields()
+
+const props = defineProps({
+	title: {
+		type: String,
+		default: __('Add a new question'),
 	},
-	auto: false,
-	cache: ['question', props.questionName],
-	onSuccess(data) {
+	questionData: {
+		type: [Object, null],
+		required: true,
+	},
+})
+
+watch(show, () => {
+	let data = props.questionData
+	if (show.value && data) {
 		let counter = 1
 		Object.keys(data).forEach((key) => {
 			if (Object.hasOwn(question, key)) question[key] = data[key]
@@ -161,7 +155,7 @@ const questionData = createResource({
 				? true
 				: false
 		}
-	},
+	}
 })
 
 const questionRow = createResource({
@@ -247,17 +241,6 @@ const addQuestionRow = (question, close) => {
 	)
 }
 
-watch(
-	() => props.questionName,
-	async (name) => {
-		console.log('name', name)
-		populateFields()
-		if (name != 'new') {
-			questionData.reload()
-		}
-	}
-)
-
 const dialogOptions = computed(() => {
 	return {
 		title: __(props.title),
diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index 90f6fdcb..3c96bb5a 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -123,7 +123,7 @@
 	</div>
 	<Question
 		v-model="showQuestionModal"
-		:questionName="currentQuestion"
+		:questionData="currentQuestion"
 		v-model:quiz="quizDetails"
 		:title="
 			currentQuestion ? __('Edit the question') : __('Add a new question')
@@ -343,10 +343,32 @@ watch(
 	}
 )
 
+const questionData = createResource({
+	url: 'lms.lms.utils.get_question_details',
+	makeParams(values) {
+		return {
+			question: values.question,
+		}
+	},
+	auto: false,
+	cache: ['question', props.questionName],
+})
+
 const openQuestionModal = (question = null) => {
-	currentQuestion.value = question
-	showQuestionModal.value = true
-	console.log(currentQuestion.value)
+	if (question) {
+		questionData.reload(
+			{ question },
+			{
+				onSuccess(data) {
+					currentQuestion.value = data
+					showQuestionModal.value = true
+				},
+			}
+		)
+	} else {
+		currentQuestion.value = null
+		showQuestionModal.value = true
+	}
 }
 
 const breadcrumbs = computed(() => {

From ed97640107077fe8bd0a67f8dc147324b6a028c4 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 7 Aug 2024 18:15:50 +0530
Subject: [PATCH 07/13] feat: allow updating questions

---
 .gitignore                                   |  3 +-
 frappe-ui                                    |  1 -
 frontend/src/components/Modals/Question.vue  | 69 ++++++++++++++++----
 frontend/src/pages/QuizCreation.vue          | 30 +--------
 lms/lms/doctype/lms_question/lms_question.py |  1 -
 5 files changed, 62 insertions(+), 42 deletions(-)
 delete mode 160000 frappe-ui

diff --git a/.gitignore b/.gitignore
index 95242ce7..957c519f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,4 @@ __pycache__/
 node_modules
 package-lock.json
 lms/public/frontend
-lms/www/lms.html
-frappe-ui
\ No newline at end of file
+lms/www/lms.html
\ No newline at end of file
diff --git a/frappe-ui b/frappe-ui
deleted file mode 160000
index a349ab07..00000000
--- a/frappe-ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a349ab070a73a3d22ead6a33374c9fe44f6ecf57
diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
index 2a7966c1..29ec5031 100644
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -2,7 +2,7 @@
 	<Dialog v-model="show" :options="dialogOptions">
 		<template #body-content>
 			<div class="space-y-4">
-				<div class="flex items-center text-xs text-gray-700 space-x-5">
+				<div v-if="!editMode" class="flex items-center text-xs text-gray-700 space-x-5">
 					<div class="flex items-center space-x-2">
 						<input
 							type="radio"
@@ -29,7 +29,7 @@
 						</label>
 					</div>
 				</div>
-				<div v-if="questionType == 'new'" class="space-y-2">
+				<div v-if="questionType == 'new' || editMode" class="space-y-2">
 					<div>
 						<label class="block text-xs text-gray-600 mb-1">
 							{{ __('Question') }}
@@ -100,7 +100,6 @@ import {
 	FormControl,
 	TextEditor,
 	createResource,
-	createDocumentResource,
 } from 'frappe-ui'
 import { computed, watch, reactive, ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
@@ -109,6 +108,8 @@ import { showToast } from '@/utils'
 const show = defineModel()
 const quiz = defineModel('quiz')
 const questionType = ref(null)
+const editMode = ref(false)
+
 const existingQuestion = reactive({
 	question: '',
 	marks: 0,
@@ -137,25 +138,39 @@ const props = defineProps({
 		type: String,
 		default: __('Add a new question'),
 	},
-	questionData: {
-		type: [Object, null],
+	questionName: {
+		type: [String, null],
 		required: true,
 	},
 })
 
-watch(show, () => {
-	let data = props.questionData
-	if (show.value && data) {
+const questionData = createResource({
+	url: 'frappe.client.get',
+	makeParams() {
+		return {
+			doctype: 'LMS Question',
+			name: props.questionName,
+		}
+	},
+	auto: false,
+	cache: ['question', props.questionName],
+	onSuccess(data) {
 		let counter = 1
+		editMode.value = true
 		Object.keys(data).forEach((key) => {
 			if (Object.hasOwn(question, key)) question[key] = data[key]
 		})
 		while (counter <= 4) {
-			question[`is_correct_${counter}`] = question[`is_correct_${counter}`]
+			question[`is_correct_${counter}`] = data[`is_correct_${counter}`]
 				? true
 				: false
+			counter++;
 		}
-	}
+	},
+});
+
+watch(show, () => {
+	if (show.value && props.questionName) questionData.fetch()
 })
 
 const questionRow = createResource({
@@ -187,7 +202,7 @@ const questionCreation = createResource({
 })
 
 const submitQuestion = (close) => {
-	if (questionData.data?.name) updateQuestion()
+	if (questionData.data?.name) updateQuestion(close)
 	else addQuestion(close)
 }
 
@@ -241,6 +256,38 @@ const addQuestionRow = (question, close) => {
 	)
 }
 
+const questionUpdate = createResource({
+	url: 'frappe.client.set_value',
+	auto: false,
+	makeParams(values) {
+		return {
+			doctype: 'LMS Question',
+			name: questionData.data?.name,
+			fieldname: {
+				...question,
+			},
+		}
+	}
+})
+
+const updateQuestion = (close) => {
+	questionUpdate.submit(
+		{},
+		{
+			onSuccess() {
+				show.value = false
+				showToast(__('Success'), __('Question updated successfully'), 'check')
+				quiz.value.reload()
+				close()
+			},
+			onError(err) {
+				showToast(__('Error'), __(err.message?.[0] || err), 'x')
+				close()
+			},
+		}
+	)
+}
+
 const dialogOptions = computed(() => {
 	return {
 		title: __(props.title),
diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index 3c96bb5a..b71210cd 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -123,7 +123,7 @@
 	</div>
 	<Question
 		v-model="showQuestionModal"
-		:questionData="currentQuestion"
+		:questionName="currentQuestion"
 		v-model:quiz="quizDetails"
 		:title="
 			currentQuestion ? __('Edit the question') : __('Add a new question')
@@ -172,7 +172,6 @@ onMounted(() => {
 		router.push({ name: 'Courses' })
 	}
 	if (props.quizID !== 'new') {
-		console.log('here')
 		quizDetails.reload()
 	}
 	window.addEventListener('keydown', keyboardShortcut)
@@ -343,32 +342,9 @@ watch(
 	}
 )
 
-const questionData = createResource({
-	url: 'lms.lms.utils.get_question_details',
-	makeParams(values) {
-		return {
-			question: values.question,
-		}
-	},
-	auto: false,
-	cache: ['question', props.questionName],
-})
-
 const openQuestionModal = (question = null) => {
-	if (question) {
-		questionData.reload(
-			{ question },
-			{
-				onSuccess(data) {
-					currentQuestion.value = data
-					showQuestionModal.value = true
-				},
-			}
-		)
-	} else {
-		currentQuestion.value = null
-		showQuestionModal.value = true
-	}
+	currentQuestion.value = question
+	showQuestionModal.value = true
 }
 
 const breadcrumbs = computed(() => {
diff --git a/lms/lms/doctype/lms_question/lms_question.py b/lms/lms/doctype/lms_question/lms_question.py
index 0e6f87bd..ca4bf2a2 100644
--- a/lms/lms/doctype/lms_question/lms_question.py
+++ b/lms/lms/doctype/lms_question/lms_question.py
@@ -11,7 +11,6 @@ class LMSQuestion(Document):
 	def validate(self):
 		validate_correct_answers(self)
 
-
 def validate_correct_answers(question):
 	if question.type == "Choices":
 		validate_duplicate_options(question)

From a3a3085b1f96b04b712fd2fbc99d26158e779766 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 8 Aug 2024 22:16:21 +0530
Subject: [PATCH 08/13] fix: update question title in quiz

---
 frontend/src/pages/QuizCreation.vue          | 9 ++++++---
 lms/lms/doctype/lms_question/lms_question.py | 9 +++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index b71210cd..fb637356 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -13,6 +13,7 @@
 			<div class="text-sm font-semibold mb-4">
 				{{ __('Details') }}
 			</div>
+			{{ quiz }}
 			<FormControl
 				v-model="quiz.title"
 				:label="
@@ -106,9 +107,8 @@
 								<ListRowItem :item="item">
 									<div
 										v-if="column.key == 'question_detail'"
-										class="text-xs truncate"
+										class="text-xs truncate" v-html="item"
 									>
-										{{ item }}
 									</div>
 									<div v-else class="text-xs">
 										{{ item }}
@@ -133,7 +133,6 @@
 <script setup>
 import {
 	Breadcrumbs,
-	createDocumentResource,
 	createResource,
 	FormControl,
 	ListView,
@@ -172,6 +171,7 @@ onMounted(() => {
 		router.push({ name: 'Courses' })
 	}
 	if (props.quizID !== 'new') {
+		console.log("mounted")
 		quizDetails.reload()
 	}
 	window.addEventListener('keydown', keyboardShortcut)
@@ -220,6 +220,7 @@ const quizDetails = createResource({
 	auto: false,
 
 	onSuccess(data) {
+		console.log(data)
 		Object.keys(data).forEach((key) => {
 			if (Object.hasOwn(quiz, key)) quiz[key] = data[key]
 		})
@@ -233,6 +234,7 @@ const quizDetails = createResource({
 			let key = checkboxes[idx]
 			quiz[key] = quiz[key] ? true : false
 		}
+		console.log(quiz)
 	},
 })
 
@@ -337,6 +339,7 @@ watch(
 	(newVal) => {
 		console.log(props.quizID)
 		if (newVal) {
+			console.log("in watch")
 			quizDetails.reload()
 		}
 	}
diff --git a/lms/lms/doctype/lms_question/lms_question.py b/lms/lms/doctype/lms_question/lms_question.py
index ca4bf2a2..effcb8db 100644
--- a/lms/lms/doctype/lms_question/lms_question.py
+++ b/lms/lms/doctype/lms_question/lms_question.py
@@ -10,6 +10,7 @@ from lms.lms.utils import has_course_instructor_role, has_course_moderator_role
 class LMSQuestion(Document):
 	def validate(self):
 		validate_correct_answers(self)
+		update_question_title(self)
 
 def validate_correct_answers(question):
 	if question.type == "Choices":
@@ -60,6 +61,14 @@ def validate_possible_answer(question):
 			)
 		)
 
+def update_question_title(question):
+	if not question.is_new():
+		question_rows = frappe.get_all("LMS Quiz Question", {
+			"question": question.name
+		}, pluck="name")
+
+		for row in question_rows:
+			frappe.db.set_value("LMS Quiz Question", row, "question_detail", question.question)
 
 def get_correct_options(question):
 	correct_options = []

From 685e09ce4b1cedefc779b28aefb72e5f3948bc2a Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 9 Aug 2024 20:38:14 +0530
Subject: [PATCH 09/13] feat: question update

---
 .../src/components/Controls/Autocomplete.vue  |   3 +-
 .../src/components/Modals/ChapterModal.vue    |   4 +-
 frontend/src/components/Modals/Question.vue   |  65 ++++--
 frontend/src/pages/QuizCreation.vue           | 198 +++++++++++-------
 lms/lms/doctype/lms_quiz/lms_quiz.json        |  33 ++-
 5 files changed, 189 insertions(+), 114 deletions(-)

diff --git a/frontend/src/components/Controls/Autocomplete.vue b/frontend/src/components/Controls/Autocomplete.vue
index 980a7fd3..65a95183 100644
--- a/frontend/src/components/Controls/Autocomplete.vue
+++ b/frontend/src/components/Controls/Autocomplete.vue
@@ -91,8 +91,7 @@
 												<div>
 													{{ option.label }}
 												</div>
-												<div class="text-xs text-gray-700">
-													{{ option.description }}
+												<div class="text-xs text-gray-700" v-html="option.description">
 												</div>
 											</div>
 										</slot>
diff --git a/frontend/src/components/Modals/ChapterModal.vue b/frontend/src/components/Modals/ChapterModal.vue
index 0ec46085..59794507 100644
--- a/frontend/src/components/Modals/ChapterModal.vue
+++ b/frontend/src/components/Modals/ChapterModal.vue
@@ -21,8 +21,8 @@
 </template>
 <script setup>
 import { Dialog, FormControl, createResource } from 'frappe-ui'
-import { defineModel, reactive, watch, inject } from 'vue'
-import { createToast, formatTime } from '@/utils/'
+import { defineModel, reactive, watch } from 'vue'
+import { createToast } from '@/utils/'
 
 const show = defineModel()
 const outline = defineModel('outline')
diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
index 29ec5031..24689788 100644
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -138,8 +138,8 @@ const props = defineProps({
 		type: String,
 		default: __('Add a new question'),
 	},
-	questionName: {
-		type: [String, null],
+	questionDetail: {
+		type: [Object, null],
 		required: true,
 	},
 })
@@ -149,11 +149,10 @@ const questionData = createResource({
 	makeParams() {
 		return {
 			doctype: 'LMS Question',
-			name: props.questionName,
+			name: props.questionDetail.question,
 		}
 	},
 	auto: false,
-	cache: ['question', props.questionName],
 	onSuccess(data) {
 		let counter = 1
 		editMode.value = true
@@ -166,17 +165,35 @@ const questionData = createResource({
 				: false
 			counter++;
 		}
+		question.marks = props.questionDetail.marks
 	},
 });
 
 watch(show, () => {
-	if (show.value && props.questionName) questionData.fetch()
+	if (show.value) {
+		editMode.value = false
+		if (props.questionDetail.question)
+			questionData.fetch()
+
+		else {
+			question.question = "",
+			question.marks = 0
+			question.type = "Choices"
+			existingQuestion.question = ""
+			existingQuestion.marks = 0
+			questionType.value = null
+			populateFields()
+		}
+
+		if (props.questionDetail.marks)
+			question.marks = props.questionDetail.marks
+		
+	}
 })
 
 const questionRow = createResource({
 	url: 'frappe.client.insert',
 	makeParams(values) {
-		console.log(values)
 		return {
 			doc: {
 				doctype: 'LMS Quiz Question',
@@ -270,20 +287,38 @@ const questionUpdate = createResource({
 	}
 })
 
+const marksUpdate = createResource({
+	url: 'frappe.client.set_value',
+	auto: false,
+	makeParams(values) {
+		return {
+			doctype: 'LMS Quiz Question',
+			name: props.questionDetail.name,
+			fieldname: {
+				marks: question.marks,
+			},
+		}
+	}
+})
+
 const updateQuestion = (close) => {
 	questionUpdate.submit(
 		{},
 		{
 			onSuccess() {
-				show.value = false
-				showToast(__('Success'), __('Question updated successfully'), 'check')
-				quiz.value.reload()
-				close()
-			},
-			onError(err) {
-				showToast(__('Error'), __(err.message?.[0] || err), 'x')
-				close()
-			},
+				marksUpdate.submit({}, {
+					onSuccess() {
+						show.value = false
+						showToast(__('Success'), __('Question updated successfully'), 'check')
+						quiz.value.reload()
+						close()
+					},
+					onError(err) {
+						showToast(__('Error'), __(err.message?.[0] || err), 'x')
+						close()
+					},
+				})
+			}
 		}
 	)
 }
diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index fb637356..f47381c1 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -13,7 +13,6 @@
 			<div class="text-sm font-semibold mb-4">
 				{{ __('Details') }}
 			</div>
-			{{ quiz }}
 			<FormControl
 				v-model="quiz.title"
 				:label="
@@ -23,28 +22,20 @@
 				"
 			/>
 			<div v-if="quizDetails.data?.name">
-				<div class="grid grid-cols-2 gap-5 mt-2 mb-8">
-					<div class="space-y-2">
-						<FormControl
-							v-model="quiz.max_attempts"
-							:label="__('Maximun Attempts')"
-						/>
-						<FormControl
-							v-model="quiz.limit_questions_to"
-							:label="__('Limit Questions To')"
-						/>
-					</div>
-					<div class="space-y-2">
-						<FormControl
-							v-model="quiz.total_marks"
-							:label="__('Total Marks')"
-							disabled
-						/>
-						<FormControl
-							v-model="quiz.passing_percentage"
-							:label="__('Passing Percentage')"
-						/>
-					</div>
+				<div class="grid grid-cols-3 gap-5 mt-2 mb-8">
+					<FormControl
+						v-model="quiz.max_attempts"
+						:label="__('Maximun Attempts')"
+					/>
+					<FormControl
+						v-model="quiz.total_marks"
+						:label="__('Total Marks')"
+						disabled
+					/>
+					<FormControl
+						v-model="quiz.passing_percentage"
+						:label="__('Passing Percentage')"
+					/>
 				</div>
 
 				<!-- Settings -->
@@ -63,14 +54,29 @@
 							type="checkbox"
 							:label="__('Show Submission History')"
 						/>
+						
+					</div>
+				</div>
+
+				<div class="mb-8">
+					<div class="text-sm font-semibold mb-4">
+						{{ __('Shuffle Settings') }}
+					</div>
+					<div class="grid grid-cols-3">
 						<FormControl
 							v-model="quiz.shuffle_questions"
 							type="checkbox"
 							:label="__('Shuffle Questions')"
 						/>
+						<FormControl v-if="quiz.shuffle_questions"
+							v-model="quiz.limit_questions_to"
+							:label="__('Limit Questions To')"
+						/>
 					</div>
 				</div>
 
+				
+
 				<!-- Questions -->
 				<div>
 					<div class="flex items-center justify-between mb-4">
@@ -102,12 +108,12 @@
 								:row="row"
 								v-slot="{ idx, column, item }"
 								v-for="row in quiz.questions"
-								@click="openQuestionModal(row.question)"
+								@click="openQuestionModal(row)"
 							>
 								<ListRowItem :item="item">
 									<div
 										v-if="column.key == 'question_detail'"
-										class="text-xs truncate" v-html="item"
+										class="text-xs truncate h-4" v-html="item"
 									>
 									</div>
 									<div v-else class="text-xs">
@@ -116,6 +122,18 @@
 								</ListRowItem>
 							</ListRow>
 						</ListRows>
+						<ListSelectBanner>
+							<template #actions="{ unselectAll, selections }">
+								<div class="flex gap-2">
+									<Button
+										variant="ghost"
+										@click="deleteQuizzes(selections, unselectAll)"
+									>
+										<Trash2 class="h-4 w-4 stroke-1.5" />
+									</Button>
+								</div>
+							</template>
+						</ListSelectBanner>
 					</ListView>
 				</div>
 			</div>
@@ -123,10 +141,10 @@
 	</div>
 	<Question
 		v-model="showQuestionModal"
-		:questionName="currentQuestion"
+		:questionDetail="currentQuestion"
 		v-model:quiz="quizDetails"
 		:title="
-			currentQuestion ? __('Edit the question') : __('Add a new question')
+			currentQuestion.question ? __('Edit the question') : __('Add a new question')
 		"
 	/>
 </template>
@@ -141,6 +159,7 @@ import {
 	ListRows,
 	ListRow,
 	ListRowItem,
+	ListSelectBanner,
 	Button,
 } from 'frappe-ui'
 import {
@@ -151,47 +170,22 @@ import {
 	inject,
 	onBeforeUnmount,
 	watch,
+	isReactive,
 } from 'vue'
-import { Plus } from 'lucide-vue-next'
+import { Plus, Trash2 } from 'lucide-vue-next'
 import Question from '@/components/Modals/Question.vue'
 import { showToast } from '../utils'
 import { useRouter } from 'vue-router'
 
 const showQuestionModal = ref(false)
-const currentQuestion = ref(null)
+const currentQuestion = reactive({
+	question: '',
+	marks: 0,
+	name: ''
+})
 const user = inject('$user')
 const router = useRouter()
 
-onMounted(() => {
-	if (
-		props.quizID == 'new' &&
-		!user.data?.is_moderator &&
-		!user.data?.is_instructor
-	) {
-		router.push({ name: 'Courses' })
-	}
-	if (props.quizID !== 'new') {
-		console.log("mounted")
-		quizDetails.reload()
-	}
-	window.addEventListener('keydown', keyboardShortcut)
-})
-
-const keyboardShortcut = (e) => {
-	if (
-		e.key === 's' &&
-		(e.ctrlKey || e.metaKey) &&
-		!e.target.classList.contains('ProseMirror')
-	) {
-		submitQuiz()
-		e.preventDefault()
-	}
-}
-
-onBeforeUnmount(() => {
-	window.removeEventListener('keydown', keyboardShortcut)
-})
-
 const props = defineProps({
 	quizID: {
 		type: String,
@@ -211,16 +205,51 @@ const quiz = reactive({
 	questions: [],
 })
 
+onMounted(() => {
+	if (
+		props.quizID == 'new' &&
+		!user.data?.is_moderator &&
+		!user.data?.is_instructor
+	) {
+		router.push({ name: 'Courses' })
+	}
+	if (props.quizID !== 'new') {
+		quizDetails.reload()
+	}
+	window.addEventListener('keydown', keyboardShortcut)
+})
+
+const keyboardShortcut = (e) => {
+	if (
+		e.key === 's' &&
+		(e.ctrlKey || e.metaKey) &&
+		!e.target.classList.contains('ProseMirror')
+	) {
+		submitQuiz()
+		e.preventDefault()
+	}
+}
+
+onBeforeUnmount(() => {
+	window.removeEventListener('keydown', keyboardShortcut)
+})
+
+watch(
+	() => props.quizID !== 'new',
+	(newVal) => {
+		if (newVal) {
+			quizDetails.reload()
+		}
+	}
+)
+
 const quizDetails = createResource({
 	url: 'frappe.client.get',
 	makeParams(values) {
 		return { doctype: 'LMS Quiz', name: props.quizID }
 	},
-	cache: ['quiz', props.quizID],
 	auto: false,
-
 	onSuccess(data) {
-		console.log(data)
 		Object.keys(data).forEach((key) => {
 			if (Object.hasOwn(quiz, key)) quiz[key] = data[key]
 		})
@@ -234,7 +263,6 @@ const quizDetails = createResource({
 			let key = checkboxes[idx]
 			quiz[key] = quiz[key] ? true : false
 		}
-		console.log(quiz)
 	},
 })
 
@@ -276,7 +304,7 @@ const createQuiz = () => {
 		{},
 		{
 			onSuccess(data) {
-				showToast(__('Success'), __('Quiz created successfully', 'check'))
+				showToast(__('Success'), __('Quiz created successfully'), 'check')
 				router.push({
 					name: 'QuizCreation',
 					params: { quizID: data.name },
@@ -334,22 +362,40 @@ const questionColumns = computed(() => {
 	]
 })
 
-watch(
-	() => props.quizID !== 'new',
-	(newVal) => {
-		console.log(props.quizID)
-		if (newVal) {
-			console.log("in watch")
-			quizDetails.reload()
-		}
-	}
-)
-
 const openQuestionModal = (question = null) => {
-	currentQuestion.value = question
+	if (question) {
+		currentQuestion.question = question.question
+		currentQuestion.marks = question.marks
+		currentQuestion.name = question.name
+	} else {
+		currentQuestion.question = ''
+		currentQuestion.marks = 0
+		currentQuestion.name = ''
+	}
 	showQuestionModal.value = true
 }
 
+const deleteQuiz = createResource({
+	url: 'frappe.client.delete',
+	makeParams(values) {
+		return {
+			doctype: 'LMS Quiz Question',
+			name: values.quiz,
+		}
+	},
+})
+
+
+const deleteQuizzes = (selections, unselectAll) => {
+	selections.forEach(async (quiz) => {
+		deleteQuiz.submit({ quiz })
+	})
+	setTimeout(() => {
+		quizDetails.reload()
+		unselectAll()
+	}, 500)
+}
+
 const breadcrumbs = computed(() => {
 	let crumbs = [
 		{
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.json b/lms/lms/doctype/lms_quiz/lms_quiz.json
index 38d23b9a..dd5de78d 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.json
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.json
@@ -9,16 +9,15 @@
  "field_order": [
   "title",
   "max_attempts",
-  "limit_questions_to",
+  "show_answers",
   "column_break_gaac",
   "total_marks",
   "passing_percentage",
-  "section_break_hsiv",
-  "show_answers",
-  "column_break_rocd",
   "show_submission_history",
-  "column_break_dsup",
+  "section_break_tzbu",
   "shuffle_questions",
+  "column_break_clsh",
+  "limit_questions_to",
   "section_break_sbjx",
   "questions",
   "section_break_3",
@@ -91,11 +90,6 @@
    "fieldtype": "Check",
    "label": "Show Submission History"
   },
-  {
-   "fieldname": "section_break_hsiv",
-   "fieldtype": "Section Break",
-   "label": "Settings"
-  },
   {
    "fieldname": "passing_percentage",
    "fieldtype": "Int",
@@ -105,10 +99,6 @@
    "non_negative": 1,
    "reqd": 1
   },
-  {
-   "fieldname": "column_break_rocd",
-   "fieldtype": "Column Break"
-  },
   {
    "default": "0",
    "fieldname": "total_marks",
@@ -119,10 +109,6 @@
    "read_only": 1,
    "reqd": 1
   },
-  {
-   "fieldname": "column_break_dsup",
-   "fieldtype": "Column Break"
-  },
   {
    "default": "0",
    "fieldname": "shuffle_questions",
@@ -130,14 +116,23 @@
    "label": "Shuffle Questions"
   },
   {
+   "depends_on": "shuffle_questions",
    "fieldname": "limit_questions_to",
    "fieldtype": "Int",
    "label": "Limit Questions To"
+  },
+  {
+   "fieldname": "section_break_tzbu",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_clsh",
+   "fieldtype": "Column Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-07-19 18:21:26.681501",
+ "modified": "2024-08-09 12:21:36.256522",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz",

From 7f7986d77a26ed4f6689f2d859ca4d34625cbae6 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 12 Aug 2024 10:04:42 +0530
Subject: [PATCH 10/13] chore: fixed linters

---
 .../src/components/Controls/Autocomplete.vue  |  6 +-
 frontend/src/components/Modals/Question.vue   | 68 +++++++++----------
 frontend/src/pages/QuizCreation.vue           | 19 +++---
 lms/lms/doctype/lms_question/lms_question.py  |  9 ++-
 4 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/frontend/src/components/Controls/Autocomplete.vue b/frontend/src/components/Controls/Autocomplete.vue
index 65a95183..4b7d4a0d 100644
--- a/frontend/src/components/Controls/Autocomplete.vue
+++ b/frontend/src/components/Controls/Autocomplete.vue
@@ -91,8 +91,10 @@
 												<div>
 													{{ option.label }}
 												</div>
-												<div class="text-xs text-gray-700" v-html="option.description">
-												</div>
+												<div
+													class="text-xs text-gray-700"
+													v-html="option.description"
+												></div>
 											</div>
 										</slot>
 									</li>
diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
index 24689788..1dd09530 100644
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -2,7 +2,10 @@
 	<Dialog v-model="show" :options="dialogOptions">
 		<template #body-content>
 			<div class="space-y-4">
-				<div v-if="!editMode" class="flex items-center text-xs text-gray-700 space-x-5">
+				<div
+					v-if="!editMode"
+					class="flex items-center text-xs text-gray-700 space-x-5"
+				>
 					<div class="flex items-center space-x-2">
 						<input
 							type="radio"
@@ -95,12 +98,7 @@
 	</Dialog>
 </template>
 <script setup>
-import {
-	Dialog,
-	FormControl,
-	TextEditor,
-	createResource,
-} from 'frappe-ui'
+import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
 import { computed, watch, reactive, ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
 import { showToast } from '@/utils'
@@ -163,31 +161,26 @@ const questionData = createResource({
 			question[`is_correct_${counter}`] = data[`is_correct_${counter}`]
 				? true
 				: false
-			counter++;
+			counter++
 		}
 		question.marks = props.questionDetail.marks
 	},
-});
+})
 
 watch(show, () => {
 	if (show.value) {
 		editMode.value = false
-		if (props.questionDetail.question)
-			questionData.fetch()
-
+		if (props.questionDetail.question) questionData.fetch()
 		else {
-			question.question = "",
-			question.marks = 0
-			question.type = "Choices"
-			existingQuestion.question = ""
+			;(question.question = ''), (question.marks = 0)
+			question.type = 'Choices'
+			existingQuestion.question = ''
 			existingQuestion.marks = 0
 			questionType.value = null
 			populateFields()
 		}
 
-		if (props.questionDetail.marks)
-			question.marks = props.questionDetail.marks
-		
+		if (props.questionDetail.marks) question.marks = props.questionDetail.marks
 	}
 })
 
@@ -284,7 +277,7 @@ const questionUpdate = createResource({
 				...question,
 			},
 		}
-	}
+	},
 })
 
 const marksUpdate = createResource({
@@ -298,7 +291,7 @@ const marksUpdate = createResource({
 				marks: question.marks,
 			},
 		}
-	}
+	},
 })
 
 const updateQuestion = (close) => {
@@ -306,19 +299,26 @@ const updateQuestion = (close) => {
 		{},
 		{
 			onSuccess() {
-				marksUpdate.submit({}, {
-					onSuccess() {
-						show.value = false
-						showToast(__('Success'), __('Question updated successfully'), 'check')
-						quiz.value.reload()
-						close()
-					},
-					onError(err) {
-						showToast(__('Error'), __(err.message?.[0] || err), 'x')
-						close()
-					},
-				})
-			}
+				marksUpdate.submit(
+					{},
+					{
+						onSuccess() {
+							show.value = false
+							showToast(
+								__('Success'),
+								__('Question updated successfully'),
+								'check'
+							)
+							quiz.value.reload()
+							close()
+						},
+						onError(err) {
+							showToast(__('Error'), __(err.message?.[0] || err), 'x')
+							close()
+						},
+					}
+				)
+			},
 		}
 	)
 }
diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index f47381c1..112ff111 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -54,7 +54,6 @@
 							type="checkbox"
 							:label="__('Show Submission History')"
 						/>
-						
 					</div>
 				</div>
 
@@ -68,15 +67,14 @@
 							type="checkbox"
 							:label="__('Shuffle Questions')"
 						/>
-						<FormControl v-if="quiz.shuffle_questions"
+						<FormControl
+							v-if="quiz.shuffle_questions"
 							v-model="quiz.limit_questions_to"
 							:label="__('Limit Questions To')"
 						/>
 					</div>
 				</div>
 
-				
-
 				<!-- Questions -->
 				<div>
 					<div class="flex items-center justify-between mb-4">
@@ -113,9 +111,9 @@
 								<ListRowItem :item="item">
 									<div
 										v-if="column.key == 'question_detail'"
-										class="text-xs truncate h-4" v-html="item"
-									>
-									</div>
+										class="text-xs truncate h-4"
+										v-html="item"
+									></div>
 									<div v-else class="text-xs">
 										{{ item }}
 									</div>
@@ -144,7 +142,9 @@
 		:questionDetail="currentQuestion"
 		v-model:quiz="quizDetails"
 		:title="
-			currentQuestion.question ? __('Edit the question') : __('Add a new question')
+			currentQuestion.question
+				? __('Edit the question')
+				: __('Add a new question')
 		"
 	/>
 </template>
@@ -181,7 +181,7 @@ const showQuestionModal = ref(false)
 const currentQuestion = reactive({
 	question: '',
 	marks: 0,
-	name: ''
+	name: '',
 })
 const user = inject('$user')
 const router = useRouter()
@@ -385,7 +385,6 @@ const deleteQuiz = createResource({
 	},
 })
 
-
 const deleteQuizzes = (selections, unselectAll) => {
 	selections.forEach(async (quiz) => {
 		deleteQuiz.submit({ quiz })
diff --git a/lms/lms/doctype/lms_question/lms_question.py b/lms/lms/doctype/lms_question/lms_question.py
index effcb8db..5f18e0dd 100644
--- a/lms/lms/doctype/lms_question/lms_question.py
+++ b/lms/lms/doctype/lms_question/lms_question.py
@@ -12,6 +12,7 @@ class LMSQuestion(Document):
 		validate_correct_answers(self)
 		update_question_title(self)
 
+
 def validate_correct_answers(question):
 	if question.type == "Choices":
 		validate_duplicate_options(question)
@@ -61,15 +62,17 @@ def validate_possible_answer(question):
 			)
 		)
 
+
 def update_question_title(question):
 	if not question.is_new():
-		question_rows = frappe.get_all("LMS Quiz Question", {
-			"question": question.name
-		}, pluck="name")
+		question_rows = frappe.get_all(
+			"LMS Quiz Question", {"question": question.name}, pluck="name"
+		)
 
 		for row in question_rows:
 			frappe.db.set_value("LMS Quiz Question", row, "question_detail", question.question)
 
+
 def get_correct_options(question):
 	correct_options = []
 	correct_option_fields = [

From 62ab853605ee7447fd2a06ed61b8771e102eb7c8 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 12 Aug 2024 12:46:38 +0530
Subject: [PATCH 11/13] feat: quiz creation from lesson form

---
 .../src/components/Controls/Autocomplete.vue  |  2 +-
 frontend/src/components/Controls/Link.vue     |  1 +
 frontend/src/components/LessonPlugins.vue     | 38 ++++++++++++-------
 frontend/src/pages/LessonForm.vue             |  8 +++-
 frontend/src/utils/index.js                   |  4 +-
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/Controls/Autocomplete.vue b/frontend/src/components/Controls/Autocomplete.vue
index 4b7d4a0d..0563dd61 100644
--- a/frontend/src/components/Controls/Autocomplete.vue
+++ b/frontend/src/components/Controls/Autocomplete.vue
@@ -91,7 +91,7 @@
 												<div>
 													{{ option.label }}
 												</div>
-												<div
+												<div v-if="option.label != option.description"
 													class="text-xs text-gray-700"
 													v-html="option.description"
 												></div>
diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue
index c5f6f63f..f7730380 100644
--- a/frontend/src/components/Controls/Link.vue
+++ b/frontend/src/components/Controls/Link.vue
@@ -77,6 +77,7 @@ const valuePropPassed = computed(() => 'value' in attrs)
 const value = computed({
 	get: () => (valuePropPassed.value ? attrs.value : props.modelValue),
 	set: (val) => {
+		console.log(valuePropPassed.value)
 		return (
 			val?.value &&
 			emit(valuePropPassed.value ? 'change' : 'update:modelValue', val?.value)
diff --git a/frontend/src/components/LessonPlugins.vue b/frontend/src/components/LessonPlugins.vue
index ccaa17cf..e5a4e5af 100644
--- a/frontend/src/components/LessonPlugins.vue
+++ b/frontend/src/components/LessonPlugins.vue
@@ -2,7 +2,7 @@
 	<div class="text-lg font-semibold">
 		{{ __('Components') }}
 	</div>
-	<div class="mt-5">
+	<div class="mt-5 space-y-4">
 		<Tooltip
 			:text="
 				__(
@@ -18,20 +18,28 @@
 				<Select v-model="currentEditor" :options="getEditorOptions()" />
 			</div>
 		</Tooltip>
-		<div class="flex mt-4">
+		<div class="flex">
 			<Link
-				v-model="quiz"
+				:value="quiz"
 				class="flex-1"
 				doctype="LMS Quiz"
-				:label="__('Select a Quiz')"
+				:label="__('Add an existing quiz')"
+				@change="(option) => addQuiz(option)"
 			/>
-			<Button @click="addQuiz()" class="self-end ml-2">
-				<template #icon>
-					<Plus class="h-4 w-4 stroke-1.5" />
-				</template>
-			</Button>
+			<router-link :to="{
+				name: 'QuizCreation',
+				params: {
+					quizID: 'new',
+				}
+			}" class="self-end ml-2">
+				<Button>
+					<template #icon>
+						<Plus class="h-4 w-4 stroke-1.5" />
+					</template>
+				</Button>
+			</router-link>
 		</div>
-		<div class="mt-4">
+		<div class="">
 			<div class="text-xs text-gray-600 mb-1">
 				{{ __('Add an image, video, pdf or audio.') }}
 			</div>
@@ -68,7 +76,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="mt-4">
+		<div class="">
 			<div class="text-xs text-gray-600 mb-1">
 				{{
 					__(
@@ -112,11 +120,13 @@ const props = defineProps({
 	},
 })
 
-const addQuiz = () => {
+const addQuiz = (value) => {
+	console.log("here")
+	console.log(value)
 	getCurrentEditor().caret.setToLastBlock('end', 0)
-	if (quiz.value) {
+	if (value) {
 		getCurrentEditor().blocks.insert('quiz', {
-			quiz: quiz.value,
+			quiz: value,
 		})
 		quiz.value = null
 	}
diff --git a/frontend/src/pages/LessonForm.vue b/frontend/src/pages/LessonForm.vue
index b92ea7d9..b16d4f4d 100644
--- a/frontend/src/pages/LessonForm.vue
+++ b/frontend/src/pages/LessonForm.vue
@@ -70,7 +70,7 @@
 </template>
 <script setup>
 import { Breadcrumbs, FormControl, createResource, Button } from 'frappe-ui'
-import { computed, reactive, onMounted, inject, ref, watch } from 'vue'
+import { computed, reactive, onMounted, inject, ref, onBeforeUnmount } from 'vue'
 import EditorJS from '@editorjs/editorjs'
 import LessonPlugins from '@/components/LessonPlugins.vue'
 import { ChevronRight } from 'lucide-vue-next'
@@ -171,9 +171,13 @@ const addInstructorNotes = (data) => {
 const enableAutoSave = () => {
 	autoSaveInterval = setInterval(() => {
 		saveLesson()
-	}, 10000)
+	}, 5000)
 }
 
+onBeforeUnmount(() => {
+	clearInterval(autoSaveInterval)
+})
+
 const newLessonResource = createResource({
 	url: 'frappe.client.insert',
 	makeParams(values) {
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 05372373..e732e09f 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -236,7 +236,7 @@ export function getEditorTools() {
 						regex: /https:\/\/docs\.google\.com\/presentation\/d\/e\/([A-Za-z0-9_-]+)\/pub/,
 						embedUrl:
 							'https://docs.google.com/presentation/d/e/<%= remote_id %>/embed',
-						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>",
+						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px; margin: 1rem 0' frameborder='0' allowfullscreen='true'></iframe>",
 					},
 					drive: {
 						regex: /https:\/\/drive\.google\.com\/file\/d\/([A-Za-z0-9_-]+)\/view(\?.+)?/,
@@ -260,7 +260,7 @@ export function getEditorTools() {
 						regex: /https:\/\/docs\.google\.com\/presentation\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?/,
 						embedUrl:
 							'https://docs.google.com/presentation/d/<%= remote_id %>/embed',
-						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>",
+						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px; margin: 1rem 0;' frameborder='0' allowfullscreen='true'></iframe>",
 					},
 					codesandbox: {
 						regex: /^https:\/\/codesandbox\.io\/(?:embed\/)?([A-Za-z0-9_-]+)(?:\?[^\/]*)?$/,

From 2994144718d89c1b5b4fc2df7c16b3ae672cad6b Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 12 Aug 2024 12:47:17 +0530
Subject: [PATCH 12/13] feat: quiz creation from lesson form

---
 .../src/components/Controls/Autocomplete.vue    |  3 ++-
 frontend/src/components/LessonPlugins.vue       | 17 ++++++++++-------
 frontend/src/pages/LessonForm.vue               |  9 ++++++++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/Controls/Autocomplete.vue b/frontend/src/components/Controls/Autocomplete.vue
index 0563dd61..81f5358b 100644
--- a/frontend/src/components/Controls/Autocomplete.vue
+++ b/frontend/src/components/Controls/Autocomplete.vue
@@ -91,7 +91,8 @@
 												<div>
 													{{ option.label }}
 												</div>
-												<div v-if="option.label != option.description"
+												<div
+													v-if="option.label != option.description"
 													class="text-xs text-gray-700"
 													v-html="option.description"
 												></div>
diff --git a/frontend/src/components/LessonPlugins.vue b/frontend/src/components/LessonPlugins.vue
index e5a4e5af..89af799d 100644
--- a/frontend/src/components/LessonPlugins.vue
+++ b/frontend/src/components/LessonPlugins.vue
@@ -26,12 +26,15 @@
 				:label="__('Add an existing quiz')"
 				@change="(option) => addQuiz(option)"
 			/>
-			<router-link :to="{
-				name: 'QuizCreation',
-				params: {
-					quizID: 'new',
-				}
-			}" class="self-end ml-2">
+			<router-link
+				:to="{
+					name: 'QuizCreation',
+					params: {
+						quizID: 'new',
+					},
+				}"
+				class="self-end ml-2"
+			>
 				<Button>
 					<template #icon>
 						<Plus class="h-4 w-4 stroke-1.5" />
@@ -121,7 +124,7 @@ const props = defineProps({
 })
 
 const addQuiz = (value) => {
-	console.log("here")
+	console.log('here')
 	console.log(value)
 	getCurrentEditor().caret.setToLastBlock('end', 0)
 	if (value) {
diff --git a/frontend/src/pages/LessonForm.vue b/frontend/src/pages/LessonForm.vue
index b16d4f4d..f112d2e5 100644
--- a/frontend/src/pages/LessonForm.vue
+++ b/frontend/src/pages/LessonForm.vue
@@ -70,7 +70,14 @@
 </template>
 <script setup>
 import { Breadcrumbs, FormControl, createResource, Button } from 'frappe-ui'
-import { computed, reactive, onMounted, inject, ref, onBeforeUnmount } from 'vue'
+import {
+	computed,
+	reactive,
+	onMounted,
+	inject,
+	ref,
+	onBeforeUnmount,
+} from 'vue'
 import EditorJS from '@editorjs/editorjs'
 import LessonPlugins from '@/components/LessonPlugins.vue'
 import { ChevronRight } from 'lucide-vue-next'

From d18a6f6e73fe898fda9bdf6f228fdbbfd162f692 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 12 Aug 2024 13:13:21 +0530
Subject: [PATCH 13/13] chore: removed workspaces from package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 923d2f3e..f5231fac 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "frappe_lms",
   "version": "1.0.0",
   "description": "Easy to use, open-source, Learning Management System",
-  "workspaces": [
+  "workspaces1": [
     "frappe-ui",
     "frontend"
   ],