From 6492fdff823ad112dc68ba265df9a14896248c41 Mon Sep 17 00:00:00 2001 From: serversdwn Date: Wed, 28 Jan 2026 03:27:50 +0000 Subject: [PATCH] BIG update: Update to 0.5.1. Added: -Project management -Modem Managerment -Modem/unit pairing and more --- CHANGELOG.md | 25 +- README.md | 8 +- backend/main.py | 11 +- backend/migrate_add_deployment_type.py | 84 +++++ backend/migrate_add_project_number.py | 80 +++++ backend/models.py | 15 +- backend/routers/modem_dashboard.py | 286 ++++++++++++++++ backend/routers/projects.py | 105 +++++- backend/routers/roster_edit.py | 305 +++++++++++++++++- docker-compose.yml | 2 +- templates/base.html | 11 +- templates/modems.html | 108 +++++++ templates/partials/modem_list.html | 89 +++++ templates/partials/modem_paired_device.html | 51 +++ templates/partials/modem_picker.html | 128 ++++++++ templates/partials/modem_search_results.html | 61 ++++ templates/partials/modem_stats.html | 63 ++++ templates/partials/project_create_modal.html | 233 +++++++++++++ templates/partials/project_picker.html | 128 ++++++++ .../partials/project_search_results.html | 69 ++++ templates/partials/unit_picker.html | 132 ++++++++ templates/partials/unit_search_results.html | 66 ++++ templates/roster.html | 305 ++++++++++++++---- templates/unit_detail.html | 184 ++++++++++- 24 files changed, 2459 insertions(+), 90 deletions(-) create mode 100644 backend/migrate_add_deployment_type.py create mode 100644 backend/migrate_add_project_number.py create mode 100644 backend/routers/modem_dashboard.py create mode 100644 templates/modems.html create mode 100644 templates/partials/modem_list.html create mode 100644 templates/partials/modem_paired_device.html create mode 100644 templates/partials/modem_picker.html create mode 100644 templates/partials/modem_search_results.html create mode 100644 templates/partials/modem_stats.html create mode 100644 templates/partials/project_create_modal.html create mode 100644 templates/partials/project_picker.html create mode 100644 templates/partials/project_search_results.html create mode 100644 templates/partials/unit_picker.html create mode 100644 templates/partials/unit_search_results.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 89b1929..9d37d9d 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 3e6a989..5248f17 100644 --- a/README.md +++ b/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) diff --git a/backend/main.py b/backend/main.py index cd3797c..c09adbd 100644 --- a/backend/main.py +++ b/backend/main.py @@ -18,7 +18,7 @@ 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 @@ -29,7 +29,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 +92,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 +217,12 @@ 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("/projects", response_class=HTMLResponse) async def projects_page(request: Request): """Projects management and overview""" diff --git a/backend/migrate_add_deployment_type.py b/backend/migrate_add_deployment_type.py new file mode 100644 index 0000000..c18573e --- /dev/null +++ b/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() diff --git a/backend/migrate_add_project_number.py b/backend/migrate_add_project_number.py new file mode 100644 index 0000000..656dc37 --- /dev/null +++ b/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() diff --git a/backend/models.py b/backend/models.py index 407d99c..bd22b0c 100644 --- a/backend/models.py +++ b/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) diff --git a/backend/routers/modem_dashboard.py b/backend/routers/modem_dashboard.py new file mode 100644 index 0000000..a4d13c5 --- /dev/null +++ b/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('

Modem not found

') + + # 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. + } diff --git a/backend/routers/projects.py b/backend/routers/projects.py index d2fc991..2fcf0f0 100644 --- a/backend/routers/projects.py +++ b/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, diff --git a/backend/routers/roster_edit.py b/backend/routers/roster_edit.py index 5b429ce..f8e6f7f 100644 --- a/backend/routers/roster_edit.py +++ b/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 @@ -150,6 +150,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 +211,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 +222,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 +279,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 +442,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 "", @@ -314,6 +475,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 +486,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 +545,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,8 +593,79 @@ 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} + + 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}") @@ -624,6 +885,40 @@ async def import_csv( 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 = { @@ -682,6 +977,10 @@ async def import_csv( 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'): @@ -724,6 +1023,8 @@ async def import_csv( 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', '')), diff --git a/docker-compose.yml b/docker-compose.yml index 876487b..1de4897 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: # --- TERRA-VIEW PRODUCTION --- - terra-view-prod: + terra-view: build: . container_name: terra-view ports: diff --git a/templates/base.html b/templates/base.html index 13364aa..1ddabe5 100644 --- a/templates/base.html +++ b/templates/base.html @@ -130,6 +130,13 @@ Sound Level Meters + + + + + Modems + + @@ -377,10 +384,10 @@ - + - + {% block extra_scripts %}{% endblock %} diff --git a/templates/modems.html b/templates/modems.html new file mode 100644 index 0000000..882cdb6 --- /dev/null +++ b/templates/modems.html @@ -0,0 +1,108 @@ +{% extends "base.html" %} + +{% block title %}Field Modems - Terra-View{% endblock %} + +{% block content %} +
+

+ + + + Field Modems +

+

Manage network connectivity devices for field equipment

+
+ + +
+ +
+
+
+
+
+ + +
+
+

All Modems

+
+ +
+ + + + +
+ + Add modem in roster + +
+
+ +
+
+
+
+
+
+
+
+
+
+ + +{% endblock %} diff --git a/templates/partials/modem_list.html b/templates/partials/modem_list.html new file mode 100644 index 0000000..72525d5 --- /dev/null +++ b/templates/partials/modem_list.html @@ -0,0 +1,89 @@ + +{% if modems %} +
+ {% for modem in modems %} +
+
+
+
+ + {{ modem.id }} + + {% if modem.hardware_model %} + {{ modem.hardware_model }} + {% endif %} +
+ + {% if modem.ip_address %} +

{{ modem.ip_address }}

+ {% else %} +

No IP configured

+ {% endif %} + + {% if modem.phone_number %} +

{{ modem.phone_number }}

+ {% endif %} +
+ + + {% if modem.status == "retired" %} + Retired + {% elif modem.status == "benched" %} + Benched + {% elif modem.status == "in_use" %} + In Use + {% elif modem.status == "spare" %} + Spare + {% endif %} +
+ + + {% if modem.paired_device %} +
+

Paired with:

+ + {{ modem.paired_device.id }} + ({{ modem.paired_device.device_type }}) + +
+ {% endif %} + + + {% if modem.location or modem.project_id %} +
+ {% if modem.project_id %} + {{ modem.project_id }} + {% endif %} + {% if modem.location %} + {{ modem.location }} + {% endif %} +
+ {% endif %} + + +
+ + + Details + +
+ + + +
+ {% endfor %} +
+{% else %} +
+ + + +

No modems found

+

Add modems from the Fleet Roster

+
+{% endif %} diff --git a/templates/partials/modem_paired_device.html b/templates/partials/modem_paired_device.html new file mode 100644 index 0000000..020492c --- /dev/null +++ b/templates/partials/modem_paired_device.html @@ -0,0 +1,51 @@ + +{% if device %} +
+
+ {% if device.device_type == "slm" %} + + + + {% else %} + + + + {% endif %} +
+
+

Currently paired with

+ + {{ device.id }} + +
+ {{ device.device_type }} + {% if device.project_id %} + | + {{ device.project_id }} + {% endif %} + {% if device.deployed %} + Deployed + {% else %} + Benched + {% endif %} +
+
+ + + + + +
+{% else %} +
+
+ + + +
+
+

No device currently paired

+

This modem is available for assignment

+
+
+{% endif %} diff --git a/templates/partials/modem_picker.html b/templates/partials/modem_picker.html new file mode 100644 index 0000000..d541e6c --- /dev/null +++ b/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("") %} + +
+ + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + diff --git a/templates/partials/modem_search_results.html b/templates/partials/modem_search_results.html new file mode 100644 index 0000000..c3ba327 --- /dev/null +++ b/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 %} +
+
+
+
+ {{ modem.id }} + {% if modem.ip_address %} + - + {{ modem.ip_address }} + {% endif %} +
+ {% if modem.note %} +
+ {{ modem.note }} +
+ {% endif %} +
+
+ {% if not modem.deployed %} + + Benched + + {% endif %} +
+
+
+ {% endfor %} +{% endif %} + +{% if show_empty %} +
+ + + +

