fix: improvedr pair status sharing.

- pair_devices.html template for device pairing interface
- SLMM device control lock prevents flooding nl43.
Fix:
- Polling intervals for SLMM.
- modem view now list
- device pairing much improved.
- various other tweaks through out UI.
- SLMM Scheduled downloads fixed.

CHANGELOG.md

@@ -1,10 +1,31 @@
 # Changelog
 
-All notable changes to Seismo Fleet Manager will be documented in this file.
+All notable changes to Terra-View will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.1] - 2026-01-27
+
+### Added
+- **Dashboard Schedule View**: Today's scheduled actions now display directly on the main dashboard
+  - New "Today's Actions" panel showing upcoming and past scheduled events
+  - Schedule list partial for project-specific schedule views
+  - API endpoint for fetching today's schedule data
+- **New Branding Assets**: Complete logo rework for Terra-View
+  - New Terra-View logos for light and dark themes
+  - Retina-ready (@2x) logo variants
+  - Updated favicons (16px and 32px)
+  - Refreshed PWA icons (72px through 512px)
+
+### Changed
+- **Dashboard Layout**: Reorganized to include schedule information panel
+- **Base Template**: Updated to use new Terra-View logos with theme-aware switching
+
+## [0.5.0] - 2026-01-23
+
+_Note: This version was not formally released; changes were included in v0.5.1._
+
 ## [0.4.4] - 2026-01-23
 
 ### Added
@@ -378,6 +399,8 @@ No database migration required for v0.4.0. All new features use existing databas
 - Photo management per unit
 - Automated status categorization (OK/Pending/Missing)
 
+[0.5.1]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.5.0...v0.5.1
+[0.5.0]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.4.4...v0.5.0
 [0.4.4]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.4.3...v0.4.4
 [0.4.3]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.4.1...v0.4.2

README.md

@@ -1,4 +1,4 @@
-# Seismo Fleet Manager v0.4.4
+# Terra-View v0.5.1
 Backend API and HTMX-powered web interface for managing a mixed fleet of seismographs and field modems. Track deployments, monitor health in real time, merge roster intent with incoming telemetry, and control your fleet through a unified database and dashboard.
 
 ## Features
@@ -571,9 +571,11 @@ MIT
 
 ## Version
 
-**Current: 0.4.4** — Recurring schedules, alerting UI, report templates + RND viewer, and SLM workflow polish (2026-01-23)
+**Current: 0.5.1** — Dashboard schedule view with today's actions panel, new Terra-View branding and logo rework (2026-01-27)
 
-Previous: 0.4.3 — SLM roster/project view refresh, project insight panels, FTP browser folder downloads, and SLMM sync (2026-01-14)
+Previous: 0.4.4 — Recurring schedules, alerting UI, report templates + RND viewer, and SLM workflow polish (2026-01-23)
+
+0.4.3 — SLM roster/project view refresh, project insight panels, FTP browser folder downloads, and SLMM sync (2026-01-14)
 
 0.4.2 — SLM configuration interface with TCP/FTP controls, modem diagnostics, and dashboard endpoints for Sound Level Meters (2026-01-05)
 

backend/main.py

@@ -18,9 +18,10 @@ logging.basicConfig(
 logger = logging.getLogger(__name__)
 
 from backend.database import engine, Base, get_db
-from backend.routers import roster, units, photos, roster_edit, roster_rename, dashboard, dashboard_tabs, activity, slmm, slm_ui, slm_dashboard, seismo_dashboard, projects, project_locations, scheduler
+from backend.routers import roster, units, photos, roster_edit, roster_rename, dashboard, dashboard_tabs, activity, slmm, slm_ui, slm_dashboard, seismo_dashboard, projects, project_locations, scheduler, modem_dashboard
 from backend.services.snapshot import emit_status_snapshot
 from backend.models import IgnoredUnit
+from backend.utils.timezone import get_user_timezone
 
 # Create database tables
 Base.metadata.create_all(bind=engine)
@@ -29,7 +30,7 @@ Base.metadata.create_all(bind=engine)
 ENVIRONMENT = os.getenv("ENVIRONMENT", "production")
 
 # Initialize FastAPI app
-VERSION = "0.4.3"
+VERSION = "0.5.1"
 app = FastAPI(
     title="Seismo Fleet Manager",
     description="Backend API for managing seismograph fleet status",
@@ -92,6 +93,7 @@ app.include_router(slmm.router)
 app.include_router(slm_ui.router)
 app.include_router(slm_dashboard.router)
 app.include_router(seismo_dashboard.router)
+app.include_router(modem_dashboard.router)
 
 from backend.routers import settings
 app.include_router(settings.router)
@@ -216,6 +218,73 @@ async def seismographs_page(request: Request):
     return templates.TemplateResponse("seismographs.html", {"request": request})
 
 
+@app.get("/modems", response_class=HTMLResponse)
+async def modems_page(request: Request):
+    """Field modems management dashboard"""
+    return templates.TemplateResponse("modems.html", {"request": request})
+
+
+@app.get("/pair-devices", response_class=HTMLResponse)
+async def pair_devices_page(request: Request, db: Session = Depends(get_db)):
+    """
+    Device pairing page - two-column layout for pairing recorders with modems.
+    """
+    from backend.models import RosterUnit
+
+    # Get all non-retired recorders (seismographs and SLMs)
+    recorders = db.query(RosterUnit).filter(
+        RosterUnit.retired == False,
+        RosterUnit.device_type.in_(["seismograph", "slm", None])  # None defaults to seismograph
+    ).order_by(RosterUnit.id).all()
+
+    # Get all non-retired modems
+    modems = db.query(RosterUnit).filter(
+        RosterUnit.retired == False,
+        RosterUnit.device_type == "modem"
+    ).order_by(RosterUnit.id).all()
+
+    # Build existing pairings list
+    pairings = []
+    for recorder in recorders:
+        if recorder.deployed_with_modem_id:
+            modem = next((m for m in modems if m.id == recorder.deployed_with_modem_id), None)
+            pairings.append({
+                "recorder_id": recorder.id,
+                "recorder_type": (recorder.device_type or "seismograph").upper(),
+                "modem_id": recorder.deployed_with_modem_id,
+                "modem_ip": modem.ip_address if modem else None
+            })
+
+    # Convert to dicts for template
+    recorders_data = [
+        {
+            "id": r.id,
+            "device_type": r.device_type or "seismograph",
+            "deployed": r.deployed,
+            "deployed_with_modem_id": r.deployed_with_modem_id
+        }
+        for r in recorders
+    ]
+
+    modems_data = [
+        {
+            "id": m.id,
+            "deployed": m.deployed,
+            "deployed_with_unit_id": m.deployed_with_unit_id,
+            "ip_address": m.ip_address,
+            "phone_number": m.phone_number
+        }
+        for m in modems
+    ]
+
+    return templates.TemplateResponse("pair_devices.html", {
+        "request": request,
+        "recorders": recorders_data,
+        "modems": modems_data,
+        "pairings": pairings
+    })
+
+
 @app.get("/projects", response_class=HTMLResponse)
 async def projects_page(request: Request):
     """Projects management and overview"""
@@ -580,6 +649,7 @@ async def devices_all_partial(request: Request):
             "last_calibrated": unit_data.get("last_calibrated"),
             "next_calibration_due": unit_data.get("next_calibration_due"),
             "deployed_with_modem_id": unit_data.get("deployed_with_modem_id"),
+            "deployed_with_unit_id": unit_data.get("deployed_with_unit_id"),
             "ip_address": unit_data.get("ip_address"),
             "phone_number": unit_data.get("phone_number"),
             "hardware_model": unit_data.get("hardware_model"),
@@ -603,6 +673,7 @@ async def devices_all_partial(request: Request):
             "last_calibrated": unit_data.get("last_calibrated"),
             "next_calibration_due": unit_data.get("next_calibration_due"),
             "deployed_with_modem_id": unit_data.get("deployed_with_modem_id"),
+            "deployed_with_unit_id": unit_data.get("deployed_with_unit_id"),
             "ip_address": unit_data.get("ip_address"),
             "phone_number": unit_data.get("phone_number"),
             "hardware_model": unit_data.get("hardware_model"),
@@ -626,6 +697,7 @@ async def devices_all_partial(request: Request):
             "last_calibrated": unit_data.get("last_calibrated"),
             "next_calibration_due": unit_data.get("next_calibration_due"),
             "deployed_with_modem_id": unit_data.get("deployed_with_modem_id"),
+            "deployed_with_unit_id": unit_data.get("deployed_with_unit_id"),
             "ip_address": unit_data.get("ip_address"),
             "phone_number": unit_data.get("phone_number"),
             "hardware_model": unit_data.get("hardware_model"),
@@ -649,6 +721,7 @@ async def devices_all_partial(request: Request):
             "last_calibrated": None,
             "next_calibration_due": None,
             "deployed_with_modem_id": None,
+            "deployed_with_unit_id": None,
             "ip_address": None,
             "phone_number": None,
             "hardware_model": None,
@@ -671,7 +744,8 @@ async def devices_all_partial(request: Request):
     return templates.TemplateResponse("partials/devices_table.html", {
         "request": request,
         "units": units_list,
-        "timestamp": datetime.now().strftime("%H:%M:%S")
+        "timestamp": datetime.now().strftime("%H:%M:%S"),
+        "user_timezone": get_user_timezone()
     })
 
 

backend/migrate_add_deployment_type.py

@@ -0,0 +1,84 @@
+"""
+Migration script to add deployment_type and deployed_with_unit_id fields to roster table.
+
+deployment_type: tracks what type of device a modem is deployed with:
+- "seismograph" - Modem is connected to a seismograph
+- "slm" - Modem is connected to a sound level meter
+- NULL/empty - Not assigned or unknown
+
+deployed_with_unit_id: stores the ID of the seismograph/SLM this modem is deployed with
+(reverse relationship of deployed_with_modem_id)
+
+Run this script once to migrate an existing database.
+"""
+
+import sqlite3
+import os
+
+# Database path
+DB_PATH = "./data/seismo_fleet.db"
+
+
+def migrate_database():
+    """Add deployment_type and deployed_with_unit_id columns to roster table"""
+
+    if not os.path.exists(DB_PATH):
+        print(f"Database not found at {DB_PATH}")
+        print("The database will be created automatically when you run the application.")
+        return
+
+    print(f"Migrating database: {DB_PATH}")
+
+    conn = sqlite3.connect(DB_PATH)
+    cursor = conn.cursor()
+
+    # Check if roster table exists
+    cursor.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='roster'")
+    table_exists = cursor.fetchone()
+
+    if not table_exists:
+        print("Roster table does not exist yet - will be created when app runs")
+        conn.close()
+        return
+
+    # Check existing columns
+    cursor.execute("PRAGMA table_info(roster)")
+    columns = [col[1] for col in cursor.fetchall()]
+
+    try:
+        # Add deployment_type if not exists
+        if 'deployment_type' not in columns:
+            print("Adding deployment_type column to roster table...")
+            cursor.execute("ALTER TABLE roster ADD COLUMN deployment_type TEXT")
+            print("  Added deployment_type column")
+
+            cursor.execute("CREATE INDEX IF NOT EXISTS ix_roster_deployment_type ON roster(deployment_type)")
+            print("  Created index on deployment_type")
+        else:
+            print("deployment_type column already exists")
+
+        # Add deployed_with_unit_id if not exists
+        if 'deployed_with_unit_id' not in columns:
+            print("Adding deployed_with_unit_id column to roster table...")
+            cursor.execute("ALTER TABLE roster ADD COLUMN deployed_with_unit_id TEXT")
+            print("  Added deployed_with_unit_id column")
+
+            cursor.execute("CREATE INDEX IF NOT EXISTS ix_roster_deployed_with_unit_id ON roster(deployed_with_unit_id)")
+            print("  Created index on deployed_with_unit_id")
+        else:
+            print("deployed_with_unit_id column already exists")
+
+        conn.commit()
+        print("\nMigration completed successfully!")
+
+    except sqlite3.Error as e:
+        print(f"\nError during migration: {e}")
+        conn.rollback()
+        raise
+
+    finally:
+        conn.close()
+
+
+if __name__ == "__main__":
+    migrate_database()

backend/migrate_add_project_number.py

@@ -0,0 +1,80 @@
+"""
+Migration script to add project_number field to projects table.
+
+This adds a new column for TMI internal project numbering:
+- Format: xxxx-YY (e.g., "2567-23")
+- xxxx = incremental project number
+- YY = year project was started
+
+Combined with client_name and name (project/site name), this enables
+smart searching across all project identifiers.
+
+Run this script once to migrate an existing database.
+"""
+
+import sqlite3
+import os
+
+# Database path
+DB_PATH = "./data/seismo_fleet.db"
+
+
+def migrate_database():
+    """Add project_number column to projects table"""
+
+    if not os.path.exists(DB_PATH):
+        print(f"Database not found at {DB_PATH}")
+        print("The database will be created automatically when you run the application.")
+        return
+
+    print(f"Migrating database: {DB_PATH}")
+
+    conn = sqlite3.connect(DB_PATH)
+    cursor = conn.cursor()
+
+    # Check if projects table exists
+    cursor.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='projects'")
+    table_exists = cursor.fetchone()
+
+    if not table_exists:
+        print("Projects table does not exist yet - will be created when app runs")
+        conn.close()
+        return
+
+    # Check if project_number column already exists
+    cursor.execute("PRAGMA table_info(projects)")
+    columns = [col[1] for col in cursor.fetchall()]
+
+    if 'project_number' in columns:
+        print("Migration already applied - project_number column exists")
+        conn.close()
+        return
+
+    print("Adding project_number column to projects table...")
+
+    try:
+        cursor.execute("ALTER TABLE projects ADD COLUMN project_number TEXT")
+        print("  Added project_number column")
+
+        # Create index for faster searching
+        cursor.execute("CREATE INDEX IF NOT EXISTS ix_projects_project_number ON projects(project_number)")
+        print("  Created index on project_number")
+
+        # Also add index on client_name if it doesn't exist
+        cursor.execute("CREATE INDEX IF NOT EXISTS ix_projects_client_name ON projects(client_name)")
+        print("  Created index on client_name")
+
+        conn.commit()
+        print("\nMigration completed successfully!")
+
+    except sqlite3.Error as e:
+        print(f"\nError during migration: {e}")
+        conn.rollback()
+        raise
+
+    finally:
+        conn.close()
+
+
+if __name__ == "__main__":
+    migrate_database()

backend/models.py

@@ -50,6 +50,8 @@ class RosterUnit(Base):
     ip_address = Column(String, nullable=True)
     phone_number = Column(String, nullable=True)
     hardware_model = Column(String, nullable=True)
+    deployment_type = Column(String, nullable=True)  # "seismograph" | "slm" - what type of device this modem is deployed with
+    deployed_with_unit_id = Column(String, nullable=True)  # ID of seismograph/SLM this modem is deployed with
 
     # Sound Level Meter-specific fields (nullable for seismographs and modems)
     slm_host = Column(String, nullable=True)  # Device IP or hostname
@@ -137,17 +139,26 @@ class Project(Base):
     """
     Projects: top-level organization for monitoring work.
     Type-aware to enable/disable features based on project_type_id.
+
+    Project naming convention:
+    - project_number: TMI internal ID format xxxx-YY (e.g., "2567-23")
+    - client_name: Client/contractor name (e.g., "PJ Dick")
+    - name: Project/site name (e.g., "RKM Hall", "CMU Campus")
+
+    Display format: "2567-23 - PJ Dick - RKM Hall"
+    Users can search by any of these fields.
     """
     __tablename__ = "projects"
 
     id = Column(String, primary_key=True, index=True)  # UUID
-    name = Column(String, nullable=False, unique=True)
+    project_number = Column(String, nullable=True, index=True)  # TMI ID: xxxx-YY format (e.g., "2567-23")
+    name = Column(String, nullable=False, unique=True)  # Project/site name (e.g., "RKM Hall")
     description = Column(Text, nullable=True)
     project_type_id = Column(String, nullable=False)  # FK to ProjectType.id
     status = Column(String, default="active")  # active, completed, archived
 
     # Project metadata
-    client_name = Column(String, nullable=True)
+    client_name = Column(String, nullable=True, index=True)  # Client name (e.g., "PJ Dick")
     site_address = Column(String, nullable=True)
     site_coordinates = Column(String, nullable=True)  # "lat,lon"
     start_date = Column(Date, nullable=True)

backend/routers/modem_dashboard.py

@@ -0,0 +1,286 @@
+"""
+Modem Dashboard Router
+
+Provides API endpoints for the Field Modems management page.
+"""
+
+from fastapi import APIRouter, Request, Depends, Query
+from fastapi.responses import HTMLResponse
+from sqlalchemy.orm import Session
+from datetime import datetime
+import subprocess
+import time
+import logging
+
+from backend.database import get_db
+from backend.models import RosterUnit
+from backend.templates_config import templates
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter(prefix="/api/modem-dashboard", tags=["modem-dashboard"])
+
+
+@router.get("/stats", response_class=HTMLResponse)
+async def get_modem_stats(request: Request, db: Session = Depends(get_db)):
+    """
+    Get summary statistics for modem dashboard.
+    Returns HTML partial with stat cards.
+    """
+    # Query all modems
+    all_modems = db.query(RosterUnit).filter_by(device_type="modem").all()
+
+    # Get IDs of modems that have devices paired to them
+    paired_modem_ids = set()
+    devices_with_modems = db.query(RosterUnit).filter(
+        RosterUnit.deployed_with_modem_id.isnot(None),
+        RosterUnit.retired == False
+    ).all()
+    for device in devices_with_modems:
+        if device.deployed_with_modem_id:
+            paired_modem_ids.add(device.deployed_with_modem_id)
+
+    # Count categories
+    total_count = len(all_modems)
+    retired_count = sum(1 for m in all_modems if m.retired)
+
+    # In use = deployed AND paired with a device
+    in_use_count = sum(1 for m in all_modems
+                       if m.deployed and not m.retired and m.id in paired_modem_ids)
+
+    # Spare = deployed but NOT paired (available for assignment)
+    spare_count = sum(1 for m in all_modems
+                      if m.deployed and not m.retired and m.id not in paired_modem_ids)
+
+    # Benched = not deployed and not retired
+    benched_count = sum(1 for m in all_modems if not m.deployed and not m.retired)
+
+    return templates.TemplateResponse("partials/modem_stats.html", {
+        "request": request,
+        "total_count": total_count,
+        "in_use_count": in_use_count,
+        "spare_count": spare_count,
+        "benched_count": benched_count,
+        "retired_count": retired_count
+    })
+
+
+@router.get("/units", response_class=HTMLResponse)
+async def get_modem_units(
+    request: Request,
+    db: Session = Depends(get_db),
+    search: str = Query(None),
+    filter_status: str = Query(None),  # "in_use", "spare", "benched", "retired"
+):
+    """
+    Get list of modem units for the dashboard.
+    Returns HTML partial with modem cards.
+    """
+    query = db.query(RosterUnit).filter_by(device_type="modem")
+
+    # Filter by search term if provided
+    if search:
+        search_term = f"%{search}%"
+        query = query.filter(
+            (RosterUnit.id.ilike(search_term)) |
+            (RosterUnit.ip_address.ilike(search_term)) |
+            (RosterUnit.hardware_model.ilike(search_term)) |
+            (RosterUnit.phone_number.ilike(search_term)) |
+            (RosterUnit.location.ilike(search_term))
+        )
+
+    modems = query.order_by(
+        RosterUnit.retired.asc(),
+        RosterUnit.deployed.desc(),
+        RosterUnit.id.asc()
+    ).all()
+
+    # Get paired device info for each modem
+    paired_devices = {}
+    devices_with_modems = db.query(RosterUnit).filter(
+        RosterUnit.deployed_with_modem_id.isnot(None),
+        RosterUnit.retired == False
+    ).all()
+    for device in devices_with_modems:
+        if device.deployed_with_modem_id:
+            paired_devices[device.deployed_with_modem_id] = {
+                "id": device.id,
+                "device_type": device.device_type,
+                "deployed": device.deployed
+            }
+
+    # Annotate modems with paired device info
+    modem_list = []
+    for modem in modems:
+        paired = paired_devices.get(modem.id)
+
+        # Determine status category
+        if modem.retired:
+            status = "retired"
+        elif not modem.deployed:
+            status = "benched"
+        elif paired:
+            status = "in_use"
+        else:
+            status = "spare"
+
+        # Apply filter if specified
+        if filter_status and status != filter_status:
+            continue
+
+        modem_list.append({
+            "id": modem.id,
+            "ip_address": modem.ip_address,
+            "phone_number": modem.phone_number,
+            "hardware_model": modem.hardware_model,
+            "deployed": modem.deployed,
+            "retired": modem.retired,
+            "location": modem.location,
+            "project_id": modem.project_id,
+            "paired_device": paired,
+            "status": status
+        })
+
+    return templates.TemplateResponse("partials/modem_list.html", {
+        "request": request,
+        "modems": modem_list
+    })
+
+
+@router.get("/{modem_id}/paired-device")
+async def get_paired_device(modem_id: str, db: Session = Depends(get_db)):
+    """
+    Get the device (SLM/seismograph) that is paired with this modem.
+    Returns JSON with device info or null if not paired.
+    """
+    # Check modem exists
+    modem = db.query(RosterUnit).filter_by(id=modem_id, device_type="modem").first()
+    if not modem:
+        return {"status": "error", "detail": f"Modem {modem_id} not found"}
+
+    # Find device paired with this modem
+    device = db.query(RosterUnit).filter(
+        RosterUnit.deployed_with_modem_id == modem_id,
+        RosterUnit.retired == False
+    ).first()
+
+    if device:
+        return {
+            "paired": True,
+            "device": {
+                "id": device.id,
+                "device_type": device.device_type,
+                "deployed": device.deployed,
+                "project_id": device.project_id,
+                "location": device.location or device.address
+            }
+        }
+
+    return {"paired": False, "device": None}
+
+
+@router.get("/{modem_id}/paired-device-html", response_class=HTMLResponse)
+async def get_paired_device_html(modem_id: str, request: Request, db: Session = Depends(get_db)):
+    """
+    Get HTML partial showing the device paired with this modem.
+    Used by unit_detail.html for modems.
+    """
+    # Check modem exists
+    modem = db.query(RosterUnit).filter_by(id=modem_id, device_type="modem").first()
+    if not modem:
+        return HTMLResponse('<p class="text-red-500">Modem not found</p>')
+
+    # Find device paired with this modem
+    device = db.query(RosterUnit).filter(
+        RosterUnit.deployed_with_modem_id == modem_id,
+        RosterUnit.retired == False
+    ).first()
+
+    return templates.TemplateResponse("partials/modem_paired_device.html", {
+        "request": request,
+        "modem_id": modem_id,
+        "device": device
+    })
+
+
+@router.get("/{modem_id}/ping")
+async def ping_modem(modem_id: str, db: Session = Depends(get_db)):
+    """
+    Test modem connectivity with a simple ping.
+    Returns response time and connection status.
+    """
+    # Get modem from database
+    modem = db.query(RosterUnit).filter_by(id=modem_id, device_type="modem").first()
+
+    if not modem:
+        return {"status": "error", "detail": f"Modem {modem_id} not found"}
+
+    if not modem.ip_address:
+        return {"status": "error", "detail": f"Modem {modem_id} has no IP address configured"}
+
+    try:
+        # Ping the modem (1 packet, 2 second timeout)
+        start_time = time.time()
+        result = subprocess.run(
+            ["ping", "-c", "1", "-W", "2", modem.ip_address],
+            capture_output=True,
+            text=True,
+            timeout=3
+        )
+        response_time = int((time.time() - start_time) * 1000)  # Convert to milliseconds
+
+        if result.returncode == 0:
+            return {
+                "status": "success",
+                "modem_id": modem_id,
+                "ip_address": modem.ip_address,
+                "response_time_ms": response_time,
+                "message": "Modem is responding"
+            }
+        else:
+            return {
+                "status": "error",
+                "modem_id": modem_id,
+                "ip_address": modem.ip_address,
+                "detail": "Modem not responding to ping"
+            }
+
+    except subprocess.TimeoutExpired:
+        return {
+            "status": "error",
+            "modem_id": modem_id,
+            "ip_address": modem.ip_address,
+            "detail": "Ping timeout"
+        }
+    except Exception as e:
+        logger.error(f"Failed to ping modem {modem_id}: {e}")
+        return {
+            "status": "error",
+            "modem_id": modem_id,
+            "detail": str(e)
+        }
+
+
+@router.get("/{modem_id}/diagnostics")
+async def get_modem_diagnostics(modem_id: str, db: Session = Depends(get_db)):
+    """
+    Get modem diagnostics (signal strength, data usage, uptime).
+
+    Currently returns placeholders. When ModemManager is available,
+    this endpoint will query it for real diagnostics.
+    """
+    modem = db.query(RosterUnit).filter_by(id=modem_id, device_type="modem").first()
+    if not modem:
+        return {"status": "error", "detail": f"Modem {modem_id} not found"}
+
+    # TODO: Query ModemManager backend when available
+    return {
+        "status": "unavailable",
+        "message": "ModemManager integration not yet available",
+        "modem_id": modem_id,
+        "signal_strength_dbm": None,
+        "data_usage_mb": None,
+        "uptime_seconds": None,
+        "carrier": None,
+        "connection_type": None  # LTE, 5G, etc.
+    }

backend/routers/projects.py

@@ -11,7 +11,7 @@ Provides API endpoints for the Projects system:
 from fastapi import APIRouter, Request, Depends, HTTPException, Query
 from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse
 from sqlalchemy.orm import Session
-from sqlalchemy import func, and_
+from sqlalchemy import func, and_, or_
 from datetime import datetime, timedelta
 from typing import Optional
 from collections import OrderedDict
@@ -147,6 +147,107 @@ async def get_projects_stats(request: Request, db: Session = Depends(get_db)):
     })
 
 
+# ============================================================================
+# Project Search (Smart Autocomplete)
+# ============================================================================
+
+def _build_project_display(project: Project) -> str:
+    """Build display string from project fields: 'xxxx-YY - Client - Name'"""
+    parts = []
+    if project.project_number:
+        parts.append(project.project_number)
+    if project.client_name:
+        parts.append(project.client_name)
+    if project.name:
+        parts.append(project.name)
+    return " - ".join(parts) if parts else project.id
+
+
+@router.get("/search", response_class=HTMLResponse)
+async def search_projects(
+    request: Request,
+    q: str = Query("", description="Search term"),
+    db: Session = Depends(get_db),
+    limit: int = Query(10, le=50),
+):
+    """
+    Fuzzy search across project fields for autocomplete.
+    Searches: project_number, client_name, name (project/site name)
+    Returns HTML partial for HTMX dropdown.
+    """
+    if not q.strip():
+        # Return recent active projects when no search term
+        projects = db.query(Project).filter(
+            Project.status != "archived"
+        ).order_by(Project.updated_at.desc()).limit(limit).all()
+    else:
+        search_term = f"%{q}%"
+        projects = db.query(Project).filter(
+            and_(
+                Project.status != "archived",
+                or_(
+                    Project.project_number.ilike(search_term),
+                    Project.client_name.ilike(search_term),
+                    Project.name.ilike(search_term),
+                )
+            )
+        ).order_by(Project.updated_at.desc()).limit(limit).all()
+
+    # Build display data for each project
+    projects_data = [{
+        "id": p.id,
+        "project_number": p.project_number,
+        "client_name": p.client_name,
+        "name": p.name,
+        "display": _build_project_display(p),
+        "status": p.status,
+    } for p in projects]
+
+    return templates.TemplateResponse("partials/project_search_results.html", {
+        "request": request,
+        "projects": projects_data,
+        "query": q,
+        "show_create": len(projects) == 0 and q.strip(),
+    })
+
+
+@router.get("/search-json")
+async def search_projects_json(
+    q: str = Query("", description="Search term"),
+    db: Session = Depends(get_db),
+    limit: int = Query(10, le=50),
+):
+    """
+    Fuzzy search across project fields - JSON response.
+    For programmatic/API consumption.
+    """
+    if not q.strip():
+        projects = db.query(Project).filter(
+            Project.status != "archived"
+        ).order_by(Project.updated_at.desc()).limit(limit).all()
+    else:
+        search_term = f"%{q}%"
+        projects = db.query(Project).filter(
+            and_(
+                Project.status != "archived",
+                or_(
+                    Project.project_number.ilike(search_term),
+                    Project.client_name.ilike(search_term),
+                    Project.name.ilike(search_term),
+                )
+            )
+        ).order_by(Project.updated_at.desc()).limit(limit).all()
+
+    return [{
+        "id": p.id,
+        "project_number": p.project_number,
+        "client_name": p.client_name,
+        "name": p.name,
+        "display": _build_project_display(p),
+        "status": p.status,
+    } for p in projects]
+
+
 # ============================================================================
 # Project CRUD
 # ============================================================================
