Merge pull request #924 from pateljannat/reorder-lessons

feat: reorder lessons
2024-07-10 22:00:54 +05:30
parent 8edfe041c3 a84b225247
commit 9960507318
20 changed files with 293 additions and 96 deletions
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -29,7 +29,9 @@
    "tailwindcss": "^3.3.3",
    "vue": "^3.4.23",
    "vue-chartjs": "^5.3.0",
-    "vue-router": "^4.0.12"
+    "vue-draggable-next": "^2.2.1",
+    "vue-router": "^4.0.12",
+    "vuedraggable": "4.1.0"
  },
  "devDependencies": {
    "@vitejs/plugin-vue": "^5.0.3",
--- a/frontend/src/components/AppSidebar.vue
+++ b/frontend/src/components/AppSidebar.vue
@@ -18,20 +18,28 @@
 			</div>
 			<div
 				v-if="sidebarSettings.data?.web_pages?.length || isModerator"
-				class="mt-4 pt-1 border-t border-gray-200"
+				class="pt-1"
 			>
 				<div
-					v-if="isModerator"
-					class="flex items-center justify-between pr-2"
-					:class="isSidebarCollapsed ? 'pl-3' : 'pl-5'"
+					class="flex items-center justify-between pr-2 cursor-pointer"
+					:class="isSidebarCollapsed ? 'pl-3' : 'pl-4'"
+					@click="showWebPages = !showWebPages"
 				>
-					<span
+					<div
 						v-if="!isSidebarCollapsed"
-						class="text-sm font-medium text-gray-600"
+						class="flex items-center text-sm font-medium text-gray-600"
 					>
-						{{ __('Web Pages') }}
-					</span>
-					<Button variant="ghost" @click="openPageModal()">
+						<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
+							<ChevronRight
+								class="h-4 w-4 stroke-1.5 text-gray-900 transition-all duration-300 ease-in-out"
+								:class="{ 'rotate-90': showWebPages }"
+							/>
+						</span>
+						<span class="ml-2">
+							{{ __('Web Pages') }}
+						</span>
+					</div>
+					<Button v-if="isModerator" variant="ghost" @click="openPageModal()">
 						<template #icon>
 							<Plus class="h-4 w-4 text-gray-700 stroke-1.5" />
 						</template>
@@ -39,7 +47,8 @@
 				</div>
 				<div
 					v-if="sidebarSettings.data?.web_pages?.length"
-					class="flex flex-col"
+					class="flex flex-col transition-all duration-300 ease-in-out"
+					:class="showWebPages ? 'block' : 'hidden'"
 				>
 					<SidebarLink
 						v-for="link in sidebarSettings.data.web_pages"
@@ -87,7 +96,7 @@ import { ref, onMounted, inject, watch } from 'vue'
 import { getSidebarLinks } from '../utils'
 import { usersStore } from '@/stores/user'
 import { sessionStore } from '@/stores/session'
-import { Plus } from 'lucide-vue-next'
+import { ChevronRight, Plus } from 'lucide-vue-next'
 import { createResource, Button } from 'frappe-ui'
 import PageModal from '@/components/Modals/PageModal.vue'

@@ -99,6 +108,7 @@ const sidebarLinks = ref(getSidebarLinks())
 const showPageModal = ref(false)
 const isModerator = ref(false)
 const pageToEdit = ref(null)
+const showWebPages = ref(false)

 onMounted(() => {
 	socket.on('publish_lms_notifications', (data) => {
--- a/frontend/src/components/BatchOverlay.vue
+++ b/frontend/src/components/BatchOverlay.vue
@@ -41,7 +41,7 @@
 			</span>
 		</div>
 		<router-link
-			v-if="user?.data?.is_moderator"
+			v-if="isModerator || isStudent"
 			:to="{
 				name: 'Batch',
 				params: {
@@ -51,7 +51,7 @@
 		>
 			<Button variant="solid" class="w-full mt-4">
 				<span>
-					{{ __('Manage Batch') }}
+					{{ isModerator ? __('Manage Batch') : __('Visit Batch') }}
 				</span>
 			</Button>
 		</router-link>
@@ -65,7 +65,7 @@
 			}"
 			v-else-if="batch.data.paid_batch && batch.data.seats_left"
 		>
-			<Button class="w-full mt-4" variant="solid">
+			<Button v-if="!isStudent" class="w-full mt-4" variant="solid">
 				<span>
 					{{ __('Register Now') }}
 				</span>
@@ -79,7 +79,7 @@
 			{{ __('Enroll Now') }}
 		</Button>
 		<router-link
-			v-if="user?.data?.is_moderator"
+			v-if="isModerator"
 			:to="{
 				name: 'BatchCreation',
 				params: {
@@ -117,4 +117,12 @@ const seats_left = computed(() => {
 	}
 	return null
 })
+
+const isStudent = computed(() => {
+	return props.batch.data?.students?.includes(user.data?.name)
+})
+
+const isModerator = computed(() => {
+	return user.data?.is_moderator
+})
 </script>
--- a/frontend/src/components/CourseOutline.vue
+++ b/frontend/src/components/CourseOutline.vue
@@ -39,45 +39,53 @@
 					</div>
 				</DisclosureButton>
 				<DisclosurePanel>
-					<div v-for="lesson in chapter.lessons" :key="lesson.name">
-						<div class="outline-lesson pl-8 py-2 pr-4">
-							<router-link
-								:to="{
-									name: allowEdit ? 'CreateLesson' : 'Lesson',
-									params: {
-										courseName: courseName,
-										chapterNumber: lesson.number.split('.')[0],
-										lessonNumber: lesson.number.split('.')[1],
-									},
-								}"
-							>
-								<div class="flex items-center text-sm leading-5 group">
-									<MonitorPlay
-										v-if="lesson.icon === 'icon-youtube'"
-										class="h-4 w-4 text-gray-900 stroke-1 mr-2"
-									/>
-									<HelpCircle
-										v-else-if="lesson.icon === 'icon-quiz'"
-										class="h-4 w-4 text-gray-900 stroke-1 mr-2"
-									/>
-									<FileText
-										v-else-if="lesson.icon === 'icon-list'"
-										class="h-4 w-4 text-gray-900 stroke-1 mr-2"
-									/>
-									{{ lesson.title }}
-									<Trash2
-										v-if="allowEdit"
-										@click.prevent="trashLesson(lesson.name, chapter.name)"
-										class="h-4 w-4 stroke-1.5 text-gray-700 ml-auto invisible group-hover:visible"
-									/>
-									<Check
-										v-if="lesson.is_complete"
-										class="h-4 w-4 text-green-700 ml-2"
-									/>
-								</div>
-							</router-link>
-						</div>
-					</div>
+					<Draggable
+						:list="chapter.lessons"
+						item-key="name"
+						group="items"
+						@end="updateOutline"
+						:data-chapter="chapter.name"
+					>
+						<template #item="{ element: lesson }">
+							<div class="outline-lesson pl-8 py-2 pr-4">
+								<router-link
+									:to="{
+										name: allowEdit ? 'CreateLesson' : 'Lesson',
+										params: {
+											courseName: courseName,
+											chapterNumber: lesson.number.split('.')[0],
+											lessonNumber: lesson.number.split('.')[1],
+										},
+									}"
+								>
+									<div class="flex items-center text-sm leading-5 group">
+										<MonitorPlay
+											v-if="lesson.icon === 'icon-youtube'"
+											class="h-4 w-4 text-gray-900 stroke-1 mr-2"
+										/>
+										<HelpCircle
+											v-else-if="lesson.icon === 'icon-quiz'"
+											class="h-4 w-4 text-gray-900 stroke-1 mr-2"
+										/>
+										<FileText
+											v-else-if="lesson.icon === 'icon-list'"
+											class="h-4 w-4 text-gray-900 stroke-1 mr-2"
+										/>
+										{{ lesson.title }}
+										<Trash2
+											v-if="allowEdit"
+											@click.prevent="trashLesson(lesson.name, chapter.name)"
+											class="h-4 w-4 stroke-1.5 text-gray-700 ml-auto invisible group-hover:visible"
+										/>
+										<Check
+											v-if="lesson.is_complete"
+											class="h-4 w-4 text-green-700 ml-2"
+										/>
+									</div>
+								</router-link>
+							</div>
+						</template>
+					</Draggable>
 					<div v-if="allowEdit" class="flex mt-2 mb-4 pl-8">
 						<router-link
 							:to="{
@@ -111,6 +119,7 @@
 <script setup>
 import { Button, createResource } from 'frappe-ui'
 import { ref } from 'vue'
+import Draggable from 'vuedraggable'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue'
 import {
 	ChevronRight,
@@ -172,7 +181,22 @@ const deleteLesson = createResource({
 	},
 	onSuccess() {
 		outline.reload()
-		showToast('Success', 'Lesson deleted', 'check')
+		showToast('Success', 'Lesson deleted successfully', 'check')
+	},
+})
+
+const updateLessonIndex = createResource({
+	url: 'lms.lms.api.update_lesson_index',
+	makeParams(values) {
+		return {
+			lesson: values.lesson,
+			sourceChapter: values.sourceChapter,
+			targetChapter: values.targetChapter,
+			idx: values.idx,
+		}
+	},
+	onSuccess() {
+		showToast('Success', 'Lesson moved successfully', 'check')
 	},
 })

@@ -195,6 +219,15 @@ const openChapterModal = (chapter = null) => {
 const getCurrentChapter = () => {
 	return currentChapter.value
 }
+
+const updateOutline = (e) => {
+	updateLessonIndex.submit({
+		lesson: e.item.__draggable_context.element.name,
+		sourceChapter: e.from.dataset.chapter,
+		targetChapter: e.to.dataset.chapter,
+		idx: e.newIndex,
+	})
+}
 </script>
 <style>
 .outline-lesson:has(.router-link-active) {
--- a/frontend/src/components/SidebarLink.vue
+++ b/frontend/src/components/SidebarLink.vue
@@ -20,7 +20,7 @@
 				</slot>
 			</Tooltip>
 			<span
-				class="flex-shrink-0 text-base duration-300 ease-in-out"
+				class="flex-shrink-0 text-sm duration-300 ease-in-out"
 				:class="
 					isCollapsed
 						? 'ml-0 w-0 overflow-hidden opacity-0'
@@ -38,12 +38,12 @@
 			>
 				<component
 					:is="icons['Edit']"
-					class="h-3 w-3 stroke-1.5 text-gray-800"
+					class="h-3 w-3 stroke-1.5 text-gray-700"
 					@click.stop="openModal(link)"
 				/>
 				<component
 					:is="icons['X']"
-					class="h-3 w-3 stroke-1.5 text-gray-800"
+					class="h-3 w-3 stroke-1.5 text-gray-700"
 					@click.stop="deletePage(link)"
 				/>
 			</div>
--- a/frontend/src/pages/Batch.vue
+++ b/frontend/src/pages/Batch.vue
@@ -183,7 +183,7 @@ import {
 	MessageCircle,
 	Globe,
 } from 'lucide-vue-next'
-import { formatTime } from '@/utils'
+import { formatTime, updateDocumentTitle } from '@/utils'
 import BatchDashboard from '@/components/BatchDashboard.vue'
 import BatchCourses from '@/components/BatchCourses.vue'
 import LiveClass from '@/components/LiveClass.vue'
@@ -286,4 +286,13 @@ const redirectToLogin = () => {
 const openAnnouncementModal = () => {
 	showAnnouncementModal.value = true
 }
+
+const pageMeta = computed(() => {
+	return {
+		title: batch.data?.title,
+		description: batch.data?.description,
+	}
+})
+
+updateDocumentTitle(pageMeta)
 </script>
--- a/frontend/src/pages/BatchDetail.vue
+++ b/frontend/src/pages/BatchDetail.vue
@@ -100,7 +100,7 @@
 import { computed, inject } from 'vue'
 import { useRouter } from 'vue-router'
 import { BookOpen, Clock } from 'lucide-vue-next'
-import { formatTime } from '@/utils'
+import { formatTime, updateDocumentTitle } from '@/utils'
 import { Breadcrumbs, createResource } from 'frappe-ui'
 import CourseCard from '@/components/CourseCard.vue'
 import BatchOverlay from '@/components/BatchOverlay.vue'
@@ -125,16 +125,6 @@ const batch = createResource({
 		batch: props.batchName,
 	},
 	auto: true,
-	onSuccess(data) {
-		if (data.students?.includes(user.data?.name)) {
-			router.push({
-				name: 'Batch',
-				params: {
-					batchName: props.batchName,
-				},
-			})
-		}
-	},
 })

 const courses = createResource({
@@ -154,6 +144,15 @@ const breadcrumbs = computed(() => {
 	})
 	return items
 })
+
+const pageMeta = computed(() => {
+	return {
+		title: batch.data?.title,
+		description: batch.data?.description,
+	}
+})
+
+updateDocumentTitle(pageMeta)
 </script>
 <style>
 .batch-description p {
--- a/frontend/src/pages/Batches.vue
+++ b/frontend/src/pages/Batches.vue
@@ -91,6 +91,7 @@ import { createListResource, Breadcrumbs, Button, Tabs, Badge } from 'frappe-ui'
 import { Plus } from 'lucide-vue-next'
 import BatchCard from '@/components/BatchCard.vue'
 import { inject, ref, computed } from 'vue'
+import { updateDocumentTitle } from '@/utils'

 const user = inject('$user')

@@ -129,4 +130,13 @@ if (user.data) {
 		count: computed(() => batches.data?.enrolled?.length),
 	})
 }
+
+const pageMeta = computed(() => {
+	return {
+		title: 'Batches',
+		description: 'All batches divided by categories',
+	}
+})
+
+updateDocumentTitle(pageMeta)
 </script>
--- a/frontend/src/pages/CertifiedParticipants.vue
+++ b/frontend/src/pages/CertifiedParticipants.vue
@@ -52,6 +52,7 @@ import { Breadcrumbs, FormControl, createResource } from 'frappe-ui'
 import { ref, computed } from 'vue'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { Search } from 'lucide-vue-next'
+import { updateDocumentTitle } from '@/utils'

 const searchQuery = ref('')

@@ -70,4 +71,13 @@ const participants = createResource({
 const breadcrumbs = computed(() => {
 	return [{ label: 'Certified Participants', to: '/certified-participants' }]
 })
+
+const pageMeta = computed(() => {
+	return {
+		title: 'Certified Participants',
+		description: 'All participants that have been certified.',
+	}
+})
+
+updateDocumentTitle(pageMeta)
 </script>
--- a/frontend/src/pages/CreateCourse.vue
+++ b/frontend/src/pages/CreateCourse.vue
@@ -7,19 +7,6 @@
 				>
 					<Breadcrumbs class="h-7" :items="breadcrumbs" />
 					<div class="flex items-center mt-3 md:mt-0">
-						<router-link
-							v-if="courseResource.data"
-							:to="{
-								name: 'CourseDetail',
-								params: { courseName: courseResource.data.name },
-							}"
-						>
-							<Button>
-								<span>
-									{{ __('View Course') }}
-								</span>
-							</Button>
-						</router-link>
 						<Button variant="solid" @click="submitCourse()" class="ml-2">
 							<span>
 								{{ __('Save') }}
@@ -222,7 +209,12 @@ import {
 	reactive,
 	watch,
 } from 'vue'
-import { convertToTitleCase, showToast, getFileSize } from '../utils'
+import {
+	convertToTitleCase,
+	showToast,
+	getFileSize,
+	updateDocumentTitle,
+} from '../utils'
 import Link from '@/components/Controls/Link.vue'
 import { FileText, X } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
@@ -492,4 +484,13 @@ const breadcrumbs = computed(() => {
 	})
 	return crumbs
 })
+
+const pageMeta = computed(() => {
+	return {
+		title: 'Create a Course',
+		description: 'Create or edit a course for your learning system.',
+	}
+})
+
+updateDocumentTitle(pageMeta)
 </script>
--- a/frontend/src/pages/Lesson.vue
+++ b/frontend/src/pages/Lesson.vue
@@ -185,7 +185,7 @@ import UserAvatar from '@/components/UserAvatar.vue'
 import { useRoute } from 'vue-router'
 import { ChevronLeft, ChevronRight } from 'lucide-vue-next'
 import Discussions from '@/components/Discussions.vue'
-import { getEditorTools } from '../utils'
+import { getEditorTools, updateDocumentTitle } from '../utils'
 import EditorJS from '@editorjs/editorjs'
 import LessonContent from '@/components/LessonContent.vue'
 import CourseInstructors from '@/components/CourseInstructors.vue'
@@ -338,6 +338,15 @@ const allowInstructorContent = () => {
 const redirectToLogin = () => {
 	window.location.href = `/login?redirect-to=/lms/courses/${props.courseName}`
 }
+
+const pageMeta = computed(() => {
+	return {
+		title: lesson.data?.title,
+		description: lesson.data?.course,
+	}
+})
+
+updateDocumentTitle(pageMeta)
 </script>
 <style>
 .avatar-group {
--- a/frontend/src/pages/Notifications.vue
+++ b/frontend/src/pages/Notifications.vue
@@ -69,6 +69,7 @@ import { computed, inject, ref, onMounted } from 'vue'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { useRouter } from 'vue-router'
 import { X } from 'lucide-vue-next'
+import { updateDocumentTitle } from '@/utils'

 const user = inject('$user')
 const socket = inject('$socket')
@@ -146,6 +147,15 @@ const breadcrumbs = computed(() => {
 	]
 	return crumbs
 })
+
+const pageMeta = computed(() => {
+	return {
+		title: 'Notifications',
+		description: 'All your notifications in one place.',
+	}
+})
+
+updateDocumentTitle(pageMeta)
 </script>
 <style>
 .notification strong {
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -93,7 +93,7 @@ import { Edit } from 'lucide-vue-next'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { useRoute, useRouter } from 'vue-router'
 import NoPermission from '@/components/NoPermission.vue'
-import { convertToTitleCase } from '@/utils'
+import { convertToTitleCase, updateDocumentTitle } from '@/utils'
 import EditProfile from '@/components/Modals/EditProfile.vue'
 import EditCoverImage from '@/components/Modals/EditCoverImage.vue'

@@ -208,4 +208,13 @@ const breadcrumbs = computed(() => {
 	]
 	return crumbs
 })
+
+const pageMeta = computed(() => {
+	return {
+		title: profile.data?.full_name,
+		description: profile.data?.headline,
+	}
+})
+
+updateDocumentTitle(pageMeta)
 </script>
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -357,13 +357,19 @@ export function getSidebarLinks() {
 			label: 'Courses',
 			icon: 'BookOpen',
 			to: 'Courses',
-			activeFor: ['Courses', 'CourseDetail', 'Lesson'],
+			activeFor: [
+				'Courses',
+				'CourseDetail',
+				'Lesson',
+				'CreateCourse',
+				'CreateLesson',
+			],
 		},
 		{
 			label: 'Batches',
 			icon: 'Users',
 			to: 'Batches',
-			activeFor: ['Batches', 'BatchDetail', 'Batch'],
+			activeFor: ['Batches', 'BatchDetail', 'Batch', 'BatchCreation'],
 		},
 		{
 			label: 'Certified Participants',
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1865,12 +1865,18 @@ socket.io-parser@~4.2.4:
    "@socket.io/component-emitter" "~3.1.0"
    debug "~4.3.1"

+sortablejs@1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8"
+  integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==
+
 source-map-js@^1.2.0:
  version "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
  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==
@@ -1889,6 +1895,7 @@ string-width@^5.0.1, string-width@^5.1.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
  version "6.0.1"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -2025,6 +2032,11 @@ vue-demi@>=0.13.0, vue-demi@>=0.14.5, vue-demi@>=0.14.7:
  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.8.tgz#00335e9317b45e4a68d3528aaf58e0cec3d5640a"
  integrity sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==

+vue-draggable-next@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/vue-draggable-next/-/vue-draggable-next-2.2.1.tgz#adbe98c74610cca8f4eb63f92042681f96920451"
+  integrity sha512-EAMS1IRHF0kZO0o5PMOinsQsXIqsrKT1hKmbICxG3UEtn7zLFkLxlAtajcCcUTisNvQ6TtCB5COjD9a1raNADw==
+
 vue-router@^4.0.12:
  version "4.3.2"
  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.3.2.tgz#08096c7765dacc6832f58e35f7a081a8b34116a7"
@@ -2043,6 +2055,13 @@ vue@^3.4.23:
    "@vue/server-renderer" "3.4.27"
    "@vue/shared" "3.4.27"

+vuedraggable@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270"
+  integrity sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==
+  dependencies:
+    sortablejs "1.14.0"
+
 w3c-keyname@^2.2.0:
  version "2.2.8"
  resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5"
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -483,3 +483,62 @@ def delete_sidebar_item(webpage):
 def delete_lesson(lesson, chapter):
 	frappe.db.delete("Lesson Reference", {"parent": chapter, "lesson": lesson})
 	frappe.db.delete("Course Lesson", lesson)
+
+
+@frappe.whitelist()
+def update_lesson_index(lesson, sourceChapter, targetChapter, idx):
+	hasMoved = sourceChapter == targetChapter
+
+	update_source_chapter(lesson, sourceChapter, idx, hasMoved)
+	if not hasMoved:
+		update_target_chapter(lesson, targetChapter, idx)
+
+
+def update_source_chapter(lesson, chapter, idx, hasMoved=False):
+	lessons = frappe.get_all(
+		"Lesson Reference",
+		{
+			"parent": chapter,
+		},
+		pluck="lesson",
+		order_by="idx",
+	)
+
+	lessons.remove(lesson)
+	if not hasMoved:
+		frappe.db.delete("Lesson Reference", {"parent": chapter, "lesson": lesson})
+	else:
+		lessons.insert(idx, lesson)
+
+	update_index(lessons, chapter)
+
+
+def update_target_chapter(lesson, chapter, idx):
+	lessons = frappe.get_all(
+		"Lesson Reference",
+		{
+			"parent": chapter,
+		},
+		pluck="lesson",
+		order_by="idx",
+	)
+
+	lessons.insert(idx, lesson)
+	new_lesson_reference = frappe.new_doc("Lesson Reference")
+	new_lesson_reference.update(
+		{
+			"lesson": lesson,
+			"parent": chapter,
+			"parenttype": "Course Chapter",
+			"parentfield": "lessons",
+		}
+	)
+	new_lesson_reference.insert()
+	update_index(lessons, chapter)
+
+
+def update_index(lessons, chapter):
+	for row in lessons:
+		frappe.db.set_value(
+			"Lesson Reference", {"lesson": row, "parent": chapter}, "idx", lessons.index(row) + 1
+		)
--- a/lms/lms/notification/certificate_request_creation/certificate_request_creation.html
+++ b/lms/lms/notification/certificate_request_creation/certificate_request_creation.html
@@ -1,7 +1,9 @@
 {% set title = frappe.db.get_value("LMS Course", doc.course, "title") %}
 {% set timezone = frappe.db.get_value("LMS Batch", doc.batch, "timezone") %}
 {% set timezone = timezone if timezone else '' %}
+{% set evaluator_name = frappe.db.get_value("User", doc.evaluator, "full_name") %}

 <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> {{ _("Please prepare well and be on time for the evaluations.") }} </p>
--- a/lms/lms/notification/certificate_request_creation/certificate_request_creation.json
+++ b/lms/lms/notification/certificate_request_creation/certificate_request_creation.json
@@ -10,10 +10,10 @@
 "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\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> {{ _(\"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) }}\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
 "message_type": "HTML",
- "modified": "2024-06-21 13:15:38.588768",
- "modified_by": "Administrator",
+ "modified": "2024-07-10 15:51:03.429317",
+ "modified_by": "sayali@erpnext.com",
 "module": "LMS",
 "name": "Certificate Request Creation",
 "owner": "Administrator",
--- a/lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html
+++ b/lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html
@@ -1,7 +1,8 @@
 {% set title = frappe.db.get_value("LMS Course", doc.course, "title") %}
 {% set timezone = frappe.db.get_value("LMS Batch", doc.batch, "timezone") %}
 {% set timezone = timezone if timezone else '' %}
+{% set evaluator_name = frappe.db.get_value("User", doc.evaluator, "full_name") %}

 <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> {{ _("Please prepare well and be on time for the evaluations.") }} </p>
--- a/lms/lms/notification/certificate_request_reminder/certificate_request_reminder.json
+++ b/lms/lms/notification/certificate_request_reminder/certificate_request_reminder.json
@@ -11,10 +11,10 @@
 "event": "Days Before",
 "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\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\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> {{ _('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_type": "HTML",
- "modified": "2024-06-21 13:17:26.360030",
- "modified_by": "Administrator",
+ "modified": "2024-07-10 15:51:33.803704",
+ "modified_by": "sayali@erpnext.com",
 "module": "LMS",
 "name": "Certificate Request Reminder",
 "owner": "Administrator",