From 90151be166ac2c83d3022a9708563c6b1e2d5ef9 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 23 Feb 2026 12:35:13 +0530
Subject: [PATCH 1/4] fix: updated app name in workspace and desktop

---
 frontend/src/pages/Lesson.vue                          |  4 ++--
 .../{frappe_lms.json => frappe_learning.json}          |  5 +++--
 lms/hooks.py                                           |  2 +-
 .../workspace/{lms/lms.json => learning/learning.json} | 10 +++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename lms/desktop_icon/{frappe_lms.json => frappe_learning.json} (82%)
 rename lms/lms/workspace/{lms/lms.json => learning/learning.json} (97%)

diff --git a/frontend/src/pages/Lesson.vue b/frontend/src/pages/Lesson.vue
index 6bef3c0d..2a8a9523 100644
--- a/frontend/src/pages/Lesson.vue
+++ b/frontend/src/pages/Lesson.vue
@@ -783,11 +783,11 @@ const isAdmin = computed(() => {
 
 const allowEdit = () => {
 	if (window.read_only_mode) return false
-	if (isAdmin.value) return true
-	return false
+	return isAdmin.value
 }
 
 const allowInstructorContent = () => {
+	if (window.read_only_mode) return false
 	return isAdmin.value
 }
 
diff --git a/lms/desktop_icon/frappe_lms.json b/lms/desktop_icon/frappe_learning.json
similarity index 82%
rename from lms/desktop_icon/frappe_lms.json
rename to lms/desktop_icon/frappe_learning.json
index f137321c..72f5b16d 100644
--- a/lms/desktop_icon/frappe_lms.json
+++ b/lms/desktop_icon/frappe_learning.json
@@ -6,14 +6,15 @@
  "hidden": 0,
  "icon_type": "App",
  "idx": 0,
- "label": "Frappe LMS",
+ "label": "Frappe Learning",
  "link": "/lms",
  "link_type": "External",
  "logo_url": "/assets/lms/frontend/learning.svg",
  "modified": "2025-12-15 14:31:50.704854",
  "modified_by": "Administrator",
- "name": "Frappe LMS",
+ "name": "Frappe Learning",
  "owner": "Administrator",
+ "restrict_removal": 0,
  "roles": [],
  "standard": 1
 }
diff --git a/lms/hooks.py b/lms/hooks.py
index 9f99e09d..3fc60642 100644
--- a/lms/hooks.py
+++ b/lms/hooks.py
@@ -5,7 +5,7 @@ from . import __version__ as app_version
 app_name = "frappe_lms"
 app_title = "Learning"
 app_publisher = "Frappe"
-app_description = "Frappe LMS App"
+app_description = "Open Source Learning Management System built with Frappe Framework"
 app_icon_url = "/assets/lms/images/lms-logo.png"
 app_icon_title = "Learning"
 app_color = "grey"
diff --git a/lms/lms/workspace/lms/lms.json b/lms/lms/workspace/learning/learning.json
similarity index 97%
rename from lms/lms/workspace/lms/lms.json
rename to lms/lms/workspace/learning/learning.json
index 1912a7f3..42aee5ae 100644
--- a/lms/lms/workspace/lms/lms.json
+++ b/lms/lms/workspace/learning/learning.json
@@ -23,7 +23,7 @@
  "icon": "education",
  "idx": 0,
  "is_hidden": 0,
- "label": "LMS",
+ "label": "Learning",
  "links": [
   {
    "hidden": 0,
@@ -150,10 +150,10 @@
    "type": "Link"
   }
  ],
- "modified": "2025-12-08 13:23:09.718683",
- "modified_by": "sayali@frappe.io",
+ "modified": "2026-02-23 12:27:25.010341",
+ "modified_by": "Administrator",
  "module": "LMS",
- "name": "LMS",
+ "name": "Learning",
  "number_cards": [],
  "owner": "Administrator",
  "parent_page": "",
@@ -217,6 +217,6 @@
    "type": "DocType"
   }
  ],
- "title": "LMS",
+ "title": "Learning",
  "type": "Workspace"
 }

From fb0517caa0469e920c61b30b59b5a43fbbcf2751 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 23 Feb 2026 14:54:54 +0530
Subject: [PATCH 2/4] fix: show only instructor tab for admins on home page

