Merge pull request 'roadmap' (#23) from roadmap into master

Reviewed-on: #23

README.md

@@ -1,11 +1,13 @@
 # CPAS Violation Tracker
 
-Single-container Dockerized web app for CPAS violation documentation.
+Single-container Dockerized web app for CPAS violation documentation and workforce standing management.
-Built with React + Vite (frontend), Node.js + Express (backend), SQLite (database).
+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/
+cpas/
-├── Dockerfile                  # Multi-stage: builds React + runs Express
+├── 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
+│   ├── schema.sql                 # Tables + 90-day active score view
-│   └── database.js             # SQLite connection
+│   └── 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
+## Database Schema
-- [ ] Phase 3 — Puppeteer PDF generation
+
-- [ ] Phase 4 — Dashboard, CPAS scores, tier warnings
+Three tables + one view:
-- [ ] Phase 5 — Recidivist point auto-suggest
+
+- **`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/components/AmendViolationModal.jsx

@@ -0,0 +1,205 @@
+import React, { useState, useEffect } from 'react';
+import axios from 'axios';
+
+const FIELD_LABELS = {
+  incident_time:  'Incident Time',
+  location:       'Location / Context',
+  details:        'Incident Notes',
+  submitted_by:   'Submitted By',
+  witness_name:   'Witness / Documenting Officer',
+};
+
+const s = {
+  overlay: {
+    position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.8)',
+    zIndex: 2000, display: 'flex', alignItems: 'center', justifyContent: 'center',
+  },
+  modal: {
+    background: '#111217', color: '#f8f9fa', width: '520px', maxWidth: '95vw',
+    maxHeight: '90vh', overflowY: 'auto',
+    borderRadius: '10px', boxShadow: '0 8px 40px rgba(0,0,0,0.8)',
+    border: '1px solid #222',
+  },
+  header: {
+    background: 'linear-gradient(135deg, #000000, #151622)', color: 'white',
+    padding: '18px 22px', display: 'flex', alignItems: 'center', justifyContent: 'space-between',
+    borderBottom: '1px solid #222', position: 'sticky', top: 0, zIndex: 10,
+  },
+  headerLeft: {},
+  title:    { fontSize: '15px', fontWeight: 700 },
+  subtitle: { fontSize: '11px', color: '#9ca0b8', marginTop: '2px' },
+  closeBtn: {
+    background: 'none', border: 'none', color: 'white', fontSize: '20px',
+    cursor: 'pointer', lineHeight: 1,
+  },
+  body: { padding: '22px' },
+  notice: {
+    background: '#0e1a30', border: '1px solid #1e3a5f', borderRadius: '6px',
+    padding: '10px 14px', fontSize: '12px', color: '#7eb8f7', marginBottom: '18px',
+  },
+  label:   { fontSize: '11px', color: '#9ca0b8', textTransform: 'uppercase', letterSpacing: '0.5px', marginBottom: '5px' },
+  input: {
+    width: '100%', background: '#0d0e14', border: '1px solid #2a2b3a', borderRadius: '6px',
+    color: '#f8f9fa', padding: '9px 12px', fontSize: '13px', marginBottom: '14px',
+    outline: 'none', boxSizing: 'border-box',
+  },
+  textarea: {
+    width: '100%', background: '#0d0e14', border: '1px solid #2a2b3a', borderRadius: '6px',
+    color: '#f8f9fa', padding: '9px 12px', fontSize: '13px', marginBottom: '14px',
+    outline: 'none', boxSizing: 'border-box', minHeight: '80px', resize: 'vertical',
+  },
+  divider: { borderTop: '1px solid #1c1d29', margin: '16px 0' },
+  sectionTitle: {
+    fontSize: '11px', fontWeight: 700, color: '#9ca0b8', textTransform: 'uppercase',
+    letterSpacing: '0.5px', marginBottom: '12px',
+  },
+  amendRow: {
+    background: '#0d0e14', border: '1px solid #1c1d29', borderRadius: '6px',
+    padding: '10px 12px', marginBottom: '8px', fontSize: '12px',
+  },
+  amendField:    { fontWeight: 700, color: '#c0c2d6', marginBottom: '4px' },
+  amendOld:      { color: '#ff7070', textDecoration: 'line-through', marginRight: '6px' },
+  amendNew:      { color: '#9ef7c1' },
+  amendMeta:     { fontSize: '10px', color: '#555a7a', marginTop: '4px' },
+  row:     { display: 'flex', gap: '10px', justifyContent: 'flex-end', marginTop: '6px' },
+  btn:     (color, bg) => ({
+    padding: '8px 18px', borderRadius: '6px', fontWeight: 700, fontSize: '13px',
+    cursor: 'pointer', border: `1px solid ${color}`, color, background: bg || 'none',
+  }),
+  error: {
+    background: '#3c1114', border: '1px solid #f5c6cb', borderRadius: '6px',
+    padding: '10px 12px', fontSize: '12px', color: '#ffb3b8', marginBottom: '14px',
+  },
+};
+
+function fmtDt(iso) {
+  if (!iso) return '—';
+  return new Date(iso).toLocaleString('en-US', { timeZone: 'America/Chicago', dateStyle: 'medium', timeStyle: 'short' });
+}
+
+export default function AmendViolationModal({ violation, onClose, onSaved }) {
+  const [fields, setFields] = useState({
+    incident_time:  violation.incident_time  || '',
+    location:       violation.location       || '',
+    details:        violation.details        || '',
+    submitted_by:   violation.submitted_by   || '',
+    witness_name:   violation.witness_name   || '',
+  });
+  const [changedBy, setChangedBy]   = useState('');
+  const [saving, setSaving]         = useState(false);
+  const [error, setError]           = useState('');
+  const [amendments, setAmendments] = useState([]);
+
+  useEffect(() => {
+    axios.get(`/api/violations/${violation.id}/amendments`)
+      .then(r => setAmendments(r.data))
+      .catch(() => {});
+  }, [violation.id]);
+
+  const hasChanges = Object.entries(fields).some(
+    ([k, v]) => v !== (violation[k] || '')
+  );
+
+  const handleSave = async () => {
+    setError('');
+    setSaving(true);
+    try {
+      // Only send fields that actually changed
+      const patch = Object.fromEntries(
+        Object.entries(fields).filter(([k, v]) => v !== (violation[k] || ''))
+      );
+      await axios.patch(`/api/violations/${violation.id}/amend`, { ...patch, changed_by: changedBy || null });
+      onSaved();
+      onClose();
+    } catch (e) {
+      setError(e.response?.data?.error || 'Failed to save amendment');
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  const set = (field, value) => setFields(prev => ({ ...prev, [field]: value }));
+
+  return (
+    <div style={s.overlay} onClick={e => e.target === e.currentTarget && onClose()}>
+      <div style={s.modal}>
+        <div style={s.header}>
+          <div style={s.headerLeft}>
+            <div style={s.title}>Amend Violation</div>
+            <div style={s.subtitle}>
+              CPAS-{String(violation.id).padStart(5, '0')} · {violation.violation_name} · {violation.incident_date}
+            </div>
+          </div>
+          <button style={s.closeBtn} onClick={onClose}>✕</button>
+        </div>
+
+        <div style={s.body}>
+          <div style={s.notice}>
+            Only non-scoring fields can be amended. Point values, violation type, and incident date
+            are immutable — delete and re-submit if those need to change.
+          </div>
+
+          {error && <div style={s.error}>{error}</div>}
+
+          {Object.entries(FIELD_LABELS).map(([field, label]) => (
+            <div key={field}>
+              <div style={s.label}>{label}</div>
+              {field === 'details' ? (
+                <textarea
+                  style={s.textarea}
+                  value={fields[field]}
+                  onChange={e => set(field, e.target.value)}
+                />
+              ) : (
+                <input
+                  style={s.input}
+                  value={fields[field]}
+                  onChange={e => set(field, e.target.value)}
+                />
+              )}
+            </div>
+          ))}
+
+          <div style={s.label}>Your Name (recorded in amendment log)</div>
+          <input
+            style={s.input}
+            value={changedBy}
+            onChange={e => setChangedBy(e.target.value)}
+            placeholder="Optional but recommended"
+          />
+
+          <div style={s.row}>
+            <button style={s.btn('#888')} onClick={onClose}>Cancel</button>
+            <button
+              style={s.btn('#fff', hasChanges ? '#667eea' : '#333')}
+              onClick={handleSave}
+              disabled={!hasChanges || saving}
+            >
+              {saving ? 'Saving…' : 'Save Amendment'}
+            </button>
+          </div>
+
+          {amendments.length > 0 && (
+            <>
+              <div style={s.divider} />
+              <div style={s.sectionTitle}>Amendment History ({amendments.length})</div>
+              {amendments.map(a => (
+                <div key={a.id} style={s.amendRow}>
+                  <div style={s.amendField}>{FIELD_LABELS[a.field_name] || a.field_name}</div>
+                  <div>
+                    <span style={s.amendOld}>{a.old_value || '(empty)'}</span>
+                    <span style={{ color: '#555', marginRight: '6px' }}>→</span>
+                    <span style={s.amendNew}>{a.new_value || '(empty)'}</span>
+                  </div>
+                  <div style={s.amendMeta}>
+                    {a.changed_by ? `by ${a.changed_by} · ` : ''}{fmtDt(a.created_at)}
+                  </div>
+                </div>
+              ))}
+            </>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}

client/src/components/AuditLog.jsx

@@ -0,0 +1,200 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import axios from 'axios';
+
+const ACTION_COLORS = {
+  employee_created:  '#667eea',
+  employee_edited:   '#9b8af8',
+  employee_merged:   '#f0a500',
+  violation_created: '#28a745',
+  violation_amended: '#4db6ac',
+  violation_negated: '#ffc107',
+  violation_restored:'#17a2b8',
+  violation_deleted: '#dc3545',
+};
+
+const ACTION_LABELS = {
+  employee_created:  'Employee Created',
+  employee_edited:   'Employee Edited',
+  employee_merged:   'Employee Merged',
+  violation_created: 'Violation Logged',
+  violation_amended: 'Violation Amended',
+  violation_negated: 'Violation Negated',
+  violation_restored:'Violation Restored',
+  violation_deleted: 'Violation Deleted',
+};
+
+const ENTITY_LABELS = {
+  employee:  'Employee',
+  violation: 'Violation',
+};
+
+const s = {
+  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: '22px 26px', position: 'sticky', top: 0, zIndex: 10,
+    borderBottom: '1px solid #222',
+  },
+  headerRow: { display: 'flex', alignItems: 'center', justifyContent: 'space-between' },
+  title:     { fontSize: '17px', fontWeight: 700 },
+  subtitle:  { fontSize: '12px', color: '#9ca0b8', marginTop: '3px' },
+  closeBtn:  {
+    background: 'none', border: 'none', color: 'white', fontSize: '22px',
+    cursor: 'pointer', lineHeight: 1,
+  },
+  filters: {
+    padding: '14px 26px', borderBottom: '1px solid #1c1d29',
+    display: 'flex', gap: '10px', flexWrap: 'wrap',
+  },
+  select: {
+    background: '#0d0e14', border: '1px solid #2a2b3a', borderRadius: '6px',
+    color: '#f8f9fa', padding: '7px 12px', fontSize: '12px', outline: 'none',
+  },
+  body:       { padding: '16px 26px', flex: 1 },
+  entry: {
+    borderBottom: '1px solid #1c1d29', padding: '12px 0',
+    display: 'flex', gap: '12px', alignItems: 'flex-start',
+  },
+  dot: (action) => ({
+    width: '8px', height: '8px', borderRadius: '50%', marginTop: '5px', flexShrink: 0,
+    background: ACTION_COLORS[action] || '#555',
+  }),
+  entryMain:  { flex: 1, minWidth: 0 },
+  actionBadge: (action) => ({
+    display: 'inline-block', padding: '2px 8px', borderRadius: '10px',
+    fontSize: '10px', fontWeight: 700, letterSpacing: '0.3px', marginRight: '6px',
+    background: (ACTION_COLORS[action] || '#555') + '22',
+    color: ACTION_COLORS[action] || '#aaa',
+    border: `1px solid ${(ACTION_COLORS[action] || '#555')}44`,
+  }),
+  entityRef:  { fontSize: '11px', color: '#9ca0b8' },
+  details:    { fontSize: '11px', color: '#667', marginTop: '4px', fontFamily: 'monospace', wordBreak: 'break-all' },
+  meta:       { fontSize: '10px', color: '#555a7a', marginTop: '4px' },
+  empty:      { textAlign: 'center', color: '#555a7a', padding: '60px 0', fontSize: '13px' },
+  loadMore:   {
+    width: '100%', background: 'none', border: '1px solid #2a2b3a', borderRadius: '6px',
+    color: '#9ca0b8', padding: '10px', cursor: 'pointer', fontSize: '12px', marginTop: '16px',
+  },
+};
+
+function fmtDt(iso) {
+  if (!iso) return '—';
+  return new Date(iso).toLocaleString('en-US', {
+    timeZone: 'America/Chicago', dateStyle: 'medium', timeStyle: 'short',
+  });
+}
+
+function renderDetails(detailsStr) {
+  if (!detailsStr) return null;
+  try {
+    const obj = JSON.parse(detailsStr);
+    return JSON.stringify(obj, null, 0)
+      .replace(/^\{/, '').replace(/\}$/, '').replace(/","/g, '  ');
+  } catch {
+    return detailsStr;
+  }
+}
+
+export default function AuditLog({ onClose }) {
+  const [entries, setEntries]       = useState([]);
+  const [loading, setLoading]       = useState(true);
+  const [offset, setOffset]         = useState(0);
+  const [hasMore, setHasMore]       = useState(false);
+  const [filterType, setFilterType] = useState('');
+  const [filterAction, setFilterAction] = useState('');
+  const LIMIT = 50;
+
+  const load = useCallback((reset = false) => {
+    setLoading(true);
+    const o = reset ? 0 : offset;
+    const params = { limit: LIMIT, offset: o };
+    if (filterType)   params.entity_type = filterType;
+    if (filterAction) params.action      = filterAction; // future: server-side action filter
+    axios.get('/api/audit', { params })
+      .then(r => {
+        const data = r.data;
+        // Client-side action filter (cheap enough at this scale)
+        const filtered = filterAction ? data.filter(e => e.action === filterAction) : data;
+        setEntries(prev => reset ? filtered : [...prev, ...filtered]);
+        setHasMore(data.length === LIMIT);
+        setOffset(o + LIMIT);
+      })
+      .finally(() => setLoading(false));
+  }, [offset, filterType, filterAction]);
+
+  useEffect(() => { load(true); }, [filterType, filterAction]); // eslint-disable-line
+
+  const handleOverlay = e => { if (e.target === e.currentTarget) onClose(); };
+
+  return (
+    <div style={s.overlay} onClick={handleOverlay}>
+      <div style={s.panel} onClick={e => e.stopPropagation()}>
+        <div style={s.header}>
+          <div style={s.headerRow}>
+            <div>
+              <div style={s.title}>Audit Log</div>
+              <div style={s.subtitle}>All system write actions — append-only</div>
+            </div>
+            <button style={s.closeBtn} onClick={onClose}>✕</button>
+          </div>
+        </div>
+
+        <div style={s.filters}>
+          <select style={s.select} value={filterType} onChange={e => { setFilterType(e.target.value); setOffset(0); }}>
+            <option value="">All entity types</option>
+            {Object.entries(ENTITY_LABELS).map(([v, l]) => <option key={v} value={v}>{l}</option>)}
+          </select>
+          <select style={s.select} value={filterAction} onChange={e => { setFilterAction(e.target.value); setOffset(0); }}>
+            <option value="">All actions</option>
+            {Object.entries(ACTION_LABELS).map(([v, l]) => <option key={v} value={v}>{l}</option>)}
+          </select>
+        </div>
+
+        <div style={s.body}>
+          {loading && entries.length === 0 ? (
+            <div style={s.empty}>Loading…</div>
+          ) : entries.length === 0 ? (
+            <div style={s.empty}>No audit entries found.</div>
+          ) : (
+            entries.map(e => (
+              <div key={e.id} style={s.entry}>
+                <div style={s.dot(e.action)} />
+                <div style={s.entryMain}>
+                  <div>
+                    <span style={s.actionBadge(e.action)}>
+                      {ACTION_LABELS[e.action] || e.action}
+                    </span>
+                    <span style={s.entityRef}>
+                      {ENTITY_LABELS[e.entity_type] || e.entity_type}
+                      {e.entity_id ? ` #${e.entity_id}` : ''}
+                    </span>
+                  </div>
+                  {e.details && (
+                    <div style={s.details}>{renderDetails(e.details)}</div>
+                  )}
+                  <div style={s.meta}>
+                    {e.performed_by ? `by ${e.performed_by} · ` : ''}{fmtDt(e.created_at)}
+                  </div>
+                </div>
+              </div>
+            ))
+          )}
+
+          {hasMore && (
+            <button style={s.loadMore} onClick={() => load(false)}>
+              Load more
+            </button>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}

client/src/components/Dashboard.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect, useCallback } from 'react';
 import axios from 'axios';
 import CpasBadge, { getTier } from './CpasBadge';
 import EmployeeModal from './EmployeeModal';
