From c49a2e28ce3cc6a720dc7e0d1466d3c01e1bb2cc Mon Sep 17 00:00:00 2001
From: Taleef7 <tamst01@pfw.edu>
Date: Sun, 26 Apr 2026 23:48:20 -0400
Subject: [PATCH 1/2] feat: improve admin matching and pricing polish

---
 app/admin/matches/[id]/page.tsx               | 30 ++++++-
 app/admin/payments/page.tsx                   |  3 +-
 app/admin/requests/RequestFilters.tsx         | 31 +++++++
 app/admin/requests/[id]/AssignTutorForm.tsx   | 41 +++++++--
 app/admin/requests/[id]/page.tsx              | 10 +++
 app/admin/requests/page.tsx                   | 46 +++++++---
 app/admin/tutors/[id]/page.tsx                |  9 ++
 app/dashboard/packages/[id]/page.tsx          |  3 +-
 app/dashboard/packages/new/page.tsx           |  3 +-
 app/page.tsx                                  |  3 +-
 components/admin/AdminBreadcrumbs.tsx         | 36 ++++++++
 .../admin/__tests__/AdminBreadcrumbs.test.ts  | 23 +++++
 docs/GAP_ANALYSIS.md                          |  4 +-
 docs/plan-CorvEd.md                           |  8 +-
 lib/admin/__tests__/request-search.test.ts    | 35 ++++++++
 lib/admin/request-search.ts                   | 37 ++++++++
 lib/utils/__tests__/availability.test.ts      | 53 +++++++++++
 lib/utils/__tests__/currency.test.ts          | 14 +++
 lib/utils/availability.ts                     | 88 +++++++++++++++++++
 lib/utils/currency.ts                         |  9 ++
 20 files changed, 459 insertions(+), 27 deletions(-)
 create mode 100644 components/admin/AdminBreadcrumbs.tsx
 create mode 100644 components/admin/__tests__/AdminBreadcrumbs.test.ts
 create mode 100644 lib/admin/__tests__/request-search.test.ts
 create mode 100644 lib/admin/request-search.ts
 create mode 100644 lib/utils/__tests__/availability.test.ts
 create mode 100644 lib/utils/__tests__/currency.test.ts
 create mode 100644 lib/utils/availability.ts
 create mode 100644 lib/utils/currency.ts

diff --git a/app/admin/matches/[id]/page.tsx b/app/admin/matches/[id]/page.tsx
index e7ebf65..508c2d2 100644
--- a/app/admin/matches/[id]/page.tsx
+++ b/app/admin/matches/[id]/page.tsx
@@ -11,6 +11,7 @@ import { LEVEL_LABELS } from '@/lib/utils/request'
 import { ReassignTutorForm, EditMatchForm, GenerateSessionsForm, DeleteSessionsForm, AdminNotesForm } from './MatchActions'
 import { CopyMessageButton } from '@/components/CopyMessageButton'
 import { WhatsAppLink } from '@/components/WhatsAppLink'
+import { AdminBreadcrumbs } from '@/components/admin/AdminBreadcrumbs'
 import { templates } from '@/lib/whatsapp/templates'
 
 const DAY_NAMES = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