---
 frontend/src/pages/Home/Home.vue              | 41 ++++++++-----------
 .../course_evaluator/course_evaluator.json    | 14 ++++++-
 .../lms_certificate_request.json              | 14 ++++++-
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/frontend/src/pages/Home/Home.vue b/frontend/src/pages/Home/Home.vue
index 8bbe7e41..ee742be5 100644
--- a/frontend/src/pages/Home/Home.vue
+++ b/frontend/src/pages/Home/Home.vue
@@ -1,9 +1,4 @@
 <template>
-	<!-- <header
-		class="sticky flex items-center justify-between top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5"
-	>
-		<Breadcrumbs :items="[{ label: __('Home'), route: { name: 'Home' } }]" />
-	</header> -->
 	<div class="w-full px-5 pt-5 pb-10">
 		<div class="space-y-2">
 			<div class="flex items-center justify-between">
@@ -11,9 +6,8 @@
 					{{ __('Hey') }}, {{ user.data?.full_name }} 👋
 				</div>
 				<div>
-					<TabButtons v-if="isAdmin" v-model="currentTab" :buttons="tabs" />
 					<div
-						v-else
+						v-if="!isAdmin"
 						@click="showStreakModal = true"
 						class="bg-surface-amber-2 px-2 py-1 rounded-md cursor-pointer"
 					>
@@ -35,19 +29,16 @@
 			:liveClasses="adminLiveClasses"
 			:evals="adminEvals"
 		/>
-		<StudentHome v-else :myLiveClasses="myLiveClasses" />
+		<StudentHome
+			v-else-if="currentTab === 'student'"
+			:myLiveClasses="myLiveClasses"
+		/>
 	</div>
 	<Streak v-model="showStreakModal" :streakInfo="streakInfo" />
 </template>
 <script setup lang="ts">
 import { computed, inject, onMounted, ref } from 'vue'
-import {
-	Breadcrumbs,
-	call,
-	createResource,
-	TabButtons,
-	usePageMeta,
-} from 'frappe-ui'
+import { call, createResource, usePageMeta } from 'frappe-ui'
 import { sessionStore } from '@/stores/session'
 import StudentHome from '@/pages/Home/StudentHome.vue'
 import AdminHome from '@/pages/Home/AdminHome.vue'
@@ -56,10 +47,10 @@ import Streak from '@/pages/Home/Streak.vue'
 const user = inject<any>('$user')
 const { brand } = sessionStore()
 const evalCount = ref(0)
-const currentTab = ref<'student' | 'instructor'>('instructor')
+const currentTab = ref<'student' | 'instructor'>('student')
 const showStreakModal = ref(false)
 
