From e45b33a8099cf1f742ba3a7c742628bf61ed6d3c Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 8 Jan 2025 11:22:07 +0530
Subject: [PATCH 1/3] feat: batch feedback

---
 frontend/src/components/BatchFeedback.vue     | 47 ++++++++++
 frontend/src/components/BatchStudents.vue     |  2 +-
 .../Modals/BatchStudentProgress.vue           |  4 -
 frontend/src/pages/Batch.vue                  | 14 ++-
 lms/lms/api.py                                |  2 +-
 .../doctype/lms_batch_feedback/__init__.py    |  0
 .../lms_batch_feedback/lms_batch_feedback.js  |  8 ++
 .../lms_batch_feedback.json                   | 90 +++++++++++++++++++
 .../lms_batch_feedback/lms_batch_feedback.py  |  9 ++
 .../test_lms_batch_feedback.py                | 30 +++++++
 10 files changed, 198 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/components/BatchFeedback.vue
 create mode 100644 lms/lms/doctype/lms_batch_feedback/__init__.py
 create mode 100644 lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.js
 create mode 100644 lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 create mode 100644 lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.py
 create mode 100644 lms/lms/doctype/lms_batch_feedback/test_lms_batch_feedback.py

diff --git a/frontend/src/components/BatchFeedback.vue b/frontend/src/components/BatchFeedback.vue
new file mode 100644
index 000000000..94d454476
--- /dev/null
+++ b/frontend/src/components/BatchFeedback.vue
@@ -0,0 +1,47 @@
+<template>
+	<div v-if="feedbackList.data"></div>
+	<div v-else class="space-y-8">
+		<div class="grid grid-cols-4 gap-5">
+			<Rating v-model="feedback.content" :label="__('Content')" />
+			<Rating v-model="feedback.delivery" :label="__('Delivery')" />
+			<Rating v-model="feedback.instructors" :label="__('Instructors')" />
+			<Rating v-model="feedback.value" :label="__('Value')" />
+		</div>
+		<FormControl
+			v-model="feedback.feedback"
+			type="textarea"
+			:label="__('Feedback')"
+			rows="7"
+		/>
+	</div>
+</template>
+<script setup lang="ts">
+import { inject, reactive } from 'vue'
+import { createListResource, FormControl, Rating } from 'frappe-ui'
+
+const user = inject('$user')
+const feedback = reactive({
+	content: 0,
+	delivery: 0,
+	instructors: 0,
+	value: 0,
+	feedback: '',
+})
+
+const props = defineProps({
+	batch: {
+		type: String,
+		required: true,
+	},
+})
+
+const feedbackList = createListResource({
+	doctype: 'LMS Batch Feedback',
+	filters: {
+		batch: props.batch,
+		member: user.data?.name,
+	},
+	cache: ['feedbackList', props.batch, user.data?.name],
+	auto: true,
+})
+</script>
diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue
index 8a6d520a9..11a4cb745 100644
--- a/frontend/src/components/BatchStudents.vue
+++ b/frontend/src/components/BatchStudents.vue
@@ -391,7 +391,7 @@ const getChartOptions = (categories) => {
 				},
 				rotate: 0,
 				formatter: function (value) {
-					return value.length > 20 ? `${value.substring(0, 20)}...` : value // Trim long labels
+					return value.length > 20 ? `${value.substring(0, 20)}...` : value
 				},
 			},
 		},
diff --git a/frontend/src/components/Modals/BatchStudentProgress.vue b/frontend/src/components/Modals/BatchStudentProgress.vue
index 6e7266659..9c40c2aa0 100644
--- a/frontend/src/components/Modals/BatchStudentProgress.vue
+++ b/frontend/src/components/Modals/BatchStudentProgress.vue
@@ -77,10 +77,6 @@
 						</div>
 					</div>
 				</div>
-
-				<!-- <span class="mt-4">
-                    {{ student }}
-                </span> -->
 			</div>
 		</template>
 	</Dialog>
diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue
index 511e4b2e3..86e7cff0b 100644
--- a/frontend/src/pages/Batch.vue
+++ b/frontend/src/pages/Batch.vue
@@ -84,6 +84,9 @@
 									:scrollToBottom="true"
 								/>
 							</div>
+							<div v-else-if="tab.label == 'Feedback'">
+								<BatchFeedback :batch="batch.data.name" />
+							</div>
 						</div>
 					</template>
 				</Tabs>
@@ -190,12 +193,11 @@ import {
 	BookOpen,
 	Laptop,
 	BookOpenCheck,
-	Contact2,
 	Mail,
 	SendIcon,
 	MessageCircle,
 	Globe,
-	ShieldCheck,
+	ClipboardPen,
 } from 'lucide-vue-next'
 import { formatTime, updateDocumentTitle } from '@/utils'
 import BatchDashboard from '@/components/BatchDashboard.vue'
@@ -208,6 +210,7 @@ import AnnouncementModal from '@/components/Modals/AnnouncementModal.vue'
 import Discussions from '@/components/Discussions.vue'
 import DateRange from '@/components/Common/DateRange.vue'
 import BulkCertificates from '@/components/Modals/BulkCertificates.vue'
+import BatchFeedback from '@/components/BatchFeedback.vue'
 
 const user = inject('$user')
 const showAnnouncementModal = ref(false)
@@ -291,6 +294,13 @@ const tabs = computed(() => {
 		label: 'Discussions',
 		icon: MessageCircle,
 	})
+
+	if (isStudent.value) {
+		batchTabs.push({
+			label: 'Feedback',
+			icon: ClipboardPen,
+		})
+	}
 	return batchTabs
 })
 
diff --git a/lms/lms/api.py b/lms/lms/api.py
index 347e3ac1f..8f7ee3fb2 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -594,7 +594,7 @@ def get_categories(doctype, filters):
 def get_members(start=0, search=""):
 	"""Get members for the given search term and start index.
 	Args: start (int): Start index for the query.
-	        search (str): Search term to filter the results.
+	search (str): Search term to filter the results.
 	Returns: List of members.
 	"""
 
