From 0c1f1fada4b9751c27b474002d96be5615e1a88a Mon Sep 17 00:00:00 2001
From: Rehan Ansari <rehanrehman389@gmail.com>
Date: Sat, 25 Oct 2025 10:09:31 +0530
Subject: [PATCH 1/4] fix: incorrect error msg

---
 lms/lms/doctype/lms_program/lms_program.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/lms/doctype/lms_program/lms_program.py b/lms/lms/doctype/lms_program/lms_program.py
index 95bd312b..9bcefd22 100644
--- a/lms/lms/doctype/lms_program/lms_program.py
+++ b/lms/lms/doctype/lms_program/lms_program.py
@@ -17,7 +17,7 @@ class LMSProgram(Document):
 		duplicates = {course for course in courses if courses.count(course) > 1}
 		if len(duplicates):
 			frappe.throw(
-				_("Course {0} has already been added to this batch.").format(
+				_("Course {0} has already been added to this program.").format(
 					frappe.bold(next(iter(duplicates)))
 				)
 			)
@@ -27,7 +27,7 @@ class LMSProgram(Document):
 		duplicates = {member for member in members if members.count(member) > 1}
 		if len(duplicates):
 			frappe.throw(
-				_("Member {0} has already been added to this batch.").format(
+				_("Member {0} has already been added to this program.").format(
 					frappe.bold(next(iter(duplicates)))
 				)
 			)

From 741cc4ccc75c8c063165dfb27790d7e5163738ff Mon Sep 17 00:00:00 2001
From: Rehan Ansari <rehanrehman389@gmail.com>
Date: Sat, 25 Oct 2025 13:03:53 +0530
Subject: [PATCH 2/4] fix: allow adding courses/members to new programs

---
 frontend/src/pages/Programs/ProgramForm.vue | 148 ++++++++++++++++----
 1 file changed, 122 insertions(+), 26 deletions(-)

diff --git a/frontend/src/pages/Programs/ProgramForm.vue b/frontend/src/pages/Programs/ProgramForm.vue
index 99691ddf..3993af11 100644
--- a/frontend/src/pages/Programs/ProgramForm.vue
+++ b/frontend/src/pages/Programs/ProgramForm.vue
@@ -58,15 +58,22 @@
 						</Button>
 					</div>
 					<ListView
-						v-if="programCourses.data.length > 0"
+						v-if="
+							(programName === 'new' && program.program_courses.length > 0) ||
+							(programName !== 'new' && programCourses.data.length > 0)
+						"
 						:columns="courseColumns"
-						:rows="programCourses.data"
+						:rows="
+							programName === 'new'
+								? program.program_courses
+								: programCourses.data
+						"
 						:options="{
 							selectable: true,
 							resizeColumn: true,
 							showTooltip: false,
 						}"
-						rowKey="name"
+						:rowKey="programName === 'new' ? 'course' : 'name'"
 					>
 						<ListHeader
 							class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
@@ -75,8 +82,12 @@
 						</ListHeader>
 						<ListRows>
 							<Draggable
-								:list="programCourses.data"
-								item-key="name"
+								:list="
+									programName === 'new'
+										? program.program_courses
+										: programCourses.data
+								"
+								:item-key="programName === 'new' ? 'course' : 'name'"
 								group="items"
 								@end="updateOrder"
 								class="cursor-move"
@@ -91,7 +102,11 @@
 								<div class="flex gap-2">
 									<Button
 										variant="ghost"
-										@click="remove(selections, unselectAll, 'courses')"
+										@click="
+											programName === 'new'
+												? removeNewProgramCourses(selections, unselectAll)
+												: remove(selections, unselectAll, 'courses')
+										"
 									>
 										<Trash2 class="h-4 w-4 stroke-1.5" />
 									</Button>
@@ -133,14 +148,21 @@
 						</div>
 					</div>
 					<ListView
-						v-if="programMembers.data.length > 0"
+						v-if="
+							(programName === 'new' && program.program_members.length > 0) ||
+							(programName !== 'new' && programMembers.data.length > 0)
+						"
 						:columns="memberColumns"
-						:rows="programMembers.data"
+						:rows="
+							programName === 'new'
+								? program.program_members
+								: programMembers.data
+						"
 						:options="{
 							selectable: true,
 							resizeColumn: true,
 						}"
