From 23d465d4a1305032eb4ccf237f1e3813984c1f93 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 16 Jan 2025 12:52:17 +0530
Subject: [PATCH] fix: batch enrolled filter logic

---
 frontend/src/pages/Batches.vue |  4 +++-
 lms/lms/utils.py               | 39 ++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/frontend/src/pages/Batches.vue b/frontend/src/pages/Batches.vue
index 85512640..e68e6179 100644
--- a/frontend/src/pages/Batches.vue
+++ b/frontend/src/pages/Batches.vue
@@ -189,6 +189,8 @@ const updateTabFilter = () => {
 	}
 	if (currentTab.value == 'Enrolled' && user.data?.is_student) {
 		filters.value['enrolled'] = 1
+		delete filters.value['start_date']
+		delete filters.value['published']
 		orderBy.value = 'start_date desc'
 	} else if (user.data?.is_student) {
 		delete filters.value['enrolled']
@@ -209,7 +211,7 @@ const updateTabFilter = () => {
 }
 
 const updateStudentFilter = () => {
-	if (!user.data || user.data?.is_student) {
+	if (!user.data || (user.data?.is_student && currentTab.value != 'Enrolled')) {
 		filters.value['start_date'] = ['>=', dayjs().format('YYYY-MM-DD')]
 		filters.value['published'] = 1
 	}
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 86e20c8a..93e7f207 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1861,8 +1861,6 @@ def get_batches(filters=None, start=0, page_length=20, order_by="start_date"):
 		)
 		filters.update({"name": ["in", enrolled_batches]})
 		del filters["enrolled"]
-		del filters["published"]
-		del filters["start_date"]
 
 	batches = frappe.get_all(
 		"LMS Batch",
@@ -1889,6 +1887,12 @@ def get_batches(filters=None, start=0, page_length=20, order_by="start_date"):
 		page_length=page_length,
 	)
 
+	batches = filter_batches_based_on_start_time(batches, filters)
+	batches = get_batch_card_details(batches)
+	return batches
+
+
+def filter_batches_based_on_start_time(batches, filters):
 	batchType = get_batch_type(filters)
 	if batchType == "upcoming":
 		batches_to_remove = list(
@@ -1908,20 +1912,6 @@ def get_batches(filters=None, start=0, page_length=20, order_by="start_date"):
 			)
 		)
 		batches = [batch for batch in batches if batch not in batches_to_remove]
-
-	for batch in batches:
-		batch.instructors = get_instructors(batch.name)
-		students_count = frappe.db.count("Batch Student", {"parent": batch.name})
-
-		if batch.seat_count:
-			batch.seats_left = batch.seat_count - students_count
-
-		if batch.paid_batch and batch.start_date >= getdate():
-			batch.amount, batch.currency = check_multicurrency(
-				batch.amount, batch.currency, None, batch.amount_usd
-			)
-			batch.price = fmt_money(batch.amount, 0, batch.currency)
-
 	return batches
 
 
@@ -1936,3 +1926,20 @@ def get_batch_type(filters):
 			batchType = "archived"
 
 	return batchType
+
+
+def get_batch_card_details(batches):
+	for batch in batches:
+		batch.instructors = get_instructors(batch.name)
+		students_count = frappe.db.count("Batch Student", {"parent": batch.name})
+
+		if batch.seat_count:
+			batch.seats_left = batch.seat_count - students_count
+
+		if batch.paid_batch and batch.start_date >= getdate():
+			batch.amount, batch.currency = check_multicurrency(
+				batch.amount, batch.currency, None, batch.amount_usd
+			)
+			batch.price = fmt_money(batch.amount, 0, batch.currency)
+
+	return batches