diff --git a/lms/lms/doctype/lms_batch_feedback/__init__.py b/lms/lms/doctype/lms_batch_feedback/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.js b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.js
new file mode 100644
index 000000000..fec296c0e
--- /dev/null
+++ b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2025, Frappe and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("LMS Batch Feedback", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
new file mode 100644
index 000000000..4609fc2f3
--- /dev/null
+++ b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
@@ -0,0 +1,90 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2025-01-07 18:53:22.279844",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "member",
+  "batch",
+  "feedback",
+  "column_break_swst",
+  "content",
+  "delivery",
+  "instructors",
+  "value"
+ ],
+ "fields": [
+  {
+   "fieldname": "member",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Member",
+   "options": "User",
+   "reqd": 1
+  },
+  {
+   "fieldname": "batch",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Batch",
+   "options": "LMS Batch",
+   "reqd": 1
+  },
+  {
+   "fieldname": "feedback",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Feedback",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_swst",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "content",
+   "fieldtype": "Rating",
+   "label": "Content"
+  },
+  {
+   "fieldname": "delivery",
+   "fieldtype": "Rating",
+   "label": "Delivery"
+  },
+  {
+   "fieldname": "instructors",
+   "fieldtype": "Rating",
+   "label": "Instructors"
+  },
+  {
+   "fieldname": "value",
+   "fieldtype": "Rating",
+   "label": "Value"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2025-01-07 18:56:38.800575",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Batch Feedback",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.py b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.py
new file mode 100644
index 000000000..43a049f3f
--- /dev/null
+++ b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Frappe and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class LMSBatchFeedback(Document):
+	pass
diff --git a/lms/lms/doctype/lms_batch_feedback/test_lms_batch_feedback.py b/lms/lms/doctype/lms_batch_feedback/test_lms_batch_feedback.py
new file mode 100644
index 000000000..38b10c4fd
--- /dev/null
+++ b/lms/lms/doctype/lms_batch_feedback/test_lms_batch_feedback.py
@@ -0,0 +1,30 @@
+# Copyright (c) 2025, Frappe and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+
+# On IntegrationTestCase, the doctype test records and all
+# link-field test record dependencies are recursively loaded
+# Use these module variables to add/remove to/from that list
+EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+
+
+class UnitTestLMSBatchFeedback(UnitTestCase):
+	"""
+	Unit tests for LMSBatchFeedback.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
+class IntegrationTestLMSBatchFeedback(IntegrationTestCase):
+	"""
+	Integration tests for LMSBatchFeedback.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass

From 2ecb93e925f692bf9f2313c0693e79fb4f7f16a2 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 10 Jan 2025 19:05:59 +0530
Subject: [PATCH 2/3] feat: show submitted feedback as readonly

---
 frontend/src/components/BatchFeedback.vue     | 94 +++++++++++++++----
 frontend/src/components/JobCard.vue           |  2 +-
 .../lms_batch_feedback.json                   | 14 ++-
 3 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/BatchFeedback.vue b/frontend/src/components/BatchFeedback.vue
index 94d454476..93eca9e66 100644
--- a/frontend/src/components/BatchFeedback.vue
+++ b/frontend/src/components/BatchFeedback.vue
@@ -1,25 +1,59 @@
 <template>
-	<div v-if="feedbackList.data"></div>
-	<div v-else class="space-y-8">
-		<div class="grid grid-cols-4 gap-5">
-			<Rating v-model="feedback.content" :label="__('Content')" />
-			<Rating v-model="feedback.delivery" :label="__('Delivery')" />
-			<Rating v-model="feedback.instructors" :label="__('Instructors')" />
-			<Rating v-model="feedback.value" :label="__('Value')" />
+	<div>
+		<div
+			v-if="feedbackList.data?.length"
+			class="bg-blue-100 text-blue-700 p-2 rounded-md mb-5"
+		>
+			{{ __('Thank you for providing your feedback!') }}
+		</div>
+		<div v-else class="flex justify-between items-center mb-5">
+			<div class="text-lg font-semibold">
+				{{ __('Help Us Improve') }}
+			</div>
+			<Button @click="submitFeedback()">
+				{{ __('Submit') }}
+			</Button>
+		</div>
+		<div class="space-y-8">
+			<div class="grid grid-cols-4 gap-5">
+				<Rating
+					v-model="feedback.content"
+					:label="__('Content')"
+					:readonly="readOnly"
+				/>
+				<Rating
+					v-model="feedback.delivery"
+					:label="__('Delivery')"
+					:readonly="readOnly"
+				/>
+				<Rating
+					v-model="feedback.instructors"
+					:label="__('Instructors')"
+					:readonly="readOnly"
+				/>
+				<Rating
+					v-model="feedback.value"
+					:label="__('Value')"
+					:readonly="readOnly"
+				/>
+			</div>
+			<FormControl
+				v-model="feedback.feedback"
+				type="textarea"
+				:label="__('Feedback')"
+				:rows="7"
+				:readonly="readOnly"
+			/>
 		</div>
-		<FormControl
-			v-model="feedback.feedback"
-			type="textarea"
-			:label="__('Feedback')"
-			rows="7"
-		/>
 	</div>
 </template>
-<script setup lang="ts">
-import { inject, reactive } from 'vue'
-import { createListResource, FormControl, Rating } from 'frappe-ui'
+<script setup>
+import { inject, reactive, ref } from 'vue'
+import { Button, createListResource, FormControl, Rating } from 'frappe-ui'
 
 const user = inject('$user')
+const ratingKeys = ['content', 'delivery', 'instructors', 'value']
+const readOnly = ref(false)
 const feedback = reactive({
 	content: 0,
 	delivery: 0,
@@ -41,7 +75,35 @@ const feedbackList = createListResource({
 		batch: props.batch,
 		member: user.data?.name,
 	},
+	fields: ['content', 'delivery', 'instructors', 'value', 'feedback', 'name'],
 	cache: ['feedbackList', props.batch, user.data?.name],
 	auto: true,
+	onSuccess(data) {
+		if (data.length) {
+			readOnly.value = true
+			Object.keys(feedback).forEach((key) => {
+				if (ratingKeys.includes(key)) feedback[key] = data[0][key] * 5
+				else feedback[key] = data[0][key]
+			})
+		}
+	},
 })
+
+const submitFeedback = () => {
+	ratingKeys.forEach((key) => {
+		feedback[key] = feedback[key] / 5
+	})
+	feedbackList.insert.submit(
+		{
+			member: user.data?.name,
+			batch: props.batch,
+			...feedback,
+		},
+		{
+			onSuccess: () => {
+				feedbackList.reload()
+			},
+		}
+	)
+}
 </script>
diff --git a/frontend/src/components/JobCard.vue b/frontend/src/components/JobCard.vue
index e59978f8b..a67e69cf2 100644
--- a/frontend/src/components/JobCard.vue
+++ b/frontend/src/components/JobCard.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex rounded p-1 lg:px-2 lg:py-2.5 hover:bg-gray-100">
+	<div class="flex rounded p-1 lg:px-2 lg:py-4 hover:bg-gray-100">
 		<div class="flex w-3/5 md:w-2/5">
 			<img
 				:src="job.company_logo"
diff --git a/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
index 4609fc2f3..5703eae48 100644
--- a/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
+++ b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
@@ -65,7 +65,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-01-07 18:56:38.800575",
+ "modified": "2025-01-10 17:25:25.482724",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Feedback",
@@ -82,6 +82,18 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "LMS Student",
+   "share": 1,
+   "write": 1
   }
  ],
  "sort_field": "creation",

From 8fe0b62bb315fa35ef53c8fbbb22891e6166a794 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 13 Jan 2025 11:31:18 +0530
Subject: [PATCH 3/3] feat: batch feedback for moderators

---
 frontend/src/components/BatchFeedback.vue     | 198 ++++++++++++++++--
 frontend/src/pages/Batch.vue                  |  18 +-
 .../lms_batch_feedback.json                   |  22 +-
 3 files changed, 204 insertions(+), 34 deletions(-)

diff --git a/frontend/src/components/BatchFeedback.vue b/frontend/src/components/BatchFeedback.vue
index 93eca9e66..1f1f0b28c 100644
--- a/frontend/src/components/BatchFeedback.vue
+++ b/frontend/src/components/BatchFeedback.vue
@@ -1,5 +1,5 @@
 <template>
-	<div>
+	<div v-if="user.data?.is_student">
 		<div
 			v-if="feedbackList.data?.length"
 			class="bg-blue-100 text-blue-700 p-2 rounded-md mb-5"
@@ -15,7 +15,7 @@
 			</Button>
 		</div>
 		<div class="space-y-8">
-			<div class="grid grid-cols-4 gap-5">
+			<div class="flex items-center justify-between">
 				<Rating
 					v-model="feedback.content"
 					:label="__('Content')"
@@ -46,21 +46,103 @@
 			/>
 		</div>
 	</div>
+
+	<div v-else-if="feedbackList.data?.length">
+		<div class="text-lg font-semibold mb-5">
+			{{ __('Average of Feedback Received') }}
+		</div>
+
+		<div class="flex items-center justify-between mb-10">
+			<Rating
+				v-model="average.content"
+				:label="__('Content')"
+				:readonly="true"
+			/>
+			<Rating
+				v-model="average.delivery"
+				:label="__('Delivery')"
+				:readonly="true"
+			/>
+			<Rating
+				v-model="average.instructors"
+				:label="__('Instructors')"
+				:readonly="true"
+			/>
+			<Rating v-model="average.value" :label="__('Value')" :readonly="true" />
+		</div>
+
+		<div class="text-lg font-semibold mb-5">
+			{{ __('All Feedback') }}
+		</div>
+		<ListView
+			:columns="feedbackColumns"
+			:rows="feedbackList.data"
+			row-key="name"
+			:options="{
+				showTooltip: false,
+				rowHeight: 'h-16',
+				selectable: false,
+			}"
+		>
+			<ListHeader
+				class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+			></ListHeader>
+			<ListRows>
+				<ListRow
+					:row="row"
+					v-for="row in feedbackList.data"
+					class="group cursor-pointer"
+				>
+					<template #default="{ column, item }">
+						<ListRowItem
+							:item="row[column.key]"
+							:align="column.align"
+							class="text-sm"
+						>
+							<template #prefix>
+								<div v-if="column.key == 'member_name'">
+									<Avatar
+										class="flex items-center"
+										:image="row['member_image']"
+										:label="item"
+										size="sm"
+									/>
+								</div>
+							</template>
+							<div v-if="ratingKeys.includes(column.key)">
+								<Rating v-model="row[column.key]" :readonly="true" />
+							</div>
+							<div v-else class="leading-5">
+								{{ row[column.key] }}
+							</div>
+						</ListRowItem>
+					</template>
+				</ListRow>
+			</ListRows>
+		</ListView>
+	</div>
 </template>
 <script setup>