No modems found matching "{{ query }}"

+
+{% endif %} + +{% if not modems and not show_empty %} +
+ + + +

Start typing to search modems...

+

Search by modem ID, IP address, or note

+
+{% endif %} diff --git a/templates/partials/modem_stats.html b/templates/partials/modem_stats.html new file mode 100644 index 0000000..99ac32c --- /dev/null +++ b/templates/partials/modem_stats.html @@ -0,0 +1,63 @@ + + + +
+
+
+

Total Modems

+

{{ total_count }}

+
+
+ + + +
+
+
+ + +
+
+
+

In Use

+

{{ in_use_count }}

+
+
+ + + +
+
+

Paired with a device

+
+ + +
+
+
+

Spare

+

{{ spare_count }}

+
+
+ + + +
+
+

Available for assignment

+
+ + +
+
+
+

Benched

+

{{ benched_count }}

+
+
+ + + +
+
+
diff --git a/templates/partials/project_create_modal.html b/templates/partials/project_create_modal.html new file mode 100644 index 0000000..3758542 --- /dev/null +++ b/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. +#} + + + + diff --git a/templates/partials/project_picker.html b/templates/partials/project_picker.html new file mode 100644 index 0000000..4be7f28 --- /dev/null +++ b/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("") %} + +
+ + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + diff --git a/templates/partials/project_search_results.html b/templates/partials/project_search_results.html new file mode 100644 index 0000000..3c36c8d --- /dev/null +++ b/templates/partials/project_search_results.html @@ -0,0 +1,69 @@ + + +{% set picker_id = request.query_params.get('picker_id', '') %} + +{% if projects %} + {% for project in projects %} +
+
+
+
+ {% if project.project_number %} + {{ project.project_number }} + {% if project.client_name or project.name %} + - + {% endif %} + {% endif %} + {% if project.client_name %} + {{ project.client_name }} + {% endif %} +
+ {% if project.name %} +
+ {{ project.name }} +
+ {% endif %} +
+ {% if project.status == 'completed' %} + + Completed + + {% endif %} +
+
+ {% endfor %} +{% endif %} + +{% if show_create %} +
+
+ + + + Create new project "{{ query }}" +
+