-onMounted(() => {
+const fetchEvalCount = () => {
 	call('frappe.client.get_count', {
 		doctype: 'LMS Certificate Request',
 		filters: {
@@ -70,7 +61,7 @@ onMounted(() => {
 	}).then((data: any) => {
 		evalCount.value = data
 	})
-})
+}
 
 const isAdmin = computed(() => {
 	return (
@@ -80,6 +71,15 @@ const isAdmin = computed(() => {
 	)
 })
 
+onMounted(() => {
+	if (isAdmin.value) {
+		currentTab.value = 'instructor'
+	} else {
+		currentTab.value = 'student'
+		fetchEvalCount()
+	}
+})
+
 const myLiveClasses = createResource({
 	url: 'lms.lms.api.get_my_live_classes',
 	auto: !isAdmin.value ? true : false,
@@ -151,11 +151,6 @@ const subtitle = computed(() => {
 	}
 })
 
-const tabs = [
-	{ label: __('Student'), value: 'student' },
-	{ label: __('Instructor'), value: 'instructor' },
-]
-
 usePageMeta(() => {
 	return {
 		title: __('Home'),
diff --git a/lms/lms/doctype/course_evaluator/course_evaluator.json b/lms/lms/doctype/course_evaluator/course_evaluator.json
index 5ffae917..41bd9f8c 100644
--- a/lms/lms/doctype/course_evaluator/course_evaluator.json
+++ b/lms/lms/doctype/course_evaluator/course_evaluator.json
@@ -83,7 +83,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-11-10 11:41:51.802016",
+ "modified": "2026-02-23 14:50:11.733278",
  "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "Course Evaluator",
@@ -125,6 +125,18 @@
    "role": "Batch Evaluator",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Course Creator",
+   "share": 1,
+   "write": 1
   }
  ],
  "row_format": "Dynamic",
diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.json b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
index bf81aa55..a95fdff0 100644
--- a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
+++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
@@ -157,7 +157,7 @@
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2026-02-19 16:01:43.810407",
+ "modified": "2026-02-23 14:45:44.994705",
  "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Certificate Request",
@@ -210,6 +210,18 @@
    "role": "Batch Evaluator",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Course Creator",
+   "share": 1,
+   "write": 1
   }
  ],
  "row_format": "Dynamic",

From 2634a4e3165a36a914f9113c9e4ab3b5b09b3344 Mon Sep 17 00:00:00 2001
From: raizasafeel <89463672+raizasafeel@users.noreply.github.com>
Date: Mon, 23 Feb 2026 15:12:08 +0530
Subject: [PATCH 3/4] fix(lesson): render codesandbox properly

---
 frontend/src/utils/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index f560d061..0a7a5826 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -236,10 +236,10 @@ export function getEditorTools() {
 						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_-]+)(?:\?[^\/]*)?$/,
+						regex: /^https:\/\/codesandbox\.io\/(?:(?:p\/(?:sandbox|devbox)\/)|(?:embed\/)|(?:s\/))?([A-Za-z0-9_-]+)(?:[\/\?].*)?$/,
 						embedUrl:
 							'https://codesandbox.io/embed/<%= remote_id %>?view=editor+%2B+preview&module=%2Findex.html',
-						html: "<iframe style='width: 100%; height: 500px; border: 0; border-radius: 4px; overflow: hidden;' sandbox='allow-mods allow-forms allow-popups allow-scripts allow-same-origin' frameborder='0' allowfullscreen='true'></iframe>",
+						html: "<iframe style='width: 100%; height: 500px; border: 0; border-radius: 4px; overflow: hidden;' sandbox='allow-modals allow-forms allow-popups allow-scripts allow-same-origin' frameborder='0' allowfullscreen='true'></iframe>",
 					},
 				},
 			},

From b3c8fbd833d150c6356c4ea6a232e77ca14450c3 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 23 Feb 2026 16:31:58 +0530
Subject: [PATCH 4/4] chore: capture more events for analytics

---
 frontend/src/components/DiscussionReplies.vue | 139 ++++++++----------
 .../src/components/Modals/DiscussionModal.vue | 112 ++++++--------
 frontend/src/components/Settings/Members.vue  |   3 +
 .../Batches/components/NewBatchModal.vue      |  10 +-
 frontend/src/pages/Courses/NewCourseModal.vue |  10 +-
 .../doctype/course_lesson/course_lesson.py    |   7 +-
 .../lms_certificate/lms_certificate.py        |   2 +-
 .../lms_course_review/lms_course_review.json  |   3 +-
 8 files changed, 125 insertions(+), 161 deletions(-)

diff --git a/frontend/src/components/DiscussionReplies.vue b/frontend/src/components/DiscussionReplies.vue
index aad4d902..6911a107 100644
--- a/frontend/src/components/DiscussionReplies.vue
+++ b/frontend/src/components/DiscussionReplies.vue
@@ -93,11 +93,19 @@
 	</div>
 </template>
 <script setup>
-import { createResource, TextEditor, Button, Dropdown, toast } from 'frappe-ui'
+import {
+	call,
+	createResource,
+	TextEditor,
+	Button,
+	Dropdown,
+	toast,
+} from 'frappe-ui'
 import { timeAgo } from '@/utils'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { ChevronLeft, MoreHorizontal } from 'lucide-vue-next'
 import { ref, inject, onMounted, onUnmounted } from 'vue'
+import { useTelemetry } from 'frappe-ui/frappe'
 
 const showTopics = defineModel('showTopics')
 const newReply = ref('')
@@ -107,6 +115,7 @@ const allUsers = inject('$allUsers')
 const mentionUsers = ref([])
 const renderEditor = ref(false)
 const readOnlyMode = window.read_only_mode
+const { capture } = useTelemetry()
 
 const props = defineProps({
 	topic: {
@@ -143,19 +152,6 @@ const replies = createResource({
 	auto: true,
 })
 
-const newReplyResource = createResource({
-	url: 'frappe.client.insert',
-	makeParams(values) {
-		return {
-			doc: {
-				doctype: 'Discussion Reply',
-				reply: newReply.value,
-				topic: props.topic.name,
-			},
-		}
-	},
-})
-
 const fetchMentionUsers = () => {
 	if (user.data?.is_student) {
 		renderEditor.value = true
@@ -178,78 +174,61 @@ const fetchMentionUsers = () => {
 }
 
 const postReply = () => {
-	newReplyResource.submit(
-		{},
-		{
-			validate() {
-				if (!newReply.value) {
-					return 'Reply cannot be empty'
-				}
-			},
-			onSuccess() {
-				newReply.value = ''
-				replies.reload()
-			},
-			onError(err) {
-				toast.error(err.messages?.[0] || err)
-			},
-		}
-	)
-}
-
-const editReplyResource = createResource({
-	url: 'frappe.client.set_value',
-	makeParams(values) {
-		return {
+	if (!newReply.value) {
+		toast.error(__('Reply cannot be empty.'))
+		return
+	}
+	call('frappe.client.insert', {
+		doc: {
 			doctype: 'Discussion Reply',
-			name: values.name,
-			fieldname: 'reply',
-			value: values.reply,
-		}
-	},
-})
+			reply: newReply.value,
+			topic: props.topic.name,
+		},
+	})
+		.then((data) => {
+			newReply.value = ''
+			replies.reload()
+			capture('discussion_reply_created')
+		})
+		.catch((err) => {
+			toast.error(err.messages?.[0] || err)
+			console.error(err)
+		})
+}
 
 const postEdited = (reply) => {
-	editReplyResource.submit(
-		{
-			name: reply.name,
-			reply: reply.reply,
-		},
-		{
-			validate() {
-				if (!reply.reply) {
-					return 'Reply cannot be empty'
-				}
-			},
-			onSuccess() {
-				reply.editable = false
-				replies.reload()
-			},
-		}
-	)
+	if (!reply.reply) {
+		toast.error(__('Reply cannot be empty.'))
+		return
+	}
+	call('frappe.client.set_value', {
+		doctype: 'Discussion Reply',
+		name: reply.name,
+		fieldname: 'reply',
+		value: reply.reply,
+	})
+		.then(() => {
+			reply.editable = false
+			replies.reload()
+		})
+		.catch((err) => {
+			toast.error(err.messages?.[0] || err)
+			console.error(err)
+		})
 }
 
-const deleteReplyResource = createResource({
-	url: 'frappe.client.delete',
-	makeParams(values) {
-		return {
-			doctype: 'Discussion Reply',
-			name: values.name,
-		}
-	},
-})
-
 const deleteReply = (reply) => {
-	deleteReplyResource.submit(
-		{
-			name: reply.name,
-		},
-		{
-			onSuccess() {
-				replies.reload()
-			},
-		}
-	)
+	call('frappe.client.delete', {
+		doctype: 'Discussion Reply',
+		name: reply.name,
+	})
+		.then(() => {
+			replies.reload()
+		})
+		.catch((err) => {
+			toast.error(err.messages?.[0] || err)
+			console.error(err)
+		})
 }
 
 onUnmounted(() => {
diff --git a/frontend/src/components/Modals/DiscussionModal.vue b/frontend/src/components/Modals/DiscussionModal.vue
index e5ad5210..d42e75da 100644
--- a/frontend/src/components/Modals/DiscussionModal.vue
+++ b/frontend/src/components/Modals/DiscussionModal.vue
@@ -34,17 +34,13 @@
 	</Dialog>
 </template>
 <script setup>
-import {
-	Dialog,
-	FormControl,
-	TextEditor,
-	createResource,
-	toast,
-} from 'frappe-ui'
+import { call, Dialog, FormControl, TextEditor, toast } from 'frappe-ui'
 import { reactive } from 'vue'
 import { singularize } from '@/utils'
+import { useTelemetry } from 'frappe-ui/frappe'
 
 const topics = defineModel('reloadTopics')
+const { capture } = useTelemetry()
 
 const props = defineProps({
 	title: {
@@ -66,64 +62,50 @@ const topic = reactive({
 	reply: '',
 })
 
-const topicResource = createResource({
-	url: 'frappe.client.insert',
-	makeParams(values) {
-		return {
-			doc: {
-				doctype: 'Discussion Topic',
-				reference_doctype: props.doctype,
-				reference_docname: props.docname,
-				title: topic.title,
-			},
-		}
-	},
-})
-
-const replyResource = createResource({
-	url: 'frappe.client.insert',
-	makeParams(values) {
-		return {
-			doc: {
-				doctype: 'Discussion Reply',
-				topic: values.topic,
-				reply: topic.reply,
-			},
-		}
-	},
-})
-
 const submitTopic = (close) => {
-	topicResource.submit(
-		{},
-		{
-			validate() {
-				if (!topic.title) {
-					return 'Title cannot be empty.'
-				}
-				if (!topic.reply) {
-					return 'Reply cannot be empty.'
-				}
-			},
-			onSuccess(data) {
-				replyResource.submit(
-					{
-						topic: data.name,
-					},
-					{
-						onSuccess() {
-							topic.title = ''
-							topic.reply = ''
-							topics.value.reload()
-							close()
-						},
-					}
-				)
-			},
-			onError(err) {
-				toast.error(err.messages?.[0] || err)
-			},
-		}
-	)
+	if (!topic.title) {
+		toast.error(__('Title cannot be empty.'))
+		return
+	}
+	if (!topic.reply) {
+		toast.error(__('Details cannot be empty.'))
+		return
+	}
+	call('frappe.client.insert', {
+		doc: {
+			doctype: 'Discussion Topic',
+			reference_doctype: props.doctype,
+			reference_docname: props.docname,
+			title: topic.title,
+		},
+	})
+		.then((data) => {
+			createReply(data.name, close)
+		})
+		.catch((err) => {
+			toast.error(err.messages?.[0] || err)
+			console.error(err)
+		})
+}
+
+const createReply = (topicName, close) => {
+	call('frappe.client.insert', {
+		doc: {
+			doctype: 'Discussion Reply',
+			topic: topicName,
+			reply: topic.reply,
+		},
+	})
+		.then((data) => {
+			topic.title = ''
+			topic.reply = ''
+			topics.value.reload()
+			capture('discussion_topic_created')
+			close()
+		})
+		.catch((err) => {
+			toast.error(err.messages?.[0] || err)
+			console.error(err)
+		})
 }
 </script>
diff --git a/frontend/src/components/Settings/Members.vue b/frontend/src/components/Settings/Members.vue
index c9b9db45..c7abd1d4 100644
--- a/frontend/src/components/Settings/Members.vue
+++ b/frontend/src/components/Settings/Members.vue
@@ -131,6 +131,7 @@ import { ref, watch, reactive, inject } from 'vue'
 import { RefreshCw, Plus, Search, Shield } from 'lucide-vue-next'
 import { useOnboarding } from 'frappe-ui/frappe'
 import type { User } from '@/components/Settings/types'
+import { useTelemetry } from 'frappe-ui/frappe'
 
 type Member = {
 	username: string
@@ -149,6 +150,7 @@ const hasNextPage = ref(false)
 const showForm = ref(false)
 const user = inject<User | null>('$user')
 const { updateOnboardingStep } = useOnboarding('learning')
+const { capture } = useTelemetry()
 
 const member = reactive({
 	email: '',
@@ -202,6 +204,7 @@ const addMember = (close: () => void) => {
 	})
 		.then((data: Member) => {
 			if (user?.data?.is_system_manager) updateOnboardingStep('invite_students')
+			capture('user_added')
 			show.value = false
 			router.push({
 				name: 'ProfileRoles',
diff --git a/frontend/src/pages/Batches/components/NewBatchModal.vue b/frontend/src/pages/Batches/components/NewBatchModal.vue
index b88d938a..5bd6e443 100644
--- a/frontend/src/pages/Batches/components/NewBatchModal.vue
+++ b/frontend/src/pages/Batches/components/NewBatchModal.vue
@@ -111,7 +111,7 @@
 <script setup lang="ts">
 import { Button, Dialog, FormControl, TextEditor, toast } from 'frappe-ui'
 import { Link, useOnboarding, useTelemetry } from 'frappe-ui/frappe'
-import { ref, inject, onMounted, onBeforeUnmount, watch } from 'vue'
+import { ref, inject, onMounted, onBeforeUnmount } from 'vue'
 import { useRouter } from 'vue-router'
 import { cleanError, openSettings } from '@/utils'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
@@ -187,13 +187,13 @@ const keyboardShortcut = (e: KeyboardEvent) => {
 
 onMounted(() => {
 	window.addEventListener('keydown', keyboardShortcut)
+	capture('batch_form_opened')
 })
 
 onBeforeUnmount(() => {
 	window.removeEventListener('keydown', keyboardShortcut)
-})
-
-watch(show, () => {
-	if (show.value) capture('batch_form_opened')
+	capture('batch_form_closed', {
+		data: batch.value,
+	})
 })
 </script>
diff --git a/frontend/src/pages/Courses/NewCourseModal.vue b/frontend/src/pages/Courses/NewCourseModal.vue
index 02e98c1a..829669dd 100644
--- a/frontend/src/pages/Courses/NewCourseModal.vue
+++ b/frontend/src/pages/Courses/NewCourseModal.vue
@@ -76,7 +76,7 @@
 <script setup lang="ts">
 import { Button, Dialog, FormControl, TextEditor, toast } from 'frappe-ui'
 import { Link, useOnboarding, useTelemetry } from 'frappe-ui/frappe'
-import { inject, onMounted, onBeforeUnmount, ref, watch } from 'vue'
+import { inject, onMounted, onBeforeUnmount, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { cleanError, openSettings } from '@/utils'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
@@ -148,13 +148,13 @@ const keyboardShortcut = (e: KeyboardEvent) => {
 
 onMounted(() => {
 	window.addEventListener('keydown', keyboardShortcut)
+	capture('course_form_opened')
 })
 
 onBeforeUnmount(() => {
 	window.removeEventListener('keydown', keyboardShortcut)
-})
-
-watch(show, () => {
-	if (show.value) capture('course_form_opened')
+	capture('course_form_closed', {
+		data: course.value,
+	})
 })
 </script>
diff --git a/lms/lms/doctype/course_lesson/course_lesson.py b/lms/lms/doctype/course_lesson/course_lesson.py
index e891b9b0..7add79ab 100644
--- a/lms/lms/doctype/course_lesson/course_lesson.py
+++ b/lms/lms/doctype/course_lesson/course_lesson.py
@@ -103,7 +103,7 @@ def save_progress(lesson: str, course: str, scorm_details: dict = None):
 		)
 
 	progress = get_course_progress(course)
-	capture_progress_for_analytics(progress, course)
+	capture_progress_for_analytics()
 
 	# Had to get doc, as on_change doesn't trigger when you use set_value. The trigger is necessary for badge to get assigned.
 	enrollment = frappe.get_doc("LMS Enrollment", membership)
@@ -121,9 +121,8 @@ def save_progress(lesson: str, course: str, scorm_details: dict = None):
 	return progress
 
 
-def capture_progress_for_analytics(progress, course):
-	if progress in [25, 50, 75, 100]:
-		capture("course_progress", "lms", properties={"course": course, "progress": progress})
+def capture_progress_for_analytics():
+	capture("course_progress", "lms")
 
 
 def get_quiz_progress(lesson):
diff --git a/lms/lms/doctype/lms_certificate/lms_certificate.py b/lms/lms/doctype/lms_certificate/lms_certificate.py
index 19579a07..bf5cfa76 100644
--- a/lms/lms/doctype/lms_certificate/lms_certificate.py
+++ b/lms/lms/doctype/lms_certificate/lms_certificate.py
@@ -19,8 +19,8 @@ class LMSCertificate(Document):
 		self.name = make_autoname("hash", self.doctype)
 
 	def after_insert(self):
-		self.send_certification_email()
 		capture("certificate_issued", "lms")
+		self.send_certification_email()
 
 	def send_certification_email(self):
 		outgoing_email_account = frappe.get_cached_value(
diff --git a/lms/lms/doctype/lms_course_review/lms_course_review.json b/lms/lms/doctype/lms_course_review/lms_course_review.json
index 64f0ac27..a7d7fdbe 100644
--- a/lms/lms/doctype/lms_course_review/lms_course_review.json
+++ b/lms/lms/doctype/lms_course_review/lms_course_review.json
@@ -41,7 +41,7 @@
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2026-02-20 17:40:39.823017",
+ "modified": "2026-02-23 16:21:18.503806",
  "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Course Review",
@@ -65,6 +65,7 @@
    "export": 1,
    "if_owner": 1,
    "print": 1,
+   "read": 1,
    "report": 1,
    "role": "LMS Student",
    "share": 1,