-import { inject, reactive, ref } from 'vue'
-import { Button, createListResource, FormControl, Rating } from 'frappe-ui'
+import { computed, inject, onMounted, reactive, ref, watch } from 'vue'
+import {
+	Avatar,
+	Button,
+	createListResource,
+	FormControl,
+	ListView,
+	ListHeader,
+	ListHeaderItem,
+	ListRows,
+	ListRow,
+	ListRowItem,
+	Rating,
+} from 'frappe-ui'
 
 const user = inject('$user')
 const ratingKeys = ['content', 'delivery', 'instructors', 'value']
 const readOnly = ref(false)
-const feedback = reactive({
-	content: 0,
-	delivery: 0,
-	instructors: 0,
-	value: 0,
-	feedback: '',
-})
+const average = reactive({})
+const feedback = reactive({})
 
 const props = defineProps({
 	batch: {
@@ -69,25 +151,64 @@ const props = defineProps({
 	},
 })
 
+onMounted(() => {
+	let filters = {
+		batch: props.batch,
+	}
+	if (user.data?.is_student) {
+		filters['member'] = user.data?.name
+	}
+	feedbackList.update({
+		filters: filters,
+	})
+	feedbackList.reload()
+})
+
 const feedbackList = createListResource({
 	doctype: 'LMS Batch Feedback',
 	filters: {
 		batch: props.batch,
-		member: user.data?.name,
 	},
-	fields: ['content', 'delivery', 'instructors', 'value', 'feedback', 'name'],
+	fields: [
+		'content',
+		'delivery',
+		'instructors',
+		'value',
+		'feedback',
+		'name',
+		'member',
+		'member_name',
+		'member_image',
+	],
 	cache: ['feedbackList', props.batch, user.data?.name],
-	auto: true,
-	onSuccess(data) {
-		if (data.length) {
+})
+
+watch(
+	() => feedbackList.data,
+	() => {
+		if (feedbackList.data.length) {
+			let data = feedbackList.data
 			readOnly.value = true
-			Object.keys(feedback).forEach((key) => {
-				if (ratingKeys.includes(key)) feedback[key] = data[0][key] * 5
-				else feedback[key] = data[0][key]
+
+			ratingKeys.forEach((key) => {
+				average[key] = 0
+			})
+
+			data.forEach((row) => {
+				Object.keys(row).forEach((key) => {
+					if (ratingKeys.includes(key)) row[key] = row[key] * 5
+					feedback[key] = row[key]
+				})
+				ratingKeys.forEach((key) => {
+					average[key] += row[key]
+				})
+			})
+			Object.keys(average).forEach((key) => {
+				average[key] = average[key] / data.length
 			})
 		}
-	},
-})
+	}
+)
 
 const submitFeedback = () => {
 	ratingKeys.forEach((key) => {
@@ -106,4 +227,39 @@ const submitFeedback = () => {
 		}
 	)
 }
+
+const feedbackColumns = computed(() => {
+	return [
+		{
+			label: 'Member',
+			key: 'member_name',
+			width: '10rem',
+		},
+		{
+			label: 'Feedback',
+			key: 'feedback',
+			width: '15rem',
+		},
+		{
+			label: 'Content',
+			key: 'content',
+			width: '10rem',
+		},
+		{
+			label: 'Delivery',
+			key: 'delivery',
+			width: '10rem',
+		},
+		{
+			label: 'Instructors',
+			key: 'instructors',
+			width: '10rem',
+		},
+		{
+			label: 'Value',
+			key: 'value',
+			width: '10rem',
+		},
+	]
+})
 </script>
diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue
index 775673bde..3c9288c44 100644
--- a/frontend/src/pages/Batch.vue
+++ b/frontend/src/pages/Batch.vue
@@ -21,7 +21,7 @@
 				</Button>
 			</div>
 		</header>
-		<div v-if="batch.data" class="grid grid-cols-[70%,30%] h-screen">
+		<div v-if="batch.data" class="grid grid-cols-[75%,25%] h-screen">
 			<div class="border-r">
 				<Tabs
 					v-model="tabIndex"
@@ -65,7 +65,7 @@
 							<div v-else-if="tab.label == 'Dashboard'">
 								<BatchStudents :batch="batch.data" />
 							</div>
-							<div v-else-if="tab.label == 'Live Class'">
+							<div v-else-if="tab.label == 'Classes'">
 								<LiveClass :batch="batch.data.name" />
 							</div>
 							<div v-else-if="tab.label == 'Assessments'">
@@ -81,7 +81,7 @@
 									:title="__('Discussions')"
 									:key="batch.data.name"
 									:singleThread="true"
-									:scrollToBottom="true"
+									:scrollToBottom="false"
 								/>
 							</div>
 							<div v-else-if="tab.label == 'Feedback'">
@@ -274,7 +274,7 @@ const tabs = computed(() => {
 	})
 
 	batchTabs.push({
-		label: 'Live Class',
+		label: 'Classes',
 		icon: Laptop,
 	})
 
@@ -295,12 +295,10 @@ const tabs = computed(() => {
 		icon: MessageCircle,
 	})
 
-	if (isStudent.value) {
-		batchTabs.push({
-			label: 'Feedback',
-			icon: ClipboardPen,
-		})
-	}
+	batchTabs.push({
+		label: 'Feedback',
+		icon: ClipboardPen,
+	})
 	return batchTabs
 })
 
diff --git a/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
index 5703eae48..f9a4ecb2f 100644
--- a/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
+++ b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
@@ -6,13 +6,15 @@
  "engine": "InnoDB",
  "field_order": [
   "member",
+  "member_name",
+  "member_image",
   "batch",
-  "feedback",
   "column_break_swst",
   "content",
   "delivery",
   "instructors",
-  "value"
+  "value",
+  "feedback"
  ],
  "fields": [
   {
@@ -61,11 +63,25 @@
    "fieldname": "value",
    "fieldtype": "Rating",
    "label": "Value"
+  },
+  {
+   "fetch_from": "member.full_name",
+   "fieldname": "member_name",
+   "fieldtype": "Data",
+   "label": "Member Name",
+   "read_only": 1
+  },
+  {
+   "fetch_from": "member.user_image",
+   "fieldname": "member_image",
+   "fieldtype": "Attach Image",
+   "label": "Member Image",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-01-10 17:25:25.482724",
+ "modified": "2025-01-10 19:39:04.143783",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Feedback",