feat: add pagination in appointment

Reviewed-on: #5

backend/src/controllers/appointment.controller.js

@@ -1,10 +1,10 @@
 import prisma from "../prisma/client.js";
-import {sendEmail} from "../utils/sendEmail.js";
-import {getEmailsByType} from "../utils/getEmailByTypes.js";
+import { sendEmail } from "../utils/sendEmail.js";
+import { getEmailsByType } from "../utils/getEmailByTypes.js";
 
 export const createAppointment = async (req, res) => {
 	try {
-		const {name, mobileNumber, email, message, date, doctorId, departmentId} =
+		const { name, mobileNumber, email, message, date, doctorId, departmentId } =
 			req.body;
 
 		if (!name || !mobileNumber || !doctorId || !departmentId || !date) {
@@ -71,19 +71,98 @@ export const createAppointment = async (req, res) => {
 
 export const getAppointments = async (req, res) => {
 	try {
-		const appointments = await prisma.appointment.findMany({
-			include: {
-				doctor: true,
-				department: true,
-			},
-			orderBy: {
-				createdAt: "desc",
-			},
-		});
+		const page = parseInt(req.query.page);
+		const limit = parseInt(req.query.limit);
 
-		res.status(200).json({
+		const search = req.query.search || "";
+		const doctor = req.query.doctor || "";
+		const department = req.query.department || "";
+		const date = req.query.date || "";
+
+		if (!page && !limit) {
+			const appointments = await prisma.appointment.findMany({
+				include: {
+					doctor: true,
+					department: true,
+				},
+				orderBy: { createdAt: "desc" },
+			});
+
+			return res.status(200).json({
+				success: true,
+				data: appointments,
+				meta: null,
+			});
+		}
+
+		const currentPage = page || 1;
+		const currentLimit = limit || 10;
+		const skip = (currentPage - 1) * currentLimit;
+
+		const where = {
+			AND: [
+				search
+					? {
+							OR: [
+								{ name: { contains: search, mode: "insensitive" } },
+								{ mobileNumber: { contains: search } },
+								{ email: { contains: search, mode: "insensitive" } },
+							],
+						}
+					: {},
+
+				doctor
+					? {
+							doctor: {
+								name: { contains: doctor, mode: "insensitive" },
+							},
+						}
+					: {},
+
+				department
+					? {
+							department: {
+								name: { contains: department, mode: "insensitive" },
+							},
+						}
+					: {},
+
+				date
+					? {
+							date: {
+								gte: new Date(date),
+								lt: new Date(
+									new Date(date).setDate(new Date(date).getDate() + 1),
+								),
+							},
+						}
+					: {},
+			],
+		};
+
+		const [appointments, total] = await Promise.all([
+			prisma.appointment.findMany({
+				where,
+				include: {
+					doctor: true,
+					department: true,
+				},
+				orderBy: { createdAt: "desc" },
+				skip,
+				take: currentLimit,
+			}),
+			prisma.appointment.count({ where }),
+		]);
+
+		return res.status(200).json({
 			success: true,
 			data: appointments,
+			meta: {
+				total,
+				page: currentPage,
+				limit: currentLimit,
+				totalPages: Math.ceil(total / currentLimit),
+			},
 		});
 	} catch (error) {
 		console.error(error);
@@ -98,7 +177,7 @@ export const getAppointments = async (req, res) => {
 
 export const getAppointment = async (req, res) => {
 	try {
-		const {id} = req.params;
+		const { id } = req.params;
 
 		const appointment = await prisma.appointment.findUnique({
 			where: {
@@ -134,7 +213,7 @@ export const getAppointment = async (req, res) => {
 
 export const getAppointmentsByDoctor = async (req, res) => {
 	try {
-		const {doctorId} = req.params;
+		const { doctorId } = req.params;
 
 		const appointments = await prisma.appointment.findMany({
 			where: {
@@ -166,7 +245,7 @@ export const getAppointmentsByDoctor = async (req, res) => {
 
 export const getAppointmentsByDepartment = async (req, res) => {
 	try {
-		const {departmentId} = req.params;
+		const { departmentId } = req.params;
 
 		const appointments = await prisma.appointment.findMany({
 			where: {
@@ -195,7 +274,7 @@ export const getAppointmentsByDepartment = async (req, res) => {
 
 export const updateAppointment = async (req, res) => {
 	try {
-		const {id} = req.params;
+		const { id } = req.params;
 
 		const appointment = await prisma.appointment.update({
 			where: {
@@ -226,7 +305,7 @@ export const updateAppointment = async (req, res) => {
 
 export const deleteAppointment = async (req, res) => {
 	try {
-		const {id} = req.params;
+		const { id } = req.params;
 
 		await prisma.appointment.delete({
 			where: {

frontend/src/api/appointment.ts

@@ -1,7 +1,22 @@
 import apiClient from "@/api/client";
 
-export const getAppointmentsApi = async () => {
-	const res = await apiClient.get("/appointments/getall");
+export const getAppointmentsApi = async (
+	page?: number,
+	limit?: number,
+	search?: string,
+	doctor?: string,
+	department?: string,
+	date?: string,
+) => {
+	let url = "/appointments/getAll";
+
+	if (page && limit) {
+		url += `?page=${page}&limit=${limit}&search=${search || ""}&doctor=${
+			doctor || ""
+		}&department=${department || ""}&date=${date || ""}`;
+	}
+
+	const res = await apiClient.get(url);
 	return res.data;
 };
 

frontend/src/pages/Appointment.tsx

@@ -1,7 +1,7 @@
-import {useState, useEffect, useCallback} from "react";
+import { useState, useEffect, useCallback } from "react";
 
-import {getAppointmentsApi, deleteAppointmentApi} from "@/api/appointment";
-import {exportToExcel} from "@/utils/exportToExcel";
+import { getAppointmentsApi, deleteAppointmentApi } from "@/api/appointment";
+import { exportToExcel } from "@/utils/exportToExcel";
 
 import {
 	Table,
@@ -12,12 +12,18 @@ import {
 	TableRow,
 } from "@/components/ui/table";
 
-import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
 
-import {Button} from "@/components/ui/button";
-import {Input} from "@/components/ui/input";
-
-import {Loader2, Trash, RefreshCw, Download} from "lucide-react";
+import {
+	Loader2,
+	Trash,
+	RefreshCw,
+	Download,
+	ChevronLeft,
+	ChevronRight,
+} from "lucide-react";
 
 export default function AppointmentPage() {
 	const [appointments, setAppointments] = useState<any[]>([]);
@@ -28,106 +34,153 @@ export default function AppointmentPage() {
 	const [filterDepartment, setFilterDepartment] = useState("");
 	const [filterDate, setFilterDate] = useState("");
 
+	const [currentPage, setCurrentPage] = useState(1);
+	const [itemsPerPage, setItemsPerPage] = useState(10);
+
+	const [meta, setMeta] = useState<any>({});
+
 	const fetchAll = useCallback(async () => {
 		setLoading(true);
 		try {
-			const res = await getAppointmentsApi();
+			const res = await getAppointmentsApi(
+				currentPage,
+				itemsPerPage,
+				searchText,
+				filterDoctor,
+				filterDepartment,
+				filterDate,
+			);
+
 			setAppointments(res?.data || []);
+			setMeta(res?.meta || {});
 		} catch (err) {
 			console.error(err);
 		} finally {
 			setLoading(false);
 		}
-	}, []);
+	}, [
+		currentPage,
+		itemsPerPage,
+		searchText,
+		filterDoctor,
+		filterDepartment,
+		filterDate,
+	]);
 
 	useEffect(() => {
 		fetchAll();
 	}, [fetchAll]);
 
-	const filteredAppointments = appointments.filter((item) => {
-		const matchesSearch =
-			item.name?.toLowerCase().includes(searchText.toLowerCase()) ||
-			item.mobileNumber?.includes(searchText) ||
-			item.email?.toLowerCase().includes(searchText.toLowerCase());
-
-		const matchesDoctor = filterDoctor
-			? item.doctor?.name?.toLowerCase().includes(filterDoctor.toLowerCase())
-			: true;
-
-		const matchesDepartment = filterDepartment
-			? item.department?.name
-					?.toLowerCase()
-					.includes(filterDepartment.toLowerCase())
-			: true;
-
-		const matchesDate = filterDate
-			? new Date(item.date).toISOString().split("T")[0] === filterDate
-			: true;
-
-		return matchesSearch && matchesDoctor && matchesDepartment && matchesDate;
-	});
-
 	async function handleDelete(id: number) {
 		if (!confirm("Delete appointment?")) return;
 		await deleteAppointmentApi(id);
 		fetchAll();
 	}
 
-	const handleExport = () => {
-		const exportData = filteredAppointments.map((item) => ({
-			ID: item.id,
-			Name: item.name,
-			Phone: item.mobileNumber,
-			Email: item.email,
-			Doctor: item.doctor?.name,
-			Department: item.department?.name,
-			Date: new Date(item.date).toLocaleDateString(),
-			Message: item.message,
-		}));
+	const handleExport = async () => {
+		try {
+			const res = await getAppointmentsApi();
 
-		exportToExcel(exportData, "appointments");
+			let data = res?.data || [];
+
+			data = data.filter((item: any) => {
+				const matchesSearch =
+					item.name?.toLowerCase().includes(searchText.toLowerCase()) ||
+					item.mobileNumber?.includes(searchText) ||
+					item.email?.toLowerCase().includes(searchText.toLowerCase());
+
+				const matchesDoctor = filterDoctor
+					? item.doctor?.name
+							?.toLowerCase()
+							.includes(filterDoctor.toLowerCase())
+					: true;
+
+				const matchesDepartment = filterDepartment
+					? item.department?.name
+							?.toLowerCase()
+							.includes(filterDepartment.toLowerCase())
+					: true;
+
+				const matchesDate = filterDate
+					? new Date(item.date).toISOString().split("T")[0] === filterDate
+					: true;
+
+				return (
+					matchesSearch && matchesDoctor && matchesDepartment && matchesDate
+				);
+			});
+
+			const exportData = data.map((item: any) => ({
+				ID: item.id,
+				Name: item.name,
+				Phone: item.mobileNumber,
+				Email: item.email,
+				Doctor: item.doctor?.name,
+				Department: item.department?.name,
+				Date: new Date(item.date).toLocaleDateString(),
+				Message: item.message,
+			}));
+
+			exportToExcel(exportData, "appointments");
+		} catch (err) {
+			console.error(err);
+		}
 	};
 
 	return (
 		<div className="p-6 space-y-6">
-			<div className="flex justify-between items-center gap-3 flex-wrap">
+			<div className="flex justify-between items-center flex-wrap gap-3">
 				<h1 className="text-2xl font-bold">Appointments</h1>
 
-				<div className="flex flex-wrap gap-2">
+				<div className="flex flex-wrap gap-2 items-center">
 					<Input
-						placeholder="Search name / phone / email..."
+						placeholder="Search..."
 						value={searchText}
-						onChange={(e) => setSearchText(e.target.value)}
-						className="w-[220px]"
+						onChange={(e) => {
+							setSearchText(e.target.value);
+							setCurrentPage(1);
+						}}
+						className="w-[200px]"
 					/>
 
 					<Input
-						placeholder="Filter Doctor"
+						placeholder="Doctor"
 						value={filterDoctor}
 						onChange={(e) => setFilterDoctor(e.target.value)}
-						className="w-[180px]"
+						className="w-[160px]"
 					/>
 
 					<Input
-						placeholder="Filter Department"
+						placeholder="Department"
 						value={filterDepartment}
 						onChange={(e) => setFilterDepartment(e.target.value)}
-						className="w-[200px]"
+						className="w-[160px]"
 					/>
 
 					<Input
 						type="date"
 						value={filterDate}
 						onChange={(e) => setFilterDate(e.target.value)}
-						className="w-[180px]"
+						className="w-[160px]"
 					/>
 
-					<Button variant="outline" onClick={fetchAll} disabled={loading}>
+					<select
+						value={itemsPerPage}
+						onChange={(e) => {
+							setItemsPerPage(Number(e.target.value));
+							setCurrentPage(1);
+						}}
+						className="border px-2 py-1 rounded">
+						<option value={5}>5</option>
+						<option value={10}>10</option>
+						<option value={20}>20</option>
+					</select>
+
+					<Button onClick={fetchAll}>
 						<RefreshCw className="mr-2 h-4 w-4" />
-						Refresh
 					</Button>
 
-					<Button variant="outline" onClick={handleExport}>
+					<Button onClick={handleExport}>
 						<Download className="mr-2 h-4 w-4" />
 						Export
 					</Button>
@@ -140,74 +193,77 @@ export default function AppointmentPage() {
 				</CardHeader>
 
 				<CardContent>
-					<div className="overflow-x-auto">
-						<Table className="min-w-[700px]">
-							<TableHeader>
+					<Table>
+						<TableHeader>
+							<TableRow>
+								<TableHead>ID</TableHead>
+								<TableHead>Name</TableHead>
+								<TableHead>Phone</TableHead>
+								<TableHead>Doctor</TableHead>
+								<TableHead>Department</TableHead>
+								<TableHead>Date</TableHead>
+								<TableHead>Actions</TableHead>
+							</TableRow>
+						</TableHeader>
+
+						<TableBody>
+							{loading ? (
 								<TableRow>
-									<TableHead>ID</TableHead>
-									<TableHead>Name</TableHead>
-									<TableHead>Phone</TableHead>
-									<TableHead>Email</TableHead>
-									<TableHead>Doctor</TableHead>
-									<TableHead>Department</TableHead>
-									<TableHead>Appointment Date</TableHead>
-									<TableHead>Message</TableHead>
-									<TableHead>Generated on</TableHead>
-
-									<TableHead>Actions</TableHead>
+									<TableCell colSpan={7} className="text-center">
+										<Loader2 className="animate-spin mx-auto" />
+									</TableCell>
 								</TableRow>
-							</TableHeader>
-
-							<TableBody>
-								{loading ? (
-									<TableRow>
-										<TableCell colSpan={9} className="text-center">
-											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
+							) : appointments.length === 0 ? (
+								<TableRow>
+									<TableCell
+										colSpan={7}
+										className="text-center py-6 text-gray-500">
+										No appointments found
+									</TableCell>
+								</TableRow>
+							) : (
+								appointments.map((item) => (
+									<TableRow key={item.id}>
+										<TableCell>{item.id}</TableCell>
+										<TableCell>{item.name}</TableCell>
+										<TableCell>{item.mobileNumber}</TableCell>
+										<TableCell>{item.doctor?.name}</TableCell>
+										<TableCell>{item.department?.name}</TableCell>
+										<TableCell>
+											{new Date(item.date).toLocaleDateString()}
+										</TableCell>
+										<TableCell>
+											<Button
+												size="sm"
+												variant="destructive"
+												onClick={() => handleDelete(item.id)}>
+												<Trash className="h-4 w-4" />
+											</Button>
 										</TableCell>
 									</TableRow>
-								) : filteredAppointments.length === 0 ? (
-									<TableRow>
-										<TableCell colSpan={9} className="text-center">
-											No appointments found
-										</TableCell>
-									</TableRow>
-								) : (
-									filteredAppointments.map((item) => (
-										<TableRow key={item.id}>
-											<TableCell>{item.id}</TableCell>
-											<TableCell>{item.name}</TableCell>
-											<TableCell>{item.mobileNumber}</TableCell>
-											<TableCell>{item.email}</TableCell>
-											<TableCell>{item.doctor?.name}</TableCell>
-											<TableCell>{item.department?.name}</TableCell>
+								))
+							)}
+						</TableBody>
+					</Table>
 
-											{/* ✅ DATE ONLY */}
-											<TableCell>
-												{new Date(item.date).toLocaleDateString()}
-											</TableCell>
+					<div className="flex justify-between mt-4">
+						<p>
+							Page {meta.page || 1} of {meta.totalPages || 1}
+						</p>
 
-											<TableCell className="max-w-[250px] whitespace-normal">
-												{item.message}
-											</TableCell>
-											<TableCell>
-												{" "}
-												{new Date(item.createdAt).toLocaleDateString()}
-											</TableCell>
+						<div className="flex gap-2">
+							<Button
+								disabled={currentPage === 1}
+								onClick={() => setCurrentPage((p) => p - 1)}>
+								<ChevronLeft />
+							</Button>
 
-											<TableCell>
-												<Button
-													size="sm"
-													variant="destructive"
-													onClick={() => handleDelete(item.id)}
-												>
-													<Trash className="h-4 w-4" />
-												</Button>
-											</TableCell>
-										</TableRow>
-									))
-								)}
-							</TableBody>
-						</Table>
+							<Button
+								disabled={currentPage === meta.totalPages}
+								onClick={() => setCurrentPage((p) => p + 1)}>
+								<ChevronRight />
+							</Button>
+						</div>
 					</div>
 				</CardContent>
 			</Card>

frontend/src/pages/Department.tsx

@@ -1,5 +1,5 @@
-import {useState, useEffect, useCallback} from "react";
-import {AxiosError} from "axios";
+import { useState, useEffect, useCallback } from "react";
+import { AxiosError } from "axios";
 
 import {
 	getDepartmentsApi,
@@ -17,8 +17,8 @@ import {
 	TableRow,
 } from "@/components/ui/table";
 
-import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
-import {Button} from "@/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Button } from "@/components/ui/button";
 
 import {
 	Dialog,
@@ -28,10 +28,10 @@ import {
 	DialogFooter,
 } from "@/components/ui/dialog";
 
-import {Input} from "@/components/ui/input";
-import {Textarea} from "@/components/ui/textarea";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
 
-import {Loader2, RefreshCw, Plus, Pencil, Trash} from "lucide-react";
+import { Loader2, RefreshCw, Plus, Pencil, Trash, Eye } from "lucide-react";
 
 interface Department {
 	departmentId: string;
@@ -51,6 +51,9 @@ export default function DepartmentPage() {
 	const [openModal, setOpenModal] = useState(false);
 	const [editing, setEditing] = useState<Department | null>(null);
 
+	const [viewOpen, setViewOpen] = useState(false);
+	const [viewData, setViewData] = useState<Department | null>(null);
+
 	const [searchText, setSearchText] = useState("");
 
 	const [form, setForm] = useState<Department>({
@@ -85,32 +88,21 @@ export default function DepartmentPage() {
 		fetchDepartments();
 	}, [fetchDepartments]);
 
-	const filteredDepartments = departments.filter((dep) => {
-		const text = searchText.toLowerCase();
+	const filteredDepartments = departments.filter((dep) =>
+		dep.name.toLowerCase().includes(searchText.toLowerCase()),
+	);
 
-		return (
-			dep.name.toLowerCase().includes(text) ||
-			dep.departmentId.toLowerCase().includes(text) ||
-			dep.para1.toLowerCase().includes(text) ||
-			dep.para2.toLowerCase().includes(text) ||
-			dep.para3.toLowerCase().includes(text) ||
-			dep.facilities.toLowerCase().includes(text) ||
-			dep.services.toLowerCase().includes(text)
-		);
-	});
+	function handleChange(e: any) {
+		setForm({ ...form, [e.target.name]: e.target.value });
+	}
 
-	function handleChange(
-		e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
-	) {
-		setForm({
-			...form,
-			[e.target.name]: e.target.value,
-		});
+	function truncate(text: string, limit = 60) {
+		if (!text) return "-";
+		return text.length > limit ? text.substring(0, limit) + "..." : text;
 	}
 
 	function openAdd() {
 		setEditing(null);
-
 		setForm({
 			departmentId: "",
 			name: "",
@@ -120,7 +112,6 @@ export default function DepartmentPage() {
 			facilities: "",
 			services: "",
 		});
-
 		setOpenModal(true);
 	}
 
@@ -130,10 +121,15 @@ export default function DepartmentPage() {
 		setOpenModal(true);
 	}
 
+	function openView(dep: Department) {
+		setViewData(dep);
+		setViewOpen(true);
+	}
+
 	async function handleSubmit() {
 		try {
 			if (editing) {
-				const {departmentId, ...updateData} = form;
+				const { departmentId, ...updateData } = form;
 				await updateDepartmentApi(editing.departmentId, updateData);
 			} else {
 				await createDepartmentApi(form);
@@ -146,12 +142,11 @@ export default function DepartmentPage() {
 		}
 	}
 
-	async function handleDelete(departmentId: string) {
-		const confirmDelete = confirm("Delete this department?");
-		if (!confirmDelete) return;
+	async function handleDelete(id: string) {
+		if (!confirm("Delete this department?")) return;
 
 		try {
-			await deleteDepartmentApi(departmentId);
+			await deleteDepartmentApi(id);
 			fetchDepartments();
 		} catch (error) {
 			console.error(error);
@@ -160,7 +155,6 @@ export default function DepartmentPage() {
 
 	return (
 		<div className="p-6 space-y-6">
-			{/* HEADER */}
 			<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-3">
 				<h1 className="text-2xl font-bold">Departments</h1>
 
@@ -175,8 +169,7 @@ export default function DepartmentPage() {
 					<Button
 						variant="outline"
 						onClick={fetchDepartments}
-						disabled={loading}
-					>
+						disabled={loading}>
 						<RefreshCw className="mr-2 h-4 w-4" />
 						Refresh
 					</Button>
@@ -200,31 +193,29 @@ export default function DepartmentPage() {
 				</CardHeader>
 
 				<CardContent>
-					<div className="border rounded-md overflow-x-auto max-w-full">
-						<Table>
+					<div className="border rounded-md max-h-[500px] overflow-y-auto">
+						<Table className="w-full table-fixed">
 							<TableHeader>
 								<TableRow>
-									<TableHead>ID</TableHead>
-									<TableHead>Name</TableHead>
-									<TableHead>Para1</TableHead>
-									<TableHead>Para2</TableHead>
-									<TableHead>Para3</TableHead>
-									<TableHead>Facilities</TableHead>
-									<TableHead>Services</TableHead>
-									<TableHead>Actions</TableHead>
+									<TableHead className="w-[80px]">ID</TableHead>
+									<TableHead className="w-[180px]">Name</TableHead>
+									<TableHead className="w-[250px]">Para1</TableHead>
+									<TableHead className="w-[220px]">Facilities</TableHead>
+									<TableHead className="w-[220px]">Services</TableHead>
+									<TableHead className="w-[120px]">Actions</TableHead>
 								</TableRow>
 							</TableHeader>
 
 							<TableBody>
 								{loading ? (
 									<TableRow>
-										<TableCell colSpan={8} className="text-center">
+										<TableCell colSpan={6} className="text-center">
 											<Loader2 className="h-6 w-6 animate-spin mx-auto" />
 										</TableCell>
 									</TableRow>
 								) : filteredDepartments.length === 0 ? (
 									<TableRow>
-										<TableCell colSpan={8} className="text-center">
+										<TableCell colSpan={6} className="text-center">
 											No departments found
 										</TableCell>
 									</TableRow>
@@ -233,42 +224,47 @@ export default function DepartmentPage() {
 										<TableRow key={dep.departmentId}>
 											<TableCell>{dep.departmentId}</TableCell>
 
-											<TableCell>{dep.name}</TableCell>
-
-											<TableCell className="max-w-[300px] whitespace-normal break-words">
-												{dep.para1}
+											<TableCell>
+												<div className="break-words">{dep.name}</div>
 											</TableCell>
 
-											<TableCell className="max-w-[300px] whitespace-normal break-words">
-												{dep.para2}
+											<TableCell>
+												<div className="break-words whitespace-normal">
+													{truncate(dep.para1)}
+												</div>
 											</TableCell>
 
-											<TableCell className="max-w-[300px] whitespace-normal break-words">
-												{dep.para3}
+											<TableCell>
+												<div className="break-words whitespace-normal">
+													{truncate(dep.facilities)}
+												</div>
 											</TableCell>
 
-											<TableCell className="max-w-[300px] whitespace-normal break-words">
-												{dep.facilities}
+											<TableCell>
+												<div className="break-words whitespace-normal">
+													{truncate(dep.services)}
+												</div>
 											</TableCell>
 
-											<TableCell className="max-w-[300px] whitespace-normal break-words">
-												{dep.services}
-											</TableCell>
-
-											<TableCell className="flex gap-2">
+											<TableCell className="flex gap-2 whitespace-nowrap">
 												<Button
 													size="sm"
 													variant="outline"
-													onClick={() => openEdit(dep)}
-												>
+													onClick={() => openView(dep)}>
+													<Eye className="h-4 w-4" />
+												</Button>
+
+												<Button
+													size="sm"
+													variant="outline"
+													onClick={() => openEdit(dep)}>
 													<Pencil className="h-4 w-4" />
 												</Button>
 
 												<Button
 													size="sm"
 													variant="destructive"
-													onClick={() => handleDelete(dep.departmentId)}
-												>
+													onClick={() => handleDelete(dep.departmentId)}>
 													<Trash className="h-4 w-4" />
 												</Button>
 											</TableCell>
@@ -281,64 +277,59 @@ export default function DepartmentPage() {
 				</CardContent>
 			</Card>
 
-			{/* MODAL */}
 			<Dialog open={openModal} onOpenChange={setOpenModal}>
-				<DialogContent className="max-w-4xl">
+				<DialogContent className="w-full !max-w-5xl max-h-[90vh] overflow-y-auto">
 					<DialogHeader>
 						<DialogTitle>
 							{editing ? "Edit Department" : "Add Department"}
 						</DialogTitle>
 					</DialogHeader>
 
-					<div className="space-y-4 max-h-[70vh] overflow-y-auto pr-2">
+					<div className="space-y-4">
 						<Input
 							name="departmentId"
-							placeholder="Department ID"
 							value={form.departmentId}
 							onChange={handleChange}
 							disabled={!!editing}
+							placeholder="Department ID"
 						/>
 
 						<Input
 							name="name"
-							placeholder="Department Name"
 							value={form.name}
 							onChange={handleChange}
+							placeholder="Department Name"
 						/>
 
 						<Textarea
 							name="para1"
-							placeholder="Paragraph 1"
 							value={form.para1}
 							onChange={handleChange}
+							placeholder="Para1"
 						/>
-
 						<Textarea
 							name="para2"
-							placeholder="Paragraph 2"
 							value={form.para2}
 							onChange={handleChange}
+							placeholder="Para2"
 						/>
-
 						<Textarea
 							name="para3"
-							placeholder="Paragraph 3"
 							value={form.para3}
 							onChange={handleChange}
+							placeholder="Para3"
 						/>
-
 						<Textarea
 							name="facilities"
-							placeholder="Facilities"
 							value={form.facilities}
 							onChange={handleChange}
+							placeholder="Facilities"
 						/>
-
 						<Textarea
 							name="services"
-							placeholder="Services"
 							value={form.services}
 							onChange={handleChange}
+							placeholder="Services"
 						/>
 					</div>
 
@@ -346,13 +337,65 @@ export default function DepartmentPage() {
 						<Button variant="outline" onClick={() => setOpenModal(false)}>
 							Cancel
 						</Button>
-
 						<Button onClick={handleSubmit}>
 							{editing ? "Update" : "Create"}
 						</Button>
 					</DialogFooter>
 				</DialogContent>
 			</Dialog>
+
+			<Dialog open={viewOpen} onOpenChange={setViewOpen}>
+				<DialogContent className="w-full !max-w-5xl max-h-[90vh] overflow-y-auto">
+					{" "}
+					<DialogHeader>
+						<DialogTitle>Department Details</DialogTitle>
+					</DialogHeader>
+					{viewData && (
+						<div className="space-y-4 text-sm">
+							<p>
+								<b>ID:</b> {viewData.departmentId}
+							</p>
+
+							<p>
+								<b>Name:</b> {viewData.name}
+							</p>
+
+							<p>
+								<b>Para1:</b>
+								<br />
+								{viewData.para1}
+							</p>
+
+							<p>
+								<b>Para2:</b>
+								<br />
+								{viewData.para2}
+							</p>
+
+							<p>
+								<b>Para3:</b>
+								<br />
+								{viewData.para3}
+							</p>
+
+							<p>
+								<b>Facilities:</b>
+								<br />
+								{viewData.facilities}
+							</p>
+
+							<p>
+								<b>Services:</b>
+								<br />
+								{viewData.services}
+							</p>
+						</div>
+					)}
+					<DialogFooter>
+						<Button onClick={() => setViewOpen(false)}>Close</Button>
+					</DialogFooter>
+				</DialogContent>
+			</Dialog>
 		</div>
 	);
 }