From b4cc0c6807b83e06da3a0cf93b21ccf028b1380f Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 7 May 2024 19:03:27 +0530
Subject: [PATCH] fix: certified participants page mobile layout

---
 frontend/src/components/BatchCourses.vue     | 15 ++++++----
 frontend/src/components/BatchStudents.vue    | 13 ++++++---
 frontend/src/pages/Batch.vue                 |  2 +-
 frontend/src/pages/CertifiedParticipants.vue | 30 ++++++++++----------
 frontend/src/pages/ProfileCertificates.vue   |  8 ++----
 lms/lms/api.py                               | 11 +++++++
 lms/lms/utils.py                             |  6 ++--
 lms/www/lms.py                               |  2 +-
 8 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/frontend/src/components/BatchCourses.vue b/frontend/src/components/BatchCourses.vue
index 241c5ae9..7d644eb8 100644
--- a/frontend/src/components/BatchCourses.vue
+++ b/frontend/src/components/BatchCourses.vue
@@ -19,7 +19,7 @@
 			<ListView
 				:columns="getCoursesColumns()"
 				:rows="courses.data"
-				row-key="name"
+				row-key="batch_course"
 				:options="{ showTooltip: false }"
 			>
 				<ListHeader
@@ -49,7 +49,10 @@
 				<ListSelectBanner>
 					<template #actions="{ unselectAll, selections }">
 						<div class="flex gap-2">
-							<Button variant="ghost" @click="removeCourses(selections)">
+							<Button
+								variant="ghost"
+								@click="removeCourses(selections, unselectAll)"
+							>
 								<Trash2 class="h-4 w-4 stroke-1.5" />
 							</Button>
 						</div>
@@ -133,11 +136,13 @@ const removeCourse = createResource({
 	},
 })
 
-const removeCourses = (selections) => {
+const removeCourses = (selections, unselectAll) => {
 	selections.forEach(async (course) => {
 		removeCourse.submit({ course })
-		await setTimeout(1000)
 	})
-	courses.reload()
+	setTimeout(() => {
+		courses.reload()
+		unselectAll()
+	}, 1000)
 }
 </script>
diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue
index ca3271fc..dc73322f 100644
--- a/frontend/src/components/BatchStudents.vue
+++ b/frontend/src/components/BatchStudents.vue
@@ -52,7 +52,10 @@
 			<ListSelectBanner>
 				<template #actions="{ unselectAll, selections }">
 					<div class="flex gap-2">
-						<Button variant="ghost" @click="removeStudents(selections)">
+						<Button
+							variant="ghost"
+							@click="removeStudents(selections, unselectAll)"
+						>
 							<Trash2 class="h-4 w-4 stroke-1.5" />
 						</Button>
 					</div>
@@ -142,11 +145,13 @@ const removeStudent = createResource({
 	},
 })
 