+import AuditLog from './AuditLog';
 
 const AT_RISK_THRESHOLD = 2;
 
@@ -12,7 +13,7 @@ const TIERS = [
   { min: 15, max: 19  },
   { min: 20, max: 24  },
   { min: 25, max: 29  },
-  { min: 30, max: 999},
+  { min: 30, max: 999 },
 ];
 
 function nextTierBoundary(points) {
@@ -43,14 +44,17 @@ const s = {
   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' },
+  toolbarRight: { display: 'flex', gap: '10px', alignItems: 'center' },
+  refreshBtn:   { padding: '9px 18px', background: '#d4af37', color: '#000', border: 'none', borderRadius: '6px', cursor: 'pointer', fontWeight: 600, fontSize: '13px' },
+  auditBtn:     { padding: '9px 18px', background: 'none', color: '#9ca0b8', border: '1px solid #2a2b3a', borderRadius: '6px', cursor: 'pointer', fontWeight: 600, fontSize: '13px' },
 };
 
 export default function Dashboard() {
   const [employees,   setEmployees]   = useState([]);
   const [filtered,    setFiltered]    = useState([]);
   const [search,      setSearch]      = useState('');
-  const [selectedId,setSelectedId] = useState(null);
+  const [selectedId,  setSelectedId]  = useState(null);
+  const [showAudit,   setShowAudit]   = useState(false);
   const [loading,     setLoading]     = useState(true);
 
   const load = useCallback(() => {
@@ -77,14 +81,21 @@ export default function Dashboard() {
   const maxPoints   = employees.reduce((m, e) => Math.max(m, e.active_points), 0);
 
   return (
+    <>
       <div style={s.wrap}>
         <div style={s.header}>
           <div>
             <div style={s.title}>Company Dashboard</div>
             <div style={s.subtitle}>Click any employee name to view their full profile</div>
           </div>
-        <div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}>
+          <div style={s.toolbarRight}>
-          <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.auditBtn} onClick={() => setShowAudit(true)}>📋 Audit Log</button>
             <button style={s.refreshBtn} onClick={load}>↻ Refresh</button>
           </div>
         </div>
@@ -129,17 +140,26 @@ 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 ? '#181200' : i % 2 === 0 ? '#111217' : '#151622' }}>
+                  <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()}
@@ -149,7 +169,9 @@ export default function Dashboard() {
                     <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, fontWeight: 700, color: tier.color, fontSize: '16px' }}>
