Add OSHA Form 301 and Osha page components
- Implemented Form301 component for displaying OSHA Form 301 equivalent, including employee and case information. - Created Osha component to manage OSHA recordkeeping, including tabs for 300 Log, 300A Summary, Hours & rates, and Submit to OSHA. - Added functionality for printing and downloading CSV files for OSHA submissions. - Integrated loading and error handling states for data fetching.
This commit is contained in:
jayjennings committed
1 parent
3e964d1176
commit
61c876edec
59 files changed
+9180
-183
No files matched your search
@@ -12,11 +12,13 @@ import { attachmentRoutes } from './routes/attachments.ts'
|
||||
import { authRoutes } from './routes/auth.ts'
|
||||
import { incidentRoutes } from './routes/incidents.ts'
|
||||
import { kioskAdminRoutes, kioskPublicRoutes } from './routes/kiosks.ts'
|
||||
import { oshaRoutes } from './routes/osha.ts'
|
||||
import { rootCauseRoutes } from './routes/root-causes.ts'
|
||||
import { setupRoutes } from './routes/setup.ts'
|
||||
import { areaRoutes, siteRoutes } from './routes/sites.ts'
|
||||
import { statsRoutes } from './routes/stats.ts'
|
||||
import { userRoutes } from './routes/users.ts'
|
||||
import { viewRoutes } from './routes/views.ts'
|
||||
import type { FileStorage } from './storage.ts'
|
||||
|
||||
export interface AppDeps {
|
||||
@@ -57,6 +59,8 @@ export function createApp({ db, config, notifier, storage }: AppDeps) {
|
||||
app.route('/api/stats', statsRoutes)
|
||||
app.route('/api/kiosks', kioskAdminRoutes)
|
||||
app.route('/api/kiosk', kioskPublicRoutes())
|
||||
app.route('/api/osha', oshaRoutes)
|
||||
app.route('/api/views', viewRoutes)
|
||||
app.all('/api/*', (c) => c.json({ error: 'Not found' }, 404))
|
||||
|
||||
app.onError((error, c) => {
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
CREATE TYPE "public"."osha_case_type" AS ENUM('injury', 'skin_disorder', 'respiratory', 'poisoning', 'hearing_loss', 'other_illness');--> statement-breakpoint
|
||||
CREATE TYPE "public"."osha_outcome" AS ENUM('death', 'days_away', 'restricted', 'other');--> statement-breakpoint
|
||||
CREATE TYPE "public"."osha_special_case" AS ENUM('none', 'needlestick', 'medical_removal', 'hearing_loss', 'tuberculosis');--> statement-breakpoint
|
||||
ALTER TABLE "hours_worked" ADD COLUMN "average_employees" integer;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "case_number" text;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "work_related" boolean;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "new_case" boolean;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "died" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "date_of_death" date;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "days_away_from_work" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "restricted_or_transfer" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "medical_treatment" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "loss_of_consciousness" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "significant_diagnosis" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "special_case" "osha_special_case" DEFAULT 'none' NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "case_type" "osha_case_type" DEFAULT 'injury' NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "recordable" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "outcome" "osha_outcome";--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "inpatient_hospitalization" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "amputation" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "loss_of_eye" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "reported_to_osha_at" timestamp with time zone;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "employee_address" text;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "date_of_birth" date;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "date_of_hire" date;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "sex" text;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "physician_name" text;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "treatment_facility" text;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "treated_in_emergency_room" boolean DEFAULT false NOT NULL;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "time_started_work" text;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "activity_before" text;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "what_happened" text;--> statement-breakpoint
|
||||
ALTER TABLE "injured_persons" ADD COLUMN "object_substance" text;--> statement-breakpoint
|
||||
ALTER TABLE "sites" ADD COLUMN "street_address" text;--> statement-breakpoint
|
||||
ALTER TABLE "sites" ADD COLUMN "city" text;--> statement-breakpoint
|
||||
ALTER TABLE "sites" ADD COLUMN "state" text;--> statement-breakpoint
|
||||
ALTER TABLE "sites" ADD COLUMN "zip" text;--> statement-breakpoint
|
||||
ALTER TABLE "sites" ADD COLUMN "naics_code" text;--> statement-breakpoint
|
||||
ALTER TABLE "sites" ADD COLUMN "industry_description" text;--> statement-breakpoint
|
||||
ALTER TABLE "sites" ADD COLUMN "ein" text;--> statement-breakpoint
|
||||
ALTER TABLE "sites" ADD COLUMN "establishment_type" integer DEFAULT 1 NOT NULL;
|
||||
@@ -0,0 +1,14 @@
|
||||
CREATE TABLE "saved_views" (
|
||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
||||
"organization_id" uuid NOT NULL,
|
||||
"user_id" uuid NOT NULL,
|
||||
"page" text NOT NULL,
|
||||
"name" text NOT NULL,
|
||||
"filters" jsonb NOT NULL,
|
||||
"shared" boolean DEFAULT false NOT NULL,
|
||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL
|
||||
);
|
||||
--> statement-breakpoint
|
||||
ALTER TABLE "saved_views" ADD CONSTRAINT "saved_views_organization_id_organizations_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organizations"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
|
||||
ALTER TABLE "saved_views" ADD CONSTRAINT "saved_views_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
|
||||
CREATE INDEX "saved_views_organization_page_idx" ON "saved_views" USING btree ("organization_id","page");
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -22,6 +22,20 @@
|
||||
"when": 1791310953907,
|
||||
"tag": "0002_kiosks_and_offline",
|
||||
"breakpoints": true
|
||||
},
|
||||
{
|
||||
"idx": 3,
|
||||
"version": "7",
|
||||
"when": 1791312050891,
|
||||
"tag": "0003_osha_recordkeeping",
|
||||
"breakpoints": true
|
||||
},
|
||||
{
|
||||
"idx": 4,
|
||||
"version": "7",
|
||||
"when": 1791315152348,
|
||||
"tag": "0004_saved_views",
|
||||
"breakpoints": true
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -14,6 +14,9 @@ export const actionKindEnum = pgEnum('action_kind', vocab.actionKinds)
|
||||
export const actionStatusEnum = pgEnum('action_status', vocab.actionStatuses)
|
||||
export const authTokenPurposeEnum = pgEnum('auth_token_purpose', ['magic_link', 'password_reset'])
|
||||
export const reportChannelEnum = pgEnum('report_channel', ['web', 'kiosk'])
|
||||
export const oshaCaseTypeEnum = pgEnum('osha_case_type', vocab.oshaCaseTypes)
|
||||
export const oshaOutcomeEnum = pgEnum('osha_outcome', vocab.oshaOutcomes)
|
||||
export const oshaSpecialCaseEnum = pgEnum('osha_special_case', vocab.oshaSpecialCases)
|
||||
|
||||
const id = () => uuid().primaryKey().defaultRandom()
|
||||
const timestamptz = () => timestamp({ withTimezone: true })
|
||||
@@ -91,6 +94,16 @@ export const sites = pgTable(
|
||||
name: text().notNull(),
|
||||
address: text(),
|
||||
timezone: text().notNull().default('UTC'),
|
||||
// OSHA establishment details (Form 300A and the ITA upload)
|
||||
streetAddress: text(),
|
||||
city: text(),
|
||||
state: text(),
|
||||
zip: text(),
|
||||
naicsCode: text(),
|
||||
industryDescription: text(),
|
||||
ein: text(),
|
||||
/** ITA establishment_type: 1 private, 2 state government, 3 local government. */
|
||||
establishmentType: integer().notNull().default(1),
|
||||
archivedAt: timestamptz(),
|
||||
createdAt: createdAt(),
|
||||
updatedAt: updatedAt(),
|
||||
@@ -208,6 +221,42 @@ export const injuredPersons = pgTable(
|
||||
daysRestricted: integer().notNull().default(0),
|
||||
/** OSHA privacy case: name withheld from the 300 log. */
|
||||
privacyCase: boolean().notNull().default(false),
|
||||
|
||||
// OSHA recordability (29 CFR 1904). Null answers mean "not assessed yet".
|
||||
caseNumber: text(),
|
||||
workRelated: boolean(),
|
||||
newCase: boolean(),
|
||||
died: boolean().notNull().default(false),
|
||||
dateOfDeath: date({ mode: 'string' }),
|
||||
daysAwayFromWork: boolean().notNull().default(false),
|
||||
restrictedOrTransfer: boolean().notNull().default(false),
|
||||
medicalTreatment: boolean().notNull().default(false),
|
||||
lossOfConsciousness: boolean().notNull().default(false),
|
||||
significantDiagnosis: boolean().notNull().default(false),
|
||||
specialCase: oshaSpecialCaseEnum().notNull().default('none'),
|
||||
caseType: oshaCaseTypeEnum().notNull().default('injury'),
|
||||
/** Derived from the answers above with shared/osha.ts, stored for reporting. */
|
||||
recordable: boolean().notNull().default(false),
|
||||
outcome: oshaOutcomeEnum(),
|
||||
|
||||
// Severe injury reporting (1904.39)
|
||||
inpatientHospitalization: boolean().notNull().default(false),
|
||||
amputation: boolean().notNull().default(false),
|
||||
lossOfEye: boolean().notNull().default(false),
|
||||
reportedToOshaAt: timestamptz(),
|
||||
|
||||
// Form 301 details
|
||||
employeeAddress: text(),
|
||||
dateOfBirth: date({ mode: 'string' }),
|
||||
dateOfHire: date({ mode: 'string' }),
|
||||
sex: text(),
|
||||
physicianName: text(),
|
||||
treatmentFacility: text(),
|
||||
treatedInEmergencyRoom: boolean().notNull().default(false),
|
||||
timeStartedWork: text(),
|
||||
activityBefore: text(),
|
||||
whatHappened: text(),
|
||||
objectSubstance: text(),
|
||||
createdAt: createdAt(),
|
||||
updatedAt: updatedAt(),
|
||||
},
|
||||
@@ -330,8 +379,30 @@ export const hoursWorked = pgTable(
|
||||
/** First day of the month, e.g. `2026-10-01`. */
|
||||
month: date({ mode: 'string' }).notNull(),
|
||||
hours: numeric({ precision: 12, scale: 2 }).notNull(),
|
||||
/** Average number of employees on the payroll that month (for the annual average). */
|
||||
averageEmployees: integer(),
|
||||
createdAt: createdAt(),
|
||||
updatedAt: updatedAt(),
|
||||
},
|
||||
(t) => [uniqueIndex('hours_worked_site_month_unique').on(t.siteId, t.month)],
|
||||
)
|
||||
|
||||
/** Named filter sets for the Analytics and Incidents pages; private, or shared with the organization. */
|
||||
export const savedViews = pgTable(
|
||||
'saved_views',
|
||||
{
|
||||
id: id(),
|
||||
organizationId: uuid()
|
||||
.notNull()
|
||||
.references(() => organizations.id),
|
||||
userId: uuid()
|
||||
.notNull()
|
||||
.references(() => users.id, { onDelete: 'cascade' }),
|
||||
page: text().notNull(),
|
||||
name: text().notNull(),
|
||||
filters: jsonb().$type<Record<string, string>>().notNull(),
|
||||
shared: boolean().notNull().default(false),
|
||||
createdAt: createdAt(),
|
||||
},
|
||||
(t) => [index('saved_views_organization_page_idx').on(t.organizationId, t.page)],
|
||||
)
|
||||
+144
-2
@@ -2,7 +2,8 @@
|
||||
import { hashPassword } from '../auth/password.ts'
|
||||
import { loadConfig } from '../config.ts'
|
||||
import { openDatabase } from './client.ts'
|
||||
import { auditLog, areas, incidentCounters, incidents, organizations, sites, users } from './schema.ts'
|
||||
import { assessRecordability } from '../../shared/osha.ts'
|
||||
import { auditLog, areas, correctiveActions, hoursWorked, incidentCounters, incidents, injuredPersons, investigations, organizations, rootCauses, sites, users } from './schema.ts'
|
||||
|
||||
const DEMO_PASSWORD = 'safetylog-demo'
|
||||
|
||||
@@ -79,10 +80,151 @@ try {
|
||||
createdAt: incident.createdAt,
|
||||
})),
|
||||
)
|
||||
await tx.insert(incidentCounters).values({ organizationId: org.id, lastNumber: demo.length })
|
||||
// A year of history so dashboards and the OSHA log have something to show
|
||||
const lastNumber = await seedHistory(tx as unknown as typeof db, org.id, demo.length, areaIds, people.map((p) => p.id))
|
||||
await tx.insert(incidentCounters).values({ organizationId: org.id, lastNumber })
|
||||
})
|
||||
console.log(`Seeded demo data. Sign in as admin@example.com, manager@example.com, supervisor@example.com or reporter@example.com with password "${DEMO_PASSWORD}".`)
|
||||
}
|
||||
} finally {
|
||||
await close()
|
||||
}
|
||||
|
||||
/** Deterministic pseudo-random numbers, so every seed produces the same demo. */
|
||||
function random(seed: number) {
|
||||
let state = seed
|
||||
return () => {
|
||||
state = (state * 1_664_525 + 1_013_904_223) % 2 ** 32
|
||||
return state / 2 ** 32
|
||||
}
|
||||
}
|
||||
|
||||
async function seedHistory(
|
||||
database: typeof db,
|
||||
organizationId: string,
|
||||
startNumber: number,
|
||||
areaIds: Record<string, { siteId: string; areaId: string }>,
|
||||
userIds: string[],
|
||||
): Promise<number> {
|
||||
const rand = random(42)
|
||||
const pick = <T>(items: readonly T[]) => items[Math.floor(rand() * items.length)]
|
||||
const day = 86_400_000
|
||||
const now = Date.now()
|
||||
const locations = Object.values(areaIds)
|
||||
// Near misses and hazards outnumber injuries, as in a healthy reporting culture
|
||||
const types = ['near_miss', 'near_miss', 'near_miss', 'hazard', 'hazard', 'hazard', 'injury', 'injury', 'property_damage', 'environmental', 'illness'] as const
|
||||
// Busier around shift changes (06–08, 14–16) and mid-shift
|
||||
const hours = [6, 7, 7, 9, 10, 11, 13, 14, 14, 15, 15, 16, 19, 22, 2]
|
||||
const titles = {
|
||||
near_miss: ['Forklift nearly struck pedestrian', 'Load slipped from pallet jack', 'Unsecured ladder almost fell', 'Dropped tool from mezzanine'],
|
||||
hazard: ['Oil leak under press', 'Blocked emergency exit', 'Damaged guard on conveyor', 'Frayed extension cord', 'Missing machine guard'],
|
||||
injury: ['Hand laceration from sheet metal', 'Back strain lifting boxes', 'Slip on wet floor', 'Pinched finger in die'],
|
||||
illness: ['Dermatitis from cutting fluid'],
|
||||
property_damage: ['Forklift hit racking', 'Damaged dock door'],
|
||||
environmental: ['Hydraulic fluid spill', 'Coolant leak to drain'],
|
||||
} as const
|
||||
const categories = ['people', 'process', 'equipment', 'materials', 'environment', 'management'] as const
|
||||
|
||||
let number = startNumber
|
||||
for (let i = 0; i < 150; i++) {
|
||||
const type = pick(types)
|
||||
const occurred = new Date(now - Math.floor(rand() * 360 + 3) * day)
|
||||
occurred.setHours(pick(hours), Math.floor(rand() * 60), 0, 0)
|
||||
const created = new Date(occurred.getTime() + (1 + rand() * 6) * 3_600_000)
|
||||
const age = (now - occurred.getTime()) / day
|
||||
const status = age > 60 ? (rand() < 0.85 ? 'closed' : 'actions') : age > 20 ? pick(['investigation', 'actions', 'verification', 'closed'] as const) : pick(['reported', 'triage', 'investigation'] as const)
|
||||
const closedAt = status === 'closed' ? new Date(created.getTime() + (5 + rand() * 35) * day) : null
|
||||
number++
|
||||
const [incident] = await database
|
||||
.insert(incidents)
|
||||
.values({
|
||||
organizationId,
|
||||
number,
|
||||
title: pick(titles[type]),
|
||||
type,
|
||||
severity: type === 'injury' ? pick(['medium', 'high', 'high'] as const) : pick(['low', 'medium', 'medium', 'high'] as const),
|
||||
status,
|
||||
occurredAt: occurred,
|
||||
createdAt: created,
|
||||
closedAt: closedAt && closedAt.getTime() < now ? closedAt : null,
|
||||
...pick(locations),
|
||||
reporterId: pick(userIds),
|
||||
})
|
||||
.returning()
|
||||
const auditRows: (typeof auditLog.$inferInsert)[] = [
|
||||
{ organizationId, actorId: incident.reporterId, entityType: 'incident', entityId: incident.id, action: 'create', changes: { number, title: incident.title }, createdAt: created },
|
||||
]
|
||||
if (status !== 'reported') {
|
||||
// Most reports are triaged within a day; the team got quicker over the year
|
||||
const delayHours = rand() < 0.55 + (1 - age / 365) * 0.35 ? 2 + rand() * 18 : 26 + rand() * 70
|
||||
auditRows.push({ organizationId, actorId: pick(userIds), entityType: 'incident', entityId: incident.id, action: 'status', changes: { status: ['reported', 'triage'] }, createdAt: new Date(created.getTime() + delayHours * 3_600_000) })
|
||||
}
|
||||
await database.insert(auditLog).values(auditRows)
|
||||
|
||||
if (['investigation', 'actions', 'verification', 'closed'].includes(status) && type !== 'near_miss') {
|
||||
const [investigation] = await database.insert(investigations).values({ incidentId: incident.id, method: 'five_whys', startedAt: created }).returning()
|
||||
const causes = await database
|
||||
.insert(rootCauses)
|
||||
.values(Array.from({ length: 1 + Math.floor(rand() * 2) }, () => ({ investigationId: investigation.id, category: pick(categories), description: 'Identified during investigation' })))
|
||||
.returning()
|
||||
const due = new Date(created.getTime() + 21 * day)
|
||||
const done = status === 'closed' || status === 'verification' || rand() < 0.4
|
||||
const completed = new Date(created.getTime() + (8 + rand() * 30) * day)
|
||||
await database.insert(correctiveActions).values({
|
||||
incidentId: incident.id,
|
||||
rootCauseId: causes[0].id,
|
||||
title: 'Fix the cause and brief the team',
|
||||
assigneeId: pick(userIds),
|
||||
dueDate: due.toISOString().slice(0, 10),
|
||||
status: done && completed.getTime() < now ? (status === 'closed' ? 'verified' : 'done') : 'open',
|
||||
completedAt: done && completed.getTime() < now ? completed : null,
|
||||
})
|
||||
}
|
||||
|
||||
if ((type === 'injury' || type === 'illness') && rand() < 0.6) {
|
||||
const answers = {
|
||||
employmentType: 'employee' as const,
|
||||
workRelated: true,
|
||||
newCase: true,
|
||||
died: false,
|
||||
daysAwayFromWork: rand() < 0.3,
|
||||
restrictedOrTransfer: rand() < 0.4,
|
||||
medicalTreatment: rand() < 0.7,
|
||||
lossOfConsciousness: false,
|
||||
significantDiagnosis: false,
|
||||
specialCase: 'none' as const,
|
||||
}
|
||||
const verdict = assessRecordability(answers)
|
||||
await database.insert(injuredPersons).values({
|
||||
incidentId: incident.id,
|
||||
caseNumber: `INC-${String(number).padStart(4, '0')}`,
|
||||
name: pick(['Alex Moreno', 'Jamie Patel', 'Chris Nguyen', 'Taylor Brooks', 'Morgan Diaz']),
|
||||
jobTitle: pick(['Press operator', 'Material handler', 'Maintenance technician', 'Assembler']),
|
||||
natureOfInjury: incident.title,
|
||||
caseType: type === 'illness' ? 'skin_disorder' : 'injury',
|
||||
...answers,
|
||||
daysAway: answers.daysAwayFromWork ? 1 + Math.floor(rand() * 10) : 0,
|
||||
daysRestricted: answers.restrictedOrTransfer ? 2 + Math.floor(rand() * 14) : 0,
|
||||
recordable: verdict.status === 'recordable',
|
||||
outcome: verdict.outcome,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Monthly hours worked and headcount for every site, for the last 13 months
|
||||
const siteIds = [...new Set(locations.map((l) => l.siteId))]
|
||||
const today = new Date()
|
||||
for (const siteId of siteIds) {
|
||||
for (let m = 12; m >= 0; m--) {
|
||||
const month = new Date(today.getFullYear(), today.getMonth() - m, 1)
|
||||
const employees = 70 + Math.floor(rand() * 30)
|
||||
await database.insert(hoursWorked).values({
|
||||
siteId,
|
||||
month: `${month.getFullYear()}-${String(month.getMonth() + 1).padStart(2, '0')}-01`,
|
||||
hours: String(employees * 168),
|
||||
averageEmployees: employees,
|
||||
})
|
||||
}
|
||||
}
|
||||
return number
|
||||
}
|
||||
@@ -0,0 +1,252 @@
|
||||
import { and, eq, gte, inArray, isNotNull, lt, min } from 'drizzle-orm'
|
||||
import type { AnalyticsStats, Kpi, TypeGroup } from '../../shared/api-types.ts'
|
||||
import { hasRole, type IncidentType } from '../../shared/enums.ts'
|
||||
import { incidenceRate } from '../../shared/osha.ts'
|
||||
import type { SessionUser } from '../auth/sessions.ts'
|
||||
import type { Db } from '../db/client.ts'
|
||||
import { areas, auditLog, correctiveActions, hoursWorked, incidents, injuredPersons, investigations, rootCauses, sites } from '../db/schema.ts'
|
||||
import { addDays, localDate } from './dates.ts'
|
||||
import { visibleTo } from './incidents.ts'
|
||||
|
||||
const DAY_MS = 86_400_000
|
||||
|
||||
export const typeGroup: Record<IncidentType, TypeGroup> = {
|
||||
near_miss: 'hazards',
|
||||
hazard: 'hazards',
|
||||
injury: 'injuries',
|
||||
illness: 'injuries',
|
||||
property_damage: 'damage',
|
||||
environmental: 'damage',
|
||||
}
|
||||
|
||||
export interface AnalyticsFilters {
|
||||
/** Inclusive start date, `YYYY-MM-DD` (server time zone). */
|
||||
from: string
|
||||
/** Inclusive end date. */
|
||||
to: string
|
||||
siteId?: string
|
||||
type?: IncidentType
|
||||
}
|
||||
|
||||
const startOf = (isoDate: string) => new Date(`${isoDate}T00:00:00`)
|
||||
const monthKey = (date: Date) => `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}`
|
||||
const ratio = (part: number, whole: number) => (whole > 0 ? part / whole : null)
|
||||
const round1 = (value: number | null) => (value === null ? null : Math.round(value * 10) / 10)
|
||||
|
||||
/** Monday of the week containing `date`, local time. */
|
||||
function weekStart(date: Date): Date {
|
||||
const start = new Date(date.getFullYear(), date.getMonth(), date.getDate())
|
||||
start.setDate(start.getDate() - ((start.getDay() + 6) % 7))
|
||||
return start
|
||||
}
|
||||
|
||||
/** Buckets covering [from, to]: weeks for ranges up to ~3 months, otherwise months. */
|
||||
export function buckets(from: string, to: string): { bucket: 'week' | 'month'; starts: Date[] } {
|
||||
const start = startOf(from)
|
||||
const end = startOf(to)
|
||||
const days = (end.getTime() - start.getTime()) / DAY_MS + 1
|
||||
const starts: Date[] = []
|
||||
if (days <= 92) {
|
||||
for (let d = weekStart(start); d <= end; d = new Date(d.getFullYear(), d.getMonth(), d.getDate() + 7)) starts.push(d)
|
||||
return { bucket: 'week', starts }
|
||||
}
|
||||
for (let d = new Date(start.getFullYear(), start.getMonth(), 1); d <= end; d = new Date(d.getFullYear(), d.getMonth() + 1, 1)) starts.push(d)
|
||||
return { bucket: 'month', starts }
|
||||
}
|
||||
|
||||
function bucketIndex(starts: Date[], date: Date): number {
|
||||
for (let i = starts.length - 1; i >= 0; i--) if (date >= starts[i]) return i
|
||||
return -1
|
||||
}
|
||||
|
||||
export async function computeAnalytics(db: Db, user: SessionUser, filters: AnalyticsFilters): Promise<AnalyticsStats> {
|
||||
const from = startOf(filters.from)
|
||||
const to = startOf(addDays(filters.to, 1)) // exclusive
|
||||
const length = to.getTime() - from.getTime()
|
||||
const previousFrom = new Date(from.getTime() - length)
|
||||
const visible = visibleTo(db, user)
|
||||
const scope = and(visible, filters.siteId ? eq(incidents.siteId, filters.siteId) : undefined, filters.type ? eq(incidents.type, filters.type) : undefined)
|
||||
const occurredIn = (start: Date, end: Date) => and(scope, gte(incidents.occurredAt, start), lt(incidents.occurredAt, end))
|
||||
|
||||
const columns = { id: incidents.id, type: incidents.type, occurredAt: incidents.occurredAt, createdAt: incidents.createdAt, siteId: incidents.siteId, areaId: incidents.areaId }
|
||||
const current = await db.select(columns).from(incidents).where(occurredIn(from, to))
|
||||
const previous = await db.select(columns).from(incidents).where(occurredIn(previousFrom, from))
|
||||
|
||||
const countGroups = (rows: typeof current) => {
|
||||
const groups = { hazards: 0, injuries: 0, damage: 0 }
|
||||
for (const row of rows) groups[typeGroup[row.type]]++
|
||||
return groups
|
||||
}
|
||||
const now = countGroups(current)
|
||||
const before = countGroups(previous)
|
||||
|
||||
// Responsiveness: time from report to the first status change
|
||||
async function triagedShare(rows: typeof current): Promise<number | null> {
|
||||
if (rows.length === 0) return null
|
||||
const firstMoves = await db
|
||||
.select({ id: auditLog.entityId, at: min(auditLog.createdAt) })
|
||||
.from(auditLog)
|
||||
.where(and(eq(auditLog.entityType, 'incident'), eq(auditLog.action, 'status'), inArray(auditLog.entityId, rows.map((r) => r.id))))
|
||||
.groupBy(auditLog.entityId)
|
||||
const moved = new Map(firstMoves.map((m) => [m.id, m.at]))
|
||||
const quick = rows.filter((r) => {
|
||||
const at = moved.get(r.id)
|
||||
return at && at.getTime() - r.createdAt.getTime() <= DAY_MS
|
||||
})
|
||||
return quick.length / rows.length
|
||||
}
|
||||
|
||||
async function averageDaysToClose(start: Date, end: Date) {
|
||||
const closed = await db
|
||||
.select({ createdAt: incidents.createdAt, closedAt: incidents.closedAt })
|
||||
.from(incidents)
|
||||
.where(and(scope, isNotNull(incidents.closedAt), gte(incidents.closedAt, start), lt(incidents.closedAt, end)))
|
||||
if (closed.length === 0) return null
|
||||
return round1(closed.reduce((sum, r) => sum + (r.closedAt!.getTime() - r.createdAt.getTime()), 0) / closed.length / DAY_MS)
|
||||
}
|
||||
|
||||
async function completedActions(start: Date, end: Date) {
|
||||
return db
|
||||
.select({ completedAt: correctiveActions.completedAt, dueDate: correctiveActions.dueDate })
|
||||
.from(correctiveActions)
|
||||
.innerJoin(incidents, eq(incidents.id, correctiveActions.incidentId))
|
||||
.where(and(scope, isNotNull(correctiveActions.completedAt), isNotNull(correctiveActions.dueDate), gte(correctiveActions.completedAt, start), lt(correctiveActions.completedAt, end)))
|
||||
}
|
||||
const onTime = (row: { completedAt: Date | null; dueDate: string | null }) => localDate(row.completedAt!) <= row.dueDate!
|
||||
const actionsNow = await completedActions(from, to)
|
||||
const actionsBefore = await completedActions(previousFrom, from)
|
||||
|
||||
const today = localDate()
|
||||
const overdueRows = await db
|
||||
.select({ id: correctiveActions.id })
|
||||
.from(correctiveActions)
|
||||
.innerJoin(incidents, eq(incidents.id, correctiveActions.incidentId))
|
||||
.where(and(scope, inArray(correctiveActions.status, ['open', 'in_progress']), lt(correctiveActions.dueDate, today)))
|
||||
|
||||
// Lagging: OSHA-recordable cases. Counts only, so supervisors may see them.
|
||||
const canSeeRates = hasRole(user.role, 'supervisor')
|
||||
async function recordableRows(start: Date, end: Date) {
|
||||
return db
|
||||
.select({ occurredAt: incidents.occurredAt, outcome: injuredPersons.outcome })
|
||||
.from(injuredPersons)
|
||||
.innerJoin(incidents, eq(incidents.id, injuredPersons.incidentId))
|
||||
.where(and(eq(incidents.organizationId, user.organizationId), filters.siteId ? eq(incidents.siteId, filters.siteId) : undefined, eq(injuredPersons.recordable, true), gte(incidents.occurredAt, start), lt(incidents.occurredAt, end)))
|
||||
}
|
||||
|
||||
const kpi = (value: number | null, previousValue: number | null): Kpi => ({ value, previous: previousValue })
|
||||
const ratioOf = (groups: typeof now) => (groups.injuries ? Math.round(((groups.hazards / groups.injuries) * 10)) / 10 : null)
|
||||
|
||||
// Trend
|
||||
const { bucket, starts } = buckets(filters.from, filters.to)
|
||||
const trend = starts.map((start) => ({ start: localDate(start), hazards: 0, injuries: 0, damage: 0 }))
|
||||
for (const row of current) {
|
||||
const i = bucketIndex(starts, row.occurredAt)
|
||||
if (i >= 0) trend[i][typeGroup[row.type]]++
|
||||
}
|
||||
|
||||
// Heatmap: weekday × hour of occurrence
|
||||
const heatmap = Array.from({ length: 7 }, () => Array<number>(24).fill(0))
|
||||
for (const row of current) heatmap[(row.occurredAt.getDay() + 6) % 7][row.occurredAt.getHours()]++
|
||||
|
||||
// Location: sites, or areas within the chosen site
|
||||
let byLocation: AnalyticsStats['byLocation']
|
||||
if (filters.siteId) {
|
||||
const areaRows = await db.select({ id: areas.id, name: areas.name }).from(areas).where(eq(areas.siteId, filters.siteId))
|
||||
const names = new Map(areaRows.map((a) => [a.id, a.name]))
|
||||
const counts = new Map<string | null, number>()
|
||||
for (const row of current) counts.set(row.areaId, (counts.get(row.areaId) ?? 0) + 1)
|
||||
byLocation = [...counts].map(([id, count]) => ({ id, name: id ? (names.get(id) ?? 'Unknown area') : 'Area not specified', count }))
|
||||
} else {
|
||||
const siteRows = await db.select({ id: sites.id, name: sites.name }).from(sites).where(eq(sites.organizationId, user.organizationId))
|
||||
const names = new Map(siteRows.map((s) => [s.id, s.name]))
|
||||
const counts = new Map<string, number>()
|
||||
for (const row of current) counts.set(row.siteId, (counts.get(row.siteId) ?? 0) + 1)
|
||||
byLocation = [...counts].map(([id, count]) => ({ id, name: names.get(id) ?? 'Unknown site', count }))
|
||||
}
|
||||
byLocation.sort((a, b) => b.count - a.count || a.name.localeCompare(b.name))
|
||||
|
||||
const causeRows = current.length
|
||||
? await db
|
||||
.select({ category: rootCauses.category })
|
||||
.from(rootCauses)
|
||||
.innerJoin(investigations, eq(investigations.id, rootCauses.investigationId))
|
||||
.where(inArray(investigations.incidentId, current.map((r) => r.id)))
|
||||
: []
|
||||
const causeCounts = new Map<string, number>()
|
||||
for (const row of causeRows) causeCounts.set(row.category, (causeCounts.get(row.category) ?? 0) + 1)
|
||||
const byRootCause = [...causeCounts].map(([category, count]) => ({ category: category as AnalyticsStats['byRootCause'][number]['category'], count })).sort((a, b) => b.count - a.count)
|
||||
|
||||
// Actions completed per month, on time vs late
|
||||
const actionsByMonth: AnalyticsStats['actionsByMonth'] = []
|
||||
for (let d = new Date(from.getFullYear(), from.getMonth(), 1); d < to; d = new Date(d.getFullYear(), d.getMonth() + 1, 1)) actionsByMonth.push({ month: monthKey(d), onTime: 0, late: 0 })
|
||||
for (const row of actionsNow) {
|
||||
const entry = actionsByMonth.find((m) => m.month === monthKey(row.completedAt!))
|
||||
if (entry) entry[onTime(row) ? 'onTime' : 'late']++
|
||||
}
|
||||
|
||||
// Rolling 12-month OSHA rates at each of the last 12 month ends
|
||||
let rates: AnalyticsStats['rates'] = null
|
||||
let yearly: AnalyticsStats['yearly'] = null
|
||||
let recordables: Kpi | null = null
|
||||
if (canSeeRates) {
|
||||
recordables = kpi((await recordableRows(from, to)).length, (await recordableRows(previousFrom, from)).length)
|
||||
const endMonth = new Date(startOf(filters.to).getFullYear(), startOf(filters.to).getMonth(), 1)
|
||||
const windowStart = new Date(endMonth.getFullYear() - 5, 0, 1)
|
||||
const cases = await recordableRows(windowStart, new Date(endMonth.getFullYear(), endMonth.getMonth() + 1, 1))
|
||||
const hours = await db
|
||||
.select({ month: hoursWorked.month, hours: hoursWorked.hours })
|
||||
.from(hoursWorked)
|
||||
.innerJoin(sites, eq(sites.id, hoursWorked.siteId))
|
||||
.where(and(eq(sites.organizationId, user.organizationId), filters.siteId ? eq(hoursWorked.siteId, filters.siteId) : undefined, gte(hoursWorked.month, localDate(windowStart))))
|
||||
const hoursByMonth = new Map<string, number>()
|
||||
for (const h of hours) hoursByMonth.set(h.month.slice(0, 7), (hoursByMonth.get(h.month.slice(0, 7)) ?? 0) + Number(h.hours))
|
||||
const casesIn = (start: Date, end: Date) => cases.filter((c) => c.occurredAt >= start && c.occurredAt < end)
|
||||
const hoursIn = (start: Date, end: Date) => {
|
||||
let total = 0
|
||||
for (let d = new Date(start); d < end; d = new Date(d.getFullYear(), d.getMonth() + 1, 1)) total += hoursByMonth.get(monthKey(d)) ?? 0
|
||||
return total
|
||||
}
|
||||
const isDart = (c: { outcome: string | null }) => c.outcome === 'days_away' || c.outcome === 'restricted'
|
||||
|
||||
rates = Array.from({ length: 12 }, (_, i) => {
|
||||
const monthStart = new Date(endMonth.getFullYear(), endMonth.getMonth() - 11 + i, 1)
|
||||
const windowEnd = new Date(monthStart.getFullYear(), monthStart.getMonth() + 1, 1)
|
||||
const windowBegin = new Date(windowEnd.getFullYear() - 1, windowEnd.getMonth(), 1)
|
||||
const inWindow = casesIn(windowBegin, windowEnd)
|
||||
const h = hoursIn(windowBegin, windowEnd)
|
||||
return { month: monthKey(monthStart), trir: incidenceRate(inWindow.length, h), dart: incidenceRate(inWindow.filter(isDart).length, h) }
|
||||
})
|
||||
yearly = Array.from({ length: 5 }, (_, i) => {
|
||||
const year = endMonth.getFullYear() - 4 + i
|
||||
const inYear = casesIn(new Date(year, 0, 1), new Date(year + 1, 0, 1))
|
||||
const h = Math.round(hoursIn(new Date(year, 0, 1), new Date(year + 1, 0, 1)))
|
||||
const dartCases = inYear.filter(isDart).length
|
||||
return { year, recordables: inYear.length, dartCases, hours: h, trir: incidenceRate(inYear.length, h), dart: incidenceRate(dartCases, h) }
|
||||
})
|
||||
}
|
||||
|
||||
return {
|
||||
from: filters.from,
|
||||
to: filters.to,
|
||||
previousFrom: localDate(previousFrom),
|
||||
bucket,
|
||||
kpis: {
|
||||
reports: kpi(current.length, previous.length),
|
||||
leadingReports: kpi(now.hazards, before.hazards),
|
||||
injuries: kpi(now.injuries, before.injuries),
|
||||
nearMissRatio: kpi(ratioOf(now), ratioOf(before)),
|
||||
triagedWithin24h: kpi(await triagedShare(current), await triagedShare(previous)),
|
||||
actionsOnTime: kpi(ratio(actionsNow.filter(onTime).length, actionsNow.length), ratio(actionsBefore.filter(onTime).length, actionsBefore.length)),
|
||||
averageDaysToClose: kpi(await averageDaysToClose(from, to), await averageDaysToClose(previousFrom, from)),
|
||||
recordables,
|
||||
overdueActions: overdueRows.length,
|
||||
},
|
||||
trend,
|
||||
byLocation,
|
||||
byRootCause,
|
||||
heatmap,
|
||||
actionsByMonth,
|
||||
rates,
|
||||
yearly,
|
||||
}
|
||||
}
|
||||
@@ -3,10 +3,10 @@ import { toCsv } from './csv.ts'
|
||||
|
||||
describe('toCsv', () => {
|
||||
it('quotes commas, quotes and newlines', () => {
|
||||
expect(toCsv(['a', 'b'], [['x,y', 'say "hi"\nok']])).toBe('a,b\r\n"x,y","say ""hi""\nok"\r\n')
|
||||
expect(toCsv(['a', 'b'], [['x,y', 'say "hi"\nok']])).toBe('\uFEFFa,b\r\n"x,y","say ""hi""\nok"\r\n')
|
||||
})
|
||||
|
||||
it('neutralises formula prefixes and blanks nulls', () => {
|
||||
expect(toCsv(['a'], [['=1+1'], ['-2'], [null], [3]])).toBe("a\r\n'=1+1\r\n'-2\r\n\r\n3\r\n")
|
||||
expect(toCsv(['a'], [['=1+1'], ['-2'], [null], [3]])).toBe("\uFEFFa\r\n'=1+1\r\n'-2\r\n\r\n3\r\n")
|
||||
})
|
||||
})
|
||||
+5
-4
@@ -1,14 +1,15 @@
|
||||
type Cell = string | number | null | undefined
|
||||
|
||||
/**
|
||||
* RFC 4180 CSV with a BOM so Excel opens UTF-8 correctly. Cells that a spreadsheet would treat as a
|
||||
* formula are prefixed with an apostrophe (CSV injection).
|
||||
* RFC 4180 CSV. By default starts with a BOM so Excel opens UTF-8 correctly (`bom: false` for machine
|
||||
* uploads such as OSHA's ITA). Cells a spreadsheet would treat as a formula are prefixed with an
|
||||
* apostrophe (CSV injection).
|
||||
*/
|
||||
export function toCsv(header: string[], rows: Cell[][]): string {
|
||||
export function toCsv(header: string[], rows: Cell[][], { bom = true }: { bom?: boolean } = {}): string {
|
||||
const cell = (value: Cell) => {
|
||||
let text = value === null || value === undefined ? '' : String(value)
|
||||
if (/^[=+\-@\t\r]/.test(text)) text = `'${text}`
|
||||
return /[",\r\n]/.test(text) ? `"${text.replace(/"/g, '""')}"` : text
|
||||
}
|
||||
return '' + [header, ...rows].map((row) => row.map(cell).join(',')).join('\r\n') + '\r\n'
|
||||
return (bom ? '\uFEFF' : '') + [header, ...rows].map((row) => row.map(cell).join(',')).join('\r\n') + '\r\n'
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { and, asc, eq, exists, or, type SQL } from 'drizzle-orm'
|
||||
import { and, asc, count, eq, exists, or, type SQL } from 'drizzle-orm'
|
||||
import { alias } from 'drizzle-orm/pg-core'
|
||||
import type { Attachment, CorrectiveAction, Incident, IncidentDetail, Investigation, RootCause } from '../../shared/api-types.ts'
|
||||
import { hasRole } from '../../shared/enums.ts'
|
||||
@@ -6,7 +6,7 @@ import { incidentReference } from '../../shared/format.ts'
|
||||
import { availableTransitions } from '../../shared/workflow.ts'
|
||||
import type { SessionUser } from '../auth/sessions.ts'
|
||||
import type { Db } from '../db/client.ts'
|
||||
import { areas, attachments, correctiveActions, incidents, investigations, kiosks, rootCauses, sites, users } from '../db/schema.ts'
|
||||
import { areas, attachments, correctiveActions, incidents, injuredPersons, investigations, kiosks, rootCauses, sites, users } from '../db/schema.ts'
|
||||
import { audit } from './audit.ts'
|
||||
import { iso, localDate } from './dates.ts'
|
||||
import { fail } from './http.ts'
|
||||
@@ -159,6 +159,7 @@ export async function loadDetail(db: Db, user: SessionUser, number: number): Pro
|
||||
: null
|
||||
const actions = actionRows.map((action) => toAction(action))
|
||||
const manage = hasRole(user.role, 'supervisor')
|
||||
const [{ injured }] = await db.select({ injured: count() }).from(injuredPersons).where(eq(injuredPersons.incidentId, incidentId))
|
||||
|
||||
return {
|
||||
...toIncident(row),
|
||||
@@ -171,7 +172,8 @@ export async function loadDetail(db: Db, user: SessionUser, number: number): Pro
|
||||
rootCauseCount: causes.length,
|
||||
actionStatuses: actions.map((action) => action.status),
|
||||
}),
|
||||
can: { edit: manage, manageInvestigation: manage, manageActions: manage },
|
||||
injuredCount: injured,
|
||||
can: { edit: manage, manageInvestigation: manage, manageActions: manage, manageOsha: hasRole(user.role, 'safety_manager') },
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,200 @@
|
||||
import { and, asc, eq, gte, isNull, lt } from 'drizzle-orm'
|
||||
import type { Establishment, OshaCase, OshaLogRow, OshaYear } from '../../shared/api-types.ts'
|
||||
import { oshaCaseTypes } from '../../shared/enums.ts'
|
||||
import { incidentReference } from '../../shared/format.ts'
|
||||
import { capDays, incidenceRate, severeInjuryReport, summaryChecks, type SummaryTotals } from '../../shared/osha.ts'
|
||||
import type { Db } from '../db/client.ts'
|
||||
import { areas, hoursWorked, incidents, injuredPersons, organizations, sites } from '../db/schema.ts'
|
||||
import { iso } from './dates.ts'
|
||||
import { fail } from './http.ts'
|
||||
|
||||
type Person = typeof injuredPersons.$inferSelect
|
||||
type IncidentInfo = { id: string; number: number; title: string; occurredAt: Date; createdAt: Date }
|
||||
|
||||
/** Jan 1 to Jan 1 in the server's time zone (set TZ to the plant's zone). */
|
||||
export function yearRange(year: number): [Date, Date] {
|
||||
return [new Date(year, 0, 1), new Date(year + 1, 0, 1)]
|
||||
}
|
||||
|
||||
/** Fields the ITA case upload and Form 301 require that are still empty. */
|
||||
export function missingFields(person: Person): string[] {
|
||||
if (!person.recordable) return []
|
||||
const required: [keyof Person, string][] = [
|
||||
['jobTitle', 'job title'],
|
||||
['dateOfBirth', 'date of birth'],
|
||||
['dateOfHire', 'date hired'],
|
||||
['activityBefore', 'what they were doing'],
|
||||
['whatHappened', 'what happened'],
|
||||
['natureOfInjury', 'the injury or illness'],
|
||||
['objectSubstance', 'object or substance'],
|
||||
]
|
||||
const missing = required.filter(([key]) => !person[key]).map(([, label]) => label)
|
||||
if (person.died && !person.dateOfDeath) missing.push('date of death')
|
||||
return missing
|
||||
}
|
||||
|
||||
export function toOshaCase(person: Person, incident: IncidentInfo): OshaCase {
|
||||
const severe = severeInjuryReport(person)
|
||||
return {
|
||||
id: person.id,
|
||||
incident: { id: incident.id, number: incident.number, reference: incidentReference(incident.number), title: incident.title, occurredAt: iso(incident.occurredAt) },
|
||||
caseNumber: person.caseNumber ?? incidentReference(incident.number),
|
||||
name: person.name,
|
||||
jobTitle: person.jobTitle,
|
||||
employmentType: person.employmentType,
|
||||
bodyPart: person.bodyPart,
|
||||
natureOfInjury: person.natureOfInjury,
|
||||
caseType: person.caseType,
|
||||
workRelated: person.workRelated,
|
||||
newCase: person.newCase,
|
||||
died: person.died,
|
||||
dateOfDeath: person.dateOfDeath,
|
||||
daysAwayFromWork: person.daysAwayFromWork,
|
||||
daysAway: person.daysAway,
|
||||
restrictedOrTransfer: person.restrictedOrTransfer,
|
||||
daysRestricted: person.daysRestricted,
|
||||
medicalTreatment: person.medicalTreatment,
|
||||
lossOfConsciousness: person.lossOfConsciousness,
|
||||
significantDiagnosis: person.significantDiagnosis,
|
||||
specialCase: person.specialCase,
|
||||
privacyCase: person.privacyCase,
|
||||
recordable: person.recordable,
|
||||
outcome: person.outcome,
|
||||
inpatientHospitalization: person.inpatientHospitalization,
|
||||
amputation: person.amputation,
|
||||
lossOfEye: person.lossOfEye,
|
||||
reportedToOshaAt: iso(person.reportedToOshaAt),
|
||||
// The clock starts when the employer learns of it; the report date is the best record of that.
|
||||
severeReport: severe && { ...severe, dueBy: new Date(incident.createdAt.getTime() + severe.withinHours * 3_600_000).toISOString() },
|
||||
employeeAddress: person.employeeAddress,
|
||||
dateOfBirth: person.dateOfBirth,
|
||||
dateOfHire: person.dateOfHire,
|
||||
sex: person.sex === 'M' || person.sex === 'F' ? person.sex : null,
|
||||
physicianName: person.physicianName,
|
||||
treatmentFacility: person.treatmentFacility,
|
||||
treatedInEmergencyRoom: person.treatedInEmergencyRoom,
|
||||
timeStartedWork: person.timeStartedWork,
|
||||
activityBefore: person.activityBefore,
|
||||
whatHappened: person.whatHappened,
|
||||
objectSubstance: person.objectSubstance,
|
||||
missingFields: missingFields(person),
|
||||
updatedAt: iso(person.updatedAt),
|
||||
}
|
||||
}
|
||||
|
||||
/** Form 300 column F: injury, body part, and what caused it. */
|
||||
export function describeCase(person: Pick<Person, 'natureOfInjury' | 'bodyPart' | 'objectSubstance'>): string {
|
||||
const injury = [person.natureOfInjury, person.bodyPart && `(${person.bodyPart})`].filter(Boolean).join(' ')
|
||||
return [injury, person.objectSubstance].filter(Boolean).join('; ')
|
||||
}
|
||||
|
||||
export const establishmentOf = (site: typeof sites.$inferSelect): Establishment => ({
|
||||
streetAddress: site.streetAddress,
|
||||
city: site.city,
|
||||
state: site.state,
|
||||
zip: site.zip,
|
||||
naicsCode: site.naicsCode,
|
||||
industryDescription: site.industryDescription,
|
||||
ein: site.ein,
|
||||
establishmentType: site.establishmentType,
|
||||
})
|
||||
|
||||
export function missingEstablishmentFields(site: typeof sites.$inferSelect): string[] {
|
||||
const required: [keyof typeof site, string][] = [
|
||||
['streetAddress', 'street address'],
|
||||
['city', 'city'],
|
||||
['state', 'state'],
|
||||
['zip', 'ZIP code'],
|
||||
['naicsCode', 'NAICS code'],
|
||||
['ein', 'EIN'],
|
||||
]
|
||||
return required.filter(([key]) => !site[key]).map(([, label]) => label)
|
||||
}
|
||||
|
||||
/** Everything for one establishment's year: the 300 Log, 300A totals, hours, rates and ITA checks. */
|
||||
export async function buildOshaYear(db: Db, organizationId: string, siteId: string, year: number): Promise<OshaYear> {
|
||||
const [site] = await db.select().from(sites).where(and(eq(sites.id, siteId), eq(sites.organizationId, organizationId)))
|
||||
if (!site) throw fail(404, 'Site not found')
|
||||
const [organization] = await db.select({ name: organizations.name }).from(organizations).where(eq(organizations.id, organizationId))
|
||||
const [from, to] = yearRange(year)
|
||||
|
||||
const caseRows = await db
|
||||
.select({ person: injuredPersons, incident: incidents, areaName: areas.name })
|
||||
.from(injuredPersons)
|
||||
.innerJoin(incidents, eq(incidents.id, injuredPersons.incidentId))
|
||||
.leftJoin(areas, eq(areas.id, incidents.areaId))
|
||||
.where(and(eq(incidents.siteId, siteId), eq(injuredPersons.recordable, true), gte(incidents.occurredAt, from), lt(incidents.occurredAt, to)))
|
||||
.orderBy(asc(incidents.occurredAt), asc(injuredPersons.caseNumber))
|
||||
|
||||
const rows: OshaLogRow[] = caseRows.map(({ person, incident, areaName }) => {
|
||||
const days = capDays(person.daysAwayFromWork ? person.daysAway : 0, person.restrictedOrTransfer ? person.daysRestricted : 0)
|
||||
return {
|
||||
caseId: person.id,
|
||||
caseNumber: person.caseNumber ?? incidentReference(incident.number),
|
||||
incidentNumber: incident.number,
|
||||
employeeName: person.privacyCase ? 'Privacy case' : person.name,
|
||||
jobTitle: person.jobTitle ?? '',
|
||||
dateOfInjury: iso(incident.occurredAt),
|
||||
location: [areaName, incident.locationDetail].filter(Boolean).join(', ') || site.name,
|
||||
description: describeCase(person),
|
||||
outcome: person.outcome ?? 'other',
|
||||
daysAway: days.daysAway,
|
||||
daysRestricted: days.daysRestricted,
|
||||
caseType: person.caseType,
|
||||
missingFields: missingFields(person),
|
||||
}
|
||||
})
|
||||
|
||||
const totals: SummaryTotals = {
|
||||
deaths: rows.filter((r) => r.outcome === 'death').length,
|
||||
daysAwayCases: rows.filter((r) => r.outcome === 'days_away').length,
|
||||
restrictedCases: rows.filter((r) => r.outcome === 'restricted').length,
|
||||
otherCases: rows.filter((r) => r.outcome === 'other').length,
|
||||
daysAway: rows.reduce((sum, r) => sum + r.daysAway, 0),
|
||||
daysRestricted: rows.reduce((sum, r) => sum + r.daysRestricted, 0),
|
||||
byType: Object.fromEntries(oshaCaseTypes.map((type) => [type, rows.filter((r) => r.caseType === type).length])) as SummaryTotals['byType'],
|
||||
}
|
||||
|
||||
const monthRows = await db
|
||||
.select()
|
||||
.from(hoursWorked)
|
||||
.where(and(eq(hoursWorked.siteId, siteId), gte(hoursWorked.month, `${year}-01-01`), lt(hoursWorked.month, `${year + 1}-01-01`)))
|
||||
const months = Array.from({ length: 12 }, (_, i) => {
|
||||
const row = monthRows.find((m) => Number(m.month.slice(5, 7)) === i + 1)
|
||||
return { month: i + 1, hours: row ? Number(row.hours) : null, averageEmployees: row?.averageEmployees ?? null }
|
||||
})
|
||||
const totalHoursWorked = Math.round(months.reduce((sum, m) => sum + (m.hours ?? 0), 0))
|
||||
const headcounts = months.map((m) => m.averageEmployees).filter((n): n is number => n !== null)
|
||||
// 1904.32 instructions: total of employees each pay period ÷ number of pay periods; here, months.
|
||||
const annualAverageEmployees = headcounts.length ? Math.round(headcounts.reduce((a, b) => a + b, 0) / headcounts.length) : 0
|
||||
const maxEmployees = headcounts.length ? Math.max(...headcounts) : 0
|
||||
const recordable = rows.length
|
||||
|
||||
return {
|
||||
site: { id: site.id, name: site.name, ...establishmentOf(site) },
|
||||
companyName: organization.name,
|
||||
year,
|
||||
rows,
|
||||
totals,
|
||||
months,
|
||||
totalHoursWorked,
|
||||
annualAverageEmployees,
|
||||
maxEmployees,
|
||||
rates: {
|
||||
trir: incidenceRate(recordable, totalHoursWorked),
|
||||
dart: incidenceRate(totals.daysAwayCases + totals.restrictedCases, totalHoursWorked),
|
||||
ltir: incidenceRate(totals.daysAwayCases, totalHoursWorked),
|
||||
},
|
||||
checks: summaryChecks(totals, annualAverageEmployees, totalHoursWorked),
|
||||
missingEstablishmentFields: missingEstablishmentFields(site),
|
||||
}
|
||||
}
|
||||
|
||||
/** Active sites for an organization (establishments that may need a log). */
|
||||
export function activeSites(db: Db, organizationId: string) {
|
||||
return db
|
||||
.select()
|
||||
.from(sites)
|
||||
.where(and(eq(sites.organizationId, organizationId), isNull(sites.archivedAt)))
|
||||
.orderBy(asc(sites.name))
|
||||
}
|
||||
+27
-1
@@ -2,7 +2,8 @@ import { and, eq, inArray, isNotNull, isNull, lt, lte, ne, or } from 'drizzle-or
|
||||
import { incidentReference } from '../shared/format.ts'
|
||||
import type { Config } from './config.ts'
|
||||
import type { Db } from './db/client.ts'
|
||||
import { correctiveActions, incidents, users } from './db/schema.ts'
|
||||
import { OSHA_REPORTING_CONTACT, severeInjuryReport } from '../shared/osha.ts'
|
||||
import { correctiveActions, incidents, injuredPersons, users } from './db/schema.ts'
|
||||
import { addDays, localDate } from './lib/dates.ts'
|
||||
import type { Mailer } from './mail.ts'
|
||||
|
||||
@@ -93,6 +94,31 @@ export class Notifier {
|
||||
})
|
||||
}
|
||||
|
||||
/** 1904.39: fatalities must be reported to OSHA within 8 hours; hospitalizations, amputations and eye losses within 24. */
|
||||
severeInjury(caseId: string) {
|
||||
this.dispatch(async () => {
|
||||
const [row] = await this.db
|
||||
.select({ person: injuredPersons, incident: incidents })
|
||||
.from(injuredPersons)
|
||||
.innerJoin(incidents, eq(incidents.id, injuredPersons.incidentId))
|
||||
.where(eq(injuredPersons.id, caseId))
|
||||
const report = row && severeInjuryReport(row.person)
|
||||
if (!report) return
|
||||
const recipients = await this.db
|
||||
.select({ email: users.email })
|
||||
.from(users)
|
||||
.where(and(eq(users.organizationId, row.incident.organizationId), eq(users.active, true), inArray(users.role, ['safety_manager', 'admin'])))
|
||||
const reference = incidentReference(row.incident.number)
|
||||
for (const { email } of recipients) {
|
||||
await this.mailer.send({
|
||||
to: email,
|
||||
subject: `Report to OSHA within ${report.withinHours} hours: ${reference}`,
|
||||
text: `${reference} (${row.incident.title}) was recorded with: ${report.reasons.join(', ')}. OSHA requires a direct report within ${report.withinHours} hours of learning about it (29 CFR 1904.39).\n\n${OSHA_REPORTING_CONTACT}\n\nAfter reporting, record the date and time on the case: ${this.link(`/incidents/${row.incident.number}`)}`,
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
actionAssigned(actionId: string, assignedBy: string) {
|
||||
this.dispatch(async () => {
|
||||
const [row] = await this.db
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
import { afterAll, beforeAll, describe, expect, it } from 'vitest'
|
||||
import { buckets } from '../lib/analytics.ts'
|
||||
import { localDate } from '../lib/dates.ts'
|
||||
import { createTestContext } from '../test/helpers.ts'
|
||||
|
||||
let ctx: Awaited<ReturnType<typeof createTestContext>>
|
||||
let manager: Awaited<ReturnType<typeof ctx.createUser>>
|
||||
let reporter: Awaited<ReturnType<typeof ctx.createUser>>
|
||||
let north: { id: string }
|
||||
let south: { id: string }
|
||||
|
||||
const daysAgo = (days: number, hour = 10) => {
|
||||
const d = new Date()
|
||||
d.setDate(d.getDate() - days)
|
||||
d.setHours(hour, 0, 0, 0)
|
||||
return d
|
||||
}
|
||||
const range = (fromDaysAgo: number, toDaysAgo = 0) => `from=${localDate(daysAgo(fromDaysAgo))}&to=${localDate(daysAgo(toDaysAgo))}`
|
||||
|
||||
async function report(type: string, when: Date, siteId = north.id, by = manager) {
|
||||
const res = await by.post('/api/incidents', { title: `${type} report`, type, severity: 'low', occurredAt: when.toISOString(), siteId })
|
||||
return res.body.incident.number as number
|
||||
}
|
||||
|
||||
beforeAll(async () => {
|
||||
ctx = await createTestContext()
|
||||
north = await ctx.createSite('North')
|
||||
south = await ctx.createSite('South')
|
||||
manager = await ctx.createUser('safety_manager')
|
||||
reporter = await ctx.createUser('reporter')
|
||||
// Current 30-day period: 3 near misses/hazards, 1 injury, 1 spill
|
||||
await report('near_miss', daysAgo(2, 14))
|
||||
await report('near_miss', daysAgo(3, 14))
|
||||
await report('hazard', daysAgo(5, 9), south.id)
|
||||
const injury = await report('injury', daysAgo(6, 22))
|
||||
await report('environmental', daysAgo(10))
|
||||
// Previous period: 1 near miss, 2 injuries
|
||||
await report('near_miss', daysAgo(40))
|
||||
await report('injury', daysAgo(45))
|
||||
await report('injury', daysAgo(50))
|
||||
|
||||
// Triage one report straight away
|
||||
await manager.post(`/api/incidents/${injury}/transitions`, { to: 'triage' })
|
||||
// A recordable case with hours worked
|
||||
await manager.post(`/api/osha/incidents/${injury}/cases`, { name: 'Case', workRelated: true, newCase: true, daysAwayFromWork: true, daysAway: 2 })
|
||||
const now = new Date()
|
||||
await manager.put(`/api/osha/sites/${north.id}/hours`, { year: now.getFullYear(), months: [{ month: now.getMonth() + 1, hours: 10_000, averageEmployees: 60 }] })
|
||||
})
|
||||
afterAll(() => ctx.close())
|
||||
|
||||
describe('analytics', () => {
|
||||
it('compares the period with the one before', async () => {
|
||||
const stats = (await manager.get(`/api/stats/analytics?${range(29)}`)).body
|
||||
expect(stats.kpis.reports).toEqual({ value: 5, previous: 3 })
|
||||
expect(stats.kpis.leadingReports).toEqual({ value: 3, previous: 1 })
|
||||
expect(stats.kpis.injuries).toEqual({ value: 1, previous: 2 })
|
||||
expect(stats.kpis.nearMissRatio).toEqual({ value: 3, previous: 0.5 })
|
||||
expect(stats.kpis.triagedWithin24h.value).toBeCloseTo(0.2)
|
||||
expect(stats.kpis.recordables).toEqual({ value: 1, previous: 0 })
|
||||
})
|
||||
|
||||
it('groups the trend, locations and the time-of-day heatmap', async () => {
|
||||
const stats = (await manager.get(`/api/stats/analytics?${range(29)}`)).body
|
||||
expect(stats.bucket).toBe('week')
|
||||
const totals = stats.trend.reduce((sum: Record<string, number>, b: Record<string, number>) => ({ hazards: sum.hazards + b.hazards, injuries: sum.injuries + b.injuries, damage: sum.damage + b.damage }), { hazards: 0, injuries: 0, damage: 0 })
|
||||
expect(totals).toEqual({ hazards: 3, injuries: 1, damage: 1 })
|
||||
expect(stats.byLocation).toEqual([
|
||||
{ id: north.id, name: 'North', count: 4 },
|
||||
{ id: south.id, name: 'South', count: 1 },
|
||||
])
|
||||
expect(stats.heatmap).toHaveLength(7)
|
||||
expect(stats.heatmap.flat().reduce((a: number, b: number) => a + b, 0)).toBe(5)
|
||||
expect(stats.heatmap[(daysAgo(6).getDay() + 6) % 7][22]).toBeGreaterThanOrEqual(1)
|
||||
})
|
||||
|
||||
it('narrows to a site (showing its areas) and a type', async () => {
|
||||
const stats = (await manager.get(`/api/stats/analytics?${range(29)}&siteId=${north.id}&type=near_miss`)).body
|
||||
expect(stats.kpis.reports.value).toBe(2)
|
||||
expect(stats.byLocation).toEqual([{ id: null, name: 'Area not specified', count: 2 }])
|
||||
})
|
||||
|
||||
it('computes rolling 12-month OSHA rates from hours worked', async () => {
|
||||
const stats = (await manager.get(`/api/stats/analytics?${range(29)}`)).body
|
||||
expect(stats.rates).toHaveLength(12)
|
||||
expect(stats.rates.at(-1)).toEqual({ month: localDate(new Date()).slice(0, 7), trir: 20, dart: 20 })
|
||||
// Summed over the years, so the test holds even when the injury falls in last year (early January)
|
||||
expect(stats.yearly.reduce((sum: number, y: { recordables: number }) => sum + y.recordables, 0)).toBe(1)
|
||||
expect(stats.yearly.at(-1)).toMatchObject({ year: new Date().getFullYear(), hours: 10_000 })
|
||||
})
|
||||
|
||||
it('scopes reporters to their own reports and hides rates', async () => {
|
||||
await report('hazard', daysAgo(1), north.id, reporter)
|
||||
const stats = (await reporter.get(`/api/stats/analytics?${range(29)}`)).body
|
||||
expect(stats.kpis.reports.value).toBe(1)
|
||||
expect(stats.rates).toBeNull()
|
||||
expect(stats.kpis.recordables).toBeNull()
|
||||
})
|
||||
|
||||
it('validates the range', async () => {
|
||||
expect((await manager.get(`/api/stats/analytics?from=2026-02-01&to=2026-01-01`)).status).toBe(400)
|
||||
expect((await manager.get(`/api/stats/analytics?from=2015-01-01&to=2026-01-01`)).status).toBe(400)
|
||||
})
|
||||
|
||||
it('uses weeks for short ranges and months for long ones', () => {
|
||||
expect(buckets('2026-01-01', '2026-03-31').bucket).toBe('week')
|
||||
const long = buckets('2025-01-15', '2025-12-31')
|
||||
expect(long.bucket).toBe('month')
|
||||
expect(long.starts).toHaveLength(12)
|
||||
})
|
||||
})
|
||||
|
||||
describe('saved views', () => {
|
||||
it('keeps private views private and lets supervisors share', async () => {
|
||||
const supervisor = await ctx.createUser('supervisor')
|
||||
const mine = await reporter.post('/api/views', { page: 'analytics', name: 'My hazards', filters: { type: 'hazard', range: '90' } })
|
||||
expect(mine.status).toBe(201)
|
||||
expect((await reporter.post('/api/views', { page: 'analytics', name: 'Shared?', filters: {}, shared: true })).status).toBe(403)
|
||||
await supervisor.post('/api/views', { page: 'analytics', name: 'Plant review', filters: { range: '365' }, shared: true })
|
||||
|
||||
const reporterViews = (await reporter.get('/api/views?page=analytics')).body.views.map((v: { name: string; mine: boolean }) => [v.name, v.mine])
|
||||
expect(reporterViews).toEqual([
|
||||
['My hazards', true],
|
||||
['Plant review', false],
|
||||
])
|
||||
expect((await supervisor.get('/api/views?page=analytics')).body.views.map((v: { name: string }) => v.name)).toEqual(['Plant review'])
|
||||
|
||||
expect((await reporter.delete(`/api/views/${(await supervisor.get('/api/views?page=analytics')).body.views[0].id}`)).status).toBe(403)
|
||||
expect((await reporter.delete(`/api/views/${mine.body.view.id}`)).status).toBe(204)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,176 @@
|
||||
import { afterAll, beforeAll, describe, expect, it } from 'vitest'
|
||||
import { createTestContext } from '../test/helpers.ts'
|
||||
|
||||
let ctx: Awaited<ReturnType<typeof createTestContext>>
|
||||
let manager: Awaited<ReturnType<typeof ctx.createUser>>
|
||||
let supervisor: Awaited<ReturnType<typeof ctx.createUser>>
|
||||
let site: { id: string }
|
||||
const year = new Date().getFullYear()
|
||||
|
||||
/** An incident earlier this year (Jan 15, local time) so it lands on this year's log. */
|
||||
async function incident(title = 'Hand caught in press') {
|
||||
const occurredAt = new Date(year, 0, 15, 10, 30).toISOString()
|
||||
const res = await supervisor.post('/api/incidents', { title, type: 'injury', severity: 'high', occurredAt, siteId: site.id, locationDetail: 'Line 3' })
|
||||
return res.body.incident.number as number
|
||||
}
|
||||
|
||||
const recordableAnswers = {
|
||||
workRelated: true,
|
||||
newCase: true,
|
||||
jobTitle: 'Press operator',
|
||||
natureOfInjury: 'Laceration',
|
||||
bodyPart: 'left hand',
|
||||
objectSubstance: 'Press die',
|
||||
dateOfBirth: '1990-04-02',
|
||||
dateOfHire: '2019-06-10',
|
||||
activityBefore: 'Clearing a jam',
|
||||
whatHappened: 'Hand slipped into the die area',
|
||||
sex: 'M',
|
||||
timeStartedWork: '07:00',
|
||||
}
|
||||
|
||||
beforeAll(async () => {
|
||||
ctx = await createTestContext()
|
||||
site = await ctx.createSite('Main Plant')
|
||||
manager = await ctx.createUser('safety_manager')
|
||||
supervisor = await ctx.createUser('supervisor')
|
||||
})
|
||||
afterAll(() => ctx.close())
|
||||
|
||||
describe('injured people (OSHA cases)', () => {
|
||||
it('keeps medical details to safety managers', async () => {
|
||||
const number = await incident()
|
||||
await manager.post(`/api/osha/incidents/${number}/cases`, { name: 'Pat Doe' })
|
||||
expect((await supervisor.get(`/api/osha/incidents/${number}/cases`)).status).toBe(403)
|
||||
expect((await supervisor.post(`/api/osha/incidents/${number}/cases`, { name: 'X' })).status).toBe(403)
|
||||
const detail = (await supervisor.get(`/api/incidents/${number}`)).body.incident
|
||||
expect(detail).toMatchObject({ injuredCount: 1, can: { manageOsha: false } })
|
||||
// The timeline says a person was added, without naming them
|
||||
const timeline = (await supervisor.get(`/api/incidents/${number}/timeline`)).body.timeline
|
||||
expect(JSON.stringify(timeline)).not.toContain('Pat Doe')
|
||||
})
|
||||
|
||||
it('works out recordability from the answers, and re-checks on every change', async () => {
|
||||
const number = await incident()
|
||||
let res = await manager.post(`/api/osha/incidents/${number}/cases`, { name: 'Sam Lee' })
|
||||
expect(res.body.case).toMatchObject({ recordable: false, outcome: null, caseNumber: `INC-${String(number).padStart(4, '0')}` })
|
||||
const id = res.body.case.id
|
||||
|
||||
res = await manager.patch(`/api/osha/cases/${id}`, { ...recordableAnswers })
|
||||
expect(res.body.case).toMatchObject({ recordable: false }) // first aid only so far
|
||||
|
||||
res = await manager.patch(`/api/osha/cases/${id}`, { medicalTreatment: true })
|
||||
expect(res.body.case).toMatchObject({ recordable: true, outcome: 'other' })
|
||||
|
||||
res = await manager.patch(`/api/osha/cases/${id}`, { daysAwayFromWork: true, daysAway: 4, restrictedOrTransfer: true, daysRestricted: 10 })
|
||||
expect(res.body.case).toMatchObject({ outcome: 'days_away', daysAway: 4, daysRestricted: 10, missingFields: [] })
|
||||
|
||||
res = await manager.patch(`/api/osha/cases/${id}`, { workRelated: false })
|
||||
expect(res.body.case.recordable).toBe(false)
|
||||
await manager.patch(`/api/osha/cases/${id}`, { workRelated: true })
|
||||
})
|
||||
|
||||
it('numbers each person on an incident and enforces the 180-day cap', async () => {
|
||||
const number = await incident()
|
||||
await manager.post(`/api/osha/incidents/${number}/cases`, { name: 'First' })
|
||||
const second = await manager.post(`/api/osha/incidents/${number}/cases`, { name: 'Second' })
|
||||
expect(second.body.case.caseNumber).toBe(`INC-${String(number).padStart(4, '0')}-2`)
|
||||
const res = await manager.patch(`/api/osha/cases/${second.body.case.id}`, { daysAwayFromWork: true, daysAway: 150, restrictedOrTransfer: true, daysRestricted: 40 })
|
||||
expect(res.status).toBe(400)
|
||||
expect(res.body.error).toMatch(/180/)
|
||||
})
|
||||
|
||||
it('ignores day counts when the outcome does not apply', async () => {
|
||||
const number = await incident()
|
||||
const created = await manager.post(`/api/osha/incidents/${number}/cases`, { name: 'Counts', daysAway: 12 })
|
||||
expect(created.body.case.daysAway).toBe(0)
|
||||
})
|
||||
|
||||
it('alerts safety managers when a case must be reported to OSHA, once', async () => {
|
||||
const number = await incident('Finger amputation at shear')
|
||||
const created = await manager.post(`/api/osha/incidents/${number}/cases`, { name: 'Alex Kim', ...recordableAnswers, amputation: true, medicalTreatment: true })
|
||||
expect(created.body.case.severeReport).toMatchObject({ withinHours: 24, reasons: ['amputation'] })
|
||||
await ctx.notifier.flush()
|
||||
const alert = ctx.mailer.last(manager.user.email)
|
||||
expect(alert?.subject).toMatch(/^Report to OSHA within 24 hours: INC-\d{4}$/)
|
||||
expect(alert?.text).toContain('1-800-321-OSHA')
|
||||
|
||||
const before = ctx.mailer.sent.length
|
||||
await manager.patch(`/api/osha/cases/${created.body.case.id}`, { reportedToOshaAt: new Date().toISOString(), lossOfEye: true })
|
||||
await ctx.notifier.flush()
|
||||
expect(ctx.mailer.sent.length).toBe(before)
|
||||
})
|
||||
})
|
||||
|
||||
describe('OSHA log, summary and rates', () => {
|
||||
let other: { id: string }
|
||||
|
||||
beforeAll(async () => {
|
||||
other = await ctx.createSite('Second Plant')
|
||||
const occurredAt = new Date(year, 1, 3, 14, 5).toISOString()
|
||||
const res = await supervisor.post('/api/incidents', { title: 'Needlestick', type: 'injury', severity: 'medium', occurredAt, siteId: other.id })
|
||||
const number = res.body.incident.number
|
||||
const created = await manager.post(`/api/osha/incidents/${number}/cases`, { name: 'Jordan Private', ...recordableAnswers, specialCase: 'needlestick', privacyCase: true, restrictedOrTransfer: true, daysRestricted: 3, caseType: 'other_illness' })
|
||||
if (!created.body.case.recordable) throw new Error('setup: needlestick case should be recordable')
|
||||
// Not recordable: should stay off the log
|
||||
await manager.post(`/api/osha/incidents/${number}/cases`, { name: 'First Aid Only', ...recordableAnswers })
|
||||
await manager.put(`/api/osha/sites/${other.id}/hours`, {
|
||||
year,
|
||||
months: Array.from({ length: 12 }, (_, i) => ({ month: i + 1, hours: 10_000, averageEmployees: i < 6 ? 50 : 70 })),
|
||||
})
|
||||
})
|
||||
|
||||
it('builds the 300 Log with privacy cases hidden', async () => {
|
||||
const log = (await manager.get(`/api/osha/log?siteId=${other.id}&year=${year}`)).body
|
||||
expect(log.rows).toHaveLength(1)
|
||||
expect(log.rows[0]).toMatchObject({ employeeName: 'Privacy case', jobTitle: 'Press operator', outcome: 'restricted', daysRestricted: 3, caseType: 'other_illness' })
|
||||
expect(log.rows[0].description).toBe('Laceration (left hand); Press die')
|
||||
})
|
||||
|
||||
it('totals the 300A, computes rates and runs the ITA checks', async () => {
|
||||
const log = (await manager.get(`/api/osha/log?siteId=${other.id}&year=${year}`)).body
|
||||
expect(log.totals).toMatchObject({ deaths: 0, daysAwayCases: 0, restrictedCases: 1, otherCases: 0, daysRestricted: 3 })
|
||||
expect(log).toMatchObject({ totalHoursWorked: 120_000, annualAverageEmployees: 60, maxEmployees: 70 })
|
||||
expect(log.rates).toEqual({ trir: 1.67, dart: 1.67, ltir: 0 })
|
||||
expect(log.checks.errors).toEqual([])
|
||||
expect(log.missingEstablishmentFields).toEqual(['street address', 'city', 'state', 'ZIP code', 'NAICS code', 'EIN'])
|
||||
|
||||
const empty = (await manager.get(`/api/osha/log?siteId=${site.id}&year=${year}`)).body
|
||||
expect(empty.checks.errors).toContain('Enter hours worked for each month.')
|
||||
})
|
||||
|
||||
it('validates and normalises establishment details', async () => {
|
||||
expect((await manager.patch(`/api/sites/${other.id}`, { naicsCode: '33211' })).status).toBe(400)
|
||||
const res = await manager.patch(`/api/sites/${other.id}`, { streetAddress: '1 Mill Rd', city: 'Dayton', state: 'oh', zip: '45402-1234', naicsCode: '332119', ein: '12-3456789' })
|
||||
expect(res.body.site).toMatchObject({ state: 'OH', zip: '454021234', ein: '123456789' })
|
||||
})
|
||||
|
||||
it('exports the ITA 300A file in OSHA’s format', async () => {
|
||||
const res = await manager.get(`/api/osha/ita/summary.csv?year=${year}`)
|
||||
const lines = res.body.toString('utf8').trimEnd().split('\r\n')
|
||||
expect(lines[0].charCodeAt(0)).not.toBe(0xfeff)
|
||||
expect(lines[0]).toBe(
|
||||
'establishment_name,ein_number,company_name,street_address,city,state,zip,naics_code,industry_description,size,establishment_type,year_filing_for,annual_average_employees,total_hours_worked,no_injuries_illnesses,total_deaths,total_dafw_cases,total_djtr_cases,total_other_cases,total_dafw_days,total_djtr_days,total_injuries,total_skin_disorders,total_respiratory_conditions,total_poisonings,total_hearing_loss,total_other_illnesses,change_reason',
|
||||
)
|
||||
const second = lines.find((line: string) => line.startsWith('Second Plant'))
|
||||
expect(second).toBe(`Second Plant,123456789,Northstar Co.,1 Mill Rd,Dayton,OH,454021234,332119,,21,1,${year},60,120000,1,0,0,1,0,0,3,0,0,0,0,0,1,`)
|
||||
})
|
||||
|
||||
it('exports ITA case data without names', async () => {
|
||||
const res = await manager.get(`/api/osha/ita/cases.csv?year=${year}`)
|
||||
const csv = res.body.toString('utf8')
|
||||
expect(csv).not.toContain('Jordan Private')
|
||||
expect(csv).not.toContain('First Aid Only')
|
||||
const [header, ...rows] = csv.trimEnd().split('\r\n')
|
||||
expect(header.split(',')).toHaveLength(24)
|
||||
const row = rows.find((line: string) => line.startsWith('Second Plant'))!
|
||||
expect(row).toContain(`02-03-${year}`) // mm-dd-yyyy
|
||||
expect(row).toContain(',3,0,3,6,04-02-1990,06-10-2019,M,0,0,07:00,14:05,,') // outcome, days, type, dates, sex, treatment, times
|
||||
})
|
||||
|
||||
it('produces a Form 301 for a case', async () => {
|
||||
const log = (await manager.get(`/api/osha/log?siteId=${other.id}&year=${year}`)).body
|
||||
const form = (await manager.get(`/api/osha/cases/${log.rows[0].caseId}/301`)).body
|
||||
expect(form).toMatchObject({ establishment: { name: 'Second Plant', city: 'Dayton' }, case: { name: 'Jordan Private', privacyCase: true }, incident: { title: 'Needlestick' } })
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,289 @@
|
||||
import { and, asc, count, eq } from 'drizzle-orm'
|
||||
import { Hono } from 'hono'
|
||||
import { z } from 'zod'
|
||||
import type { Form301 } from '../../shared/api-types.ts'
|
||||
import { incidentReference } from '../../shared/format.ts'
|
||||
import { assessRecordability, caseTypeCode, outcomeCode, severeInjuryReport, itaSizeCode } from '../../shared/osha.ts'
|
||||
import { createOshaCaseSchema, hoursWorkedSchema, updateOshaCaseSchema } from '../../shared/schemas.ts'
|
||||
import { requireRole } from '../auth/middleware.ts'
|
||||
import type { SessionUser } from '../auth/sessions.ts'
|
||||
import type { Db } from '../db/client.ts'
|
||||
import { areas, hoursWorked, incidents, injuredPersons, sites } from '../db/schema.ts'
|
||||
import { toCsv } from '../lib/csv.ts'
|
||||
import { currentUser, fail, validate, type AppEnv } from '../lib/http.ts'
|
||||
import { auditIncident, findIncident } from '../lib/incidents.ts'
|
||||
import { activeSites, buildOshaYear, describeCase, establishmentOf, toOshaCase, yearRange } from '../lib/osha.ts'
|
||||
|
||||
const numberParam = z.object({ number: z.coerce.number().int().positive() })
|
||||
const idParam = z.object({ id: z.uuid() })
|
||||
const yearQuery = z.object({ year: z.coerce.number().int().min(2000).max(2100) })
|
||||
|
||||
type Person = typeof injuredPersons.$inferSelect
|
||||
|
||||
/** Days only count when the matching outcome applies; recordability is always derived, never sent. */
|
||||
function derive(person: Omit<Person, 'recordable' | 'outcome'>) {
|
||||
if (person.daysAway + person.daysRestricted > 180) throw fail(400, 'Stop counting once days away and restricted days reach 180 in total (1904.7(b)(3)(vii)).')
|
||||
const assessment = assessRecordability(person)
|
||||
return {
|
||||
daysAway: person.daysAwayFromWork ? person.daysAway : 0,
|
||||
daysRestricted: person.restrictedOrTransfer ? person.daysRestricted : 0,
|
||||
recordable: assessment.status === 'recordable',
|
||||
outcome: assessment.outcome,
|
||||
}
|
||||
}
|
||||
|
||||
async function findCase(db: Db, user: SessionUser, id: string) {
|
||||
const [row] = await db
|
||||
.select({ person: injuredPersons, incident: incidents })
|
||||
.from(injuredPersons)
|
||||
.innerJoin(incidents, eq(incidents.id, injuredPersons.incidentId))
|
||||
.where(and(eq(injuredPersons.id, id), eq(incidents.organizationId, user.organizationId)))
|
||||
if (!row) throw fail(404, 'Case not found')
|
||||
return row
|
||||
}
|
||||
|
||||
const dateMDY = (isoDate: string | null) => (isoDate ? `${isoDate.slice(5, 7)}-${isoDate.slice(8, 10)}-${isoDate.slice(0, 4)}` : '')
|
||||
const localTime = (date: Date) => `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`
|
||||
const localDateMDY = (date: Date) => `${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}-${date.getFullYear()}`
|
||||
const clip = (text: string, max: number) => (text.length > max ? `${text.slice(0, max - 1)}…` : text)
|
||||
|
||||
/**
|
||||
* OSHA recordkeeping. Injury and medical details are limited to safety managers and admins
|
||||
* (they hold the confidential records); everyone else only sees that a person was involved.
|
||||
*/
|
||||
export const oshaRoutes = new Hono<AppEnv>()
|
||||
.get('/incidents/:number/cases', requireRole('safety_manager'), validate('param', numberParam), async (c) => {
|
||||
const db = c.get('db')
|
||||
const { incident } = await findIncident(db, currentUser(c), c.req.valid('param').number)
|
||||
const people = await db.select().from(injuredPersons).where(eq(injuredPersons.incidentId, incident.id)).orderBy(asc(injuredPersons.createdAt))
|
||||
return c.json({ cases: people.map((person) => toOshaCase(person, incident)) })
|
||||
})
|
||||
|
||||
.post('/incidents/:number/cases', requireRole('safety_manager'), validate('param', numberParam), validate('json', createOshaCaseSchema), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const db = c.get('db')
|
||||
const { incident } = await findIncident(db, me, c.req.valid('param').number)
|
||||
const input = c.req.valid('json')
|
||||
const [{ existing }] = await db.select({ existing: count() }).from(injuredPersons).where(eq(injuredPersons.incidentId, incident.id))
|
||||
const reference = incidentReference(incident.number)
|
||||
|
||||
const draft = {
|
||||
employmentType: 'employee' as const,
|
||||
caseType: 'injury' as const,
|
||||
workRelated: null,
|
||||
newCase: null,
|
||||
died: false,
|
||||
daysAwayFromWork: false,
|
||||
daysAway: 0,
|
||||
restrictedOrTransfer: false,
|
||||
daysRestricted: 0,
|
||||
medicalTreatment: false,
|
||||
lossOfConsciousness: false,
|
||||
significantDiagnosis: false,
|
||||
specialCase: 'none' as const,
|
||||
...input,
|
||||
reportedToOshaAt: input.reportedToOshaAt ? new Date(input.reportedToOshaAt) : null,
|
||||
}
|
||||
const [person] = await db
|
||||
.insert(injuredPersons)
|
||||
.values({ ...draft, ...derive(draft as Person), incidentId: incident.id, caseNumber: existing ? `${reference}-${existing + 1}` : reference })
|
||||
.returning()
|
||||
// The timeline is visible beyond the safety team, so it carries no names or medical details.
|
||||
await auditIncident(db, me, me.organizationId, incident.id, 'osha_case.add', { caseNumber: person.caseNumber, recordable: person.recordable })
|
||||
if (severeInjuryReport(person) && !person.reportedToOshaAt) c.get('notifier').severeInjury(person.id)
|
||||
return c.json({ case: toOshaCase(person, incident) }, 201)
|
||||
})
|
||||
|
||||
.patch('/cases/:id', requireRole('safety_manager'), validate('param', idParam), validate('json', updateOshaCaseSchema), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const db = c.get('db')
|
||||
const { person, incident } = await findCase(db, me, c.req.valid('param').id)
|
||||
const input = c.req.valid('json')
|
||||
const merged = { ...person, ...input, reportedToOshaAt: input.reportedToOshaAt === undefined ? person.reportedToOshaAt : input.reportedToOshaAt ? new Date(input.reportedToOshaAt) : null }
|
||||
const update = { ...merged, ...derive(merged) }
|
||||
const [saved] = await db
|
||||
.update(injuredPersons)
|
||||
.set({ ...update, id: undefined, incidentId: undefined, createdAt: undefined, updatedAt: undefined })
|
||||
.where(eq(injuredPersons.id, person.id))
|
||||
.returning()
|
||||
await auditIncident(db, me, me.organizationId, incident.id, 'osha_case.update', {
|
||||
caseNumber: saved.caseNumber,
|
||||
...(saved.recordable !== person.recordable ? { recordable: [person.recordable, saved.recordable] } : {}),
|
||||
})
|
||||
const becameSevere = severeInjuryReport(saved) && !severeInjuryReport(person)
|
||||
if (becameSevere && !saved.reportedToOshaAt) c.get('notifier').severeInjury(saved.id)
|
||||
return c.json({ case: toOshaCase(saved, incident) })
|
||||
})
|
||||
|
||||
.delete('/cases/:id', requireRole('safety_manager'), validate('param', idParam), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const db = c.get('db')
|
||||
const { person, incident } = await findCase(db, me, c.req.valid('param').id)
|
||||
await db.delete(injuredPersons).where(eq(injuredPersons.id, person.id))
|
||||
await auditIncident(db, me, me.organizationId, incident.id, 'osha_case.remove', { caseNumber: person.caseNumber })
|
||||
return c.body(null, 204)
|
||||
})
|
||||
|
||||
.get('/cases/:id/301', requireRole('safety_manager'), validate('param', idParam), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const db = c.get('db')
|
||||
const { person, incident } = await findCase(db, me, c.req.valid('param').id)
|
||||
const [site] = await db.select().from(sites).where(eq(sites.id, incident.siteId))
|
||||
const [area] = incident.areaId ? await db.select({ name: areas.name }).from(areas).where(eq(areas.id, incident.areaId)) : []
|
||||
const year = await buildOshaYear(db, me.organizationId, site.id, incident.occurredAt.getFullYear())
|
||||
const form: Form301 = {
|
||||
case: toOshaCase(person, incident),
|
||||
establishment: { name: site.name, companyName: year.companyName, ...establishmentOf(site) },
|
||||
incident: {
|
||||
reference: incidentReference(incident.number),
|
||||
occurredAt: incident.occurredAt.toISOString(),
|
||||
title: incident.title,
|
||||
description: incident.description,
|
||||
site: site.name,
|
||||
area: area?.name ?? null,
|
||||
locationDetail: incident.locationDetail,
|
||||
},
|
||||
}
|
||||
return c.json(form)
|
||||
})
|
||||
|
||||
.get('/log', requireRole('safety_manager'), validate('query', yearQuery.extend({ siteId: z.uuid() })), async (c) => {
|
||||
const { siteId, year } = c.req.valid('query')
|
||||
return c.json(await buildOshaYear(c.get('db'), currentUser(c).organizationId, siteId, year))
|
||||
})
|
||||
|
||||
.get('/sites/:id/hours', requireRole('safety_manager'), validate('param', idParam), validate('query', yearQuery), async (c) => {
|
||||
const year = await buildOshaYear(c.get('db'), currentUser(c).organizationId, c.req.valid('param').id, c.req.valid('query').year)
|
||||
return c.json({ months: year.months })
|
||||
})
|
||||
|
||||
.put('/sites/:id/hours', requireRole('safety_manager'), validate('param', idParam), validate('json', hoursWorkedSchema), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const db = c.get('db')
|
||||
const siteId = c.req.valid('param').id
|
||||
const { year, months } = c.req.valid('json')
|
||||
await buildOshaYear(db, me.organizationId, siteId, year) // 404 unless the site is ours
|
||||
for (const { month, hours, averageEmployees } of months) {
|
||||
const monthDate = `${year}-${String(month).padStart(2, '0')}-01`
|
||||
if (hours === null && averageEmployees === null) {
|
||||
await db.delete(hoursWorked).where(and(eq(hoursWorked.siteId, siteId), eq(hoursWorked.month, monthDate)))
|
||||
continue
|
||||
}
|
||||
await db
|
||||
.insert(hoursWorked)
|
||||
.values({ siteId, month: monthDate, hours: String(hours ?? 0), averageEmployees })
|
||||
.onConflictDoUpdate({ target: [hoursWorked.siteId, hoursWorked.month], set: { hours: String(hours ?? 0), averageEmployees } })
|
||||
}
|
||||
const updated = await buildOshaYear(db, me.organizationId, siteId, year)
|
||||
return c.json({ months: updated.months })
|
||||
})
|
||||
|
||||
// OSHA Injury Tracking Application uploads. Formats follow OSHA's published CSV specifications.
|
||||
.get('/ita/summary.csv', requireRole('safety_manager'), validate('query', yearQuery), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const db = c.get('db')
|
||||
const { year } = c.req.valid('query')
|
||||
const rows = []
|
||||
for (const site of await activeSites(db, me.organizationId)) {
|
||||
const y = await buildOshaYear(db, me.organizationId, site.id, year)
|
||||
const t = y.totals
|
||||
rows.push([
|
||||
site.name,
|
||||
site.ein,
|
||||
y.companyName,
|
||||
site.streetAddress,
|
||||
site.city,
|
||||
site.state,
|
||||
site.zip,
|
||||
site.naicsCode,
|
||||
site.industryDescription,
|
||||
itaSizeCode(y.maxEmployees),
|
||||
site.establishmentType,
|
||||
year,
|
||||
y.annualAverageEmployees,
|
||||
y.totalHoursWorked,
|
||||
y.rows.length ? 1 : 2,
|
||||
t.deaths,
|
||||
t.daysAwayCases,
|
||||
t.restrictedCases,
|
||||
t.otherCases,
|
||||
t.daysAway,
|
||||
t.daysRestricted,
|
||||
t.byType.injury,
|
||||
t.byType.skin_disorder,
|
||||
t.byType.respiratory,
|
||||
t.byType.poisoning,
|
||||
t.byType.hearing_loss,
|
||||
t.byType.other_illness,
|
||||
'',
|
||||
])
|
||||
}
|
||||
const csv = toCsv(
|
||||
[
|
||||
'establishment_name', 'ein_number', 'company_name', 'street_address', 'city', 'state', 'zip', 'naics_code', 'industry_description', 'size',
|
||||
'establishment_type', 'year_filing_for', 'annual_average_employees', 'total_hours_worked', 'no_injuries_illnesses', 'total_deaths',
|
||||
'total_dafw_cases', 'total_djtr_cases', 'total_other_cases', 'total_dafw_days', 'total_djtr_days', 'total_injuries', 'total_skin_disorders',
|
||||
'total_respiratory_conditions', 'total_poisonings', 'total_hearing_loss', 'total_other_illnesses', 'change_reason',
|
||||
],
|
||||
rows,
|
||||
{ bom: false },
|
||||
)
|
||||
return c.body(csv, 200, { 'Content-Type': 'text/csv; charset=utf-8', 'Content-Disposition': `attachment; filename="osha-ita-300a-${year}.csv"` })
|
||||
})
|
||||
|
||||
.get('/ita/cases.csv', requireRole('safety_manager'), validate('query', yearQuery), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const db = c.get('db')
|
||||
const { year } = c.req.valid('query')
|
||||
const [from, to] = yearRange(year)
|
||||
const rows = []
|
||||
for (const site of await activeSites(db, me.organizationId)) {
|
||||
const y = await buildOshaYear(db, me.organizationId, site.id, year)
|
||||
for (const row of y.rows) {
|
||||
const [{ person, incident }] = await db
|
||||
.select({ person: injuredPersons, incident: incidents })
|
||||
.from(injuredPersons)
|
||||
.innerJoin(incidents, eq(incidents.id, injuredPersons.incidentId))
|
||||
.where(eq(injuredPersons.id, row.caseId))
|
||||
if (incident.occurredAt < from || incident.occurredAt >= to) continue
|
||||
// No names or other personal identifiers: OSHA publishes this data.
|
||||
rows.push([
|
||||
site.name,
|
||||
year,
|
||||
row.caseNumber,
|
||||
clip(row.jobTitle, 255),
|
||||
localDateMDY(incident.occurredAt),
|
||||
clip(row.location, 255),
|
||||
clip(describeCase(person), 255),
|
||||
outcomeCode[row.outcome],
|
||||
row.daysAway,
|
||||
row.daysRestricted,
|
||||
caseTypeCode[row.caseType],
|
||||
dateMDY(person.dateOfBirth),
|
||||
dateMDY(person.dateOfHire),
|
||||
person.sex ?? '',
|
||||
person.treatedInEmergencyRoom ? 1 : 0,
|
||||
person.inpatientHospitalization ? 1 : 0,
|
||||
person.timeStartedWork ?? '',
|
||||
localTime(incident.occurredAt),
|
||||
'',
|
||||
person.activityBefore ?? '',
|
||||
person.whatHappened ?? incident.description ?? '',
|
||||
person.natureOfInjury ?? '',
|
||||
person.objectSubstance ?? '',
|
||||
dateMDY(person.dateOfDeath),
|
||||
])
|
||||
}
|
||||
}
|
||||
const csv = toCsv(
|
||||
[
|
||||
'establishment_name', 'year_of_filing', 'case_number', 'job_title', 'date_of_incident', 'incident_location', 'incident_description',
|
||||
'incident_outcome', 'dafw_num_away', 'djtr_num_tr', 'type_of_incident', 'date_of_birth', 'date_of_hire', 'sex', 'treatment_facility_type',
|
||||
'treatment_in_patient', 'time_started_work', 'time_of_incident', 'time_unknown', 'nar_before_incident', 'nar_what_happened',
|
||||
'nar_injury_illness', 'nar_object_substance', 'date_of_death',
|
||||
],
|
||||
rows,
|
||||
{ bom: false },
|
||||
)
|
||||
return c.body(csv, 200, { 'Content-Type': 'text/csv; charset=utf-8', 'Content-Disposition': `attachment; filename="osha-ita-cases-${year}.csv"` })
|
||||
})
|
||||
@@ -35,9 +35,11 @@ describe('stats', () => {
|
||||
{ siteId: expect.any(String), name: 'South', count: 0 },
|
||||
])
|
||||
|
||||
const analytics = (await supervisor.get('/api/stats/analytics?days=30')).body
|
||||
expect(analytics).toMatchObject({ periodDays: 30, total: 3, topRootCause: { category: 'equipment', count: 1, share: 1 } })
|
||||
expect(analytics.byType).toEqual(expect.arrayContaining([{ type: 'hazard', count: 2 }, { type: 'injury', count: 1 }]))
|
||||
const to = new Date().toISOString().slice(0, 10)
|
||||
const from = new Date(Date.now() - 29 * 86_400_000).toISOString().slice(0, 10)
|
||||
const analytics = (await supervisor.get(`/api/stats/analytics?from=${from}&to=${to}`)).body
|
||||
expect(analytics.kpis.reports.value).toBe(3)
|
||||
expect(analytics.byRootCause).toEqual([{ category: 'equipment', count: 1 }])
|
||||
})
|
||||
|
||||
it("scopes a reporter's numbers to what they can see", async () => {
|
||||
|
||||
+11
-49
@@ -1,12 +1,13 @@
|
||||
import { and, asc, count, desc, eq, gte, inArray, isNotNull, isNull, lt, ne, sql } from 'drizzle-orm'
|
||||
import { Hono } from 'hono'
|
||||
import { z } from 'zod'
|
||||
import type { AnalyticsStats, OverviewStats } from '../../shared/api-types.ts'
|
||||
import type { OverviewStats } from '../../shared/api-types.ts'
|
||||
import { incidentStatuses, type IncidentStatus } from '../../shared/enums.ts'
|
||||
import { requireAuth } from '../auth/middleware.ts'
|
||||
import { correctiveActions, incidents, investigations, rootCauses, sites } from '../db/schema.ts'
|
||||
import { correctiveActions, incidents, sites } from '../db/schema.ts'
|
||||
import { addDays, localDate } from '../lib/dates.ts'
|
||||
import { currentUser, validate, type AppEnv } from '../lib/http.ts'
|
||||
import { computeAnalytics } from '../lib/analytics.ts'
|
||||
import { currentUser, fail, validate, type AppEnv } from '../lib/http.ts'
|
||||
import { analyticsQuery } from '../../shared/schemas.ts'
|
||||
import { visibleTo } from '../lib/incidents.ts'
|
||||
|
||||
const DAY_MS = 86_400_000
|
||||
@@ -97,49 +98,10 @@ export const statsRoutes = new Hono<AppEnv>()
|
||||
return c.json(stats)
|
||||
})
|
||||
|
||||
.get('/analytics', requireAuth, validate('query', z.object({ days: z.coerce.number().int().min(7).max(730).default(90) })), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const db = c.get('db')
|
||||
const { days } = c.req.valid('query')
|
||||
const since = new Date(Date.now() - days * DAY_MS)
|
||||
const inPeriod = and(visibleTo(db, me), gte(incidents.occurredAt, since))
|
||||
|
||||
const byType = await db.select({ type: incidents.type, count: count() }).from(incidents).where(inPeriod).groupBy(incidents.type).orderBy(desc(count()))
|
||||
const bySeverity = await db.select({ severity: incidents.severity, count: count() }).from(incidents).where(inPeriod).groupBy(incidents.severity)
|
||||
const causes = await db
|
||||
.select({ category: rootCauses.category, count: count() })
|
||||
.from(rootCauses)
|
||||
.innerJoin(investigations, eq(investigations.id, rootCauses.investigationId))
|
||||
.innerJoin(incidents, eq(incidents.id, investigations.incidentId))
|
||||
.where(inPeriod)
|
||||
.groupBy(rootCauses.category)
|
||||
.orderBy(desc(count()))
|
||||
const totalCauses = causes.reduce((sum, row) => sum + row.count, 0)
|
||||
|
||||
const monthExpr = sql<string>`to_char(${correctiveActions.completedAt}, 'YYYY-MM')`
|
||||
const onTimeExpr = sql<boolean>`(${correctiveActions.completedAt})::date <= ${correctiveActions.dueDate}`
|
||||
const completed = await db
|
||||
.select({ month: monthExpr, onTime: onTimeExpr, count: count() })
|
||||
.from(correctiveActions)
|
||||
.innerJoin(incidents, eq(incidents.id, correctiveActions.incidentId))
|
||||
.where(and(visibleTo(db, me), isNotNull(correctiveActions.completedAt), isNotNull(correctiveActions.dueDate), gte(correctiveActions.completedAt, since)))
|
||||
.groupBy(monthExpr, onTimeExpr)
|
||||
const onTime = completed.filter((row) => row.onTime).reduce((sum, row) => sum + row.count, 0)
|
||||
const allCompleted = completed.reduce((sum, row) => sum + row.count, 0)
|
||||
const months = [...new Set(completed.map((row) => row.month))].sort()
|
||||
|
||||
const stats: AnalyticsStats = {
|
||||
periodDays: days,
|
||||
total: byType.reduce((sum, row) => sum + row.count, 0),
|
||||
byType,
|
||||
bySeverity,
|
||||
topRootCause: causes[0] ? { category: causes[0].category, count: causes[0].count, share: causes[0].count / totalCauses } : null,
|
||||
onTimeActionRate: allCompleted ? onTime / allCompleted : null,
|
||||
monthlyCompletedActions: months.map((month) => ({
|
||||
month,
|
||||
onTime: completed.filter((row) => row.month === month && row.onTime).reduce((sum, row) => sum + row.count, 0),
|
||||
late: completed.filter((row) => row.month === month && !row.onTime).reduce((sum, row) => sum + row.count, 0),
|
||||
})),
|
||||
}
|
||||
return c.json(stats)
|
||||
.get('/analytics', requireAuth, validate('query', analyticsQuery), async (c) => {
|
||||
const filters = c.req.valid('query')
|
||||
if (filters.from > filters.to) throw fail(400, 'The start date must be before the end date')
|
||||
const days = (Date.parse(filters.to) - Date.parse(filters.from)) / 86_400_000
|
||||
if (days > 3 * 366) throw fail(400, 'Choose a range of up to three years')
|
||||
return c.json(await computeAnalytics(c.get('db'), currentUser(c), filters))
|
||||
})
|
||||
@@ -0,0 +1,56 @@
|
||||
import { and, asc, eq, or } from 'drizzle-orm'
|
||||
import { Hono } from 'hono'
|
||||
import { z } from 'zod'
|
||||
import type { SavedView } from '../../shared/api-types.ts'
|
||||
import { hasRole } from '../../shared/enums.ts'
|
||||
import { savedViewSchema } from '../../shared/schemas.ts'
|
||||
import { requireAuth } from '../auth/middleware.ts'
|
||||
import { savedViews } from '../db/schema.ts'
|
||||
import { currentUser, fail, validate, type AppEnv } from '../lib/http.ts'
|
||||
|
||||
const toView = (row: typeof savedViews.$inferSelect, userId: string): SavedView => ({
|
||||
id: row.id,
|
||||
page: row.page as SavedView['page'],
|
||||
name: row.name,
|
||||
filters: row.filters,
|
||||
shared: row.shared,
|
||||
mine: row.userId === userId,
|
||||
})
|
||||
|
||||
/** Saved filter sets. Supervisors and above can share views with the whole organization. */
|
||||
export const viewRoutes = new Hono<AppEnv>()
|
||||
.get('/', requireAuth, validate('query', z.object({ page: z.enum(['analytics', 'incidents']) })), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const rows = await c
|
||||
.get('db')
|
||||
.select()
|
||||
.from(savedViews)
|
||||
.where(and(eq(savedViews.organizationId, me.organizationId), eq(savedViews.page, c.req.valid('query').page), or(eq(savedViews.userId, me.id), eq(savedViews.shared, true))))
|
||||
.orderBy(asc(savedViews.name))
|
||||
return c.json({ views: rows.map((row) => toView(row, me.id)) })
|
||||
})
|
||||
|
||||
.post('/', requireAuth, validate('json', savedViewSchema), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const input = c.req.valid('json')
|
||||
if (input.shared && !hasRole(me.role, 'supervisor')) throw fail(403, 'Only supervisors and above can share views')
|
||||
const [row] = await c
|
||||
.get('db')
|
||||
.insert(savedViews)
|
||||
.values({ ...input, organizationId: me.organizationId, userId: me.id })
|
||||
.returning()
|
||||
return c.json({ view: toView(row, me.id) }, 201)
|
||||
})
|
||||
|
||||
.delete('/:id', requireAuth, validate('param', z.object({ id: z.uuid() })), async (c) => {
|
||||
const me = currentUser(c)
|
||||
const db = c.get('db')
|
||||
const [row] = await db
|
||||
.select()
|
||||
.from(savedViews)
|
||||
.where(and(eq(savedViews.id, c.req.valid('param').id), eq(savedViews.organizationId, me.organizationId)))
|
||||
if (!row || (!row.shared && row.userId !== me.id)) throw fail(404, 'View not found')
|
||||
if (row.userId !== me.id && me.role !== 'admin') throw fail(403, 'Only the owner or an admin can delete this view')
|
||||
await db.delete(savedViews).where(eq(savedViews.id, row.id))
|
||||
return c.body(null, 204)
|
||||
})
|
||||
Reference in new issue
Block a user