Merge pull request 'fix: reduce PDF margins and remove redundant puppeteer footer' (#22) from claude into master

Reviewed-on: #22

Dockerfile

@@ -1,61 +1,28 @@
-# ─────────────────────────────────────────────────────────────────────────────
-# Stage 1: Builder
-# Installs ALL dependencies and compiles the React frontend inside Docker.
-# Nothing needs to be installed on the host machine except Docker itself.
-# ─────────────────────────────────────────────────────────────────────────────
 FROM node:20-alpine AS builder
-
 WORKDIR /build
-
-# Install backend deps
 COPY package.json ./
 RUN npm install
-
-# Install frontend deps and build React app
 COPY client/package.json ./client/
 RUN cd client && npm install
-
 COPY client/ ./client/
 RUN cd client && npm run build
 
-# ─────────────────────────────────────────────────────────────────────────────
-# Stage 2: Production image
-# ─────────────────────────────────────────────────────────────────────────────
 FROM node:20-alpine AS production
-
-# Chromium for Puppeteer PDF generation
-RUN apk add --no-cache \
-    chromium \
-    nss \
-    freetype \
-    harfbuzz \
-    ca-certificates \
-    ttf-freefont
-
+RUN apk add --no-cache chromium nss freetype harfbuzz ca-certificates ttf-freefont
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 ENV NODE_ENV=production
 ENV PORT=3001
 ENV DB_PATH=/data/cpas.db
-
 WORKDIR /app
-
-# Copy backend node_modules and compiled frontend from builder
 COPY --from=builder /build/node_modules ./node_modules
 COPY --from=builder /build/client/dist  ./client/dist
-
-# Copy all backend source files
 COPY server.js    ./
 COPY package.json ./
 COPY db/          ./db/
 COPY pdf/         ./pdf/
-
-# Ensure data directory exists
+COPY client/public/static ./client/dist/static
 RUN mkdir -p /data
-
 EXPOSE 3001
-
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
-    CMD wget -qO- http://localhost:3001/api/health || exit 1
-
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3   CMD wget -qO- http://localhost:3001/api/health || exit 1
 CMD ["node", "server.js"]

README.md

@@ -1,11 +1,13 @@
 # CPAS Violation Tracker
 
-Single-container Dockerized web app for CPAS violation documentation.
-Built with React + Vite (frontend), Node.js + Express (backend), SQLite (database).
+Single-container Dockerized web app for CPAS violation documentation and workforce standing management.
+Built with **React + Vite** (frontend), **Node.js + Express** (backend), **SQLite** (database), and **Puppeteer** (PDF generation).
+
+---
 
 ## The only requirement on your machine: Docker Desktop
 
-Everything else — Node.js, npm, React build — happens inside Docker.
+Everything else — Node.js, npm, React build, Chromium for PDF — happens inside Docker.
 
 ---
 
@@ -41,17 +43,87 @@ docker stop cpas-tracker && docker rm cpas-tracker
 docker run -d --name cpas-tracker -p 3001:3001 -v cpas-data:/data cpas-tracker
 ```
 
+---
+
+## Features
+
+### Company Dashboard
+- Live table of all employees sorted by active CPAS points (highest risk first)
+- Summary stat cards: total employees, elite standing (0 pts), with active points, at-risk count, highest active score
+- **At-risk badge**: flags employees within 2 points of the next tier escalation
+- Search/filter by name, department, or supervisor
+- Click any employee name to open their full profile modal
+
+### Violation Form
+- Select existing employee or enter new employee by name
+- **Employee intelligence**: shows current CPAS standing badge and 90-day violation count before submitting
+- Violation type dropdown grouped by category; shows prior 90-day counts inline
+- **Recidivist auto-escalation**: if an employee has prior violations of the same type, points slider auto-sets to maximum per policy
+- Repeat offense badge with prior count displayed
+- Context-sensitive fields (time, minutes late, amount, location, description) shown only when relevant to violation type
+- **Tier crossing warning** (TierWarning component): previews what tier the new points would push the employee into before submission
+- Point slider for discretionary adjustments within the violation's min/max range
+- One-click PDF download immediately after submission
+
+### Employee Profile Modal
+- Full violation history with resolution status
+- Negate / restore individual violations (soft delete with resolution type + notes)
+- Hard delete option for data entry errors
+- PDF download for any historical violation record
+
+### CPAS Tier System
+
+| Points | Tier | Label |
+|--------|------|-------|
+| 0–4    | 0–1  | Elite Standing |
+| 5–9    | 1    | Realignment |
+| 10–14  | 2    | Administrative Lockdown |
+| 15–19  | 3    | Verification |
+| 20–24  | 4    | Risk Mitigation |
+| 25–29  | 5    | Final Decision |
+| 30+    | 6    | Separation |
+
+Scores are computed over a **rolling 90-day window** (negated violations excluded).
+
+### PDF Generation
+- Puppeteer + system Chromium (bundled in Docker image)
+- Generated on-demand per violation via `GET /api/violations/:id/pdf`
+- Filename: `CPAS_<EmployeeName>_<IncidentDate>.pdf`
+- PDF captures prior active points **at the time of the incident** (snapshot stored on insert)
+
+---
+
+## API Reference
+
+| Method | Endpoint | Description |
+|--------|----------|-------------|
+| GET | `/api/health` | Health check |
+| GET | `/api/employees` | List all employees |
+| POST | `/api/employees` | Create or upsert employee |
+| GET | `/api/employees/:id/score` | Get active CPAS score for employee |
+| GET | `/api/dashboard` | All employees with active points + violation counts |
+| POST | `/api/violations` | Log a new violation |
+| GET | `/api/violations/employee/:id` | Get violation history for employee (with resolutions) |
+| PATCH | `/api/violations/:id/negate` | Negate a violation (soft delete + resolution record) |
+| PATCH | `/api/violations/:id/restore` | Restore a negated violation |
+| DELETE | `/api/violations/:id` | Hard delete a violation |
+| GET | `/api/violations/:id/pdf` | Download violation PDF |
+
+---
+
 ## Project Structure
 
 ```
-cpas-violation-tracker/
-├── Dockerfile                  # Multi-stage: builds React + runs Express
+cpas/
+├── Dockerfile                     # Multi-stage: builds React + runs Express w/ Chromium
 ├── .dockerignore
 ├── package.json                   # Backend (Express) deps
 ├── server.js                      # API + static file server
 ├── db/
-│   ├── schema.sql              # Tables + 90-day score view
-│   └── database.js             # SQLite connection
+│   ├── schema.sql                 # Tables + 90-day active score view
+│   └── database.js                # SQLite connection (better-sqlite3)
+├── pdf/
+│   └── generator.js               # Puppeteer PDF generation
 └── client/                        # React frontend (Vite)
     ├── package.json
     ├── vite.config.js
@@ -60,14 +132,84 @@ cpas-violation-tracker/
         ├── main.jsx
         ├── App.jsx
         ├── data/
-        │   └── violations.js   # All CPAS violation definitions
+        │   └── violations.js      # All CPAS violation definitions + groups
+        ├── hooks/
+        │   └── useEmployeeIntelligence.js  # Score + history hook
         └── components/
-            └── ViolationForm.jsx
+            ├── CpasBadge.jsx      # Tier badge + color logic
+            ├── TierWarning.jsx    # Pre-submit tier crossing alert
+            ├── Dashboard.jsx      # Company-wide leaderboard
+            ├── ViolationForm.jsx  # Violation entry form
+            ├── EmployeeModal.jsx  # Employee profile + history modal
+            ├── NegateModal.jsx    # Negate/resolve violation dialog
+            └── ViolationHistory.jsx  # Violation list component
 ```
 
-## Phases
-- [x] Phase 1 — Container scaffold, SQLite schema, base React form
-- [ ] Phase 2 — Employee history, prior violation highlighting
-- [ ] Phase 3 — Puppeteer PDF generation
-- [ ] Phase 4 — Dashboard, CPAS scores, tier warnings
-- [ ] Phase 5 — Recidivist point auto-suggest
+---
+
+## Database Schema
+
+Three tables + one view:
+
+- **`employees`** — id, name, department, supervisor
+- **`violations`** — full incident record including `prior_active_points` snapshot at time of logging
+- **`violation_resolutions`** — resolution type, details, resolved_by (linked to violations)
+- **`active_cpas_scores`** (view) — sum of points for non-negated violations in rolling 90 days, grouped by employee
+
+---
+
+## Roadmap
+
+### ✅ Completed
+
+| Phase | Feature | Description |
+|-------|---------|-------------|
+| 1 | Container scaffold | Docker multi-stage build, Express server, SQLite schema |
+| 1 | Base violation form | Employee fields, violation type, incident date, point submission |
+| 2 | Employee intelligence | Live CPAS standing badge and 90-day count shown before submitting |
+| 2 | Prior violation highlighting | Violation dropdown annotates types with 90-day recurrence counts |
+| 2 | Recidivist auto-escalation | Points slider auto-maximizes on repeat same-type violations |
+| 2 | Violation history | Per-employee history list with resolution status |
+| 3 | PDF generation | Puppeteer/Chromium PDF per violation, downloadable immediately post-submit |
+| 3 | Prior-points snapshot | `prior_active_points` captured at insert time for accurate historical PDFs |
+| 4 | Company dashboard | Sortable employee table with live tier badges and at-risk flags |
+| 4 | Stat cards | Summary counts: total, clean, active, at-risk, highest score |
+| 4 | Tier crossing warning | Pre-submit alert when new points push employee to next tier |
+| 4 | Employee profile modal | Full history, negate/restore, hard delete, per-record PDF download |
+| 4 | Negate & restore | Soft-delete violations with resolution type + notes, fully reversible |
+
+---
+
+### 🔲 Proposed
+
+#### Reporting & Analytics
+- **Violation trends chart** — line/bar chart of violations per day/week/month, filterable by department or supervisor; useful for identifying systemic patterns vs. individual incidents
+- **Department heat map** — grid view showing violation density and average CPAS score by department; helps supervisors identify team-level risk
+- **Expiration timeline** — visual showing which active violations will roll off the 90-day window and when, so supervisors can anticipate tier drops
+- **CSV / Excel export** — bulk export of violations or dashboard data for external reporting or payroll integration
+
+#### Employee Management
+- **Employee edit / merge** — ability to update employee name, department, or supervisor without losing history; merge duplicate records created by name typos
+- **Supervisor view** — scoped dashboard showing only the employees under a given supervisor, useful for multi-supervisor environments
+- **Employee notes / flags** — free-text notes attached to an employee record (e.g. "on PIP", "union member") visible in the profile modal without affecting scoring
+
+#### Violation Workflow
+- **Acknowledgment signature field** — a "received by employee" name/date field on the violation form that prints on the PDF, replacing the blank signature line
+- **Draft / pending violations** — save a violation as draft before finalizing, useful when incidents need review before being officially logged
+- **Violation amendment** — edit a submitted violation's details (not points) with an audit trail, rather than delete-and-resubmit
+- **Bulk violation import** — CSV import for migrating historical records from paper logs or a prior system
+
+#### Notifications & Escalation
+- **Tier escalation alerts** — email or in-app notification when an employee crosses into Tier 2+ so the relevant supervisor is automatically informed
+- **Scheduled summary digest** — weekly email to supervisors listing their employees' current standings and any approaching tier thresholds
+- **At-risk threshold configuration** — make the "at-risk" warning threshold (currently hardcoded at 2 pts) configurable per deployment
+
+#### Infrastructure & Ops
+- **Multi-user auth** — simple login with role-based access (admin, supervisor, read-only); currently the app has no auth and is assumed to run on a trusted internal network
+- **Audit log** — immutable log of all creates, negates, restores, and deletes with timestamp and acting user, stored separately from the violations table
+- **Automated DB backup** — cron job or Docker health hook to snapshot `/data/cpas.db` to a mounted backup volume or remote location on a schedule
+- **Dark/light theme toggle** — the UI is currently dark-only; a toggle would improve usability in bright environments
+
+---
+
+*Proposed features are suggestions based on common HR documentation workflows. Priority and implementation order should be driven by actual operational needs.*

client/src/App.jsx

@@ -8,16 +8,19 @@ const tabs = [
 ];
 
 const s = {
-    app:     { minHeight: '100vh', background: '#f5f6fa', fontFamily: "'Segoe UI', Arial, sans-serif" },
-    nav:     { background: 'linear-gradient(135deg, #2c3e50, #34495e)', padding: '0 40px', display: 'flex', alignItems: 'center', gap: 0 },
-    logo:    { color: 'white', fontWeight: 800, fontSize: '18px', letterSpacing: '0.5px', marginRight: '32px', padding: '18px 0' },
+  app:  { minHeight: '100vh', background: '#050608', fontFamily: "'Segoe UI', Arial, sans-serif", color: '#f8f9fa' },
+  nav:  { background: '#000000', padding: '0 40px', display: 'flex', alignItems: 'center', gap: 0, borderBottom: '1px solid #333' },
+  logoWrap: { display: 'flex', alignItems: 'center', marginRight: '32px', padding: '14px 0' },
+  logoImg:  { height: '28px', marginRight: '10px' },
+  logoText: { color: '#f8f9fa', fontWeight: 800, fontSize: '18px', letterSpacing: '0.5px' },
   tab:  (active) => ({
-        padding: '18px 22px', color: active ? 'white' : 'rgba(255,255,255,0.6)',
-        borderBottom: active ? '3px solid #667eea' : '3px solid transparent',
+    padding: '18px 22px',
+    color: active ? '#f8f9fa' : 'rgba(248,249,250,0.6)',
+    borderBottom: active ? '3px solid #d4af37' : '3px solid transparent',
     cursor: 'pointer', fontWeight: active ? 700 : 400, fontSize: '14px',
-        background: 'none', border: 'none', borderBottom: active ? '3px solid #667eea' : '3px solid transparent',
+    background: 'none', border: 'none',
   }),
-    card:    { maxWidth: '1100px', margin: '30px auto', background: 'white', borderRadius: '10px', boxShadow: '0 2px 12px rgba(0,0,0,0.08)' },
+  card: { maxWidth: '1100px', margin: '30px auto', background: '#111217', borderRadius: '10px', boxShadow: '0 2px 16px rgba(0,0,0,0.6)', border: '1px solid #222' },
 };
 
 export default function App() {
@@ -25,7 +28,10 @@ export default function App() {
   return (
     <div style={s.app}>
       <nav style={s.nav}>
-                <div style={s.logo}>CPAS Tracker</div>
+        <div style={s.logoWrap}>
+          <img src="/static/mpm-logo.png" alt="MPM" style={s.logoImg} />
+          <div style={s.logoText}>CPAS Tracker</div>
+        </div>
         {tabs.map(t => (
           <button key={t.id} style={s.tab(tab === t.id)} onClick={() => setTab(t.id)}>
             {t.label}

client/src/components/Dashboard.jsx

@@ -3,7 +3,7 @@ import axios from 'axios';
 import CpasBadge, { getTier } from './CpasBadge';
 import EmployeeModal from './EmployeeModal';
 
-const AT_RISK_THRESHOLD = 2; // points within next tier boundary
+const AT_RISK_THRESHOLD = 2;
 
 const TIERS = [
   { min: 0,  max: 4   },
@@ -17,8 +17,7 @@ const TIERS = [
 
 function nextTierBoundary(points) {
   for (const t of TIERS) {
-        if (points >= t.min && points <= t.max && t.max < 999)
-            return t.max + 1;
+    if (points >= t.min && points <= t.max && t.max < 999) return t.max + 1;
   }
   return null;
 }
@@ -29,22 +28,22 @@ function isAtRisk(points) {
 }
 
 const s = {
-    wrap:      { padding: '40px' },
+  wrap:        { padding: '32px 40px', color: '#f8f9fa' },
   header:      { display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '24px', flexWrap: 'wrap', gap: '12px' },
-    title:     { fontSize: '24px', fontWeight: 700, color: '#2c3e50' },
-    subtitle:  { fontSize: '13px', color: '#888', marginTop: '3px' },
+  title:       { fontSize: '24px', fontWeight: 700, color: '#f8f9fa' },
+  subtitle:    { fontSize: '13px', color: '#b5b5c0', marginTop: '3px' },
   statsRow:    { display: 'flex', gap: '16px', flexWrap: 'wrap', marginBottom: '28px' },
-    statCard:  { flex: '1', minWidth: '140px', background: '#f8f9fa', border: '1px solid #dee2e6', borderRadius: '8px', padding: '16px', textAlign: 'center' },
-    statNum:   { fontSize: '28px', fontWeight: 800, color: '#2c3e50' },
-    statLbl:   { fontSize: '11px', color: '#888', marginTop: '4px' },
-    search:    { padding: '10px 14px', border: '1px solid #ddd', borderRadius: '6px', fontSize: '14px', width: '260px' },
-    table:     { width: '100%', borderCollapse: 'collapse', background: 'white', borderRadius: '8px', overflow: 'hidden', boxShadow: '0 1px 4px rgba(0,0,0,0.08)' },
-    th:        { background: '#34495e', color: 'white', padding: '10px 14px', textAlign: 'left', fontSize: '12px', fontWeight: 600, textTransform: 'uppercase', letterSpacing: '0.5px' },
-    td:        { padding: '11px 14px', borderBottom: '1px solid #f0f0f0', fontSize: '13px', verticalAlign: 'middle' },
-    nameBtn:   { background: 'none', border: 'none', cursor: 'pointer', fontWeight: 600, color: '#667eea', fontSize: '14px', padding: 0, textDecoration: 'underline dotted' },
-    atRiskBadge: { display: 'inline-block', marginLeft: '8px', padding: '2px 8px', borderRadius: '10px', fontSize: '10px', fontWeight: 700, background: '#fff3cd', color: '#856404', border: '1px solid #ffc107', verticalAlign: 'middle' },
-    zeroRow:   { color: '#aaa', fontStyle: 'italic', fontSize: '12px' },
-    refreshBtn:{ padding: '9px 18px', background: '#667eea', color: 'white', border: 'none', borderRadius: '6px', cursor: 'pointer', fontWeight: 600, fontSize: '13px' },
+  statCard:    { flex: '1', minWidth: '140px', background: '#181924', border: '1px solid #30313f', borderRadius: '8px', padding: '16px', textAlign: 'center' },
+  statNum:     { fontSize: '28px', fontWeight: 800, color: '#f8f9fa' },
+  statLbl:     { fontSize: '11px', color: '#b5b5c0', marginTop: '4px' },
+  search:      { padding: '10px 14px', border: '1px solid #333544', borderRadius: '6px', fontSize: '14px', width: '260px', background: '#050608', color: '#f8f9fa' },
+  table:       { width: '100%', borderCollapse: 'collapse', background: '#111217', borderRadius: '8px', overflow: 'hidden', boxShadow: '0 1px 8px rgba(0,0,0,0.6)', border: '1px solid #222' },
+  th:          { background: '#000000', color: '#f8f9fa', padding: '10px 14px', textAlign: 'left', fontSize: '12px', fontWeight: 600, textTransform: 'uppercase', letterSpacing: '0.5px' },
+  td:          { padding: '11px 14px', borderBottom: '1px solid #1c1d29', fontSize: '13px', verticalAlign: 'middle', color: '#f8f9fa' },
+  nameBtn:     { background: 'none', border: 'none', cursor: 'pointer', fontWeight: 600, color: '#d4af37', fontSize: '14px', padding: 0, textDecoration: 'underline dotted' },
+  atRiskBadge: { display: 'inline-block', marginLeft: '8px', padding: '2px 8px', borderRadius: '10px', fontSize: '10px', fontWeight: 700, background: '#3b2e00', color: '#ffd666', border: '1px solid #d4af37', verticalAlign: 'middle' },
+  zeroRow:     { color: '#77798a', fontStyle: 'italic', fontSize: '12px' },
+  refreshBtn:  { padding: '9px 18px', background: '#d4af37', color: '#000', border: 'none', borderRadius: '6px', cursor: 'pointer', fontWeight: 600, fontSize: '13px' },
 };
 
 export default function Dashboard() {
@@ -78,6 +77,10 @@ export default function Dashboard() {
   const maxPoints   = employees.reduce((m, e) => Math.max(m, e.active_points), 0);
 
   return (
+    // FIX: Fragment wraps both s.wrap AND EmployeeModal so the modal is
+    // outside the s.wrap div — React synthetic events will no longer bubble
+    // from inside the modal up through the Dashboard's DOM tree.
+    <>
       <div style={s.wrap}>
         <div style={s.header}>
           <div>
@@ -85,38 +88,41 @@ export default function Dashboard() {
             <div style={s.subtitle}>Click any employee name to view their full profile</div>
           </div>
           <div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}>
-                    <input style={s.search} placeholder="Search name, dept, supervisor…" value={search} onChange={e => setSearch(e.target.value)} />
+            <input
+              style={s.search}
+              placeholder="Search name, dept, supervisor…"
+              value={search}
+              onChange={e => setSearch(e.target.value)}
+            />
             <button style={s.refreshBtn} onClick={load}>↻ Refresh</button>
           </div>
         </div>
 
-            {/* ── Stat cards ───────────────────────────────────────── */}
         <div style={s.statsRow}>
           <div style={s.statCard}>
             <div style={s.statNum}>{employees.length}</div>
             <div style={s.statLbl}>Total Employees</div>
           </div>
           <div style={{ ...s.statCard, borderTop: '3px solid #28a745' }}>
-                    <div style={{ ...s.statNum, color: '#28a745' }}>{cleanCount}</div>
+            <div style={{ ...s.statNum, color: '#6ee7b7' }}>{cleanCount}</div>
             <div style={s.statLbl}>Elite Standing (0 pts)</div>
           </div>
-                <div style={{ ...s.statCard, borderTop: '3px solid #856404' }}>
-                    <div style={{ ...s.statNum, color: '#856404' }}>{activeCount}</div>
+          <div style={{ ...s.statCard, borderTop: '3px solid #d4af37' }}>
+            <div style={{ ...s.statNum, color: '#ffd666' }}>{activeCount}</div>
             <div style={s.statLbl}>With Active Points</div>
           </div>
-                <div style={{ ...s.statCard, borderTop: '3px solid #ffc107' }}>
-                    <div style={{ ...s.statNum, color: '#856404' }}>{atRiskCount}</div>
+          <div style={{ ...s.statCard, borderTop: '3px solid #ffb020' }}>
+            <div style={{ ...s.statNum, color: '#ffdf8a' }}>{atRiskCount}</div>
             <div style={s.statLbl}>At Risk (≤{AT_RISK_THRESHOLD} pts to next tier)</div>
           </div>
           <div style={{ ...s.statCard, borderTop: '3px solid #c0392b' }}>
-                    <div style={{ ...s.statNum, color: '#c0392b' }}>{maxPoints}</div>
+            <div style={{ ...s.statNum, color: '#ff8a80' }}>{maxPoints}</div>
             <div style={s.statLbl}>Highest Active Score</div>
           </div>
         </div>
 
-            {/* ── Scoreboard table ─────────────────────────────────── */}
         {loading ? (
-                <p style={{ color: '#aaa', textAlign: 'center', padding: '40px' }}>Loading…</p>
+          <p style={{ color: '#77798a', textAlign: 'center', padding: '40px' }}>Loading…</p>
         ) : (
           <table style={s.table}>
             <thead>
@@ -132,42 +138,56 @@ export default function Dashboard() {
             </thead>
             <tbody>
               {filtered.length === 0 && (
-                            <tr><td colSpan={7} style={{ ...s.td, textAlign: 'center', ...s.zeroRow }}>No employees found.</td></tr>
+                <tr>
+                  <td colSpan={7} style={{ ...s.td, textAlign: 'center', ...s.zeroRow }}>
+                    No employees found.
+                  </td>
+                </tr>
               )}
               {filtered.map((emp, i) => {
                 const risk     = isAtRisk(emp.active_points);
                 const tier     = getTier(emp.active_points);
                 const boundary = nextTierBoundary(emp.active_points);
                 return (
-                                <tr key={emp.id} style={{ background: risk ? '#fffdf0' : i % 2 === 0 ? 'white' : '#fafafa' }}>
-                                    <td style={{ ...s.td, color: '#aaa', fontSize: '12px' }}>{i + 1}</td>
+                  <tr
+                    key={emp.id}
+                    style={{ background: risk ? '#181200' : i % 2 === 0 ? '#111217' : '#151622' }}
+                  >
+                    <td style={{ ...s.td, color: '#77798a', fontSize: '12px' }}>{i + 1}</td>
                     <td style={s.td}>
-                                        <button style={s.nameBtn} onClick={() => setSelectedId(emp.id)}>{emp.name}</button>
+                      <button style={s.nameBtn} onClick={() => setSelectedId(emp.id)}>
+                        {emp.name}
+                      </button>
                       {risk && (
                         <span style={s.atRiskBadge}>
                           ⚠ {boundary - emp.active_points} pt{boundary - emp.active_points > 1 ? 's' : ''} to {getTier(boundary).label.split('—')[0].trim()}
                         </span>
                       )}
                     </td>
-                                    <td style={{ ...s.td, color: '#666' }}>{emp.department || '—'}</td>
-                                    <td style={{ ...s.td, color: '#666' }}>{emp.supervisor || '—'}</td>
+                    <td style={{ ...s.td, color: '#c0c2d6' }}>{emp.department || '—'}</td>
+                    <td style={{ ...s.td, color: '#c0c2d6' }}>{emp.supervisor || '—'}</td>
                     <td style={s.td}><CpasBadge points={emp.active_points} /></td>
-                                    <td style={{ ...s.td, fontWeight: 700, color: tier.color, fontSize: '16px' }}>{emp.active_points}</td>
-                                    <td style={{ ...s.td, color: '#666' }}>{emp.violation_count}</td>
+                    <td style={{ ...s.td, fontWeight: 700, color: tier.color, fontSize: '16px' }}>
+                      {emp.active_points}
+                    </td>
+                    <td style={{ ...s.td, color: '#c0c2d6' }}>{emp.violation_count}</td>
                   </tr>
                 );
               })}
             </tbody>
           </table>
         )}
+      </div>
 
-            {/* ── Employee profile modal ───────────────────────────── */}
+      {/* FIX: EmployeeModal is now OUTSIDE <div style={s.wrap}>.
+          React synthetic events no longer bubble from modal buttons
+          up through Dashboard's component tree. */}
       {selectedId && (
         <EmployeeModal
           employeeId={selectedId}
           onClose={() => { setSelectedId(null); load(); }}
         />
       )}
-        </div>
+    </>
   );
 }

client/src/components/EmployeeModal.jsx

@@ -4,24 +4,68 @@ import CpasBadge, { getTier } from './CpasBadge';
 import NegateModal from './NegateModal';
 
 const s = {
-    overlay:    { position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.55)', zIndex: 1000, display: 'flex', alignItems: 'flex-start', justifyContent: 'flex-end' },
-    panel:      { background: 'white', width: '680px', maxWidth: '95vw', height: '100vh', overflowY: 'auto', boxShadow: '-4px 0 24px rgba(0,0,0,0.18)', display: 'flex', flexDirection: 'column' },
-    header:     { background: 'linear-gradient(135deg, #2c3e50, #34495e)', color: 'white', padding: '24px 28px', position: 'sticky', top: 0, zIndex: 10 },
-    closeBtn:   { float: 'right', background: 'none', border: 'none', color: 'white', fontSize: '22px', cursor: 'pointer', lineHeight: 1, marginTop: '-2px' },
+  overlay: {
+    position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.75)',
+    zIndex: 1000, display: 'flex', alignItems: 'flex-start', justifyContent: 'flex-end',
+  },
+  panel: {
+    background: '#111217', color: '#f8f9fa', width: '680px', maxWidth: '95vw',
+    height: '100vh', overflowY: 'auto', boxShadow: '-4px 0 24px rgba(0,0,0,0.7)',
+    display: 'flex', flexDirection: 'column',
+  },
+  header: {
+    background: 'linear-gradient(135deg, #000000, #151622)', color: 'white',
+    padding: '24px 28px', position: 'sticky', top: 0, zIndex: 10,
+    borderBottom: '1px solid #222',
+  },
+  closeBtn: {
+    float: 'right', background: 'none', border: 'none', color: 'white',
+    fontSize: '22px', cursor: 'pointer', lineHeight: 1, marginTop: '-2px',
+  },
   body: { padding: '24px 28px', flex: 1 },
   scoreRow: { display: 'flex', gap: '12px', flexWrap: 'wrap', marginBottom: '24px' },
-    scoreCard:  { flex: '1', minWidth: '100px', background: '#f8f9fa', borderRadius: '8px', padding: '14px', textAlign: 'center', border: '1px solid #dee2e6' },
+  scoreCard: {
+    flex: '1', minWidth: '100px', background: '#181924', borderRadius: '8px',
+    padding: '14px', textAlign: 'center', border: '1px solid #2a2b3a',
+  },
   scoreNum: { fontSize: '26px', fontWeight: 800 },
-    scoreLbl:   { fontSize: '11px', color: '#888', marginTop: '3px' },
-    sectionHd:  { fontSize: '13px', fontWeight: 700, color: '#34495e', textTransform: 'uppercase', letterSpacing: '0.5px', marginBottom: '10px', marginTop: '24px' },
-    table:      { width: '100%', borderCollapse: 'collapse', fontSize: '12px' },
-    th:         { background: '#f1f3f5', padding: '8px 10px', textAlign: 'left', color: '#555', fontWeight: 600, fontSize: '11px', textTransform: 'uppercase' },
-    td:         { padding: '9px 10px', borderBottom: '1px solid #f0f0f0', verticalAlign: 'top' },
-    negatedRow: { background: '#f8f8f8', color: '#aaa' },
-    actionBtn:  (color) => ({ background: 'none', border: `1px solid ${color}`, color, borderRadius: '4px', padding: '3px 8px', fontSize: '11px', cursor: 'pointer', marginRight: '4px', fontWeight: 600 }),
-    resTag:     { display: 'inline-block', padding: '2px 8px', borderRadius: '10px', fontSize: '10px', fontWeight: 700, background: '#d4edda', color: '#155724', border: '1px solid #c3e6cb' },
-    pdfBtn:     { background: 'none', border: '1px solid #667eea', color: '#667eea', borderRadius: '4px', padding: '3px 8px', fontSize: '11px', cursor: 'pointer', fontWeight: 600 },
-    deleteConfirm: { background: '#f8d7da', border: '1px solid #f5c6cb', borderRadius: '6px', padding: '12px', marginTop: '8px', fontSize: '12px' },
+  scoreLbl: { fontSize: '11px', color: '#b5b5c0', marginTop: '3px' },
+  sectionHd: {
+    fontSize: '13px', fontWeight: 700, color: '#f8f9fa', textTransform: 'uppercase',
+    letterSpacing: '0.5px', marginBottom: '10px', marginTop: '24px',
+  },
+  table: {
+    width: '100%', borderCollapse: 'collapse', fontSize: '12px', background: '#181924',
+    borderRadius: '6px', overflow: 'hidden', border: '1px solid #2a2b3a',
+  },
+  th: {
+    background: '#050608', padding: '8px 10px', textAlign: 'left', color: '#f8f9fa',
+    fontWeight: 600, fontSize: '11px', textTransform: 'uppercase',
+  },
+  td: {
+    padding: '9px 10px', borderBottom: '1px solid #202231',
+    verticalAlign: 'top', color: '#f8f9fa',
+  },
+  negatedRow: { background: '#151622', color: '#9ca0b8' },
+  actionBtn: (color) => ({
+    background: 'none', border: `1px solid ${color}`, color,
+    borderRadius: '4px', padding: '3px 8px', fontSize: '11px',
+    cursor: 'pointer', marginRight: '4px', fontWeight: 600,
+  }),
+  resTag: {
+    display: 'inline-block', padding: '2px 8px', borderRadius: '10px',
+    fontSize: '10px', fontWeight: 700, background: '#053321',
+    color: '#9ef7c1', border: '1px solid #0f5132',
+  },
+  pdfBtn: {
+    background: 'none', border: '1px solid #d4af37', color: '#ffd666',
+    borderRadius: '4px', padding: '3px 8px', fontSize: '11px',
+    cursor: 'pointer', fontWeight: 600,
+  },
+  deleteConfirm: {
+    background: '#3c1114', border: '1px solid #f5c6cb', borderRadius: '6px',
+    padding: '12px', marginTop: '8px', fontSize: '12px', color: '#ffb3b8',
+  },
 };
 
 export default function EmployeeModal({ employeeId, onClose }) {
@@ -38,12 +82,14 @@ export default function EmployeeModal({ employeeId, onClose }) {
       axios.get('/api/employees'),
       axios.get(`/api/employees/${employeeId}/score`),
       axios.get(`/api/violations/employee/${employeeId}?limit=100`),
-        ]).then(([empRes, scoreRes, violRes]) => {
-            const emp = empRes.data.find(e => e.id === employeeId);
+    ])
+      .then(([empRes, scoreRes, violRes]) => {
+        const emp = empRes.data.find((e) => e.id === employeeId);
         setEmployee(emp || null);
         setScore(scoreRes.data);
         setViolations(violRes.data);
-        }).finally(() => setLoading(false));
+      })
+      .finally(() => setLoading(false));
   }, [employeeId]);
 
   useEffect(() => { load(); }, [load]);
@@ -63,77 +109,90 @@ export default function EmployeeModal({ employeeId, onClose }) {
   const handleHardDelete = async (id) => {
     await axios.delete(`/api/violations/${id}`);
     setConfirmDel(null);
-        load(); // ← refetch employee list, score, and violations
+    load();
   };
 
   const handleRestore = async (id) => {
     await axios.patch(`/api/violations/${id}/restore`);
-        load(); // ← refetch employee list, score, and violations
+    setConfirmDel(null);
+    load();
   };
 
   const handleNegate = async ({ resolution_type, details, resolved_by }) => {
-        await axios.patch(`/api/violations/${negating.id}/negate`, { resolution_type, details, resolved_by });
+    await axios.patch(`/api/violations/${negating.id}/negate`, {
+      resolution_type, details, resolved_by,
+    });
     setNegating(null);
-        load(); // ← CRITICAL FIX: refetch score immediately after negation
+    setConfirmDel(null);
+    load();
   };
 
   const tier = score ? getTier(score.active_points) : null;
-    const active  = violations.filter(v => !v.negated);
-    const negated = violations.filter(v => v.negated);
+  const active = violations.filter((v) => !v.negated);
+  const negated = violations.filter((v) => v.negated);
+
+  // FIX: overlay click only closes if clicking the backdrop itself, NOT children
+  const handleOverlayClick = (e) => {
+    if (e.target === e.currentTarget) onClose();
+  };
 
   return (
-        <div style={s.overlay} onClick={e => { if (e.target === e.currentTarget) onClose(); }}>
-            <div style={s.panel}>
+    // FIX: panel uses onClick stopPropagation to prevent bubbling to overlay
+    <div style={s.overlay} onClick={handleOverlayClick}>
+      <div style={s.panel} onClick={(e) => e.stopPropagation()}>
 
-                {/* ── Header ──────────────────────────────────── */}
+        {/* ── Header ── */}
         <div style={s.header}>
           <button style={s.closeBtn} onClick={onClose}>✕</button>
-                    <div style={{ fontSize: '20px', fontWeight: 700 }}>
-                        {loading ? 'Loading…' : (employee?.name || 'Employee Profile')}
+          <div style={{ fontSize: '18px', fontWeight: 700 }}>
+            {employee ? employee.name : 'Employee'}
           </div>
           {employee && (
-                        <div style={{ fontSize: '12px', opacity: 0.75, marginTop: '4px' }}>
-                            {[employee.department, employee.supervisor ? `Supervisor: ${employee.supervisor}` : null].filter(Boolean).join(' · ')}
+            <div style={{ fontSize: '12px', color: '#b5b5c0', marginTop: '4px' }}>
+              {employee.department} {employee.supervisor && `· Supervisor: ${employee.supervisor}`}
             </div>
           )}
         </div>
 
+        {/* ── Body ── */}
         <div style={s.body}>
           {loading ? (
-                        <p style={{ color: '#aaa', textAlign: 'center', paddingTop: '40px' }}>Loading…</p>
-                    ) : (<>
-
-                        {/* ── Score cards ───────────────────────── */}
+            <div style={{ padding: '40px', textAlign: 'center', color: '#b5b5c0' }}>Loading…</div>
+          ) : (
+            <>
+              {/* Score Cards */}
+              {score && (
                 <div style={s.scoreRow}>
-                            <div style={{ ...s.scoreCard, borderTop: `3px solid ${tier?.color}` }}>
-                                <div style={{ ...s.scoreNum, color: tier?.color }}>{score?.active_points ?? 0}</div>
+                  <div style={s.scoreCard}>
+                    <div style={{ ...s.scoreNum, color: tier?.color || '#f8f9fa' }}>
+                      {score.active_points}
+                    </div>
                     <div style={s.scoreLbl}>Active Points</div>
                   </div>
                   <div style={s.scoreCard}>
-                                <div style={s.scoreNum}>{score?.violation_count ?? 0}</div>
-                                <div style={s.scoreLbl}>90-Day Violations</div>
+                    <div style={s.scoreNum}>{score.total_violations}</div>
+                    <div style={s.scoreLbl}>Total Violations</div>
                   </div>
                   <div style={s.scoreCard}>
-                                <div style={s.scoreNum}>{active.length}</div>
-                                <div style={s.scoreLbl}>Total On Record</div>
-                            </div>
-                            <div style={s.scoreCard}>
-                                <div style={{ ...s.scoreNum, color: '#888' }}>{negated.length}</div>
+                    <div style={s.scoreNum}>{score.negated_count}</div>
                     <div style={s.scoreLbl}>Negated</div>
                   </div>
+                  <div style={{ ...s.scoreCard, minWidth: '140px' }}>
+                    <div style={{ fontSize: '13px', fontWeight: 700, color: tier?.color || '#f8f9fa' }}>
+                      {tier ? tier.label : '—'}
+                    </div>
+                    <div style={s.scoreLbl}>Current Tier</div>
                   </div>
-
-                        {tier && (
-                            <div style={{ background: '#f8f9fa', borderRadius: '6px', padding: '10px 14px', marginBottom: '16px', fontSize: '13px', border: `1px solid ${tier.color}33` }}>
-                                <strong style={{ color: tier.color }}>{tier.label}</strong>
-                                <span style={{ color: '#888', marginLeft: '10px', fontSize: '12px' }}>Rolling 90-day window · Points expire automatically</span>
                 </div>
               )}
+              {score && <CpasBadge points={score.active_points} style={{ marginBottom: '20px' }} />}
 
-                        {/* ── Active violations ─────────────────── */}
+              {/* ── Active Violations ── */}
               <div style={s.sectionHd}>Active Violations</div>
               {active.length === 0 ? (
-                            <p style={{ color: '#aaa', fontSize: '13px', fontStyle: 'italic' }}>No active violations on record.</p>
+                <div style={{ color: '#77798a', fontStyle: 'italic', fontSize: '12px' }}>
+                  No active violations on record.
+                </div>
               ) : (
                 <table style={s.table}>
                   <thead>
@@ -145,29 +204,57 @@ export default function EmployeeModal({ employeeId, onClose }) {
                     </tr>
                   </thead>
                   <tbody>
-                                    {active.map(v => (
+                    {active.map((v) => (
                       <tr key={v.id}>
                         <td style={s.td}>{v.incident_date}</td>
                         <td style={s.td}>
                           <div style={{ fontWeight: 600 }}>{v.violation_name}</div>
-                                                <div style={{ color: '#888', fontSize: '11px' }}>{v.category}</div>
-                                                {v.details && <div style={{ color: '#666', fontSize: '11px', marginTop: '3px', fontStyle: 'italic' }}>{v.details}</div>}
+                          <div style={{ fontSize: '10px', color: '#9ca0b8' }}>{v.category}</div>
+                          {v.details && (
+                            <div style={{ fontSize: '10px', color: '#b5b5c0', marginTop: '2px' }}>
+                              {v.details}
+                            </div>
+                          )}
                         </td>
-                                            <td style={{ ...s.td, fontWeight: 700, color: '#c0392b' }}>{v.points}</td>
+                        <td style={{ ...s.td, fontWeight: 700 }}>{v.points}</td>
                         <td style={s.td}>
-                                                <button style={s.actionBtn('#856404')} onClick={() => setNegating(v)}>⊘ Negate</button>
-                                                <button style={s.pdfBtn} onClick={() => handleDownloadPdf(v.id, employee?.name, v.incident_date)}>PDF</button>
-                                                <br />
-                                                {confirmDel === v.id ? (
+                          {/* FIX: All buttons use e.stopPropagation() to prevent overlay close */}
+                          <button
+                            style={s.actionBtn('#ffc107')}
+                            onClick={(e) => { e.stopPropagation(); setNegating(v); setConfirmDel(null); }}
+                          >
+                            Negate
+                          </button>
+                          <button
+                            style={s.actionBtn('#ff4d4f')}
+                            onClick={(e) => { e.stopPropagation(); setConfirmDel(confirmDel === v.id ? null : v.id); }}
+                          >
+                            {confirmDel === v.id ? 'Cancel' : 'Delete'}
+                          </button>
+                          <button
+                            style={s.pdfBtn}
+                            onClick={(e) => { e.stopPropagation(); handleDownloadPdf(v.id, employee?.name, v.incident_date); }}
+                          >
+                            PDF
+                          </button>
+                          {confirmDel === v.id && (
                             <div style={s.deleteConfirm}>
-                                                        <strong>Permanently delete?</strong> This cannot be undone.
-                                                        <div style={{ marginTop: '8px', display: 'flex', gap: '8px' }}>
-                                                            <button style={s.actionBtn('#c0392b')} onClick={() => handleHardDelete(v.id)}>Confirm Delete</button>
-                                                            <button style={s.actionBtn('#666')} onClick={() => setConfirmDel(null)}>Cancel</button>
+                              Permanently delete? This cannot be undone.
+                              <div style={{ marginTop: '8px' }}>
+                                <button
+                                  style={s.actionBtn('#ff4d4f')}
+                                  onClick={(e) => { e.stopPropagation(); handleHardDelete(v.id); }}
+                                >
+                                  Confirm Delete
+                                </button>
+                                <button
+                                  style={s.actionBtn('#888')}
+                                  onClick={(e) => { e.stopPropagation(); setConfirmDel(null); }}
+                                >
+                                  Cancel
+                                </button>
                               </div>
                             </div>
-                                                ) : (
-                                                    <button style={{ ...s.actionBtn('#c0392b'), marginTop: '4px' }} onClick={() => setConfirmDel(v.id)}>✕ Delete</button>
                           )}
                         </td>
                       </tr>
@@ -176,9 +263,10 @@ export default function EmployeeModal({ employeeId, onClose }) {
                 </table>
               )}
 
-                        {/* ── Negated violations ────────────────── */}
-                        {negated.length > 0 && (<>
-                            <div style={s.sectionHd}>Negated / Resolved Violations</div>
+              {/* ── Negated / Resolved Violations ── */}
+              {negated.length > 0 && (
+                <>
+                  <div style={s.sectionHd}>Negated / Resolved</div>
                   <table style={s.table}>
                     <thead>
                       <tr>
@@ -190,44 +278,78 @@ export default function EmployeeModal({ employeeId, onClose }) {
                       </tr>
                     </thead>
                     <tbody>
-                                    {negated.map(v => (
+                      {negated.map((v) => (
                         <tr key={v.id} style={s.negatedRow}>
                           <td style={s.td}>{v.incident_date}</td>
                           <td style={s.td}>
-                                                <div style={{ textDecoration: 'line-through' }}>{v.violation_name}</div>
-                                                <div style={{ fontSize: '11px', color: '#aaa' }}>{v.category}</div>
+                            <div style={{ fontWeight: 600 }}>{v.violation_name}</div>
+                            <div style={{ fontSize: '10px', color: '#9ca0b8' }}>{v.category}</div>
                           </td>
-                                            <td style={{ ...s.td, textDecoration: 'line-through', color: '#aaa' }}>{v.points}</td>
+                          <td style={s.td}>{v.points}</td>
                           <td style={s.td}>
                             <span style={s.resTag}>{v.resolution_type}</span>
-                                                {v.resolution_details && <div style={{ fontSize: '11px', marginTop: '3px', color: '#666' }}>{v.resolution_details}</div>}
-                                                {v.resolved_by && <div style={{ fontSize: '10px', color: '#aaa' }}>by {v.resolved_by}</div>}
+                            {v.resolution_details && (
+                              <div style={{ fontSize: '10px', color: '#b5b5c0', marginTop: '2px' }}>
+                                {v.resolution_details}
+                              </div>
+                            )}
+                            {v.resolved_by && (
+                              <div style={{ fontSize: '10px', color: '#9ca0b8' }}>
+                                by {v.resolved_by}
+                              </div>
+                            )}
                           </td>
                           <td style={s.td}>
-                                                <button style={s.actionBtn('#28a745')} onClick={() => handleRestore(v.id)}>↩ Restore</button>
-                                                {confirmDel === v.id ? (
+                            <button
+                              style={s.actionBtn('#4db6ac')}
+                              onClick={(e) => { e.stopPropagation(); handleRestore(v.id); }}
+                            >
+                              Restore
+                            </button>
+                            <button
+                              style={s.actionBtn('#ff4d4f')}
+                              onClick={(e) => { e.stopPropagation(); setConfirmDel(confirmDel === v.id ? null : v.id); }}
+                            >
+                              {confirmDel === v.id ? 'Cancel' : 'Delete'}
+                            </button>
+                            <button
+                              style={s.pdfBtn}
+                              onClick={(e) => { e.stopPropagation(); handleDownloadPdf(v.id, employee?.name, v.incident_date); }}
+                            >
+                              PDF
+                            </button>
+                            {confirmDel === v.id && (
                               <div style={s.deleteConfirm}>
-                                                        <strong>Permanently delete?</strong>
-                                                        <div style={{ marginTop: '8px', display: 'flex', gap: '8px' }}>
-                                                            <button style={s.actionBtn('#c0392b')} onClick={() => handleHardDelete(v.id)}>Confirm</button>
-                                                            <button style={s.actionBtn('#666')} onClick={() => setConfirmDel(null)}>Cancel</button>
+                                Permanently delete? This cannot be undone.
+                                <div style={{ marginTop: '8px' }}>
+                                  <button
+                                    style={s.actionBtn('#ff4d4f')}
+                                    onClick={(e) => { e.stopPropagation(); handleHardDelete(v.id); }}
+                                  >
+                                    Confirm Delete
+                                  </button>
+                                  <button
+                                    style={s.actionBtn('#888')}
+                                    onClick={(e) => { e.stopPropagation(); setConfirmDel(null); }}
+                                  >
+                                    Cancel
+                                  </button>
                                 </div>
                               </div>
-                                                ) : (
-                                                    <button style={s.actionBtn('#c0392b')} onClick={() => setConfirmDel(v.id)}>✕ Delete</button>
                             )}
                           </td>
                         </tr>
                       ))}
                     </tbody>
                   </table>
-                        </>)}
-
-                    </>)}
+                </>
+              )}
+            </>
+          )}
         </div>
       </div>
 
-            {/* ── Negate sub-modal ────────────────────────────────── */}
+      {/* FIX: NegateModal rendered OUTSIDE the panel so it sits at root z-index:2000 */}
       {negating && (
         <NegateModal
           violation={negating}

client/src/components/NegateModal.jsx

@@ -1,66 +1,136 @@
 import React, { useState } from 'react';
 
-const RESOLUTION_TYPES = [
-    'Corrective Training Completed',
-    'Management Discretion',
-    'Data Entry Error',
-    'Successfully Appealed',
-];
-
 const s = {
-    overlay: { position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.65)', zIndex: 2000, display: 'flex', alignItems: 'center', justifyContent: 'center' },
-    box:     { background: 'white', borderRadius: '10px', padding: '28px', width: '440px', maxWidth: '95vw', boxShadow: '0 8px 32px rgba(0,0,0,0.22)' },
-    title:   { fontSize: '17px', fontWeight: 700, color: '#2c3e50', marginBottom: '6px' },
-    sub:     { fontSize: '12px', color: '#888', marginBottom: '20px' },
-    label:   { fontWeight: 600, color: '#555', fontSize: '12px', marginBottom: '5px', display: 'block' },
-    input:   { width: '100%', padding: '9px 12px', border: '1px solid #ddd', borderRadius: '5px', fontSize: '13px', fontFamily: 'inherit', marginBottom: '14px' },
-    btnRow:  { display: 'flex', gap: '10px', justifyContent: 'flex-end', marginTop: '8px' },
-    btnOk:   { padding: '10px 22px', background: '#856404', color: 'white', border: 'none', borderRadius: '6px', cursor: 'pointer', fontWeight: 700, fontSize: '13px' },
-    btnCancel:{ padding: '10px 22px', background: '#f1f3f5', color: '#555', border: 'none', borderRadius: '6px', cursor: 'pointer', fontWeight: 600, fontSize: '13px' },
-    violBox: { background: '#fff3cd', border: '1px solid #ffc107', borderRadius: '6px', padding: '10px 14px', marginBottom: '18px', fontSize: '13px' },
+  overlay: {
+    position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.75)',
+    display: 'flex', alignItems: 'center', justifyContent: 'center',
+    zIndex: 2000,
+  },
+  modal: {
+    width: '480px', maxWidth: '95vw', background: '#111217', borderRadius: '12px',
+    boxShadow: '0 16px 40px rgba(0,0,0,0.8)', color: '#f8f9fa',
+    overflow: 'hidden', border: '1px solid #2a2b3a',
+  },
+  header: {
+    padding: '18px 24px', borderBottom: '1px solid #222',
+    background: 'linear-gradient(135deg, #000000, #151622)',
+  },
+  title: { fontSize: '18px', fontWeight: 700 },
+  subtitle: { fontSize: '12px', color: '#c0c2d6', marginTop: '4px' },
+  body: { padding: '18px 24px 8px 24px' },
+  pill: {
+    background: '#3b2e00', borderRadius: '6px', padding: '8px 10px',
+    fontSize: '12px', color: '#ffd666', border: '1px solid #d4af37', marginBottom: '14px',
+  },
+  label: { fontSize: '13px', fontWeight: 600, marginBottom: '4px', color: '#e5e7f1' },
+  input: {
+    width: '100%', padding: '9px 10px', borderRadius: '6px',
+    border: '1px solid #333544', background: '#050608', color: '#f8f9fa',
+    fontSize: '13px', fontFamily: 'inherit', marginBottom: '14px',
+    boxSizing: 'border-box',
+  },
+  textarea: {
+    width: '100%', minHeight: '80px', resize: 'vertical',
+    padding: '9px 10px', borderRadius: '6px', border: '1px solid #333544',
+    background: '#050608', color: '#f8f9fa', fontSize: '13px',
+    fontFamily: 'inherit', marginBottom: '14px', boxSizing: 'border-box',
+  },
+  footer: {
+    display: 'flex', justifyContent: 'flex-end', gap: '10px',
+    padding: '16px 24px 20px 24px', background: '#0c0d14', borderTop: '1px solid #222',
+  },
+  btnCancel: {
+    padding: '10px 20px', borderRadius: '6px', border: '1px solid #333544',
+    background: '#050608', color: '#f8f9fa', fontWeight: 600,
+    fontSize: '13px', cursor: 'pointer',
+  },
+  btnConfirm: {
+    padding: '10px 22px', borderRadius: '6px', border: 'none',
+    background: 'linear-gradient(135deg, #d4af37 0%, #ffdf8a 100%)',
+    color: '#000', fontWeight: 700, fontSize: '13px',
+    cursor: 'pointer', textTransform: 'uppercase',
+  },
 };
 
+const RESOLUTION_OPTIONS = [
+  'Corrective Training Completed',
+  'Verbal Warning Issued',
+  'Written Warning Issued',
+  'Management Review',
+  'Policy Exception Approved',
+  'Data Entry Error',
+  'Other',
+];
+
 export default function NegateModal({ violation, onConfirm, onCancel }) {
-    const [resType,    setResType]    = useState('');
+  const [resolutionType, setResolutionType] = useState('Corrective Training Completed');
   const [details, setDetails] = useState('');
   const [resolvedBy, setResolvedBy] = useState('');
-    const [error,      setError]      = useState('');
 
-    const handleSubmit = () => {
-        if (!resType) { setError('Please select a resolution type.'); return; }
-        onConfirm({ resolution_type: resType, details, resolved_by: resolvedBy });
+  if (!violation) return null;
+
+  const handleConfirm = () => {
+    if (!onConfirm) return;
+    onConfirm({
+      resolution_type: resolutionType,
+      details,
+      resolved_by: resolvedBy,
+    });
+  };
+
+  // FIX: overlay click only closes on backdrop, NOT modal children
+  const handleOverlayClick = (e) => {
+    if (e.target === e.currentTarget && onCancel) onCancel();
   };
 
   return (
-        <div style={s.overlay}>
-            <div style={s.box}>
-                <div style={s.title}>⊘ Negate Violation Points</div>
-                <div style={s.sub}>This will zero out the points from this incident. The record remains in the audit log.</div>
+    <div style={s.overlay} onClick={handleOverlayClick}>
+      {/* FIX: stopPropagation prevents modal clicks from bubbling to overlay */}
+      <div style={s.modal} onClick={(e) => e.stopPropagation()}>
 
-                <div style={s.violBox}>
-                    <strong>{violation.violation_name}</strong> &nbsp;·&nbsp; {violation.points} pts &nbsp;·&nbsp; {violation.incident_date}
+        <div style={s.header}>
+          <div style={s.title}>Negate Violation</div>
+          <div style={s.subtitle}>
+            Record resolution for: <strong>{violation.violation_name}</strong>
+          </div>
         </div>
 
-                <label style={s.label}>Resolution Type *</label>
-                <select style={s.input} value={resType} onChange={e => { setResType(e.target.value); setError(''); }}>
-                    <option value="">-- Select Resolution --</option>
-                    {RESOLUTION_TYPES.map(r => <option key={r} value={r}>{r}</option>)}
+        <div style={s.body}>
+          <div style={s.pill}>
+            ⚠ {violation.points} pt{violation.points !== 1 ? 's' : ''} · {violation.incident_date} · {violation.category}
+          </div>
+
+          <div style={s.label}>Resolution Type</div>
+          <select
+            style={s.input}
+            value={resolutionType}
+            onChange={(e) => setResolutionType(e.target.value)}
+          >
+            {RESOLUTION_OPTIONS.map((opt) => (
+              <option key={opt} value={opt}>{opt}</option>
+            ))}
           </select>
 
-                <label style={s.label}>Additional Details</label>
-                <textarea style={{ ...s.input, resize: 'vertical', minHeight: '70px' }}
-                    placeholder="Training course completed, specific context, approving manager notes…"
-                    value={details} onChange={e => setDetails(e.target.value)} />
+          <div style={s.label}>Details / Notes</div>
+          <textarea
+            style={s.textarea}
+            placeholder="Describe the resolution or context…"
+            value={details}
+            onChange={(e) => setDetails(e.target.value)}
+          />
 
-                <label style={s.label}>Resolved By</label>
-                <input style={s.input} type="text" placeholder="Officer / Manager name"
-                    value={resolvedBy} onChange={e => setResolvedBy(e.target.value)} />
+          <div style={s.label}>Resolved By</div>
+          <input
+            style={s.input}
+            placeholder="Manager or HR name…"
+            value={resolvedBy}
+            onChange={(e) => setResolvedBy(e.target.value)}
+          />
+        </div>
 
-                {error && <div style={{ color: '#c0392b', fontSize: '12px', marginBottom: '10px' }}>{error}</div>}
-
-                <div style={s.btnRow}>
+        <div style={s.footer}>
           <button style={s.btnCancel} onClick={onCancel}>Cancel</button>
-                    <button style={s.btnOk} onClick={handleSubmit}>Confirm Negation</button>
+          <button style={s.btnConfirm} onClick={handleConfirm}>Confirm Negation</button>
         </div>
       </div>
     </div>

client/src/components/ViolationForm.jsx

@@ -7,27 +7,27 @@ import TierWarning from './TierWarning';
 import ViolationHistory from './ViolationHistory';
 
 const s = {
-    content:      { padding: '40px' },
-    section:      { background: '#f8f9fa', borderLeft: '4px solid #667eea', padding: '20px', marginBottom: '30px', borderRadius: '4px' },
-    sectionTitle: { color: '#2c3e50', fontSize: '20px', marginBottom: '15px' },
+  content:      { padding: '32px 40px', background: '#111217', borderRadius: '10px', color: '#f8f9fa' },
+  section:      { background: '#181924', borderLeft: '4px solid #d4af37', padding: '20px', marginBottom: '30px', borderRadius: '4px', border: '1px solid #2a2b3a' },
+  sectionTitle: { color: '#f8f9fa', fontSize: '20px', marginBottom: '15px', fontWeight: 700 },
   grid:         { display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(250px, 1fr))', gap: '15px', marginTop: '15px' },
   item:         { display: 'flex', flexDirection: 'column' },
-    label:        { fontWeight: 600, color: '#555', marginBottom: '5px', fontSize: '13px' },
-    input:        { padding: '10px', border: '1px solid #ddd', borderRadius: '4px', fontSize: '14px', fontFamily: 'inherit' },
+  label:        { fontWeight: 600, color: '#e5e7f1', marginBottom: '5px', fontSize: '13px' },
+  input:        { padding: '10px', border: '1px solid #333544', borderRadius: '4px', fontSize: '14px', fontFamily: 'inherit', background: '#050608', color: '#f8f9fa' },
   fullCol:      { gridColumn: '1 / -1' },
-    contextBox:   { background: '#f1f3f5', border: '1px solid #ced4da', borderRadius: '4px', padding: '10px', fontSize: '12px', color: '#444', marginTop: '4px' },
-    repeatBadge:  { display: 'inline-block', marginLeft: '8px', padding: '1px 7px', borderRadius: '10px', fontSize: '11px', fontWeight: 700, background: '#fff3cd', color: '#856404', border: '1px solid #ffc107' },
-    repeatWarn:   { background: '#fff3cd', border: '1px solid #ffc107', borderRadius: '4px', padding: '8px 12px', marginTop: '6px', fontSize: '12px', color: '#856404' },
-    pointBox:     { background: '#fff3cd', border: '2px solid #ffc107', padding: '15px', borderRadius: '6px', marginTop: '15px', textAlign: 'center' },
-    pointValue:   { fontSize: '24px', fontWeight: 'bold', color: '#667eea', margin: '10px 0' },
+  contextBox:   { background: '#141623', border: '1px solid #333544', borderRadius: '4px', padding: '10px', fontSize: '12px', color: '#d1d3e0', marginTop: '4px' },
+  repeatBadge:  { display: 'inline-block', marginLeft: '8px', padding: '1px 7px', borderRadius: '10px', fontSize: '11px', fontWeight: 700, background: '#3b2e00', color: '#ffd666', border: '1px solid #d4af37' },
+  repeatWarn:   { background: '#3b2e00', border: '1px solid #d4af37', borderRadius: '4px', padding: '8px 12px', marginTop: '6px', fontSize: '12px', color: '#ffdf8a' },
+  pointBox:     { background: '#181200', border: '2px solid #d4af37', padding: '15px', borderRadius: '6px', marginTop: '15px', textAlign: 'center' },
+  pointValue:   { fontSize: '24px', fontWeight: 'bold', color: '#ffd666', margin: '10px 0' },
   scoreRow:     { display: 'flex', alignItems: 'center', gap: '12px', marginBottom: '14px', flexWrap: 'wrap' },
   btnRow:       { display: 'flex', gap: '15px', justifyContent: 'center', marginTop: '30px', flexWrap: 'wrap' },
-    btnPrimary:   { padding: '15px 40px', fontSize: '16px', fontWeight: 600, border: 'none', borderRadius: '6px', cursor: 'pointer', background: 'linear-gradient(135deg, #667eea 0%, #764ba2 100%)', color: 'white', textTransform: 'uppercase' },
+  btnPrimary:   { padding: '15px 40px', fontSize: '16px', fontWeight: 600, border: 'none', borderRadius: '6px', cursor: 'pointer', background: 'linear-gradient(135deg, #d4af37 0%, #ffdf8a 100%)', color: '#000', textTransform: 'uppercase' },
   btnPdf:       { padding: '15px 40px', fontSize: '16px', fontWeight: 600, border: 'none', borderRadius: '6px', cursor: 'pointer', background: 'linear-gradient(135deg, #e74c3c 0%, #c0392b 100%)', color: 'white', textTransform: 'uppercase' },
-    btnSecondary: { padding: '15px 40px', fontSize: '16px', fontWeight: 600, border: 'none', borderRadius: '6px', cursor: 'pointer', background: '#6c757d', color: 'white', textTransform: 'uppercase' },
-    note:         { background: '#e7f3ff', borderLeft: '4px solid #2196F3', padding: '15px', margin: '20px 0', borderRadius: '4px' },
-    statusOk:     { marginTop: '15px', padding: '15px', borderRadius: '6px', textAlign: 'center', fontWeight: 600, background: '#d4edda', color: '#155724', border: '1px solid #c3e6cb' },
-    statusErr:    { marginTop: '15px', padding: '15px', borderRadius: '6px', textAlign: 'center', fontWeight: 600, background: '#f8d7da', color: '#721c24', border: '1px solid #f5c6cb' },
+  btnSecondary: { padding: '15px 40px', fontSize: '16px', fontWeight: 600, border: '1px solid #333544', borderRadius: '6px', cursor: 'pointer', background: '#050608', color: '#f8f9fa', textTransform: 'uppercase' },
+  note:         { background: '#141623', borderLeft: '4px solid #2196F3', padding: '15px', margin: '20px 0', borderRadius: '4px', fontSize: '13px', color: '#d1d3e0' },
+  statusOk:     { marginTop: '15px', padding: '15px', borderRadius: '6px', textAlign: 'center', fontWeight: 600, background: '#053321', color: '#9ef7c1', border: '1px solid #0f5132' },
+  statusErr:    { marginTop: '15px', padding: '15px', borderRadius: '6px', textAlign: 'center', fontWeight: 600, background: '#3c1114', color: '#ffb3b8', border: '1px solid #f5c6cb' },
 };
 
 const EMPTY_FORM = {
@@ -41,7 +41,7 @@ export default function ViolationForm() {
   const [form,         setForm]         = useState(EMPTY_FORM);
   const [violation,    setViolation]    = useState(null);
   const [status,       setStatus]       = useState(null);
-    const [lastViolId,   setLastViolId]   = useState(null); // ID of most recently saved violation
+  const [lastViolId,   setLastViolId]   = useState(null);
   const [pdfLoading,   setPdfLoading]   = useState(false);
 
   const intel = useEmployeeIntelligence(form.employeeId || null);
@@ -113,9 +113,7 @@ export default function ViolationForm() {
     if (!lastViolId) return;
     setPdfLoading(true);
     try {
-            const response = await axios.get(`/api/violations/${lastViolId}/pdf`, {
-                responseType: 'blob',
-            });
+      const response = await axios.get(`/api/violations/${lastViolId}/pdf`, { responseType: 'blob' });
       const url      = window.URL.createObjectURL(new Blob([response.data], { type: 'application/pdf' }));
       const link     = document.createElement('a');
       link.href      = url;
@@ -138,15 +136,14 @@ export default function ViolationForm() {
   return (
     <div style={s.content}>
 
-            {/* ── Employee Information ─────────────────────────────── */}
       <div style={s.section}>
         <h2 style={s.sectionTitle}>Employee Information</h2>
 
         {intel.score && form.employeeId && (
           <div style={s.scoreRow}>
-                        <span style={{ fontSize: '13px', color: '#555', fontWeight: 600 }}>Current Standing:</span>
+            <span style={{ fontSize: '13px', color: '#d1d3e0', fontWeight: 600 }}>Current Standing:</span>
             <CpasBadge points={intel.score.active_points} />
-                        <span style={{ fontSize: '12px', color: '#888' }}>
+            <span style={{ fontSize: '12px', color: '#9ca0b8' }}>
               {intel.score.violation_count} violation{intel.score.violation_count !== 1 ? 's' : ''} in last 90 days
             </span>
           </div>
@@ -174,7 +171,6 @@ export default function ViolationForm() {
         </div>
       </div>
 
-            {/* ── Violation Details ────────────────────────────────── */}
       <form onSubmit={handleSubmit}>
         <div style={s.section}>
           <h2 style={s.sectionTitle}>Violation Details</h2>
@@ -207,7 +203,7 @@ export default function ViolationForm() {
                     </span>
                   )}
                   <br />{violation.description}<br />
-                                    <span style={{ fontSize: '11px', color: '#666' }}>{violation.chapter}</span>
+                  <span style={{ fontSize: '11px', color: '#a0a3ba' }}>{violation.chapter}</span>
                 </div>
               )}
 
@@ -264,7 +260,7 @@ export default function ViolationForm() {
 
           {violation && (
             <div style={s.pointBox}>
-                            <h4 style={{ color: '#856404', marginBottom: '10px' }}>CPAS Point Assessment</h4>
+              <h4 style={{ color: '#ffdf8a', marginBottom: '10px' }}>CPAS Point Assessment</h4>
               <p style={{ margin: 0 }}>
                 {violation.name}: {violation.minPoints === violation.maxPoints
                   ? `${violation.minPoints} Points (Fixed)`
@@ -274,7 +270,7 @@ export default function ViolationForm() {
                 min={violation.minPoints} max={violation.maxPoints}
                 value={form.points} onChange={handleChange} />
               <div style={s.pointValue}>{form.points} Points</div>
-                            <p style={{ fontSize: '12px', color: '#666' }}>Adjust to reflect severity and context</p>
+              <p style={{ fontSize: '12px', color: '#d1d3e0' }}>Adjust to reflect severity and context</p>
             </div>
           )}
         </div>
@@ -286,7 +282,6 @@ export default function ViolationForm() {
           </button>
         </div>
 
-                {/* PDF download — appears after successful submission */}
         {lastViolId && status?.ok && (
           <div style={{ textAlign: 'center', marginTop: '16px' }}>
             <button
@@ -297,7 +292,7 @@ export default function ViolationForm() {
             >
               {pdfLoading ? '⏳ Generating PDF...' : '⬇ Download PDF'}
             </button>
-                        <p style={{ fontSize: '11px', color: '#888', marginTop: '6px' }}>
+            <p style={{ fontSize: '11px', color: '#9ca0b8', marginTop: '6px' }}>
               Violation #{lastViolId} — click to download the signed violation document
             </p>
           </div>
@@ -306,7 +301,6 @@ export default function ViolationForm() {
         {status && <div style={status.ok ? s.statusOk : s.statusErr}>{status.msg}</div>}
       </form>
 
-            {/* ── Violation History Panel ──────────────────────────── */}
       {form.employeeId && (
         <div style={s.section}>
           <h2 style={s.sectionTitle}>Violation History</h2>

client/src/components/ViolationHistory.jsx

@@ -2,19 +2,19 @@ import React, { useState } from 'react';
 
 const s = {
     wrapper:  { marginTop: '24px' },
-    title:    { color: '#2c3e50', fontSize: '16px', fontWeight: 700, marginBottom: '10px' },
-    table:    { width: '100%', borderCollapse: 'collapse', fontSize: '13px' },
-    th:       { background: '#2c3e50', color: 'white', padding: '8px 10px', textAlign: 'left' },
-    td:       { padding: '8px 10px', borderBottom: '1px solid #dee2e6' },
-    trEven:   { background: '#f8f9fa' },
-    trOdd:    { background: 'white' },
+    title:    { color: '#b5b5c0', fontSize: '16px', fontWeight: 700, marginBottom: '10px' },
+    table:    { width: '100%', borderCollapse: 'collapse', fontSize: '13px', background: '#111217', borderRadius: '6px', overflow: 'hidden', border: '1px solid #222' },
+    th:       { background: '#000000', color: '#f8f9fa', padding: '8px 10px', textAlign: 'left', fontSize: '12px', fontWeight: 600, textTransform: 'uppercase', letterSpacing: '0.5px' },
+    td:       { padding: '8px 10px', borderBottom: '1px solid #1c1d29', color: '#f8f9fa', verticalAlign: 'middle' },
+    trEven:   { background: '#111217' },
+    trOdd:    { background: '#151622' },
     pts:      { fontWeight: 700, color: '#667eea' },
     toggle:   { background: 'none', border: 'none', color: '#667eea', cursor: 'pointer', fontSize: '13px', padding: 0, textDecoration: 'underline' },
-    empty:    { color: '#888', fontStyle: 'italic', fontSize: '13px', marginTop: '8px' },
+    empty:    { color: '#77798a', fontStyle: 'italic', fontSize: '13px', marginTop: '8px' },
 };
 
 function formatDate(d) {
-    if (!d) return '—';
+    if (!d) return '–';
     const dt = new Date(d + 'T12:00:00');
     return dt.toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric', timeZone: 'America/Chicago' });
 }
@@ -44,9 +44,9 @@ export default function ViolationHistory({ history, loading }) {
                         <tr key={v.id} style={i % 2 === 0 ? s.trEven : s.trOdd}>
                             <td style={s.td}>{formatDate(v.incident_date)}</td>
                             <td style={s.td}>{v.violation_name}</td>
-                            <td style={s.td}>{v.category}</td>
+                            <td style={{ ...s.td, color: '#c0c2d6' }}>{v.category}</td>
                             <td style={{ ...s.td, ...s.pts }}>{v.points}</td>
-                            <td style={s.td}>{v.details || '—'}</td>
+                            <td style={{ ...s.td, color: '#c0c2d6' }}>{v.details || '–'}</td>
                         </tr>
                     ))}
                 </tbody>

db/database.js

@@ -13,27 +13,14 @@ db.pragma('foreign_keys = ON');
 const schema = fs.readFileSync(path.join(__dirname, 'schema.sql'), 'utf8');
 db.exec(schema);
 
-// Migrate: add negated columns if upgrading from Phase 1-3
-const cols = db.prepare("PRAGMA table_info(violations)").all().map(c => c.name);
+// ── Migrations for existing DBs ─────────────────────────────────────────────
+const cols = db.prepare('PRAGMA table_info(violations)').all().map(c => c.name);
 if (!cols.includes('negated'))              db.exec("ALTER TABLE violations ADD COLUMN negated INTEGER NOT NULL DEFAULT 0");
 if (!cols.includes('negated_at'))           db.exec("ALTER TABLE violations ADD COLUMN negated_at DATETIME");
+if (!cols.includes('prior_active_points'))  db.exec("ALTER TABLE violations ADD COLUMN prior_active_points INTEGER");
+if (!cols.includes('prior_tier_label'))     db.exec("ALTER TABLE violations ADD COLUMN prior_tier_label TEXT");
 
-// After adding columns + resolutions table, ensure view is correct
-db.exec(`
-    DROP VIEW IF EXISTS active_cpas_scores;
-    CREATE VIEW active_cpas_scores AS
-    SELECT
-        employee_id,
-        SUM(points)  AS active_points,
-        COUNT(*)     AS violation_count
-    FROM violations
-    WHERE negated = 0
-      AND incident_date >= DATE('now', '-90 days')
-    GROUP BY employee_id;
-`);
-
-
-// Ensure resolutions table exists on upgrade
+// Ensure resolutions table exists
 db.exec(`CREATE TABLE IF NOT EXISTS violation_resolutions (
     id              INTEGER PRIMARY KEY AUTOINCREMENT,
     violation_id    INTEGER NOT NULL REFERENCES violations(id) ON DELETE CASCADE,
@@ -43,5 +30,17 @@ db.exec(`CREATE TABLE IF NOT EXISTS violation_resolutions (
     created_at      DATETIME DEFAULT CURRENT_TIMESTAMP
 )`);
 
+// Recreate view so it always filters negated rows
+db.exec(`DROP VIEW IF EXISTS active_cpas_scores;
+CREATE VIEW active_cpas_scores AS
+SELECT
+    employee_id,
+    SUM(points)  AS active_points,
+    COUNT(*)     AS violation_count
+FROM violations
+WHERE negated = 0
+  AND incident_date >= DATE('now', '-90 days')
+GROUP BY employee_id;`);
+
 console.log('[DB] Connected:', dbPath);
 module.exports = db;

db/schema.sql

@@ -21,6 +21,8 @@ CREATE TABLE IF NOT EXISTS violations (
     witness_name         TEXT,
     negated              INTEGER NOT NULL DEFAULT 0,
     negated_at           DATETIME,
+    prior_active_points  INTEGER, -- snapshot at time of logging
+    prior_tier_label     TEXT,    -- optional human-readable tier
     created_at           DATETIME DEFAULT CURRENT_TIMESTAMP
 );
 

pdf/generator.js

@@ -30,18 +30,12 @@ async function generatePdf(violation, score) {
             format:              'Letter',
             printBackground:     true,
             margin: {
-                top:    '0.6in',
-                bottom: '0.7in',
-                left:   '0.75in',
-                right:  '0.75in',
+                top:    '0.35in',
+                bottom: '0.35in',
+                left:   '0.4in',
+                right:  '0.4in',
             },
-            displayHeaderFooter: true,
-            headerTemplate:      '<div></div>',
-            footerTemplate: `
-                <div style="font-size:9px; color:#888; width:100%; text-align:center; padding:0 0.75in;">
-                    CONFIDENTIAL — MPM Internal HR Document &nbsp;|&nbsp;
-                    Page <span class="pageNumber"></span> of <span class="totalPages"></span>
-                </div>`,
+            displayHeaderFooter: false,
         });
 
         return pdf;

server.js

@@ -11,10 +11,10 @@ app.use(cors());
 app.use(express.json());
 app.use(express.static(path.join(__dirname, 'client', 'dist')));
 
-// ── Health ──────────────────────────────────────────────────────────────────
+// Health
 app.get('/api/health', (req, res) => res.json({ status: 'ok', timestamp: new Date().toISOString() }));
 
-// ── Employees ───────────────────────────────────────────────────────────────
+// Employees
 app.get('/api/employees', (req, res) => {
   const rows = db.prepare('SELECT id, name, department, supervisor FROM employees ORDER BY name ASC').all();
   res.json(rows);
@@ -25,26 +25,27 @@ app.post('/api/employees', (req, res) => {
   if (!name) return res.status(400).json({ error: 'name is required' });
   const existing = db.prepare('SELECT * FROM employees WHERE LOWER(name) = LOWER(?)').get(name);
   if (existing) {
-        if (department || supervisor)
+    if (department || supervisor) {
       db.prepare('UPDATE employees SET department = COALESCE(?, department), supervisor = COALESCE(?, supervisor) WHERE id = ?')
         .run(department || null, supervisor || null, existing.id);
+    }
     return res.json({ ...existing, department, supervisor });
   }
-    const result = db.prepare('INSERT INTO employees (name, department, supervisor) VALUES (?, ?, ?)').run(name, department || null, supervisor || null);
+  const result = db.prepare('INSERT INTO employees (name, department, supervisor) VALUES (?, ?, ?)')
+    .run(name, department || null, supervisor || null);
   res.status(201).json({ id: result.lastInsertRowid, name, department, supervisor });
 });
 
-// ── Employee CPAS Score ─────────────────────────────────────────────────────
+// Employee score (current snapshot)
 app.get('/api/employees/:id/score', (req, res) => {
   const row = db.prepare('SELECT * FROM active_cpas_scores WHERE employee_id = ?').get(req.params.id);
   res.json(row || { employee_id: req.params.id, active_points: 0, violation_count: 0 });
 });
 
-// ── Dashboard — all employees with scores ───────────────────────────────────
+// Dashboard
 app.get('/api/dashboard', (req, res) => {
   const rows = db.prepare(`
-        SELECT
-            e.id, e.name, e.department, e.supervisor,
+    SELECT e.id, e.name, e.department, e.supervisor,
            COALESCE(s.active_points, 0)  AS active_points,
            COALESCE(s.violation_count,0) AS violation_count
     FROM employees e
@@ -54,31 +55,7 @@ app.get('/api/dashboard', (req, res) => {
   res.json(rows);
 });
 
-// ── Violation counts (90-day) ───────────────────────────────────────────────
-app.get('/api/employees/:id/violation-counts', (req, res) => {
-    const rows = db.prepare(`
-        SELECT violation_type, COUNT(*) as count FROM violations
-        WHERE employee_id = ? AND negated = 0 AND incident_date >= DATE('now', '-90 days')
-        GROUP BY violation_type
-    `).all(req.params.id);
-    const map = {};
-    rows.forEach(r => { map[r.violation_type] = r.count; });
-    res.json(map);
-});
-
-// ── Violation counts (all-time) ─────────────────────────────────────────────
-app.get('/api/employees/:id/violation-counts/alltime', (req, res) => {
-    const rows = db.prepare(`
-        SELECT violation_type, COUNT(*) as count, MAX(points) as max_points_used FROM violations
-        WHERE employee_id = ? AND negated = 0
-        GROUP BY violation_type
-    `).all(req.params.id);
-    const map = {};
-    rows.forEach(r => { map[r.violation_type] = { count: r.count, max_points_used: r.max_points_used }; });
-    res.json(map);
-});
-
-// ── Violation history (per employee) ───────────────────────────────────────
+// Violation history (per employee) with resolutions
 app.get('/api/violations/employee/:id', (req, res) => {
   const limit = parseInt(req.query.limit) || 50;
   const rows  = db.prepare(`
@@ -93,75 +70,132 @@ app.get('/api/violations/employee/:id', (req, res) => {
   res.json(rows);
 });
 
-// ── POST new violation ──────────────────────────────────────────────────────
+// Helper: compute prior_active_points at time of insert
+function getPriorActivePoints(employeeId, incidentDate) {
+  const row = db.prepare(
+    `SELECT COALESCE(SUM(points),0) AS pts
+     FROM violations
+     WHERE employee_id = ?
+       AND negated = 0
+       AND incident_date >= DATE(?, '-90 days')
+       AND incident_date < ?`
+  ).get(employeeId, incidentDate, incidentDate);
+  return row ? row.pts : 0;
+}
+
+// POST new violation
 app.post('/api/violations', (req, res) => {
   const {
     employee_id, violation_type, violation_name, category,
     points, incident_date, incident_time, location,
     details, submitted_by, witness_name
   } = req.body;
-    if (!employee_id || !violation_type || !points || !incident_date)
+
+  if (!employee_id || !violation_type || !points || !incident_date) {
     return res.status(400).json({ error: 'Missing required fields' });
+  }
+
+  const ptsInt   = parseInt(points);
+  const priorPts = getPriorActivePoints(employee_id, incident_date);
 
   const result = db.prepare(`
-        INSERT INTO violations (employee_id, violation_type, violation_name, category,
-            points, incident_date, incident_time, location, details, submitted_by, witness_name)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(employee_id, violation_type, violation_name || violation_type,
-           category || 'General', points, incident_date,
+    INSERT INTO violations (
+      employee_id, violation_type, violation_name, category,
+      points, incident_date, incident_time, location,
+      details, submitted_by, witness_name,
+      prior_active_points
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(
+    employee_id, violation_type, violation_name || violation_type,
+    category || 'General', ptsInt, incident_date,
     incident_time || null, location || null,
-           details || null, submitted_by || null, witness_name || null);
+    details || null, submitted_by || null, witness_name || null,
+    priorPts
+  );
 
   res.status(201).json({ id: result.lastInsertRowid });
 });
 
-// ── PATCH — Soft Negate (add resolution) ───────────────────────────────────
+// ── Negate a violation ──────────────────────────────────────────────────────
 app.patch('/api/violations/:id/negate', (req, res) => {
   const { resolution_type, details, resolved_by } = req.body;
-    if (!resolution_type) return res.status(400).json({ error: 'resolution_type is required' });
+  const id = req.params.id;
 
-    const violation = db.prepare('SELECT * FROM violations WHERE id = ?').get(req.params.id);
+  const violation = db.prepare('SELECT * FROM violations WHERE id = ?').get(id);
   if (!violation) return res.status(404).json({ error: 'Violation not found' });
 
-    db.prepare('UPDATE violations SET negated = 1, negated_at = CURRENT_TIMESTAMP WHERE id = ?').run(req.params.id);
+  // Mark negated
+  db.prepare('UPDATE violations SET negated = 1 WHERE id = ?').run(id);
+
+  // Upsert resolution record
+  const existing = db.prepare('SELECT id FROM violation_resolutions WHERE violation_id = ?').get(id);
+  if (existing) {
+    db.prepare(`
+      UPDATE violation_resolutions
+      SET resolution_type = ?, details = ?, resolved_by = ?, created_at = datetime('now')
+      WHERE violation_id = ?
+    `).run(resolution_type || 'Resolved', details || null, resolved_by || null, id);
+  } else {
     db.prepare(`
       INSERT INTO violation_resolutions (violation_id, resolution_type, details, resolved_by)
       VALUES (?, ?, ?, ?)
-    `).run(req.params.id, resolution_type, details || null, resolved_by || null);
+    `).run(id, resolution_type || 'Resolved', details || null, resolved_by || null);
+  }
 
   res.json({ success: true });
 });
 
-// ── PATCH — Restore negated violation ──────────────────────────────────────
+// ── Restore a negated violation ─────────────────────────────────────────────
 app.patch('/api/violations/:id/restore', (req, res) => {
-    const violation = db.prepare('SELECT * FROM violations WHERE id = ?').get(req.params.id);
+  const id = req.params.id;
+
+  const violation = db.prepare('SELECT * FROM violations WHERE id = ?').get(id);
   if (!violation) return res.status(404).json({ error: 'Violation not found' });
-    db.prepare('UPDATE violations SET negated = 0, negated_at = NULL WHERE id = ?').run(req.params.id);
-    db.prepare('DELETE FROM violation_resolutions WHERE violation_id = ?').run(req.params.id);
+
+  db.prepare('UPDATE violations SET negated = 0 WHERE id = ?').run(id);
+  db.prepare('DELETE FROM violation_resolutions WHERE violation_id = ?').run(id);
+
   res.json({ success: true });
 });
 
-// ── DELETE — Hard Delete ────────────────────────────────────────────────────
+// ── Hard delete a violation ─────────────────────────────────────────────────
 app.delete('/api/violations/:id', (req, res) => {
-    const violation = db.prepare('SELECT * FROM violations WHERE id = ?').get(req.params.id);
+  const id = req.params.id;
+
+  const violation = db.prepare('SELECT * FROM violations WHERE id = ?').get(id);
   if (!violation) return res.status(404).json({ error: 'Violation not found' });
-    db.prepare('DELETE FROM violation_resolutions WHERE violation_id = ?').run(req.params.id);
-    db.prepare('DELETE FROM violations WHERE id = ?').run(req.params.id);
+
+  // Delete resolution first (FK safety)
+  db.prepare('DELETE FROM violation_resolutions WHERE violation_id = ?').run(id);
+  db.prepare('DELETE FROM violations WHERE id = ?').run(id);
+
   res.json({ success: true });
 });
 
-// ── PDF ─────────────────────────────────────────────────────────────────────
+// ── PDF endpoint ─────────────────────────────────────────────────────────────
 app.get('/api/violations/:id/pdf', async (req, res) => {
   try {
     const violation = db.prepare(`
       SELECT v.*, e.name as employee_name, e.department, e.supervisor
-            FROM violations v JOIN employees e ON e.id = v.employee_id
+      FROM violations v
+      JOIN employees e ON e.id = v.employee_id
       WHERE v.id = ?
     `).get(req.params.id);
+
     if (!violation) return res.status(404).json({ error: 'Violation not found' });
-        const score     = db.prepare('SELECT * FROM active_cpas_scores WHERE employee_id = ?').get(violation.employee_id) || { active_points: 0, violation_count: 0 };
-        const pdfBuffer = await generatePdf(violation, score);
+
+    const active = db.prepare('SELECT * FROM active_cpas_scores WHERE employee_id = ?')
+      .get(violation.employee_id) || { active_points: 0, violation_count: 0 };
+
+    const scoreForPdf = {
+      employee_id:     violation.employee_id,
+      active_points:   violation.prior_active_points != null ? violation.prior_active_points : active.active_points,
+      violation_count: active.violation_count,
+    };
+
+    const pdfBuffer = await generatePdf(violation, scoreForPdf);
     const safeName  = violation.employee_name.replace(/[^a-z0-9]/gi, '_');
+
     res.set({
       'Content-Type':        'application/pdf',
       'Content-Disposition': `attachment; filename="CPAS_${safeName}_${violation.incident_date}.pdf"`,
@@ -174,7 +208,7 @@ app.get('/api/violations/:id/pdf', async (req, res) => {
   }
 });
 
-// ── SPA fallback ────────────────────────────────────────────────────────────
+// SPA fallback
 app.get('*', (req, res) => res.sendFile(path.join(__dirname, 'client', 'dist', 'index.html')));
 
 app.listen(PORT, '0.0.0.0', () => console.log(`[CPAS] Server running on port ${PORT}`));