@@ -161,6 +262,7 @@ async def create_project(request: Request, db: Session = Depends(get_db)):
 
     project = Project(
         id=str(uuid.uuid4()),
+        project_number=form_data.get("project_number"),  # TMI ID: xxxx-YY format
         name=form_data.get("name"),
         description=form_data.get("description"),
         project_type_id=form_data.get("project_type_id"),
@@ -197,6 +299,7 @@ async def get_project(project_id: str, db: Session = Depends(get_db)):
 
     return {
         "id": project.id,
+        "project_number": project.project_number,
         "name": project.name,
         "description": project.description,
         "project_type_id": project.project_type_id,

backend/routers/roster.py

@@ -2,20 +2,32 @@ from fastapi import APIRouter, Depends
 from sqlalchemy.orm import Session
 from datetime import datetime, timedelta
 from typing import Dict, Any
+import asyncio
+import logging
 import random
 
 from backend.database import get_db
 from backend.services.snapshot import emit_status_snapshot
+from backend.services.slm_status_sync import sync_slm_status_to_emitters
 
 router = APIRouter(prefix="/api", tags=["roster"])
+logger = logging.getLogger(__name__)
 
 
 @router.get("/status-snapshot")
-def get_status_snapshot(db: Session = Depends(get_db)):
+async def get_status_snapshot(db: Session = Depends(get_db)):
     """
     Calls emit_status_snapshot() to get current fleet status.
-    This will be replaced with real Series3 emitter logic later.
+    Syncs SLM status from SLMM before generating snapshot.
     """
+    # Sync SLM status from SLMM (with timeout to prevent blocking)
+    try:
+        await asyncio.wait_for(sync_slm_status_to_emitters(), timeout=2.0)
+    except asyncio.TimeoutError:
+        logger.warning("SLM status sync timed out, using cached data")
+    except Exception as e:
+        logger.warning(f"SLM status sync failed: {e}")
+
     return emit_status_snapshot()
 
 

backend/routers/roster_edit.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, Depends, HTTPException, Form, UploadFile, File, Request
+from fastapi import APIRouter, Depends, HTTPException, Form, UploadFile, File, Request, Query
 from fastapi.exceptions import RequestValidationError
 from sqlalchemy.orm import Session
 from datetime import datetime, date
@@ -10,6 +10,7 @@ import os
 
 from backend.database import get_db
 from backend.models import RosterUnit, IgnoredUnit, Emitter, UnitHistory
+from backend.services.slmm_sync import sync_slm_to_slmm
 
 router = APIRouter(prefix="/api/roster", tags=["roster-edit"])
 logger = logging.getLogger(__name__)
@@ -150,6 +151,8 @@ async def add_roster_unit(
     ip_address: str = Form(None),
     phone_number: str = Form(None),
     hardware_model: str = Form(None),
+    deployment_type: str = Form(None),  # "seismograph" | "slm" - what device type modem is deployed with
+    deployed_with_unit_id: str = Form(None),  # ID of seismograph/SLM this modem is deployed with
     # Sound Level Meter-specific fields
     slm_host: str = Form(None),
     slm_tcp_port: str = Form(None),
@@ -209,6 +212,7 @@ async def add_roster_unit(
         ip_address=ip_address if ip_address else None,
         phone_number=phone_number if phone_number else None,
         hardware_model=hardware_model if hardware_model else None,
+        deployment_type=deployment_type if deployment_type else None,
         # Sound Level Meter-specific fields
         slm_host=slm_host if slm_host else None,
         slm_tcp_port=slm_tcp_port_int,
@@ -219,6 +223,23 @@ async def add_roster_unit(
         slm_time_weighting=slm_time_weighting if slm_time_weighting else None,
         slm_measurement_range=slm_measurement_range if slm_measurement_range else None,
     )
+
+    # Auto-fill location data from modem if pairing and fields are empty
+    if deployed_with_modem_id:
+        modem = db.query(RosterUnit).filter(
+            RosterUnit.id == deployed_with_modem_id,
+            RosterUnit.device_type == "modem"
+        ).first()
+        if modem:
+            if not unit.location and modem.location:
+                unit.location = modem.location
+            if not unit.address and modem.address:
+                unit.address = modem.address
+            if not unit.coordinates and modem.coordinates:
+                unit.coordinates = modem.coordinates
+            if not unit.project_id and modem.project_id:
+                unit.project_id = modem.project_id
+
     db.add(unit)
     db.commit()
 
@@ -259,6 +280,145 @@ def get_modems_list(db: Session = Depends(get_db)):
     ]
 
 
+@router.get("/search/modems")
+def search_modems(
+    request: Request,
+    q: str = Query("", description="Search term"),
+    deployed_only: bool = Query(False, description="Only show deployed modems"),
+    exclude_retired: bool = Query(True, description="Exclude retired modems"),
+    limit: int = Query(10, le=50),
+    db: Session = Depends(get_db)
+):
+    """
+    Search modems by ID, IP address, or note. Returns HTML partial for HTMX dropdown.
+
+    Used by modem picker component to find modems to link with seismographs/SLMs.
+    """
+    from fastapi.responses import HTMLResponse
+    from fastapi.templating import Jinja2Templates
+
+    templates = Jinja2Templates(directory="templates")
+
+    query = db.query(RosterUnit).filter(RosterUnit.device_type == "modem")
+
+    if deployed_only:
+        query = query.filter(RosterUnit.deployed == True)
+
+    if exclude_retired:
+        query = query.filter(RosterUnit.retired == False)
+
+    # Search by ID, IP address, or note
+    if q and q.strip():
+        search_term = f"%{q.strip()}%"
+        query = query.filter(
+            (RosterUnit.id.ilike(search_term)) |
+            (RosterUnit.ip_address.ilike(search_term)) |
+            (RosterUnit.note.ilike(search_term))
+        )
+
+    modems = query.order_by(RosterUnit.id).limit(limit).all()
+
+    # Build results
+    results = []
+    for modem in modems:
+        # Build display text: ID - IP - Note (if available)
+        display_parts = [modem.id]
+        if modem.ip_address:
+            display_parts.append(modem.ip_address)
+        if modem.note:
+            display_parts.append(modem.note)
+        display = " - ".join(display_parts)
+
+        results.append({
+            "id": modem.id,
+            "ip_address": modem.ip_address or "",
+            "phone_number": modem.phone_number or "",
+            "note": modem.note or "",
+            "deployed": modem.deployed,
+            "display": display
+        })
+
+    # Determine if we should show "no results" message
+    show_empty = len(results) == 0 and q and q.strip()
+
+    return templates.TemplateResponse(
+        "partials/modem_search_results.html",
+        {
+            "request": request,
+            "modems": results,
+            "query": q,
+            "show_empty": show_empty
+        }
+    )
+
+
+@router.get("/search/units")
+def search_units(
+    request: Request,
+    q: str = Query("", description="Search term"),
+    device_type: str = Query(None, description="Filter by device type: seismograph, modem, slm"),
+    deployed_only: bool = Query(False, description="Only show deployed units"),
+    exclude_retired: bool = Query(True, description="Exclude retired units"),
+    limit: int = Query(10, le=50),
+    db: Session = Depends(get_db)
+):
+    """
+    Search roster units by ID or note. Returns HTML partial for HTMX dropdown.
+
+    Used by unit picker component to find seismographs/SLMs to link with modems.
+    """
+    from fastapi.responses import HTMLResponse
+    from fastapi.templating import Jinja2Templates
+
+    templates = Jinja2Templates(directory="templates")
+
+    query = db.query(RosterUnit)
+
+    # Apply filters
+    if device_type:
+        query = query.filter(RosterUnit.device_type == device_type)
+
+    if deployed_only:
+        query = query.filter(RosterUnit.deployed == True)
+
+    if exclude_retired:
+        query = query.filter(RosterUnit.retired == False)
+
+    # Search by ID or note
+    if q and q.strip():
+        search_term = f"%{q.strip()}%"
+        query = query.filter(
+            (RosterUnit.id.ilike(search_term)) |
+            (RosterUnit.note.ilike(search_term))
+        )
+
+    units = query.order_by(RosterUnit.id).limit(limit).all()
+
+    # Build results
+    results = []
+    for unit in units:
+        results.append({
+            "id": unit.id,
+            "device_type": unit.device_type or "seismograph",
+            "note": unit.note or "",
+            "deployed": unit.deployed,
+            "display": f"{unit.id}" + (f" - {unit.note}" if unit.note else "")
+        })
+
+    # Determine if we should show "no results" message
+    show_empty = len(results) == 0 and q and q.strip()
+
+    return templates.TemplateResponse(
+        "partials/unit_search_results.html",
+        {
+            "request": request,
+            "units": results,
+            "query": q,
+            "show_empty": show_empty
+        }
+    )
+
+
 @router.get("/{unit_id}")
 def get_roster_unit(unit_id: str, db: Session = Depends(get_db)):
     """Get a single roster unit by ID"""
@@ -283,6 +443,8 @@ def get_roster_unit(unit_id: str, db: Session = Depends(get_db)):
         "ip_address": unit.ip_address or "",
         "phone_number": unit.phone_number or "",
         "hardware_model": unit.hardware_model or "",
+        "deployment_type": unit.deployment_type or "",
+        "deployed_with_unit_id": unit.deployed_with_unit_id or "",
         "slm_host": unit.slm_host or "",
         "slm_tcp_port": unit.slm_tcp_port or "",
         "slm_ftp_port": unit.slm_ftp_port or "",
@@ -295,7 +457,7 @@ def get_roster_unit(unit_id: str, db: Session = Depends(get_db)):
 
 
 @router.post("/edit/{unit_id}")
-def edit_roster_unit(
+async def edit_roster_unit(
     unit_id: str,
     device_type: str = Form("seismograph"),
     unit_type: str = Form("series3"),
@@ -314,6 +476,8 @@ def edit_roster_unit(
     ip_address: str = Form(None),
     phone_number: str = Form(None),
     hardware_model: str = Form(None),
+    deployment_type: str = Form(None),
+    deployed_with_unit_id: str = Form(None),
     # Sound Level Meter-specific fields
     slm_host: str = Form(None),
     slm_tcp_port: str = Form(None),
@@ -323,6 +487,14 @@ def edit_roster_unit(
     slm_frequency_weighting: str = Form(None),
     slm_time_weighting: str = Form(None),
     slm_measurement_range: str = Form(None),
+    # Cascade options - sync fields to paired device
+    cascade_to_unit_id: str = Form(None),
+    cascade_deployed: str = Form(None),
+    cascade_retired: str = Form(None),
+    cascade_project: str = Form(None),
+    cascade_location: str = Form(None),
+    cascade_coordinates: str = Form(None),
+    cascade_note: str = Form(None),
     db: Session = Depends(get_db)
 ):
     unit = db.query(RosterUnit).filter(RosterUnit.id == unit_id).first()
@@ -374,10 +546,29 @@ def edit_roster_unit(
     unit.next_calibration_due = next_cal_date
     unit.deployed_with_modem_id = deployed_with_modem_id if deployed_with_modem_id else None
 
+    # Auto-fill location data from modem if pairing and fields are empty
+    if deployed_with_modem_id:
+        modem = db.query(RosterUnit).filter(
+            RosterUnit.id == deployed_with_modem_id,
+            RosterUnit.device_type == "modem"
+        ).first()
+        if modem:
+            # Only fill if the device field is empty
+            if not unit.location and modem.location:
+                unit.location = modem.location
+            if not unit.address and modem.address:
+                unit.address = modem.address
+            if not unit.coordinates and modem.coordinates:
+                unit.coordinates = modem.coordinates
+            if not unit.project_id and modem.project_id:
+                unit.project_id = modem.project_id
+
     # Modem-specific fields
     unit.ip_address = ip_address if ip_address else None
     unit.phone_number = phone_number if phone_number else None
     unit.hardware_model = hardware_model if hardware_model else None
+    unit.deployment_type = deployment_type if deployment_type else None
+    unit.deployed_with_unit_id = deployed_with_unit_id if deployed_with_unit_id else None
 
     # Sound Level Meter-specific fields
     unit.slm_host = slm_host if slm_host else None
@@ -403,12 +594,93 @@ def edit_roster_unit(
         old_status_text = "retired" if old_retired else "active"
         record_history(db, unit_id, "retired_change", "retired", old_status_text, status_text, "manual")
 
+    # Handle cascade to paired device
+    cascaded_unit_id = None
+    if cascade_to_unit_id and cascade_to_unit_id.strip():
+        paired_unit = db.query(RosterUnit).filter(RosterUnit.id == cascade_to_unit_id).first()
+        if paired_unit:
+            cascaded_unit_id = paired_unit.id
+
+            # Cascade deployed status
+            if cascade_deployed in ['true', 'True', '1', 'yes']:
+                old_paired_deployed = paired_unit.deployed
+                paired_unit.deployed = deployed_bool
+                paired_unit.last_updated = datetime.utcnow()
+                if old_paired_deployed != deployed_bool:
+                    status_text = "deployed" if deployed_bool else "benched"
+                    old_status_text = "deployed" if old_paired_deployed else "benched"
+                    record_history(db, paired_unit.id, "deployed_change", "deployed",
+                                   old_status_text, status_text, f"cascade from {unit_id}")
+
+            # Cascade retired status
+            if cascade_retired in ['true', 'True', '1', 'yes']:
+                old_paired_retired = paired_unit.retired
+                paired_unit.retired = retired_bool
+                paired_unit.last_updated = datetime.utcnow()
+                if old_paired_retired != retired_bool:
+                    status_text = "retired" if retired_bool else "active"
+                    old_status_text = "retired" if old_paired_retired else "active"
+                    record_history(db, paired_unit.id, "retired_change", "retired",
+                                   old_status_text, status_text, f"cascade from {unit_id}")
+
+            # Cascade project
+            if cascade_project in ['true', 'True', '1', 'yes']:
+                old_paired_project = paired_unit.project_id
+                paired_unit.project_id = project_id
+                paired_unit.last_updated = datetime.utcnow()
+                if old_paired_project != project_id:
+                    record_history(db, paired_unit.id, "project_change", "project_id",
+                                   old_paired_project or "", project_id or "", f"cascade from {unit_id}")
+
+            # Cascade address/location
+            if cascade_location in ['true', 'True', '1', 'yes']:
+                old_paired_address = paired_unit.address
+                old_paired_location = paired_unit.location
+                paired_unit.address = address
+                paired_unit.location = location
+                paired_unit.last_updated = datetime.utcnow()
+                if old_paired_address != address:
+                    record_history(db, paired_unit.id, "address_change", "address",
+                                   old_paired_address or "", address or "", f"cascade from {unit_id}")
+
+            # Cascade coordinates
+            if cascade_coordinates in ['true', 'True', '1', 'yes']:
+                old_paired_coords = paired_unit.coordinates
+                paired_unit.coordinates = coordinates
+                paired_unit.last_updated = datetime.utcnow()
+                if old_paired_coords != coordinates:
+                    record_history(db, paired_unit.id, "coordinates_change", "coordinates",
+                                   old_paired_coords or "", coordinates or "", f"cascade from {unit_id}")
+
+            # Cascade note
+            if cascade_note in ['true', 'True', '1', 'yes']:
+                old_paired_note = paired_unit.note
+                paired_unit.note = note
+                paired_unit.last_updated = datetime.utcnow()
+                if old_paired_note != note:
+                    record_history(db, paired_unit.id, "note_change", "note",
+                                   old_paired_note or "", note or "", f"cascade from {unit_id}")
+
     db.commit()
-    return {"message": "Unit updated", "id": unit_id, "device_type": device_type}
+
+    # Sync SLM polling config to SLMM when deployed/retired status changes
+    # This ensures benched units stop being polled
+    if device_type == "slm" and (old_deployed != deployed_bool or old_retired != retired_bool):
+        db.refresh(unit)  # Refresh to get committed values
+        try:
+            await sync_slm_to_slmm(unit)
+            logger.info(f"Synced SLM {unit_id} polling config to SLMM (deployed={deployed_bool}, retired={retired_bool})")
+        except Exception as e:
+            logger.warning(f"Failed to sync SLM {unit_id} polling config to SLMM: {e}")
+
+    response = {"message": "Unit updated", "id": unit_id, "device_type": device_type}
+    if cascaded_unit_id:
+        response["cascaded_to"] = cascaded_unit_id
+    return response
 
 
 @router.post("/set-deployed/{unit_id}")
-def set_deployed(unit_id: str, deployed: bool = Form(...), db: Session = Depends(get_db)):
+async def set_deployed(unit_id: str, deployed: bool = Form(...), db: Session = Depends(get_db)):
     unit = get_or_create_roster_unit(db, unit_id)
     old_deployed = unit.deployed
     unit.deployed = deployed
@@ -429,11 +701,21 @@ def set_deployed(unit_id: str, deployed: bool = Form(...), db: Session = Depends
         )
 
     db.commit()
+
+    # Sync SLM polling config to SLMM when deployed status changes
+    if unit.device_type == "slm" and old_deployed != deployed:
+        db.refresh(unit)
+        try:
+            await sync_slm_to_slmm(unit)
+            logger.info(f"Synced SLM {unit_id} polling config to SLMM (deployed={deployed})")
+        except Exception as e:
+            logger.warning(f"Failed to sync SLM {unit_id} polling config to SLMM: {e}")
+
     return {"message": "Updated", "id": unit_id, "deployed": deployed}
 
 
 @router.post("/set-retired/{unit_id}")
-def set_retired(unit_id: str, retired: bool = Form(...), db: Session = Depends(get_db)):
+async def set_retired(unit_id: str, retired: bool = Form(...), db: Session = Depends(get_db)):
     unit = get_or_create_roster_unit(db, unit_id)
     old_retired = unit.retired
     unit.retired = retired
@@ -454,6 +736,16 @@ def set_retired(unit_id: str, retired: bool = Form(...), db: Session = Depends(g
         )
 
     db.commit()
+
+    # Sync SLM polling config to SLMM when retired status changes
+    if unit.device_type == "slm" and old_retired != retired:
+        db.refresh(unit)
+        try:
+            await sync_slm_to_slmm(unit)
+            logger.info(f"Synced SLM {unit_id} polling config to SLMM (retired={retired})")
+        except Exception as e:
+            logger.warning(f"Failed to sync SLM {unit_id} polling config to SLMM: {e}")
+
     return {"message": "Updated", "id": unit_id, "retired": retired}
 
 
@@ -531,6 +823,37 @@ def set_note(unit_id: str, note: str = Form(""), db: Session = Depends(get_db)):
     return {"message": "Updated", "id": unit_id, "note": note}
 
 
+def _parse_bool(value: str) -> bool:
+    """Parse boolean from CSV string value."""
+    return value.lower() in ('true', '1', 'yes') if value else False
+
+
+def _parse_int(value: str) -> int | None:
+    """Parse integer from CSV string value, return None if empty or invalid."""
+    if not value or not value.strip():
+        return None
+    try:
+        return int(value.strip())
+    except ValueError:
+        return None
+
+
+def _parse_date(value: str) -> date | None:
+    """Parse date from CSV string value (YYYY-MM-DD format)."""
+    if not value or not value.strip():
+        return None
+    try:
+        return datetime.strptime(value.strip(), '%Y-%m-%d').date()
+    except ValueError:
+        return None
+
+
+def _get_csv_value(row: dict, key: str, default=None):
+    """Get value from CSV row, return default if empty."""
+    value = row.get(key, '').strip() if row.get(key) else ''
+    return value if value else default
+
+
 @router.post("/import-csv")
 async def import_csv(
     file: UploadFile = File(...),
@@ -541,13 +864,40 @@ async def import_csv(
     Import roster units from CSV file.
 
     Expected CSV columns (unit_id is required, others are optional):
-    - unit_id: Unique identifier for the unit
+
-    - unit_type: Type of unit (default: "series3")
+    Common fields (all device types):
-    - deployed: Boolean for deployment status (default: False)
+    - unit_id: Unique identifier for the unit (REQUIRED)
-    - retired: Boolean for retirement status (default: False)
+    - device_type: "seismograph", "modem", or "slm" (default: "seismograph")
+    - unit_type: Sub-type (e.g., "series3", "series4" for seismographs)
+    - deployed: Boolean (true/false/yes/no/1/0)
+    - retired: Boolean
     - note: Notes about the unit
     - project_id: Project identifier
     - location: Location description
+    - address: Street address
+    - coordinates: GPS coordinates (lat;lon or lat,lon)
+
+    Seismograph-specific:
+    - last_calibrated: Date (YYYY-MM-DD)
+    - next_calibration_due: Date (YYYY-MM-DD)
+    - deployed_with_modem_id: ID of paired modem
+
+    Modem-specific:
+    - ip_address: Device IP address
+    - phone_number: SIM card phone number
+    - hardware_model: Hardware model (e.g., IBR900, RV55)
+
+    SLM-specific:
+    - slm_host: Device IP or hostname
+    - slm_tcp_port: TCP control port (default 2255)
+    - slm_ftp_port: FTP port (default 21)
+    - slm_model: Device model (NL-43, NL-53)
+    - slm_serial_number: Serial number
+    - slm_frequency_weighting: A, C, or Z
+    - slm_time_weighting: F (Fast), S (Slow), I (Impulse)
+    - slm_measurement_range: e.g., "30-130 dB"
+
+    Lines starting with # are treated as comments and skipped.
 
     Args:
         file: CSV file upload
@@ -560,6 +910,46 @@ async def import_csv(
     # Read file content
     contents = await file.read()
     csv_text = contents.decode('utf-8')
+
+    # Filter out comment lines (starting with #)
+    lines = csv_text.split('\n')
+    filtered_lines = [line for line in lines if not line.strip().startswith('#')]
+    csv_text = '\n'.join(filtered_lines)
+
+    # First pass: validate for duplicates and empty unit_ids
+    csv_reader = csv.DictReader(io.StringIO(csv_text))
+    seen_unit_ids = {}  # unit_id -> list of row numbers
+    empty_unit_id_rows = []
+
+    for row_num, row in enumerate(csv_reader, start=2):
+        unit_id = row.get('unit_id', '').strip()
+        if not unit_id:
+            empty_unit_id_rows.append(row_num)
+        else:
+            if unit_id not in seen_unit_ids:
+                seen_unit_ids[unit_id] = []
+            seen_unit_ids[unit_id].append(row_num)
+
+    # Check for validation errors
+    validation_errors = []
+
+    # Report empty unit_ids
+    if empty_unit_id_rows:
+        validation_errors.append(f"Empty unit_id on row(s): {', '.join(map(str, empty_unit_id_rows))}")
+
+    # Report duplicates
+    duplicates = {uid: rows for uid, rows in seen_unit_ids.items() if len(rows) > 1}
+    if duplicates:
+        for uid, rows in duplicates.items():
+            validation_errors.append(f"Duplicate unit_id '{uid}' on rows: {', '.join(map(str, rows))}")
+
+    if validation_errors:
+        raise HTTPException(
+            status_code=400,
+            detail="CSV validation failed:\n" + "\n".join(validation_errors)
+        )
+
+    # Second pass: actually import the data
     csv_reader = csv.DictReader(io.StringIO(csv_text))
 
     results = {
@@ -580,6 +970,9 @@ async def import_csv(
                 })
                 continue
 
+            # Determine device type
+            device_type = _get_csv_value(row, 'device_type', 'seismograph')
+
             # Check if unit exists
             existing_unit = db.query(RosterUnit).filter(RosterUnit.id == unit_id).first()
 
@@ -588,31 +981,90 @@ async def import_csv(
                     results["skipped"].append(unit_id)
                     continue
 
-                # Update existing unit
+                # Update existing unit - common fields
-                existing_unit.unit_type = row.get('unit_type', existing_unit.unit_type or 'series3')
+                existing_unit.device_type = device_type
-                existing_unit.deployed = row.get('deployed', '').lower() in ('true', '1', 'yes') if row.get('deployed') else existing_unit.deployed
+                existing_unit.unit_type = _get_csv_value(row, 'unit_type', existing_unit.unit_type or 'series3')
-                existing_unit.retired = row.get('retired', '').lower() in ('true', '1', 'yes') if row.get('retired') else existing_unit.retired
+                existing_unit.deployed = _parse_bool(row.get('deployed', '')) if row.get('deployed') else existing_unit.deployed
-                existing_unit.note = row.get('note', existing_unit.note or '')
+                existing_unit.retired = _parse_bool(row.get('retired', '')) if row.get('retired') else existing_unit.retired
-                existing_unit.project_id = row.get('project_id', existing_unit.project_id)
+                existing_unit.note = _get_csv_value(row, 'note', existing_unit.note)
-                existing_unit.location = row.get('location', existing_unit.location)
+                existing_unit.project_id = _get_csv_value(row, 'project_id', existing_unit.project_id)
-                existing_unit.address = row.get('address', existing_unit.address)
+                existing_unit.location = _get_csv_value(row, 'location', existing_unit.location)
-                existing_unit.coordinates = row.get('coordinates', existing_unit.coordinates)
+                existing_unit.address = _get_csv_value(row, 'address', existing_unit.address)
+                existing_unit.coordinates = _get_csv_value(row, 'coordinates', existing_unit.coordinates)
                 existing_unit.last_updated = datetime.utcnow()
 
+                # Seismograph-specific fields
+                if row.get('last_calibrated'):
+                    existing_unit.last_calibrated = _parse_date(row.get('last_calibrated'))
+                if row.get('next_calibration_due'):
+                    existing_unit.next_calibration_due = _parse_date(row.get('next_calibration_due'))
+                if row.get('deployed_with_modem_id'):
+                    existing_unit.deployed_with_modem_id = _get_csv_value(row, 'deployed_with_modem_id')
+
+                # Modem-specific fields
+                if row.get('ip_address'):
+                    existing_unit.ip_address = _get_csv_value(row, 'ip_address')
+                if row.get('phone_number'):
+                    existing_unit.phone_number = _get_csv_value(row, 'phone_number')
+                if row.get('hardware_model'):
+                    existing_unit.hardware_model = _get_csv_value(row, 'hardware_model')
+                if row.get('deployment_type'):
+                    existing_unit.deployment_type = _get_csv_value(row, 'deployment_type')
+                if row.get('deployed_with_unit_id'):
+                    existing_unit.deployed_with_unit_id = _get_csv_value(row, 'deployed_with_unit_id')
+
+                # SLM-specific fields
+                if row.get('slm_host'):
+                    existing_unit.slm_host = _get_csv_value(row, 'slm_host')
+                if row.get('slm_tcp_port'):
+                    existing_unit.slm_tcp_port = _parse_int(row.get('slm_tcp_port'))
+                if row.get('slm_ftp_port'):
+                    existing_unit.slm_ftp_port = _parse_int(row.get('slm_ftp_port'))
+                if row.get('slm_model'):
+                    existing_unit.slm_model = _get_csv_value(row, 'slm_model')
+                if row.get('slm_serial_number'):
+                    existing_unit.slm_serial_number = _get_csv_value(row, 'slm_serial_number')
+                if row.get('slm_frequency_weighting'):
+                    existing_unit.slm_frequency_weighting = _get_csv_value(row, 'slm_frequency_weighting')
+                if row.get('slm_time_weighting'):
+                    existing_unit.slm_time_weighting = _get_csv_value(row, 'slm_time_weighting')
+                if row.get('slm_measurement_range'):
+                    existing_unit.slm_measurement_range = _get_csv_value(row, 'slm_measurement_range')
+
                 results["updated"].append(unit_id)
             else:
-                # Create new unit
+                # Create new unit with all fields
                 new_unit = RosterUnit(
                     id=unit_id,
-                    unit_type=row.get('unit_type', 'series3'),
+                    device_type=device_type,
-                    deployed=row.get('deployed', '').lower() in ('true', '1', 'yes'),
+                    unit_type=_get_csv_value(row, 'unit_type', 'series3'),
-                    retired=row.get('retired', '').lower() in ('true', '1', 'yes'),
+                    deployed=_parse_bool(row.get('deployed', '')),
-                    note=row.get('note', ''),
+                    retired=_parse_bool(row.get('retired', '')),
-                    project_id=row.get('project_id'),
+                    note=_get_csv_value(row, 'note', ''),
-                    location=row.get('location'),
+                    project_id=_get_csv_value(row, 'project_id'),
-                    address=row.get('address'),
+                    location=_get_csv_value(row, 'location'),
-                    coordinates=row.get('coordinates'),
+                    address=_get_csv_value(row, 'address'),
-                    last_updated=datetime.utcnow()
+                    coordinates=_get_csv_value(row, 'coordinates'),
+                    last_updated=datetime.utcnow(),
+                    # Seismograph fields
+                    last_calibrated=_parse_date(row.get('last_calibrated', '')),
+                    next_calibration_due=_parse_date(row.get('next_calibration_due', '')),
+                    deployed_with_modem_id=_get_csv_value(row, 'deployed_with_modem_id'),
+                    # Modem fields
+                    ip_address=_get_csv_value(row, 'ip_address'),
+                    phone_number=_get_csv_value(row, 'phone_number'),
+                    hardware_model=_get_csv_value(row, 'hardware_model'),
+                    deployment_type=_get_csv_value(row, 'deployment_type'),
+                    deployed_with_unit_id=_get_csv_value(row, 'deployed_with_unit_id'),
+                    # SLM fields
+                    slm_host=_get_csv_value(row, 'slm_host'),
+                    slm_tcp_port=_parse_int(row.get('slm_tcp_port', '')),
+                    slm_ftp_port=_parse_int(row.get('slm_ftp_port', '')),
+                    slm_model=_get_csv_value(row, 'slm_model'),
+                    slm_serial_number=_get_csv_value(row, 'slm_serial_number'),
+                    slm_frequency_weighting=_get_csv_value(row, 'slm_frequency_weighting'),
+                    slm_time_weighting=_get_csv_value(row, 'slm_time_weighting'),
+                    slm_measurement_range=_get_csv_value(row, 'slm_measurement_range'),
                 )
                 db.add(new_unit)
                 results["added"].append(unit_id)
@@ -735,3 +1187,145 @@ def delete_history_entry(history_id: int, db: Session = Depends(get_db)):
     db.delete(history_entry)
     db.commit()
     return {"message": "History entry deleted", "id": history_id}
+
+
+@router.post("/pair-devices")
+async def pair_devices(
+    request: Request,
+    db: Session = Depends(get_db)
+):
+    """
+    Create a bidirectional pairing between a recorder (seismograph/SLM) and a modem.
+
+    Sets:
+    - recorder.deployed_with_modem_id = modem_id
+    - modem.deployed_with_unit_id = recorder_id
+
+    Also clears any previous pairings for both devices.
+    """
+    data = await request.json()
+    recorder_id = data.get("recorder_id")
+    modem_id = data.get("modem_id")
+
+    if not recorder_id or not modem_id:
+        raise HTTPException(status_code=400, detail="Both recorder_id and modem_id are required")
+
+    # Get or create the units
+    recorder = db.query(RosterUnit).filter(RosterUnit.id == recorder_id).first()
+    modem = db.query(RosterUnit).filter(RosterUnit.id == modem_id).first()
+
+    if not recorder:
+        raise HTTPException(status_code=404, detail=f"Recorder {recorder_id} not found in roster")
+    if not modem:
+        raise HTTPException(status_code=404, detail=f"Modem {modem_id} not found in roster")
+
+    # Validate device types
+    if recorder.device_type == "modem":
+        raise HTTPException(status_code=400, detail=f"{recorder_id} is a modem, not a recorder")
+    if modem.device_type != "modem":
+        raise HTTPException(status_code=400, detail=f"{modem_id} is not a modem (type: {modem.device_type})")
+
+    # Clear any previous pairings
+    # If recorder was paired with a different modem, clear that modem's link
+    if recorder.deployed_with_modem_id and recorder.deployed_with_modem_id != modem_id:
+        old_modem = db.query(RosterUnit).filter(RosterUnit.id == recorder.deployed_with_modem_id).first()
+        if old_modem and old_modem.deployed_with_unit_id == recorder_id:
+            record_history(db, old_modem.id, "update", "deployed_with_unit_id",
+                          old_modem.deployed_with_unit_id, None, "pair_devices", f"Cleared by new pairing")
+            old_modem.deployed_with_unit_id = None
+
+    # If modem was paired with a different recorder, clear that recorder's link
+    if modem.deployed_with_unit_id and modem.deployed_with_unit_id != recorder_id:
+        old_recorder = db.query(RosterUnit).filter(RosterUnit.id == modem.deployed_with_unit_id).first()
+        if old_recorder and old_recorder.deployed_with_modem_id == modem_id:
+            record_history(db, old_recorder.id, "update", "deployed_with_modem_id",
+                          old_recorder.deployed_with_modem_id, None, "pair_devices", f"Cleared by new pairing")
+            old_recorder.deployed_with_modem_id = None
+
+    # Record history for the pairing
+    old_recorder_modem = recorder.deployed_with_modem_id
+    old_modem_unit = modem.deployed_with_unit_id
+
+    # Set the new pairing
+    recorder.deployed_with_modem_id = modem_id
+    modem.deployed_with_unit_id = recorder_id
+
+    # Record history
+    if old_recorder_modem != modem_id:
+        record_history(db, recorder_id, "update", "deployed_with_modem_id",
+                      old_recorder_modem, modem_id, "pair_devices", f"Paired with modem")
+    if old_modem_unit != recorder_id:
+        record_history(db, modem_id, "update", "deployed_with_unit_id",
+                      old_modem_unit, recorder_id, "pair_devices", f"Paired with recorder")
+
+    db.commit()
+
+    logger.info(f"Paired {recorder_id} with modem {modem_id}")
+
+    # If SLM, sync to SLMM cache
+    if recorder.device_type == "slm":
+        await sync_slm_to_slmm_cache(
+            unit_id=recorder_id,
+            host=recorder.slm_host,
+            tcp_port=recorder.slm_tcp_port,
+            ftp_port=recorder.slm_ftp_port,
+            deployed_with_modem_id=modem_id,
+            db=db
+        )
+
+    return {
+        "success": True,
+        "message": f"Paired {recorder_id} with {modem_id}",
+        "recorder_id": recorder_id,
+        "modem_id": modem_id
+    }
+
+
+@router.post("/unpair-devices")
+async def unpair_devices(
+    request: Request,
+    db: Session = Depends(get_db)
+):
+    """
+    Remove the bidirectional pairing between a recorder and modem.
+
+    Clears:
+    - recorder.deployed_with_modem_id
+    - modem.deployed_with_unit_id
+    """
+    data = await request.json()
+    recorder_id = data.get("recorder_id")
+    modem_id = data.get("modem_id")
+
+    if not recorder_id or not modem_id:
+        raise HTTPException(status_code=400, detail="Both recorder_id and modem_id are required")
+
+    recorder = db.query(RosterUnit).filter(RosterUnit.id == recorder_id).first()
+    modem = db.query(RosterUnit).filter(RosterUnit.id == modem_id).first()
+
+    changes_made = False
+
+    if recorder and recorder.deployed_with_modem_id == modem_id:
+        record_history(db, recorder_id, "update", "deployed_with_modem_id",
+                      recorder.deployed_with_modem_id, None, "unpair_devices", "Unpairing")
+        recorder.deployed_with_modem_id = None
+        changes_made = True
+
+    if modem and modem.deployed_with_unit_id == recorder_id:
+        record_history(db, modem_id, "update", "deployed_with_unit_id",
+                      modem.deployed_with_unit_id, None, "unpair_devices", "Unpairing")
+        modem.deployed_with_unit_id = None
+        changes_made = True
+
+    if changes_made:
+        db.commit()
+        logger.info(f"Unpaired {recorder_id} from modem {modem_id}")
+        return {
+            "success": True,
+            "message": f"Unpaired {recorder_id} from {modem_id}"
+        }
+    else:
+        return {
+            "success": False,
+            "message": "No pairing found between these devices"
+        }

backend/routers/slm_dashboard.py

@@ -167,23 +167,7 @@ async def get_live_view(request: Request, unit_id: str, db: Session = Depends(ge
                 measurement_state = state_data.get("measurement_state", "Unknown")
                 is_measuring = state_data.get("is_measuring", False)
 
-            # If measuring, sync start time from FTP to database (fixes wrong timestamps)
+            # Get live status (measurement_start_time is already stored in SLMM database)
-            if is_measuring:
-                try:
-                    sync_response = await client.post(
-                        f"{SLMM_BASE_URL}/api/nl43/{unit_id}/sync-start-time",
-                        timeout=10.0
-                    )
-                    if sync_response.status_code == 200:
-                        sync_data = sync_response.json()
-                        logger.info(f"Synced start time for {unit_id}: {sync_data.get('message')}")
-                    else:
-                        logger.warning(f"Failed to sync start time for {unit_id}: {sync_response.status_code}")
-                except Exception as e:
-                    # Don't fail the whole request if sync fails
-                    logger.warning(f"Could not sync start time for {unit_id}: {e}")
-
-            # Get live status (now with corrected start time)
             status_response = await client.get(
                 f"{SLMM_BASE_URL}/api/nl43/{unit_id}/live"
             )

backend/services/device_controller.py

@@ -289,6 +289,74 @@ class DeviceController:
         else:
             raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
 
+    # ========================================================================
+    # FTP Control
+    # ========================================================================
+
+    async def enable_ftp(
+        self,
+        unit_id: str,
+        device_type: str,
+    ) -> Dict[str, Any]:
+        """
+        Enable FTP server on device.
+
+        Must be called before downloading files.
+
+        Args:
+            unit_id: Unit identifier
+            device_type: "slm" | "seismograph"
+
+        Returns:
+            Response dict with status
+        """
+        if device_type == "slm":
+            try:
+                return await self.slmm_client.enable_ftp(unit_id)
+            except SLMMClientError as e:
+                raise DeviceControllerError(f"SLMM error: {str(e)}")
+
+        elif device_type == "seismograph":
+            return {
+                "status": "not_implemented",
+                "message": "Seismograph FTP not yet implemented",
+                "unit_id": unit_id,
+            }
+
+        else:
+            raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
+
+    async def disable_ftp(
+        self,
+        unit_id: str,
+        device_type: str,
+    ) -> Dict[str, Any]:
+        """
+        Disable FTP server on device.
+
+        Args:
+            unit_id: Unit identifier
+            device_type: "slm" | "seismograph"
+
+        Returns:
+            Response dict with status
+        """
+        if device_type == "slm":
+            try:
+                return await self.slmm_client.disable_ftp(unit_id)
+            except SLMMClientError as e:
+                raise DeviceControllerError(f"SLMM error: {str(e)}")
+
+        elif device_type == "seismograph":
+            return {
+                "status": "not_implemented",
+                "message": "Seismograph FTP not yet implemented",
+                "unit_id": unit_id,
+            }
+
+        else:
+            raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
+
     # ========================================================================
     # Device Configuration
     # ========================================================================

backend/services/scheduler.py

@@ -350,7 +350,14 @@ class SchedulerService:
         unit_id: str,
         db: Session,
     ) -> Dict[str, Any]:
-        """Execute a 'download' action."""
+        """Execute a 'download' action.
+
+        This handles standalone download actions (not part of stop_cycle).
+        The workflow is:
+        1. Enable FTP on device
+        2. Download current measurement folder
+        3. (Optionally disable FTP - left enabled for now)
+        """
         # Get project and location info for file path
         location = db.query(MonitoringLocation).filter_by(id=action.location_id).first()
         project = db.query(Project).filter_by(id=action.project_id).first()
@@ -358,8 +365,8 @@ class SchedulerService:
         if not location or not project:
             raise Exception("Project or location not found")
 
-        # Build destination path
+        # Build destination path (for logging/metadata reference)
-        # Example: data/Projects/{project-id}/sound/{location-name}/session-{timestamp}/
+        # Actual download location is managed by SLMM (data/downloads/{unit_id}/)
         session_timestamp = datetime.utcnow().strftime("%Y-%m-%d-%H%M")
         location_type_dir = "sound" if action.device_type == "slm" else "vibration"
 
@@ -368,12 +375,18 @@ class SchedulerService:
             f"{location.name}/session-{session_timestamp}/"
         )
 
-        # Download files via device controller
+        # Step 1: Enable FTP on device
+        logger.info(f"Enabling FTP on {unit_id} for download")
+        await self.device_controller.enable_ftp(unit_id, action.device_type)
+
+        # Step 2: Download current measurement folder
+        # The slmm_client.download_files() now automatically determines the correct
+        # folder based on the device's current index number
         response = await self.device_controller.download_files(
             unit_id,
             action.device_type,
             destination_path,
-            files=None,  # Download all files
+            files=None,  # Download all files in current measurement folder
         )
 
         # TODO: Create DataFile records for downloaded files

backend/services/slm_status_sync.py

@@ -0,0 +1,125 @@
+"""
+SLM Status Synchronization Service
+
+Syncs SLM device status from SLMM backend to Terra-View's Emitter table.
+This bridges SLMM's polling data with Terra-View's status snapshot system.
+
+SLMM tracks device reachability via background polling. This service
+fetches that data and creates/updates Emitter records so SLMs appear
+correctly in the dashboard status snapshot.
+"""
+
+import logging
+from datetime import datetime, timezone
+from typing import Dict, Any
+
+from backend.database import get_db_session
+from backend.models import Emitter
+from backend.services.slmm_client import get_slmm_client, SLMMClientError
+
+logger = logging.getLogger(__name__)
+
+
+async def sync_slm_status_to_emitters() -> Dict[str, Any]:
+    """
+    Fetch SLM status from SLMM and sync to Terra-View's Emitter table.
+
+    For each device in SLMM's polling status:
+    - If last_success exists, create/update Emitter with that timestamp
+    - If not reachable, update Emitter with last known timestamp (or None)
+
+    Returns:
+        Dict with synced_count, error_count, errors list
+    """
+    client = get_slmm_client()
+    synced = 0
+    errors = []
+
+    try:
+        # Get polling status from SLMM
+        status_response = await client.get_polling_status()
+
+        # Handle nested response structure
+        data = status_response.get("data", status_response)
+        devices = data.get("devices", [])
+
+        if not devices:
+            logger.debug("No SLM devices in SLMM polling status")
+            return {"synced_count": 0, "error_count": 0, "errors": []}
+
+        db = get_db_session()
+        try:
+            for device in devices:
+                unit_id = device.get("unit_id")
+                if not unit_id:
+                    continue
+
+                try:
+                    # Get or create Emitter record
+                    emitter = db.query(Emitter).filter(Emitter.id == unit_id).first()
+
+                    # Determine last_seen from SLMM data
+                    last_success_str = device.get("last_success")
+                    is_reachable = device.get("is_reachable", False)
+
+                    if last_success_str:
+                        # Parse ISO format timestamp
+                        last_seen = datetime.fromisoformat(
+                            last_success_str.replace("Z", "+00:00")
+                        )
+                        # Convert to naive UTC for consistency with existing code
+                        if last_seen.tzinfo:
+                            last_seen = last_seen.astimezone(timezone.utc).replace(tzinfo=None)
+                    else:
+                        last_seen = None
+
+                    # Status will be recalculated by snapshot.py based on time thresholds
+                    # Just store a provisional status here
+                    status = "OK" if is_reachable else "Missing"
+
+                    # Store last error message if available
+                    last_error = device.get("last_error") or ""
+
+                    if emitter:
+                        # Update existing record
+                        emitter.last_seen = last_seen
+                        emitter.status = status
+                        emitter.unit_type = "slm"
+                        emitter.last_file = last_error
+                    else:
+                        # Create new record
+                        emitter = Emitter(
+                            id=unit_id,
+                            unit_type="slm",
+                            last_seen=last_seen,
+                            last_file=last_error,
+                            status=status
+                        )
+                        db.add(emitter)
+
+                    synced += 1
+
+                except Exception as e:
+                    errors.append(f"{unit_id}: {str(e)}")
+                    logger.error(f"Error syncing SLM {unit_id}: {e}")
+
+            db.commit()
+
+        finally:
+            db.close()
+
+        if synced > 0:
+            logger.info(f"Synced {synced} SLM device(s) to Emitter table")
+
+    except SLMMClientError as e:
+        logger.warning(f"Could not reach SLMM for status sync: {e}")
+        errors.append(f"SLMM unreachable: {str(e)}")
+    except Exception as e:
+        logger.error(f"Error in SLM status sync: {e}", exc_info=True)
+        errors.append(str(e))
+
+    return {
+        "synced_count": synced,
+        "error_count": len(errors),
+        "errors": errors
+    }

backend/services/slmm_client.py

@@ -478,9 +478,118 @@ class SLMMClient:
         return await self._request("GET", f"/{unit_id}/settings")
 
     # ========================================================================
-    # Data Download (Future)
+    # FTP Control
     # ========================================================================
 
+    async def enable_ftp(self, unit_id: str) -> Dict[str, Any]:
+        """
+        Enable FTP server on device.
+
+        Must be called before downloading files. FTP and TCP can work in tandem.
+
+        Args:
+            unit_id: Unit identifier
+
+        Returns:
+            Dict with status message
+        """
+        return await self._request("POST", f"/{unit_id}/ftp/enable")
+
+    async def disable_ftp(self, unit_id: str) -> Dict[str, Any]:
+        """
+        Disable FTP server on device.
+
+        Args:
+            unit_id: Unit identifier
+
+        Returns:
+            Dict with status message
+        """
+        return await self._request("POST", f"/{unit_id}/ftp/disable")
+
+    async def get_ftp_status(self, unit_id: str) -> Dict[str, Any]:
+        """
+        Get FTP server status on device.
+
+        Args:
+            unit_id: Unit identifier
+
+        Returns:
+            Dict with ftp_enabled status
+        """
+        return await self._request("GET", f"/{unit_id}/ftp/status")
+
+    # ========================================================================
+    # Data Download
+    # ========================================================================
+
+    async def download_file(
+        self,
+        unit_id: str,
+        remote_path: str,
+    ) -> Dict[str, Any]:
+        """
+        Download a single file from unit via FTP.
+
+        Args:
+            unit_id: Unit identifier
+            remote_path: Path on device to download (e.g., "/NL43_DATA/measurement.wav")
+
+        Returns:
+            Binary file content (as response)
+        """
+        data = {"remote_path": remote_path}
+        return await self._request("POST", f"/{unit_id}/ftp/download", data=data)
+
+    async def download_folder(
+        self,
+        unit_id: str,
+        remote_path: str,
+    ) -> Dict[str, Any]:
+        """
+        Download an entire folder from unit via FTP as a ZIP archive.
+
+        Useful for downloading complete measurement sessions (e.g., Auto_0000 folders).
+
+        Args:
+            unit_id: Unit identifier
+            remote_path: Folder path on device to download (e.g., "/NL43_DATA/Auto_0000")
+
+        Returns:
+            Dict with local_path, folder_name, file_count, zip_size_bytes
+        """
+        data = {"remote_path": remote_path}
+        return await self._request("POST", f"/{unit_id}/ftp/download-folder", data=data)
+
+    async def download_current_measurement(
+        self,
+        unit_id: str,
+    ) -> Dict[str, Any]:
+        """
+        Download the current measurement folder based on device's index number.
+
+        This is the recommended method for scheduled downloads - it automatically
+        determines which folder to download based on the device's current store index.
+
+        Args:
+            unit_id: Unit identifier
+
+        Returns:
+            Dict with local_path, folder_name, file_count, zip_size_bytes, index_number
+        """
+        # Get current index number from device
+        index_info = await self.get_index_number(unit_id)
+        index_number = index_info.get("index_number", 0)
+
+        # Format as Auto_XXXX folder name
+        folder_name = f"Auto_{index_number:04d}"
+        remote_path = f"/NL43_DATA/{folder_name}"
+
+        # Download the folder
+        result = await self.download_folder(unit_id, remote_path)
+        result["index_number"] = index_number
+        return result
+
     async def download_files(
         self,
         unit_id: str,
@@ -488,23 +597,24 @@ class SLMMClient:
         files: Optional[List[str]] = None,
     ) -> Dict[str, Any]:
         """
-        Download files from unit via FTP.
+        Download measurement files from unit via FTP.
 
-        NOTE: This endpoint doesn't exist in SLMM yet. Will need to implement.
+        This method automatically determines the current measurement folder and downloads it.
+        The destination_path parameter is logged for reference but actual download location
+        is managed by SLMM (data/downloads/{unit_id}/).
 
         Args:
             unit_id: Unit identifier
-            destination_path: Local path to save files
+            destination_path: Reference path (for logging/metadata, not used by SLMM)
-            files: List of filenames to download, or None for all
+            files: Ignored - always downloads the current measurement folder
 
         Returns:
-            Dict with downloaded files list and metadata
+            Dict with download result including local_path, folder_name, etc.
         """
-        data = {
+        # Use the new method that automatically determines what to download
-            "destination_path": destination_path,
+        result = await self.download_current_measurement(unit_id)
-            "files": files or "all",
+        result["requested_destination"] = destination_path
-        }
+        return result
-        return await self._request("POST", f"/{unit_id}/ftp/download", data=data)
 
     # ========================================================================
     # Cycle Commands (for scheduled automation)

backend/services/slmm_sync.py

@@ -36,6 +36,10 @@ async def sync_slm_to_slmm(unit: RosterUnit) -> bool:
         logger.warning(f"SLM {unit.id} has no host configured, skipping SLMM sync")
         return False
 
+    # Disable polling if unit is benched (deployed=False) or retired
+    # Only actively deployed units should be polled
+    should_poll = unit.deployed and not unit.retired
+
     try:
         async with httpx.AsyncClient(timeout=5.0) as client:
             response = await client.put(
@@ -47,8 +51,8 @@ async def sync_slm_to_slmm(unit: RosterUnit) -> bool:
                     "ftp_enabled": True,
                     "ftp_username": "USER",  # Default NL43 credentials
                     "ftp_password": "0000",
-                    "poll_enabled": not unit.retired,  # Disable polling for retired units
+                    "poll_enabled": should_poll,  # Disable polling for benched or retired units
-                    "poll_interval_seconds": 60,  # Default interval
+                    "poll_interval_seconds": 3600,  # Default to 1 hour polling
                 }
             )
 

backend/services/snapshot.py

@@ -108,6 +108,7 @@ def emit_status_snapshot():
                 "last_calibrated": r.last_calibrated.isoformat() if r.last_calibrated else None,
                 "next_calibration_due": r.next_calibration_due.isoformat() if r.next_calibration_due else None,
                 "deployed_with_modem_id": r.deployed_with_modem_id,
+                "deployed_with_unit_id": r.deployed_with_unit_id,
                 "ip_address": r.ip_address,
                 "phone_number": r.phone_number,
                     "hardware_model": r.hardware_model,
@@ -137,6 +138,7 @@ def emit_status_snapshot():
                     "last_calibrated": None,
                     "next_calibration_due": None,
                     "deployed_with_modem_id": None,
+                    "deployed_with_unit_id": None,
                     "ip_address": None,
                     "phone_number": None,
                     "hardware_model": None,
@@ -146,6 +148,34 @@ def emit_status_snapshot():
                     "coordinates": "",
                 }
 
+        # --- Derive modem status from paired devices ---
+        # Modems don't have their own check-in system, so we inherit status
+        # from whatever device they're paired with (seismograph or SLM)
+        # Check both directions: modem.deployed_with_unit_id OR device.deployed_with_modem_id
+        for unit_id, unit_data in units.items():
+            if unit_data.get("device_type") == "modem" and not unit_data.get("retired"):
+                paired_unit_id = None
+                roster_unit = roster.get(unit_id)
+
+                # First, check if modem has deployed_with_unit_id set
+                if roster_unit and roster_unit.deployed_with_unit_id:
+                    paired_unit_id = roster_unit.deployed_with_unit_id
+                else:
+                    # Fallback: check if any device has this modem in deployed_with_modem_id
+                    for other_id, other_roster in roster.items():
+                        if other_roster.deployed_with_modem_id == unit_id:
+                            paired_unit_id = other_id
+                            break
+
+                if paired_unit_id:
+                    paired_unit = units.get(paired_unit_id)
+                    if paired_unit:
+                        # Inherit status from paired device
+                        unit_data["status"] = paired_unit.get("status", "Missing")
+                        unit_data["age"] = paired_unit.get("age", "N/A")
+                        unit_data["last"] = paired_unit.get("last")
+                        unit_data["derived_from"] = paired_unit_id
+
         # Separate buckets for UI
         active_units = {
             uid: u for uid, u in units.items()

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
 
   # --- TERRA-VIEW PRODUCTION ---
-  terra-view-prod:
+  terra-view:
     build: .
     container_name: terra-view
     ports:

sample_roster.csv

@@ -1,6 +1,23 @@
-unit_id,unit_type,deployed,retired,note,project_id,location
+unit_id,device_type,unit_type,deployed,retired,note,project_id,location,address,coordinates,last_calibrated,next_calibration_due,deployed_with_modem_id,ip_address,phone_number,hardware_model,slm_host,slm_tcp_port,slm_ftp_port,slm_model,slm_serial_number,slm_frequency_weighting,slm_time_weighting,slm_measurement_range
-BE1234,series3,true,false,Primary unit at main site,PROJ-001,San Francisco CA
+# ============================================
-BE5678,series3,true,false,Backup sensor,PROJ-001,Los Angeles CA
+# SEISMOGRAPHS (device_type=seismograph)
-BE9012,series3,false,false,In maintenance,PROJ-002,Workshop
+# ============================================
-BE3456,series3,true,false,,PROJ-003,New York NY
+BE1234,seismograph,series3,true,false,Primary unit at main site,PROJ-001,San Francisco CA,123 Market St,37.7749;-122.4194,2025-06-15,2026-06-15,MDM001,,,,,,,,,,,
-BE7890,series3,false,true,Decommissioned 2024,,Storage
+BE5678,seismograph,series3,true,false,Backup sensor,PROJ-001,Los Angeles CA,456 Sunset Blvd,34.0522;-118.2437,2025-03-01,2026-03-01,MDM002,,,,,,,,,,,
+BE9012,seismograph,series4,false,false,In maintenance - needs calibration,PROJ-002,Workshop,789 Industrial Way,,,,,,,,,,,,,,
+BE3456,seismograph,series3,true,false,,PROJ-003,New York NY,101 Broadway,40.7128;-74.0060,2025-01-10,2026-01-10,,,,,,,,,,,
+BE7890,seismograph,series3,false,true,Decommissioned 2024,,Storage,Warehouse B,,,,,,,,,,,,,,,
+# ============================================
+# MODEMS (device_type=modem)
+# ============================================
+MDM001,modem,,true,false,Cradlepoint at SF site,PROJ-001,San Francisco CA,123 Market St,37.7749;-122.4194,,,,,192.168.1.100,+1-555-0101,IBR900,,,,,,,
+MDM002,modem,,true,false,Sierra Wireless at LA site,PROJ-001,Los Angeles CA,456 Sunset Blvd,34.0522;-118.2437,,,,,10.0.0.50,+1-555-0102,RV55,,,,,,,
+MDM003,modem,,false,false,Spare modem in storage,,,Storage,Warehouse A,,,,,,+1-555-0103,IBR600,,,,,,,
+MDM004,modem,,true,false,NYC backup modem,PROJ-003,New York NY,101 Broadway,40.7128;-74.0060,,,,,172.16.0.25,+1-555-0104,IBR1700,,,,,,,
+# ============================================
+# SOUND LEVEL METERS (device_type=slm)
+# ============================================
+SLM001,slm,,true,false,NL-43 at construction site A,PROJ-004,Downtown Site,500 Main St,40.7589;-73.9851,,,,,,,,192.168.10.101,2255,21,NL-43,12345678,A,F,30-130 dB
+SLM002,slm,,true,false,NL-43 at construction site B,PROJ-004,Midtown Site,600 Park Ave,40.7614;-73.9776,,,MDM004,,,,,192.168.10.102,2255,21,NL-43,12345679,A,S,30-130 dB
+SLM003,slm,,false,false,NL-53 spare unit,,,Storage,Warehouse A,,,,,,,,,,,NL-53,98765432,C,F,25-138 dB
+SLM004,slm,,true,false,NL-43 nighttime monitoring,PROJ-005,Residential Area,200 Quiet Lane,40.7484;-73.9857,,,,,,,,10.0.5.50,2255,21,NL-43,11112222,A,S,30-130 dB

templates/base.html

@@ -130,6 +130,20 @@
                     Sound Level Meters
                 </a>
 
+                <a href="/modems" class="flex items-center px-4 py-3 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 {% if request.url.path == '/modems' %}bg-gray-100 dark:bg-gray-700{% endif %}">
+                    <svg class="w-5 h-5 mr-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.111 16.404a5.5 5.5 0 017.778 0M12 20h.01m-7.08-7.071c3.904-3.905 10.236-3.905 14.141 0M1.394 9.393c5.857-5.857 15.355-5.857 21.213 0"></path>
+                    </svg>
+                    Modems
+                </a>
+
+                <a href="/pair-devices" class="flex items-center px-4 py-3 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 {% if request.url.path == '/pair-devices' %}bg-gray-100 dark:bg-gray-700{% endif %}">
+                    <svg class="w-5 h-5 mr-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"></path>
+                    </svg>
+                    Pair Devices
+                </a>
+
                 <a href="/projects" class="flex items-center px-4 py-3 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 {% if request.url.path.startswith('/projects') %}bg-gray-100 dark:bg-gray-700{% endif %}">
                     <svg class="w-5 h-5 mr-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10"></path>
@@ -377,10 +391,10 @@
     </script>
 
     <!-- Offline Database -->
-    <script src="/static/offline-db.js?v=0.4.3"></script>
+    <script src="/static/offline-db.js?v=0.5.1"></script>
 
     <!-- Mobile JavaScript -->
-    <script src="/static/mobile.js?v=0.4.3"></script>
+    <script src="/static/mobile.js?v=0.5.1"></script>
 
     {% block extra_scripts %}{% endblock %}
 </body>

templates/dashboard.html

@@ -187,6 +187,68 @@
 
     </div>
 
+    <!-- Dashboard Filters -->
+    <div class="rounded-xl shadow-lg bg-white dark:bg-slate-700 p-4 mb-4" id="dashboard-filters-card">
+        <div class="flex items-center justify-between mb-3">
+            <h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300">Filter Dashboard</h3>
+            <button onclick="resetFilters()" class="text-xs text-gray-500 hover:text-seismo-orange dark:hover:text-seismo-orange transition-colors">
+                Reset Filters
+            </button>
+        </div>
+
+        <div class="flex flex-wrap gap-6">
+            <!-- Device Type Filters -->
+            <div class="flex flex-col gap-1">
+                <span class="text-xs text-gray-500 dark:text-gray-400 font-medium uppercase tracking-wide">Device Type</span>
+                <div class="flex gap-4">
+                    <label class="flex items-center gap-1.5 cursor-pointer">
+                        <input type="checkbox" id="filter-seismograph" checked
+                               class="rounded border-gray-300 text-blue-600 focus:ring-blue-500 dark:border-gray-600 dark:bg-slate-800"
+                               onchange="applyFilters()">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Seismographs</span>
+                    </label>
+                    <label class="flex items-center gap-1.5 cursor-pointer">
+                        <input type="checkbox" id="filter-slm" checked
+                               class="rounded border-gray-300 text-purple-600 focus:ring-purple-500 dark:border-gray-600 dark:bg-slate-800"
+                               onchange="applyFilters()">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">SLMs</span>
+                    </label>
+                    <label class="flex items-center gap-1.5 cursor-pointer">
+                        <input type="checkbox" id="filter-modem" checked
+                               class="rounded border-gray-300 text-cyan-600 focus:ring-cyan-500 dark:border-gray-600 dark:bg-slate-800"
+                               onchange="applyFilters()">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Modems</span>
+                    </label>
+                </div>
+            </div>
+
+            <!-- Status Filters -->
+            <div class="flex flex-col gap-1">
+                <span class="text-xs text-gray-500 dark:text-gray-400 font-medium uppercase tracking-wide">Status</span>
+                <div class="flex gap-4">
+                    <label class="flex items-center gap-1.5 cursor-pointer">
+                        <input type="checkbox" id="filter-ok" checked
+                               class="rounded border-gray-300 text-green-600 focus:ring-green-500 dark:border-gray-600 dark:bg-slate-800"
+                               onchange="applyFilters()">
+                        <span class="text-sm text-green-600 dark:text-green-400">OK</span>
+                    </label>
+                    <label class="flex items-center gap-1.5 cursor-pointer">
+                        <input type="checkbox" id="filter-pending" checked
+                               class="rounded border-gray-300 text-yellow-600 focus:ring-yellow-500 dark:border-gray-600 dark:bg-slate-800"
+                               onchange="applyFilters()">
+                        <span class="text-sm text-yellow-600 dark:text-yellow-400">Pending</span>
+                    </label>
+                    <label class="flex items-center gap-1.5 cursor-pointer">
+                        <input type="checkbox" id="filter-missing" checked
+                               class="rounded border-gray-300 text-red-600 focus:ring-red-500 dark:border-gray-600 dark:bg-slate-800"
+                               onchange="applyFilters()">
+                        <span class="text-sm text-red-600 dark:text-red-400">Missing</span>
+                    </label>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <!-- Fleet Map -->
     <div class="rounded-xl shadow-lg bg-white dark:bg-slate-700 p-6 mb-8" id="fleet-map-card">
         <div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('fleet-map')">
@@ -302,6 +364,254 @@
 
 
 <script>
+// ===== Dashboard Filtering System =====
+let currentSnapshotData = null;  // Store latest snapshot data for re-filtering
+
+// Filter state - tracks which device types and statuses to show
+const filters = {
+    deviceTypes: {
+        seismograph: true,
+        sound_level_meter: true,
+        modem: true
+    },
+    statuses: {
+        OK: true,
+        Pending: true,
+        Missing: true
+    }
+};
+
+// Load saved filter preferences from localStorage
+function loadFilterPreferences() {
+    const saved = localStorage.getItem('dashboardFilters');
+    if (saved) {
+        try {
+            const parsed = JSON.parse(saved);
+            if (parsed.deviceTypes) Object.assign(filters.deviceTypes, parsed.deviceTypes);
+            if (parsed.statuses) Object.assign(filters.statuses, parsed.statuses);
+        } catch (e) {
+            console.error('Error loading filter preferences:', e);
+        }
+    }
+
+    // Sync checkboxes with loaded state
+    const seismoCheck = document.getElementById('filter-seismograph');
+    const slmCheck = document.getElementById('filter-slm');
+    const modemCheck = document.getElementById('filter-modem');
+    const okCheck = document.getElementById('filter-ok');
+    const pendingCheck = document.getElementById('filter-pending');
+    const missingCheck = document.getElementById('filter-missing');
+
+    if (seismoCheck) seismoCheck.checked = filters.deviceTypes.seismograph;
+    if (slmCheck) slmCheck.checked = filters.deviceTypes.sound_level_meter;
+    if (modemCheck) modemCheck.checked = filters.deviceTypes.modem;
+    if (okCheck) okCheck.checked = filters.statuses.OK;
+    if (pendingCheck) pendingCheck.checked = filters.statuses.Pending;
+    if (missingCheck) missingCheck.checked = filters.statuses.Missing;
+}
+
+// Save filter preferences to localStorage
+function saveFilterPreferences() {
+    localStorage.setItem('dashboardFilters', JSON.stringify(filters));
+}
+
+// Apply filters - called when any checkbox changes
+function applyFilters() {
+    // Update filter state from checkboxes
+    const seismoCheck = document.getElementById('filter-seismograph');
+    const slmCheck = document.getElementById('filter-slm');
+    const modemCheck = document.getElementById('filter-modem');
+    const okCheck = document.getElementById('filter-ok');
+    const pendingCheck = document.getElementById('filter-pending');
+    const missingCheck = document.getElementById('filter-missing');
+
+    if (seismoCheck) filters.deviceTypes.seismograph = seismoCheck.checked;
+    if (slmCheck) filters.deviceTypes.sound_level_meter = slmCheck.checked;
+    if (modemCheck) filters.deviceTypes.modem = modemCheck.checked;
+    if (okCheck) filters.statuses.OK = okCheck.checked;
+    if (pendingCheck) filters.statuses.Pending = pendingCheck.checked;
+    if (missingCheck) filters.statuses.Missing = missingCheck.checked;
+
+    saveFilterPreferences();
+
+    // Re-render with current data and filters
+    if (currentSnapshotData) {
+        renderFilteredDashboard(currentSnapshotData);
+    }
+}
+
+// Reset all filters to show everything
+function resetFilters() {
+    filters.deviceTypes = { seismograph: true, sound_level_meter: true, modem: true };
+    filters.statuses = { OK: true, Pending: true, Missing: true };
+
+    // Update all checkboxes
+    const checkboxes = [
+        'filter-seismograph', 'filter-slm', 'filter-modem',
+        'filter-ok', 'filter-pending', 'filter-missing'
+    ];
+    checkboxes.forEach(id => {
+        const el = document.getElementById(id);
+        if (el) el.checked = true;
+    });
+
+    saveFilterPreferences();
+
+    if (currentSnapshotData) {
+        renderFilteredDashboard(currentSnapshotData);
+    }
+}
+
+// Check if a unit passes the current filters
+function unitPassesFilter(unit) {
+    const deviceType = unit.device_type || 'seismograph';
+    const status = unit.status || 'Missing';
+
+    // Check device type filter
+    if (!filters.deviceTypes[deviceType]) {
+        return false;
+    }
+
+    // Check status filter
+    if (!filters.statuses[status]) {
+        return false;
+    }
+
+    return true;
+}
+
+// Get display label for device type
+function getDeviceTypeLabel(deviceType) {
+    switch(deviceType) {
+        case 'sound_level_meter': return 'SLM';
+        case 'modem': return 'Modem';
+        default: return 'Seismograph';
+    }
+}
+
+// Render dashboard with filtered data
+function renderFilteredDashboard(data) {
+    // Filter active units for alerts
+    const filteredActive = {};
+    Object.entries(data.active || {}).forEach(([id, unit]) => {
+        if (unitPassesFilter(unit)) {
+            filteredActive[id] = unit;
+        }
+    });
+
+    // Update alerts with filtered data
+    updateAlertsFiltered(filteredActive);
+
+    // Update map with filtered data
+    updateFleetMapFiltered(data.units);
+}
+
+// Update the Recent Alerts section with filtering
+function updateAlertsFiltered(filteredActive) {
+    const alertsList = document.getElementById('alerts-list');
+    const missingUnits = Object.entries(filteredActive).filter(([_, u]) => u.status === 'Missing');
+
+    if (!missingUnits.length) {
+        // Check if this is because of filters or genuinely no alerts
+        const anyMissing = currentSnapshotData && Object.values(currentSnapshotData.active || {}).some(u => u.status === 'Missing');
+        if (anyMissing) {
+            alertsList.innerHTML = '<p class="text-sm text-gray-500 dark:text-gray-400">No alerts match current filters</p>';
+        } else {
+            alertsList.innerHTML = '<p class="text-sm text-green-600 dark:text-green-400">All units reporting normally</p>';
+        }
+    } else {
+        let alertsHtml = '';
+        missingUnits.forEach(([id, unit]) => {
+            const deviceLabel = getDeviceTypeLabel(unit.device_type);
+            alertsHtml += `
+            <div class="flex items-start space-x-2 text-sm">
+                <span class="w-2 h-2 rounded-full bg-red-500 mt-1.5"></span>
+                <div>
+                    <a href="/unit/${id}" class="font-medium text-red-600 dark:text-red-400 hover:underline">${id}</a>
+                    <span class="text-xs text-gray-500 ml-1">(${deviceLabel})</span>
+                    <p class="text-gray-600 dark:text-gray-400">Missing for ${unit.age}</p>
+                </div>
+            </div>`;
+        });
+        alertsList.innerHTML = alertsHtml;
+    }
+}
+
+// Update map with filtered data
+function updateFleetMapFiltered(allUnits) {
+    if (!fleetMap) return;
+
+    // Clear existing markers
+    fleetMarkers.forEach(marker => fleetMap.removeLayer(marker));
+    fleetMarkers = [];
+
+    // Get deployed units with coordinates that pass the filter
+    const deployedUnits = Object.entries(allUnits || {})
+        .filter(([_, u]) => u.deployed && u.coordinates && unitPassesFilter(u));
+
+    if (deployedUnits.length === 0) {
+        return;
+    }
+
+    const bounds = [];
+
+    deployedUnits.forEach(([id, unit]) => {
+        const coords = parseLocation(unit.coordinates);
+        if (coords) {
+            const [lat, lon] = coords;
+
+            // Color based on status
+            const markerColor = unit.status === 'OK' ? 'green' :
+                               unit.status === 'Pending' ? 'orange' : 'red';
+
+            // Different marker style per device type
+            const deviceType = unit.device_type || 'seismograph';
+            let radius = 8;
+            let weight = 2;
+
+            if (deviceType === 'modem') {
+                radius = 6;
+                weight = 2;
+            } else if (deviceType === 'sound_level_meter') {
+                radius = 8;
+                weight = 3;
+            }
+
+            const marker = L.circleMarker([lat, lon], {
+                radius: radius,
+                fillColor: markerColor,
+                color: '#fff',
+                weight: weight,
+                opacity: 1,
+                fillOpacity: 0.8
+            }).addTo(fleetMap);
+
+            // Popup with device type
+            const deviceLabel = getDeviceTypeLabel(deviceType);
+
+            marker.bindPopup(`
+                <div class="p-2">
+                    <h3 class="font-bold text-lg">${id}</h3>
+                    <p class="text-sm text-gray-600">${deviceLabel}</p>
+                    <p class="text-sm">Status: <span style="color: ${markerColor}">${unit.status}</span></p>
+                    ${unit.note ? `<p class="text-sm text-gray-600">${unit.note}</p>` : ''}
+                    <a href="/unit/${id}" class="text-blue-600 hover:underline text-sm">View Details</a>
+                </div>
+            `);
+
+            fleetMarkers.push(marker);
+            bounds.push([lat, lon]);
+        }
+    });
+
+    // Fit bounds if we have markers
+    if (bounds.length > 0) {
+        const padding = window.innerWidth < 768 ? [20, 20] : [50, 50];
+        fleetMap.fitBounds(bounds, { padding: padding });
+        fleetMapInitialized = true;
+    }
+}
+
 // Toggle card collapse/expand (mobile only)
 function toggleCard(cardName) {
     // Only work on mobile
@@ -366,8 +676,17 @@ if (document.readyState === 'loading') {
 
 function updateDashboard(event) {
     try {
+        // Only process responses from /api/status-snapshot
+        const requestUrl = event.detail.xhr.responseURL || event.detail.pathInfo?.requestPath;
+        if (!requestUrl || !requestUrl.includes('/api/status-snapshot')) {
+            return; // Ignore responses from other endpoints (like /dashboard/todays-actions)
+        }
+
         const data = JSON.parse(event.detail.xhr.response);
 
+        // Store data for filter re-application
+        currentSnapshotData = data;
+
         // Update "Last updated" timestamp with timezone
         const now = new Date();
         const timezone = localStorage.getItem('timezone') || 'America/New_York';
@@ -379,7 +698,7 @@ function updateDashboard(event) {
             timeZoneName: 'short'
         });
 
-        // ===== Fleet summary numbers =====
+        // ===== Fleet summary numbers (always unfiltered) =====
         document.getElementById('total-units').textContent = data.summary?.total ?? 0;
         document.getElementById('deployed-units').textContent = data.summary?.active ?? 0;
         document.getElementById('benched-units').textContent = data.summary?.benched ?? 0;
@@ -387,9 +706,10 @@ function updateDashboard(event) {
         document.getElementById('status-pending').textContent = data.summary?.pending ?? 0;
         document.getElementById('status-missing').textContent = data.summary?.missing ?? 0;
 
-        // ===== Device type counts =====
+        // ===== Device type counts (always unfiltered) =====
         let seismoCount = 0;
         let slmCount = 0;
+        let modemCount = 0;
         Object.values(data.units || {}).forEach(unit => {
             if (unit.retired) return; // Don't count retired units
             const deviceType = unit.device_type || 'seismograph';
@@ -397,46 +717,26 @@ function updateDashboard(event) {
                 seismoCount++;
             } else if (deviceType === 'sound_level_meter') {
                 slmCount++;
+            } else if (deviceType === 'modem') {
+                modemCount++;
             }
         });
         document.getElementById('seismo-count').textContent = seismoCount;
         document.getElementById('slm-count').textContent = slmCount;
 
-        // ===== Alerts =====
+        // ===== Apply filters and render map + alerts =====
-        const alertsList = document.getElementById('alerts-list');
+        renderFilteredDashboard(data);
-        // Only show alerts for deployed units that are MISSING (not pending)
-        const missingUnits = Object.entries(data.active).filter(([_, u]) => u.status === 'Missing');
-
-        if (!missingUnits.length) {
-            alertsList.innerHTML =
-                '<p class="text-sm text-green-600 dark:text-green-400">✓ All units reporting normally</p>';
-        } else {
-            let alertsHtml = '';
-
-            missingUnits.forEach(([id, unit]) => {
-                alertsHtml += `
-                <div class="flex items-start space-x-2 text-sm">
-                    <span class="w-2 h-2 rounded-full bg-red-500 mt-1.5"></span>
-                    <div>
-                        <a href="/unit/${id}" class="font-medium text-red-600 dark:text-red-400 hover:underline">${id}</a>
-                        <p class="text-gray-600 dark:text-gray-400">Missing for ${unit.age}</p>
-                    </div>
-                </div>`;
-            });
-
-            alertsList.innerHTML = alertsHtml;
-        }
-
-        // ===== Update Fleet Map =====
-        updateFleetMap(data);
 
     } catch (err) {
         console.error("Dashboard update error:", err);
     }
 }
 
-// Handle tab switching
+// Handle tab switching and initialize components
 document.addEventListener('DOMContentLoaded', function() {
+    // Load filter preferences
+    loadFilterPreferences();
+
     const tabButtons = document.querySelectorAll('.tab-button');
 
     tabButtons.forEach(button => {
@@ -476,64 +776,6 @@ function initFleetMap() {
     }, 100);
 }
 
-function updateFleetMap(data) {
-    if (!fleetMap) return;
-
-    // Clear existing markers
-    fleetMarkers.forEach(marker => fleetMap.removeLayer(marker));
-    fleetMarkers = [];
-
-    // Get deployed units with coordinates data
-    const deployedUnits = Object.entries(data.units).filter(([_, u]) => u.deployed && u.coordinates);
-
-    if (deployedUnits.length === 0) {
-        return;
-    }
-
-    const bounds = [];
-
-    deployedUnits.forEach(([id, unit]) => {
-        const coords = parseLocation(unit.coordinates);
-        if (coords) {
-            const [lat, lon] = coords;
-
-            // Create marker with custom color based on status
-            const markerColor = unit.status === 'OK' ? 'green' : unit.status === 'Pending' ? 'orange' : 'red';
-
-            const marker = L.circleMarker([lat, lon], {
-                radius: 8,
-                fillColor: markerColor,
-                color: '#fff',
-                weight: 2,
-                opacity: 1,
-                fillOpacity: 0.8
-            }).addTo(fleetMap);
-
-            // Add popup with unit info
-            marker.bindPopup(`
-                <div class="p-2">
-                    <h3 class="font-bold text-lg">${id}</h3>
-                    <p class="text-sm">Status: <span style="color: ${markerColor}">${unit.status}</span></p>
-                    <p class="text-sm">Type: ${unit.device_type}</p>
-                    ${unit.note ? `<p class="text-sm text-gray-600">${unit.note}</p>` : ''}
-                    <a href="/unit/${id}" class="text-blue-600 hover:underline text-sm">View Details →</a>
-                </div>
-            `);
-
-            fleetMarkers.push(marker);
-            bounds.push([lat, lon]);
-        }
-    });
-
-    // Fit map to show all markers
-    if (bounds.length > 0) {
-        // Use different padding for mobile vs desktop
-        const padding = window.innerWidth < 768 ? [20, 20] : [50, 50];
-        fleetMap.fitBounds(bounds, { padding: padding });
-        fleetMapInitialized = true;
-    }
-}
-
 function parseLocation(location) {
     if (!location) return null;
 

templates/modems.html

@@ -0,0 +1,102 @@
+{% extends "base.html" %}
+
+{% block title %}Field Modems - Terra-View{% endblock %}
+
+{% block content %}
+<div class="mb-8">
+    <h1 class="text-3xl font-bold text-gray-900 dark:text-white flex items-center">
+        <svg class="w-8 h-8 mr-3 text-seismo-orange" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.111 16.404a5.5 5.5 0 017.778 0M12 20h.01m-7.08-7.071c3.904-3.905 10.236-3.905 14.141 0M1.394 9.393c5.857-5.857 15.355-5.857 21.213 0"></path>
+        </svg>
+        Field Modems
+    </h1>
+    <p class="text-gray-600 dark:text-gray-400 mt-1">Manage network connectivity devices for field equipment</p>
+</div>
+
+<!-- Summary Stats -->
+<div class="grid grid-cols-1 md:grid-cols-4 gap-6 mb-8"
+     hx-get="/api/modem-dashboard/stats"
+     hx-trigger="load, every 30s"
+     hx-swap="innerHTML">
+    <!-- Stats will be loaded here -->
+    <div class="animate-pulse bg-gray-200 dark:bg-gray-700 h-24 rounded-xl"></div>
+    <div class="animate-pulse bg-gray-200 dark:bg-gray-700 h-24 rounded-xl"></div>
+    <div class="animate-pulse bg-gray-200 dark:bg-gray-700 h-24 rounded-xl"></div>
+    <div class="animate-pulse bg-gray-200 dark:bg-gray-700 h-24 rounded-xl"></div>
+</div>
+
+<!-- Modem List -->
+<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6">
+    <div class="flex items-center justify-between mb-6">
+        <h2 class="text-xl font-semibold text-gray-900 dark:text-white">All Modems</h2>
+        <div class="flex items-center gap-4">
+            <!-- Search -->
+            <div class="relative">
+                <input type="text"
+                       id="modem-search"
+                       placeholder="Search modems..."
+                       class="pl-9 pr-4 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange focus:border-transparent"
+                       hx-get="/api/modem-dashboard/units"
+                       hx-trigger="keyup changed delay:300ms"
+                       hx-target="#modem-list"
+                       hx-include="[name='search']"
+                       name="search">
+                <svg class="w-4 h-4 absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+                </svg>
+            </div>
+            <a href="/roster?device_type=modem" class="text-sm text-seismo-orange hover:underline">
+                Add modem in roster
+            </a>
+        </div>
+    </div>
+
+    <div id="modem-list"
+         hx-get="/api/modem-dashboard/units"
+         hx-trigger="load, every 30s"
+         hx-swap="innerHTML">
+        <p class="text-gray-500 dark:text-gray-400">Loading modems...</p>
+    </div>
+</div>
+
+<script>
+// Ping a modem and show result
+async function pingModem(modemId) {
+    const btn = document.getElementById(`ping-btn-${modemId}`);
+    const resultDiv = document.getElementById(`ping-result-${modemId}`);
+
+    // Show loading state
+    const originalText = btn.textContent;
+    btn.textContent = 'Pinging...';
+    btn.disabled = true;
+    resultDiv.classList.remove('hidden');
+    resultDiv.className = 'mt-2 text-xs text-gray-500';
+    resultDiv.textContent = 'Testing connection...';
+
+    try {
+        const response = await fetch(`/api/modem-dashboard/${modemId}/ping`);
+        const data = await response.json();
+
+        if (data.status === 'success') {
+            resultDiv.className = 'mt-2 text-xs text-green-600 dark:text-green-400';
+            resultDiv.innerHTML = `<span class="inline-block w-2 h-2 bg-green-500 rounded-full mr-1"></span>Online (${data.response_time_ms}ms)`;
+        } else {
+            resultDiv.className = 'mt-2 text-xs text-red-600 dark:text-red-400';
+            resultDiv.innerHTML = `<span class="inline-block w-2 h-2 bg-red-500 rounded-full mr-1"></span>${data.detail || 'Offline'}`;
+        }
+    } catch (error) {
+        resultDiv.className = 'mt-2 text-xs text-red-600 dark:text-red-400';
+        resultDiv.textContent = 'Error: ' + error.message;
+    }
+
+    // Restore button
+    btn.textContent = originalText;
+    btn.disabled = false;
+
+    // Hide result after 10 seconds
+    setTimeout(() => {
+        resultDiv.classList.add('hidden');
+    }, 10000);
+}
+</script>
+{% endblock %}

templates/pair_devices.html

@@ -0,0 +1,566 @@
+{% extends "base.html" %}
+
+{% block title %}Pair Devices - Terra-View{% endblock %}
+
+{% block content %}
+<div class="max-w-7xl mx-auto">
+    <!-- Header -->
+    <div class="mb-6">
+        <h1 class="text-2xl font-bold text-gray-900 dark:text-white">Pair Devices</h1>
+        <p class="mt-1 text-sm text-gray-600 dark:text-gray-400">
+            Select a recorder (seismograph or SLM) and a modem to create a bidirectional pairing.
+        </p>
+    </div>
+
+    <!-- Selection Summary Bar -->
+    <div id="selection-bar" class="mb-6 p-4 bg-white dark:bg-slate-800 rounded-lg shadow border border-gray-200 dark:border-gray-700">
+        <div class="flex items-center justify-between flex-wrap gap-4">
+            <div class="flex items-center gap-6">
+                <div class="flex items-center gap-2">
+                    <span class="text-sm text-gray-600 dark:text-gray-400">Recorder:</span>
+                    <span id="selected-recorder" class="font-mono font-medium text-gray-900 dark:text-white">None selected</span>
+                </div>
+                <svg class="w-5 h-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 5l7 7m0 0l-7 7m7-7H3"></path>
+                </svg>
+                <div class="flex items-center gap-2">
+                    <span class="text-sm text-gray-600 dark:text-gray-400">Modem:</span>
+                    <span id="selected-modem" class="font-mono font-medium text-gray-900 dark:text-white">None selected</span>
+                </div>
+            </div>
+            <div class="flex items-center gap-3">
+                <button id="clear-selection-btn"
+                        onclick="clearSelection()"
+                        class="px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 bg-gray-100 dark:bg-gray-700 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-600 disabled:opacity-50 disabled:cursor-not-allowed"
+                        disabled>
+                    Clear
+                </button>
+                <button id="pair-btn"
+                        onclick="pairDevices()"
+                        class="px-4 py-2 text-sm font-medium text-white bg-seismo-orange rounded-lg hover:bg-orange-600 disabled:opacity-50 disabled:cursor-not-allowed"
+                        disabled>
+                    Pair Devices
+                </button>
+            </div>
+        </div>
+    </div>
+
+    <!-- Two Column Layout -->
+    <div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
+        <!-- Left Column: Recorders (Seismographs + SLMs) -->
+        <div class="bg-white dark:bg-slate-800 rounded-lg shadow border border-gray-200 dark:border-gray-700">
+            <div class="px-4 py-3 border-b border-gray-200 dark:border-gray-700">
+                <div class="flex items-center justify-between mb-3">
+                    <h2 class="text-lg font-semibold text-gray-900 dark:text-white flex items-center gap-2">
+                        <svg class="w-5 h-5 text-seismo-orange" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z"></path>
+                        </svg>
+                        Recorders
+                        <span id="recorder-count" class="text-sm font-normal text-gray-500 dark:text-gray-400">({{ recorders|length }})</span>
+                    </h2>
+                </div>
+                <!-- Recorder Search & Filters -->
+                <div class="space-y-2">
+                    <input type="text" id="recorder-search" placeholder="Search by ID..."
+                           class="w-full px-3 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white text-sm focus:ring-2 focus:ring-seismo-orange focus:border-seismo-orange"
+                           oninput="filterRecorders()">
+                    <div class="flex items-center gap-4">
+                        <label class="flex items-center gap-2 cursor-pointer">
+                            <input type="checkbox" id="recorder-hide-paired" onchange="filterRecorders()" class="rounded border-gray-300 dark:border-gray-600 text-seismo-orange focus:ring-seismo-orange">
+                            <span class="text-xs text-gray-600 dark:text-gray-400">Hide paired</span>
+                        </label>
+                        <label class="flex items-center gap-2 cursor-pointer">
+                            <input type="checkbox" id="recorder-deployed-only" onchange="filterRecorders()" class="rounded border-gray-300 dark:border-gray-600 text-seismo-orange focus:ring-seismo-orange">
+                            <span class="text-xs text-gray-600 dark:text-gray-400">Deployed only</span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="max-h-[600px] overflow-y-auto">
+                <div id="recorders-list" class="divide-y divide-gray-200 dark:divide-gray-700">
+                    {% for unit in recorders %}
+                    <div class="device-row recorder-row p-3 hover:bg-gray-50 dark:hover:bg-gray-700/50 cursor-pointer transition-colors"
+                         data-id="{{ unit.id }}"
+                         data-deployed="{{ unit.deployed|lower }}"
+                         data-paired-with="{{ unit.deployed_with_modem_id or '' }}"
+                         data-device-type="{{ unit.device_type }}"
+                         onclick="selectRecorder('{{ unit.id }}')">
+                        <div class="flex items-center justify-between">
+                            <div class="flex items-center gap-3">
+                                <div class="w-8 h-8 rounded-full flex items-center justify-center
+                                    {% if unit.device_type == 'slm' %}bg-purple-100 dark:bg-purple-900/30 text-purple-600 dark:text-purple-400
+                                    {% else %}bg-blue-100 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400{% endif %}">
+                                    {% if unit.device_type == 'slm' %}
+                                    <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.536 8.464a5 5 0 010 7.072m2.828-9.9a9 9 0 010 12.728M5.586 15H4a1 1 0 01-1-1v-4a1 1 0 011-1h1.586l4.707-4.707C10.923 3.663 12 4.109 12 5v14c0 .891-1.077 1.337-1.707.707L5.586 15z"></path>
+                                    </svg>
+                                    {% else %}
+                                    <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z"></path>
+                                    </svg>
+                                    {% endif %}
+                                </div>
+                                <div>
+                                    <div class="font-mono font-medium text-gray-900 dark:text-white">{{ unit.id }}</div>
+                                    <div class="text-xs text-gray-500 dark:text-gray-400">
+                                        {{ unit.device_type|capitalize }}
+                                        {% if not unit.deployed %}<span class="text-yellow-600 dark:text-yellow-400">(Benched)</span>{% endif %}
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="flex items-center gap-2">
+                                {% if unit.deployed_with_modem_id %}
+                                <span class="px-2 py-1 text-xs rounded-full bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400">
+                                    → {{ unit.deployed_with_modem_id }}
+                                </span>
+                                {% endif %}
+                                <div class="w-5 h-5 rounded-full border-2 border-gray-300 dark:border-gray-600 flex items-center justify-center selection-indicator">
+                                    <svg class="w-3 h-3 text-seismo-orange hidden check-icon" fill="currentColor" viewBox="0 0 20 20">
+                                        <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd"></path>
+                                    </svg>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    {% else %}
+                    <div class="p-8 text-center text-gray-500 dark:text-gray-400">
+                        No recorders found in roster
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+
+        <!-- Right Column: Modems -->
+        <div class="bg-white dark:bg-slate-800 rounded-lg shadow border border-gray-200 dark:border-gray-700">
+            <div class="px-4 py-3 border-b border-gray-200 dark:border-gray-700">
+                <div class="flex items-center justify-between mb-3">
+                    <h2 class="text-lg font-semibold text-gray-900 dark:text-white flex items-center gap-2">
+                        <svg class="w-5 h-5 text-seismo-orange" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.111 16.404a5.5 5.5 0 017.778 0M12 20h.01m-7.08-7.071c3.904-3.905 10.236-3.905 14.141 0M1.394 9.393c5.857-5.857 15.355-5.857 21.213 0"></path>
+                        </svg>
+                        Modems
+                        <span id="modem-count" class="text-sm font-normal text-gray-500 dark:text-gray-400">({{ modems|length }})</span>
+                    </h2>
+                </div>
+                <!-- Modem Search & Filters -->
+                <div class="space-y-2">
+                    <input type="text" id="modem-search" placeholder="Search by ID, IP, or phone..."
+                           class="w-full px-3 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white text-sm focus:ring-2 focus:ring-seismo-orange focus:border-seismo-orange"
+                           oninput="filterModems()">
+                    <div class="flex items-center gap-4">
+                        <label class="flex items-center gap-2 cursor-pointer">
+                            <input type="checkbox" id="modem-hide-paired" onchange="filterModems()" class="rounded border-gray-300 dark:border-gray-600 text-seismo-orange focus:ring-seismo-orange">
+                            <span class="text-xs text-gray-600 dark:text-gray-400">Hide paired</span>
+                        </label>
+                        <label class="flex items-center gap-2 cursor-pointer">
+                            <input type="checkbox" id="modem-deployed-only" onchange="filterModems()" class="rounded border-gray-300 dark:border-gray-600 text-seismo-orange focus:ring-seismo-orange">
+                            <span class="text-xs text-gray-600 dark:text-gray-400">Deployed only</span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="max-h-[600px] overflow-y-auto">
+                <div id="modems-list" class="divide-y divide-gray-200 dark:divide-gray-700">
+                    {% for unit in modems %}
+                    <div class="device-row modem-row p-3 hover:bg-gray-50 dark:hover:bg-gray-700/50 cursor-pointer transition-colors"
+                         data-id="{{ unit.id }}"
+                         data-deployed="{{ unit.deployed|lower }}"
+                         data-paired-with="{{ unit.deployed_with_unit_id or '' }}"
+                         data-ip="{{ unit.ip_address or '' }}"
+                         data-phone="{{ unit.phone_number or '' }}"
+                         onclick="selectModem('{{ unit.id }}')">
+                        <div class="flex items-center justify-between">
+                            <div class="flex items-center gap-3">
+                                <div class="w-8 h-8 rounded-full bg-amber-100 dark:bg-amber-900/30 flex items-center justify-center text-amber-600 dark:text-amber-400">
+                                    <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.111 16.404a5.5 5.5 0 017.778 0M12 20h.01m-7.08-7.071c3.904-3.905 10.236-3.905 14.141 0M1.394 9.393c5.857-5.857 15.355-5.857 21.213 0"></path>
+                                    </svg>
+                                </div>
+                                <div>
+                                    <div class="font-mono font-medium text-gray-900 dark:text-white">{{ unit.id }}</div>
+                                    <div class="text-xs text-gray-500 dark:text-gray-400">
+                                        {% if unit.ip_address %}<span class="font-mono">{{ unit.ip_address }}</span>{% endif %}
+                                        {% if unit.phone_number %}{% if unit.ip_address %} · {% endif %}{{ unit.phone_number }}{% endif %}
+                                        {% if not unit.ip_address and not unit.phone_number %}Modem{% endif %}
+                                        {% if not unit.deployed %}<span class="text-yellow-600 dark:text-yellow-400">(Benched)</span>{% endif %}
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="flex items-center gap-2">
+                                {% if unit.deployed_with_unit_id %}
+                                <span class="px-2 py-1 text-xs rounded-full bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400">
+                                    ← {{ unit.deployed_with_unit_id }}
+                                </span>
+                                {% endif %}
+                                <div class="w-5 h-5 rounded-full border-2 border-gray-300 dark:border-gray-600 flex items-center justify-center selection-indicator">
+                                    <svg class="w-3 h-3 text-seismo-orange hidden check-icon" fill="currentColor" viewBox="0 0 20 20">
+                                        <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd"></path>
+                                    </svg>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    {% else %}
+                    <div class="p-8 text-center text-gray-500 dark:text-gray-400">
+                        No modems found in roster
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Existing Pairings Section -->
+    <div class="mt-8 bg-white dark:bg-slate-800 rounded-lg shadow border border-gray-200 dark:border-gray-700">
+        <div class="px-4 py-3 border-b border-gray-200 dark:border-gray-700">
+            <h2 class="text-lg font-semibold text-gray-900 dark:text-white flex items-center gap-2">
+                <svg class="w-5 h-5 text-green-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"></path>
+                </svg>
+                Existing Pairings
+                <span id="pairing-count" class="text-sm font-normal text-gray-500 dark:text-gray-400">({{ pairings|length }})</span>
+            </h2>
+        </div>
+        <div class="max-h-[400px] overflow-y-auto">
+            <div id="pairings-list" class="divide-y divide-gray-200 dark:divide-gray-700">
+                {% for pairing in pairings %}
+                <div class="pairing-row p-3 flex items-center justify-between hover:bg-gray-50 dark:hover:bg-gray-700/50">
+                    <div class="flex items-center gap-4">
+                        <div class="flex items-center gap-2">
+                            <span class="px-2 py-1 text-sm font-mono rounded bg-blue-100 dark:bg-blue-900/30 text-blue-700 dark:text-blue-400">
+                                {{ pairing.recorder_id }}
+                            </span>
+                            <span class="text-xs text-gray-500 dark:text-gray-400">{{ pairing.recorder_type }}</span>
+                        </div>
+                        <svg class="w-5 h-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7h12m0 0l-4-4m4 4l-4 4m0 6H4m0 0l4 4m-4-4l4-4"></path>
+                        </svg>
+                        <div class="flex items-center gap-2">
+                            <span class="px-2 py-1 text-sm font-mono rounded bg-amber-100 dark:bg-amber-900/30 text-amber-700 dark:text-amber-400">
+                                {{ pairing.modem_id }}
+                            </span>
+                            {% if pairing.modem_ip %}
+                            <span class="text-xs font-mono text-gray-500 dark:text-gray-400">{{ pairing.modem_ip }}</span>
+                            {% endif %}
+                        </div>
+                    </div>
+                    <button onclick="unpairDevices('{{ pairing.recorder_id }}', '{{ pairing.modem_id }}')"
+                            class="p-2 text-red-600 dark:text-red-400 hover:bg-red-100 dark:hover:bg-red-900/30 rounded-lg transition-colors"
+                            title="Unpair devices">
+                        <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                        </svg>
+                    </button>
+                </div>
+                {% else %}
+                <div class="p-8 text-center text-gray-500 dark:text-gray-400">
+                    No pairings found. Select a recorder and modem above to create one.
+                </div>
+                {% endfor %}
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Toast notification -->
+<div id="toast" class="fixed bottom-4 right-4 px-4 py-3 rounded-lg shadow-lg transform translate-y-full opacity-0 transition-all duration-300 z-50"></div>
+
+<script>
+let selectedRecorder = null;
+let selectedModem = null;
+
+function selectRecorder(id) {
+    // Deselect previous
+    document.querySelectorAll('.recorder-row').forEach(row => {
+        row.classList.remove('bg-seismo-orange/10', 'dark:bg-seismo-orange/20');
+        row.querySelector('.selection-indicator').classList.remove('border-seismo-orange', 'bg-seismo-orange');
+        row.querySelector('.selection-indicator').classList.add('border-gray-300', 'dark:border-gray-600');
+        row.querySelector('.check-icon').classList.add('hidden');
+    });
+
+    // Toggle selection
+    if (selectedRecorder === id) {
+        selectedRecorder = null;
+        document.getElementById('selected-recorder').textContent = 'None selected';
+    } else {
+        selectedRecorder = id;
+        document.getElementById('selected-recorder').textContent = id;
+
+        // Highlight selected
+        const row = document.querySelector(`.recorder-row[data-id="${id}"]`);
+        if (row) {
+            row.classList.add('bg-seismo-orange/10', 'dark:bg-seismo-orange/20');
+            row.querySelector('.selection-indicator').classList.remove('border-gray-300', 'dark:border-gray-600');
+            row.querySelector('.selection-indicator').classList.add('border-seismo-orange', 'bg-seismo-orange');
+            row.querySelector('.check-icon').classList.remove('hidden');
+        }
+    }
+
+    updateButtons();
+}
+
+function selectModem(id) {
+    // Deselect previous
+    document.querySelectorAll('.modem-row').forEach(row => {
+        row.classList.remove('bg-seismo-orange/10', 'dark:bg-seismo-orange/20');
+        row.querySelector('.selection-indicator').classList.remove('border-seismo-orange', 'bg-seismo-orange');
+        row.querySelector('.selection-indicator').classList.add('border-gray-300', 'dark:border-gray-600');
+        row.querySelector('.check-icon').classList.add('hidden');
+    });
+
+    // Toggle selection
+    if (selectedModem === id) {
+        selectedModem = null;
+        document.getElementById('selected-modem').textContent = 'None selected';
+    } else {
+        selectedModem = id;
+        document.getElementById('selected-modem').textContent = id;
+
+        // Highlight selected
+        const row = document.querySelector(`.modem-row[data-id="${id}"]`);
+        if (row) {
+            row.classList.add('bg-seismo-orange/10', 'dark:bg-seismo-orange/20');
+            row.querySelector('.selection-indicator').classList.remove('border-gray-300', 'dark:border-gray-600');
+            row.querySelector('.selection-indicator').classList.add('border-seismo-orange', 'bg-seismo-orange');
+            row.querySelector('.check-icon').classList.remove('hidden');
+        }
+    }
+
+    updateButtons();
+}
+
+function updateButtons() {
+    const pairBtn = document.getElementById('pair-btn');
+    const clearBtn = document.getElementById('clear-selection-btn');
+
+    pairBtn.disabled = !(selectedRecorder && selectedModem);
+    clearBtn.disabled = !(selectedRecorder || selectedModem);
+}
+
+function clearSelection() {
+    if (selectedRecorder) selectRecorder(selectedRecorder);
+    if (selectedModem) selectModem(selectedModem);
+}
+
+function filterRecorders() {
+    const searchTerm = document.getElementById('recorder-search').value.toLowerCase().trim();
+    const hidePaired = document.getElementById('recorder-hide-paired').checked;
+    const deployedOnly = document.getElementById('recorder-deployed-only').checked;
+
+    let visibleRecorders = 0;
+
+    document.querySelectorAll('.recorder-row').forEach(row => {
+        const id = row.dataset.id.toLowerCase();
+        const pairedWith = row.dataset.pairedWith;
+        const deployed = row.dataset.deployed === 'true';
+
+        let show = true;
+        if (searchTerm && !id.includes(searchTerm)) show = false;
+        if (hidePaired && pairedWith) show = false;
+        if (deployedOnly && !deployed) show = false;
+
+        row.style.display = show ? '' : 'none';
+        if (show) visibleRecorders++;
+    });
+
+    document.getElementById('recorder-count').textContent = `(${visibleRecorders})`;
+}
+
+function filterModems() {
+    const searchTerm = document.getElementById('modem-search').value.toLowerCase().trim();
+    const hidePaired = document.getElementById('modem-hide-paired').checked;
+    const deployedOnly = document.getElementById('modem-deployed-only').checked;
+
+    let visibleModems = 0;
+
+    document.querySelectorAll('.modem-row').forEach(row => {
+        const id = row.dataset.id.toLowerCase();
+        const ip = (row.dataset.ip || '').toLowerCase();
+        const phone = (row.dataset.phone || '').toLowerCase();
+        const pairedWith = row.dataset.pairedWith;
+        const deployed = row.dataset.deployed === 'true';
+
+        let show = true;
+        if (searchTerm && !id.includes(searchTerm) && !ip.includes(searchTerm) && !phone.includes(searchTerm)) show = false;
+        if (hidePaired && pairedWith) show = false;
+        if (deployedOnly && !deployed) show = false;
+
+        row.style.display = show ? '' : 'none';
+        if (show) visibleModems++;
+    });
+
+    document.getElementById('modem-count').textContent = `(${visibleModems})`;
+}
+
+function saveScrollPositions() {
+    const recordersList = document.getElementById('recorders-list').parentElement;
+    const modemsList = document.getElementById('modems-list').parentElement;
+    const pairingsList = document.getElementById('pairings-list').parentElement;
+
+    sessionStorage.setItem('pairDevices_recorderScroll', recordersList.scrollTop);
+    sessionStorage.setItem('pairDevices_modemScroll', modemsList.scrollTop);
+    sessionStorage.setItem('pairDevices_pairingScroll', pairingsList.scrollTop);
+
+    // Save recorder filter state
+    sessionStorage.setItem('pairDevices_recorderSearch', document.getElementById('recorder-search').value);
+    sessionStorage.setItem('pairDevices_recorderHidePaired', document.getElementById('recorder-hide-paired').checked);
+    sessionStorage.setItem('pairDevices_recorderDeployedOnly', document.getElementById('recorder-deployed-only').checked);
+
+    // Save modem filter state
+    sessionStorage.setItem('pairDevices_modemSearch', document.getElementById('modem-search').value);
+    sessionStorage.setItem('pairDevices_modemHidePaired', document.getElementById('modem-hide-paired').checked);
+    sessionStorage.setItem('pairDevices_modemDeployedOnly', document.getElementById('modem-deployed-only').checked);
+}
+
+function restoreScrollPositions() {
+    const recorderScroll = sessionStorage.getItem('pairDevices_recorderScroll');
+    const modemScroll = sessionStorage.getItem('pairDevices_modemScroll');
+    const pairingScroll = sessionStorage.getItem('pairDevices_pairingScroll');
+
+    if (recorderScroll) {
+        document.getElementById('recorders-list').parentElement.scrollTop = parseInt(recorderScroll);
+    }
+    if (modemScroll) {
+        document.getElementById('modems-list').parentElement.scrollTop = parseInt(modemScroll);
+    }
+    if (pairingScroll) {
+        document.getElementById('pairings-list').parentElement.scrollTop = parseInt(pairingScroll);
+    }
+
+    // Restore recorder filter state
+    const recorderSearch = sessionStorage.getItem('pairDevices_recorderSearch');
+    const recorderHidePaired = sessionStorage.getItem('pairDevices_recorderHidePaired');
+    const recorderDeployedOnly = sessionStorage.getItem('pairDevices_recorderDeployedOnly');
+
+    if (recorderSearch) document.getElementById('recorder-search').value = recorderSearch;
+    if (recorderHidePaired === 'true') document.getElementById('recorder-hide-paired').checked = true;
+    if (recorderDeployedOnly === 'true') document.getElementById('recorder-deployed-only').checked = true;
+
+    // Restore modem filter state
+    const modemSearch = sessionStorage.getItem('pairDevices_modemSearch');
+    const modemHidePaired = sessionStorage.getItem('pairDevices_modemHidePaired');
+    const modemDeployedOnly = sessionStorage.getItem('pairDevices_modemDeployedOnly');
+
+    if (modemSearch) document.getElementById('modem-search').value = modemSearch;
+    if (modemHidePaired === 'true') document.getElementById('modem-hide-paired').checked = true;
+    if (modemDeployedOnly === 'true') document.getElementById('modem-deployed-only').checked = true;
+
+    // Apply filters if any were set
+    if (recorderSearch || recorderHidePaired === 'true' || recorderDeployedOnly === 'true') {
+        filterRecorders();
+    }
+    if (modemSearch || modemHidePaired === 'true' || modemDeployedOnly === 'true') {
+        filterModems();
+    }
+
+    // Clear stored values
+    sessionStorage.removeItem('pairDevices_recorderScroll');
+    sessionStorage.removeItem('pairDevices_modemScroll');
+    sessionStorage.removeItem('pairDevices_pairingScroll');
+    sessionStorage.removeItem('pairDevices_recorderSearch');
+    sessionStorage.removeItem('pairDevices_recorderHidePaired');
+    sessionStorage.removeItem('pairDevices_recorderDeployedOnly');
+    sessionStorage.removeItem('pairDevices_modemSearch');
+    sessionStorage.removeItem('pairDevices_modemHidePaired');
+    sessionStorage.removeItem('pairDevices_modemDeployedOnly');
+}
+
+// Restore scroll positions on page load
+document.addEventListener('DOMContentLoaded', restoreScrollPositions);
+
+async function pairDevices() {
+    if (!selectedRecorder || !selectedModem) return;
+
+    const pairBtn = document.getElementById('pair-btn');
+    pairBtn.disabled = true;
+    pairBtn.textContent = 'Pairing...';
+
+    try {
+        const response = await fetch('/api/roster/pair-devices', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                recorder_id: selectedRecorder,
+                modem_id: selectedModem
+            })
+        });
+
+        const result = await response.json();
+
+        if (response.ok) {
+            showToast(`Paired ${selectedRecorder} with ${selectedModem}`, 'success');
+            // Save scroll positions before reload
+            saveScrollPositions();
+            setTimeout(() => window.location.reload(), 500);
+        } else {
+            showToast(result.detail || 'Failed to pair devices', 'error');
+        }
+    } catch (error) {
+        showToast('Error pairing devices: ' + error.message, 'error');
+    } finally {
+        pairBtn.disabled = false;
+        pairBtn.textContent = 'Pair Devices';
+    }
+}
+
+async function unpairDevices(recorderId, modemId) {
+    if (!confirm(`Unpair ${recorderId} from ${modemId}?`)) return;
+
+    try {
+        const response = await fetch('/api/roster/unpair-devices', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                recorder_id: recorderId,
+                modem_id: modemId
+            })
+        });
+
+        const result = await response.json();
+
+        if (response.ok) {
+            showToast(`Unpaired ${recorderId} from ${modemId}`, 'success');
+            // Save scroll positions before reload
+            saveScrollPositions();
+            setTimeout(() => window.location.reload(), 500);
+        } else {
+            showToast(result.detail || 'Failed to unpair devices', 'error');
+        }
+    } catch (error) {
+        showToast('Error unpairing devices: ' + error.message, 'error');
+    }
+}
+
+function showToast(message, type = 'info') {
+    const toast = document.getElementById('toast');
+    toast.textContent = message;
+    toast.className = 'fixed bottom-4 right-4 px-4 py-3 rounded-lg shadow-lg transform transition-all duration-300 z-50';
+
+    if (type === 'success') {
+        toast.classList.add('bg-green-500', 'text-white');
+    } else if (type === 'error') {
+        toast.classList.add('bg-red-500', 'text-white');
+    } else {
+        toast.classList.add('bg-gray-800', 'text-white');
+    }
+
+    // Show
+    toast.classList.remove('translate-y-full', 'opacity-0');
+
+    // Hide after 3 seconds
+    setTimeout(() => {
+        toast.classList.add('translate-y-full', 'opacity-0');
+    }, 3000);
+}
+</script>
+
+<style>
+.bg-seismo-orange\/10 {
+    background-color: rgb(249 115 22 / 0.1);
+}
+.dark\:bg-seismo-orange\/20:is(.dark *) {
+    background-color: rgb(249 115 22 / 0.2);
+}
+</style>
+{% endblock %}

templates/partials/devices_table.html

@@ -104,8 +104,13 @@
                             {% if unit.phone_number %}
                                 <div>{{ unit.phone_number }}</div>
                             {% endif %}
-                            {% if unit.hardware_model %}
+                            {% if unit.deployed_with_unit_id %}
-                                <div class="text-gray-500 dark:text-gray-500">{{ unit.hardware_model }}</div>
+                                <div>
+                                    <span class="text-gray-500 dark:text-gray-500">Linked:</span>
+                                    <a href="/unit/{{ unit.deployed_with_unit_id }}" class="text-seismo-orange hover:underline font-medium">
+                                        {{ unit.deployed_with_unit_id }}
+                                    </a>
+                                </div>
                             {% endif %}
                         {% else %}
                             {% if unit.next_calibration_due %}
@@ -126,7 +131,7 @@
                     </div>
                 </td>
                 <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="text-sm text-gray-500 dark:text-gray-400">{{ unit.last_seen }}</div>
+                    <div class="text-sm text-gray-500 dark:text-gray-400 last-seen-cell" data-iso="{{ unit.last_seen }}">{{ unit.last_seen }}</div>
                 </td>
                 <td class="px-6 py-4 whitespace-nowrap">
                     <div class="text-sm
@@ -345,6 +350,39 @@
 </style>
 
 <script>
+(function() {
+    // User's configured timezone from settings (defaults to America/New_York)
+    const userTimezone = '{{ user_timezone | default("America/New_York") }}';
+
+    // Format ISO timestamp to human-readable format in user's timezone
+    function formatLastSeenLocal(isoString) {
+        if (!isoString || isoString === 'Never' || isoString === 'N/A') {
+            return isoString || 'Never';
+        }
+        try {
+            const date = new Date(isoString);
+            if (isNaN(date.getTime())) return isoString;
+
+            // Format in user's configured timezone
+            return date.toLocaleString('en-US', {
+                timeZone: userTimezone,
+                month: 'short',
+                day: 'numeric',
+                hour: 'numeric',
+                minute: '2-digit',
+                hour12: true
+            });
+        } catch (e) {
+            return isoString;
+        }
+    }
+
+    // Format all last-seen cells on page load
+    document.querySelectorAll('.last-seen-cell').forEach(cell => {
+        const isoDate = cell.getAttribute('data-iso');
+        cell.textContent = formatLastSeenLocal(isoDate);
+    });
+
     // Update timestamp
     const timestampElement = document.getElementById('last-updated');
     if (timestampElement) {
@@ -365,20 +403,23 @@
         };
         return acc;
     }, {});
+})();
 
-    // Sorting state
+    // Sorting state (needs to persist across swaps)
-    let currentSort = { column: null, direction: 'asc' };
+    if (typeof window.currentSort === 'undefined') {
+        window.currentSort = { column: null, direction: 'asc' };
+    }
 
     function sortTable(column) {
         const tbody = document.getElementById('roster-tbody');
         const rows = Array.from(tbody.getElementsByTagName('tr'));
 
         // Determine sort direction
-        if (currentSort.column === column) {
+        if (window.currentSort.column === column) {
-            currentSort.direction = currentSort.direction === 'asc' ? 'desc' : 'asc';
+            window.currentSort.direction = window.currentSort.direction === 'asc' ? 'desc' : 'asc';
         } else {
-            currentSort.column = column;
+            window.currentSort.column = column;
-            currentSort.direction = 'asc';
+            window.currentSort.direction = 'asc';
         }
 
         // Sort rows
@@ -406,8 +447,8 @@
                 bVal = bVal.toLowerCase();
             }
 
-            if (aVal < bVal) return currentSort.direction === 'asc' ? -1 : 1;
+            if (aVal < bVal) return window.currentSort.direction === 'asc' ? -1 : 1;
-            if (aVal > bVal) return currentSort.direction === 'asc' ? 1 : -1;
+            if (aVal > bVal) return window.currentSort.direction === 'asc' ? 1 : -1;
             return 0;
         });
 
@@ -443,10 +484,10 @@
         });
 
         // Set current indicator
-        if (currentSort.column) {
+        if (window.currentSort.column) {
-            const indicator = document.querySelector(`.sort-indicator[data-column="${currentSort.column}"]`);
+            const indicator = document.querySelector(`.sort-indicator[data-column="${window.currentSort.column}"]`);
             if (indicator) {
-                indicator.className = `sort-indicator ${currentSort.direction}`;
+                indicator.className = `sort-indicator ${window.currentSort.direction}`;
             }
         }
     }

templates/partials/modem_list.html

@@ -0,0 +1,127 @@
+<!-- Modem List -->
+{% if modems %}
+<div class="overflow-x-auto">
+    <table class="w-full">
+        <thead class="bg-gray-50 dark:bg-slate-700 border-b border-gray-200 dark:border-gray-600">
+            <tr>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-700 dark:text-gray-300 uppercase tracking-wider">Unit ID</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-700 dark:text-gray-300 uppercase tracking-wider">Status</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-700 dark:text-gray-300 uppercase tracking-wider">IP Address</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-700 dark:text-gray-300 uppercase tracking-wider">Phone</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-700 dark:text-gray-300 uppercase tracking-wider">Paired Device</th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-gray-700 dark:text-gray-300 uppercase tracking-wider">Location</th>
+                <th class="px-4 py-3 text-right text-xs font-medium text-gray-700 dark:text-gray-300 uppercase tracking-wider">Actions</th>
+            </tr>
+        </thead>
+        <tbody class="divide-y divide-gray-200 dark:divide-gray-700">
+            {% for modem in modems %}
+            <tr class="hover:bg-gray-50 dark:hover:bg-slate-700 transition-colors">
+                <td class="px-4 py-3 whitespace-nowrap">
+                    <div class="flex items-center gap-2">
+                        <a href="/unit/{{ modem.id }}" class="font-medium text-blue-600 dark:text-blue-400 hover:underline">
+                            {{ modem.id }}
+                        </a>
+                        {% if modem.hardware_model %}
+                        <span class="text-xs text-gray-500 dark:text-gray-400">({{ modem.hardware_model }})</span>
+                        {% endif %}
+                    </div>
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap">
+                    {% if modem.status == "retired" %}
+                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-200 text-gray-700 dark:bg-gray-700 dark:text-gray-300">
+                        Retired
+                    </span>
+                    {% elif modem.status == "benched" %}
+                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300">
+                        Benched
+                    </span>
+                    {% elif modem.status == "in_use" %}
+                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-300">
+                        In Use
+                    </span>
+                    {% elif modem.status == "spare" %}
+                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-300">
+                        Spare
+                    </span>
+                    {% else %}
+                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300">
+                        —
+                    </span>
+                    {% endif %}
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm">
+                    {% if modem.ip_address %}
+                    <span class="font-mono text-gray-900 dark:text-gray-300">{{ modem.ip_address }}</span>
+                    {% else %}
+                    <span class="text-gray-400 dark:text-gray-600">—</span>
+                    {% endif %}
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm text-gray-900 dark:text-gray-300">
+                    {% if modem.phone_number %}
+                    {{ modem.phone_number }}
+                    {% else %}
+                    <span class="text-gray-400 dark:text-gray-600">—</span>
+                    {% endif %}
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-sm">
+                    {% if modem.paired_device %}
+                    <a href="/unit/{{ modem.paired_device.id }}" class="text-blue-600 dark:text-blue-400 hover:underline">
+                        {{ modem.paired_device.id }}
+                        <span class="text-gray-500 dark:text-gray-400">({{ modem.paired_device.device_type }})</span>
+                    </a>
+                    {% else %}
+                    <span class="text-gray-400 dark:text-gray-600">None</span>
+                    {% endif %}
+                </td>
+                <td class="px-4 py-3 text-sm text-gray-900 dark:text-gray-300">
+                    {% if modem.project_id %}
+                    <span class="bg-gray-200 dark:bg-gray-700 px-1.5 py-0.5 rounded text-xs mr-1">{{ modem.project_id }}</span>
+                    {% endif %}
+                    {% if modem.location %}
+                    <span class="truncate max-w-xs inline-block" title="{{ modem.location }}">{{ modem.location }}</span>
+                    {% elif not modem.project_id %}
+                    <span class="text-gray-400 dark:text-gray-600">—</span>
+                    {% endif %}
+                </td>
+                <td class="px-4 py-3 whitespace-nowrap text-right text-sm">
+                    <div class="flex items-center justify-end gap-2">
+                        <button onclick="pingModem('{{ modem.id }}')"
+                                id="ping-btn-{{ modem.id }}"
+                                class="text-xs px-2 py-1 bg-blue-100 hover:bg-blue-200 text-blue-700 dark:bg-blue-900/30 dark:hover:bg-blue-900/50 dark:text-blue-300 rounded transition-colors">
+                            Ping
+                        </button>
+                        <a href="/unit/{{ modem.id }}" class="text-blue-600 dark:text-blue-400 hover:underline">
+                            View →
+                        </a>
+                    </div>
+                    <!-- Ping Result (hidden by default) -->
+                    <div id="ping-result-{{ modem.id }}" class="mt-1 text-xs hidden"></div>
+                </td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+
+{% if search %}
+<div class="mt-4 text-sm text-gray-600 dark:text-gray-400">
+    Found {{ modems|length }} modem(s) matching "{{ search }}"
+</div>
+{% endif %}
+
+{% else %}
+<div class="text-center py-12 text-gray-500 dark:text-gray-400">
+    <svg class="w-12 h-12 mx-auto mb-3 opacity-50" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.111 16.404a5.5 5.5 0 017.778 0M12 20h.01m-7.08-7.071c3.904-3.905 10.236-3.905 14.141 0M1.394 9.393c5.857-5.857 15.355-5.857 21.213 0"></path>
+    </svg>
+    <p>No modems found</p>
+    {% if search %}
+    <button onclick="document.getElementById('modem-search').value = ''; htmx.trigger('#modem-search', 'keyup');"
+            class="mt-3 text-blue-600 dark:text-blue-400 hover:underline">
+        Clear search
+    </button>
+    {% else %}
+    <p class="text-sm mt-1">Add modems from the <a href="/roster" class="text-seismo-orange hover:underline">Fleet Roster</a></p>
+    {% endif %}
+</div>
+{% endif %}

templates/partials/modem_paired_device.html

@@ -0,0 +1,51 @@
+<!-- Paired Device Info for Modem Detail Page -->
+{% if device %}
+<div class="flex items-center gap-4 p-4 bg-green-50 dark:bg-green-900/20 rounded-lg">
+    <div class="bg-green-100 dark:bg-green-900/30 p-3 rounded-lg">
+        {% if device.device_type == "slm" %}
+        <svg class="w-6 h-6 text-green-600 dark:text-green-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z"></path>
+        </svg>
+        {% else %}
+        <svg class="w-6 h-6 text-green-600 dark:text-green-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 3v2m6-2v2M9 19v2m6-2v2M5 9H3m2 6H3m18-6h-2m2 6h-2M7 19h10a2 2 0 002-2V7a2 2 0 00-2-2H7a2 2 0 00-2 2v10a2 2 0 002 2zM9 9h6v6H9V9z"></path>
+        </svg>
+        {% endif %}
+    </div>
+    <div class="flex-1">
+        <p class="text-sm text-gray-500 dark:text-gray-400">Currently paired with</p>
+        <a href="/unit/{{ device.id }}" class="text-lg font-semibold text-green-700 dark:text-green-400 hover:underline">
+            {{ device.id }}
+        </a>
+        <div class="flex items-center gap-2 mt-1 text-sm text-gray-600 dark:text-gray-400">
+            <span class="capitalize">{{ device.device_type }}</span>
+            {% if device.project_id %}
+                <span class="text-gray-400">|</span>
+                <span>{{ device.project_id }}</span>
+            {% endif %}
+            {% if device.deployed %}
+                <span class="px-1.5 py-0.5 bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-300 text-xs rounded">Deployed</span>
+            {% else %}
+                <span class="px-1.5 py-0.5 bg-amber-100 dark:bg-amber-900/30 text-amber-700 dark:text-amber-300 text-xs rounded">Benched</span>
+            {% endif %}
+        </div>
+    </div>
+    <a href="/unit/{{ device.id }}" class="text-gray-400 hover:text-seismo-orange transition-colors">
+        <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"></path>
+        </svg>
+    </a>
+</div>
+{% else %}
+<div class="flex items-center gap-4 p-4 bg-gray-50 dark:bg-gray-800 rounded-lg">
+    <div class="bg-gray-200 dark:bg-gray-700 p-3 rounded-lg">
+        <svg class="w-6 h-6 text-gray-500 dark:text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636"></path>
+        </svg>
+    </div>
+    <div class="flex-1">
+        <p class="text-gray-600 dark:text-gray-400">No device currently paired</p>
+        <p class="text-sm text-gray-500 dark:text-gray-500">This modem is available for assignment</p>
+    </div>
+</div>
+{% endif %}

templates/partials/modem_picker.html

@@ -0,0 +1,128 @@
+{#
+Modem Picker Component
+A reusable HTMX-based autocomplete for selecting modems.
+
+Usage: include "partials/modem_picker.html" with context
+
+Variables available in context:
+- selected_modem_id: Pre-selected modem ID (optional)
+- selected_modem_display: Display text for pre-selected modem (optional)
+- input_name: Name attribute for the hidden input (default: "deployed_with_modem_id")
+- picker_id: Unique ID suffix for multiple pickers on same page (default: "")
+#}
+
+{% set picker_id = picker_id|default("") %}
+{% set input_name = input_name|default("deployed_with_modem_id") %}
+{% set selected_modem_id = selected_modem_id|default("") %}
+{% set selected_modem_display = selected_modem_display|default("") %}
+
+<div class="modem-picker relative" id="modem-picker-container{{ picker_id }}">
+    <!-- Hidden input for form submission (stores modem ID) -->
+    <input type="hidden"
+           name="{{ input_name }}"
+           id="modem-picker-value{{ picker_id }}"
+           value="{{ selected_modem_id }}">
+
+    <!-- Search Input -->
+    <div class="relative">
+        <input type="text"
+               id="modem-picker-search{{ picker_id }}"
+               placeholder="Search by modem ID, IP, or note..."
+               class="w-full px-4 py-2 pr-10 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange focus:border-seismo-orange"
+               autocomplete="off"
+               value="{{ selected_modem_display }}"
+               hx-get="/api/roster/search/modems"
+               hx-trigger="keyup changed delay:300ms, focus"
+               hx-target="#modem-picker-dropdown{{ picker_id }}"
+               hx-vals='{"picker_id": "{{ picker_id }}"}'
+               name="q"
+               onfocus="showModemDropdown('{{ picker_id }}')"
+               oninput="handleModemSearchInput('{{ picker_id }}', this.value)">
+
+        <!-- Search icon -->
+        <div class="absolute inset-y-0 right-0 flex items-center pr-3 pointer-events-none">
+            <svg class="w-5 h-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+            </svg>
+        </div>
+
+        <!-- Clear button (shown when modem is selected) -->
+        <button type="button"
+                id="modem-picker-clear{{ picker_id }}"
+                class="absolute inset-y-0 right-8 flex items-center pr-1 {{ 'hidden' if not selected_modem_id else '' }}"
+                onclick="clearModemSelection('{{ picker_id }}')"
+                title="Clear selection">
+            <svg class="w-4 h-4 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+            </svg>
+        </button>
+    </div>
+
+    <!-- Dropdown Results Container -->
+    <div id="modem-picker-dropdown{{ picker_id }}"
+         class="hidden absolute z-50 w-full mt-1 bg-white dark:bg-slate-800 border border-gray-300 dark:border-gray-600 rounded-lg shadow-lg max-h-60 overflow-y-auto">
+        <!-- Results loaded via HTMX -->
+    </div>
+</div>
+
+<script>
+{# Modem picker functions - defined once, work for any picker_id #}
+if (typeof selectModem === 'undefined') {
+    function selectModem(modemId, displayText, pickerId = '') {
+        const valueInput = document.getElementById('modem-picker-value' + pickerId);
+        const searchInput = document.getElementById('modem-picker-search' + pickerId);
+        const dropdown = document.getElementById('modem-picker-dropdown' + pickerId);
+        const clearBtn = document.getElementById('modem-picker-clear' + pickerId);
+
+        if (valueInput) valueInput.value = modemId;
+        if (searchInput) searchInput.value = displayText;
+        if (dropdown) dropdown.classList.add('hidden');
+        if (clearBtn) clearBtn.classList.remove('hidden');
+    }
+
+    function clearModemSelection(pickerId = '') {
+        const valueInput = document.getElementById('modem-picker-value' + pickerId);
+        const searchInput = document.getElementById('modem-picker-search' + pickerId);
+        const clearBtn = document.getElementById('modem-picker-clear' + pickerId);
+
+        if (valueInput) valueInput.value = '';
+        if (searchInput) {
+            searchInput.value = '';
+            searchInput.focus();
+        }
+        if (clearBtn) clearBtn.classList.add('hidden');
+    }
+
+    function showModemDropdown(pickerId = '') {
+        const dropdown = document.getElementById('modem-picker-dropdown' + pickerId);
+        if (dropdown) dropdown.classList.remove('hidden');
+    }
+
+    function hideModemDropdown(pickerId = '') {
+        const dropdown = document.getElementById('modem-picker-dropdown' + pickerId);
+        if (dropdown) dropdown.classList.add('hidden');
+    }
+
+    function handleModemSearchInput(pickerId, value) {
+        const valueInput = document.getElementById('modem-picker-value' + pickerId);
+        const clearBtn = document.getElementById('modem-picker-clear' + pickerId);
+
+        // If user clears the search box, also clear the hidden value
+        if (!value.trim()) {
+            if (valueInput) valueInput.value = '';
+            if (clearBtn) clearBtn.classList.add('hidden');
+        }
+    }
+
+    // Close dropdown when clicking outside
+    document.addEventListener('click', function(event) {
+        const pickers = document.querySelectorAll('.modem-picker');
+        pickers.forEach(picker => {
+            if (!picker.contains(event.target)) {
+                const dropdown = picker.querySelector('[id^="modem-picker-dropdown"]');
+                if (dropdown) dropdown.classList.add('hidden');
+            }
+        });
+    });
+}
+</script>

templates/partials/modem_search_results.html

@@ -0,0 +1,61 @@
+{#
+Modem Search Results Partial
+Rendered by /api/roster/search/modems endpoint for HTMX dropdown.
+
+Variables:
+- modems: List of modem dicts with id, ip_address, phone_number, note, deployed, display
+- query: The search query string
+- show_empty: Boolean - show "no results" message
+#}
+
+{% set picker_id = request.query_params.get('picker_id', '') %}
+
+{% if modems %}
+    {% for modem in modems %}
+    <div class="px-4 py-3 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer border-b border-gray-100 dark:border-gray-700 last:border-0 transition-colors"
+         onclick="selectModem('{{ modem.id }}', '{{ modem.display|e }}', '{{ picker_id }}')">
+        <div class="flex items-start justify-between gap-2">
+            <div class="flex-1 min-w-0">
+                <div class="font-medium text-gray-900 dark:text-white truncate">
+                    <span class="text-seismo-orange font-semibold">{{ modem.id }}</span>
+                    {% if modem.ip_address %}
+                        <span class="text-gray-400 mx-1">-</span>
+                        <span class="text-gray-600 dark:text-gray-400 font-mono text-sm">{{ modem.ip_address }}</span>
+                    {% endif %}
+                </div>
+                {% if modem.note %}
+                    <div class="text-sm text-gray-500 dark:text-gray-400 truncate">
+                        {{ modem.note }}
+                    </div>
+                {% endif %}
+            </div>
+            <div class="flex items-center gap-2">
+                {% if not modem.deployed %}
+                    <span class="flex-shrink-0 text-xs px-2 py-0.5 bg-gray-100 dark:bg-gray-600 text-gray-600 dark:text-gray-300 rounded">
+                        Benched
+                    </span>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+    {% endfor %}
+{% endif %}
+
+{% if show_empty %}
+    <div class="px-4 py-6 text-center text-gray-500 dark:text-gray-400">
+        <svg class="w-8 h-8 mx-auto mb-2 text-gray-300 dark:text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+        </svg>
+        <p class="text-sm">No modems found matching "{{ query }}"</p>
+    </div>
+{% endif %}
+
+{% if not modems and not show_empty %}
+    <div class="px-4 py-6 text-center text-gray-500 dark:text-gray-400">
+        <svg class="w-8 h-8 mx-auto mb-2 text-gray-300 dark:text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+        </svg>
+        <p class="text-sm">Start typing to search modems...</p>
+        <p class="text-xs mt-1">Search by modem ID, IP address, or note</p>
+    </div>
+{% endif %}

templates/partials/modem_stats.html

@@ -0,0 +1,63 @@
+<!-- Modem summary stat cards -->
+
+<!-- Total Modems Card -->
+<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6">
+    <div class="flex items-center justify-between">
+        <div>
+            <p class="text-sm text-gray-600 dark:text-gray-400 font-medium">Total Modems</p>
+            <p class="text-3xl font-bold text-gray-900 dark:text-white mt-1">{{ total_count }}</p>
+        </div>
+        <div class="bg-blue-100 dark:bg-blue-900/30 p-3 rounded-lg">
+            <svg class="w-8 h-8 text-blue-600 dark:text-blue-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.111 16.404a5.5 5.5 0 017.778 0M12 20h.01m-7.08-7.071c3.904-3.905 10.236-3.905 14.141 0M1.394 9.393c5.857-5.857 15.355-5.857 21.213 0"></path>
+            </svg>
+        </div>
+    </div>
+</div>
+
+<!-- In Use Card (paired with device) -->
+<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6">
+    <div class="flex items-center justify-between">
+        <div>
+            <p class="text-sm text-gray-600 dark:text-gray-400 font-medium">In Use</p>
+            <p class="text-3xl font-bold text-green-600 dark:text-green-400 mt-1">{{ in_use_count }}</p>
+        </div>
+        <div class="bg-green-100 dark:bg-green-900/30 p-3 rounded-lg">
+            <svg class="w-8 h-8 text-green-600 dark:text-green-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+            </svg>
+        </div>
+    </div>
+    <p class="text-xs text-gray-500 dark:text-gray-400 mt-2">Paired with a device</p>
+</div>
+
+<!-- Spare Card (deployed but not paired) -->
+<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6">
+    <div class="flex items-center justify-between">
+        <div>
+            <p class="text-sm text-gray-600 dark:text-gray-400 font-medium">Spare</p>
+            <p class="text-3xl font-bold text-seismo-orange mt-1">{{ spare_count }}</p>
+        </div>
+        <div class="bg-orange-100 dark:bg-orange-900/30 p-3 rounded-lg">
+            <svg class="w-8 h-8 text-seismo-orange" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 8h14M5 8a2 2 0 110-4h14a2 2 0 110 4M5 8v10a2 2 0 002 2h10a2 2 0 002-2V8m-9 4h4"></path>
+            </svg>
+        </div>
+    </div>
+    <p class="text-xs text-gray-500 dark:text-gray-400 mt-2">Available for assignment</p>
+</div>
+
+<!-- Benched Card -->
+<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6">
+    <div class="flex items-center justify-between">
+        <div>
+            <p class="text-sm text-gray-600 dark:text-gray-400 font-medium">Benched</p>
+            <p class="text-3xl font-bold text-gray-500 dark:text-gray-400 mt-1">{{ benched_count }}</p>
+        </div>
+        <div class="bg-gray-200 dark:bg-gray-700 p-3 rounded-lg">
+            <svg class="w-8 h-8 text-gray-600 dark:text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 13V6a2 2 0 00-2-2H6a2 2 0 00-2 2v7m16 0v5a2 2 0 01-2 2H6a2 2 0 01-2-2v-5m16 0h-2.586a1 1 0 00-.707.293l-2.414 2.414a1 1 0 01-.707.293h-3.172a1 1 0 01-.707-.293l-2.414-2.414A1 1 0 006.586 13H4"></path>
+            </svg>
+        </div>
+    </div>
+</div>

templates/partials/project_create_modal.html

@@ -0,0 +1,233 @@
+{#
+Quick Create Project Modal
+Allows inline creation of a new project from the project picker.
+
+Include this modal in pages that use the project picker.
+#}
+
+<div id="quickCreateProjectModal" class="hidden fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
+    <div class="bg-white dark:bg-slate-800 rounded-xl shadow-2xl max-w-md w-full mx-4">
+        <div class="p-6 border-b border-gray-200 dark:border-gray-700">
+            <div class="flex justify-between items-center">
+                <h2 class="text-xl font-bold text-gray-900 dark:text-white">Create New Project</h2>
+                <button type="button" onclick="closeCreateProjectModal()" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300">
+                    <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                    </svg>
+                </button>
+            </div>
+        </div>
+
+        <form id="quickCreateProjectForm" class="p-6 space-y-4">
+            <!-- Hidden field to track which picker opened this modal -->
+            <input type="hidden" id="qcp-picker-id" value="">
+
+            <div>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                    Project Number
+                    <span class="text-gray-400 font-normal">(xxxx-YY)</span>
+                </label>
+                <input type="text"
+                       name="project_number"
+                       id="qcp-project-number"
+                       pattern="\d{4}-\d{2}"
+                       placeholder="2567-23"
+                       class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                <p class="text-xs text-gray-500 dark:text-gray-400 mt-1">TMI internal project number (optional)</p>
+            </div>
+
+            <div>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                    Client Name <span class="text-red-500">*</span>
+                </label>
+                <input type="text"
+                       name="client_name"
+                       id="qcp-client-name"
+                       required
+                       placeholder="PJ Dick, Turner Construction, etc."
+                       class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+            </div>
+
+            <div>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                    Project Name <span class="text-red-500">*</span>
+                </label>
+                <input type="text"
+                       name="name"
+                       id="qcp-project-name"
+                       required
+                       placeholder="RKM Hall, CMU Campus, Building 7, etc."
+                       class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                <p class="text-xs text-gray-500 dark:text-gray-400 mt-1">Site or building name</p>
+            </div>
+
+            <div>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                    Project Type <span class="text-red-500">*</span>
+                </label>
+                <select name="project_type_id"
+                        id="qcp-project-type"
+                        required
+                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                    <option value="vibration_monitoring">Vibration Monitoring</option>
+                    <option value="sound_monitoring">Sound Monitoring</option>
+                    <option value="combined">Combined (Vibration + Sound)</option>
+                </select>
+            </div>
+
+            <div id="qcp-error" class="hidden p-3 bg-red-100 dark:bg-red-900/30 text-red-700 dark:text-red-300 rounded-lg text-sm">
+            </div>
+
+            <div class="flex gap-3 pt-2">
+                <button type="submit"
+                        id="qcp-submit-btn"
+                        class="flex-1 px-4 py-2 bg-seismo-orange hover:bg-orange-600 text-white rounded-lg font-medium transition-colors flex items-center justify-center gap-2">
+                    <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"></path>
+                    </svg>
+                    Create & Select
+                </button>
+                <button type="button"
+                        onclick="closeCreateProjectModal()"
+                        class="px-4 py-2 bg-gray-300 dark:bg-gray-600 hover:bg-gray-400 dark:hover:bg-gray-500 text-gray-700 dark:text-white rounded-lg font-medium transition-colors">
+                    Cancel
+                </button>
+            </div>
+        </form>
+    </div>
+</div>
+
+<script>
+// Quick create project modal functions
+if (typeof openCreateProjectModal === 'undefined') {
+    function openCreateProjectModal(searchQuery, pickerId = '') {
+        const modal = document.getElementById('quickCreateProjectModal');
+        const pickerIdInput = document.getElementById('qcp-picker-id');
+        const projectNumInput = document.getElementById('qcp-project-number');
+        const clientNameInput = document.getElementById('qcp-client-name');
+        const projectNameInput = document.getElementById('qcp-project-name');
+        const errorDiv = document.getElementById('qcp-error');
+
+        // Store which picker opened this
+        if (pickerIdInput) pickerIdInput.value = pickerId;
+
+        // Reset form
+        document.getElementById('quickCreateProjectForm').reset();
+        if (errorDiv) errorDiv.classList.add('hidden');
+
+        // Try to parse the search query intelligently
+        if (searchQuery) {
+            // Check if it looks like a project number (xxxx-YY pattern)
+            const projectNumMatch = searchQuery.match(/(\d{4}-\d{2})/);
+            if (projectNumMatch) {
+                if (projectNumInput) projectNumInput.value = projectNumMatch[1];
+                // If there's more after the number, use it as client name
+                const remainder = searchQuery.replace(projectNumMatch[1], '').replace(/^[\s\-]+/, '').trim();
+                if (remainder && clientNameInput) clientNameInput.value = remainder;
+            } else {
+                // Not a project number - assume it's client or project name
+                // If short (likely a name fragment), put it in client name
+                if (clientNameInput) clientNameInput.value = searchQuery;
+            }
+        }
+
+        // Show modal
+        if (modal) modal.classList.remove('hidden');
+
+        // Focus the first empty required field
+        if (clientNameInput && !clientNameInput.value) {
+            clientNameInput.focus();
+        } else if (projectNameInput) {
+            projectNameInput.focus();
+        }
+    }
+
+    function closeCreateProjectModal() {
+        const modal = document.getElementById('quickCreateProjectModal');
+        if (modal) modal.classList.add('hidden');
+    }
+
+    // Handle quick create form submission
+    document.getElementById('quickCreateProjectForm')?.addEventListener('submit', async function(e) {
+        e.preventDefault();
+
+        const submitBtn = document.getElementById('qcp-submit-btn');
+        const errorDiv = document.getElementById('qcp-error');
+        const pickerId = document.getElementById('qcp-picker-id')?.value || '';
+
+        // Show loading state
+        const originalBtnText = submitBtn.innerHTML;
+        submitBtn.disabled = true;
+        submitBtn.innerHTML = `
+            <svg class="w-5 h-5 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"></path>
+            </svg>
+            Creating...
+        `;
+        if (errorDiv) errorDiv.classList.add('hidden');
+
+        const formData = new FormData(this);
+
+        try {
+            const response = await fetch('/api/projects/create', {
+                method: 'POST',
+                body: formData
+            });
+
+            const result = await response.json();
+
+            if (response.ok && result.success) {
+                // Build display text from form values
+                const parts = [];
+                const projectNumber = formData.get('project_number');
+                const clientName = formData.get('client_name');
+                const projectName = formData.get('name');
+
+                if (projectNumber) parts.push(projectNumber);
+                if (clientName) parts.push(clientName);
+                if (projectName) parts.push(projectName);
+
+                const displayText = parts.join(' - ');
+
+                // Select the newly created project in the picker
+                selectProject(result.project_id, displayText, pickerId);
+
+                // Close modal
+                closeCreateProjectModal();
+            } else {
+                // Show error
+                if (errorDiv) {
+                    errorDiv.textContent = result.detail || result.message || 'Failed to create project';
+                    errorDiv.classList.remove('hidden');
+                }
+            }
+        } catch (error) {
+            if (errorDiv) {
+                errorDiv.textContent = `Error: ${error.message}`;
+                errorDiv.classList.remove('hidden');
+            }
+        } finally {
+            // Restore button
+            submitBtn.disabled = false;
+            submitBtn.innerHTML = originalBtnText;
+        }
+    });
+
+    // Close modal on backdrop click
+    document.getElementById('quickCreateProjectModal')?.addEventListener('click', function(e) {
+        if (e.target === this) {
+            closeCreateProjectModal();
+        }
+    });
+
+    // Close modal on Escape key
+    document.addEventListener('keydown', function(e) {
+        if (e.key === 'Escape') {
+            const modal = document.getElementById('quickCreateProjectModal');
+            if (modal && !modal.classList.contains('hidden')) {
+                closeCreateProjectModal();
+            }
+        }
+    });
+}
+</script>

templates/partials/project_picker.html

@@ -0,0 +1,128 @@
+{#
+Project Picker Component
+A reusable HTMX-based autocomplete for selecting projects.
+
+Usage: include "partials/project_picker.html" with context
+
+Variables available in context:
+- selected_project_id: Pre-selected project UUID (optional)
+- selected_project_display: Display text for pre-selected project (optional)
+- input_name: Name attribute for the hidden input (default: "project_id")
+- picker_id: Unique ID suffix for multiple pickers on same page (default: "")
+#}
+
+{% set picker_id = picker_id|default("") %}
+{% set input_name = input_name|default("project_id") %}
+{% set selected_project_id = selected_project_id|default("") %}
+{% set selected_project_display = selected_project_display|default("") %}
+
+<div class="project-picker relative" id="project-picker-container{{ picker_id }}">
+    <!-- Hidden input for form submission (stores project UUID) -->
+    <input type="hidden"
+           name="{{ input_name }}"
+           id="project-picker-value{{ picker_id }}"
+           value="{{ selected_project_id }}">
+
+    <!-- Search Input -->
+    <div class="relative">
+        <input type="text"
+               id="project-picker-search{{ picker_id }}"
+               placeholder="Search by project number, client, or name..."
+               class="w-full px-4 py-2 pr-10 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange focus:border-seismo-orange"
+               autocomplete="off"
+               value="{{ selected_project_display }}"
+               hx-get="/api/projects/search"
+               hx-trigger="keyup changed delay:300ms, focus"
+               hx-target="#project-picker-dropdown{{ picker_id }}"
+               hx-vals='{"picker_id": "{{ picker_id }}"}'
+               name="q"
+               onfocus="showProjectDropdown('{{ picker_id }}')"
+               oninput="handleProjectSearchInput('{{ picker_id }}', this.value)">
+
+        <!-- Search icon -->
+        <div class="absolute inset-y-0 right-0 flex items-center pr-3 pointer-events-none">
+            <svg class="w-5 h-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+            </svg>
+        </div>
+
+        <!-- Clear button (shown when project is selected) -->
+        <button type="button"
+                id="project-picker-clear{{ picker_id }}"
+                class="absolute inset-y-0 right-8 flex items-center pr-1 {{ 'hidden' if not selected_project_id else '' }}"
+                onclick="clearProjectSelection('{{ picker_id }}')"
+                title="Clear selection">
+            <svg class="w-4 h-4 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+            </svg>
+        </button>
+    </div>
+
+    <!-- Dropdown Results Container -->
+    <div id="project-picker-dropdown{{ picker_id }}"
+         class="hidden absolute z-50 w-full mt-1 bg-white dark:bg-slate-800 border border-gray-300 dark:border-gray-600 rounded-lg shadow-lg max-h-60 overflow-y-auto">
+        <!-- Results loaded via HTMX -->
+    </div>
+</div>
+
+<script>
+// Project picker functions - defined once, work for any picker_id
+if (typeof selectProject === 'undefined') {
+    function selectProject(projectId, displayText, pickerId = '') {
+        const valueInput = document.getElementById('project-picker-value' + pickerId);
+        const searchInput = document.getElementById('project-picker-search' + pickerId);
+        const dropdown = document.getElementById('project-picker-dropdown' + pickerId);
+        const clearBtn = document.getElementById('project-picker-clear' + pickerId);
+
+        if (valueInput) valueInput.value = projectId;
+        if (searchInput) searchInput.value = displayText;
+        if (dropdown) dropdown.classList.add('hidden');
+        if (clearBtn) clearBtn.classList.remove('hidden');
+    }
+
+    function clearProjectSelection(pickerId = '') {
+        const valueInput = document.getElementById('project-picker-value' + pickerId);
+        const searchInput = document.getElementById('project-picker-search' + pickerId);
+        const clearBtn = document.getElementById('project-picker-clear' + pickerId);
+
+        if (valueInput) valueInput.value = '';
+        if (searchInput) {
+            searchInput.value = '';
+            searchInput.focus();
+        }
+        if (clearBtn) clearBtn.classList.add('hidden');
+    }
+
+    function showProjectDropdown(pickerId = '') {
+        const dropdown = document.getElementById('project-picker-dropdown' + pickerId);
+        if (dropdown) dropdown.classList.remove('hidden');
+    }
+
+    function hideProjectDropdown(pickerId = '') {
+        const dropdown = document.getElementById('project-picker-dropdown' + pickerId);
+        if (dropdown) dropdown.classList.add('hidden');
+    }
+
+    function handleProjectSearchInput(pickerId, value) {
+        const valueInput = document.getElementById('project-picker-value' + pickerId);
+        const clearBtn = document.getElementById('project-picker-clear' + pickerId);
+
+        // If user clears the search box, also clear the hidden value
+        if (!value.trim()) {
+            if (valueInput) valueInput.value = '';
+            if (clearBtn) clearBtn.classList.add('hidden');
+        }
+    }
+
+    // Close dropdown when clicking outside
+    document.addEventListener('click', function(event) {
+        const pickers = document.querySelectorAll('.project-picker');
+        pickers.forEach(picker => {
+            if (!picker.contains(event.target)) {
+                const dropdown = picker.querySelector('[id^="project-picker-dropdown"]');
+                if (dropdown) dropdown.classList.add('hidden');
+            }
+        });
+    });
+}
+</script>

templates/partials/project_search_results.html

@@ -0,0 +1,69 @@
+<!--
+Project Search Results Partial
+Rendered by /api/projects/search endpoint for HTMX dropdown.
+
+Variables:
+- projects: List of project dicts with id, project_number, client_name, name, display, status
+- query: The search query string
+- show_create: Boolean - show "Create new project" option when no matches
+-->
+
+{% set picker_id = request.query_params.get('picker_id', '') %}
+
+{% if projects %}
+    {% for project in projects %}
+    <div class="px-4 py-3 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer border-b border-gray-100 dark:border-gray-700 last:border-0 transition-colors"
+         onclick="selectProject('{{ project.id }}', '{{ project.display|e }}', '{{ picker_id }}')">
+        <div class="flex items-start justify-between gap-2">
+            <div class="flex-1 min-w-0">
+                <div class="font-medium text-gray-900 dark:text-white truncate">
+                    {% if project.project_number %}
+                        <span class="text-seismo-orange font-semibold">{{ project.project_number }}</span>
+                        {% if project.client_name or project.name %}
+                            <span class="text-gray-400 mx-1">-</span>
+                        {% endif %}
+                    {% endif %}
+                    {% if project.client_name %}
+                        <span>{{ project.client_name }}</span>
+                    {% endif %}
+                </div>
+                {% if project.name %}
+                    <div class="text-sm text-gray-500 dark:text-gray-400 truncate">
+                        {{ project.name }}
+                    </div>
+                {% endif %}
+            </div>
+            {% if project.status == 'completed' %}
+                <span class="flex-shrink-0 text-xs px-2 py-0.5 bg-gray-100 dark:bg-gray-600 text-gray-600 dark:text-gray-300 rounded">
+                    Completed
+                </span>
+            {% endif %}
+        </div>
+    </div>
+    {% endfor %}
+{% endif %}
+
+{% if show_create %}
+    <div class="px-4 py-3 hover:bg-green-50 dark:hover:bg-green-900/30 cursor-pointer border-t border-gray-200 dark:border-gray-600 transition-colors"
+         onclick="openCreateProjectModal('{{ query|e }}', '{{ picker_id }}')">
+        <div class="flex items-center gap-2 text-green-600 dark:text-green-400">
+            <svg class="w-5 h-5 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"></path>
+            </svg>
+            <span class="font-medium">Create new project "{{ query }}"</span>
+        </div>
+        <p class="text-xs text-gray-500 dark:text-gray-400 mt-1 ml-7">
+            No matching projects found. Click to create a new one.
+        </p>
+    </div>
+{% endif %}
+
+{% if not projects and not show_create %}
+    <div class="px-4 py-6 text-center text-gray-500 dark:text-gray-400">
+        <svg class="w-8 h-8 mx-auto mb-2 text-gray-300 dark:text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+        </svg>
+        <p class="text-sm">Start typing to search projects...</p>
+        <p class="text-xs mt-1">Search by project number, client name, or project name</p>
+    </div>
+{% endif %}

templates/partials/roster_table.html

@@ -337,6 +337,7 @@
 </style>
 
 <script>
+(function() {
     // Update timestamp
     const timestampElement = document.getElementById('last-updated');
     if (timestampElement) {
@@ -357,20 +358,23 @@
         };
         return acc;
     }, {});
+})();
 
-    // Sorting state
+    // Sorting state (needs to persist across swaps)
-    let currentSort = { column: null, direction: 'asc' };
+    if (typeof window.currentSort === 'undefined') {
+        window.currentSort = { column: null, direction: 'asc' };
+    }
 
     function sortTable(column) {
         const tbody = document.getElementById('roster-tbody');
         const rows = Array.from(tbody.getElementsByTagName('tr'));
 
         // Determine sort direction
-        if (currentSort.column === column) {
+        if (window.currentSort.column === column) {
-            currentSort.direction = currentSort.direction === 'asc' ? 'desc' : 'asc';
+            window.currentSort.direction = window.currentSort.direction === 'asc' ? 'desc' : 'asc';
         } else {
-            currentSort.column = column;
+            window.currentSort.column = column;
-            currentSort.direction = 'asc';
+            window.currentSort.direction = 'asc';
         }
 
         // Sort rows
@@ -398,8 +402,8 @@
                 bVal = bVal.toLowerCase();
             }
 
-            if (aVal < bVal) return currentSort.direction === 'asc' ? -1 : 1;
+            if (aVal < bVal) return window.currentSort.direction === 'asc' ? -1 : 1;
-            if (aVal > bVal) return currentSort.direction === 'asc' ? 1 : -1;
+            if (aVal > bVal) return window.currentSort.direction === 'asc' ? 1 : -1;
             return 0;
         });
 
@@ -435,10 +439,10 @@
         });
 
         // Set current indicator
-        if (currentSort.column) {
+        if (window.currentSort.column) {
-            const indicator = document.querySelector(`.sort-indicator[data-column="${currentSort.column}"]`);
+            const indicator = document.querySelector(`.sort-indicator[data-column="${window.currentSort.column}"]`);
             if (indicator) {
-                indicator.className = `sort-indicator ${currentSort.direction}`;
+                indicator.className = `sort-indicator ${window.currentSort.direction}`;
             }
         }
     }

templates/partials/unit_picker.html

@@ -0,0 +1,132 @@
+{#
+Unit Picker Component
+A reusable HTMX-based autocomplete for selecting seismographs/SLMs.
+
+Usage: include "partials/unit_picker.html" with context
+
+Variables available in context:
+- selected_unit_id: Pre-selected unit ID (optional)
+- selected_unit_display: Display text for pre-selected unit (optional)
+- input_name: Name attribute for the hidden input (default: "deployed_with_unit_id")
+- picker_id: Unique ID suffix for multiple pickers on same page (default: "")
+- device_type_filter: Filter by device type: "seismograph", "slm", or empty for all (default: "")
+- deployed_only: Only show deployed units (default: false)
+#}
+
+{% set picker_id = picker_id|default("") %}
+{% set input_name = input_name|default("deployed_with_unit_id") %}
+{% set selected_unit_id = selected_unit_id|default("") %}
+{% set selected_unit_display = selected_unit_display|default("") %}
+{% set device_type_filter = device_type_filter|default("") %}
+{% set deployed_only = deployed_only|default(false) %}
+
+<div class="unit-picker relative" id="unit-picker-container{{ picker_id }}">
+    <!-- Hidden input for form submission (stores unit ID) -->
+    <input type="hidden"
+           name="{{ input_name }}"
+           id="unit-picker-value{{ picker_id }}"
+           value="{{ selected_unit_id }}">
+
+    <!-- Search Input -->
+    <div class="relative">
+        <input type="text"
+               id="unit-picker-search{{ picker_id }}"
+               placeholder="Search by unit ID or note..."
+               class="w-full px-4 py-2 pr-10 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange focus:border-seismo-orange"
+               autocomplete="off"
+               value="{{ selected_unit_display }}"
+               hx-get="/api/roster/search/units"
+               hx-trigger="keyup changed delay:300ms, focus"
+               hx-target="#unit-picker-dropdown{{ picker_id }}"
+               hx-vals='{"picker_id": "{{ picker_id }}", "device_type": "{{ device_type_filter }}", "deployed_only": "{{ deployed_only|lower }}"}'
+               name="q"
+               onfocus="showUnitDropdown('{{ picker_id }}')"
+               oninput="handleUnitSearchInput('{{ picker_id }}', this.value)">
+
+        <!-- Search icon -->
+        <div class="absolute inset-y-0 right-0 flex items-center pr-3 pointer-events-none">
+            <svg class="w-5 h-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+            </svg>
+        </div>
+
+        <!-- Clear button (shown when unit is selected) -->
+        <button type="button"
+                id="unit-picker-clear{{ picker_id }}"
+                class="absolute inset-y-0 right-8 flex items-center pr-1 {{ 'hidden' if not selected_unit_id else '' }}"
+                onclick="clearUnitSelection('{{ picker_id }}')"
+                title="Clear selection">
+            <svg class="w-4 h-4 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+            </svg>
+        </button>
+    </div>
+
+    <!-- Dropdown Results Container -->
+    <div id="unit-picker-dropdown{{ picker_id }}"
+         class="hidden absolute z-50 w-full mt-1 bg-white dark:bg-slate-800 border border-gray-300 dark:border-gray-600 rounded-lg shadow-lg max-h-60 overflow-y-auto">
+        <!-- Results loaded via HTMX -->
+    </div>
+</div>
+
+<script>
+{# Unit picker functions - defined once, work for any picker_id #}
+if (typeof selectUnit === 'undefined') {
+    function selectUnit(unitId, displayText, pickerId = '') {
+        const valueInput = document.getElementById('unit-picker-value' + pickerId);
+        const searchInput = document.getElementById('unit-picker-search' + pickerId);
+        const dropdown = document.getElementById('unit-picker-dropdown' + pickerId);
+        const clearBtn = document.getElementById('unit-picker-clear' + pickerId);
+
+        if (valueInput) valueInput.value = unitId;
+        if (searchInput) searchInput.value = displayText;
+        if (dropdown) dropdown.classList.add('hidden');
+        if (clearBtn) clearBtn.classList.remove('hidden');
+    }
+
+    function clearUnitSelection(pickerId = '') {
+        const valueInput = document.getElementById('unit-picker-value' + pickerId);
+        const searchInput = document.getElementById('unit-picker-search' + pickerId);
+        const clearBtn = document.getElementById('unit-picker-clear' + pickerId);
+
+        if (valueInput) valueInput.value = '';
+        if (searchInput) {
+            searchInput.value = '';
+            searchInput.focus();
+        }
+        if (clearBtn) clearBtn.classList.add('hidden');
+    }
+
+    function showUnitDropdown(pickerId = '') {
+        const dropdown = document.getElementById('unit-picker-dropdown' + pickerId);
+        if (dropdown) dropdown.classList.remove('hidden');
+    }
+
+    function hideUnitDropdown(pickerId = '') {
+        const dropdown = document.getElementById('unit-picker-dropdown' + pickerId);
+        if (dropdown) dropdown.classList.add('hidden');
+    }
+
+    function handleUnitSearchInput(pickerId, value) {
+        const valueInput = document.getElementById('unit-picker-value' + pickerId);
+        const clearBtn = document.getElementById('unit-picker-clear' + pickerId);
+
+        // If user clears the search box, also clear the hidden value
+        if (!value.trim()) {
+            if (valueInput) valueInput.value = '';
+            if (clearBtn) clearBtn.classList.add('hidden');
+        }
+    }
+
+    // Close dropdown when clicking outside
+    document.addEventListener('click', function(event) {
+        const pickers = document.querySelectorAll('.unit-picker');
+        pickers.forEach(picker => {
+            if (!picker.contains(event.target)) {
+                const dropdown = picker.querySelector('[id^="unit-picker-dropdown"]');
+                if (dropdown) dropdown.classList.add('hidden');
+            }
+        });
+    });
+}
+</script>

templates/partials/unit_search_results.html

@@ -0,0 +1,66 @@
+{#
+Unit Search Results Partial
+Rendered by /api/roster/search/units endpoint for HTMX dropdown.
+
+Variables:
+- units: List of unit dicts with id, device_type, note, deployed, display
+- query: The search query string
+- show_empty: Boolean - show "no results" message
+#}
+
+{% set picker_id = request.query_params.get('picker_id', '') %}
+
+{% if units %}
+    {% for unit in units %}
+    <div class="px-4 py-3 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer border-b border-gray-100 dark:border-gray-700 last:border-0 transition-colors"
+         onclick="selectUnit('{{ unit.id }}', '{{ unit.display|e }}', '{{ picker_id }}')">
+        <div class="flex items-start justify-between gap-2">
+            <div class="flex-1 min-w-0">
+                <div class="font-medium text-gray-900 dark:text-white truncate">
+                    <span class="text-seismo-orange font-semibold">{{ unit.id }}</span>
+                </div>
+                {% if unit.note %}
+                    <div class="text-sm text-gray-500 dark:text-gray-400 truncate">
+                        {{ unit.note }}
+                    </div>
+                {% endif %}
+            </div>
+            <div class="flex items-center gap-2">
+                {% if unit.device_type == 'seismograph' %}
+                    <span class="flex-shrink-0 text-xs px-2 py-0.5 bg-blue-100 dark:bg-blue-900/30 text-blue-600 dark:text-blue-300 rounded">
+                        Seismo
+                    </span>
+                {% elif unit.device_type == 'slm' %}
+                    <span class="flex-shrink-0 text-xs px-2 py-0.5 bg-purple-100 dark:bg-purple-900/30 text-purple-600 dark:text-purple-300 rounded">
+                        SLM
+                    </span>
+                {% endif %}
+                {% if not unit.deployed %}
+                    <span class="flex-shrink-0 text-xs px-2 py-0.5 bg-gray-100 dark:bg-gray-600 text-gray-600 dark:text-gray-300 rounded">
+                        Benched
+                    </span>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+    {% endfor %}
+{% endif %}
+
+{% if show_empty %}
+    <div class="px-4 py-6 text-center text-gray-500 dark:text-gray-400">
+        <svg class="w-8 h-8 mx-auto mb-2 text-gray-300 dark:text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+        </svg>
+        <p class="text-sm">No units found matching "{{ query }}"</p>
+    </div>
+{% endif %}
+
+{% if not units and not show_empty %}
+    <div class="px-4 py-6 text-center text-gray-500 dark:text-gray-400">
+        <svg class="w-8 h-8 mx-auto mb-2 text-gray-300 dark:text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+        </svg>
+        <p class="text-sm">Start typing to search units...</p>
+        <p class="text-xs mt-1">Search by unit ID or note</p>
+    </div>
+{% endif %}

templates/roster.html

@@ -131,10 +131,8 @@
                     class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
             </div>
             <div>
-                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Project ID</label>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Project</label>
-                <input type="text" name="project_id"
+                {% include "partials/project_picker.html" with context %}
-                    class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange"
-                    placeholder="PROJ-001">
             </div>
             <div>
                 <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Location</label>
@@ -159,8 +157,8 @@
                 </div>
                 <div id="modemPairingField" class="hidden">
                     <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Deployed With Modem</label>
-                    <input type="text" name="deployed_with_modem_id" placeholder="Modem ID"
+                    {% set picker_id = "-add-seismo" %}
-                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                    {% include "partials/modem_picker.html" with context %}
                     <p class="text-xs text-gray-500 dark:text-gray-400 mt-1">Only needed when deployed</p>
                 </div>
             </div>
@@ -183,6 +181,21 @@
                     <input type="text" name="hardware_model" placeholder="e.g., Raven XTV"
                         class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
                 </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Deployment Type</label>
+                    <select name="deployment_type"
+                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                        <option value="">Not assigned</option>
+                        <option value="seismograph">Seismograph</option>
+                        <option value="slm">Sound Level Meter (SLM)</option>
+                    </select>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Deployed With Unit</label>
+                    {% set picker_id = "-add-modem" %}
+                    {% set device_type_filter = "" %}
+                    {% include "partials/unit_picker.html" with context %}
+                </div>
             </div>
 
             <!-- Sound Level Meter-specific fields -->
@@ -297,9 +310,9 @@
                     class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
             </div>
             <div>
-                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Project ID</label>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Project</label>
-                <input type="text" name="project_id" id="editProjectId"
+                {% set picker_id = "-edit" %}
-                    class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                {% include "partials/project_picker.html" with context %}
             </div>
             <div>
                 <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Address</label>
@@ -327,8 +340,8 @@
                 </div>
                 <div id="editModemPairingField" class="hidden">
                     <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Deployed With Modem</label>
-                    <input type="text" name="deployed_with_modem_id" id="editDeployedWithModemId" placeholder="Modem ID"
+                    {% set picker_id = "-edit-seismo" %}
-                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                    {% include "partials/modem_picker.html" with context %}
                 </div>
             </div>
 
@@ -350,6 +363,21 @@
                     <input type="text" name="hardware_model" id="editHardwareModel" placeholder="e.g., Raven XTV"
                         class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
                 </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Deployment Type</label>
+                    <select name="deployment_type" id="editDeploymentType"
+                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                        <option value="">Not assigned</option>
+                        <option value="seismograph">Seismograph</option>
+                        <option value="slm">Sound Level Meter (SLM)</option>
+                    </select>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Deployed With Unit</label>
+                    {% set picker_id = "-edit-modem" %}
+                    {% set device_type_filter = "" %}
+                    {% include "partials/unit_picker.html" with context %}
+                </div>
             </div>
 
             <!-- Sound Level Meter-specific fields -->
@@ -419,6 +447,55 @@
                 <textarea name="note" id="editNote" rows="3"
                     class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange"></textarea>
             </div>
+
+            <!-- Cascade to Paired Device Section -->
+            <div id="editCascadeSection" class="hidden border-t border-gray-200 dark:border-gray-700 pt-4">
+                <div class="flex items-center gap-2 mb-3">
+                    <svg class="w-5 h-5 text-seismo-orange" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"></path>
+                    </svg>
+                    <span class="text-sm font-semibold text-gray-700 dark:text-gray-300">
+                        Also update paired device: <span id="editPairedDeviceName" class="text-seismo-orange"></span>
+                    </span>
+                </div>
+                <input type="hidden" name="cascade_to_unit_id" id="editCascadeToUnitId" value="">
+                <div class="grid grid-cols-2 gap-2 bg-gray-50 dark:bg-slate-700/50 rounded-lg p-3">
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_deployed" id="editCascadeDeployed" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Deployed status</span>
+                    </label>
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_retired" id="editCascadeRetired" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Retired status</span>
+                    </label>
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_project" id="editCascadeProject" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Project</span>
+                    </label>
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_location" id="editCascadeLocation" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Address</span>
+                    </label>
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_coordinates" id="editCascadeCoordinates" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Coordinates</span>
+                    </label>
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_note" id="editCascadeNote" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Notes</span>
+                    </label>
+                </div>
+                <p class="text-xs text-gray-500 dark:text-gray-400 mt-2">
+                    Check the fields you want to sync to the paired device
+                </p>
+            </div>
+
             <div class="flex gap-3 pt-4">
                 <button type="submit" class="flex-1 px-4 py-2 bg-seismo-orange hover:bg-orange-600 text-white rounded-lg transition-colors">
                     Save Changes
@@ -650,11 +727,7 @@
     document.getElementById('addUnitForm').addEventListener('htmx:afterRequest', function(event) {
         if (event.detail.successful) {
             closeAddUnitModal();
-            // Trigger roster refresh for current active tab
+            refreshDeviceList();
-            htmx.ajax('GET', currentRosterEndpoint, {
-                target: '#roster-content',
-                swap: 'innerHTML'
-            });
             // Show success message
             alert('Unit added successfully!');
         } else {
@@ -692,6 +765,33 @@
     function closeEditUnitModal() {
         document.getElementById('editUnitModal').classList.add('hidden');
         document.getElementById('editUnitForm').reset();
+        // Also clear the project picker
+        const projectPickerValue = document.getElementById('project-picker-value-edit');
+        const projectPickerSearch = document.getElementById('project-picker-search-edit');
+        const projectPickerClear = document.getElementById('project-picker-clear-edit');
+        if (projectPickerValue) projectPickerValue.value = '';
+        if (projectPickerSearch) projectPickerSearch.value = '';
+        if (projectPickerClear) projectPickerClear.classList.add('hidden');
+    }
+
+    // Fetch project display name for edit modal
+    async function fetchProjectDisplayForEdit(projectId) {
+        if (!projectId) return '';
+        try {
+            const response = await fetch(`/api/projects/${projectId}`);
+            if (response.ok) {
+                const project = await response.json();
+                const parts = [
+                    project.project_number,
+                    project.client_name,
+                    project.name
+                ].filter(Boolean);
+                return parts.join(' - ') || projectId;
+            }
+        } catch (e) {
+            console.error('Failed to fetch project:', e);
+        }
+        return projectId;
     }
 
     // Toggle device-specific fields in edit modal
@@ -753,7 +853,23 @@
             document.getElementById('editUnitId').value = unit.id;
             document.getElementById('editDeviceTypeSelect').value = unit.device_type;
             document.getElementById('editUnitType').value = unit.unit_type;
-            document.getElementById('editProjectId').value = unit.project_id;
+
+            // Populate project picker (uses -edit suffix)
+            const projectPickerValue = document.getElementById('project-picker-value-edit');
+            const projectPickerSearch = document.getElementById('project-picker-search-edit');
+            const projectPickerClear = document.getElementById('project-picker-clear-edit');
+            if (projectPickerValue) projectPickerValue.value = unit.project_id || '';
+            if (unit.project_id) {
+                // Fetch project display name
+                fetchProjectDisplayForEdit(unit.project_id).then(displayText => {
+                    if (projectPickerSearch) projectPickerSearch.value = displayText;
+                    if (projectPickerClear) projectPickerClear.classList.remove('hidden');
+                });
+            } else {
+                if (projectPickerSearch) projectPickerSearch.value = '';
+                if (projectPickerClear) projectPickerClear.classList.add('hidden');
+            }
+
             document.getElementById('editAddress').value = unit.address;
             document.getElementById('editCoordinates').value = unit.coordinates;
             document.getElementById('editNote').value = unit.note;
@@ -765,12 +881,62 @@
             // Seismograph fields
             document.getElementById('editLastCalibrated').value = unit.last_calibrated;
             document.getElementById('editNextCalibrationDue').value = unit.next_calibration_due;
-            document.getElementById('editDeployedWithModemId').value = unit.deployed_with_modem_id;
+
+            // Populate modem picker for seismograph (uses -edit-seismo suffix)
+            const modemPickerValue = document.getElementById('modem-picker-value-edit-seismo');
+            const modemPickerSearch = document.getElementById('modem-picker-search-edit-seismo');
+            const modemPickerClear = document.getElementById('modem-picker-clear-edit-seismo');
+            if (modemPickerValue) modemPickerValue.value = unit.deployed_with_modem_id || '';
+            if (unit.deployed_with_modem_id) {
+                // Fetch modem display (ID + IP + note)
+                fetch(`/api/roster/${unit.deployed_with_modem_id}`)
+                    .then(r => r.ok ? r.json() : null)
+                    .then(modem => {
+                        if (modem && modemPickerSearch) {
+                            let display = modem.id;
+                            if (modem.ip_address) display += ` - ${modem.ip_address}`;
+                            if (modem.note) display += ` - ${modem.note}`;
+                            modemPickerSearch.value = display;
+                            if (modemPickerClear) modemPickerClear.classList.remove('hidden');
+                        }
+                    })
+                    .catch(() => {
+                        if (modemPickerSearch) modemPickerSearch.value = unit.deployed_with_modem_id;
+                    });
+            } else {
+                if (modemPickerSearch) modemPickerSearch.value = '';
+                if (modemPickerClear) modemPickerClear.classList.add('hidden');
+            }
 
             // Modem fields
             document.getElementById('editIpAddress').value = unit.ip_address;
             document.getElementById('editPhoneNumber').value = unit.phone_number;
             document.getElementById('editHardwareModel').value = unit.hardware_model;
+            document.getElementById('editDeploymentType').value = unit.deployment_type || '';
+
+            // Populate unit picker for modem (uses -edit-modem suffix)
+            const unitPickerValue = document.getElementById('unit-picker-value-edit-modem');
+            const unitPickerSearch = document.getElementById('unit-picker-search-edit-modem');
+            const unitPickerClear = document.getElementById('unit-picker-clear-edit-modem');
+            if (unitPickerValue) unitPickerValue.value = unit.deployed_with_unit_id || '';
+            if (unit.deployed_with_unit_id) {
+                // Fetch unit display (ID + note)
+                fetch(`/api/roster/${unit.deployed_with_unit_id}`)
+                    .then(r => r.ok ? r.json() : null)
+                    .then(linkedUnit => {
+                        if (linkedUnit && unitPickerSearch) {
+                            const display = linkedUnit.note ? `${linkedUnit.id} - ${linkedUnit.note}` : linkedUnit.id;
+                            unitPickerSearch.value = display;
+                            if (unitPickerClear) unitPickerClear.classList.remove('hidden');
+                        }
+                    })
+                    .catch(() => {
+                        if (unitPickerSearch) unitPickerSearch.value = unit.deployed_with_unit_id;
+                    });
+            } else {
+                if (unitPickerSearch) unitPickerSearch.value = '';
+                if (unitPickerClear) unitPickerClear.classList.add('hidden');
+            }
 
             // SLM fields
             document.getElementById('editSlmModel').value = unit.slm_model || '';
@@ -781,6 +947,35 @@
             document.getElementById('editSlmFrequencyWeighting').value = unit.slm_frequency_weighting || '';
             document.getElementById('editSlmTimeWeighting').value = unit.slm_time_weighting || '';
 
+            // Cascade section - show if there's a paired device
+            const cascadeSection = document.getElementById('editCascadeSection');
+            const cascadeToUnitId = document.getElementById('editCascadeToUnitId');
+            const pairedDeviceName = document.getElementById('editPairedDeviceName');
+
+            // Determine paired device based on device type
+            let pairedUnitId = null;
+            if (unit.device_type === 'modem' && unit.deployed_with_unit_id) {
+                pairedUnitId = unit.deployed_with_unit_id;
+            } else if ((unit.device_type === 'seismograph' || unit.device_type === 'sound_level_meter') && unit.deployed_with_modem_id) {
+                pairedUnitId = unit.deployed_with_modem_id;
+            }
+
+            if (pairedUnitId) {
+                cascadeToUnitId.value = pairedUnitId;
+                pairedDeviceName.textContent = pairedUnitId;
+                cascadeSection.classList.remove('hidden');
+                // Reset checkboxes
+                document.getElementById('editCascadeDeployed').checked = false;
+                document.getElementById('editCascadeRetired').checked = false;
+                document.getElementById('editCascadeProject').checked = false;
+                document.getElementById('editCascadeLocation').checked = false;
+                document.getElementById('editCascadeCoordinates').checked = false;
+                document.getElementById('editCascadeNote').checked = false;
+            } else {
+                cascadeToUnitId.value = '';
+                cascadeSection.classList.add('hidden');
+            }
+
             // Store unit ID for form submission
             document.getElementById('editUnitForm').dataset.unitId = unitId;
 
@@ -814,11 +1009,7 @@
 
             if (response.ok) {
                 closeEditUnitModal();
-                // Trigger roster refresh for current active tab
+                refreshDeviceList();
-                htmx.ajax('GET', currentRosterEndpoint, {
-                    target: '#roster-content',
-                    swap: 'innerHTML'
-                });
                 alert('Unit updated successfully!');
             } else {
                 const result = await response.json();
@@ -846,11 +1037,7 @@
             });
 
             if (response.ok) {
-                // Trigger roster refresh for current active tab
+                refreshDeviceList();
-                htmx.ajax('GET', currentRosterEndpoint, {
-                    target: '#roster-content',
-                    swap: 'innerHTML'
-                });
                 alert(`Unit ${deployed ? 'deployed' : 'benched'} successfully!`);
             } else {
                 const result = await response.json();
@@ -878,11 +1065,7 @@
             });
 
             if (response.ok) {
-                // Trigger roster refresh for current active tab
+                refreshDeviceList();
-                htmx.ajax('GET', currentRosterEndpoint, {
-                    target: '#roster-content',
-                    swap: 'innerHTML'
-                });
                 alert(`Unit ${unitId} moved to ignore list`);
             } else {
                 const result = await response.json();
@@ -905,11 +1088,7 @@
             });
 
             if (response.ok) {
-                // Trigger roster refresh for current active tab
+                refreshDeviceList();
-                htmx.ajax('GET', currentRosterEndpoint, {
-                    target: '#roster-content',
-                    swap: 'innerHTML'
-                });
                 alert(`Unit ${unitId} deleted successfully`);
             } else {
                 const result = await response.json();
@@ -948,11 +1127,7 @@
                 `;
                 resultDiv.classList.remove('hidden');
 
-                // Trigger roster refresh for current active tab
+                refreshDeviceList();
-                htmx.ajax('GET', currentRosterEndpoint, {
-                    target: '#roster-content',
-                    swap: 'innerHTML'
-                });
 
                 // Close modal after 2 seconds
                 setTimeout(() => closeImportModal(), 2000);
@@ -968,35 +1143,35 @@
         }
     });
 
-    // Handle roster tab switching with auto-refresh
+    // Refresh device list (applies current client-side filters after load)
-    let currentRosterEndpoint = '/partials/roster-deployed'; // Default to deployed tab
+    function refreshDeviceList() {
-
+        htmx.ajax('GET', '/partials/devices-all', {
-    document.addEventListener('DOMContentLoaded', function() {
+            target: '#device-content',
-        const tabButtons = document.querySelectorAll('.roster-tab-button');
-
-        tabButtons.forEach(button => {
-            button.addEventListener('click', function() {
-                // Remove active-roster-tab class from all buttons
-                tabButtons.forEach(btn => btn.classList.remove('active-roster-tab'));
-                // Add active-roster-tab class to clicked button
-                this.classList.add('active-roster-tab');
-
-                // Update current endpoint for auto-refresh
-                currentRosterEndpoint = this.getAttribute('data-endpoint');
-            });
-        });
-
-        // Auto-refresh the current active tab every 10 seconds
-        setInterval(() => {
-            const rosterContent = document.getElementById('roster-content');
-            if (rosterContent) {
-                // Use HTMX to trigger a refresh of the current endpoint
-                htmx.ajax('GET', currentRosterEndpoint, {
-                    target: '#roster-content',
             swap: 'innerHTML'
+        }).then(() => {
+            // Re-apply filters after content loads
+            setTimeout(filterDevices, 100);
         });
     }
-        }, 10000); // 10 seconds
+
+    // Check if any modal is currently open
+    function isAnyModalOpen() {
+        const modalIds = ['addUnitModal', 'editUnitModal', 'renameUnitModal', 'importModal', 'quickCreateProjectModal'];
+        return modalIds.some(id => {
+            const modal = document.getElementById(id);
+            return modal && !modal.classList.contains('hidden');
+        });
+    }
+
+    document.addEventListener('DOMContentLoaded', function() {
+        // Auto-refresh device list every 30 seconds (increased from 10s to reduce flicker)
+        setInterval(() => {
+            const deviceContent = document.getElementById('device-content');
+            if (deviceContent && !isAnyModalOpen()) {
+                // Only auto-refresh if no modal is open
+                refreshDeviceList();
+            }
+        }, 30000);
     });
 
     // Un-ignore Unit (remove from ignored list)
@@ -1345,4 +1520,7 @@
 }
 </style>
 
+<!-- Include Project Create Modal for inline project creation -->
+{% include "partials/project_create_modal.html" %}
+
 {% endblock %}

templates/unit_detail.html

@@ -43,7 +43,7 @@
             </button>
         </div>
         <div class="flex gap-3">
-            <button id="editButton" onclick="window.location.href='/roster?edit=' + unitId" class="px-4 py-2 bg-seismo-orange hover:bg-orange-600 text-white rounded-lg transition-colors flex items-center gap-2">
+            <button id="editButton" onclick="enterEditMode()" class="px-4 py-2 bg-seismo-orange hover:bg-orange-600 text-white rounded-lg transition-colors flex items-center gap-2">
                 <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path>
                 </svg>
@@ -121,8 +121,13 @@
                     <p id="viewUnitType" class="mt-1 text-gray-900 dark:text-white font-medium">--</p>
                 </div>
                 <div>
-                    <label class="text-sm font-medium text-gray-500 dark:text-gray-400">Project ID</label>
+                    <label class="text-sm font-medium text-gray-500 dark:text-gray-400">Project</label>
-                    <p id="viewProjectId" class="mt-1 text-gray-900 dark:text-white font-medium">--</p>
+                    <p id="viewProjectContainer" class="mt-1">
+                        <a id="viewProjectLink" href="#" class="text-seismo-orange hover:text-orange-600 font-medium hover:underline hidden">
+                            <span id="viewProjectText">--</span>
+                        </a>
+                        <span id="viewProjectNoLink" class="text-gray-900 dark:text-white font-medium">Not assigned</span>
+                    </p>
                 </div>
                 <div>
                     <label class="text-sm font-medium text-gray-500 dark:text-gray-400">Address</label>
@@ -148,7 +153,12 @@
                     </div>
                     <div>
                         <label class="text-sm font-medium text-gray-500 dark:text-gray-400">Deployed With Modem</label>
-                        <p id="viewDeployedWithModemId" class="mt-1 text-gray-900 dark:text-white font-medium">--</p>
+                        <p id="viewDeployedWithModemContainer" class="mt-1">
+                            <a id="viewDeployedWithModemLink" href="#" class="text-seismo-orange hover:text-orange-600 font-medium hover:underline hidden">
+                                <span id="viewDeployedWithModemText">--</span>
+                            </a>
+                            <span id="viewDeployedWithModemNoLink" class="text-gray-900 dark:text-white font-medium">--</span>
+                        </p>
                     </div>
                 </div>
             </div>
@@ -172,6 +182,48 @@
                 </div>
             </div>
 
+            <!-- Paired Device (for modems only) -->
+            <div id="viewPairedDeviceSection" class="hidden border-t border-gray-200 dark:border-gray-700 pt-6">
+                <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-4">Paired Device</h3>
+                <div id="pairedDeviceInfo">
+                    <p class="text-sm text-gray-500 dark:text-gray-400">Loading...</p>
+                </div>
+            </div>
+
+            <!-- Connectivity (for modems only) -->
+            <div id="viewConnectivitySection" class="hidden border-t border-gray-200 dark:border-gray-700 pt-6">
+                <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-4">Connectivity</h3>
+                <div class="flex items-center gap-4 mb-4">
+                    <button onclick="pingModem()" id="modemPingBtn"
+                            class="px-4 py-2 bg-blue-100 hover:bg-blue-200 text-blue-700 dark:bg-blue-900/30 dark:hover:bg-blue-900/50 dark:text-blue-300 rounded-lg flex items-center gap-2 transition-colors">
+                        <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.111 16.404a5.5 5.5 0 017.778 0M12 20h.01m-7.08-7.071c3.904-3.905 10.236-3.905 14.141 0M1.394 9.393c5.857-5.857 15.355-5.857 21.213 0"></path>
+                        </svg>
+                        Ping Test
+                    </button>
+                    <span id="modemPingResult" class="text-sm text-gray-500 dark:text-gray-400">--</span>
+                </div>
+
+                <!-- Future Diagnostics Placeholders -->
+                <div class="grid grid-cols-1 md:grid-cols-3 gap-4 opacity-60">
+                    <div class="bg-gray-100 dark:bg-gray-700 rounded-lg p-4">
+                        <p class="text-xs text-gray-500 dark:text-gray-400">Signal Strength</p>
+                        <p class="text-xl font-semibold text-gray-400 dark:text-gray-500">-- dBm</p>
+                        <p class="text-xs text-gray-400 dark:text-gray-500 mt-1">ModemManager pending</p>
+                    </div>
+                    <div class="bg-gray-100 dark:bg-gray-700 rounded-lg p-4">
+                        <p class="text-xs text-gray-500 dark:text-gray-400">Data Usage</p>
+                        <p class="text-xl font-semibold text-gray-400 dark:text-gray-500">-- MB</p>
+                        <p class="text-xs text-gray-400 dark:text-gray-500 mt-1">ModemManager pending</p>
+                    </div>
+                    <div class="bg-gray-100 dark:bg-gray-700 rounded-lg p-4">
+                        <p class="text-xs text-gray-500 dark:text-gray-400">Uptime</p>
+                        <p class="text-xl font-semibold text-gray-400 dark:text-gray-500">--</p>
+                        <p class="text-xs text-gray-400 dark:text-gray-500 mt-1">ModemManager pending</p>
+                    </div>
+                </div>
+            </div>
+
             <!-- Notes -->
             <div class="border-t border-gray-200 dark:border-gray-700 pt-6">
                 <label class="text-sm font-medium text-gray-500 dark:text-gray-400">Notes</label>
@@ -251,11 +303,11 @@
                         class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
                 </div>
 
-                <!-- Project ID -->
+                <!-- Project -->
                 <div>
-                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Project ID</label>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Project</label>
-                    <input type="text" name="project_id" id="projectId"
+                    {% set picker_id = "-detail" %}
-                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                    {% include "partials/project_picker.html" with context %}
                 </div>
 
                 <!-- Address -->
@@ -289,8 +341,20 @@
                     </div>
                     <div>
                         <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Deployed With Modem</label>
-                        <input type="text" name="deployed_with_modem_id" id="deployedWithModemId" placeholder="Modem ID"
+                        <div class="flex gap-2">
-                            class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                            <div class="flex-1">
+                                {% set picker_id = "-detail-seismo" %}
+                                {% set input_name = "deployed_with_modem_id" %}
+                                {% include "partials/modem_picker.html" with context %}
+                            </div>
+                            <button type="button" onclick="openPairDeviceModal('seismograph')"
+                                class="px-3 py-2 bg-gray-100 dark:bg-gray-700 hover:bg-gray-200 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-300 rounded-lg transition-colors flex items-center gap-1"
+                                title="Pair with modem">
+                                <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"></path>
+                                </svg>
+                            </button>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -364,11 +428,20 @@
                     </div>
                     <div class="md:col-span-2">
                         <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Deployed With Modem</label>
-                        <select name="deployed_with_modem_id" id="slmDeployedWithModemId"
+                        <div class="flex gap-2">
-                            class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                            <div class="flex-1">
-                            <option value="">No modem assigned</option>
+                                {% set picker_id = "-detail-slm" %}
-                            <!-- Options will be populated by JavaScript -->
+                                {% set input_name = "deployed_with_modem_id" %}
-                        </select>
+                                {% include "partials/modem_picker.html" with context %}
+                            </div>
+                            <button type="button" onclick="openPairDeviceModal('sound_level_meter')"
+                                class="px-3 py-2 bg-gray-100 dark:bg-gray-700 hover:bg-gray-200 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-300 rounded-lg transition-colors flex items-center gap-1"
+                                title="Pair with modem">
+                                <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"></path>
+                                </svg>
+                            </button>
+                        </div>
                         <p class="text-xs text-gray-500 dark:text-gray-400 mt-1">Select the modem that provides network connectivity for this SLM</p>
                     </div>
                 </div>
@@ -395,6 +468,54 @@
                     class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange"></textarea>
             </div>
 
+            <!-- Cascade to Paired Device Section -->
+            <div id="detailCascadeSection" class="hidden border-t border-gray-200 dark:border-gray-700 pt-4">
+                <div class="flex items-center gap-2 mb-3">
+                    <svg class="w-5 h-5 text-seismo-orange" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"></path>
+                    </svg>
+                    <span class="text-sm font-semibold text-gray-700 dark:text-gray-300">
+                        Also update paired device: <span id="detailPairedDeviceName" class="text-seismo-orange"></span>
+                    </span>
+                </div>
+                <input type="hidden" name="cascade_to_unit_id" id="detailCascadeToUnitId" value="">
+                <div class="grid grid-cols-2 md:grid-cols-3 gap-2 bg-gray-50 dark:bg-slate-700/50 rounded-lg p-3">
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_deployed" id="detailCascadeDeployed" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Deployed status</span>
+                    </label>
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_retired" id="detailCascadeRetired" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Retired status</span>
+                    </label>
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_project" id="detailCascadeProject" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Project</span>
+                    </label>
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_location" id="detailCascadeLocation" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Address</span>
+                    </label>
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_coordinates" id="detailCascadeCoordinates" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Coordinates</span>
+                    </label>
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" name="cascade_note" id="detailCascadeNote" value="true"
+                            class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-700 dark:text-gray-300">Notes</span>
+                    </label>
+                </div>
+                <p class="text-xs text-gray-500 dark:text-gray-400 mt-2">
+                    Check the fields you want to sync to the paired device
+                </p>
+            </div>
+
             <!-- Save/Cancel Buttons -->
             <div class="flex gap-3">
                 <button type="submit" class="flex-1 px-6 py-3 bg-seismo-orange hover:bg-orange-600 text-white rounded-lg font-medium transition-colors">
@@ -415,6 +536,64 @@ let currentSnapshot = null;
 let unitMap = null;
 let mapMarker = null;
 
+// Fetch project display name (combines project_number, client_name, name)
+async function fetchProjectDisplay(projectId) {
+    if (!projectId) return '';
+    try {
+        const response = await fetch(`/api/projects/${projectId}`);
+        if (response.ok) {
+            const project = await response.json();
+            const parts = [
+                project.project_number,
+                project.client_name,
+                project.name
+            ].filter(Boolean);
+            return parts.join(' - ') || projectId;
+        }
+    } catch (e) {
+        console.error('Failed to fetch project:', e);
+    }
+    return projectId;
+}
+
+// Fetch modem display name (combines id, ip_address, hardware_model)
+// Also returns the actual modem ID if found (for updating picker value)
+async function fetchModemDisplay(modemIdOrIp) {
+    if (!modemIdOrIp) return { display: '', modemId: '' };
+    try {
+        // First try direct lookup by ID
+        let response = await fetch(`/api/roster/${encodeURIComponent(modemIdOrIp)}`);
+        if (response.ok) {
+            const modem = await response.json();
+            const parts = [modem.id];
+            if (modem.ip_address) parts.push(`(${modem.ip_address})`);
+            if (modem.hardware_model) parts.push(`- ${modem.hardware_model}`);
+            return { display: parts.join(' ') || modemIdOrIp, modemId: modem.id };
+        }
+
+        // If not found, maybe it's an IP address - search for it
+        response = await fetch(`/api/roster/search/modems?q=${encodeURIComponent(modemIdOrIp)}`);
+        if (response.ok) {
+            // The search returns HTML, so we need to look up differently
+            // Try fetching all modems and find by IP
+            const modemsResponse = await fetch('/api/roster/modems');
+            if (modemsResponse.ok) {
+                const modems = await modemsResponse.json();
+                const modem = modems.find(m => m.ip_address === modemIdOrIp);
+                if (modem) {
+                    const parts = [modem.id];
+                    if (modem.ip_address) parts.push(`(${modem.ip_address})`);
+                    if (modem.hardware_model) parts.push(`- ${modem.hardware_model}`);
+                    return { display: parts.join(' ') || modemIdOrIp, modemId: modem.id };
+                }
+            }
+        }
+    } catch (e) {
+        console.error('Failed to fetch modem:', e);
+    }
+    return { display: modemIdOrIp, modemId: modemIdOrIp };
+}
+
 // Load unit data on page load
 async function loadUnitData() {
     try {
@@ -536,14 +715,60 @@ function populateViewMode() {
     // Basic info
     document.getElementById('viewDeviceType').textContent = currentUnit.device_type || '--';
     document.getElementById('viewUnitType').textContent = currentUnit.unit_type || '--';
-    document.getElementById('viewProjectId').textContent = currentUnit.project_id || '--';
+
+    // Project display with clickable link
+    const projectId = currentUnit.project_id;
+    const projectLink = document.getElementById('viewProjectLink');
+    const projectNoLink = document.getElementById('viewProjectNoLink');
+    const projectText = document.getElementById('viewProjectText');
+
+    if (projectId) {
+        // Fetch project display name and show link
+        fetchProjectDisplay(projectId).then(displayText => {
+            if (projectText) projectText.textContent = displayText;
+            if (projectLink) {
+                projectLink.href = `/projects/${projectId}`;
+                projectLink.classList.remove('hidden');
+            }
+            if (projectNoLink) projectNoLink.classList.add('hidden');
+        });
+    } else {
+        if (projectNoLink) {
+            projectNoLink.textContent = 'Not assigned';
+            projectNoLink.classList.remove('hidden');
+        }
+        if (projectLink) projectLink.classList.add('hidden');
+    }
+
     document.getElementById('viewAddress').textContent = currentUnit.address || '--';
     document.getElementById('viewCoordinates').textContent = currentUnit.coordinates || '--';
 
     // Seismograph fields
     document.getElementById('viewLastCalibrated').textContent = currentUnit.last_calibrated || '--';
     document.getElementById('viewNextCalibrationDue').textContent = currentUnit.next_calibration_due || '--';
-    document.getElementById('viewDeployedWithModemId').textContent = currentUnit.deployed_with_modem_id || '--';
+
+    // Deployed with modem - show as clickable link
+    const modemLink = document.getElementById('viewDeployedWithModemLink');
+    const modemNoLink = document.getElementById('viewDeployedWithModemNoLink');
+    const modemText = document.getElementById('viewDeployedWithModemText');
+
+    if (currentUnit.deployed_with_modem_id) {
+        // Fetch modem info to get the actual ID (in case stored as IP) and display text
+        fetchModemDisplay(currentUnit.deployed_with_modem_id).then(result => {
+            if (modemText) modemText.textContent = result.display;
+            if (modemLink) {
+                modemLink.href = `/unit/${encodeURIComponent(result.modemId)}`;
+                modemLink.classList.remove('hidden');
+            }
+            if (modemNoLink) modemNoLink.classList.add('hidden');
+        });
+    } else {
+        if (modemNoLink) {
+            modemNoLink.textContent = '--';
+            modemNoLink.classList.remove('hidden');
+        }
+        if (modemLink) modemLink.classList.add('hidden');
+    }
 
     // Modem fields
     document.getElementById('viewIpAddress').textContent = currentUnit.ip_address || '--';
@@ -557,9 +782,15 @@ function populateViewMode() {
     if (currentUnit.device_type === 'modem') {
         document.getElementById('viewSeismographFields').classList.add('hidden');
         document.getElementById('viewModemFields').classList.remove('hidden');
+        document.getElementById('viewPairedDeviceSection').classList.remove('hidden');
+        document.getElementById('viewConnectivitySection').classList.remove('hidden');
+        // Load paired device info
+        loadPairedDevice();
     } else {
         document.getElementById('viewSeismographFields').classList.remove('hidden');
         document.getElementById('viewModemFields').classList.add('hidden');
+        document.getElementById('viewPairedDeviceSection').classList.add('hidden');
+        document.getElementById('viewConnectivitySection').classList.add('hidden');
     }
 }
 
@@ -567,7 +798,22 @@ function populateViewMode() {
 function populateEditForm() {
     document.getElementById('deviceType').value = currentUnit.device_type || 'seismograph';
     document.getElementById('unitType').value = currentUnit.unit_type || '';
-    document.getElementById('projectId').value = currentUnit.project_id || '';
+
+    // Populate project picker (uses -detail suffix)
+    const projectPickerValue = document.getElementById('project-picker-value-detail');
+    const projectPickerSearch = document.getElementById('project-picker-search-detail');
+    const projectPickerClear = document.getElementById('project-picker-clear-detail');
+    if (projectPickerValue) projectPickerValue.value = currentUnit.project_id || '';
+    if (currentUnit.project_id) {
+        fetchProjectDisplay(currentUnit.project_id).then(displayText => {
+            if (projectPickerSearch) projectPickerSearch.value = displayText;
+            if (projectPickerClear) projectPickerClear.classList.remove('hidden');
+        });
+    } else {
+        if (projectPickerSearch) projectPickerSearch.value = '';
+        if (projectPickerClear) projectPickerClear.classList.add('hidden');
+    }
+
     document.getElementById('address').value = currentUnit.address || '';
     document.getElementById('coordinates').value = currentUnit.coordinates || '';
     document.getElementById('deployed').checked = currentUnit.deployed;
@@ -577,7 +823,24 @@ function populateEditForm() {
     // Seismograph fields
     document.getElementById('lastCalibrated').value = currentUnit.last_calibrated || '';
     document.getElementById('nextCalibrationDue').value = currentUnit.next_calibration_due || '';
-    document.getElementById('deployedWithModemId').value = currentUnit.deployed_with_modem_id || '';
+
+    // Populate modem picker for seismograph (uses -detail-seismo suffix)
+    const modemPickerValue = document.getElementById('modem-picker-value-detail-seismo');
+    const modemPickerSearch = document.getElementById('modem-picker-search-detail-seismo');
+    const modemPickerClear = document.getElementById('modem-picker-clear-detail-seismo');
+    if (currentUnit.deployed_with_modem_id) {
+        // Fetch modem display info (handles both modem ID and IP address lookups)
+        fetchModemDisplay(currentUnit.deployed_with_modem_id).then(result => {
+            // Update the hidden value with the actual modem ID (in case it was stored as IP)
+            if (modemPickerValue) modemPickerValue.value = result.modemId || currentUnit.deployed_with_modem_id;
+            if (modemPickerSearch) modemPickerSearch.value = result.display;
+            if (modemPickerClear) modemPickerClear.classList.remove('hidden');
+        });
+    } else {
+        if (modemPickerValue) modemPickerValue.value = '';
+        if (modemPickerSearch) modemPickerSearch.value = '';
+        if (modemPickerClear) modemPickerClear.classList.add('hidden');
+    }
 
     // Modem fields
     document.getElementById('ipAddress').value = currentUnit.ip_address || '';
@@ -591,10 +854,69 @@ function populateEditForm() {
     document.getElementById('slmFrequencyWeighting').value = currentUnit.slm_frequency_weighting || '';
     document.getElementById('slmTimeWeighting').value = currentUnit.slm_time_weighting || '';
     document.getElementById('slmMeasurementRange').value = currentUnit.slm_measurement_range || '';
-    document.getElementById('slmDeployedWithModemId').value = currentUnit.deployed_with_modem_id || '';
+
+    // Populate modem picker for SLM (uses -detail-slm suffix)
+    const slmModemPickerValue = document.getElementById('modem-picker-value-detail-slm');
+    const slmModemPickerSearch = document.getElementById('modem-picker-search-detail-slm');
+    const slmModemPickerClear = document.getElementById('modem-picker-clear-detail-slm');
+    if (currentUnit.deployed_with_modem_id) {
+        // Fetch modem display info (handles both modem ID and IP address lookups)
+        fetchModemDisplay(currentUnit.deployed_with_modem_id).then(result => {
+            // Update the hidden value with the actual modem ID (in case it was stored as IP)
+            if (slmModemPickerValue) slmModemPickerValue.value = result.modemId || currentUnit.deployed_with_modem_id;
+            if (slmModemPickerSearch) slmModemPickerSearch.value = result.display;
+            if (slmModemPickerClear) slmModemPickerClear.classList.remove('hidden');
+        });
+    } else {
+        if (slmModemPickerValue) slmModemPickerValue.value = '';
+        if (slmModemPickerSearch) slmModemPickerSearch.value = '';
+        if (slmModemPickerClear) slmModemPickerClear.classList.add('hidden');
+    }
 
     // Show/hide fields based on device type
     toggleDetailFields();
+
+    // Check for paired device and show cascade section if applicable
+    checkAndShowCascadeSection();
+}
+
+// Check for paired device and show/hide cascade section
+async function checkAndShowCascadeSection() {
+    const cascadeSection = document.getElementById('detailCascadeSection');
+    const cascadeToUnitId = document.getElementById('detailCascadeToUnitId');
+    const pairedDeviceName = document.getElementById('detailPairedDeviceName');
+
+    if (!cascadeSection) return;
+
+    // Reset cascade section
+    cascadeSection.classList.add('hidden');
+    if (cascadeToUnitId) cascadeToUnitId.value = '';
+    if (pairedDeviceName) pairedDeviceName.textContent = '';
+
+    // Reset checkboxes
+    ['detailCascadeDeployed', 'detailCascadeRetired', 'detailCascadeProject',
+     'detailCascadeLocation', 'detailCascadeCoordinates', 'detailCascadeNote'].forEach(id => {
+        const checkbox = document.getElementById(id);
+        if (checkbox) checkbox.checked = false;
+    });
+
+    let pairedUnitId = null;
+
+    // Check based on device type
+    if (currentUnit.device_type === 'modem' && currentUnit.deployed_with_unit_id) {
+        // Modem is paired with a seismograph or SLM
+        pairedUnitId = currentUnit.deployed_with_unit_id;
+    } else if ((currentUnit.device_type === 'seismograph' || currentUnit.device_type === 'sound_level_meter') && currentUnit.deployed_with_modem_id) {
+        // Seismograph or SLM is paired with a modem
+        pairedUnitId = currentUnit.deployed_with_modem_id;
+    }
+
+    if (pairedUnitId) {
+        // Show cascade section
+        cascadeSection.classList.remove('hidden');
+        if (cascadeToUnitId) cascadeToUnitId.value = pairedUnitId;
+        if (pairedDeviceName) pairedDeviceName.textContent = pairedUnitId;
+    }
 }
 
 // Toggle device-specific fields
@@ -641,6 +963,16 @@ document.getElementById('editForm').addEventListener('submit', async function(e)
     e.preventDefault();
 
     const formData = new FormData(this);
+    const deviceType = formData.get('device_type');
+
+    // Fix: FormData contains both modem picker hidden inputs (seismo and slm).
+    // We need to ensure only the correct one is submitted based on device type.
+    // Delete all deployed_with_modem_id entries and re-add the correct one.
+    const modemId = getCorrectModemPickerValue(deviceType);
+    formData.delete('deployed_with_modem_id');
+    if (modemId) {
+        formData.append('deployed_with_modem_id', modemId);
+    }
 
     try {
         const response = await fetch(`/api/roster/edit/${unitId}`, {
@@ -662,6 +994,19 @@ document.getElementById('editForm').addEventListener('submit', async function(e)
     }
 });
 
+// Get the correct modem picker value based on device type
+function getCorrectModemPickerValue(deviceType) {
+    if (deviceType === 'seismograph') {
+        const picker = document.getElementById('modem-picker-value-detail-seismo');
+        return picker ? picker.value : '';
+    } else if (deviceType === 'sound_level_meter') {
+        const picker = document.getElementById('modem-picker-value-detail-slm');
+        return picker ? picker.value : '';
+    }
+    // Modems don't have a deployed_with_modem_id
+    return '';
+}
+
 // Delete unit
 async function deleteUnit() {
     if (!confirm(`Are you sure you want to PERMANENTLY delete unit ${unitId}?\n\nThis action cannot be undone!`)) {
@@ -999,10 +1344,297 @@ async function deleteHistoryEntry(historyId) {
     }
 }
 
+// Load paired device info for modems
+async function loadPairedDevice() {
+    try {
+        const response = await fetch(`/api/modem-dashboard/${unitId}/paired-device-html`);
+        if (response.ok) {
+            const html = await response.text();
+            document.getElementById('pairedDeviceInfo').innerHTML = html;
+        }
+    } catch (error) {
+        console.error('Error loading paired device:', error);
+        document.getElementById('pairedDeviceInfo').innerHTML = '<p class="text-red-500 text-sm">Failed to load paired device info</p>';
+    }
+}
+
+// Ping modem and show result
+async function pingModem() {
+    const btn = document.getElementById('modemPingBtn');
+    const resultSpan = document.getElementById('modemPingResult');
+
+    // Show loading state
+    const originalText = btn.innerHTML;
+    btn.innerHTML = `
+        <svg class="w-5 h-5 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"></path>
+        </svg>
+        Pinging...
+    `;
+    btn.disabled = true;
+    resultSpan.textContent = 'Testing connection...';
+    resultSpan.className = 'text-sm text-gray-500 dark:text-gray-400';
+
+    try {
+        const response = await fetch(`/api/modem-dashboard/${unitId}/ping`);
+        const data = await response.json();
+
+        if (data.status === 'success') {
+            resultSpan.innerHTML = `<span class="inline-block w-2 h-2 bg-green-500 rounded-full mr-1"></span>Online (${data.response_time_ms}ms)`;
+            resultSpan.className = 'text-sm text-green-600 dark:text-green-400';
+        } else {
+            resultSpan.innerHTML = `<span class="inline-block w-2 h-2 bg-red-500 rounded-full mr-1"></span>${data.detail || 'Offline'}`;
+            resultSpan.className = 'text-sm text-red-600 dark:text-red-400';
+        }
+    } catch (error) {
+        resultSpan.textContent = 'Error: ' + error.message;
+        resultSpan.className = 'text-sm text-red-600 dark:text-red-400';
+    }
+
+    // Restore button
+    btn.innerHTML = originalText;
+    btn.disabled = false;
+}
+
 // Load data when page loads
 loadUnitData().then(() => {
     loadPhotos();
     loadUnitHistory();
 });
+
+// ===== Pair Device Modal Functions =====
+let pairModalModems = []; // Cache loaded modems
+let pairModalDeviceType = ''; // Current device type
+
+function openPairDeviceModal(deviceType) {
+    const modal = document.getElementById('pairDeviceModal');
+    const searchInput = document.getElementById('pairModemSearch');
+    const hideBenchedCheckbox = document.getElementById('pairHideBenched');
+
+    if (!modal) return;
+
+    pairModalDeviceType = deviceType;
+
+    // Reset search and filter
+    if (searchInput) searchInput.value = '';
+    if (hideBenchedCheckbox) hideBenchedCheckbox.checked = false;
+
+    // Show modal
+    modal.classList.remove('hidden');
+
+    // Focus search input
+    setTimeout(() => {
+        if (searchInput) searchInput.focus();
+    }, 100);
+
+    // Load available modems
+    loadAvailableModems();
+}
+
+function closePairDeviceModal() {
+    const modal = document.getElementById('pairDeviceModal');
+    if (modal) modal.classList.add('hidden');
+    pairModalModems = [];
+}
+
+async function loadAvailableModems() {
+    const listContainer = document.getElementById('pairModemList');
+    listContainer.innerHTML = '<div class="text-center py-4"><div class="animate-spin inline-block w-6 h-6 border-2 border-seismo-orange border-t-transparent rounded-full"></div><p class="mt-2 text-sm text-gray-500">Loading modems...</p></div>';
+
+    try {
+        const response = await fetch('/api/roster/modems');
+        if (!response.ok) throw new Error('Failed to load modems');
+
+        pairModalModems = await response.json();
+
+        if (pairModalModems.length === 0) {
+            listContainer.innerHTML = '<p class="text-center py-4 text-gray-500">No modems found in roster</p>';
+            return;
+        }
+
+        // Render the list
+        renderModemList();
+    } catch (error) {
+        listContainer.innerHTML = `<p class="text-center py-4 text-red-500">Error: ${error.message}</p>`;
+    }
+}
+
+function filterPairModemList() {
+    renderModemList();
+}
+
+function renderModemList() {
+    const listContainer = document.getElementById('pairModemList');
+    const searchInput = document.getElementById('pairModemSearch');
+    const hideBenchedCheckbox = document.getElementById('pairHideBenched');
+
+    const searchTerm = (searchInput?.value || '').toLowerCase().trim();
+    const hideBenched = hideBenchedCheckbox?.checked || false;
+
+    // Filter modems
+    let filteredModems = pairModalModems.filter(modem => {
+        // Filter by benched status
+        if (hideBenched && !modem.deployed) return false;
+
+        // Filter by search term
+        if (searchTerm) {
+            const searchFields = [
+                modem.id,
+                modem.ip_address || '',
+                modem.phone_number || '',
+                modem.note || ''
+            ].join(' ').toLowerCase();
+            if (!searchFields.includes(searchTerm)) return false;
+        }
+
+        return true;
+    });
+
+    if (filteredModems.length === 0) {
+        listContainer.innerHTML = '<p class="text-center py-4 text-gray-500">No modems match your criteria</p>';
+        return;
+    }
+
+    // Build modem list
+    let html = '';
+    for (const modem of filteredModems) {
+        const displayParts = [modem.id];
+        if (modem.ip_address) displayParts.push(`(${modem.ip_address})`);
+        if (modem.note) displayParts.push(`- ${modem.note.substring(0, 30)}${modem.note.length > 30 ? '...' : ''}`);
+
+        const deployedBadge = modem.deployed
+            ? '<span class="px-2 py-0.5 bg-green-100 dark:bg-green-900/30 text-green-800 dark:text-green-300 text-xs rounded">Deployed</span>'
+            : '<span class="px-2 py-0.5 bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-400 text-xs rounded">Benched</span>';
+
+        const pairedBadge = modem.deployed_with_unit_id
+            ? `<span class="px-2 py-0.5 bg-purple-100 dark:bg-purple-900/30 text-purple-800 dark:text-purple-300 text-xs rounded">Paired: ${modem.deployed_with_unit_id}</span>`
+            : '';
+
+        html += `
+            <div class="flex items-center justify-between p-3 hover:bg-gray-50 dark:hover:bg-gray-700 cursor-pointer border-b border-gray-100 dark:border-gray-700 last:border-0"
+                 onclick="selectModemForPairing('${modem.id}', '${displayParts.join(' ').replace(/'/g, "\\'")}')">
+                <div class="flex-1">
+                    <div class="font-medium text-gray-900 dark:text-white">
+                        <span class="text-seismo-orange">${modem.id}</span>
+                        ${modem.ip_address ? `<span class="text-gray-400 ml-2 font-mono text-sm">${modem.ip_address}</span>` : ''}
+                    </div>
+                    ${modem.note ? `<div class="text-sm text-gray-500 dark:text-gray-400 truncate">${modem.note}</div>` : ''}
+                </div>
+                <div class="flex gap-2 ml-3">
+                    ${deployedBadge}
+                    ${pairedBadge}
+                </div>
+            </div>
+        `;
+    }
+
+    listContainer.innerHTML = html;
+}
+
+function selectModemForPairing(modemId, displayText) {
+    // Update the correct picker based on device type
+    let pickerId = '';
+    if (pairModalDeviceType === 'seismograph') {
+        pickerId = '-detail-seismo';
+    } else if (pairModalDeviceType === 'sound_level_meter') {
+        pickerId = '-detail-slm';
+    }
+
+    const valueInput = document.getElementById('modem-picker-value' + pickerId);
+    const searchInput = document.getElementById('modem-picker-search' + pickerId);
+    const clearBtn = document.getElementById('modem-picker-clear' + pickerId);
+
+    if (valueInput) valueInput.value = modemId;
+    if (searchInput) searchInput.value = displayText;
+    if (clearBtn) clearBtn.classList.remove('hidden');
+
+    // Close modal
+    closePairDeviceModal();
+}
+
+// Clear pairing (unpair device from modem)
+function clearPairing(deviceType) {
+    let pickerId = '';
+    if (deviceType === 'seismograph') {
+        pickerId = '-detail-seismo';
+    } else if (deviceType === 'sound_level_meter') {
+        pickerId = '-detail-slm';
+    }
+
+    const valueInput = document.getElementById('modem-picker-value' + pickerId);
+    const searchInput = document.getElementById('modem-picker-search' + pickerId);
+    const clearBtn = document.getElementById('modem-picker-clear' + pickerId);
+
+    if (valueInput) valueInput.value = '';
+    if (searchInput) searchInput.value = '';
+    if (clearBtn) clearBtn.classList.add('hidden');
+
+    closePairDeviceModal();
+}
 </script>
+
+<!-- Pair Device Modal -->
+<div id="pairDeviceModal" class="hidden fixed inset-0 z-50 overflow-y-auto">
+    <div class="flex items-center justify-center min-h-screen px-4">
+        <!-- Backdrop -->
+        <div class="fixed inset-0 bg-black/50" onclick="closePairDeviceModal()"></div>
+
+        <!-- Modal Content -->
+        <div class="relative bg-white dark:bg-slate-800 rounded-xl shadow-xl max-w-lg w-full max-h-[80vh] overflow-hidden">
+            <!-- Header -->
+            <div class="flex items-center justify-between px-6 py-4 border-b border-gray-200 dark:border-gray-700">
+                <div>
+                    <h3 class="text-lg font-semibold text-gray-900 dark:text-white">Pair with Modem</h3>
+                    <p class="text-sm text-gray-500 dark:text-gray-400">Select a modem to pair with this device</p>
+                </div>
+                <button onclick="closePairDeviceModal()" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300">
+                    <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                    </svg>
+                </button>
+            </div>
+
+            <!-- Search and Filter -->
+            <div class="px-6 py-3 border-b border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-slate-900/50">
+                <div class="flex gap-3 items-center">
+                    <!-- Search Input -->
+                    <div class="flex-1 relative">
+                        <input type="text"
+                               id="pairModemSearch"
+                               placeholder="Search by ID, IP, or note..."
+                               oninput="filterPairModemList()"
+                               class="w-full px-4 py-2 pl-10 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange focus:border-seismo-orange text-sm">
+                        <svg class="w-5 h-5 text-gray-400 absolute left-3 top-1/2 -translate-y-1/2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+                        </svg>
+                    </div>
+                    <!-- Hide Benched Toggle -->
+                    <label class="flex items-center gap-2 cursor-pointer whitespace-nowrap">
+                        <input type="checkbox"
+                               id="pairHideBenched"
+                               onchange="filterPairModemList()"
+                               class="w-4 h-4 text-seismo-orange focus:ring-seismo-orange rounded">
+                        <span class="text-sm text-gray-600 dark:text-gray-400">Deployed only</span>
+                    </label>
+                </div>
+            </div>
+
+            <!-- Modem List -->
+            <div id="pairModemList" class="max-h-80 overflow-y-auto">
+                <!-- Populated by JavaScript -->
+            </div>
+
+            <!-- Footer -->
+            <div class="px-6 py-4 border-t border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-slate-900">
+                <button onclick="closePairDeviceModal()" class="w-full px-4 py-2 bg-gray-200 dark:bg-gray-700 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-300 rounded-lg transition-colors">
+                    Cancel
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Include Project Create Modal for inline project creation -->
+{% include "partials/project_create_modal.html" %}
+
 {% endblock %}