+                      {emp.active_points}
+                    </td>
                     <td style={{ ...s.td, color: '#c0c2d6' }}>{emp.violation_count}</td>
                   </tr>
                 );
@@ -157,6 +179,7 @@ export default function Dashboard() {
             </tbody>
           </table>
         )}
+      </div>
 
       {selectedId && (
         <EmployeeModal
@@ -164,6 +187,7 @@ export default function Dashboard() {
           onClose={() => { setSelectedId(null); load(); }}
         />
       )}
-    </div>
+      {showAudit && <AuditLog onClose={() => setShowAudit(false)} />}
+    </>
   );
 }

client/src/components/EditEmployeeModal.jsx

@@ -0,0 +1,189 @@
+import React, { useState, useEffect } from 'react';
+import axios from 'axios';
+
+const s = {
+  overlay: {
+    position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.8)',
+    zIndex: 2000, display: 'flex', alignItems: 'center', justifyContent: 'center',
+  },
+  modal: {
+    background: '#111217', color: '#f8f9fa', width: '480px', maxWidth: '95vw',
+    borderRadius: '10px', boxShadow: '0 8px 40px rgba(0,0,0,0.8)',
+    border: '1px solid #222', overflow: 'hidden',
+  },
+  header: {
+    background: 'linear-gradient(135deg, #000000, #151622)', color: 'white',
+    padding: '18px 22px', display: 'flex', alignItems: 'center', justifyContent: 'space-between',
+    borderBottom: '1px solid #222',
+  },
+  title: { fontSize: '15px', fontWeight: 700 },
+  closeBtn: {
+    background: 'none', border: 'none', color: 'white', fontSize: '20px',
+    cursor: 'pointer', lineHeight: 1,
+  },
+  body: { padding: '22px' },
+  tabs: { display: 'flex', gap: '4px', marginBottom: '20px' },
+  tab: (active) => ({
+    flex: 1, padding: '8px', borderRadius: '6px', cursor: 'pointer', fontSize: '12px',
+    fontWeight: 700, textAlign: 'center', border: '1px solid',
+    background: active ? '#1a1c2e' : 'none',
+    borderColor: active ? '#667eea' : '#2a2b3a',
+    color: active ? '#667eea' : '#777',
+  }),
+  label: { fontSize: '11px', color: '#9ca0b8', textTransform: 'uppercase', letterSpacing: '0.5px', marginBottom: '5px' },
+  input: {
+    width: '100%', background: '#0d0e14', border: '1px solid #2a2b3a', borderRadius: '6px',
+    color: '#f8f9fa', padding: '9px 12px', fontSize: '13px', marginBottom: '14px',
+    outline: 'none', boxSizing: 'border-box',
+  },
+  select: {
+    width: '100%', background: '#0d0e14', border: '1px solid #2a2b3a', borderRadius: '6px',
+    color: '#f8f9fa', padding: '9px 12px', fontSize: '13px', marginBottom: '14px',
+    outline: 'none', boxSizing: 'border-box',
+  },
+  row: { display: 'flex', gap: '10px', justifyContent: 'flex-end', marginTop: '6px' },
+  btn: (color, bg) => ({
+    padding: '8px 18px', borderRadius: '6px', fontWeight: 700, fontSize: '13px',
+    cursor: 'pointer', border: `1px solid ${color}`, color, background: bg || 'none',
+  }),
+  error: {
+    background: '#3c1114', border: '1px solid #f5c6cb', borderRadius: '6px',
+    padding: '10px 12px', fontSize: '12px', color: '#ffb3b8', marginBottom: '14px',
+  },
+  success: {
+    background: '#0a2e1f', border: '1px solid #0f5132', borderRadius: '6px',
+    padding: '10px 12px', fontSize: '12px', color: '#9ef7c1', marginBottom: '14px',
+  },
+  mergeWarning: {
+    background: '#2a1f00', border: '1px solid #7a5000', borderRadius: '6px',
+    padding: '12px', fontSize: '12px', color: '#ffc107', marginBottom: '14px', lineHeight: 1.5,
+  },
+};
+
+export default function EditEmployeeModal({ employee, onClose, onSaved }) {
+  const [tab, setTab] = useState('edit');
+
+  // Edit state
+  const [name, setName]             = useState(employee.name);
+  const [department, setDepartment] = useState(employee.department || '');
+  const [supervisor, setSupervisor] = useState(employee.supervisor || '');
+  const [editError, setEditError]   = useState('');
+  const [editSaving, setEditSaving] = useState(false);
+
+  // Merge state
+  const [allEmployees, setAllEmployees] = useState([]);
+  const [sourceId, setSourceId]         = useState('');
+  const [mergeError, setMergeError]     = useState('');
+  const [mergeResult, setMergeResult]   = useState(null);
+  const [merging, setMerging]           = useState(false);
+
+  useEffect(() => {
+    if (tab === 'merge') {
+      axios.get('/api/employees').then(r => setAllEmployees(r.data));
+    }
+  }, [tab]);
+
+  const handleEdit = async () => {
+    setEditError('');
+    setEditSaving(true);
+    try {
+      await axios.patch(`/api/employees/${employee.id}`, { name, department, supervisor });
+      onSaved();
+      onClose();
+    } catch (e) {
+      setEditError(e.response?.data?.error || 'Failed to save changes');
+    } finally {
+      setEditSaving(false);
+    }
+  };
+
+  const handleMerge = async () => {
+    if (!sourceId) return setMergeError('Select an employee to merge in');
+    setMergeError('');
+    setMerging(true);
+    try {
+      const r = await axios.post(`/api/employees/${employee.id}/merge`, { source_id: parseInt(sourceId) });
+      setMergeResult(r.data);
+      onSaved(); // refresh dashboard / parent list
+    } catch (e) {
+      setMergeError(e.response?.data?.error || 'Merge failed');
+    } finally {
+      setMerging(false);
+    }
+  };
+
+  const otherEmployees = allEmployees.filter(e => e.id !== employee.id);
+
+  return (
+    <div style={s.overlay} onClick={e => e.target === e.currentTarget && onClose()}>
+      <div style={s.modal}>
+        <div style={s.header}>
+          <div style={s.title}>Edit Employee</div>
+          <button style={s.closeBtn} onClick={onClose}>✕</button>
+        </div>
+        <div style={s.body}>
+          <div style={s.tabs}>
+            <button style={s.tab(tab === 'edit')}  onClick={() => setTab('edit')}>Edit Details</button>
+            <button style={s.tab(tab === 'merge')} onClick={() => setTab('merge')}>Merge Duplicate</button>
+          </div>
+
+          {tab === 'edit' && (
+            <>
+              {editError && <div style={s.error}>{editError}</div>}
+              <div style={s.label}>Full Name</div>
+              <input style={s.input} value={name} onChange={e => setName(e.target.value)} />
+              <div style={s.label}>Department</div>
+              <input style={s.input} value={department} onChange={e => setDepartment(e.target.value)} placeholder="Optional" />
+              <div style={s.label}>Supervisor</div>
+              <input style={s.input} value={supervisor} onChange={e => setSupervisor(e.target.value)} placeholder="Optional" />
+              <div style={s.row}>
+                <button style={s.btn('#888')} onClick={onClose}>Cancel</button>
+                <button style={s.btn('#fff', '#667eea')} onClick={handleEdit} disabled={editSaving}>
+                  {editSaving ? 'Saving…' : 'Save Changes'}
+                </button>
+              </div>
+            </>
+          )}
+
+          {tab === 'merge' && (
+            <>
+              {mergeResult ? (
+                <div style={s.success}>
+                  ✓ Merge complete — {mergeResult.violations_reassigned} violation{mergeResult.violations_reassigned !== 1 ? 's' : ''} reassigned
+                  to <strong>{employee.name}</strong>. The duplicate record has been removed.
+                </div>
+              ) : (
+                <>
+                  <div style={s.mergeWarning}>
+                    ⚠ This will reassign <strong>all violations</strong> from the selected employee into{' '}
+                    <strong>{employee.name}</strong>, then permanently delete the duplicate record.
+                    This cannot be undone.
+                  </div>
+                  {mergeError && <div style={s.error}>{mergeError}</div>}
+                  <div style={s.label}>Duplicate to merge into {employee.name}</div>
+                  <select style={s.select} value={sourceId} onChange={e => setSourceId(e.target.value)}>
+                    <option value="">— select employee —</option>
+                    {otherEmployees.map(e => (
+                      <option key={e.id} value={e.id}>{e.name}{e.department ? ` (${e.department})` : ''}</option>
+                    ))}
+                  </select>
+                  <div style={s.row}>
+                    <button style={s.btn('#888')} onClick={onClose}>Cancel</button>
+                    <button style={s.btn('#fff', '#c0392b')} onClick={handleMerge} disabled={merging || !sourceId}>
+                      {merging ? 'Merging…' : 'Merge & Delete Duplicate'}
+                    </button>
+                  </div>
+                </>
+              )}
+              {mergeResult && (
+                <div style={s.row}>
+                  <button style={s.btn('#fff', '#667eea')} onClick={onClose}>Done</button>
+                </div>
+              )}
+            </>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}

client/src/components/EmployeeModal.jsx

@@ -2,151 +2,86 @@ import React, { useState, useEffect, useCallback } from 'react';
 import axios from 'axios';
 import CpasBadge, { getTier } from './CpasBadge';
 import NegateModal from './NegateModal';
+import EditEmployeeModal from './EditEmployeeModal';
+import AmendViolationModal from './AmendViolationModal';
 
 const s = {
   overlay: {
-    position: 'fixed',
+    position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.75)',
-    inset: 0,
+    zIndex: 1000, display: 'flex', alignItems: 'flex-start', justifyContent: 'flex-end',
-    background: 'rgba(0,0,0,0.75)',
-    zIndex: 1000,
-    display: 'flex',
-    alignItems: 'flex-start',
-    justifyContent: 'flex-end',
   },
   panel: {
-    background: '#111217',
+    background: '#111217', color: '#f8f9fa', width: '680px', maxWidth: '95vw',
-    color: '#f8f9fa',
+    height: '100vh', overflowY: 'auto', boxShadow: '-4px 0 24px rgba(0,0,0,0.7)',
-    width: '680px',
+    display: 'flex', flexDirection: 'column',
-    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)',
+    background: 'linear-gradient(135deg, #000000, #151622)', color: 'white',
-    color: 'white',
+    padding: '24px 28px', position: 'sticky', top: 0, zIndex: 10,
-    padding: '24px 28px',
-    position: 'sticky',
-    top: 0,
-    zIndex: 10,
     borderBottom: '1px solid #222',
   },
+  headerRow: { display: 'flex', alignItems: 'flex-start', justifyContent: 'space-between' },
   closeBtn: {
-    float: 'right',
+    float: 'right', background: 'none', border: 'none', color: 'white',
-    background: 'none',
+    fontSize: '22px', cursor: 'pointer', lineHeight: 1, marginTop: '-2px',
-    border: 'none',
-    color: 'white',
-    fontSize: '22px',
-    cursor: 'pointer',
-    lineHeight: 1,
-    marginTop: '-2px',
   },
-  body: {
+  editEmpBtn: {
-    padding: '24px 28px',
+    background: 'none', border: '1px solid #555', color: '#ccc', borderRadius: '5px',
-    flex: 1,
+    padding: '4px 10px', fontSize: '11px', cursor: 'pointer', marginTop: '8px', fontWeight: 600,
-  },
-  scoreRow: {
-    display: 'flex',
-    gap: '12px',
-    flexWrap: 'wrap',
-    marginBottom: '24px',
   },
+  body: { padding: '24px 28px', flex: 1 },
+  scoreRow: { display: 'flex', gap: '12px', flexWrap: 'wrap', marginBottom: '24px' },
   scoreCard: {
-    flex: '1',
+    flex: '1', minWidth: '100px', background: '#181924', borderRadius: '8px',
-    minWidth: '100px',
+    padding: '14px', textAlign: 'center', border: '1px solid #2a2b3a',
-    background: '#181924',
-    borderRadius: '8px',
-    padding: '14px',
-    textAlign: 'center',
-    border: '1px solid #2a2b3a',
-  },
-  scoreNum: {
-    fontSize: '26px',
-    fontWeight: 800,
-  },
-  scoreLbl: {
-    fontSize: '11px',
-    color: '#b5b5c0',
-    marginTop: '3px',
   },
+  scoreNum: { fontSize: '26px', fontWeight: 800 },
+  scoreLbl: { fontSize: '11px', color: '#b5b5c0', marginTop: '3px' },
   sectionHd: {
-    fontSize: '13px',
+    fontSize: '13px', fontWeight: 700, color: '#f8f9fa', textTransform: 'uppercase',
-    fontWeight: 700,
+    letterSpacing: '0.5px', marginBottom: '10px', marginTop: '24px',
-    color: '#f8f9fa',
-    textTransform: 'uppercase',
-    letterSpacing: '0.5px',
-    marginBottom: '10px',
-    marginTop: '24px',
   },
   table: {
-    width: '100%',
+    width: '100%', borderCollapse: 'collapse', fontSize: '12px', background: '#181924',
-    borderCollapse: 'collapse',
+    borderRadius: '6px', overflow: 'hidden', border: '1px solid #2a2b3a',
-    fontSize: '12px',
-    background: '#181924',
-    borderRadius: '6px',
-    overflow: 'hidden',
-    border: '1px solid #2a2b3a',
   },
   th: {
-    background: '#050608',
+    background: '#050608', padding: '8px 10px', textAlign: 'left', color: '#f8f9fa',
-    padding: '8px 10px',
+    fontWeight: 600, fontSize: '11px', textTransform: 'uppercase',
-    textAlign: 'left',
-    color: '#f8f9fa',
-    fontWeight: 600,
-    fontSize: '11px',
-    textTransform: 'uppercase',
   },
   td: {
-    padding: '9px 10px',
+    padding: '9px 10px', borderBottom: '1px solid #202231',
-    borderBottom: '1px solid #202231',
+    verticalAlign: 'top', color: '#f8f9fa',
-    verticalAlign: 'top',
-    color: '#f8f9fa',
-  },
-  negatedRow: {
-    background: '#151622',
-    color: '#9ca0b8',
   },
+  negatedRow: { background: '#151622', color: '#9ca0b8' },
   actionBtn: (color) => ({
-    background: 'none',
+    background: 'none', border: `1px solid ${color}`, color,
-    border: `1px solid ${color}`,
+    borderRadius: '4px', padding: '3px 8px', fontSize: '11px',
-    color,
+    cursor: 'pointer', marginRight: '4px', fontWeight: 600,
-    borderRadius: '4px',
-    padding: '3px 8px',
-    fontSize: '11px',
-    cursor: 'pointer',
-    marginRight: '4px',
-    fontWeight: 600,
   }),
   resTag: {
-    display: 'inline-block',
+    display: 'inline-block', padding: '2px 8px', borderRadius: '10px',
-    padding: '2px 8px',
+    fontSize: '10px', fontWeight: 700, background: '#053321',
-    borderRadius: '10px',
+    color: '#9ef7c1', border: '1px solid #0f5132',
-    fontSize: '10px',
-    fontWeight: 700,
-    background: '#053321',
-    color: '#9ef7c1',
-    border: '1px solid #0f5132',
   },
   pdfBtn: {
-    background: 'none',
+    background: 'none', border: '1px solid #d4af37', color: '#ffd666',
-    border: '1px solid #d4af37',
+    borderRadius: '4px', padding: '3px 8px', fontSize: '11px',
-    color: '#ffd666',
+    cursor: 'pointer', fontWeight: 600,
-    borderRadius: '4px',
+  },
-    padding: '3px 8px',
+  amendBtn: {
-    fontSize: '11px',
+    background: 'none', border: '1px solid #4db6ac', color: '#4db6ac',
-    cursor: 'pointer',
+    borderRadius: '4px', padding: '3px 8px', fontSize: '11px',
-    fontWeight: 600,
+    cursor: 'pointer', marginRight: '4px', fontWeight: 600,
   },
   deleteConfirm: {
-    background: '#3c1114',
+    background: '#3c1114', border: '1px solid #f5c6cb', borderRadius: '6px',
-    border: '1px solid #f5c6cb',
+    padding: '12px', marginTop: '8px', fontSize: '12px', color: '#ffb3b8',
-    borderRadius: '6px',
+  },
-    padding: '12px',
+  amendBadge: {
-    marginTop: '8px',
+    display: 'inline-block', marginLeft: '4px', padding: '1px 5px', borderRadius: '8px',
-    fontSize: '12px',
+    fontSize: '9px', fontWeight: 700, background: '#0e2a2a', color: '#4db6ac',
-    color: '#ffb3b8',
+    border: '1px solid #1a4a4a', verticalAlign: 'middle',
   },
 };
 
@@ -157,6 +92,8 @@ export default function EmployeeModal({ employeeId, onClose }) {
   const [loading,    setLoading]    = useState(true);
   const [negating,   setNegating]   = useState(null);
   const [confirmDel, setConfirmDel] = useState(null);
+  const [editingEmp, setEditingEmp] = useState(false);
+  const [amending,   setAmending]   = useState(null); // violation object
 
   const load = useCallback(() => {
     setLoading(true);
@@ -174,17 +111,11 @@ export default function EmployeeModal({ employeeId, onClose }) {
       .finally(() => setLoading(false));
   }, [employeeId]);
 
-  useEffect(() => {
+  useEffect(() => { load(); }, [load]);
-    load();
-  }, [load]);
 
   const handleDownloadPdf = async (violId, empName, date) => {
-    const response = await axios.get(`/api/violations/${violId}/pdf`, {
+    const response = await axios.get(`/api/violations/${violId}/pdf`, { responseType: 'blob' });
-      responseType: 'blob',
+    const url  = window.URL.createObjectURL(new Blob([response.data], { type: 'application/pdf' }));
-    });
-    const url = window.URL.createObjectURL(
-      new Blob([response.data], { type: 'application/pdf' }),
-    );
     const link = document.createElement('a');
     link.href     = url;
     link.download = `CPAS_${(empName || '').replace(/[^a-z0-9]/gi, '_')}_${date}.pdf`;
@@ -207,11 +138,7 @@ export default function EmployeeModal({ employeeId, onClose }) {
   };
 
   const handleNegate = async ({ resolution_type, details, resolved_by }) => {
-    await axios.patch(`/api/violations/${negating.id}/negate`, {
+    await axios.patch(`/api/violations/${negating.id}/negate`, { resolution_type, details, resolved_by });
-      resolution_type,
-      details,
-      resolved_by,
-    });
     setNegating(null);
     setConfirmDel(null);
     load();
@@ -221,115 +148,73 @@ export default function EmployeeModal({ employeeId, onClose }) {
   const active  = violations.filter((v) => !v.negated);
   const negated = violations.filter((v) => v.negated);
 
-  const handleOverlayClick = (e) => {
+  const handleOverlayClick = (e) => { if (e.target === e.currentTarget) onClose(); };
-    if (e.target === e.currentTarget) onClose();
-  };
 
   return (
     <div style={s.overlay} onClick={handleOverlayClick}>
-      <div style={s.panel}>
+      <div style={s.panel} onClick={(e) => e.stopPropagation()}>
+
+        {/* ── Header ── */}
         <div style={s.header}>
-          <button style={s.closeBtn} onClick={onClose}>
+          <div style={s.headerRow}>
-            ✕
+            <div>
-          </button>
+              <div style={{ fontSize: '18px', fontWeight: 700 }}>
-          <div style={{ fontSize: '20px', fontWeight: 700 }}>
+                {employee ? employee.name : 'Employee'}
-            {loading ? 'Loading…' : employee?.name || 'Employee Profile'}
               </div>
               {employee && (
-            <div style={{ fontSize: '12px', opacity: 0.8, marginTop: '4px' }}>
+                <div style={{ fontSize: '12px', color: '#b5b5c0', marginTop: '4px' }}>
-              {[employee.department, employee.supervisor ? `Supervisor: ${employee.supervisor}` : null]
+                  {employee.department} {employee.supervisor && `· Supervisor: ${employee.supervisor}`}
-                .filter(Boolean)
-                .join(' · ')}
                 </div>
               )}
+              {employee && (
+                <button style={s.editEmpBtn} onClick={() => setEditingEmp(true)}>
+                  ✎ Edit Employee
+                </button>
+              )}
+            </div>
+            <button style={s.closeBtn} onClick={onClose}>✕</button>
+          </div>
         </div>
 
+        {/* ── Body ── */}
         <div style={s.body}>
           {loading ? (
-            <p
+            <div style={{ padding: '40px', textAlign: 'center', color: '#b5b5c0' }}>Loading…</div>
-              style={{
-                color: '#77798a',
-                textAlign: 'center',
-                paddingTop: '40px',
-              }}
-            >
-              Loading…
-            </p>
           ) : (
             <>
+              {/* Score Cards */}
+              {score && (
                 <div style={s.scoreRow}>
-                <div
+                  <div style={s.scoreCard}>
-                  style={{
+                    <div style={{ ...s.scoreNum, color: tier?.color || '#f8f9fa' }}>
-                    ...s.scoreCard,
+                      {score.active_points}
-                    borderTop: `3px solid ${tier?.color}`,
-                  }}
-                >
-                  <div
-                    style={{
-                      ...s.scoreNum,
-                      color: tier?.color,
-                    }}
-                  >
-                    {score?.active_points ?? 0}
                     </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.scoreNum}>{score.total_violations}</div>
-                  <div style={s.scoreLbl}>90-Day Violations</div>
+                    <div style={s.scoreLbl}>Total Violations</div>
                   </div>
                   <div style={s.scoreCard}>
-                  <div style={s.scoreNum}>{active.length}</div>
+                    <div style={s.scoreNum}>{score.negated_count}</div>
-                  <div style={s.scoreLbl}>Total On Record</div>
-                </div>
-                <div style={s.scoreCard}>
-                  <div
-                    style={{
-                      ...s.scoreNum,
-                      color: '#ffd666',
-                    }}
-                  >
-                    {negated.length}
-                  </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: '#181924',
-                    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: '#b5b5c0',
-                      marginLeft: '10px',
-                      fontSize: '12px',
-                    }}
-                  >
-                    Rolling 90-day window · Points expire automatically
-                  </span>
                 </div>
               )}
+              {score && <CpasBadge points={score.active_points} style={{ marginBottom: '20px' }} />}
 
+              {/* ── Active Violations ── */}
               <div style={s.sectionHd}>Active Violations</div>
               {active.length === 0 ? (
-                <p
+                <div style={{ color: '#777990', fontStyle: 'italic', fontSize: '12px' }}>
-                  style={{
-                    color: '#77798a',
-                    fontSize: '13px',
-                    fontStyle: 'italic',
-                  }}
-                >
                   No active violations on record.
-                </p>
+                </div>
               ) : (
                 <table style={s.table}>
                   <thead>
@@ -345,92 +230,58 @@ export default function EmployeeModal({ employeeId, onClose }) {
                       <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={{ fontWeight: 600 }}>
-                          <div
+                            {v.violation_name}
-                            style={{
+                            {v.amendment_count > 0 && (
-                              color: '#b5b5c0',
+                              <span style={s.amendBadge}>{v.amendment_count} edit{v.amendment_count !== 1 ? 's' : ''}</span>
-                              fontSize: '11px',
+                            )}
-                            }}
-                          >
-                            {v.category}
                           </div>
+                          <div style={{ fontSize: '10px', color: '#9ca0b8' }}>{v.category}</div>
                           {v.details && (
-                            <div
+                            <div style={{ fontSize: '10px', color: '#b5b5c0', marginTop: '2px' }}>{v.details}</div>
-                              style={{
-                                color: '#d1d3e0',
-                                fontSize: '11px',
-                                marginTop: '3px',
-                                fontStyle: 'italic',
-                              }}
-                            >
-                              {v.details}
-                            </div>
                           )}
                         </td>
-                        <td
+                        <td style={{ ...s.td, fontWeight: 700 }}>{v.points}</td>
-                          style={{
-                            ...s.td,
-                            fontWeight: 700,
-                            color: '#ff8a80',
-                          }}
-                        >
-                          {v.points}
-                        </td>
                         <td style={s.td}>
+                          <button style={s.amendBtn} onClick={(e) => { e.stopPropagation(); setAmending(v); }}>
+                            Amend
+                          </button>
                           <button
-                            style={s.actionBtn('#ffd666')}
+                            style={s.actionBtn('#ffc107')}
-                            onClick={() => setNegating(v)}
+                            onClick={(e) => { e.stopPropagation(); setNegating(v); setConfirmDel(null); }}
                           >
-                            ⊘ Negate
+                            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={() =>
+                            onClick={(e) => { e.stopPropagation(); handleDownloadPdf(v.id, employee?.name, v.incident_date); }}
-                              handleDownloadPdf(
-                                v.id,
-                                employee?.name,
-                                v.incident_date,
-                              )
-                            }
                           >
                             PDF
                           </button>
-                          <br />
+                          {confirmDel === v.id && (
-                          {confirmDel === v.id ? (
                             <div style={s.deleteConfirm}>
-                              <strong>Permanently delete?</strong> This cannot be
+                              Permanently delete? This cannot be undone.
-                              undone.
+                              <div style={{ marginTop: '8px' }}>
-                              <div
-                                style={{
-                                  marginTop: '8px',
-                                  display: 'flex',
-                                  gap: '8px',
-                                }}
-                              >
                                 <button
-                                  style={s.actionBtn('#ffb3b8')}
+                                  style={s.actionBtn('#ff4d4f')}
-                                  onClick={() => handleHardDelete(v.id)}
+                                  onClick={(e) => { e.stopPropagation(); handleHardDelete(v.id); }}
                                 >
                                   Confirm Delete
                                 </button>
                                 <button
-                                  style={s.actionBtn('#9ca0b8')}
+                                  style={s.actionBtn('#888')}
-                                  onClick={() => setConfirmDel(null)}
+                                  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>
@@ -439,9 +290,10 @@ export default function EmployeeModal({ employeeId, onClose }) {
                 </table>
               )}
 
+              {/* ── Negated / Resolved Violations ── */}
               {negated.length > 0 && (
                 <>
-                  <div style={s.sectionHd}>Negated / Resolved Violations</div>
+                  <div style={s.sectionHd}>Negated / Resolved</div>
                   <table style={s.table}>
                     <thead>
                       <tr>
@@ -457,89 +309,58 @@ export default function EmployeeModal({ employeeId, onClose }) {
                         <tr key={v.id} style={s.negatedRow}>
                           <td style={s.td}>{v.incident_date}</td>
                           <td style={s.td}>
-                            <div style={{ textDecoration: 'line-through' }}>
+                            <div style={{ fontWeight: 600 }}>{v.violation_name}</div>
-                              {v.violation_name}
+                            <div style={{ fontSize: '10px', color: '#9ca0b8' }}>{v.category}</div>
-                            </div>
-                            <div
-                              style={{
-                                fontSize: '11px',
-                                color: '#9ca0b8',
-                              }}
-                            >
-                              {v.category}
-                            </div>
-                          </td>
-                          <td
-                            style={{
-                              ...s.td,
-                              textDecoration: 'line-through',
-                              color: '#9ca0b8',
-                            }}
-                          >
-                            {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
+                              <div style={{ fontSize: '10px', color: '#b5b5c0', marginTop: '2px' }}>
-                                style={{
-                                  fontSize: '11px',
-                                  marginTop: '3px',
-                                  color: '#d1d3e0',
-                                }}
-                              >
                                 {v.resolution_details}
                               </div>
                             )}
                             {v.resolved_by && (
-                              <div
+                              <div style={{ fontSize: '10px', color: '#9ca0b8' }}>by {v.resolved_by}</div>
-                                style={{
-                                  fontSize: '10px',
-                                  color: '#9ca0b8',
-                                }}
-                              >
-                                by {v.resolved_by}
-                              </div>
                             )}
                           </td>
                           <td style={s.td}>
                             <button
-                              style={s.actionBtn('#9ef7c1')}
+                              style={s.actionBtn('#4db6ac')}
-                              onClick={() => handleRestore(v.id)}
+                              onClick={(e) => { e.stopPropagation(); handleRestore(v.id); }}
                             >
-                              ↩ Restore
+                              Restore
                             </button>
-                            {confirmDel === v.id ? (
+                            <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>
+                                Permanently delete? This cannot be undone.
-                                <div
+                                <div style={{ marginTop: '8px' }}>
-                                  style={{
-                                    marginTop: '8px',
-                                    display: 'flex',
-                                    gap: '8px',
-                                  }}
-                                >
                                   <button
-                                    style={s.actionBtn('#ffb3b8')}
+                                    style={s.actionBtn('#ff4d4f')}
-                                    onClick={() => handleHardDelete(v.id)}
+                                    onClick={(e) => { e.stopPropagation(); handleHardDelete(v.id); }}
                                   >
-                                    Confirm
+                                    Confirm Delete
                                   </button>
                                   <button
-                                    style={s.actionBtn('#9ca0b8')}
+                                    style={s.actionBtn('#888')}
-                                    onClick={() => setConfirmDel(null)}
+                                    onClick={(e) => { e.stopPropagation(); setConfirmDel(null); }}
                                   >
                                     Cancel
                                   </button>
                                 </div>
                               </div>
-                            ) : (
-                              <button
-                                style={s.actionBtn('#c0392b')}
-                                onClick={() => setConfirmDel(v.id)}
-                              >
-                                ✕ Delete
-                              </button>
                             )}
                           </td>
                         </tr>
@@ -553,6 +374,7 @@ export default function EmployeeModal({ employeeId, onClose }) {
         </div>
       </div>
 
+      {/* Modals rendered outside panel to avoid z-index nesting issues */}
       {negating && (
         <NegateModal
           violation={negating}
@@ -560,6 +382,20 @@ export default function EmployeeModal({ employeeId, onClose }) {
           onCancel={() => setNegating(null)}
         />
       )}
+      {editingEmp && employee && (
+        <EditEmployeeModal
+          employee={employee}
+          onClose={() => setEditingEmp(false)}
+          onSaved={load}
+        />
+      )}
+      {amending && (
+        <AmendViolationModal
+          violation={amending}
+          onClose={() => setAmending(null)}
+          onSaved={load}
+        />
+      )}
     </div>
   );
 }

client/src/components/NegateModal.jsx

@@ -2,111 +2,66 @@ import React, { useState } from 'react';
 
 const s = {
   overlay: {
-    position: 'fixed',
+    position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.75)',
-    inset: 0,
+    display: 'flex', alignItems: 'center', justifyContent: 'center',
-    background: 'rgba(0,0,0,0.75)',
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
     zIndex: 2000,
   },
   modal: {
-    width: '480px',
+    width: '480px', maxWidth: '95vw', background: '#111217', borderRadius: '12px',
-    maxWidth: '95vw',
+    boxShadow: '0 16px 40px rgba(0,0,0,0.8)', color: '#f8f9fa',
-    background: '#111217',
+    overflow: 'hidden', border: '1px solid #2a2b3a',
-    borderRadius: '12px',
-    boxShadow: '0 16px 40px rgba(0,0,0,0.8)',
-    color: '#f8f9fa',
-    overflow: 'hidden',
-    border: '1px solid #2a2b3a',
   },
   header: {
-    padding: '18px 24px',
+    padding: '18px 24px', borderBottom: '1px solid #222',
-    borderBottom: '1px solid #222',
     background: 'linear-gradient(135deg, #000000, #151622)',
   },
-  title: {
+  title: { fontSize: '18px', fontWeight: 700 },
-    fontSize: '18px',
+  subtitle: { fontSize: '12px', color: '#c0c2d6', marginTop: '4px' },
-    fontWeight: 700,
+  body: { padding: '18px 24px 8px 24px' },
-  },
-  subtitle: {
-    fontSize: '12px',
-    color: '#c0c2d6',
-    marginTop: '4px',
-  },
-  body: {
-    padding: '18px 24px 8px 24px',
-  },
   pill: {
-    background: '#3b2e00',
+    background: '#3b2e00', borderRadius: '6px', padding: '8px 10px',
-    borderRadius: '6px',
+    fontSize: '12px', color: '#ffd666', border: '1px solid #d4af37', marginBottom: '14px',
-    padding: '8px 10px',
-    fontSize: '12px',
-    color: '#ffd666',
-    border: '1px solid #d4af37',
-    marginBottom: '14px',
-  },
-  label: {
-    fontSize: '13px',
-    fontWeight: 600,
-    marginBottom: '4px',
-    color: '#e5e7f1',
   },
+  label: { fontSize: '13px', fontWeight: 600, marginBottom: '4px', color: '#e5e7f1' },
   input: {
-    width: '100%',
+    width: '100%', padding: '9px 10px', borderRadius: '6px',
-    padding: '9px 10px',
+    border: '1px solid #333544', background: '#050608', color: '#f8f9fa',
-    borderRadius: '6px',
+    fontSize: '13px', fontFamily: 'inherit', marginBottom: '14px',
-    border: '1px solid #333544',
+    boxSizing: 'border-box',
-    background: '#050608',
-    color: '#f8f9fa',
-    fontSize: '13px',
-    fontFamily: 'inherit',
-    marginBottom: '14px',
   },
   textarea: {
-    width: '100%',
+    width: '100%', minHeight: '80px', resize: 'vertical',
-    minHeight: '80px',
+    padding: '9px 10px', borderRadius: '6px', border: '1px solid #333544',
-    resize: 'vertical',
+    background: '#050608', color: '#f8f9fa', fontSize: '13px',
-    padding: '9px 10px',
+    fontFamily: 'inherit', marginBottom: '14px', boxSizing: 'border-box',
-    borderRadius: '6px',
-    border: '1px solid #333544',
-    background: '#050608',
-    color: '#f8f9fa',
-    fontSize: '13px',
-    fontFamily: 'inherit',
-    marginBottom: '14px',
   },
   footer: {
-    display: 'flex',
+    display: 'flex', justifyContent: 'flex-end', gap: '10px',
-    justifyContent: 'flex-end',
+    padding: '16px 24px 20px 24px', background: '#0c0d14', borderTop: '1px solid #222',
-    gap: '10px',
-    padding: '16px 24px 20px 24px',
-    background: '#0c0d14',
-    borderTop: '1px solid #222',
   },
   btnCancel: {
-    padding: '10px 20px',
+    padding: '10px 20px', borderRadius: '6px', border: '1px solid #333544',
-    borderRadius: '6px',
+    background: '#050608', color: '#f8f9fa', fontWeight: 600,
-    border: '1px solid #333544',
+    fontSize: '13px', cursor: 'pointer',
-    background: '#050608',
-    color: '#f8f9fa',
-    fontWeight: 600,
-    fontSize: '13px',
-    cursor: 'pointer',
   },
   btnConfirm: {
-    padding: '10px 22px',
+    padding: '10px 22px', borderRadius: '6px', border: 'none',
-    borderRadius: '6px',
-    border: 'none',
     background: 'linear-gradient(135deg, #d4af37 0%, #ffdf8a 100%)',
-    color: '#000',
+    color: '#000', fontWeight: 700, fontSize: '13px',
-    fontWeight: 700,
+    cursor: 'pointer', textTransform: 'uppercase',
-    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 [resolutionType, setResolutionType] = useState('Corrective Training Completed');
   const [details, setDetails] = useState('');
@@ -123,75 +78,59 @@ export default function NegateModal({ violation, onConfirm, onCancel }) {
     });
   };
 
+  // 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} onClick={handleOverlayClick}>
-      <div style={s.modal}>
+      {/* FIX: stopPropagation prevents modal clicks from bubbling to overlay */}
+      <div style={s.modal} onClick={(e) => e.stopPropagation()}>
+
         <div style={s.header}>
-          <div style={s.title}>⊘ Negate Violation Points</div>
+          <div style={s.title}>Negate Violation</div>
           <div style={s.subtitle}>
-            This will zero out the points from this incident. The record remains in the audit log.
+            Record resolution for: <strong>{violation.violation_name}</strong>
           </div>
         </div>
 
         <div style={s.body}>
           <div style={s.pill}>
-            {violation.violation_name} · {violation.points} pts · {violation.incident_date}
+            ⚠ {violation.points} pt{violation.points !== 1 ? 's' : ''} · {violation.incident_date} · {violation.category}
           </div>
 
-          <div>
+          <div style={s.label}>Resolution Type</div>
-            <div style={s.label}>Resolution Type *</div>
           <select
             style={s.input}
             value={resolutionType}
-              onChange={e => setResolutionType(e.target.value)}
+            onChange={(e) => setResolutionType(e.target.value)}
           >
-              <option>Corrective Training Completed</option>
+            {RESOLUTION_OPTIONS.map((opt) => (
-              <option>Documentation Error</option>
+              <option key={opt} value={opt}>{opt}</option>
-              <option>Policy Clarification / Exception</option>
+            ))}
-              <option>Management Discretion</option>
           </select>
-          </div>
 
-          <div>
+          <div style={s.label}>Details / Notes</div>
-            <div style={s.label}>Additional Details</div>
           <textarea
             style={s.textarea}
+            placeholder="Describe the resolution or context…"
             value={details}
-              onChange={e => setDetails(e.target.value)}
+            onChange={(e) => setDetails(e.target.value)}
-              placeholder="Briefly describe why points are being negated..."
           />
-          </div>
 
-          <div>
           <div style={s.label}>Resolved By</div>
           <input
             style={s.input}
+            placeholder="Manager or HR name…"
             value={resolvedBy}
-              onChange={e => setResolvedBy(e.target.value)}
+            onChange={(e) => setResolvedBy(e.target.value)}
-              placeholder="Supervisor or HR"
           />
         </div>
-        </div>
 
         <div style={s.footer}>
-          <button
+          <button style={s.btnCancel} onClick={onCancel}>Cancel</button>
-            type="button"
+          <button style={s.btnConfirm} onClick={handleConfirm}>Confirm Negation</button>
-            style={s.btnCancel}
-            onClick={() => onCancel && onCancel()}
-          >
-            Cancel
-          </button>
-          <button
-            type="button"
-            style={s.btnConfirm}
-            onClick={handleConfirm}
-          >
-            Confirm Negation
-          </button>
         </div>
       </div>
     </div>

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' },
+    title:    { color: '#b5b5c0', fontSize: '16px', fontWeight: 700, marginBottom: '10px' },
-    table:    { width: '100%', borderCollapse: 'collapse', fontSize: '13px' },
+    table:    { width: '100%', borderCollapse: 'collapse', fontSize: '13px', background: '#111217', borderRadius: '6px', overflow: 'hidden', border: '1px solid #222' },
-    th:       { background: '#2c3e50', color: 'white', padding: '8px 10px', textAlign: 'left' },
+    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 #dee2e6' },
+    td:       { padding: '8px 10px', borderBottom: '1px solid #1c1d29', color: '#f8f9fa', verticalAlign: 'middle' },
-    trEven:   { background: '#f8f9fa' },
+    trEven:   { background: '#111217' },
-    trOdd:    { background: 'white' },
+    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,7 +13,7 @@ db.pragma('foreign_keys = ON');
 const schema = fs.readFileSync(path.join(__dirname, 'schema.sql'), 'utf8');
 db.exec(schema);
 
-// ── Migrations for existing DBs ─────────────────────────────────────────────
+// ── 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");
@@ -30,6 +30,30 @@ db.exec(`CREATE TABLE IF NOT EXISTS violation_resolutions (
     created_at      DATETIME DEFAULT CURRENT_TIMESTAMP
 )`);
 
+// ── Feature: Violation Amendments ────────────────────────────────────────────
+// Stores a field-level diff every time a violation's editable fields are changed.
+db.exec(`CREATE TABLE IF NOT EXISTS violation_amendments (
+    id           INTEGER PRIMARY KEY AUTOINCREMENT,
+    violation_id INTEGER NOT NULL REFERENCES violations(id) ON DELETE CASCADE,
+    changed_by   TEXT,
+    field_name   TEXT    NOT NULL,
+    old_value    TEXT,
+    new_value    TEXT,
+    created_at   DATETIME DEFAULT CURRENT_TIMESTAMP
+)`);
+
+// ── Feature: Audit Log ───────────────────────────────────────────────────────
+// Append-only record of every write action across the system.
+db.exec(`CREATE TABLE IF NOT EXISTS audit_log (
+    id           INTEGER PRIMARY KEY AUTOINCREMENT,
+    action       TEXT    NOT NULL,
+    entity_type  TEXT    NOT NULL,
+    entity_id    INTEGER,
+    performed_by TEXT,
+    details      TEXT,
+    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

pdf/generator.js

@@ -30,18 +30,12 @@ async function generatePdf(violation, score) {
             format:              'Letter',
             printBackground:     true,
             margin: {
-                top:    '0.6in',
+                top:    '0.35in',
-                bottom: '0.7in',
+                bottom: '0.35in',
-                left:   '0.75in',
+                left:   '0.4in',
-                right:  '0.75in',
+                right:  '0.4in',
             },
-            displayHeaderFooter: true,
+            displayHeaderFooter: false,
-            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>`,
         });
 
         return pdf;

server.js

@@ -11,10 +11,23 @@ app.use(cors());
 app.use(express.json());
 app.use(express.static(path.join(__dirname, 'client', 'dist')));
 
+// ── Audit helper ─────────────────────────────────────────────────────────────
+function audit(action, entityType, entityId, performedBy, details) {
+  try {
+    db.prepare(`
+      INSERT INTO audit_log (action, entity_type, entity_id, performed_by, details)
+      VALUES (?, ?, ?, ?, ?)
+    `).run(action, entityType, entityId || null, performedBy || null,
+      typeof details === 'object' ? JSON.stringify(details) : (details || null));
+  } catch (e) {
+    console.error('[AUDIT]', e.message);
+  }
+}
+
 // 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);
@@ -33,9 +46,72 @@ app.post('/api/employees', (req, res) => {
   }
   const result = db.prepare('INSERT INTO employees (name, department, supervisor) VALUES (?, ?, ?)')
     .run(name, department || null, supervisor || null);
+  audit('employee_created', 'employee', result.lastInsertRowid, null, { name });
   res.status(201).json({ id: result.lastInsertRowid, name, department, supervisor });
 });
 
+// ── Employee Edit ─────────────────────────────────────────────────────────────
+// PATCH /api/employees/:id  — update name, department, or supervisor
+app.patch('/api/employees/:id', (req, res) => {
+  const id  = parseInt(req.params.id);
+  const emp = db.prepare('SELECT * FROM employees WHERE id = ?').get(id);
+  if (!emp) return res.status(404).json({ error: 'Employee not found' });
+
+  const { name, department, supervisor, performed_by } = req.body;
+
+  // Prevent name collision with a different employee
+  if (name && name.trim() !== emp.name) {
+    const clash = db.prepare('SELECT id FROM employees WHERE LOWER(name) = LOWER(?) AND id != ?').get(name.trim(), id);
+    if (clash) return res.status(409).json({ error: 'An employee with that name already exists', conflictId: clash.id });
+  }
+
+  const newName       = (name       || emp.name).trim();
+  const newDept       = department  !== undefined ? (department  || null) : emp.department;
+  const newSupervisor = supervisor  !== undefined ? (supervisor  || null) : emp.supervisor;
+
+  db.prepare('UPDATE employees SET name = ?, department = ?, supervisor = ? WHERE id = ?')
+    .run(newName, newDept, newSupervisor, id);
+
+  audit('employee_edited', 'employee', id, performed_by, {
+    before: { name: emp.name, department: emp.department, supervisor: emp.supervisor },
+    after:  { name: newName,  department: newDept,        supervisor: newSupervisor  },
+  });
+
+  res.json({ id, name: newName, department: newDept, supervisor: newSupervisor });
+});
+
+// ── Employee Merge ────────────────────────────────────────────────────────────
+// POST /api/employees/:id/merge  — reassign all violations from sourceId → id, then delete source
+app.post('/api/employees/:id/merge', (req, res) => {
+  const targetId = parseInt(req.params.id);
+  const { source_id, performed_by } = req.body;
+  if (!source_id) return res.status(400).json({ error: 'source_id is required' });
+
+  const target = db.prepare('SELECT * FROM employees WHERE id = ?').get(targetId);
+  const source = db.prepare('SELECT * FROM employees WHERE id = ?').get(source_id);
+  if (!target) return res.status(404).json({ error: 'Target employee not found' });
+  if (!source) return res.status(404).json({ error: 'Source employee not found' });
+  if (targetId === parseInt(source_id)) return res.status(400).json({ error: 'Cannot merge an employee into themselves' });
+
+  const mergeTransaction = db.transaction(() => {
+    // Move all violations
+    const moved = db.prepare('UPDATE violations SET employee_id = ? WHERE employee_id = ?').run(targetId, source_id);
+    // Delete the source employee
+    db.prepare('DELETE FROM employees WHERE id = ?').run(source_id);
+    return moved.changes;
+  });
+
+  const violationsMoved = mergeTransaction();
+
+  audit('employee_merged', 'employee', targetId, performed_by, {
+    source: { id: source.id, name: source.name },
+    target: { id: target.id, name: target.name },
+    violations_reassigned: violationsMoved,
+  });
+
+  res.json({ success: true, violations_reassigned: violationsMoved });
+});
+
 // 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);
@@ -55,12 +131,13 @@ app.get('/api/dashboard', (req, res) => {
   res.json(rows);
 });
 
-// Violation history (per employee) with resolutions
+// Violation history (per employee) with resolutions + amendment count
 app.get('/api/violations/employee/:id', (req, res) => {
   const limit = parseInt(req.query.limit) || 50;
   const rows  = db.prepare(`
     SELECT v.*, r.resolution_type, r.details AS resolution_details,
-           r.resolved_by, r.created_at AS resolved_at
+           r.resolved_by, r.created_at AS resolved_at,
+           (SELECT COUNT(*) FROM violation_amendments a WHERE a.violation_id = v.id) AS amendment_count
     FROM violations v
     LEFT JOIN violation_resolutions r ON r.violation_id = v.id
     WHERE v.employee_id = ?
@@ -70,7 +147,15 @@ app.get('/api/violations/employee/:id', (req, res) => {
   res.json(rows);
 });
 
-// NEW helper: compute prior_active_points at time of insert (excluding this violation)
+// ── Violation amendment history ───────────────────────────────────────────────
+app.get('/api/violations/:id/amendments', (req, res) => {
+  const rows = db.prepare(`
+    SELECT * FROM violation_amendments WHERE violation_id = ? ORDER BY created_at DESC
+  `).all(req.params.id);
+  res.json(rows);
+});
+
+// Helper: compute prior_active_points at time of insert
 function getPriorActivePoints(employeeId, incidentDate) {
   const row = db.prepare(
     `SELECT COALESCE(SUM(points),0) AS pts
@@ -113,12 +198,138 @@ app.post('/api/violations', (req, res) => {
     priorPts
   );
 
+  audit('violation_created', 'violation', result.lastInsertRowid, submitted_by, {
+    employee_id, violation_type, points: ptsInt, incident_date,
+  });
+
   res.status(201).json({ id: result.lastInsertRowid });
 });
 
-// Negate / restore / delete endpoints unchanged ...
+// ── Violation Amendment (edit) ────────────────────────────────────────────────
+// PATCH /api/violations/:id/amend — edit mutable fields; logs a diff per changed field
+const AMENDABLE_FIELDS = ['incident_time', 'location', 'details', 'submitted_by', 'witness_name'];
 
-// PDF endpoint — use stored prior_active_points snapshot
+app.patch('/api/violations/:id/amend', (req, res) => {
+  const id        = parseInt(req.params.id);
+  const { changed_by, ...updates } = req.body;
+
+  const violation = db.prepare('SELECT * FROM violations WHERE id = ?').get(id);
+  if (!violation) return res.status(404).json({ error: 'Violation not found' });
+  if (violation.negated) return res.status(400).json({ error: 'Cannot amend a negated violation' });
+
+  // Only allow whitelisted fields to be amended
+  const allowed = Object.fromEntries(
+    Object.entries(updates).filter(([k]) => AMENDABLE_FIELDS.includes(k))
+  );
+  if (Object.keys(allowed).length === 0) {
+    return res.status(400).json({ error: 'No amendable fields provided', amendable: AMENDABLE_FIELDS });
+  }
+
+  const amendTransaction = db.transaction(() => {
+    // Build UPDATE
+    const setClauses = Object.keys(allowed).map(k => `${k} = ?`).join(', ');
+    const values     = [...Object.values(allowed), id];
+    db.prepare(`UPDATE violations SET ${setClauses} WHERE id = ?`).run(...values);
+
+    // Insert an amendment record per changed field
+    const insertAmendment = db.prepare(`
+      INSERT INTO violation_amendments (violation_id, changed_by, field_name, old_value, new_value)
+      VALUES (?, ?, ?, ?, ?)
+    `);
+    for (const [field, newVal] of Object.entries(allowed)) {
+      const oldVal = violation[field];
+      if (String(oldVal) !== String(newVal)) {
+        insertAmendment.run(id, changed_by || null, field, oldVal ?? null, newVal ?? null);
+      }
+    }
+  });
+
+  amendTransaction();
+
+  audit('violation_amended', 'violation', id, changed_by, { fields: Object.keys(allowed) });
+
+  const updated = db.prepare('SELECT * FROM violations WHERE id = ?').get(id);
+  res.json(updated);
+});
+
+// ── Negate a violation ────────────────────────────────────────────────────────
+app.patch('/api/violations/:id/negate', (req, res) => {
+  const { resolution_type, details, resolved_by } = req.body;
+  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 = 1 WHERE id = ?').run(id);
+
+  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(id, resolution_type || 'Resolved', details || null, resolved_by || null);
+  }
+
+  audit('violation_negated', 'violation', id, resolved_by, { resolution_type });
+  res.json({ success: true });
+});
+
+// ── Restore a negated violation ───────────────────────────────────────────────
+app.patch('/api/violations/:id/restore', (req, res) => {
+  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 WHERE id = ?').run(id);
+  db.prepare('DELETE FROM violation_resolutions WHERE violation_id = ?').run(id);
+
+  audit('violation_restored', 'violation', id, req.body?.performed_by, {});
+  res.json({ success: true });
+});
+
+// ── Hard delete a violation ───────────────────────────────────────────────────
+app.delete('/api/violations/:id', (req, res) => {
+  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(id);
+  db.prepare('DELETE FROM violations WHERE id = ?').run(id);
+
+  audit('violation_deleted', 'violation', id, req.body?.performed_by, {
+    violation_type: violation.violation_type, employee_id: violation.employee_id,
+  });
+  res.json({ success: true });
+});
+
+// ── Audit log ─────────────────────────────────────────────────────────────────
+app.get('/api/audit', (req, res) => {
+  const limit  = Math.min(parseInt(req.query.limit)  || 100, 500);
+  const offset = parseInt(req.query.offset) || 0;
+  const type   = req.query.entity_type;
+  const id     = req.query.entity_id;
+
+  let sql    = 'SELECT * FROM audit_log';
+  const args = [];
+  const where = [];
+  if (type) { where.push('entity_type = ?'); args.push(type); }
+  if (id)   { where.push('entity_id = ?');   args.push(id); }
+  if (where.length) sql += ' WHERE ' + where.join(' AND ');
+  sql += ' ORDER BY created_at DESC LIMIT ? OFFSET ?';
+  args.push(limit, offset);
+
+  res.json(db.prepare(sql).all(...args));
+});
+
+// ── PDF endpoint ──────────────────────────────────────────────────────────────
 app.get('/api/violations/:id/pdf', async (req, res) => {
   try {
     const violation = db.prepare(`
@@ -130,13 +341,11 @@ app.get('/api/violations/:id/pdf', async (req, res) => {
 
     if (!violation) return res.status(404).json({ error: 'Violation not found' });
 
-    // For PDF, compute score row but pass stored prior_active_points so math is stable
     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,
-      // snapshot at time of violation (if present); fall back to current
       active_points:   violation.prior_active_points != null ? violation.prior_active_points : active.active_points,
       violation_count: active.violation_count,
     };