+ No matching projects found. Click to create a new one. +

+
+{% endif %} + +{% if not projects and not show_create %} +
+ + + +

Start typing to search projects...

+

Search by project number, client name, or project name

+
+{% endif %} diff --git a/templates/partials/unit_picker.html b/templates/partials/unit_picker.html new file mode 100644 index 0000000..34317e4 --- /dev/null +++ b/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) %} + +
+ + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + diff --git a/templates/partials/unit_search_results.html b/templates/partials/unit_search_results.html new file mode 100644 index 0000000..c4e63a7 --- /dev/null +++ b/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 %} +
+
+
+
+ {{ unit.id }} +
+ {% if unit.note %} +
+ {{ unit.note }} +
+ {% endif %} +
+
+ {% if unit.device_type == 'seismograph' %} + + Seismo + + {% elif unit.device_type == 'slm' %} + + SLM + + {% endif %} + {% if not unit.deployed %} + + Benched + + {% endif %} +
+
+
+ {% endfor %} +{% endif %} + +{% if show_empty %} +
+ + + +

No units found matching "{{ query }}"

+
+{% endif %} + +{% if not units and not show_empty %} +
+ + + +

Start typing to search units...

+

Search by unit ID or note

+
+{% endif %} diff --git a/templates/roster.html b/templates/roster.html index f437570..7e29582 100644 --- a/templates/roster.html +++ b/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">
- - + + {% include "partials/project_picker.html" with context %}
@@ -159,8 +157,8 @@
@@ -183,6 +181,21 @@ +
+ + +
+
+ + {% set picker_id = "-add-modem" %} + {% set device_type_filter = "" %} + {% include "partials/unit_picker.html" with context %} +
@@ -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">
- - + + {% set picker_id = "-edit" %} + {% include "partials/project_picker.html" with context %}
@@ -327,8 +340,8 @@
@@ -350,6 +363,21 @@ +
+ + +
+
+ + {% set picker_id = "-edit-modem" %} + {% set device_type_filter = "" %} + {% include "partials/unit_picker.html" with context %} +
@@ -419,6 +447,55 @@ + + + +
- -

--

+ +

+ + Not assigned +

@@ -172,6 +177,48 @@
+ + + + + +
@@ -251,11 +298,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">
- +
- - + + {% set picker_id = "-detail" %} + {% include "partials/project_picker.html" with context %}
@@ -415,6 +462,26 @@ 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; +} + // Load unit data on page load async function loadUnitData() { try { @@ -536,7 +603,31 @@ 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 || '--'; @@ -557,9 +648,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 +664,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; @@ -999,10 +1111,66 @@ 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 = '

Failed to load paired device info

'; + } +} + +// 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 = ` + + + + 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 = `Online (${data.response_time_ms}ms)`; + resultSpan.className = 'text-sm text-green-600 dark:text-green-400'; + } else { + resultSpan.innerHTML = `${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(); }); + + +{% include "partials/project_create_modal.html" %} + {% endblock %}