@@ -163,6 +164,14 @@ export default async function AdminMatchDetailPage({
 
   return (
     <div className="mx-auto max-w-3xl space-y-6">
+      <AdminBreadcrumbs
+        items={[
+          { label: 'Admin', href: '/admin' },
+          { label: 'Matches', href: '/admin/matches' },
+          { label: 'Match Detail' },
+        ]}
+      />
+
       {assigned === '1' && (
         <div className="border-2 border-[#121212] bg-white px-6 py-4 text-[#121212]">
           <p className="font-semibold">Tutor assigned successfully.</p>
@@ -210,7 +219,18 @@ export default async function AdminMatchDetailPage({
         <dl className="grid gap-x-8 gap-y-3 text-sm sm:grid-cols-2">
           <div>
             <dt className="text-[#121212]/60">Student</dt>
-            <dd className="font-medium text-[#121212]">{studentName}</dd>
+            <dd className="font-medium text-[#121212]">
+              {studentProfile?.display_name ? (
+                <Link
+                  href={`/admin/users?search=${encodeURIComponent(studentProfile.display_name)}`}
+                  className="text-[#1040C0] underline-offset-4 hover:underline"
+                >
+                  {studentName}
+                </Link>
+              ) : (
+                studentName
+              )}
+            </dd>
             {studentProfile?.whatsapp_number && (
               <dd className="mt-1 flex items-center gap-2 text-xs text-[#121212]/40">
                 📱 {studentProfile.whatsapp_number}
@@ -225,6 +245,14 @@ export default async function AdminMatchDetailPage({
               {tutorUserProfile?.display_name ?? '—'}
             </dd>
             <dd className="text-xs text-[#121212]/40">{tutorProfile?.timezone}</dd>
+            <dd className="mt-1 text-xs">
+              <Link
+                href={`/admin/tutors/${match.tutor_user_id}`}
+                className="font-bold text-[#1040C0] underline-offset-4 hover:underline"
+              >
+                View tutor profile
+              </Link>
+            </dd>
             {tutorUserProfile?.whatsapp_number && (
               <dd className="mt-1 flex items-center gap-2 text-xs text-[#121212]/40">
                 📱 {tutorUserProfile.whatsapp_number}
diff --git a/app/admin/payments/page.tsx b/app/admin/payments/page.tsx
index 42a4e5d..88d2303 100644
--- a/app/admin/payments/page.tsx
+++ b/app/admin/payments/page.tsx
@@ -11,6 +11,7 @@ import { PaymentQuickActions } from './PaymentQuickActions'
 import Link from 'next/link'
 import { templates } from '@/lib/whatsapp/templates'
 import { PAYMENT_INSTRUCTIONS } from '@/lib/config/pricing'
+import { formatPkr } from '@/lib/utils/currency'
 import { AdminPagination, PAGE_SIZE } from '@/components/AdminPagination'
 
 const STATUS_COLOURS: Record<string, string> = {
@@ -149,7 +150,7 @@ export default async function AdminPaymentsPage({
                       {subjectName} · {level} · {pkg?.tier_sessions ?? '?'} sessions/month
                     </p>
                     <p className="text-sm text-[#121212]/60">
-                      Amount: <span className="font-bold text-[#121212]">PKR {payment.amount_pkr.toLocaleString()}</span>
+                      Amount: <span className="font-bold text-[#121212]">{formatPkr(payment.amount_pkr)}</span>
                     </p>
                     <p className="text-xs text-[#121212]/40">Submitted: {submittedDate}</p>
                     {payment.reference && (
diff --git a/app/admin/requests/RequestFilters.tsx b/app/admin/requests/RequestFilters.tsx
index a8a578a..0a4bd80 100644
--- a/app/admin/requests/RequestFilters.tsx
+++ b/app/admin/requests/RequestFilters.tsx
@@ -10,6 +10,7 @@ type RequestFiltersProps = {
   activeStatus: string
   activeSubject: string | undefined
   activeLevel: string | undefined
+  activeSearch: string | undefined
 }
 
 export function RequestFilters({
@@ -17,12 +18,14 @@ export function RequestFilters({
   activeStatus,
   activeSubject,
   activeLevel,
+  activeSearch,
 }: RequestFiltersProps) {
   function buildHref(params: Record<string, string | undefined>): string {
     const merged: Record<string, string | undefined> = {
       status: activeStatus !== 'all' ? activeStatus : undefined,
       subject: activeSubject,
       level: activeLevel,
+      q: activeSearch,
       ...params,
     }
     const qs = Object.entries(merged)
@@ -34,6 +37,34 @@ export function RequestFilters({
 
   return (
     <div className="flex flex-wrap gap-3">
+      <form action="/admin/requests" className="flex flex-wrap gap-2">
+        {activeStatus !== 'all' && <input type="hidden" name="status" value={activeStatus} />}
+        {activeSubject && <input type="hidden" name="subject" value={activeSubject} />}
+        {activeLevel && <input type="hidden" name="level" value={activeLevel} />}
+        <input
+          type="search"
+          name="q"
+          defaultValue={activeSearch ?? ''}
+          placeholder="Search student, requester, or subject"
+          className="min-h-[38px] min-w-[260px] border-2 border-[#121212] px-3 py-1.5 text-sm"
+          aria-label="Search requests"
+        />
+        <button
+          type="submit"
+          className="border-2 border-[#121212] bg-[#121212] px-3 py-1.5 text-xs font-bold uppercase tracking-widest text-white"
+        >
+          Search
+        </button>
+        {activeSearch && (
+          <a
+            href={buildHref({ q: undefined })}
+            className="inline-flex min-h-[38px] items-center border-2 border-[#B0B0B0] bg-white px-3 py-1.5 text-xs font-bold uppercase tracking-widest text-[#121212]/70 hover:border-[#1040C0] hover:text-[#1040C0]"
+          >
+            Clear
+          </a>
+        )}
+      </form>
+
       {/* Subject filter */}
       <select
         value={activeSubject ?? ''}
diff --git a/app/admin/requests/[id]/AssignTutorForm.tsx b/app/admin/requests/[id]/AssignTutorForm.tsx
index d0e9312..3c96414 100644
--- a/app/admin/requests/[id]/AssignTutorForm.tsx
+++ b/app/admin/requests/[id]/AssignTutorForm.tsx
@@ -6,6 +6,10 @@
 import { useActionState, useState } from 'react'
 import Link from 'next/link'
 import { assignTutor } from '../actions'
+import {
+  type AvailabilityWindow,
+  getAvailabilityOverlapSummary,
+} from '@/lib/utils/availability'
 
 const DAY_OPTIONS = [
   { label: 'Sun', value: 0 },
@@ -19,14 +23,12 @@ const DAY_OPTIONS = [
 
 const DAY_SHORT = ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa']
 
-type AvailWindow = { day: number; start: string; end: string }
-
 export type EligibleTutor = {
   tutor_user_id: string
   bio: string | null
   timezone: string
   user_profiles: { display_name: string; whatsapp_number: string | null } | null
-  tutor_availability: { windows: AvailWindow[] } | null
+  tutor_availability: { windows: AvailabilityWindow[] } | null
 }
 
 type ActionResult = { error?: string; matchId?: string } | undefined
@@ -59,13 +61,13 @@ async function assignAction(
 }
 
 /** Visual availability calendar: 7 columns (days), time-block rows colour-coded */
-function AvailabilityCalendar({ windows }: { windows: AvailWindow[] }) {
+function AvailabilityCalendar({ windows }: { windows: AvailabilityWindow[] }) {
   if (windows.length === 0) {
     return <p className="text-xs text-[#121212]/40 italic">No availability set</p>
   }
 
   // Group windows by day
-  const byDay: Record<number, AvailWindow[]> = {}
+  const byDay: Record<number, AvailabilityWindow[]> = {}
   for (const w of windows) {
     if (!byDay[w.day]) byDay[w.day] = []
     byDay[w.day].push(w)
@@ -100,18 +102,41 @@ function AvailabilityCalendar({ windows }: { windows: AvailWindow[] }) {
   )
 }
 
+function formatOverlapWindows(overlaps: AvailabilityWindow[]): string {
+  return overlaps
+    .map((window) => `${DAY_OPTIONS.find((day) => day.value === window.day)?.label ?? window.day} ${window.start}-${window.end}`)
+    .join(', ')
+}
+
 /** Single collapsible tutor card */
 function TutorCard({
   tutor,
+  requestAvailabilityWindows,
   isSelected,
   onSelect,
 }: {
   tutor: EligibleTutor
+  requestAvailabilityWindows: AvailabilityWindow[]
   isSelected: boolean
   onSelect: () => void
 }) {
   const [expanded, setExpanded] = useState(isSelected)
   const windows = tutor.tutor_availability?.windows ?? []
+  const overlap = getAvailabilityOverlapSummary(requestAvailabilityWindows, windows)
+  const overlapLabel =
+    overlap.status === 'overlap'
+      ? `Overlap: ${formatOverlapWindows(overlap.overlaps)}`
+      : overlap.status === 'none'
+        ? 'No requested-time overlap'
+        : overlap.status === 'missing_request'
+          ? 'Request availability missing'
+          : 'Tutor availability missing'
+  const overlapClass =
+    overlap.status === 'overlap'
+      ? 'border-[#1040C0] bg-[#1040C0]/10 text-[#1040C0]'
+      : overlap.status === 'none'
+        ? 'border-[#D02020] bg-[#D02020]/10 text-[#D02020]'
+        : 'border-[#F0C020] bg-[#F0C020]/20 text-[#121212]'
   const name = tutor.user_profiles?.display_name ?? '—'
 
   return (
@@ -137,6 +162,9 @@ function TutorCard({
           className="h-4 w-4 flex-shrink-0 accent-[#1040C0]"
         />
         <span className="flex-1 font-semibold text-[#121212]">{name}</span>
+        <span className={`border px-2 py-0.5 text-[10px] font-bold uppercase tracking-wide ${overlapClass}`}>
+          {overlapLabel}
+        </span>
         <span className="text-xs text-[#121212]/40">{tutor.timezone}</span>
         <button
           type="button"
@@ -177,10 +205,12 @@ function TutorCard({
 export function AssignTutorForm({
   requestId,
   requestTimezone,
+  requestAvailabilityWindows,
   eligibleTutors,
 }: {
   requestId: string
   requestTimezone: string
+  requestAvailabilityWindows: AvailabilityWindow[]
   eligibleTutors: EligibleTutor[]
 }) {
   const [selectedTutorId, setSelectedTutorId] = useState<string | null>(null)
@@ -223,6 +253,7 @@ export function AssignTutorForm({
             <TutorCard
               key={tutor.tutor_user_id}
               tutor={tutor}
+              requestAvailabilityWindows={requestAvailabilityWindows}
               isSelected={selectedTutorId === tutor.tutor_user_id}
               onSelect={() => setSelectedTutorId(tutor.tutor_user_id)}
             />
diff --git a/app/admin/requests/[id]/page.tsx b/app/admin/requests/[id]/page.tsx
index 5085992..313a292 100644
--- a/app/admin/requests/[id]/page.tsx
+++ b/app/admin/requests/[id]/page.tsx
@@ -11,6 +11,7 @@ import { STATUS_COLOURS, STATUS_LABELS, LEVEL_LABELS } from '@/lib/utils/request
 import { AssignTutorForm } from './AssignTutorForm'
 import { AdminRequestActions } from './AdminRequestActions'
 import { WhatsAppLink } from '@/components/WhatsAppLink'
+import { AdminBreadcrumbs } from '@/components/admin/AdminBreadcrumbs'
 
 const EXAM_BOARD_LABELS: Record<string, string> = {
   cambridge: 'Cambridge',
@@ -148,6 +149,14 @@ export default async function AdminRequestDetailPage({
 
   return (
     <div className="space-y-6">
+      <AdminBreadcrumbs
+        items={[
+          { label: 'Admin', href: '/admin' },
+          { label: 'Requests', href: '/admin/requests' },
+          { label: 'Request Detail' },
+        ]}
+      />
+
       {/* Back link */}
       <Link
         href="/admin/requests"
@@ -328,6 +337,7 @@ export default async function AdminRequestDetailPage({
             <AssignTutorForm
               requestId={request.id}
               requestTimezone={request.timezone}
+              requestAvailabilityWindows={availWindows}
               eligibleTutors={eligibleTutors}
             />
           ) : request.status === 'matched' || request.status === 'active' ? (
diff --git a/app/admin/requests/page.tsx b/app/admin/requests/page.tsx
index 6599159..189ba16 100644
--- a/app/admin/requests/page.tsx
+++ b/app/admin/requests/page.tsx
@@ -8,6 +8,7 @@ import { createAdminClient } from '@/lib/supabase/admin'
 import { STATUS_COLOURS, STATUS_LABELS, LEVEL_LABELS } from '@/lib/utils/request'
 import { RequestFilters } from './RequestFilters'
 import { AdminPagination, PAGE_SIZE } from '@/components/AdminPagination'
+import { filterAdminRequestsBySearch, normalizeAdminRequestSearch } from '@/lib/admin/request-search'
 import type { Database } from '@/lib/supabase/database.types'
 
 type RequestStatusEnum = Database['public']['Enums']['request_status_enum']
@@ -43,10 +44,11 @@ type FilterStatus = 'all' | (typeof ALL_STATUSES)[number]
 export default async function AdminRequestsPage({
   searchParams,
 }: {
-  searchParams: Promise<{ status?: string; subject?: string; level?: string; page?: string }>
+  searchParams: Promise<{ status?: string; subject?: string; level?: string; q?: string; page?: string }>
 }) {
-  const { status, subject, level, page } = await searchParams
+  const { status, subject, level, q, page } = await searchParams
   const activeStatus: FilterStatus = ALL_STATUSES.includes(status ?? '') ? status! : 'all'
+  const activeSearch = normalizeAdminRequestSearch(q)
   const currentPage = Math.max(1, parseInt(page ?? '1', 10) || 1)
   const from = (currentPage - 1) * PAGE_SIZE
   const to = from + PAGE_SIZE - 1
@@ -79,16 +81,35 @@ export default async function AdminRequestsPage({
     dataQuery = dataQuery.eq('level', level as LevelEnum)
   }
 
-  dataQuery = dataQuery.range(from, to)
+  const subjectsQuery = admin.from('subjects').select('id, name').eq('active', true).order('sort_order')
 
-  const [{ count: totalCount }, { data: requestsData }, { data: subjectsData }] = await Promise.all([
-    countQuery,
-    dataQuery,
-    admin.from('subjects').select('id, name').eq('active', true).order('sort_order'),
-  ])
+  let requests: RequestRow[] = []
+  let totalCount = 0
+  let subjects: { id: number; name: string }[] = []
 
-  const requests = (requestsData ?? []) as unknown as RequestRow[]
-  const subjects = (subjectsData ?? []) as { id: number; name: string }[]
+  if (activeSearch) {
+    const [{ data: requestsData }, { data: subjectsData }] = await Promise.all([
+      dataQuery,
+      subjectsQuery,
+    ])
+    const filteredRequests = filterAdminRequestsBySearch(
+      (requestsData ?? []) as unknown as RequestRow[],
+      activeSearch,
+    )
+    totalCount = filteredRequests.length
+    requests = filteredRequests.slice(from, to + 1)
+    subjects = (subjectsData ?? []) as { id: number; name: string }[]
+  } else {
+    dataQuery = dataQuery.range(from, to)
+    const [{ count }, { data: requestsData }, { data: subjectsData }] = await Promise.all([
+      countQuery,
+      dataQuery,
+      subjectsQuery,
+    ])
+    totalCount = count ?? 0
+    requests = (requestsData ?? []) as unknown as RequestRow[]
+    subjects = (subjectsData ?? []) as { id: number; name: string }[]
+  }
 
   const statusLinks: { label: string; value: FilterStatus }[] = [
     { label: 'All', value: 'all' },
@@ -102,7 +123,7 @@ export default async function AdminRequestsPage({
   ]
 
   function buildStatusHref(newStatus: FilterStatus) {
-    const qs = Object.entries({ status: newStatus !== 'all' ? newStatus : undefined, subject, level })
+    const qs = Object.entries({ status: newStatus !== 'all' ? newStatus : undefined, subject, level, q: activeSearch || undefined })
       .filter(([, v]) => v !== undefined && v !== '')
       .map(([k, v]) => `${k}=${encodeURIComponent(v!)}`)
       .join('&')
@@ -114,7 +135,7 @@ export default async function AdminRequestsPage({
       <div className="flex items-center justify-between">
         <h1 className="text-3xl font-black uppercase tracking-tighter text-[#121212]">Requests</h1>
         <p className="text-sm text-[#121212]/60">
-          {totalCount ?? requests.length} request{(totalCount ?? requests.length) !== 1 ? 's' : ''}
+          {totalCount} request{totalCount !== 1 ? 's' : ''}
         </p>
       </div>
 
@@ -141,6 +162,7 @@ export default async function AdminRequestsPage({
         activeStatus={activeStatus}
         activeSubject={subject}
         activeLevel={level}
+        activeSearch={activeSearch}
       />
 
       {/* Table */}
diff --git a/app/admin/tutors/[id]/page.tsx b/app/admin/tutors/[id]/page.tsx
index 432fdbf..462ee7c 100644
--- a/app/admin/tutors/[id]/page.tsx
+++ b/app/admin/tutors/[id]/page.tsx
@@ -8,6 +8,7 @@ import Link from 'next/link'
 import { createAdminClient } from '@/lib/supabase/admin'
 import { ApproveButton, RevokeButton } from '../TutorActions'
 import { WhatsAppLink } from '@/components/WhatsAppLink'
+import { AdminBreadcrumbs } from '@/components/admin/AdminBreadcrumbs'
 
 const DAY_NAMES = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
 
@@ -74,6 +75,14 @@ export default async function AdminTutorDetailPage({
 
   return (
     <div className="mx-auto max-w-2xl space-y-6">
+      <AdminBreadcrumbs
+        items={[
+          { label: 'Admin', href: '/admin' },
+          { label: 'Tutors', href: '/admin/tutors' },
+          { label: profile?.display_name ?? 'Tutor Detail' },
+        ]}
+      />
+
       {/* Back link */}
       <Link
         href="/admin/tutors"
diff --git a/app/dashboard/packages/[id]/page.tsx b/app/dashboard/packages/[id]/page.tsx
index 0fb0f1b..30fb03f 100644
--- a/app/dashboard/packages/[id]/page.tsx
+++ b/app/dashboard/packages/[id]/page.tsx
@@ -12,6 +12,7 @@ import {
   isAllowedPaymentProofType,
   MAX_PAYMENT_PROOF_SIZE_BYTES,
 } from '@/lib/payments/proofs'
+import { formatPkr } from '@/lib/utils/currency'
 import { LEVEL_LABELS } from '@/lib/utils/request'
 
 type PackageRow = {
@@ -293,7 +294,7 @@ export default function PackageDetailPage() {
             {formatDate(pkg.start_date)} → {formatDate(pkg.end_date)}
           </p>
           <p className="mt-3 text-2xl font-bold text-[#1040C0]">
-            PKR {payment.amount_pkr.toLocaleString()}
+            {formatPkr(payment.amount_pkr)}
           </p>
           {pkgConfig && (
             <p className="mt-1 text-xs text-[#121212]/40">{pkgConfig.typicalFrequency} · 60 min/session</p>
diff --git a/app/dashboard/packages/new/page.tsx b/app/dashboard/packages/new/page.tsx
index a06d791..fb89f9c 100644
--- a/app/dashboard/packages/new/page.tsx
+++ b/app/dashboard/packages/new/page.tsx
@@ -6,6 +6,7 @@
 import { Suspense, useState } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { PACKAGES } from '@/lib/config/pricing'
+import { formatPkr } from '@/lib/utils/currency'
 
 function NewPackageContent() {
   const router = useRouter()
@@ -94,7 +95,7 @@ function NewPackageContent() {
                   {pkg.typicalFrequency}
                 </p>
                 <p className={`mt-3 text-lg font-bold ${isSelected ? 'text-white' : 'text-[#1040C0]'}`}>
-                  PKR {pkg.pricePerMonthPkr.toLocaleString()}
+                  {formatPkr(pkg.pricePerMonthPkr)}
                 </p>
                 <p className={`mt-1 text-xs ${isSelected ? 'text-white/60' : 'text-[#121212]/40'}`}>
                   {pkg.description}
diff --git a/app/page.tsx b/app/page.tsx
index feadb34..bf3c5c3 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -4,6 +4,7 @@ import { WhatsAppCTA } from '@/components/WhatsAppCTA'
 import { createClient } from '@/lib/supabase/server'
 import { signOut } from '@/app/auth/actions'
 import { PACKAGES as PACKAGE_CONFIGS } from '@/lib/config/pricing'
+import { formatPkr } from '@/lib/utils/currency'
 
 const SUBJECTS = [
   'Mathematics',
@@ -54,7 +55,7 @@ const LANDING_PACKAGES = PACKAGE_CONFIGS.map((pkg) => {
     ...(cardStyle ?? {}),
     sessions: pkg.sessionsPerMonth,
     frequency: pkg.typicalFrequency,
-    price: `PKR ${pkg.pricePerMonthPkr.toLocaleString('en-PK')}`,
+    price: formatPkr(pkg.pricePerMonthPkr),
     description: cardStyle?.description ?? pkg.description,
     highlight: cardStyle?.highlight ?? pkg.tier === 12,
     accentColor: cardStyle?.accentColor ?? '#1040C0',
diff --git a/components/admin/AdminBreadcrumbs.tsx b/components/admin/AdminBreadcrumbs.tsx
new file mode 100644
index 0000000..197aba4
--- /dev/null
+++ b/components/admin/AdminBreadcrumbs.tsx
@@ -0,0 +1,36 @@
+import Link from 'next/link'
+
+export type AdminBreadcrumbItem = {
+  label: string
+  href?: string
+}
+
+export function AdminBreadcrumbs({ items }: { items: AdminBreadcrumbItem[] }) {
+  return (
+    <nav aria-label="Admin breadcrumb" className="text-sm">
+      <ol className="flex flex-wrap items-center gap-2 text-[#121212]/50">
+        {items.map((item, index) => {
+          const isLast = index === items.length - 1
+
+          return (
+            <li key={`${item.label}-${index}`} className="flex items-center gap-2">
+              {item.href && !isLast ? (
+                <Link
+                  href={item.href}
+                  className="font-bold text-[#1040C0] underline-offset-4 hover:underline"
+                >
+                  {item.label}
+                </Link>
+              ) : (
+                <span className={isLast ? 'font-semibold text-[#121212]' : undefined}>
+                  {item.label}
+                </span>
+              )}
+              {!isLast && <span aria-hidden="true">/</span>}
+            </li>
+          )
+        })}
+      </ol>
+    </nav>
+  )
+}
diff --git a/components/admin/__tests__/AdminBreadcrumbs.test.ts b/components/admin/__tests__/AdminBreadcrumbs.test.ts
new file mode 100644
index 0000000..437fc49
--- /dev/null
+++ b/components/admin/__tests__/AdminBreadcrumbs.test.ts
@@ -0,0 +1,23 @@
+import React from 'react'
+import { renderToStaticMarkup } from 'react-dom/server'
+import { describe, expect, test } from 'vitest'
+
+import { AdminBreadcrumbs } from '@/components/admin/AdminBreadcrumbs'
+
+describe('AdminBreadcrumbs', () => {
+  test('renders deterministic admin return links without browser history', () => {
+    const html = renderToStaticMarkup(
+      React.createElement(AdminBreadcrumbs, {
+        items: [
+          { label: 'Admin', href: '/admin' },
+          { label: 'Requests', href: '/admin/requests' },
+          { label: 'Request Detail' },
+        ],
+      }),
+    )
+
+    expect(html).toContain('href="/admin"')
+    expect(html).toContain('href="/admin/requests"')
+    expect(html).toContain('Request Detail')
+  })
+})
diff --git a/docs/GAP_ANALYSIS.md b/docs/GAP_ANALYSIS.md
index ae7a25e..eb1947e 100644
--- a/docs/GAP_ANALYSIS.md
+++ b/docs/GAP_ANALYSIS.md
@@ -61,12 +61,12 @@
 | **Severity** | Critical |
 | **Status** | **RESOLVED** — Migration `20260303000001_fix_double_increment_guard.sql` replaces the RPC with a guarded version that checks previous status before incrementing/decrementing. Also adds `decrement_sessions_used` helper. Local Supabase integration tests now verify double-submit stability, consuming/non-consuming transitions, service-role direct increments, and future-session blocking. |
 
-### B2. ~~Documentation says `p_package_id` but code uses `p_request_id`~~ ✅ DONE
+### B2. ~~Documentation used an old package-id RPC example but code uses `p_request_id`~~ ✅ DONE
 
 | | |
 |---|---|
 | **Severity** | Important |
-| **Status** | **RESOLVED** — `CLAUDE.md` updated to say `increment_sessions_used(p_request_id)`. |
+| **Status** | **RESOLVED** — Contributor-facing RPC examples now use `increment_sessions_used(p_request_id)` where present, and a repo search confirms no stale package-id RPC parameter example remains. |
 
 ### B3. ~~Reschedule is admin-only; students have no self-service path~~ ✅ DONE
 
diff --git a/docs/plan-CorvEd.md b/docs/plan-CorvEd.md
index de75481..b650c68 100644
--- a/docs/plan-CorvEd.md
+++ b/docs/plan-CorvEd.md
@@ -121,8 +121,8 @@ These are the items required before MVP v0.1 is declared done per the exit crite
 
 ### 3.2 Nice-to-Have for v0.1 (but not blockers)
 
-- [ ] **Tutor availability overlap matching** — the current `fetchApprovedTutors` filters by subject and level but does not compare tutor availability_windows against the student's requested availability.
-- [ ] **Admin match detail: link to student and tutor profiles** — the match detail page shows names but should link to the user management and tutor detail pages.
+- [x] **Tutor availability overlap matching** — the admin assignment screen now shows overlap, no-overlap, and missing-availability hints using `lib/utils/availability.ts`; assignment remains manual.
+- [x] **Admin match detail: link to student and tutor profiles** — match detail now links the requester into admin user search and the tutor to the tutor detail page.
 - [x] **"What happens next" status banners** — `components/dashboards/StatusBanner.tsx` created and integrated into student dashboard.
 - [x] **Tutor no-show handling in admin** — `/admin/sessions?status=no_show` now intentionally groups `no_show_student` and `no_show_tutor`, so analytics links land on the sessions requiring follow-up.
 
@@ -138,6 +138,8 @@ These are the items required before MVP v0.1 is declared done per the exit crite
 - [x] **Empty states** — friendly empty state messages on list pages.
 - [x] **Error handling** — toast notifications standardized via Sonner. Zod validation for admin actions.
 - [x] **Reschedule cutoff warning** — `RescheduleButton` already implements 24-hour cutoff.
+- [x] **Admin detail breadcrumbs** — request, tutor, and match detail pages now expose deterministic admin breadcrumb return paths.
+- [x] **PKR formatting consistency** — pricing and payment UI now use shared `formatPkr()` formatting.
 
 ### 4.2 Design System Application — ✅ DONE
 
@@ -152,7 +154,7 @@ The Bauhaus design system has been applied:
 ### 4.3 Operational Tooling
 
 - [ ] **Admin WhatsApp copy buttons — comprehensive coverage** — extend to: 1-hour reminder, reschedule confirmation, no-show policy reminder on session pages.
-- [ ] **Filter and search improvements** — add text search by student name/subject to admin requests page.
+- [x] **Filter and search improvements** — admin requests now support text search by student/requester/subject and compose with status, subject, and level filters.
 - [x] **Audit log privacy hygiene** — audit detail writes use `sanitizeAuditDetails()` and the tutor session RPC redacts free-text notes before inserting into `audit_logs`.
 
 ### 4.4 Reliability & Error Handling — MOSTLY DONE
diff --git a/lib/admin/__tests__/request-search.test.ts b/lib/admin/__tests__/request-search.test.ts
new file mode 100644
index 0000000..4efe152
--- /dev/null
+++ b/lib/admin/__tests__/request-search.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, test } from 'vitest'
+
+import { filterAdminRequestsBySearch, normalizeAdminRequestSearch } from '@/lib/admin/request-search'
+
+const requests = [
+  {
+    for_student_name: 'Amina Khan',
+    subjects: { name: 'Mathematics' },
+    user_profiles: { display_name: 'Sara Khan' },
+  },
+  {
+    for_student_name: null,
+    subjects: { name: 'Physics' },
+    user_profiles: { display_name: 'Bilal Ahmed' },
+  },
+]
+
+describe('normalizeAdminRequestSearch', () => {
+  test('trims and collapses repeated whitespace', () => {
+    expect(normalizeAdminRequestSearch('  amina   math  ')).toBe('amina math')
+  })
+})
+
+describe('filterAdminRequestsBySearch', () => {
+  test('matches student/requester names and subject text case-insensitively', () => {
+    expect(filterAdminRequestsBySearch(requests, 'amina')).toEqual([requests[0]])
+    expect(filterAdminRequestsBySearch(requests, 'sara')).toEqual([requests[0]])
+    expect(filterAdminRequestsBySearch(requests, 'PHY')).toEqual([requests[1]])
+  })
+
+  test('requires every search token to match the request search text', () => {
+    expect(filterAdminRequestsBySearch(requests, 'amina mathematics')).toEqual([requests[0]])
+    expect(filterAdminRequestsBySearch(requests, 'amina physics')).toEqual([])
+  })
+})
diff --git a/lib/admin/request-search.ts b/lib/admin/request-search.ts
new file mode 100644
index 0000000..9b163d6
--- /dev/null
+++ b/lib/admin/request-search.ts
@@ -0,0 +1,37 @@
+export type AdminRequestSearchRow = {
+  for_student_name?: string | null
+  subjects?: { name?: string | null } | null
+  user_profiles?: { display_name?: string | null } | null
+}
+
+export function normalizeAdminRequestSearch(query: string | null | undefined): string {
+  return (query ?? '').trim().replace(/\s+/g, ' ').toLowerCase()
+}
+
+function getSearchTokens(query: string | null | undefined): string[] {
+  return normalizeAdminRequestSearch(query).split(' ').filter(Boolean)
+}
+
+function getSearchText(request: AdminRequestSearchRow): string {
+  return [
+    request.for_student_name,
+    request.user_profiles?.display_name,
+    request.subjects?.name,
+  ]
+    .filter(Boolean)
+    .join(' ')
+    .toLowerCase()
+}
+
+export function filterAdminRequestsBySearch<T extends AdminRequestSearchRow>(
+  requests: T[],
+  query: string | null | undefined,
+): T[] {
+  const tokens = getSearchTokens(query)
+  if (tokens.length === 0) return requests
+
+  return requests.filter((request) => {
+    const searchText = getSearchText(request)
+    return tokens.every((token) => searchText.includes(token))
+  })
+}
diff --git a/lib/utils/__tests__/availability.test.ts b/lib/utils/__tests__/availability.test.ts
new file mode 100644
index 0000000..cd15cf0
--- /dev/null
+++ b/lib/utils/__tests__/availability.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, test } from 'vitest'
+
+import {
+  getAvailabilityOverlapSummary,
+  getOverlappingAvailabilityWindows,
+} from '@/lib/utils/availability'
+
+describe('getOverlappingAvailabilityWindows', () => {
+  test('returns same-day time intersections for structured availability windows', () => {
+    expect(
+      getOverlappingAvailabilityWindows(
+        [{ day: 1, start: '17:00', end: '19:00' }],
+        [{ day: 1, start: '18:00', end: '20:00' }],
+      ),
+    ).toEqual([{ day: 1, start: '18:00', end: '19:00' }])
+  })
+
+  test('ignores non-overlap and different-day windows', () => {
+    expect(
+      getOverlappingAvailabilityWindows(
+        [{ day: 1, start: '17:00', end: '18:00' }],
+        [
+          { day: 1, start: '18:00', end: '19:00' },
+          { day: 2, start: '17:30', end: '18:30' },
+        ],
+      ),
+    ).toEqual([])
+  })
+})
+
+describe('getAvailabilityOverlapSummary', () => {
+  test('distinguishes missing request and tutor availability from no overlap', () => {
+    expect(getAvailabilityOverlapSummary([], [{ day: 1, start: '17:00', end: '18:00' }])).toEqual({
+      status: 'missing_request',
+      overlaps: [],
+    })
+
+    expect(getAvailabilityOverlapSummary([{ day: 1, start: '17:00', end: '18:00' }], [])).toEqual({
+      status: 'missing_tutor',
+      overlaps: [],
+    })
+
+    expect(
+      getAvailabilityOverlapSummary(
+        [{ day: 1, start: '17:00', end: '18:00' }],
+        [{ day: 1, start: '19:00', end: '20:00' }],
+      ),
+    ).toEqual({
+      status: 'none',
+      overlaps: [],
+    })
+  })
+})
diff --git a/lib/utils/__tests__/currency.test.ts b/lib/utils/__tests__/currency.test.ts
new file mode 100644
index 0000000..463000a
--- /dev/null
+++ b/lib/utils/__tests__/currency.test.ts
@@ -0,0 +1,14 @@
+import { describe, expect, test } from 'vitest'
+
+import { formatPkr } from '@/lib/utils/currency'
+
+describe('formatPkr', () => {
+  test('formats whole PKR amounts with a stable launch-friendly prefix', () => {
+    expect(formatPkr(8000)).toBe('PKR 8,000')
+    expect(formatPkr(16000)).toBe('PKR 16,000')
+  })
+
+  test('keeps zero placeholder values readable', () => {
+    expect(formatPkr(0)).toBe('PKR 0')
+  })
+})
diff --git a/lib/utils/availability.ts b/lib/utils/availability.ts
new file mode 100644
index 0000000..d380f62
--- /dev/null
+++ b/lib/utils/availability.ts
@@ -0,0 +1,88 @@
+export type AvailabilityWindow = {
+  day: number
+  start: string
+  end: string
+}
+
+export type AvailabilityOverlapStatus =
+  | 'overlap'
+  | 'none'
+  | 'missing_request'
+  | 'missing_tutor'
+
+export type AvailabilityOverlapSummary = {
+  status: AvailabilityOverlapStatus
+  overlaps: AvailabilityWindow[]
+}
+
+function timeToMinutes(time: string): number | null {
+  const match = /^(\d{2}):(\d{2})$/.exec(time)
+  if (!match) return null
+
+  const hours = Number(match[1])
+  const minutes = Number(match[2])
+  if (hours < 0 || hours > 23 || minutes < 0 || minutes > 59) return null
+
+  return hours * 60 + minutes
+}
+
+function minutesToTime(minutes: number): string {
+  const hours = Math.floor(minutes / 60)
+  const mins = minutes % 60
+
+  return `${String(hours).padStart(2, '0')}:${String(mins).padStart(2, '0')}`
+}
+
+export function getOverlappingAvailabilityWindows(
+  requestWindows: AvailabilityWindow[],
+  tutorWindows: AvailabilityWindow[],
+): AvailabilityWindow[] {
+  const overlaps: AvailabilityWindow[] = []
+
+  for (const requestWindow of requestWindows) {
+    const requestStart = timeToMinutes(requestWindow.start)
+    const requestEnd = timeToMinutes(requestWindow.end)
+    if (requestStart === null || requestEnd === null || requestEnd <= requestStart) continue
+
+    for (const tutorWindow of tutorWindows) {
+      if (requestWindow.day !== tutorWindow.day) continue
+
+      const tutorStart = timeToMinutes(tutorWindow.start)
+      const tutorEnd = timeToMinutes(tutorWindow.end)
+      if (tutorStart === null || tutorEnd === null || tutorEnd <= tutorStart) continue
+
+      const start = Math.max(requestStart, tutorStart)
+      const end = Math.min(requestEnd, tutorEnd)
+
+      if (end > start) {
+        overlaps.push({
+          day: requestWindow.day,
+          start: minutesToTime(start),
+          end: minutesToTime(end),
+        })
+      }
+    }
+  }
+
+  return overlaps.sort((a, b) => a.day - b.day || a.start.localeCompare(b.start))
+}
+
+export function getAvailabilityOverlapSummary(
+  requestWindows: AvailabilityWindow[],
+  tutorWindows: AvailabilityWindow[],
+): AvailabilityOverlapSummary {
+  if (requestWindows.length === 0) {
+    return { status: 'missing_request', overlaps: [] }
+  }
+
+  if (tutorWindows.length === 0) {
+    return { status: 'missing_tutor', overlaps: [] }
+  }
+
+  const overlaps = getOverlappingAvailabilityWindows(requestWindows, tutorWindows)
+
+  return {
+    status: overlaps.length > 0 ? 'overlap' : 'none',
+    overlaps,
+  }
+}
diff --git a/lib/utils/currency.ts b/lib/utils/currency.ts
new file mode 100644
index 0000000..ebca790
--- /dev/null
+++ b/lib/utils/currency.ts
@@ -0,0 +1,9 @@
+export function formatPkr(amount: number | null | undefined): string {
+  const value = Number.isFinite(amount) ? Math.max(0, Math.round(amount ?? 0)) : 0
+  const formatted = new Intl.NumberFormat('en-PK', {
+    maximumFractionDigits: 0,
+    minimumFractionDigits: 0,
+  }).format(value)
+
+  return `PKR ${formatted}`
+}

From 38442025867f60766ea9d1ecb7d625db37db74cc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 27 Apr 2026 04:07:27 +0000
Subject: [PATCH 2/2] fix: apply PR review feedback - formatter caching, raw
 search query, DB-level text search, link label fix

Agent-Logs-Url: https://github.com/Taleef7/CorvEd/sessions/1814cfea-3d7d-4359-83cc-92d639d10484

Co-authored-by: Taleef7 <89072337+Taleef7@users.noreply.github.com>
---
 app/admin/matches/[id]/page.tsx |  7 ++-
 app/admin/requests/page.tsx     | 76 ++++++++++++++++++++++-----------
 lib/utils/currency.ts           | 10 +++--
 3 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/app/admin/matches/[id]/page.tsx b/app/admin/matches/[id]/page.tsx
index 508c2d2..1fda6cb 100644
--- a/app/admin/matches/[id]/page.tsx
+++ b/app/admin/matches/[id]/page.tsx
@@ -225,11 +225,16 @@ export default async function AdminMatchDetailPage({
                   href={`/admin/users?search=${encodeURIComponent(studentProfile.display_name)}`}
                   className="text-[#1040C0] underline-offset-4 hover:underline"
                 >
-                  {studentName}
+                  {studentProfile.display_name}
                 </Link>
               ) : (
                 studentName
               )}
+              {request?.requester_role === 'parent' && request?.for_student_name && (
+                <span className="ml-1 text-xs text-[#121212]/50">
+                  (Student: {request.for_student_name})
+                </span>
+              )}
             </dd>
             {studentProfile?.whatsapp_number && (
               <dd className="mt-1 flex items-center gap-2 text-xs text-[#121212]/40">
diff --git a/app/admin/requests/page.tsx b/app/admin/requests/page.tsx
index 189ba16..4ca44c4 100644
--- a/app/admin/requests/page.tsx
+++ b/app/admin/requests/page.tsx
@@ -8,7 +8,7 @@ import { createAdminClient } from '@/lib/supabase/admin'
 import { STATUS_COLOURS, STATUS_LABELS, LEVEL_LABELS } from '@/lib/utils/request'
 import { RequestFilters } from './RequestFilters'
 import { AdminPagination, PAGE_SIZE } from '@/components/AdminPagination'
-import { filterAdminRequestsBySearch, normalizeAdminRequestSearch } from '@/lib/admin/request-search'
+import { normalizeAdminRequestSearch } from '@/lib/admin/request-search'
 import type { Database } from '@/lib/supabase/database.types'
 
 type RequestStatusEnum = Database['public']['Enums']['request_status_enum']
@@ -48,7 +48,8 @@ export default async function AdminRequestsPage({
 }) {
   const { status, subject, level, q, page } = await searchParams
   const activeStatus: FilterStatus = ALL_STATUSES.includes(status ?? '') ? status! : 'all'
-  const activeSearch = normalizeAdminRequestSearch(q)
+  const activeSearch = typeof q === 'string' ? q.trim() : ''
+  const normalizedSearch = normalizeAdminRequestSearch(activeSearch)
   const currentPage = Math.max(1, parseInt(page ?? '1', 10) || 1)
   const from = (currentPage - 1) * PAGE_SIZE
   const to = from + PAGE_SIZE - 1
@@ -83,33 +84,58 @@ export default async function AdminRequestsPage({
 
   const subjectsQuery = admin.from('subjects').select('id, name').eq('active', true).order('sort_order')
 
+  // Apply text search at DB level
+  // For each token, find matching user IDs (display_name) and subject IDs (name),
+  // then OR-filter across for_student_name, created_by_user_id, and subject_id.
+  if (normalizedSearch) {
+    const rawTokens = normalizedSearch.split(' ').filter(Boolean)
+    // Sanitize: remove PostgREST or()-syntax metacharacters, then escape ILIKE wildcards
+    const safeTokens = rawTokens
+      .map((t) => t.replace(/[(),"]/g, '').replace(/[%_]/g, '\\$&'))
+      .filter(Boolean)
+
+    if (safeTokens.length > 0) {
+      // Run all token lookups in parallel (2 queries per token, all concurrent)
+      const lookups = await Promise.all(
+        safeTokens.flatMap((token) => [
+          admin.from('user_profiles').select('user_id').ilike('display_name', `%${token}%`),
+          admin.from('subjects').select('id').ilike('name', `%${token}%`),
+        ]),
+      )
+
+      // Apply per-token AND filters — each token must match at least one field
+      for (let i = 0; i < safeTokens.length; i++) {
+        const token = safeTokens[i]
+        const { data: matchingUsers } = lookups[i * 2] as { data: { user_id: string }[] | null }
+        const { data: matchingSubjects } = lookups[i * 2 + 1] as { data: { id: number }[] | null }
+
+        const userIds = matchingUsers?.map((u) => u.user_id) ?? []
+        const subjectIds = matchingSubjects?.map((s) => s.id) ?? []
+
+        const orParts: string[] = [`for_student_name.ilike.%${token}%`]
+        if (userIds.length > 0) orParts.push(`created_by_user_id.in.(${userIds.join(',')})`)
+        if (subjectIds.length > 0) orParts.push(`subject_id.in.(${subjectIds.join(',')})`)
+
+        countQuery = countQuery.or(orParts.join(','))
+        dataQuery = dataQuery.or(orParts.join(','))
+      }
+    }
+  }
+
+  dataQuery = dataQuery.range(from, to)
+
   let requests: RequestRow[] = []
   let totalCount = 0
   let subjects: { id: number; name: string }[] = []
 
-  if (activeSearch) {
-    const [{ data: requestsData }, { data: subjectsData }] = await Promise.all([
-      dataQuery,
-      subjectsQuery,
-    ])
-    const filteredRequests = filterAdminRequestsBySearch(
-      (requestsData ?? []) as unknown as RequestRow[],
-      activeSearch,
-    )
-    totalCount = filteredRequests.length
-    requests = filteredRequests.slice(from, to + 1)
-    subjects = (subjectsData ?? []) as { id: number; name: string }[]
-  } else {
-    dataQuery = dataQuery.range(from, to)
-    const [{ count }, { data: requestsData }, { data: subjectsData }] = await Promise.all([
-      countQuery,
-      dataQuery,
-      subjectsQuery,
-    ])
-    totalCount = count ?? 0
-    requests = (requestsData ?? []) as unknown as RequestRow[]
-    subjects = (subjectsData ?? []) as { id: number; name: string }[]
-  }
+  const [{ count }, { data: requestsData }, { data: subjectsData }] = await Promise.all([
+    countQuery,
+    dataQuery,
+    subjectsQuery,
+  ])
+  totalCount = count ?? 0
+  requests = (requestsData ?? []) as unknown as RequestRow[]
+  subjects = (subjectsData ?? []) as { id: number; name: string }[]
 
   const statusLinks: { label: string; value: FilterStatus }[] = [
     { label: 'All', value: 'all' },
diff --git a/lib/utils/currency.ts b/lib/utils/currency.ts
index ebca790..ccef686 100644
--- a/lib/utils/currency.ts
+++ b/lib/utils/currency.ts
@@ -1,9 +1,11 @@
+const pkrNumberFormatter = new Intl.NumberFormat('en-PK', {
+  maximumFractionDigits: 0,
+  minimumFractionDigits: 0,
+})
+
 export function formatPkr(amount: number | null | undefined): string {
   const value = Number.isFinite(amount) ? Math.max(0, Math.round(amount ?? 0)) : 0
-  const formatted = new Intl.NumberFormat('en-PK', {
-    maximumFractionDigits: 0,
-    minimumFractionDigits: 0,
-  }).format(value)
+  const formatted = pkrNumberFormatter.format(value)
 
   return `PKR ${formatted}`
 }