diff --git a/app/(admin)/repair-tickets/page.tsx b/app/(admin)/repair-tickets/page.tsx index 27f7b41..4e1319e 100644 --- a/app/(admin)/repair-tickets/page.tsx +++ b/app/(admin)/repair-tickets/page.tsx @@ -79,12 +79,17 @@ export default function RepairTicketsPage() { } }; - const filteredTickets = tickets.filter( - (t) => - t.imei_serial.includes(searchImei) || - t.ticket_number.toLowerCase().includes(searchImei.toLowerCase()) || - t.customer_name.toLowerCase().includes(searchImei.toLowerCase()) - ); + const filteredTickets = (tickets || []).filter((t) => { + const q = (searchImei || '').toLowerCase().trim(); + if (!q) return true; + const imei = (t.imei_serial || '').toLowerCase(); + const num = (t.ticket_number || '').toLowerCase(); + const cust = (t.customer_name || '').toLowerCase(); + const brand = (t.brand_name || '').toLowerCase(); + const model = (t.model_name || '').toLowerCase(); + const desc = (t.problem_description || t.issue_description || '').toLowerCase(); + return imei.includes(q) || num.includes(q) || cust.includes(q) || brand.includes(q) || model.includes(q) || desc.includes(q); + }); return (
- {t.problem_description} + {t.problem_description || t.issue_description || 'No description provided'}
{user.first_name} {user.last_name}
-{getRoleName(user.role_id)}
+{getRoleName(user.role_id, user)}
{renderStatusBadge(user.is_active)} @@ -929,7 +956,17 @@ export default function UsersPage() {{getDeptName(user.department_id)} · {getDesigName(user.designation_id)}
+ {(() => { + const dept = getDeptName(user.department_id, user); + const desig = getDesigName(user.designation_id, user); + if (dept && desig) { + return{dept} · {desig}
; + } else if (dept || desig) { + return{dept || desig}
; + } else { + return{getRoleName(user.role_id, user)}
; + } + })()}