feat(capa): proof form for owners and photo gallery for HSE
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -5,8 +5,8 @@ import Link from 'next/link'
|
||||
import { ArrowLeft } from 'lucide-react'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { capaActions, incidents, users } from '@/lib/db/schema'
|
||||
import { eq } from 'drizzle-orm'
|
||||
import { capaActions, evidenceFiles, incidents, users } from '@/lib/db/schema'
|
||||
import { eq, and, asc } from 'drizzle-orm'
|
||||
import { aliasedTable } from 'drizzle-orm'
|
||||
import { VerifyForm } from '@/components/capa/verify-form'
|
||||
import { CloseCapaButton } from '@/components/capa/close-capa-button'
|
||||
@@ -60,6 +60,13 @@ export default async function CapaDetailPage({ params }: Props) {
|
||||
|
||||
if (!capa) notFound()
|
||||
|
||||
const photos = await asAdmin(db =>
|
||||
db.select({ id: evidenceFiles.id, fileUrl: evidenceFiles.fileUrl, fileType: evidenceFiles.fileType })
|
||||
.from(evidenceFiles)
|
||||
.where(and(eq(evidenceFiles.capaId, id), eq(evidenceFiles.deleted, false)))
|
||||
.orderBy(asc(evidenceFiles.uploadedAt))
|
||||
)
|
||||
|
||||
const isHse = session && ['hse', 'admin'].includes(session.role)
|
||||
const status = capa.status
|
||||
const today = new Date().toISOString().slice(0, 10)
|
||||
@@ -102,7 +109,7 @@ export default async function CapaDetailPage({ params }: Props) {
|
||||
{isHse && status === 'pending_verification' && <VerifyForm capaId={id} />}
|
||||
{isHse && status === 'verified' && <CloseCapaButton capaId={id} />}
|
||||
|
||||
{(capa.ownerNotes || capa.completedAt) && (
|
||||
{(capa.ownerNotes || capa.completedAt || photos.length > 0) && (
|
||||
<section className="space-y-2 rounded-xl bg-surface p-5 shadow-card">
|
||||
<h2 className="text-sm font-semibold">Completion report</h2>
|
||||
{capa.completedAt && (
|
||||
@@ -113,6 +120,18 @@ export default async function CapaDetailPage({ params }: Props) {
|
||||
{capa.ownerNotes && (
|
||||
<p className="whitespace-pre-wrap text-[13px] text-ink-3">{capa.ownerNotes}</p>
|
||||
)}
|
||||
{photos.length > 0 && (
|
||||
<ul className="grid grid-cols-2 gap-2 sm:grid-cols-3">
|
||||
{photos.map(p => (
|
||||
<li key={p.id}>
|
||||
<a href={p.fileUrl} target="_blank" rel="noreferrer" className="block overflow-hidden rounded-md shadow-card">
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img src={p.fileUrl} alt="CAPA completion evidence" className="aspect-square w-full object-cover" />
|
||||
</a>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
</section>
|
||||
)}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user