setia/ims
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(dashboard): include all CAPAs in on-time rate, count open+not-overdue as on-time

Browse Source
This commit is contained in:
admin
2026-07-28 16:36:57 +08:00
parent 87251b3fc6
commit dbc66460c4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/(protected)/hse/dashboard/page.tsx
+9 -9
View File
@@ -74,9 +74,9 @@ export default async function HseDashboardPage({
dueDate: capaActions.dueDate, dueDate: capaActions.dueDate,
completedAt: capaActions.completedAt, completedAt: capaActions.completedAt,
verifiedAt: capaActions.verifiedAt, verifiedAt: capaActions.verifiedAt,
status: capaActions.status,
}) })
.from(capaActions) .from(capaActions)
.where(isNotNull(capaActions.completedAt))
), ),
asAdmin(db => asAdmin(db =>
db.select({ id: doshReports.id }) db.select({ id: doshReports.id })
@@ -131,16 +131,16 @@ export default async function HseDashboardPage({
.slice(0, 10) .slice(0, 10)
const zoneMax = by_zone[0]?.count ?? 1 const zoneMax = by_zone[0]?.count ?? 1
const today = now.toISOString().slice(0, 10)
const capas = completedCapas const capas = completedCapas
const onTime = capas.filter(c => { const onTime = capas.filter(c => {
if (!c.dueDate) return false if (!c.dueDate) return true
const due = new Date(c.dueDate) if (c.completedAt) {
const done = c.verifiedAt const done = c.verifiedAt ? new Date(c.verifiedAt) : new Date(c.completedAt)
? new Date(c.verifiedAt) return done <= new Date(c.dueDate)
: c.completedAt }
? new Date(c.completedAt) // Still open — on time if not yet past due
: null return c.dueDate >= today
return done !== null && done <= due
}) })
const capaOnTimeRate = capas.length > 0 const capaOnTimeRate = capas.length > 0
? Math.round((onTime.length / capas.length) * 100) ? Math.round((onTime.length / capas.length) * 100)