-const removeStudents = (selections) => {
+const removeStudents = (selections, unselectAll) => {
 	selections.forEach(async (student) => {
 		removeStudent.submit({ student })
-		await setTimeout(1000)
 	})
-	students.reload()
+	setTimeout(() => {
+		students.reload()
+		unselectAll()
+	}, 500)
 }
 </script>
diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue
index 32899932..f1f6fab9 100644
--- a/frontend/src/pages/Batch.vue
+++ b/frontend/src/pages/Batch.vue
@@ -13,7 +13,7 @@
 				</template>
 			</Button>
 		</header>
-		<div v-if="batch.data" class="grid grid-cols-[70%,30%] h-full">
+		<div v-if="batch.data" class="grid grid-cols-[70%,30%] h-screen">
 			<div class="border-r-2">
 				<Tabs v-model="tabIndex" :tabs="tabs" tablistClass="overflow-x-visible">
 					<template #tab="{ tab, selected }" class="overflow-x-hidden">
diff --git a/frontend/src/pages/CertifiedParticipants.vue b/frontend/src/pages/CertifiedParticipants.vue
index 8acba3c8..b31ea8a2 100644
--- a/frontend/src/pages/CertifiedParticipants.vue
+++ b/frontend/src/pages/CertifiedParticipants.vue
@@ -3,23 +3,22 @@
 		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" />
+		<div>
+			<FormControl
+				type="text"
+				placeholder="Search Participants"
+				v-model="searchQuery"
+				@input="participants.reload()"
+			>
+				<template #prefix>
+					<Search class="w-4" name="search" />
+				</template>
+			</FormControl>
+		</div>
 	</header>
 
-	<div class="m-5">
-		<FormControl
-			type="text"
-			placeholder="Search Participants"
-			v-model="searchQuery"
-			@input="participants.reload()"
-			size="md"
-		>
-			<template #prefix>
-				<Search class="w-4" name="search" />
-			</template>
-		</FormControl>
-	</div>
-	<div class="grid grid-cols-3 gap-4 m-5">
-		<div v-for="participant in participants.data">
+	<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 m-5">
+		<div v-if="participants.data" v-for="participant in participants.data">
 			<router-link
 				:to="{
 					name: 'Profile',
@@ -62,6 +61,7 @@ const searchQuery = ref('')
 const participants = createResource({
 	url: 'lms.lms.api.get_certified_participants',
 	method: 'GET',
+	cache: ['certified_participants'],
 	makeParams() {
 		return {
 			search_query: searchQuery.value,
diff --git a/frontend/src/pages/ProfileCertificates.vue b/frontend/src/pages/ProfileCertificates.vue
index 5deb5ff7..519d5f53 100644
--- a/frontend/src/pages/ProfileCertificates.vue
+++ b/frontend/src/pages/ProfileCertificates.vue
@@ -34,13 +34,9 @@ const props = defineProps({
 })
 
 const certificates = createResource({
-	url: 'frappe.client.get_list',
+	url: 'lms.lms.api.get_certificates',
 	params: {
-		doctype: 'LMS Certificate',
-		fields: ['name', 'course', 'course_title', 'issue_date', 'template'],
-		filters: {
-			member: props.profile.data.name,
-		},
+		member: props.profile.data.name,
 	},
 	auto: true,
 })
diff --git a/lms/lms/api.py b/lms/lms/api.py
index aeee3988..b5f6b6f0 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -359,3 +359,14 @@ def get_certified_participants(search_query=""):
 		details["courses"] = courses
 		participant_details.append(details)
 	return participant_details
+
+
+@frappe.whitelist()
+def get_certificates(member):
+	"""Get certificates for a member."""
+	return frappe.get_all(
+		"LMS Certificate",
+		filters={"member": member},
+		fields=["name", "course", "course_title", "issue_date", "template"],
+		order_by="creation desc",
+	)
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index be52a40d..86fddfee 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1520,10 +1520,12 @@ def get_question_details(question):
 @frappe.whitelist(allow_guest=True)
 def get_batch_courses(batch):
 	courses = []
-	course_list = frappe.get_all("Batch Course", {"parent": batch}, pluck="course")
+	course_list = frappe.get_all("Batch Course", {"parent": batch}, ["name", "course"])
 
 	for course in course_list:
-		courses.append(get_course_details(course))
+		details = get_course_details(course.course)
+		details.batch_course = course.name
+		courses.append(details)
 
 	return courses
 
diff --git a/lms/www/lms.py b/lms/www/lms.py
index d2e4b205..dff65c13 100644
--- a/lms/www/lms.py
+++ b/lms/www/lms.py
@@ -97,7 +97,7 @@ def get_meta(app_path):
 			as_dict=True,
 		)
 		return {
-			"title": job_opening.title,
+			"title": job_opening.job_title,
 			"image": job_opening.company_logo,
 			"description": job_opening.company_name,
 			"keywords": "Job Openings, Jobs, Vacancies",