-						rowKey="name"
+						:rowKey="programName === 'new' ? 'member' : 'name'"
 					>
 						<ListHeader
 							class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
@@ -148,14 +170,23 @@
 							<ListHeaderItem :item="item" v-for="item in memberColumns" />
 						</ListHeader>
 						<ListRows>
-							<ListRow :row="row" v-for="row in programMembers.data" />
+							<ListRow
+								:row="row"
+								v-for="row in programName === 'new'
+									? program.program_members
+									: programMembers.data"
+							/>
 						</ListRows>
 						<ListSelectBanner>
 							<template #actions="{ unselectAll, selections }">
 								<div class="flex gap-2">
 									<Button
 										variant="ghost"
-										@click="remove(selections, unselectAll, 'members')"
+										@click="
+											programName === 'new'
+												? removeNewProgramMembers(selections, unselectAll)
+												: remove(selections, unselectAll, 'members')
+										"
 									>
 										<Trash2 class="h-4 w-4 stroke-1.5" />
 									</Button>
@@ -422,6 +453,23 @@ const addCourse = (close: () => void) => {
 		return
 	}
 
+	if (props.programName === 'new') {
+		const existingCourse = program.value.program_courses.find(
+			(c) => c.course === course.value
+		)
+		if (!existingCourse) {
+			program.value.program_courses.push({
+				course: course.value,
+				idx: program.value.program_courses.length + 1,
+			})
+			close()
+			toast.success(__('Course added to program successfully'))
+		} else {
+			toast.warning(__('Course already added to program'))
+		}
+		return
+	}
+
 	programCourses.insert.submit(
 		{
 			parent: props.programName,
@@ -449,6 +497,22 @@ const addMember = (close: () => void) => {
 		return
 	}
 
+	if (props.programName === 'new') {
+		const existingMember = program.value.program_members.find(
+			(m) => m.member === member.value
+		)
+		if (!existingMember) {
+			program.value.program_members.push({
+				member: member.value,
+			})
+			close()
+			toast.success(__('Member added to program successfully'))
+		} else {
+			toast.warning(__('Member already added to program'))
+		}
+		return
+	}
+
 	programMembers.insert.submit(
 		{
 			parent: props.programName,
@@ -504,22 +568,32 @@ const updateCounts = async (
 const updateOrder = async (e: DragEvent) => {
 	let sourceIdx = e.from.dataset.idx
 	let targetIdx = e.to.dataset.idx
-	let courses = programCourses.data
-	courses.splice(targetIdx, 0, courses.splice(sourceIdx, 1)[0])
 
-	for (const [index, course] of courses.entries()) {
-		programCourses.setValue.submit(
-			{
-				name: course.name,
-				idx: index + 1,
-			},
-			{
-				onError(err: any) {
-					toast.warning(__(err.messages?.[0] || err))
+	if (props.programName === 'new') {
+		let courses = program.value.program_courses
+		courses.splice(targetIdx, 0, courses.splice(sourceIdx, 1)[0])
+		courses.forEach((course, index) => {
+			course.idx = index + 1
+		})
+		dirty.value = true
+	} else {
+		let courses = programCourses.data
+		courses.splice(targetIdx, 0, courses.splice(sourceIdx, 1)[0])
+
+		for (const [index, course] of courses.entries()) {
+			programCourses.setValue.submit(
+				{
+					name: course.name,
+					idx: index + 1,
 				},
-			}
-		)
-		await wait(100)
+				{
+					onError(err: any) {
+						toast.warning(__(err.messages?.[0] || err))
+					},
+				}
+			)
+			await wait(100)
+		}
 	}
 }
 
@@ -545,6 +619,28 @@ const remove = async (
 	unselectAll()
 }
 
+const removeNewProgramCourses = (
+	selections: string[],
+	unselectAll: () => void
+) => {
+	const selectionsArray = Array.from(selections)
+	program.value.program_courses = program.value.program_courses.filter(
+		(c) => !selectionsArray.includes(c.course)
+	)
+	unselectAll()
+}
+
+const removeNewProgramMembers = (
+	selections: string[],
+	unselectAll: () => void
+) => {
+	const selectionsArray = Array.from(selections)
+	program.value.program_members = program.value.program_members.filter(
+		(m) => !selectionsArray.includes(m.member)
+	)
+	unselectAll()
+}
+
 const deleteProgram = (close: () => void) => {
 	if (props.programName == 'new') return
 	programs.value?.delete.submit(props.programName, {
@@ -562,7 +658,7 @@ const courseColumns = computed(() => {
 	return [
 		{
 			label: 'Title',
-			key: 'course_title',
+			key: props.programName === 'new' ? 'course' : 'course_title',
 			width: 1,
 		},
 	]

From ca2cc7bbda7a9cfdd65bf8567109a7f7f2edb23d Mon Sep 17 00:00:00 2001
From: Rehan Ansari <rehanrehman389@gmail.com>
Date: Sat, 25 Oct 2025 14:09:31 +0530
Subject: [PATCH 3/4] fix: improve delete button UX and add confirmation dialog

---
 frontend/src/pages/Programs/ProgramForm.vue | 41 +++++++++++++++------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/frontend/src/pages/Programs/ProgramForm.vue b/frontend/src/pages/Programs/ProgramForm.vue
index 3993af11..e07efd02 100644
--- a/frontend/src/pages/Programs/ProgramForm.vue
+++ b/frontend/src/pages/Programs/ProgramForm.vue
@@ -248,13 +248,12 @@
 			/>
 		</template>
 		<template #actions="{ close }">
-			<div class="flex justify-end space-x-2 group">
+			<div class="flex justify-end space-x-2">
 				<Button
 					v-if="programName != 'new'"
 					@click="deleteProgram(close)"
 					variant="outline"
 					theme="red"
-					class="invisible group-hover:visible"
 				>
 					<template #prefix>
 						<Trash2 class="size-4 stroke-1.5" />
@@ -283,7 +282,7 @@ import {
 	ListRow,
 	toast,
 } from 'frappe-ui'
-import { computed, ref, watch } from 'vue'
+import { computed, ref, watch, getCurrentInstance } from 'vue'
 import { Plus, Trash2, TrendingUp } from 'lucide-vue-next'
 import { Programs, Program } from '@/types/programs'
 import { openSettings } from '@/utils'
@@ -300,6 +299,9 @@ const member = ref<string>('')
 const showProgressDialog = ref(false)
 const dirty = ref(false)
 
+const app = getCurrentInstance()
+const { $dialog } = app.appContext.config.globalProperties
+
 const props = withDefaults(
 	defineProps<{
 		programName: string | null
@@ -643,14 +645,31 @@ const removeNewProgramMembers = (
 
 const deleteProgram = (close: () => void) => {
 	if (props.programName == 'new') return
-	programs.value?.delete.submit(props.programName, {
-		onSuccess() {
-			toast.success(__('Program deleted successfully'))
-			close()
-		},
-		onError(err: any) {
-			toast.warning(__(err.messages?.[0] || err))
-		},
+	$dialog({
+		title: __('Delete Program'),
+		message: __(
+			'Are you sure you want to delete this program? This action cannot be undone.'
+		),
+		actions: [
+			{
+				label: __('Delete'),
+				theme: 'red',
+				variant: 'solid',
+				onClick(closeDialog) {
+					programs.value?.delete.submit(props.programName, {
+						onSuccess() {
+							toast.success(__('Program deleted successfully'))
+							close()
+							closeDialog()
+						},
+						onError(err: any) {
+							toast.warning(__(err.messages?.[0] || err))
+							closeDialog()
+						},
+					})
+				},
+			},
+		],
 	})
 }
 

From 68e7684da3512c3e007b160071518a9b1294446d Mon Sep 17 00:00:00 2001
From: Rehan Ansari <rehanrehman389@gmail.com>
Date: Sat, 25 Oct 2025 14:42:22 +0530
Subject: [PATCH 4/4] fix: avoid backend updates without save action

---
 frontend/src/pages/Programs/ProgramForm.vue | 189 +++++---------------
 1 file changed, 48 insertions(+), 141 deletions(-)

diff --git a/frontend/src/pages/Programs/ProgramForm.vue b/frontend/src/pages/Programs/ProgramForm.vue
index e07efd02..4d0a7bab 100644
--- a/frontend/src/pages/Programs/ProgramForm.vue
+++ b/frontend/src/pages/Programs/ProgramForm.vue
@@ -58,16 +58,9 @@
 						</Button>
 					</div>
 					<ListView
-						v-if="
-							(programName === 'new' && program.program_courses.length > 0) ||
-							(programName !== 'new' && programCourses.data.length > 0)
-						"
+						v-if="program.program_courses.length > 0"
 						:columns="courseColumns"
-						:rows="
-							programName === 'new'
-								? program.program_courses
-								: programCourses.data
-						"
+						:rows="program.program_courses"
 						:options="{
 							selectable: true,
 							resizeColumn: true,
@@ -82,11 +75,7 @@
 						</ListHeader>
 						<ListRows>
 							<Draggable
-								:list="
-									programName === 'new'
-										? program.program_courses
-										: programCourses.data
-								"
+								:list="program.program_courses"
 								:item-key="programName === 'new' ? 'course' : 'name'"
 								group="items"
 								@end="updateOrder"
@@ -102,11 +91,7 @@
 								<div class="flex gap-2">
 									<Button
 										variant="ghost"
-										@click="
-											programName === 'new'
-												? removeNewProgramCourses(selections, unselectAll)
-												: remove(selections, unselectAll, 'courses')
-										"
+										@click="remove(selections, unselectAll, 'courses')"
 									>
 										<Trash2 class="h-4 w-4 stroke-1.5" />
 									</Button>
@@ -148,16 +133,9 @@
 						</div>
 					</div>
 					<ListView
-						v-if="
-							(programName === 'new' && program.program_members.length > 0) ||
-							(programName !== 'new' && programMembers.data.length > 0)
-						"
+						v-if="program.program_members.length > 0"
 						:columns="memberColumns"
-						:rows="
-							programName === 'new'
-								? program.program_members
-								: programMembers.data
-						"
+						:rows="program.program_members"
 						:options="{
 							selectable: true,
 							resizeColumn: true,
@@ -170,23 +148,14 @@
 							<ListHeaderItem :item="item" v-for="item in memberColumns" />
 						</ListHeader>
 						<ListRows>
-							<ListRow
-								:row="row"
-								v-for="row in programName === 'new'
-									? program.program_members
-									: programMembers.data"
-							/>
+							<ListRow :row="row" v-for="row in program.program_members" />
 						</ListRows>
 						<ListSelectBanner>
 							<template #actions="{ unselectAll, selections }">
 								<div class="flex gap-2">
 									<Button
 										variant="ghost"
-										@click="
-											programName === 'new'
-												? removeNewProgramMembers(selections, unselectAll)
-												: remove(selections, unselectAll, 'members')
-										"
+										@click="remove(selections, unselectAll, 'members')"
 									>
 										<Trash2 class="h-4 w-4 stroke-1.5" />
 									</Button>
@@ -455,42 +424,22 @@ const addCourse = (close: () => void) => {
 		return
 	}
 
-	if (props.programName === 'new') {
-		const existingCourse = program.value.program_courses.find(
-			(c) => c.course === course.value
-		)
-		if (!existingCourse) {
-			program.value.program_courses.push({
-				course: course.value,
-				idx: program.value.program_courses.length + 1,
-			})
-			close()
-			toast.success(__('Course added to program successfully'))
-		} else {
-			toast.warning(__('Course already added to program'))
-		}
-		return
-	}
-
-	programCourses.insert.submit(
-		{
-			parent: props.programName,
-			parenttype: 'LMS Program',
-			parentfield: 'program_courses',
-			course: course.value,
-			idx: programCourses.data.length + 1,
-		},
-		{
-			onSuccess() {
-				updateCounts('course', 'add')
-				close()
-				toast.success(__('Course added to program successfully'))
-			},
-			onError(err: any) {
-				toast.warning(__(err.messages?.[0] || err))
-			},
-		}
+	const existingCourse = program.value.program_courses.find(
+		(c) => c.course === course.value
 	)
+	if (!existingCourse) {
+		program.value.program_courses.push({
+			course: course.value,
+			idx: program.value.program_courses.length + 1,
+		})
+		if (props.programName !== 'new') {
+			dirty.value = true
+		}
+		close()
+		toast.success(__('Course added to program successfully'))
+	} else {
+		toast.warning(__('Course already added to program'))
+	}
 }
 
 const addMember = (close: () => void) => {
@@ -499,40 +448,21 @@ const addMember = (close: () => void) => {
 		return
 	}
 
-	if (props.programName === 'new') {
-		const existingMember = program.value.program_members.find(
-			(m) => m.member === member.value
-		)
-		if (!existingMember) {
-			program.value.program_members.push({
-				member: member.value,
-			})
-			close()
-			toast.success(__('Member added to program successfully'))
-		} else {
-			toast.warning(__('Member already added to program'))
-		}
-		return
-	}
-
-	programMembers.insert.submit(
-		{
-			parent: props.programName,
-			parenttype: 'LMS Program',
-			parentfield: 'program_members',
-			member: member.value,
-		},
-		{
-			onSuccess() {
-				updateCounts('member', 'add')
-				close()
-				toast.success(__('Member added to program successfully'))
-			},
-			onError(err: any) {
-				toast.warning(__(err.messages?.[0] || err))
-			},
-		}
+	const existingMember = program.value.program_members.find(
+		(m) => m.member === member.value
 	)
+	if (!existingMember) {
+		program.value.program_members.push({
+			member: member.value,
+		})
+		if (props.programName !== 'new') {
+			dirty.value = true
+		}
+		close()
+		toast.success(__('Member added to program successfully'))
+	} else {
+		toast.warning(__('Member already added to program'))
+	}
 }
 
 const updateCounts = async (
@@ -601,45 +531,22 @@ const updateOrder = async (e: DragEvent) => {
 
 const wait = (ms: number) => new Promise((res) => setTimeout(res, ms))
 
-const remove = async (
+const remove = (
 	selections: string[],
 	unselectAll: () => void,
 	type: string
 ) => {
-	selections = Array.from(selections)
-	for (const selection of selections) {
-		if (type == 'courses') {
-			await programCourses.delete.submit(selection)
-			await updateCounts('course', 'remove')
-		} else {
-			await programMembers.delete.submit(selection)
-			await updateCounts('member', 'remove')
-		}
-		await programs.value.reload()
-		await wait(100)
+	const selectionsArray = Array.from(selections)
+	if (type === 'courses') {
+		program.value.program_courses = program.value.program_courses.filter(
+			(c) => !selectionsArray.includes(c.name || c.course)
+		)
+	} else {
+		program.value.program_members = program.value.program_members.filter(
+			(m) => !selectionsArray.includes(m.name || m.member)
+		)
 	}
-	unselectAll()
-}
-
-const removeNewProgramCourses = (
-	selections: string[],
-	unselectAll: () => void
-) => {
-	const selectionsArray = Array.from(selections)
-	program.value.program_courses = program.value.program_courses.filter(
-		(c) => !selectionsArray.includes(c.course)
-	)
-	unselectAll()
-}
-
-const removeNewProgramMembers = (
-	selections: string[],
-	unselectAll: () => void
-) => {
-	const selectionsArray = Array.from(selections)
-	program.value.program_members = program.value.program_members.filter(
-		(m) => !selectionsArray.includes(m.member)
-	)
+	dirty.value = true
 	unselectAll()
 }