Compare commits
33 Commits
4da53facb9
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4957a08198 | ||
|
|
05482bd903 | ||
|
|
5ee6f5eb28 | ||
|
|
6492fdff82 | ||
|
|
44d7841852 | ||
|
|
38c600aca3 | ||
|
|
eeda94926f | ||
|
|
57be9bf1f1 | ||
|
|
8431784708 | ||
|
|
c771a86675 | ||
|
|
65ea0920db | ||
|
|
1f3fa7a718 | ||
|
|
a9c9b1fd48 | ||
|
|
4c213c96ee | ||
|
|
ff38b74548 | ||
|
|
c8a030a3ba | ||
|
|
d8a8330427 | ||
|
|
1ef0557ccb | ||
|
|
6c7ce5aad0 | ||
|
|
54754e2279 | ||
|
|
8787a2dbb8 | ||
|
|
7971092509 | ||
|
|
d349af9444 | ||
|
|
be83cb3fe7 | ||
|
|
e9216b9abc | ||
|
|
d93785c230 | ||
|
|
98ee9d7cea | ||
|
|
04c66bdf9c | ||
|
|
8a5fadb5df | ||
|
|
893cb96e8d | ||
|
|
c30d7fac22 | ||
|
|
6d34e543fe | ||
|
|
4d74eda65f |
2
.gitignore
vendored
@@ -211,3 +211,5 @@ __marimo__/
|
|||||||
*.db
|
*.db
|
||||||
*.db-journal
|
*.db-journal
|
||||||
data/
|
data/
|
||||||
|
.aider*
|
||||||
|
.aider*
|
||||||
|
|||||||
116
CHANGELOG.md
@@ -1,16 +1,114 @@
|
|||||||
# Changelog
|
# 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/),
|
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).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
## [0.4.1] - 2026 1-5
|
## [0.5.1] - 2026-01-27
|
||||||
### Added
|
|
||||||
- **SLM integration**: Sound Level meters are now managable in SFM
|
|
||||||
|
|
||||||
## Fixed ##
|
### Added
|
||||||
- Fixed an issue where unit status wat loading from a saved cache and not based on when it was actually heard from last. Unit status is now accurate.
|
- **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
|
||||||
|
- **Recurring schedules**: New scheduler service, recurring schedule APIs, and schedule templates (calendar/interval/list).
|
||||||
|
- **Alerts UI + backend**: Alerting service plus dropdown/list templates for surfacing notifications.
|
||||||
|
- **Report templates + viewers**: CRUD API for report templates, report preview screen, and RND file viewer.
|
||||||
|
- **SLM tooling**: SLM settings modal and SLM project report generator workflow.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- **Project data management**: Unified files view, refreshed FTP browser, and new project header/templates for file/session/unit/assignment lists.
|
||||||
|
- **Device/SLM sync**: Standardized SLM device types and tightened SLMM sync paths.
|
||||||
|
- **Docs/scripts**: Cleanup pass and expanded device-type documentation.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **Scheduler actions**: Strict command definitions so actions run reliably.
|
||||||
|
- **Project view title**: Resolved JSON string rendering in project headers.
|
||||||
|
|
||||||
|
## [0.4.3] - 2026-01-14
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- **Sound Level Meter roster tooling**: Roster manager surfaces SLM metadata, supports rename unit flows, and adds return-to-project navigation to keep SLM dashboard users oriented.
|
||||||
|
- **Project management templates**: New schedule and unit list templates plus file/session lists show what each project stores before teams dive into deployments.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- **Project view refresh**: FTP browser now downloads folders locally, the countdown timer was rebuilt, and project/device templates gained edit modals for projects and locations so navigation feels smoother.
|
||||||
|
- **SLM control sync & accuracy**: Control center groundwork now runs inside the dev UI, configuration edits propagate to SLMM (which caches configs for faster responses), and the SLM live view reads the correct DRD fields after the refactor.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **SLM UI syntax bug**: Resolved the unexpected token error that appeared in the refreshed SLM components.
|
||||||
|
|
||||||
|
## [0.4.2] - 2026-01-05
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- **SLM Configuration Interface**: Sound Level Meters can now be configured directly from the SLM dashboard
|
||||||
|
- Configuration modal with comprehensive SLM parameter editing
|
||||||
|
- TCP port configuration for SLM control connections (default: 2255)
|
||||||
|
- FTP port configuration for SLM data retrieval (default: 21)
|
||||||
|
- Modem assignment for network access or direct IP connection support
|
||||||
|
- Test Modem button with ping-based connectivity verification (shows IP and response time)
|
||||||
|
- Test SLM Connection button for end-to-end connectivity validation
|
||||||
|
- Dynamic form fields that hide/show based on modem selection
|
||||||
|
- **SLM Dashboard Endpoints**: New API routes for SLM management
|
||||||
|
- `GET /api/slm-dashboard/config/{unit_id}` - Load SLM configuration form
|
||||||
|
- `POST /api/slm-dashboard/config/{unit_id}` - Save SLM configuration
|
||||||
|
- `GET /api/slm-dashboard/test-modem/{modem_id}` - Ping modem for connectivity test
|
||||||
|
- **Database Schema Updates**: Added `slm_ftp_port` column to roster table
|
||||||
|
- Migration script: `scripts/add_slm_ftp_port.py`
|
||||||
|
- Supports both TCP (control) and FTP (data) port configuration per SLM unit
|
||||||
|
- **Docker Environment Enhancements**:
|
||||||
|
- Added `iputils-ping` and `curl` packages to Docker image for network diagnostics
|
||||||
|
- Health check endpoint support via curl
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **Form Validation**: Fixed 400 Bad Request error when adding modem units
|
||||||
|
- Form fields for device-specific parameters now properly disabled when hidden
|
||||||
|
- Empty string values for integer fields no longer cause validation failures
|
||||||
|
- JavaScript now disables hidden form sections to prevent unwanted data submission
|
||||||
|
- **Unit Status Accuracy**: Fixed issue where unit status was loading from a saved cache instead of actual last-heard time
|
||||||
|
- Unit status now accurately reflects real-time connectivity
|
||||||
|
- Status determination based on actual `slm_last_check` timestamp
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- **Roster Form Behavior**: Device-specific form fields are now disabled (not just hidden) when not applicable
|
||||||
|
- Prevents SLM fields from submitting when adding modems
|
||||||
|
- Prevents modem fields from submitting when adding SLMs
|
||||||
|
- Cleaner form submissions with only relevant data
|
||||||
|
- **Port Field Handling**: Backend now accepts port fields as strings and converts to integers
|
||||||
|
- Handles empty string values gracefully
|
||||||
|
- Proper type conversion with None fallback for empty values
|
||||||
|
|
||||||
|
### Technical Details
|
||||||
|
- Added `setFieldsDisabled()` helper function for managing form field state
|
||||||
|
- Updated `toggleDeviceFields()` and `toggleEditDeviceFields()` to disable/enable fields
|
||||||
|
- Backend type conversion: `slm_tcp_port` and `slm_ftp_port` accept strings, convert to int with empty string handling
|
||||||
|
- Modem ping uses subprocess with 1 packet, 2-second timeout, returns response time in milliseconds
|
||||||
|
- Configuration form uses 3-column grid layout for TCP Port, FTP Port, and Direct IP fields
|
||||||
|
|
||||||
|
## [0.4.1] - 2026-01-05
|
||||||
|
### Added
|
||||||
|
- **SLM Integration**: Sound Level Meters are now manageable in SFM
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fixed an issue where unit status was loading from a saved cache and not based on when it was actually heard from last. Unit status is now accurate.
|
||||||
|
|
||||||
|
|
||||||
## [0.4.0] - 2025-12-16
|
## [0.4.0] - 2025-12-16
|
||||||
@@ -301,6 +399,12 @@ No database migration required for v0.4.0. All new features use existing databas
|
|||||||
- Photo management per unit
|
- Photo management per unit
|
||||||
- Automated status categorization (OK/Pending/Missing)
|
- 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
|
||||||
|
[0.4.1]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.4.0...v0.4.1
|
||||||
[0.4.0]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.3.3...v0.4.0
|
[0.4.0]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.3.3...v0.4.0
|
||||||
[0.3.3]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.3.2...v0.3.3
|
[0.3.3]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.3.2...v0.3.3
|
||||||
[0.3.2]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.3.1...v0.3.2
|
[0.3.2]: https://github.com/serversdwn/seismo-fleet-manager/compare/v0.3.1...v0.3.2
|
||||||
|
|||||||
@@ -3,6 +3,11 @@ FROM python:3.11-slim
|
|||||||
# Set working directory
|
# Set working directory
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Install system dependencies (ping for network diagnostics)
|
||||||
|
RUN apt-get update && \
|
||||||
|
apt-get install -y --no-install-recommends iputils-ping curl && \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Copy requirements first for better caching
|
# Copy requirements first for better caching
|
||||||
COPY requirements.txt .
|
COPY requirements.txt .
|
||||||
|
|
||||||
|
|||||||
57
README.md
@@ -1,4 +1,4 @@
|
|||||||
# Seismo Fleet Manager v0.4.1
|
# 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.
|
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
|
## Features
|
||||||
@@ -308,7 +308,7 @@ print(response.json())
|
|||||||
|-------|------|-------------|
|
|-------|------|-------------|
|
||||||
| id | string | Unit identifier (primary key) |
|
| id | string | Unit identifier (primary key) |
|
||||||
| unit_type | string | Hardware model name (default: `series3`) |
|
| unit_type | string | Hardware model name (default: `series3`) |
|
||||||
| device_type | string | `seismograph` or `modem` discriminator |
|
| device_type | string | Device type: `"seismograph"`, `"modem"`, or `"slm"` (sound level meter) |
|
||||||
| deployed | boolean | Whether the unit is in the field |
|
| deployed | boolean | Whether the unit is in the field |
|
||||||
| retired | boolean | Removes the unit from deployments but preserves history |
|
| retired | boolean | Removes the unit from deployments but preserves history |
|
||||||
| note | string | Notes about the unit |
|
| note | string | Notes about the unit |
|
||||||
@@ -334,6 +334,39 @@ print(response.json())
|
|||||||
| phone_number | string | Cellular number for the modem |
|
| phone_number | string | Cellular number for the modem |
|
||||||
| hardware_model | string | Modem hardware reference |
|
| hardware_model | string | Modem hardware reference |
|
||||||
|
|
||||||
|
**Sound Level Meter (SLM) fields**
|
||||||
|
|
||||||
|
| Field | Type | Description |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| slm_host | string | Direct IP address for SLM (if not using modem) |
|
||||||
|
| slm_tcp_port | integer | TCP control port (default: 2255) |
|
||||||
|
| slm_ftp_port | integer | FTP file transfer port (default: 21) |
|
||||||
|
| slm_model | string | Device model (NL-43, NL-53) |
|
||||||
|
| slm_serial_number | string | Manufacturer serial number |
|
||||||
|
| slm_frequency_weighting | string | Frequency weighting setting (A, C, Z) |
|
||||||
|
| slm_time_weighting | string | Time weighting setting (F=Fast, S=Slow) |
|
||||||
|
| slm_measurement_range | string | Measurement range setting |
|
||||||
|
| slm_last_check | datetime | Last status check timestamp |
|
||||||
|
| deployed_with_modem_id | string | Modem pairing (shared with seismographs) |
|
||||||
|
|
||||||
|
### Device Type Schema
|
||||||
|
|
||||||
|
Terra-View supports three device types with the following standardized `device_type` values:
|
||||||
|
|
||||||
|
- **`"seismograph"`** (default) - Seismic monitoring devices (Series 3, Series 4, Micromate)
|
||||||
|
- Uses: calibration dates, modem pairing
|
||||||
|
- Examples: BE1234, UM12345 (Series 3/4 units)
|
||||||
|
|
||||||
|
- **`"modem"`** - Field modems and network equipment
|
||||||
|
- Uses: IP address, phone number, hardware model
|
||||||
|
- Examples: MDM001, MODEM-2025-01
|
||||||
|
|
||||||
|
- **`"slm"`** - Sound level meters (Rion NL-43/NL-53)
|
||||||
|
- Uses: TCP/FTP configuration, measurement settings, modem pairing
|
||||||
|
- Examples: SLM-43-01, NL43-001
|
||||||
|
|
||||||
|
**Important**: All `device_type` values must be lowercase. The legacy value `"sound_level_meter"` has been deprecated in favor of the shorter `"slm"`. Run `backend/migrate_standardize_device_types.py` to update existing databases.
|
||||||
|
|
||||||
### Emitter Table (Device Check-ins)
|
### Emitter Table (Device Check-ins)
|
||||||
|
|
||||||
| Field | Type | Description |
|
| Field | Type | Description |
|
||||||
@@ -463,6 +496,12 @@ docker compose down -v
|
|||||||
|
|
||||||
## Release Highlights
|
## Release Highlights
|
||||||
|
|
||||||
|
### v0.4.3 — 2026-01-14
|
||||||
|
- **Sound Level Meter workflow**: Roster manager surfaces SLM metadata, supports rename actions, and adds return-to-project navigation plus schedule/unit templates for project planning.
|
||||||
|
- **Project insight panels**: Project dashboards now expose file and session lists so teams can see what each project stores before diving into units.
|
||||||
|
- **Project view polish**: FTP browser supports folder downloads, the timer display was reimplemented, and the project/device templates gained edit modals for projects and locations to streamline navigation.
|
||||||
|
- **SLM sync & accuracy**: Configuration edits now propagate to SLMM (which caches configs for faster responses) and the live view uses the correct DRD fields so telemetry aligns with the control center.
|
||||||
|
|
||||||
### v0.4.0 — 2025-12-16
|
### v0.4.0 — 2025-12-16
|
||||||
- **Database Management System**: Complete backup and restore functionality with manual snapshots, restore operations, and upload/download capabilities
|
- **Database Management System**: Complete backup and restore functionality with manual snapshots, restore operations, and upload/download capabilities
|
||||||
- **Remote Database Cloning**: New `clone_db_to_dev.py` script for copying production database to remote dev servers over WAN
|
- **Remote Database Cloning**: New `clone_db_to_dev.py` script for copying production database to remote dev servers over WAN
|
||||||
@@ -532,9 +571,19 @@ MIT
|
|||||||
|
|
||||||
## Version
|
## Version
|
||||||
|
|
||||||
**Current: 0.4.0** — Database management system with backup/restore and remote cloning (2025-12-16)
|
**Current: 0.5.1** — Dashboard schedule view with today's actions panel, new Terra-View branding and logo rework (2026-01-27)
|
||||||
|
|
||||||
Previous: 0.3.3 — Mobile navigation improvements and better status visibility (2025-12-12)
|
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)
|
||||||
|
|
||||||
|
0.4.1 — Sound Level Meter integration with full management UI for SLM units (2026-01-05)
|
||||||
|
|
||||||
|
0.4.0 — Database management system with backup/restore and remote cloning (2025-12-16)
|
||||||
|
|
||||||
|
0.3.3 — Mobile navigation improvements and better status visibility (2025-12-12)
|
||||||
|
|
||||||
0.3.2 — Progressive Web App with mobile optimization (2025-12-12)
|
0.3.2 — Progressive Web App with mobile optimization (2025-12-12)
|
||||||
|
|
||||||
|
|||||||
BIN
assets/terra-view-icon_large.png
Normal file
|
After Width: | Height: | Size: 36 KiB |
108
backend/init_projects_db.py
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
Database initialization script for Projects system.
|
||||||
|
|
||||||
|
This script creates the new project management tables and populates
|
||||||
|
the project_types table with default templates.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
python -m backend.init_projects_db
|
||||||
|
"""
|
||||||
|
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from backend.database import engine, SessionLocal
|
||||||
|
from backend.models import (
|
||||||
|
Base,
|
||||||
|
ProjectType,
|
||||||
|
Project,
|
||||||
|
MonitoringLocation,
|
||||||
|
UnitAssignment,
|
||||||
|
ScheduledAction,
|
||||||
|
RecordingSession,
|
||||||
|
DataFile,
|
||||||
|
)
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
|
||||||
|
def init_project_types(db: Session):
|
||||||
|
"""Initialize default project types."""
|
||||||
|
project_types = [
|
||||||
|
{
|
||||||
|
"id": "sound_monitoring",
|
||||||
|
"name": "Sound Monitoring",
|
||||||
|
"description": "Noise monitoring projects with sound level meters and NRLs (Noise Recording Locations)",
|
||||||
|
"icon": "volume-2", # Lucide icon name
|
||||||
|
"supports_sound": True,
|
||||||
|
"supports_vibration": False,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "vibration_monitoring",
|
||||||
|
"name": "Vibration Monitoring",
|
||||||
|
"description": "Seismic/vibration monitoring projects with seismographs and monitoring points",
|
||||||
|
"icon": "activity", # Lucide icon name
|
||||||
|
"supports_sound": False,
|
||||||
|
"supports_vibration": True,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "combined",
|
||||||
|
"name": "Combined Monitoring",
|
||||||
|
"description": "Full-spectrum monitoring with both sound and vibration capabilities",
|
||||||
|
"icon": "layers", # Lucide icon name
|
||||||
|
"supports_sound": True,
|
||||||
|
"supports_vibration": True,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
for pt_data in project_types:
|
||||||
|
existing = db.query(ProjectType).filter_by(id=pt_data["id"]).first()
|
||||||
|
if not existing:
|
||||||
|
pt = ProjectType(**pt_data)
|
||||||
|
db.add(pt)
|
||||||
|
print(f"✓ Created project type: {pt_data['name']}")
|
||||||
|
else:
|
||||||
|
print(f" Project type already exists: {pt_data['name']}")
|
||||||
|
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
|
||||||
|
def create_tables():
|
||||||
|
"""Create all tables defined in models."""
|
||||||
|
print("Creating project management tables...")
|
||||||
|
Base.metadata.create_all(bind=engine)
|
||||||
|
print("✓ Tables created successfully")
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
print("=" * 60)
|
||||||
|
print("Terra-View Projects System - Database Initialization")
|
||||||
|
print("=" * 60)
|
||||||
|
print()
|
||||||
|
|
||||||
|
# Create tables
|
||||||
|
create_tables()
|
||||||
|
print()
|
||||||
|
|
||||||
|
# Initialize project types
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
print("Initializing project types...")
|
||||||
|
init_project_types(db)
|
||||||
|
print()
|
||||||
|
print("=" * 60)
|
||||||
|
print("✓ Database initialization complete!")
|
||||||
|
print("=" * 60)
|
||||||
|
print()
|
||||||
|
print("Next steps:")
|
||||||
|
print(" 1. Restart Terra-View to load new routes")
|
||||||
|
print(" 2. Navigate to /projects to create your first project")
|
||||||
|
print(" 3. Check documentation for API endpoints")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"✗ Error during initialization: {e}")
|
||||||
|
db.rollback()
|
||||||
|
raise
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
403
backend/main.py
@@ -1,17 +1,27 @@
|
|||||||
import os
|
import os
|
||||||
from fastapi import FastAPI, Request, Depends
|
import logging
|
||||||
|
from fastapi import FastAPI, Request, Depends, HTTPException
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
from fastapi.templating import Jinja2Templates
|
from fastapi.templating import Jinja2Templates
|
||||||
from fastapi.responses import HTMLResponse, FileResponse, JSONResponse
|
from fastapi.responses import HTMLResponse, FileResponse, JSONResponse
|
||||||
|
from fastapi.exceptions import RequestValidationError
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
from typing import List, Dict
|
from typing import List, Dict, Optional
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
|
||||||
|
# Configure logging
|
||||||
|
logging.basicConfig(
|
||||||
|
level=logging.INFO,
|
||||||
|
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
|
||||||
|
)
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
from backend.database import engine, Base, get_db
|
from backend.database import engine, Base, get_db
|
||||||
from backend.routers import roster, units, photos, roster_edit, dashboard, dashboard_tabs, activity, slmm, slm_ui
|
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.services.snapshot import emit_status_snapshot
|
||||||
from backend.models import IgnoredUnit
|
from backend.models import IgnoredUnit
|
||||||
|
from backend.utils.timezone import get_user_timezone
|
||||||
|
|
||||||
# Create database tables
|
# Create database tables
|
||||||
Base.metadata.create_all(bind=engine)
|
Base.metadata.create_all(bind=engine)
|
||||||
@@ -20,13 +30,23 @@ Base.metadata.create_all(bind=engine)
|
|||||||
ENVIRONMENT = os.getenv("ENVIRONMENT", "production")
|
ENVIRONMENT = os.getenv("ENVIRONMENT", "production")
|
||||||
|
|
||||||
# Initialize FastAPI app
|
# Initialize FastAPI app
|
||||||
VERSION = "0.4.0"
|
VERSION = "0.5.1"
|
||||||
app = FastAPI(
|
app = FastAPI(
|
||||||
title="Seismo Fleet Manager",
|
title="Seismo Fleet Manager",
|
||||||
description="Backend API for managing seismograph fleet status",
|
description="Backend API for managing seismograph fleet status",
|
||||||
version=VERSION
|
version=VERSION
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Add validation error handler to log details
|
||||||
|
@app.exception_handler(RequestValidationError)
|
||||||
|
async def validation_exception_handler(request: Request, exc: RequestValidationError):
|
||||||
|
logger.error(f"Validation error on {request.url}: {exc.errors()}")
|
||||||
|
logger.error(f"Body: {await request.body()}")
|
||||||
|
return JSONResponse(
|
||||||
|
status_code=400,
|
||||||
|
content={"detail": exc.errors()}
|
||||||
|
)
|
||||||
|
|
||||||
# Configure CORS
|
# Configure CORS
|
||||||
app.add_middleware(
|
app.add_middleware(
|
||||||
CORSMiddleware,
|
CORSMiddleware,
|
||||||
@@ -39,8 +59,8 @@ app.add_middleware(
|
|||||||
# Mount static files
|
# Mount static files
|
||||||
app.mount("/static", StaticFiles(directory="backend/static"), name="static")
|
app.mount("/static", StaticFiles(directory="backend/static"), name="static")
|
||||||
|
|
||||||
# Setup Jinja2 templates
|
# Use shared templates configuration with timezone filters
|
||||||
templates = Jinja2Templates(directory="templates")
|
from backend.templates_config import templates
|
||||||
|
|
||||||
# Add custom context processor to inject environment variable into all templates
|
# Add custom context processor to inject environment variable into all templates
|
||||||
@app.middleware("http")
|
@app.middleware("http")
|
||||||
@@ -65,15 +85,61 @@ app.include_router(roster.router)
|
|||||||
app.include_router(units.router)
|
app.include_router(units.router)
|
||||||
app.include_router(photos.router)
|
app.include_router(photos.router)
|
||||||
app.include_router(roster_edit.router)
|
app.include_router(roster_edit.router)
|
||||||
|
app.include_router(roster_rename.router)
|
||||||
app.include_router(dashboard.router)
|
app.include_router(dashboard.router)
|
||||||
app.include_router(dashboard_tabs.router)
|
app.include_router(dashboard_tabs.router)
|
||||||
app.include_router(activity.router)
|
app.include_router(activity.router)
|
||||||
app.include_router(slmm.router)
|
app.include_router(slmm.router)
|
||||||
app.include_router(slm_ui.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
|
from backend.routers import settings
|
||||||
app.include_router(settings.router)
|
app.include_router(settings.router)
|
||||||
|
|
||||||
|
# Projects system routers
|
||||||
|
app.include_router(projects.router)
|
||||||
|
app.include_router(project_locations.router)
|
||||||
|
app.include_router(scheduler.router)
|
||||||
|
|
||||||
|
# Report templates router
|
||||||
|
from backend.routers import report_templates
|
||||||
|
app.include_router(report_templates.router)
|
||||||
|
|
||||||
|
# Alerts router
|
||||||
|
from backend.routers import alerts
|
||||||
|
app.include_router(alerts.router)
|
||||||
|
|
||||||
|
# Recurring schedules router
|
||||||
|
from backend.routers import recurring_schedules
|
||||||
|
app.include_router(recurring_schedules.router)
|
||||||
|
|
||||||
|
# Start scheduler service and device status monitor on application startup
|
||||||
|
from backend.services.scheduler import start_scheduler, stop_scheduler
|
||||||
|
from backend.services.device_status_monitor import start_device_status_monitor, stop_device_status_monitor
|
||||||
|
|
||||||
|
@app.on_event("startup")
|
||||||
|
async def startup_event():
|
||||||
|
"""Initialize services on app startup"""
|
||||||
|
logger.info("Starting scheduler service...")
|
||||||
|
await start_scheduler()
|
||||||
|
logger.info("Scheduler service started")
|
||||||
|
|
||||||
|
logger.info("Starting device status monitor...")
|
||||||
|
await start_device_status_monitor()
|
||||||
|
logger.info("Device status monitor started")
|
||||||
|
|
||||||
|
@app.on_event("shutdown")
|
||||||
|
def shutdown_event():
|
||||||
|
"""Clean up services on app shutdown"""
|
||||||
|
logger.info("Stopping device status monitor...")
|
||||||
|
stop_device_status_monitor()
|
||||||
|
logger.info("Device status monitor stopped")
|
||||||
|
|
||||||
|
logger.info("Stopping scheduler service...")
|
||||||
|
stop_scheduler()
|
||||||
|
logger.info("Scheduler service stopped")
|
||||||
|
|
||||||
|
|
||||||
# Legacy routes from the original backend
|
# Legacy routes from the original backend
|
||||||
@@ -109,6 +175,205 @@ async def settings_page(request: Request):
|
|||||||
return templates.TemplateResponse("settings.html", {"request": request})
|
return templates.TemplateResponse("settings.html", {"request": request})
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/sound-level-meters", response_class=HTMLResponse)
|
||||||
|
async def sound_level_meters_page(request: Request):
|
||||||
|
"""Sound Level Meters management dashboard"""
|
||||||
|
return templates.TemplateResponse("sound_level_meters.html", {"request": request})
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/slm/{unit_id}", response_class=HTMLResponse)
|
||||||
|
async def slm_legacy_dashboard(
|
||||||
|
request: Request,
|
||||||
|
unit_id: str,
|
||||||
|
from_project: Optional[str] = None,
|
||||||
|
from_nrl: Optional[str] = None,
|
||||||
|
db: Session = Depends(get_db)
|
||||||
|
):
|
||||||
|
"""Legacy SLM control center dashboard for a specific unit"""
|
||||||
|
# Get project details if from_project is provided
|
||||||
|
project = None
|
||||||
|
if from_project:
|
||||||
|
from backend.models import Project
|
||||||
|
project = db.query(Project).filter_by(id=from_project).first()
|
||||||
|
|
||||||
|
# Get NRL location details if from_nrl is provided
|
||||||
|
nrl_location = None
|
||||||
|
if from_nrl:
|
||||||
|
from backend.models import NRLLocation
|
||||||
|
nrl_location = db.query(NRLLocation).filter_by(id=from_nrl).first()
|
||||||
|
|
||||||
|
return templates.TemplateResponse("slm_legacy_dashboard.html", {
|
||||||
|
"request": request,
|
||||||
|
"unit_id": unit_id,
|
||||||
|
"from_project": from_project,
|
||||||
|
"from_nrl": from_nrl,
|
||||||
|
"project": project,
|
||||||
|
"nrl_location": nrl_location
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/seismographs", response_class=HTMLResponse)
|
||||||
|
async def seismographs_page(request: Request):
|
||||||
|
"""Seismographs management dashboard"""
|
||||||
|
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"""
|
||||||
|
return templates.TemplateResponse("projects/overview.html", {"request": request})
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/projects/{project_id}", response_class=HTMLResponse)
|
||||||
|
async def project_detail_page(request: Request, project_id: str):
|
||||||
|
"""Project detail dashboard"""
|
||||||
|
return templates.TemplateResponse("projects/detail.html", {
|
||||||
|
"request": request,
|
||||||
|
"project_id": project_id
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/projects/{project_id}/nrl/{location_id}", response_class=HTMLResponse)
|
||||||
|
async def nrl_detail_page(
|
||||||
|
request: Request,
|
||||||
|
project_id: str,
|
||||||
|
location_id: str,
|
||||||
|
db: Session = Depends(get_db)
|
||||||
|
):
|
||||||
|
"""NRL (Noise Recording Location) detail page with tabs"""
|
||||||
|
from backend.models import Project, MonitoringLocation, UnitAssignment, RosterUnit, RecordingSession, DataFile
|
||||||
|
from sqlalchemy import and_
|
||||||
|
|
||||||
|
# Get project
|
||||||
|
project = db.query(Project).filter_by(id=project_id).first()
|
||||||
|
if not project:
|
||||||
|
return templates.TemplateResponse("404.html", {
|
||||||
|
"request": request,
|
||||||
|
"message": "Project not found"
|
||||||
|
}, status_code=404)
|
||||||
|
|
||||||
|
# Get location
|
||||||
|
location = db.query(MonitoringLocation).filter_by(
|
||||||
|
id=location_id,
|
||||||
|
project_id=project_id
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not location:
|
||||||
|
return templates.TemplateResponse("404.html", {
|
||||||
|
"request": request,
|
||||||
|
"message": "Location not found"
|
||||||
|
}, status_code=404)
|
||||||
|
|
||||||
|
# Get active assignment
|
||||||
|
assignment = db.query(UnitAssignment).filter(
|
||||||
|
and_(
|
||||||
|
UnitAssignment.location_id == location_id,
|
||||||
|
UnitAssignment.status == "active"
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
assigned_unit = None
|
||||||
|
if assignment:
|
||||||
|
assigned_unit = db.query(RosterUnit).filter_by(id=assignment.unit_id).first()
|
||||||
|
|
||||||
|
# Get session count
|
||||||
|
session_count = db.query(RecordingSession).filter_by(location_id=location_id).count()
|
||||||
|
|
||||||
|
# Get file count (DataFile links to session, not directly to location)
|
||||||
|
file_count = db.query(DataFile).join(
|
||||||
|
RecordingSession,
|
||||||
|
DataFile.session_id == RecordingSession.id
|
||||||
|
).filter(RecordingSession.location_id == location_id).count()
|
||||||
|
|
||||||
|
# Check for active session
|
||||||
|
active_session = db.query(RecordingSession).filter(
|
||||||
|
and_(
|
||||||
|
RecordingSession.location_id == location_id,
|
||||||
|
RecordingSession.status == "recording"
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
return templates.TemplateResponse("nrl_detail.html", {
|
||||||
|
"request": request,
|
||||||
|
"project_id": project_id,
|
||||||
|
"location_id": location_id,
|
||||||
|
"project": project,
|
||||||
|
"location": location,
|
||||||
|
"assignment": assignment,
|
||||||
|
"assigned_unit": assigned_unit,
|
||||||
|
"session_count": session_count,
|
||||||
|
"file_count": file_count,
|
||||||
|
"active_session": active_session,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
# ===== PWA ROUTES =====
|
# ===== PWA ROUTES =====
|
||||||
|
|
||||||
@app.get("/sw.js")
|
@app.get("/sw.js")
|
||||||
@@ -358,6 +623,132 @@ async def unknown_emitters_partial(request: Request):
|
|||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/partials/devices-all", response_class=HTMLResponse)
|
||||||
|
async def devices_all_partial(request: Request):
|
||||||
|
"""Unified partial template for ALL devices with comprehensive filtering support"""
|
||||||
|
from datetime import datetime
|
||||||
|
snapshot = emit_status_snapshot()
|
||||||
|
|
||||||
|
units_list = []
|
||||||
|
|
||||||
|
# Add deployed/active units
|
||||||
|
for unit_id, unit_data in snapshot["active"].items():
|
||||||
|
units_list.append({
|
||||||
|
"id": unit_id,
|
||||||
|
"status": unit_data.get("status", "Unknown"),
|
||||||
|
"age": unit_data.get("age", "N/A"),
|
||||||
|
"last_seen": unit_data.get("last", "Never"),
|
||||||
|
"deployed": True,
|
||||||
|
"retired": False,
|
||||||
|
"ignored": False,
|
||||||
|
"note": unit_data.get("note", ""),
|
||||||
|
"device_type": unit_data.get("device_type", "seismograph"),
|
||||||
|
"address": unit_data.get("address", ""),
|
||||||
|
"coordinates": unit_data.get("coordinates", ""),
|
||||||
|
"project_id": unit_data.get("project_id", ""),
|
||||||
|
"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"),
|
||||||
|
})
|
||||||
|
|
||||||
|
# Add benched units
|
||||||
|
for unit_id, unit_data in snapshot["benched"].items():
|
||||||
|
units_list.append({
|
||||||
|
"id": unit_id,
|
||||||
|
"status": unit_data.get("status", "N/A"),
|
||||||
|
"age": unit_data.get("age", "N/A"),
|
||||||
|
"last_seen": unit_data.get("last", "Never"),
|
||||||
|
"deployed": False,
|
||||||
|
"retired": False,
|
||||||
|
"ignored": False,
|
||||||
|
"note": unit_data.get("note", ""),
|
||||||
|
"device_type": unit_data.get("device_type", "seismograph"),
|
||||||
|
"address": unit_data.get("address", ""),
|
||||||
|
"coordinates": unit_data.get("coordinates", ""),
|
||||||
|
"project_id": unit_data.get("project_id", ""),
|
||||||
|
"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"),
|
||||||
|
})
|
||||||
|
|
||||||
|
# Add retired units
|
||||||
|
for unit_id, unit_data in snapshot["retired"].items():
|
||||||
|
units_list.append({
|
||||||
|
"id": unit_id,
|
||||||
|
"status": "Retired",
|
||||||
|
"age": "N/A",
|
||||||
|
"last_seen": "N/A",
|
||||||
|
"deployed": False,
|
||||||
|
"retired": True,
|
||||||
|
"ignored": False,
|
||||||
|
"note": unit_data.get("note", ""),
|
||||||
|
"device_type": unit_data.get("device_type", "seismograph"),
|
||||||
|
"address": unit_data.get("address", ""),
|
||||||
|
"coordinates": unit_data.get("coordinates", ""),
|
||||||
|
"project_id": unit_data.get("project_id", ""),
|
||||||
|
"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"),
|
||||||
|
})
|
||||||
|
|
||||||
|
# Add ignored units
|
||||||
|
for unit_id, unit_data in snapshot.get("ignored", {}).items():
|
||||||
|
units_list.append({
|
||||||
|
"id": unit_id,
|
||||||
|
"status": "Ignored",
|
||||||
|
"age": "N/A",
|
||||||
|
"last_seen": "N/A",
|
||||||
|
"deployed": False,
|
||||||
|
"retired": False,
|
||||||
|
"ignored": True,
|
||||||
|
"note": unit_data.get("note", unit_data.get("reason", "")),
|
||||||
|
"device_type": unit_data.get("device_type", "unknown"),
|
||||||
|
"address": "",
|
||||||
|
"coordinates": "",
|
||||||
|
"project_id": "",
|
||||||
|
"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,
|
||||||
|
})
|
||||||
|
|
||||||
|
# Sort by status category, then by ID
|
||||||
|
def sort_key(unit):
|
||||||
|
# Priority: deployed (active) -> benched -> retired -> ignored
|
||||||
|
if unit["deployed"]:
|
||||||
|
return (0, unit["id"])
|
||||||
|
elif not unit["retired"] and not unit["ignored"]:
|
||||||
|
return (1, unit["id"])
|
||||||
|
elif unit["retired"]:
|
||||||
|
return (2, unit["id"])
|
||||||
|
else:
|
||||||
|
return (3, unit["id"])
|
||||||
|
|
||||||
|
units_list.sort(key=sort_key)
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/devices_table.html", {
|
||||||
|
"request": request,
|
||||||
|
"units": units_list,
|
||||||
|
"timestamp": datetime.now().strftime("%H:%M:%S"),
|
||||||
|
"user_timezone": get_user_timezone()
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
@app.get("/health")
|
@app.get("/health")
|
||||||
def health_check():
|
def health_check():
|
||||||
"""Health check endpoint"""
|
"""Health check endpoint"""
|
||||||
|
|||||||
67
backend/migrate_add_auto_increment_index.py
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
"""
|
||||||
|
Migration: Add auto_increment_index column to recurring_schedules table
|
||||||
|
|
||||||
|
This migration adds the auto_increment_index column that controls whether
|
||||||
|
the scheduler should automatically find an unused store index before starting
|
||||||
|
a new measurement.
|
||||||
|
|
||||||
|
Run this script once to update existing databases:
|
||||||
|
python -m backend.migrate_add_auto_increment_index
|
||||||
|
"""
|
||||||
|
|
||||||
|
import sqlite3
|
||||||
|
import os
|
||||||
|
|
||||||
|
DB_PATH = "data/seismo_fleet.db"
|
||||||
|
|
||||||
|
|
||||||
|
def migrate():
|
||||||
|
"""Add auto_increment_index column to recurring_schedules table."""
|
||||||
|
if not os.path.exists(DB_PATH):
|
||||||
|
print(f"Database not found at {DB_PATH}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
conn = sqlite3.connect(DB_PATH)
|
||||||
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Check if recurring_schedules table exists
|
||||||
|
cursor.execute("""
|
||||||
|
SELECT name FROM sqlite_master
|
||||||
|
WHERE type='table' AND name='recurring_schedules'
|
||||||
|
""")
|
||||||
|
if not cursor.fetchone():
|
||||||
|
print("recurring_schedules table does not exist yet. Will be created on app startup.")
|
||||||
|
conn.close()
|
||||||
|
return True
|
||||||
|
|
||||||
|
# Check if auto_increment_index column already exists
|
||||||
|
cursor.execute("PRAGMA table_info(recurring_schedules)")
|
||||||
|
columns = [row[1] for row in cursor.fetchall()]
|
||||||
|
|
||||||
|
if "auto_increment_index" in columns:
|
||||||
|
print("auto_increment_index column already exists in recurring_schedules table.")
|
||||||
|
conn.close()
|
||||||
|
return True
|
||||||
|
|
||||||
|
# Add the column
|
||||||
|
print("Adding auto_increment_index column to recurring_schedules table...")
|
||||||
|
cursor.execute("""
|
||||||
|
ALTER TABLE recurring_schedules
|
||||||
|
ADD COLUMN auto_increment_index BOOLEAN DEFAULT 1
|
||||||
|
""")
|
||||||
|
conn.commit()
|
||||||
|
print("Successfully added auto_increment_index column.")
|
||||||
|
|
||||||
|
conn.close()
|
||||||
|
return True
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Migration failed: {e}")
|
||||||
|
conn.close()
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
success = migrate()
|
||||||
|
exit(0 if success else 1)
|
||||||
84
backend/migrate_add_deployment_type.py
Normal file
@@ -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()
|
||||||
80
backend/migrate_add_project_number.py
Normal file
@@ -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()
|
||||||
88
backend/migrate_add_report_templates.py
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
"""
|
||||||
|
Migration script to add report_templates table.
|
||||||
|
|
||||||
|
This creates a new table for storing report generation configurations:
|
||||||
|
- Template name and project association
|
||||||
|
- Time filtering settings (start/end time)
|
||||||
|
- Date range filtering (optional)
|
||||||
|
- Report title defaults
|
||||||
|
|
||||||
|
Run this script once to migrate an existing database.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import sqlite3
|
||||||
|
import os
|
||||||
|
|
||||||
|
# Database path
|
||||||
|
DB_PATH = "./data/seismo_fleet.db"
|
||||||
|
|
||||||
|
def migrate_database():
|
||||||
|
"""Create report_templates 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 report_templates table already exists
|
||||||
|
cursor.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='report_templates'")
|
||||||
|
table_exists = cursor.fetchone()
|
||||||
|
|
||||||
|
if table_exists:
|
||||||
|
print("Migration already applied - report_templates table exists")
|
||||||
|
conn.close()
|
||||||
|
return
|
||||||
|
|
||||||
|
print("Creating report_templates table...")
|
||||||
|
|
||||||
|
try:
|
||||||
|
cursor.execute("""
|
||||||
|
CREATE TABLE report_templates (
|
||||||
|
id TEXT PRIMARY KEY,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
project_id TEXT,
|
||||||
|
report_title TEXT DEFAULT 'Background Noise Study',
|
||||||
|
start_time TEXT,
|
||||||
|
end_time TEXT,
|
||||||
|
start_date TEXT,
|
||||||
|
end_date TEXT,
|
||||||
|
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||||
|
)
|
||||||
|
""")
|
||||||
|
print(" ✓ Created report_templates table")
|
||||||
|
|
||||||
|
# Insert default templates
|
||||||
|
import uuid
|
||||||
|
|
||||||
|
default_templates = [
|
||||||
|
(str(uuid.uuid4()), "Nighttime (7PM-7AM)", None, "Background Noise Study", "19:00", "07:00", None, None),
|
||||||
|
(str(uuid.uuid4()), "Daytime (7AM-7PM)", None, "Background Noise Study", "07:00", "19:00", None, None),
|
||||||
|
(str(uuid.uuid4()), "Full Day (All Data)", None, "Background Noise Study", None, None, None, None),
|
||||||
|
]
|
||||||
|
|
||||||
|
cursor.executemany("""
|
||||||
|
INSERT INTO report_templates (id, name, project_id, report_title, start_time, end_time, start_date, end_date)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
""", default_templates)
|
||||||
|
print(" ✓ Inserted default templates (Nighttime, Daytime, Full Day)")
|
||||||
|
|
||||||
|
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()
|
||||||
@@ -71,7 +71,7 @@ def migrate():
|
|||||||
print("\n○ No migration needed - all columns already exist.")
|
print("\n○ No migration needed - all columns already exist.")
|
||||||
|
|
||||||
print("\nSound level meter fields are now available in the roster table.")
|
print("\nSound level meter fields are now available in the roster table.")
|
||||||
print("You can now set device_type='sound_level_meter' for SLM devices.")
|
print("Note: Use device_type='slm' for Sound Level Meters. Legacy 'sound_level_meter' has been deprecated.")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
106
backend/migrate_standardize_device_types.py
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
"""
|
||||||
|
Database Migration: Standardize device_type values
|
||||||
|
|
||||||
|
This migration ensures all device_type values follow the official schema:
|
||||||
|
- "seismograph" - Seismic monitoring devices
|
||||||
|
- "modem" - Field modems and network equipment
|
||||||
|
- "slm" - Sound level meters (NL-43/NL-53)
|
||||||
|
|
||||||
|
Changes:
|
||||||
|
- Converts "sound_level_meter" → "slm"
|
||||||
|
- Safe to run multiple times (idempotent)
|
||||||
|
- No data loss
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
python backend/migrate_standardize_device_types.py
|
||||||
|
"""
|
||||||
|
|
||||||
|
import sys
|
||||||
|
import os
|
||||||
|
|
||||||
|
# Add parent directory to path so we can import backend modules
|
||||||
|
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||||
|
|
||||||
|
from sqlalchemy import create_engine, text
|
||||||
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
|
||||||
|
# Database configuration
|
||||||
|
SQLALCHEMY_DATABASE_URL = "sqlite:///./data/seismo_fleet.db"
|
||||||
|
engine = create_engine(SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False})
|
||||||
|
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||||
|
|
||||||
|
|
||||||
|
def migrate():
|
||||||
|
"""Standardize device_type values in the database"""
|
||||||
|
db = SessionLocal()
|
||||||
|
|
||||||
|
try:
|
||||||
|
print("=" * 70)
|
||||||
|
print("Database Migration: Standardize device_type values")
|
||||||
|
print("=" * 70)
|
||||||
|
print()
|
||||||
|
|
||||||
|
# Check for existing "sound_level_meter" values
|
||||||
|
result = db.execute(
|
||||||
|
text("SELECT COUNT(*) as count FROM roster WHERE device_type = 'sound_level_meter'")
|
||||||
|
).fetchone()
|
||||||
|
|
||||||
|
count_to_migrate = result[0] if result else 0
|
||||||
|
|
||||||
|
if count_to_migrate == 0:
|
||||||
|
print("✓ No records need migration - all device_type values are already standardized")
|
||||||
|
print()
|
||||||
|
print("Current device_type distribution:")
|
||||||
|
|
||||||
|
# Show distribution
|
||||||
|
distribution = db.execute(
|
||||||
|
text("SELECT device_type, COUNT(*) as count FROM roster GROUP BY device_type ORDER BY count DESC")
|
||||||
|
).fetchall()
|
||||||
|
|
||||||
|
for row in distribution:
|
||||||
|
device_type, count = row
|
||||||
|
print(f" - {device_type}: {count} units")
|
||||||
|
|
||||||
|
print()
|
||||||
|
print("Migration not needed.")
|
||||||
|
return
|
||||||
|
|
||||||
|
print(f"Found {count_to_migrate} record(s) with device_type='sound_level_meter'")
|
||||||
|
print()
|
||||||
|
print("Converting 'sound_level_meter' → 'slm'...")
|
||||||
|
|
||||||
|
# Perform the migration
|
||||||
|
db.execute(
|
||||||
|
text("UPDATE roster SET device_type = 'slm' WHERE device_type = 'sound_level_meter'")
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
print(f"✓ Successfully migrated {count_to_migrate} record(s)")
|
||||||
|
print()
|
||||||
|
|
||||||
|
# Show final distribution
|
||||||
|
print("Updated device_type distribution:")
|
||||||
|
distribution = db.execute(
|
||||||
|
text("SELECT device_type, COUNT(*) as count FROM roster GROUP BY device_type ORDER BY count DESC")
|
||||||
|
).fetchall()
|
||||||
|
|
||||||
|
for row in distribution:
|
||||||
|
device_type, count = row
|
||||||
|
print(f" - {device_type}: {count} units")
|
||||||
|
|
||||||
|
print()
|
||||||
|
print("=" * 70)
|
||||||
|
print("Migration completed successfully!")
|
||||||
|
print("=" * 70)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
db.rollback()
|
||||||
|
print(f"\n❌ Error during migration: {e}")
|
||||||
|
print("\nRolling back changes...")
|
||||||
|
raise
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
migrate()
|
||||||
@@ -19,14 +19,17 @@ class RosterUnit(Base):
|
|||||||
Roster table: represents our *intended assignment* of a unit.
|
Roster table: represents our *intended assignment* of a unit.
|
||||||
This is editable from the GUI.
|
This is editable from the GUI.
|
||||||
|
|
||||||
Supports multiple device types (seismograph, modem, sound_level_meter) with type-specific fields.
|
Supports multiple device types with type-specific fields:
|
||||||
|
- "seismograph" - Seismic monitoring devices (default)
|
||||||
|
- "modem" - Field modems and network equipment
|
||||||
|
- "slm" - Sound level meters (NL-43/NL-53)
|
||||||
"""
|
"""
|
||||||
__tablename__ = "roster"
|
__tablename__ = "roster"
|
||||||
|
|
||||||
# Core fields (all device types)
|
# Core fields (all device types)
|
||||||
id = Column(String, primary_key=True, index=True)
|
id = Column(String, primary_key=True, index=True)
|
||||||
unit_type = Column(String, default="series3") # Backward compatibility
|
unit_type = Column(String, default="series3") # Backward compatibility
|
||||||
device_type = Column(String, default="seismograph") # "seismograph" | "modem" | "sound_level_meter"
|
device_type = Column(String, default="seismograph") # "seismograph" | "modem" | "slm"
|
||||||
deployed = Column(Boolean, default=True)
|
deployed = Column(Boolean, default=True)
|
||||||
retired = Column(Boolean, default=False)
|
retired = Column(Boolean, default=False)
|
||||||
note = Column(String, nullable=True)
|
note = Column(String, nullable=True)
|
||||||
@@ -39,16 +42,21 @@ class RosterUnit(Base):
|
|||||||
# Seismograph-specific fields (nullable for modems and SLMs)
|
# Seismograph-specific fields (nullable for modems and SLMs)
|
||||||
last_calibrated = Column(Date, nullable=True)
|
last_calibrated = Column(Date, nullable=True)
|
||||||
next_calibration_due = Column(Date, nullable=True)
|
next_calibration_due = Column(Date, nullable=True)
|
||||||
deployed_with_modem_id = Column(String, nullable=True) # FK to another RosterUnit
|
|
||||||
|
# Modem assignment (shared by seismographs and SLMs)
|
||||||
|
deployed_with_modem_id = Column(String, nullable=True) # FK to another RosterUnit (device_type=modem)
|
||||||
|
|
||||||
# Modem-specific fields (nullable for seismographs and SLMs)
|
# Modem-specific fields (nullable for seismographs and SLMs)
|
||||||
ip_address = Column(String, nullable=True)
|
ip_address = Column(String, nullable=True)
|
||||||
phone_number = Column(String, nullable=True)
|
phone_number = Column(String, nullable=True)
|
||||||
hardware_model = 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)
|
# Sound Level Meter-specific fields (nullable for seismographs and modems)
|
||||||
slm_host = Column(String, nullable=True) # Device IP or hostname
|
slm_host = Column(String, nullable=True) # Device IP or hostname
|
||||||
slm_tcp_port = Column(Integer, nullable=True) # TCP control port (default 2255)
|
slm_tcp_port = Column(Integer, nullable=True) # TCP control port (default 2255)
|
||||||
|
slm_ftp_port = Column(Integer, nullable=True) # FTP data retrieval port (default 21)
|
||||||
slm_model = Column(String, nullable=True) # NL-43, NL-53, etc.
|
slm_model = Column(String, nullable=True) # NL-43, NL-53, etc.
|
||||||
slm_serial_number = Column(String, nullable=True) # Device serial number
|
slm_serial_number = Column(String, nullable=True) # Device serial number
|
||||||
slm_frequency_weighting = Column(String, nullable=True) # A, C, Z
|
slm_frequency_weighting = Column(String, nullable=True) # A, C, Z
|
||||||
@@ -105,3 +113,292 @@ class UserPreferences(Base):
|
|||||||
status_ok_threshold_hours = Column(Integer, default=12)
|
status_ok_threshold_hours = Column(Integer, default=12)
|
||||||
status_pending_threshold_hours = Column(Integer, default=24)
|
status_pending_threshold_hours = Column(Integer, default=24)
|
||||||
updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Project Management System
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
class ProjectType(Base):
|
||||||
|
"""
|
||||||
|
Project type templates: defines available project types and their capabilities.
|
||||||
|
Pre-populated with: sound_monitoring, vibration_monitoring, combined.
|
||||||
|
"""
|
||||||
|
__tablename__ = "project_types"
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True) # sound_monitoring, vibration_monitoring, combined
|
||||||
|
name = Column(String, nullable=False, unique=True) # "Sound Monitoring", "Vibration Monitoring"
|
||||||
|
description = Column(Text, nullable=True)
|
||||||
|
icon = Column(String, nullable=True) # Icon identifier for UI
|
||||||
|
supports_sound = Column(Boolean, default=False) # Enables SLM features
|
||||||
|
supports_vibration = Column(Boolean, default=False) # Enables seismograph features
|
||||||
|
created_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
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
|
||||||
|
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, 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)
|
||||||
|
end_date = Column(Date, nullable=True)
|
||||||
|
|
||||||
|
created_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
class MonitoringLocation(Base):
|
||||||
|
"""
|
||||||
|
Monitoring locations: generic location for monitoring activities.
|
||||||
|
Can be NRL (Noise Recording Location) for sound projects,
|
||||||
|
or monitoring point for vibration projects.
|
||||||
|
"""
|
||||||
|
__tablename__ = "monitoring_locations"
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, index=True) # UUID
|
||||||
|
project_id = Column(String, nullable=False, index=True) # FK to Project.id
|
||||||
|
location_type = Column(String, nullable=False) # "sound" | "vibration"
|
||||||
|
|
||||||
|
name = Column(String, nullable=False) # NRL-001, VP-North, etc.
|
||||||
|
description = Column(Text, nullable=True)
|
||||||
|
coordinates = Column(String, nullable=True) # "lat,lon"
|
||||||
|
address = Column(String, nullable=True)
|
||||||
|
|
||||||
|
# Type-specific metadata stored as JSON
|
||||||
|
# For sound: {"ambient_conditions": "urban", "expected_sources": ["traffic"]}
|
||||||
|
# For vibration: {"ground_type": "bedrock", "depth": "10m"}
|
||||||
|
location_metadata = Column(Text, nullable=True)
|
||||||
|
|
||||||
|
created_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
class UnitAssignment(Base):
|
||||||
|
"""
|
||||||
|
Unit assignments: links devices (SLMs or seismographs) to monitoring locations.
|
||||||
|
Supports temporary assignments with assigned_until.
|
||||||
|
"""
|
||||||
|
__tablename__ = "unit_assignments"
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, index=True) # UUID
|
||||||
|
unit_id = Column(String, nullable=False, index=True) # FK to RosterUnit.id
|
||||||
|
location_id = Column(String, nullable=False, index=True) # FK to MonitoringLocation.id
|
||||||
|
|
||||||
|
assigned_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
assigned_until = Column(DateTime, nullable=True) # Null = indefinite
|
||||||
|
status = Column(String, default="active") # active, completed, cancelled
|
||||||
|
notes = Column(Text, nullable=True)
|
||||||
|
|
||||||
|
# Denormalized for efficient queries
|
||||||
|
device_type = Column(String, nullable=False) # "slm" | "seismograph"
|
||||||
|
project_id = Column(String, nullable=False, index=True) # FK to Project.id
|
||||||
|
|
||||||
|
created_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
class ScheduledAction(Base):
|
||||||
|
"""
|
||||||
|
Scheduled actions: automation for recording start/stop/download.
|
||||||
|
Terra-View executes these by calling SLMM or SFM endpoints.
|
||||||
|
"""
|
||||||
|
__tablename__ = "scheduled_actions"
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, index=True) # UUID
|
||||||
|
project_id = Column(String, nullable=False, index=True) # FK to Project.id
|
||||||
|
location_id = Column(String, nullable=False, index=True) # FK to MonitoringLocation.id
|
||||||
|
unit_id = Column(String, nullable=True, index=True) # FK to RosterUnit.id (nullable if location-based)
|
||||||
|
|
||||||
|
action_type = Column(String, nullable=False) # start, stop, download, calibrate
|
||||||
|
device_type = Column(String, nullable=False) # "slm" | "seismograph"
|
||||||
|
|
||||||
|
scheduled_time = Column(DateTime, nullable=False, index=True)
|
||||||
|
executed_at = Column(DateTime, nullable=True)
|
||||||
|
execution_status = Column(String, default="pending") # pending, completed, failed, cancelled
|
||||||
|
|
||||||
|
# Response from device module (SLMM or SFM)
|
||||||
|
module_response = Column(Text, nullable=True) # JSON
|
||||||
|
error_message = Column(Text, nullable=True)
|
||||||
|
|
||||||
|
notes = Column(Text, nullable=True)
|
||||||
|
created_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
class RecordingSession(Base):
|
||||||
|
"""
|
||||||
|
Recording sessions: tracks actual monitoring sessions.
|
||||||
|
Created when recording starts, updated when it stops.
|
||||||
|
"""
|
||||||
|
__tablename__ = "recording_sessions"
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, index=True) # UUID
|
||||||
|
project_id = Column(String, nullable=False, index=True) # FK to Project.id
|
||||||
|
location_id = Column(String, nullable=False, index=True) # FK to MonitoringLocation.id
|
||||||
|
unit_id = Column(String, nullable=False, index=True) # FK to RosterUnit.id
|
||||||
|
|
||||||
|
session_type = Column(String, nullable=False) # sound | vibration
|
||||||
|
started_at = Column(DateTime, nullable=False)
|
||||||
|
stopped_at = Column(DateTime, nullable=True)
|
||||||
|
duration_seconds = Column(Integer, nullable=True)
|
||||||
|
status = Column(String, default="recording") # recording, completed, failed
|
||||||
|
|
||||||
|
# Snapshot of device configuration at recording time
|
||||||
|
session_metadata = Column(Text, nullable=True) # JSON
|
||||||
|
|
||||||
|
created_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
class DataFile(Base):
|
||||||
|
"""
|
||||||
|
Data files: references to recorded data files.
|
||||||
|
Terra-View tracks file metadata; actual files stored in data/Projects/ directory.
|
||||||
|
"""
|
||||||
|
__tablename__ = "data_files"
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, index=True) # UUID
|
||||||
|
session_id = Column(String, nullable=False, index=True) # FK to RecordingSession.id
|
||||||
|
|
||||||
|
file_path = Column(String, nullable=False) # Relative to data/Projects/
|
||||||
|
file_type = Column(String, nullable=False) # wav, csv, mseed, json
|
||||||
|
file_size_bytes = Column(Integer, nullable=True)
|
||||||
|
downloaded_at = Column(DateTime, nullable=True)
|
||||||
|
checksum = Column(String, nullable=True) # SHA256 or MD5
|
||||||
|
|
||||||
|
# Additional file metadata
|
||||||
|
file_metadata = Column(Text, nullable=True) # JSON
|
||||||
|
|
||||||
|
created_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
class ReportTemplate(Base):
|
||||||
|
"""
|
||||||
|
Report templates: saved configurations for generating Excel reports.
|
||||||
|
Allows users to save time filter presets, titles, etc. for reuse.
|
||||||
|
"""
|
||||||
|
__tablename__ = "report_templates"
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, index=True) # UUID
|
||||||
|
name = Column(String, nullable=False) # "Nighttime Report", "Full Day Report"
|
||||||
|
project_id = Column(String, nullable=True) # Optional: project-specific template
|
||||||
|
|
||||||
|
# Template settings
|
||||||
|
report_title = Column(String, default="Background Noise Study")
|
||||||
|
start_time = Column(String, nullable=True) # "19:00" format
|
||||||
|
end_time = Column(String, nullable=True) # "07:00" format
|
||||||
|
start_date = Column(String, nullable=True) # "2025-01-15" format (optional)
|
||||||
|
end_date = Column(String, nullable=True) # "2025-01-20" format (optional)
|
||||||
|
|
||||||
|
created_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Sound Monitoring Scheduler
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
class RecurringSchedule(Base):
|
||||||
|
"""
|
||||||
|
Recurring schedule definitions for automated sound monitoring.
|
||||||
|
|
||||||
|
Supports two schedule types:
|
||||||
|
- "weekly_calendar": Select specific days with start/end times (e.g., Mon/Wed/Fri 7pm-7am)
|
||||||
|
- "simple_interval": For 24/7 monitoring with daily stop/download/restart cycles
|
||||||
|
"""
|
||||||
|
__tablename__ = "recurring_schedules"
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, index=True) # UUID
|
||||||
|
project_id = Column(String, nullable=False, index=True) # FK to Project.id
|
||||||
|
location_id = Column(String, nullable=False, index=True) # FK to MonitoringLocation.id
|
||||||
|
unit_id = Column(String, nullable=True, index=True) # FK to RosterUnit.id (optional, can use assignment)
|
||||||
|
|
||||||
|
name = Column(String, nullable=False) # "Weeknight Monitoring", "24/7 Continuous"
|
||||||
|
schedule_type = Column(String, nullable=False) # "weekly_calendar" | "simple_interval"
|
||||||
|
device_type = Column(String, nullable=False) # "slm" | "seismograph"
|
||||||
|
|
||||||
|
# Weekly Calendar fields (schedule_type = "weekly_calendar")
|
||||||
|
# JSON format: {
|
||||||
|
# "monday": {"enabled": true, "start": "19:00", "end": "07:00"},
|
||||||
|
# "tuesday": {"enabled": false},
|
||||||
|
# ...
|
||||||
|
# }
|
||||||
|
weekly_pattern = Column(Text, nullable=True)
|
||||||
|
|
||||||
|
# Simple Interval fields (schedule_type = "simple_interval")
|
||||||
|
interval_type = Column(String, nullable=True) # "daily" | "hourly"
|
||||||
|
cycle_time = Column(String, nullable=True) # "00:00" - time to run stop/download/restart
|
||||||
|
include_download = Column(Boolean, default=True) # Download data before restart
|
||||||
|
|
||||||
|
# Automation options (applies to both schedule types)
|
||||||
|
auto_increment_index = Column(Boolean, default=True) # Auto-increment store/index number before start
|
||||||
|
# When True: prevents "overwrite data?" prompts by using a new index each time
|
||||||
|
|
||||||
|
# Shared configuration
|
||||||
|
enabled = Column(Boolean, default=True)
|
||||||
|
timezone = Column(String, default="America/New_York")
|
||||||
|
|
||||||
|
# Tracking
|
||||||
|
last_generated_at = Column(DateTime, nullable=True) # When actions were last generated
|
||||||
|
next_occurrence = Column(DateTime, nullable=True) # Computed next action time
|
||||||
|
|
||||||
|
created_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
class Alert(Base):
|
||||||
|
"""
|
||||||
|
In-app alerts for device status changes and system events.
|
||||||
|
|
||||||
|
Designed for future expansion to email/webhook notifications.
|
||||||
|
Currently supports:
|
||||||
|
- device_offline: Device became unreachable
|
||||||
|
- device_online: Device came back online
|
||||||
|
- schedule_failed: Scheduled action failed to execute
|
||||||
|
- schedule_completed: Scheduled action completed successfully
|
||||||
|
"""
|
||||||
|
__tablename__ = "alerts"
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, index=True) # UUID
|
||||||
|
|
||||||
|
# Alert classification
|
||||||
|
alert_type = Column(String, nullable=False) # "device_offline" | "device_online" | "schedule_failed" | "schedule_completed"
|
||||||
|
severity = Column(String, default="warning") # "info" | "warning" | "critical"
|
||||||
|
|
||||||
|
# Related entities (nullable - may not all apply)
|
||||||
|
project_id = Column(String, nullable=True, index=True)
|
||||||
|
location_id = Column(String, nullable=True, index=True)
|
||||||
|
unit_id = Column(String, nullable=True, index=True)
|
||||||
|
schedule_id = Column(String, nullable=True) # RecurringSchedule or ScheduledAction id
|
||||||
|
|
||||||
|
# Alert content
|
||||||
|
title = Column(String, nullable=False) # "NRL-001 Device Offline"
|
||||||
|
message = Column(Text, nullable=True) # Detailed description
|
||||||
|
alert_metadata = Column(Text, nullable=True) # JSON: additional context data
|
||||||
|
|
||||||
|
# Status tracking
|
||||||
|
status = Column(String, default="active") # "active" | "acknowledged" | "resolved" | "dismissed"
|
||||||
|
acknowledged_at = Column(DateTime, nullable=True)
|
||||||
|
resolved_at = Column(DateTime, nullable=True)
|
||||||
|
|
||||||
|
created_at = Column(DateTime, default=datetime.utcnow)
|
||||||
|
expires_at = Column(DateTime, nullable=True) # Auto-dismiss after this time
|
||||||
|
|||||||
326
backend/routers/alerts.py
Normal file
@@ -0,0 +1,326 @@
|
|||||||
|
"""
|
||||||
|
Alerts Router
|
||||||
|
|
||||||
|
API endpoints for managing in-app alerts.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Request, Depends, HTTPException, Query
|
||||||
|
from fastapi.responses import HTMLResponse, JSONResponse
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from typing import Optional
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
|
from backend.database import get_db
|
||||||
|
from backend.models import Alert, RosterUnit
|
||||||
|
from backend.services.alert_service import get_alert_service
|
||||||
|
from backend.templates_config import templates
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/alerts", tags=["alerts"])
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Alert List and Count
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/")
|
||||||
|
async def list_alerts(
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
status: Optional[str] = Query(None, description="Filter by status: active, acknowledged, resolved, dismissed"),
|
||||||
|
project_id: Optional[str] = Query(None),
|
||||||
|
unit_id: Optional[str] = Query(None),
|
||||||
|
alert_type: Optional[str] = Query(None, description="Filter by type: device_offline, device_online, schedule_failed"),
|
||||||
|
limit: int = Query(50, le=100),
|
||||||
|
offset: int = Query(0, ge=0),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
List alerts with optional filters.
|
||||||
|
"""
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
|
||||||
|
alerts = alert_service.get_all_alerts(
|
||||||
|
status=status,
|
||||||
|
project_id=project_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
alert_type=alert_type,
|
||||||
|
limit=limit,
|
||||||
|
offset=offset,
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"alerts": [
|
||||||
|
{
|
||||||
|
"id": a.id,
|
||||||
|
"alert_type": a.alert_type,
|
||||||
|
"severity": a.severity,
|
||||||
|
"title": a.title,
|
||||||
|
"message": a.message,
|
||||||
|
"status": a.status,
|
||||||
|
"unit_id": a.unit_id,
|
||||||
|
"project_id": a.project_id,
|
||||||
|
"location_id": a.location_id,
|
||||||
|
"created_at": a.created_at.isoformat() if a.created_at else None,
|
||||||
|
"acknowledged_at": a.acknowledged_at.isoformat() if a.acknowledged_at else None,
|
||||||
|
"resolved_at": a.resolved_at.isoformat() if a.resolved_at else None,
|
||||||
|
}
|
||||||
|
for a in alerts
|
||||||
|
],
|
||||||
|
"count": len(alerts),
|
||||||
|
"limit": limit,
|
||||||
|
"offset": offset,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/active")
|
||||||
|
async def list_active_alerts(
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
project_id: Optional[str] = Query(None),
|
||||||
|
unit_id: Optional[str] = Query(None),
|
||||||
|
alert_type: Optional[str] = Query(None),
|
||||||
|
min_severity: Optional[str] = Query(None, description="Minimum severity: info, warning, critical"),
|
||||||
|
limit: int = Query(50, le=100),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
List only active alerts.
|
||||||
|
"""
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
|
||||||
|
alerts = alert_service.get_active_alerts(
|
||||||
|
project_id=project_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
alert_type=alert_type,
|
||||||
|
min_severity=min_severity,
|
||||||
|
limit=limit,
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"alerts": [
|
||||||
|
{
|
||||||
|
"id": a.id,
|
||||||
|
"alert_type": a.alert_type,
|
||||||
|
"severity": a.severity,
|
||||||
|
"title": a.title,
|
||||||
|
"message": a.message,
|
||||||
|
"unit_id": a.unit_id,
|
||||||
|
"project_id": a.project_id,
|
||||||
|
"created_at": a.created_at.isoformat() if a.created_at else None,
|
||||||
|
}
|
||||||
|
for a in alerts
|
||||||
|
],
|
||||||
|
"count": len(alerts),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/active/count")
|
||||||
|
async def get_active_alert_count(db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Get count of active alerts (for navbar badge).
|
||||||
|
"""
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
count = alert_service.get_active_alert_count()
|
||||||
|
return {"count": count}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Single Alert Operations
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/{alert_id}")
|
||||||
|
async def get_alert(
|
||||||
|
alert_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Get a specific alert.
|
||||||
|
"""
|
||||||
|
alert = db.query(Alert).filter_by(id=alert_id).first()
|
||||||
|
if not alert:
|
||||||
|
raise HTTPException(status_code=404, detail="Alert not found")
|
||||||
|
|
||||||
|
# Get related unit info
|
||||||
|
unit = None
|
||||||
|
if alert.unit_id:
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=alert.unit_id).first()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"id": alert.id,
|
||||||
|
"alert_type": alert.alert_type,
|
||||||
|
"severity": alert.severity,
|
||||||
|
"title": alert.title,
|
||||||
|
"message": alert.message,
|
||||||
|
"metadata": alert.alert_metadata,
|
||||||
|
"status": alert.status,
|
||||||
|
"unit_id": alert.unit_id,
|
||||||
|
"unit_name": unit.id if unit else None,
|
||||||
|
"project_id": alert.project_id,
|
||||||
|
"location_id": alert.location_id,
|
||||||
|
"schedule_id": alert.schedule_id,
|
||||||
|
"created_at": alert.created_at.isoformat() if alert.created_at else None,
|
||||||
|
"acknowledged_at": alert.acknowledged_at.isoformat() if alert.acknowledged_at else None,
|
||||||
|
"resolved_at": alert.resolved_at.isoformat() if alert.resolved_at else None,
|
||||||
|
"expires_at": alert.expires_at.isoformat() if alert.expires_at else None,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/{alert_id}/acknowledge")
|
||||||
|
async def acknowledge_alert(
|
||||||
|
alert_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Mark alert as acknowledged.
|
||||||
|
"""
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
alert = alert_service.acknowledge_alert(alert_id)
|
||||||
|
|
||||||
|
if not alert:
|
||||||
|
raise HTTPException(status_code=404, detail="Alert not found")
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"alert_id": alert.id,
|
||||||
|
"status": alert.status,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/{alert_id}/dismiss")
|
||||||
|
async def dismiss_alert(
|
||||||
|
alert_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Dismiss alert.
|
||||||
|
"""
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
alert = alert_service.dismiss_alert(alert_id)
|
||||||
|
|
||||||
|
if not alert:
|
||||||
|
raise HTTPException(status_code=404, detail="Alert not found")
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"alert_id": alert.id,
|
||||||
|
"status": alert.status,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/{alert_id}/resolve")
|
||||||
|
async def resolve_alert(
|
||||||
|
alert_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Manually resolve an alert.
|
||||||
|
"""
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
alert = alert_service.resolve_alert(alert_id)
|
||||||
|
|
||||||
|
if not alert:
|
||||||
|
raise HTTPException(status_code=404, detail="Alert not found")
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"alert_id": alert.id,
|
||||||
|
"status": alert.status,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# HTML Partials for HTMX
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/partials/dropdown", response_class=HTMLResponse)
|
||||||
|
async def get_alert_dropdown(
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Return HTML partial for alert dropdown in navbar.
|
||||||
|
"""
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
alerts = alert_service.get_active_alerts(limit=10)
|
||||||
|
|
||||||
|
# Calculate relative time for each alert
|
||||||
|
now = datetime.utcnow()
|
||||||
|
alerts_data = []
|
||||||
|
for alert in alerts:
|
||||||
|
delta = now - alert.created_at
|
||||||
|
if delta.days > 0:
|
||||||
|
time_ago = f"{delta.days}d ago"
|
||||||
|
elif delta.seconds >= 3600:
|
||||||
|
time_ago = f"{delta.seconds // 3600}h ago"
|
||||||
|
elif delta.seconds >= 60:
|
||||||
|
time_ago = f"{delta.seconds // 60}m ago"
|
||||||
|
else:
|
||||||
|
time_ago = "just now"
|
||||||
|
|
||||||
|
alerts_data.append({
|
||||||
|
"alert": alert,
|
||||||
|
"time_ago": time_ago,
|
||||||
|
})
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/alerts/alert_dropdown.html", {
|
||||||
|
"request": request,
|
||||||
|
"alerts": alerts_data,
|
||||||
|
"total_count": alert_service.get_active_alert_count(),
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/partials/list", response_class=HTMLResponse)
|
||||||
|
async def get_alert_list(
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
status: Optional[str] = Query(None),
|
||||||
|
limit: int = Query(20),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Return HTML partial for alert list page.
|
||||||
|
"""
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
|
||||||
|
if status:
|
||||||
|
alerts = alert_service.get_all_alerts(status=status, limit=limit)
|
||||||
|
else:
|
||||||
|
alerts = alert_service.get_all_alerts(limit=limit)
|
||||||
|
|
||||||
|
# Calculate relative time for each alert
|
||||||
|
now = datetime.utcnow()
|
||||||
|
alerts_data = []
|
||||||
|
for alert in alerts:
|
||||||
|
delta = now - alert.created_at
|
||||||
|
if delta.days > 0:
|
||||||
|
time_ago = f"{delta.days}d ago"
|
||||||
|
elif delta.seconds >= 3600:
|
||||||
|
time_ago = f"{delta.seconds // 3600}h ago"
|
||||||
|
elif delta.seconds >= 60:
|
||||||
|
time_ago = f"{delta.seconds // 60}m ago"
|
||||||
|
else:
|
||||||
|
time_ago = "just now"
|
||||||
|
|
||||||
|
alerts_data.append({
|
||||||
|
"alert": alert,
|
||||||
|
"time_ago": time_ago,
|
||||||
|
})
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/alerts/alert_list.html", {
|
||||||
|
"request": request,
|
||||||
|
"alerts": alerts_data,
|
||||||
|
"status_filter": status,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Cleanup
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.post("/cleanup-expired")
|
||||||
|
async def cleanup_expired_alerts(db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Cleanup expired alerts (admin/maintenance endpoint).
|
||||||
|
"""
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
count = alert_service.cleanup_expired_alerts()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"cleaned_up": count,
|
||||||
|
}
|
||||||
@@ -1,10 +1,14 @@
|
|||||||
from fastapi import APIRouter, Request, Depends
|
from fastapi import APIRouter, Request, Depends
|
||||||
from fastapi.templating import Jinja2Templates
|
from sqlalchemy.orm import Session
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
|
from backend.database import get_db
|
||||||
|
from backend.models import ScheduledAction, MonitoringLocation, Project
|
||||||
from backend.services.snapshot import emit_status_snapshot
|
from backend.services.snapshot import emit_status_snapshot
|
||||||
|
from backend.templates_config import templates
|
||||||
|
from backend.utils.timezone import utc_to_local, local_to_utc, get_user_timezone
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
templates = Jinja2Templates(directory="templates")
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/dashboard/active")
|
@router.get("/dashboard/active")
|
||||||
@@ -23,3 +27,71 @@ def dashboard_benched(request: Request):
|
|||||||
"partials/benched_table.html",
|
"partials/benched_table.html",
|
||||||
{"request": request, "units": snapshot["benched"]}
|
{"request": request, "units": snapshot["benched"]}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/dashboard/todays-actions")
|
||||||
|
def dashboard_todays_actions(request: Request, db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Get today's scheduled actions for the dashboard card.
|
||||||
|
Shows upcoming, completed, and failed actions for today.
|
||||||
|
"""
|
||||||
|
import json
|
||||||
|
from zoneinfo import ZoneInfo
|
||||||
|
|
||||||
|
# Get today's date range in local timezone
|
||||||
|
tz = ZoneInfo(get_user_timezone())
|
||||||
|
now_local = datetime.now(tz)
|
||||||
|
today_start_local = now_local.replace(hour=0, minute=0, second=0, microsecond=0)
|
||||||
|
today_end_local = today_start_local + timedelta(days=1)
|
||||||
|
|
||||||
|
# Convert to UTC for database query
|
||||||
|
today_start_utc = today_start_local.astimezone(ZoneInfo("UTC")).replace(tzinfo=None)
|
||||||
|
today_end_utc = today_end_local.astimezone(ZoneInfo("UTC")).replace(tzinfo=None)
|
||||||
|
|
||||||
|
# Query today's actions
|
||||||
|
actions = db.query(ScheduledAction).filter(
|
||||||
|
ScheduledAction.scheduled_time >= today_start_utc,
|
||||||
|
ScheduledAction.scheduled_time < today_end_utc,
|
||||||
|
).order_by(ScheduledAction.scheduled_time.asc()).all()
|
||||||
|
|
||||||
|
# Enrich with location/project info and parse results
|
||||||
|
enriched_actions = []
|
||||||
|
for action in actions:
|
||||||
|
location = None
|
||||||
|
project = None
|
||||||
|
if action.location_id:
|
||||||
|
location = db.query(MonitoringLocation).filter_by(id=action.location_id).first()
|
||||||
|
if action.project_id:
|
||||||
|
project = db.query(Project).filter_by(id=action.project_id).first()
|
||||||
|
|
||||||
|
# Parse module_response for result details
|
||||||
|
result_data = None
|
||||||
|
if action.module_response:
|
||||||
|
try:
|
||||||
|
result_data = json.loads(action.module_response)
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
enriched_actions.append({
|
||||||
|
"action": action,
|
||||||
|
"location": location,
|
||||||
|
"project": project,
|
||||||
|
"result": result_data,
|
||||||
|
})
|
||||||
|
|
||||||
|
# Count by status
|
||||||
|
pending_count = sum(1 for a in actions if a.execution_status == "pending")
|
||||||
|
completed_count = sum(1 for a in actions if a.execution_status == "completed")
|
||||||
|
failed_count = sum(1 for a in actions if a.execution_status == "failed")
|
||||||
|
|
||||||
|
return templates.TemplateResponse(
|
||||||
|
"partials/dashboard/todays_actions.html",
|
||||||
|
{
|
||||||
|
"request": request,
|
||||||
|
"actions": enriched_actions,
|
||||||
|
"pending_count": pending_count,
|
||||||
|
"completed_count": completed_count,
|
||||||
|
"failed_count": failed_count,
|
||||||
|
"total_count": len(actions),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|||||||
286
backend/routers/modem_dashboard.py
Normal file
@@ -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.
|
||||||
|
}
|
||||||
521
backend/routers/project_locations.py
Normal file
@@ -0,0 +1,521 @@
|
|||||||
|
"""
|
||||||
|
Project Locations Router
|
||||||
|
|
||||||
|
Handles monitoring locations (NRLs for sound, monitoring points for vibration)
|
||||||
|
and unit assignments within projects.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Request, Depends, HTTPException, Query
|
||||||
|
from fastapi.responses import HTMLResponse, JSONResponse
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from sqlalchemy import and_, or_
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Optional
|
||||||
|
import uuid
|
||||||
|
import json
|
||||||
|
|
||||||
|
from backend.database import get_db
|
||||||
|
from backend.models import (
|
||||||
|
Project,
|
||||||
|
ProjectType,
|
||||||
|
MonitoringLocation,
|
||||||
|
UnitAssignment,
|
||||||
|
RosterUnit,
|
||||||
|
RecordingSession,
|
||||||
|
)
|
||||||
|
from backend.templates_config import templates
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/projects/{project_id}", tags=["project-locations"])
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Monitoring Locations CRUD
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/locations", response_class=HTMLResponse)
|
||||||
|
async def get_project_locations(
|
||||||
|
project_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
location_type: Optional[str] = Query(None),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Get all monitoring locations for a project.
|
||||||
|
Returns HTML partial with location list.
|
||||||
|
"""
|
||||||
|
project = db.query(Project).filter_by(id=project_id).first()
|
||||||
|
if not project:
|
||||||
|
raise HTTPException(status_code=404, detail="Project not found")
|
||||||
|
|
||||||
|
query = db.query(MonitoringLocation).filter_by(project_id=project_id)
|
||||||
|
|
||||||
|
# Filter by type if provided
|
||||||
|
if location_type:
|
||||||
|
query = query.filter_by(location_type=location_type)
|
||||||
|
|
||||||
|
locations = query.order_by(MonitoringLocation.name).all()
|
||||||
|
|
||||||
|
# Enrich with assignment info
|
||||||
|
locations_data = []
|
||||||
|
for location in locations:
|
||||||
|
# Get active assignment
|
||||||
|
assignment = db.query(UnitAssignment).filter(
|
||||||
|
and_(
|
||||||
|
UnitAssignment.location_id == location.id,
|
||||||
|
UnitAssignment.status == "active",
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
assigned_unit = None
|
||||||
|
if assignment:
|
||||||
|
assigned_unit = db.query(RosterUnit).filter_by(id=assignment.unit_id).first()
|
||||||
|
|
||||||
|
# Count recording sessions
|
||||||
|
session_count = db.query(RecordingSession).filter_by(
|
||||||
|
location_id=location.id
|
||||||
|
).count()
|
||||||
|
|
||||||
|
locations_data.append({
|
||||||
|
"location": location,
|
||||||
|
"assignment": assignment,
|
||||||
|
"assigned_unit": assigned_unit,
|
||||||
|
"session_count": session_count,
|
||||||
|
})
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/projects/location_list.html", {
|
||||||
|
"request": request,
|
||||||
|
"project": project,
|
||||||
|
"locations": locations_data,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/locations-json")
|
||||||
|
async def get_project_locations_json(
|
||||||
|
project_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
location_type: Optional[str] = Query(None),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Get all monitoring locations for a project as JSON.
|
||||||
|
Used by the schedule modal to populate location dropdown.
|
||||||
|
"""
|
||||||
|
project = db.query(Project).filter_by(id=project_id).first()
|
||||||
|
if not project:
|
||||||
|
raise HTTPException(status_code=404, detail="Project not found")
|
||||||
|
|
||||||
|
query = db.query(MonitoringLocation).filter_by(project_id=project_id)
|
||||||
|
|
||||||
|
if location_type:
|
||||||
|
query = query.filter_by(location_type=location_type)
|
||||||
|
|
||||||
|
locations = query.order_by(MonitoringLocation.name).all()
|
||||||
|
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
"id": loc.id,
|
||||||
|
"name": loc.name,
|
||||||
|
"location_type": loc.location_type,
|
||||||
|
"description": loc.description,
|
||||||
|
"address": loc.address,
|
||||||
|
"coordinates": loc.coordinates,
|
||||||
|
}
|
||||||
|
for loc in locations
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/locations/create")
|
||||||
|
async def create_location(
|
||||||
|
project_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Create a new monitoring location within a project.
|
||||||
|
"""
|
||||||
|
project = db.query(Project).filter_by(id=project_id).first()
|
||||||
|
if not project:
|
||||||
|
raise HTTPException(status_code=404, detail="Project not found")
|
||||||
|
|
||||||
|
form_data = await request.form()
|
||||||
|
|
||||||
|
location = MonitoringLocation(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=project_id,
|
||||||
|
location_type=form_data.get("location_type"),
|
||||||
|
name=form_data.get("name"),
|
||||||
|
description=form_data.get("description"),
|
||||||
|
coordinates=form_data.get("coordinates"),
|
||||||
|
address=form_data.get("address"),
|
||||||
|
location_metadata=form_data.get("location_metadata"), # JSON string
|
||||||
|
)
|
||||||
|
|
||||||
|
db.add(location)
|
||||||
|
db.commit()
|
||||||
|
db.refresh(location)
|
||||||
|
|
||||||
|
return JSONResponse({
|
||||||
|
"success": True,
|
||||||
|
"location_id": location.id,
|
||||||
|
"message": f"Location '{location.name}' created successfully",
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@router.put("/locations/{location_id}")
|
||||||
|
async def update_location(
|
||||||
|
project_id: str,
|
||||||
|
location_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Update a monitoring location.
|
||||||
|
"""
|
||||||
|
location = db.query(MonitoringLocation).filter_by(
|
||||||
|
id=location_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not location:
|
||||||
|
raise HTTPException(status_code=404, detail="Location not found")
|
||||||
|
|
||||||
|
data = await request.json()
|
||||||
|
|
||||||
|
# Update fields if provided
|
||||||
|
if "name" in data:
|
||||||
|
location.name = data["name"]
|
||||||
|
if "description" in data:
|
||||||
|
location.description = data["description"]
|
||||||
|
if "location_type" in data:
|
||||||
|
location.location_type = data["location_type"]
|
||||||
|
if "coordinates" in data:
|
||||||
|
location.coordinates = data["coordinates"]
|
||||||
|
if "address" in data:
|
||||||
|
location.address = data["address"]
|
||||||
|
if "location_metadata" in data:
|
||||||
|
location.location_metadata = data["location_metadata"]
|
||||||
|
|
||||||
|
location.updated_at = datetime.utcnow()
|
||||||
|
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return {"success": True, "message": "Location updated successfully"}
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/locations/{location_id}")
|
||||||
|
async def delete_location(
|
||||||
|
project_id: str,
|
||||||
|
location_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Delete a monitoring location.
|
||||||
|
"""
|
||||||
|
location = db.query(MonitoringLocation).filter_by(
|
||||||
|
id=location_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not location:
|
||||||
|
raise HTTPException(status_code=404, detail="Location not found")
|
||||||
|
|
||||||
|
# Check if location has active assignments
|
||||||
|
active_assignments = db.query(UnitAssignment).filter(
|
||||||
|
and_(
|
||||||
|
UnitAssignment.location_id == location_id,
|
||||||
|
UnitAssignment.status == "active",
|
||||||
|
)
|
||||||
|
).count()
|
||||||
|
|
||||||
|
if active_assignments > 0:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail="Cannot delete location with active unit assignments. Unassign units first.",
|
||||||
|
)
|
||||||
|
|
||||||
|
db.delete(location)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return {"success": True, "message": "Location deleted successfully"}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Unit Assignments
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/assignments", response_class=HTMLResponse)
|
||||||
|
async def get_project_assignments(
|
||||||
|
project_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
status: Optional[str] = Query("active"),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Get all unit assignments for a project.
|
||||||
|
Returns HTML partial with assignment list.
|
||||||
|
"""
|
||||||
|
query = db.query(UnitAssignment).filter_by(project_id=project_id)
|
||||||
|
|
||||||
|
if status:
|
||||||
|
query = query.filter_by(status=status)
|
||||||
|
|
||||||
|
assignments = query.order_by(UnitAssignment.assigned_at.desc()).all()
|
||||||
|
|
||||||
|
# Enrich with unit and location details
|
||||||
|
assignments_data = []
|
||||||
|
for assignment in assignments:
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=assignment.unit_id).first()
|
||||||
|
location = db.query(MonitoringLocation).filter_by(id=assignment.location_id).first()
|
||||||
|
|
||||||
|
assignments_data.append({
|
||||||
|
"assignment": assignment,
|
||||||
|
"unit": unit,
|
||||||
|
"location": location,
|
||||||
|
})
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/projects/assignment_list.html", {
|
||||||
|
"request": request,
|
||||||
|
"project_id": project_id,
|
||||||
|
"assignments": assignments_data,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/locations/{location_id}/assign")
|
||||||
|
async def assign_unit_to_location(
|
||||||
|
project_id: str,
|
||||||
|
location_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Assign a unit to a monitoring location.
|
||||||
|
"""
|
||||||
|
location = db.query(MonitoringLocation).filter_by(
|
||||||
|
id=location_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not location:
|
||||||
|
raise HTTPException(status_code=404, detail="Location not found")
|
||||||
|
|
||||||
|
form_data = await request.form()
|
||||||
|
unit_id = form_data.get("unit_id")
|
||||||
|
|
||||||
|
# Verify unit exists and matches location type
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=unit_id).first()
|
||||||
|
if not unit:
|
||||||
|
raise HTTPException(status_code=404, detail="Unit not found")
|
||||||
|
|
||||||
|
# Check device type matches location type
|
||||||
|
expected_device_type = "slm" if location.location_type == "sound" else "seismograph"
|
||||||
|
if unit.device_type != expected_device_type:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail=f"Unit type '{unit.device_type}' does not match location type '{location.location_type}'",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Check if location already has an active assignment
|
||||||
|
existing_assignment = db.query(UnitAssignment).filter(
|
||||||
|
and_(
|
||||||
|
UnitAssignment.location_id == location_id,
|
||||||
|
UnitAssignment.status == "active",
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if existing_assignment:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail=f"Location already has an active unit assignment ({existing_assignment.unit_id}). Unassign first.",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create new assignment
|
||||||
|
assigned_until_str = form_data.get("assigned_until")
|
||||||
|
assigned_until = datetime.fromisoformat(assigned_until_str) if assigned_until_str else None
|
||||||
|
|
||||||
|
assignment = UnitAssignment(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
unit_id=unit_id,
|
||||||
|
location_id=location_id,
|
||||||
|
project_id=project_id,
|
||||||
|
device_type=unit.device_type,
|
||||||
|
assigned_until=assigned_until,
|
||||||
|
status="active",
|
||||||
|
notes=form_data.get("notes"),
|
||||||
|
)
|
||||||
|
|
||||||
|
db.add(assignment)
|
||||||
|
db.commit()
|
||||||
|
db.refresh(assignment)
|
||||||
|
|
||||||
|
return JSONResponse({
|
||||||
|
"success": True,
|
||||||
|
"assignment_id": assignment.id,
|
||||||
|
"message": f"Unit '{unit_id}' assigned to '{location.name}'",
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/assignments/{assignment_id}/unassign")
|
||||||
|
async def unassign_unit(
|
||||||
|
project_id: str,
|
||||||
|
assignment_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Unassign a unit from a location.
|
||||||
|
"""
|
||||||
|
assignment = db.query(UnitAssignment).filter_by(
|
||||||
|
id=assignment_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not assignment:
|
||||||
|
raise HTTPException(status_code=404, detail="Assignment not found")
|
||||||
|
|
||||||
|
# Check if there are active recording sessions
|
||||||
|
active_sessions = db.query(RecordingSession).filter(
|
||||||
|
and_(
|
||||||
|
RecordingSession.location_id == assignment.location_id,
|
||||||
|
RecordingSession.unit_id == assignment.unit_id,
|
||||||
|
RecordingSession.status == "recording",
|
||||||
|
)
|
||||||
|
).count()
|
||||||
|
|
||||||
|
if active_sessions > 0:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail="Cannot unassign unit with active recording sessions. Stop recording first.",
|
||||||
|
)
|
||||||
|
|
||||||
|
assignment.status = "completed"
|
||||||
|
assignment.assigned_until = datetime.utcnow()
|
||||||
|
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return {"success": True, "message": "Unit unassigned successfully"}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Available Units for Assignment
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/available-units", response_class=JSONResponse)
|
||||||
|
async def get_available_units(
|
||||||
|
project_id: str,
|
||||||
|
location_type: str = Query(...),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Get list of available units for assignment to a location.
|
||||||
|
Filters by device type matching the location type.
|
||||||
|
"""
|
||||||
|
# Determine required device type
|
||||||
|
required_device_type = "slm" if location_type == "sound" else "seismograph"
|
||||||
|
|
||||||
|
# Get all units of the required type that are deployed and not retired
|
||||||
|
all_units = db.query(RosterUnit).filter(
|
||||||
|
and_(
|
||||||
|
RosterUnit.device_type == required_device_type,
|
||||||
|
RosterUnit.deployed == True,
|
||||||
|
RosterUnit.retired == False,
|
||||||
|
)
|
||||||
|
).all()
|
||||||
|
|
||||||
|
# Filter out units that already have active assignments
|
||||||
|
assigned_unit_ids = db.query(UnitAssignment.unit_id).filter(
|
||||||
|
UnitAssignment.status == "active"
|
||||||
|
).distinct().all()
|
||||||
|
assigned_unit_ids = [uid[0] for uid in assigned_unit_ids]
|
||||||
|
|
||||||
|
available_units = [
|
||||||
|
{
|
||||||
|
"id": unit.id,
|
||||||
|
"device_type": unit.device_type,
|
||||||
|
"location": unit.address or unit.location,
|
||||||
|
"model": unit.slm_model if unit.device_type == "slm" else unit.unit_type,
|
||||||
|
}
|
||||||
|
for unit in all_units
|
||||||
|
if unit.id not in assigned_unit_ids
|
||||||
|
]
|
||||||
|
|
||||||
|
return available_units
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# NRL-specific endpoints for detail page
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/nrl/{location_id}/sessions", response_class=HTMLResponse)
|
||||||
|
async def get_nrl_sessions(
|
||||||
|
project_id: str,
|
||||||
|
location_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Get recording sessions for a specific NRL.
|
||||||
|
Returns HTML partial with session list.
|
||||||
|
"""
|
||||||
|
from backend.models import RecordingSession, RosterUnit
|
||||||
|
|
||||||
|
sessions = db.query(RecordingSession).filter_by(
|
||||||
|
location_id=location_id
|
||||||
|
).order_by(RecordingSession.started_at.desc()).all()
|
||||||
|
|
||||||
|
# Enrich with unit details
|
||||||
|
sessions_data = []
|
||||||
|
for session in sessions:
|
||||||
|
unit = None
|
||||||
|
if session.unit_id:
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=session.unit_id).first()
|
||||||
|
|
||||||
|
sessions_data.append({
|
||||||
|
"session": session,
|
||||||
|
"unit": unit,
|
||||||
|
})
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/projects/session_list.html", {
|
||||||
|
"request": request,
|
||||||
|
"project_id": project_id,
|
||||||
|
"location_id": location_id,
|
||||||
|
"sessions": sessions_data,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/nrl/{location_id}/files", response_class=HTMLResponse)
|
||||||
|
async def get_nrl_files(
|
||||||
|
project_id: str,
|
||||||
|
location_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Get data files for a specific NRL.
|
||||||
|
Returns HTML partial with file list.
|
||||||
|
"""
|
||||||
|
from backend.models import DataFile, RecordingSession
|
||||||
|
|
||||||
|
# Join DataFile with RecordingSession to filter by location_id
|
||||||
|
files = db.query(DataFile).join(
|
||||||
|
RecordingSession,
|
||||||
|
DataFile.session_id == RecordingSession.id
|
||||||
|
).filter(
|
||||||
|
RecordingSession.location_id == location_id
|
||||||
|
).order_by(DataFile.created_at.desc()).all()
|
||||||
|
|
||||||
|
# Enrich with session details
|
||||||
|
files_data = []
|
||||||
|
for file in files:
|
||||||
|
session = None
|
||||||
|
if file.session_id:
|
||||||
|
session = db.query(RecordingSession).filter_by(id=file.session_id).first()
|
||||||
|
|
||||||
|
files_data.append({
|
||||||
|
"file": file,
|
||||||
|
"session": session,
|
||||||
|
})
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/projects/file_list.html", {
|
||||||
|
"request": request,
|
||||||
|
"project_id": project_id,
|
||||||
|
"location_id": location_id,
|
||||||
|
"files": files_data,
|
||||||
|
})
|
||||||
2620
backend/routers/projects.py
Normal file
465
backend/routers/recurring_schedules.py
Normal file
@@ -0,0 +1,465 @@
|
|||||||
|
"""
|
||||||
|
Recurring Schedules Router
|
||||||
|
|
||||||
|
API endpoints for managing recurring monitoring schedules.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Request, Depends, HTTPException, Query
|
||||||
|
from fastapi.responses import HTMLResponse, JSONResponse
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from typing import Optional
|
||||||
|
from datetime import datetime
|
||||||
|
import json
|
||||||
|
|
||||||
|
from backend.database import get_db
|
||||||
|
from backend.models import RecurringSchedule, MonitoringLocation, Project, RosterUnit
|
||||||
|
from backend.services.recurring_schedule_service import get_recurring_schedule_service
|
||||||
|
from backend.templates_config import templates
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/projects/{project_id}/recurring-schedules", tags=["recurring-schedules"])
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# List and Get
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/")
|
||||||
|
async def list_recurring_schedules(
|
||||||
|
project_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
enabled_only: bool = Query(False),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
List all recurring schedules for a project.
|
||||||
|
"""
|
||||||
|
project = db.query(Project).filter_by(id=project_id).first()
|
||||||
|
if not project:
|
||||||
|
raise HTTPException(status_code=404, detail="Project not found")
|
||||||
|
|
||||||
|
query = db.query(RecurringSchedule).filter_by(project_id=project_id)
|
||||||
|
if enabled_only:
|
||||||
|
query = query.filter_by(enabled=True)
|
||||||
|
|
||||||
|
schedules = query.order_by(RecurringSchedule.created_at.desc()).all()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"schedules": [
|
||||||
|
{
|
||||||
|
"id": s.id,
|
||||||
|
"name": s.name,
|
||||||
|
"schedule_type": s.schedule_type,
|
||||||
|
"device_type": s.device_type,
|
||||||
|
"location_id": s.location_id,
|
||||||
|
"unit_id": s.unit_id,
|
||||||
|
"enabled": s.enabled,
|
||||||
|
"weekly_pattern": json.loads(s.weekly_pattern) if s.weekly_pattern else None,
|
||||||
|
"interval_type": s.interval_type,
|
||||||
|
"cycle_time": s.cycle_time,
|
||||||
|
"include_download": s.include_download,
|
||||||
|
"timezone": s.timezone,
|
||||||
|
"next_occurrence": s.next_occurrence.isoformat() if s.next_occurrence else None,
|
||||||
|
"last_generated_at": s.last_generated_at.isoformat() if s.last_generated_at else None,
|
||||||
|
"created_at": s.created_at.isoformat() if s.created_at else None,
|
||||||
|
}
|
||||||
|
for s in schedules
|
||||||
|
],
|
||||||
|
"count": len(schedules),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/{schedule_id}")
|
||||||
|
async def get_recurring_schedule(
|
||||||
|
project_id: str,
|
||||||
|
schedule_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Get a specific recurring schedule.
|
||||||
|
"""
|
||||||
|
schedule = db.query(RecurringSchedule).filter_by(
|
||||||
|
id=schedule_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not schedule:
|
||||||
|
raise HTTPException(status_code=404, detail="Schedule not found")
|
||||||
|
|
||||||
|
# Get related location and unit info
|
||||||
|
location = db.query(MonitoringLocation).filter_by(id=schedule.location_id).first()
|
||||||
|
unit = None
|
||||||
|
if schedule.unit_id:
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=schedule.unit_id).first()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"id": schedule.id,
|
||||||
|
"name": schedule.name,
|
||||||
|
"schedule_type": schedule.schedule_type,
|
||||||
|
"device_type": schedule.device_type,
|
||||||
|
"location_id": schedule.location_id,
|
||||||
|
"location_name": location.name if location else None,
|
||||||
|
"unit_id": schedule.unit_id,
|
||||||
|
"unit_name": unit.id if unit else None,
|
||||||
|
"enabled": schedule.enabled,
|
||||||
|
"weekly_pattern": json.loads(schedule.weekly_pattern) if schedule.weekly_pattern else None,
|
||||||
|
"interval_type": schedule.interval_type,
|
||||||
|
"cycle_time": schedule.cycle_time,
|
||||||
|
"include_download": schedule.include_download,
|
||||||
|
"timezone": schedule.timezone,
|
||||||
|
"next_occurrence": schedule.next_occurrence.isoformat() if schedule.next_occurrence else None,
|
||||||
|
"last_generated_at": schedule.last_generated_at.isoformat() if schedule.last_generated_at else None,
|
||||||
|
"created_at": schedule.created_at.isoformat() if schedule.created_at else None,
|
||||||
|
"updated_at": schedule.updated_at.isoformat() if schedule.updated_at else None,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Create
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.post("/")
|
||||||
|
async def create_recurring_schedule(
|
||||||
|
project_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Create recurring schedules for one or more locations.
|
||||||
|
|
||||||
|
Body for weekly_calendar (supports multiple locations):
|
||||||
|
{
|
||||||
|
"name": "Weeknight Monitoring",
|
||||||
|
"schedule_type": "weekly_calendar",
|
||||||
|
"location_ids": ["uuid1", "uuid2"], // Array of location IDs
|
||||||
|
"weekly_pattern": {
|
||||||
|
"monday": {"enabled": true, "start": "19:00", "end": "07:00"},
|
||||||
|
"tuesday": {"enabled": false},
|
||||||
|
...
|
||||||
|
},
|
||||||
|
"include_download": true,
|
||||||
|
"auto_increment_index": true,
|
||||||
|
"timezone": "America/New_York"
|
||||||
|
}
|
||||||
|
|
||||||
|
Body for simple_interval (supports multiple locations):
|
||||||
|
{
|
||||||
|
"name": "24/7 Continuous",
|
||||||
|
"schedule_type": "simple_interval",
|
||||||
|
"location_ids": ["uuid1", "uuid2"], // Array of location IDs
|
||||||
|
"interval_type": "daily",
|
||||||
|
"cycle_time": "00:00",
|
||||||
|
"include_download": true,
|
||||||
|
"auto_increment_index": true,
|
||||||
|
"timezone": "America/New_York"
|
||||||
|
}
|
||||||
|
|
||||||
|
Legacy single location support (backwards compatible):
|
||||||
|
{
|
||||||
|
"name": "...",
|
||||||
|
"location_id": "uuid", // Single location ID
|
||||||
|
...
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
project = db.query(Project).filter_by(id=project_id).first()
|
||||||
|
if not project:
|
||||||
|
raise HTTPException(status_code=404, detail="Project not found")
|
||||||
|
|
||||||
|
data = await request.json()
|
||||||
|
|
||||||
|
# Support both location_ids (array) and location_id (single) for backwards compatibility
|
||||||
|
location_ids = data.get("location_ids", [])
|
||||||
|
if not location_ids and data.get("location_id"):
|
||||||
|
location_ids = [data.get("location_id")]
|
||||||
|
|
||||||
|
if not location_ids:
|
||||||
|
raise HTTPException(status_code=400, detail="At least one location is required")
|
||||||
|
|
||||||
|
# Validate all locations exist
|
||||||
|
locations = db.query(MonitoringLocation).filter(
|
||||||
|
MonitoringLocation.id.in_(location_ids),
|
||||||
|
MonitoringLocation.project_id == project_id,
|
||||||
|
).all()
|
||||||
|
|
||||||
|
if len(locations) != len(location_ids):
|
||||||
|
raise HTTPException(status_code=404, detail="One or more locations not found")
|
||||||
|
|
||||||
|
service = get_recurring_schedule_service(db)
|
||||||
|
created_schedules = []
|
||||||
|
base_name = data.get("name", "Unnamed Schedule")
|
||||||
|
|
||||||
|
# Create a schedule for each location
|
||||||
|
for location in locations:
|
||||||
|
# Determine device type from location
|
||||||
|
device_type = "slm" if location.location_type == "sound" else "seismograph"
|
||||||
|
|
||||||
|
# Append location name if multiple locations
|
||||||
|
schedule_name = f"{base_name} - {location.name}" if len(locations) > 1 else base_name
|
||||||
|
|
||||||
|
schedule = service.create_schedule(
|
||||||
|
project_id=project_id,
|
||||||
|
location_id=location.id,
|
||||||
|
name=schedule_name,
|
||||||
|
schedule_type=data.get("schedule_type", "weekly_calendar"),
|
||||||
|
device_type=device_type,
|
||||||
|
unit_id=data.get("unit_id"),
|
||||||
|
weekly_pattern=data.get("weekly_pattern"),
|
||||||
|
interval_type=data.get("interval_type"),
|
||||||
|
cycle_time=data.get("cycle_time"),
|
||||||
|
include_download=data.get("include_download", True),
|
||||||
|
auto_increment_index=data.get("auto_increment_index", True),
|
||||||
|
timezone=data.get("timezone", "America/New_York"),
|
||||||
|
)
|
||||||
|
|
||||||
|
# Generate actions immediately so they appear right away
|
||||||
|
generated_actions = service.generate_actions_for_schedule(schedule, horizon_days=7)
|
||||||
|
|
||||||
|
created_schedules.append({
|
||||||
|
"schedule_id": schedule.id,
|
||||||
|
"location_id": location.id,
|
||||||
|
"location_name": location.name,
|
||||||
|
"actions_generated": len(generated_actions),
|
||||||
|
})
|
||||||
|
|
||||||
|
total_actions = sum(s.get("actions_generated", 0) for s in created_schedules)
|
||||||
|
|
||||||
|
return JSONResponse({
|
||||||
|
"success": True,
|
||||||
|
"schedules": created_schedules,
|
||||||
|
"count": len(created_schedules),
|
||||||
|
"actions_generated": total_actions,
|
||||||
|
"message": f"Created {len(created_schedules)} recurring schedule(s) with {total_actions} upcoming actions",
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Update
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.put("/{schedule_id}")
|
||||||
|
async def update_recurring_schedule(
|
||||||
|
project_id: str,
|
||||||
|
schedule_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Update a recurring schedule.
|
||||||
|
"""
|
||||||
|
schedule = db.query(RecurringSchedule).filter_by(
|
||||||
|
id=schedule_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not schedule:
|
||||||
|
raise HTTPException(status_code=404, detail="Schedule not found")
|
||||||
|
|
||||||
|
data = await request.json()
|
||||||
|
service = get_recurring_schedule_service(db)
|
||||||
|
|
||||||
|
# Build update kwargs
|
||||||
|
update_kwargs = {}
|
||||||
|
for field in ["name", "weekly_pattern", "interval_type", "cycle_time",
|
||||||
|
"include_download", "auto_increment_index", "timezone", "unit_id"]:
|
||||||
|
if field in data:
|
||||||
|
update_kwargs[field] = data[field]
|
||||||
|
|
||||||
|
updated = service.update_schedule(schedule_id, **update_kwargs)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"schedule_id": updated.id,
|
||||||
|
"message": "Schedule updated successfully",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Delete
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.delete("/{schedule_id}")
|
||||||
|
async def delete_recurring_schedule(
|
||||||
|
project_id: str,
|
||||||
|
schedule_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Delete a recurring schedule.
|
||||||
|
"""
|
||||||
|
service = get_recurring_schedule_service(db)
|
||||||
|
deleted = service.delete_schedule(schedule_id)
|
||||||
|
|
||||||
|
if not deleted:
|
||||||
|
raise HTTPException(status_code=404, detail="Schedule not found")
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"message": "Schedule deleted successfully",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Enable/Disable
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.post("/{schedule_id}/enable")
|
||||||
|
async def enable_schedule(
|
||||||
|
project_id: str,
|
||||||
|
schedule_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Enable a disabled schedule.
|
||||||
|
"""
|
||||||
|
service = get_recurring_schedule_service(db)
|
||||||
|
schedule = service.enable_schedule(schedule_id)
|
||||||
|
|
||||||
|
if not schedule:
|
||||||
|
raise HTTPException(status_code=404, detail="Schedule not found")
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"schedule_id": schedule.id,
|
||||||
|
"enabled": schedule.enabled,
|
||||||
|
"message": "Schedule enabled",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/{schedule_id}/disable")
|
||||||
|
async def disable_schedule(
|
||||||
|
project_id: str,
|
||||||
|
schedule_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Disable a schedule.
|
||||||
|
"""
|
||||||
|
service = get_recurring_schedule_service(db)
|
||||||
|
schedule = service.disable_schedule(schedule_id)
|
||||||
|
|
||||||
|
if not schedule:
|
||||||
|
raise HTTPException(status_code=404, detail="Schedule not found")
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"schedule_id": schedule.id,
|
||||||
|
"enabled": schedule.enabled,
|
||||||
|
"message": "Schedule disabled",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Preview Generated Actions
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.post("/{schedule_id}/generate-preview")
|
||||||
|
async def preview_generated_actions(
|
||||||
|
project_id: str,
|
||||||
|
schedule_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
days: int = Query(7, ge=1, le=30),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Preview what actions would be generated without saving them.
|
||||||
|
"""
|
||||||
|
schedule = db.query(RecurringSchedule).filter_by(
|
||||||
|
id=schedule_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not schedule:
|
||||||
|
raise HTTPException(status_code=404, detail="Schedule not found")
|
||||||
|
|
||||||
|
service = get_recurring_schedule_service(db)
|
||||||
|
actions = service.generate_actions_for_schedule(
|
||||||
|
schedule,
|
||||||
|
horizon_days=days,
|
||||||
|
preview_only=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"schedule_id": schedule_id,
|
||||||
|
"schedule_name": schedule.name,
|
||||||
|
"preview_days": days,
|
||||||
|
"actions": [
|
||||||
|
{
|
||||||
|
"action_type": a.action_type,
|
||||||
|
"scheduled_time": a.scheduled_time.isoformat(),
|
||||||
|
"notes": a.notes,
|
||||||
|
}
|
||||||
|
for a in actions
|
||||||
|
],
|
||||||
|
"action_count": len(actions),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Manual Generation Trigger
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.post("/{schedule_id}/generate")
|
||||||
|
async def generate_actions_now(
|
||||||
|
project_id: str,
|
||||||
|
schedule_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
days: int = Query(7, ge=1, le=30),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Manually trigger action generation for a schedule.
|
||||||
|
"""
|
||||||
|
schedule = db.query(RecurringSchedule).filter_by(
|
||||||
|
id=schedule_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not schedule:
|
||||||
|
raise HTTPException(status_code=404, detail="Schedule not found")
|
||||||
|
|
||||||
|
if not schedule.enabled:
|
||||||
|
raise HTTPException(status_code=400, detail="Schedule is disabled")
|
||||||
|
|
||||||
|
service = get_recurring_schedule_service(db)
|
||||||
|
actions = service.generate_actions_for_schedule(
|
||||||
|
schedule,
|
||||||
|
horizon_days=days,
|
||||||
|
preview_only=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"schedule_id": schedule_id,
|
||||||
|
"generated_count": len(actions),
|
||||||
|
"message": f"Generated {len(actions)} scheduled actions",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# HTML Partials
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/partials/list", response_class=HTMLResponse)
|
||||||
|
async def get_schedule_list_partial(
|
||||||
|
project_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Return HTML partial for schedule list.
|
||||||
|
"""
|
||||||
|
schedules = db.query(RecurringSchedule).filter_by(
|
||||||
|
project_id=project_id
|
||||||
|
).order_by(RecurringSchedule.created_at.desc()).all()
|
||||||
|
|
||||||
|
# Enrich with location info
|
||||||
|
schedule_data = []
|
||||||
|
for s in schedules:
|
||||||
|
location = db.query(MonitoringLocation).filter_by(id=s.location_id).first()
|
||||||
|
schedule_data.append({
|
||||||
|
"schedule": s,
|
||||||
|
"location": location,
|
||||||
|
"pattern": json.loads(s.weekly_pattern) if s.weekly_pattern else None,
|
||||||
|
})
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/projects/recurring_schedule_list.html", {
|
||||||
|
"request": request,
|
||||||
|
"project_id": project_id,
|
||||||
|
"schedules": schedule_data,
|
||||||
|
})
|
||||||
187
backend/routers/report_templates.py
Normal file
@@ -0,0 +1,187 @@
|
|||||||
|
"""
|
||||||
|
Report Templates Router
|
||||||
|
|
||||||
|
CRUD operations for report template management.
|
||||||
|
Templates store time filter presets and report configuration for reuse.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Depends, HTTPException
|
||||||
|
from fastapi.responses import JSONResponse
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Optional
|
||||||
|
import uuid
|
||||||
|
|
||||||
|
from backend.database import get_db
|
||||||
|
from backend.models import ReportTemplate
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/report-templates", tags=["report-templates"])
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("")
|
||||||
|
async def list_templates(
|
||||||
|
project_id: Optional[str] = None,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
List all report templates.
|
||||||
|
Optionally filter by project_id (includes global templates with project_id=None).
|
||||||
|
"""
|
||||||
|
query = db.query(ReportTemplate)
|
||||||
|
|
||||||
|
if project_id:
|
||||||
|
# Include global templates (project_id=None) AND project-specific templates
|
||||||
|
query = query.filter(
|
||||||
|
(ReportTemplate.project_id == None) | (ReportTemplate.project_id == project_id)
|
||||||
|
)
|
||||||
|
|
||||||
|
templates = query.order_by(ReportTemplate.name).all()
|
||||||
|
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
"id": t.id,
|
||||||
|
"name": t.name,
|
||||||
|
"project_id": t.project_id,
|
||||||
|
"report_title": t.report_title,
|
||||||
|
"start_time": t.start_time,
|
||||||
|
"end_time": t.end_time,
|
||||||
|
"start_date": t.start_date,
|
||||||
|
"end_date": t.end_date,
|
||||||
|
"created_at": t.created_at.isoformat() if t.created_at else None,
|
||||||
|
"updated_at": t.updated_at.isoformat() if t.updated_at else None,
|
||||||
|
}
|
||||||
|
for t in templates
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("")
|
||||||
|
async def create_template(
|
||||||
|
data: dict,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Create a new report template.
|
||||||
|
|
||||||
|
Request body:
|
||||||
|
- name: Template name (required)
|
||||||
|
- project_id: Optional project ID for project-specific template
|
||||||
|
- report_title: Default report title
|
||||||
|
- start_time: Start time filter (HH:MM format)
|
||||||
|
- end_time: End time filter (HH:MM format)
|
||||||
|
- start_date: Start date filter (YYYY-MM-DD format)
|
||||||
|
- end_date: End date filter (YYYY-MM-DD format)
|
||||||
|
"""
|
||||||
|
name = data.get("name")
|
||||||
|
if not name:
|
||||||
|
raise HTTPException(status_code=400, detail="Template name is required")
|
||||||
|
|
||||||
|
template = ReportTemplate(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
name=name,
|
||||||
|
project_id=data.get("project_id"),
|
||||||
|
report_title=data.get("report_title", "Background Noise Study"),
|
||||||
|
start_time=data.get("start_time"),
|
||||||
|
end_time=data.get("end_time"),
|
||||||
|
start_date=data.get("start_date"),
|
||||||
|
end_date=data.get("end_date"),
|
||||||
|
)
|
||||||
|
|
||||||
|
db.add(template)
|
||||||
|
db.commit()
|
||||||
|
db.refresh(template)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"id": template.id,
|
||||||
|
"name": template.name,
|
||||||
|
"project_id": template.project_id,
|
||||||
|
"report_title": template.report_title,
|
||||||
|
"start_time": template.start_time,
|
||||||
|
"end_time": template.end_time,
|
||||||
|
"start_date": template.start_date,
|
||||||
|
"end_date": template.end_date,
|
||||||
|
"created_at": template.created_at.isoformat() if template.created_at else None,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/{template_id}")
|
||||||
|
async def get_template(
|
||||||
|
template_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""Get a specific report template by ID."""
|
||||||
|
template = db.query(ReportTemplate).filter_by(id=template_id).first()
|
||||||
|
if not template:
|
||||||
|
raise HTTPException(status_code=404, detail="Template not found")
|
||||||
|
|
||||||
|
return {
|
||||||
|
"id": template.id,
|
||||||
|
"name": template.name,
|
||||||
|
"project_id": template.project_id,
|
||||||
|
"report_title": template.report_title,
|
||||||
|
"start_time": template.start_time,
|
||||||
|
"end_time": template.end_time,
|
||||||
|
"start_date": template.start_date,
|
||||||
|
"end_date": template.end_date,
|
||||||
|
"created_at": template.created_at.isoformat() if template.created_at else None,
|
||||||
|
"updated_at": template.updated_at.isoformat() if template.updated_at else None,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.put("/{template_id}")
|
||||||
|
async def update_template(
|
||||||
|
template_id: str,
|
||||||
|
data: dict,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""Update an existing report template."""
|
||||||
|
template = db.query(ReportTemplate).filter_by(id=template_id).first()
|
||||||
|
if not template:
|
||||||
|
raise HTTPException(status_code=404, detail="Template not found")
|
||||||
|
|
||||||
|
# Update fields if provided
|
||||||
|
if "name" in data:
|
||||||
|
template.name = data["name"]
|
||||||
|
if "project_id" in data:
|
||||||
|
template.project_id = data["project_id"]
|
||||||
|
if "report_title" in data:
|
||||||
|
template.report_title = data["report_title"]
|
||||||
|
if "start_time" in data:
|
||||||
|
template.start_time = data["start_time"]
|
||||||
|
if "end_time" in data:
|
||||||
|
template.end_time = data["end_time"]
|
||||||
|
if "start_date" in data:
|
||||||
|
template.start_date = data["start_date"]
|
||||||
|
if "end_date" in data:
|
||||||
|
template.end_date = data["end_date"]
|
||||||
|
|
||||||
|
template.updated_at = datetime.utcnow()
|
||||||
|
db.commit()
|
||||||
|
db.refresh(template)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"id": template.id,
|
||||||
|
"name": template.name,
|
||||||
|
"project_id": template.project_id,
|
||||||
|
"report_title": template.report_title,
|
||||||
|
"start_time": template.start_time,
|
||||||
|
"end_time": template.end_time,
|
||||||
|
"start_date": template.start_date,
|
||||||
|
"end_date": template.end_date,
|
||||||
|
"updated_at": template.updated_at.isoformat() if template.updated_at else None,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/{template_id}")
|
||||||
|
async def delete_template(
|
||||||
|
template_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""Delete a report template."""
|
||||||
|
template = db.query(ReportTemplate).filter_by(id=template_id).first()
|
||||||
|
if not template:
|
||||||
|
raise HTTPException(status_code=404, detail="Template not found")
|
||||||
|
|
||||||
|
db.delete(template)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return JSONResponse({"status": "success", "message": "Template deleted"})
|
||||||
@@ -2,20 +2,32 @@ from fastapi import APIRouter, Depends
|
|||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from typing import Dict, Any
|
from typing import Dict, Any
|
||||||
|
import asyncio
|
||||||
|
import logging
|
||||||
import random
|
import random
|
||||||
|
|
||||||
from backend.database import get_db
|
from backend.database import get_db
|
||||||
from backend.services.snapshot import emit_status_snapshot
|
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"])
|
router = APIRouter(prefix="/api", tags=["roster"])
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/status-snapshot")
|
@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.
|
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()
|
return emit_status_snapshot()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
139
backend/routers/roster_rename.py
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
"""
|
||||||
|
Roster Unit Rename Router
|
||||||
|
|
||||||
|
Provides endpoint for safely renaming unit IDs across all database tables.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Depends, HTTPException, Form
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from datetime import datetime
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from backend.database import get_db
|
||||||
|
from backend.models import RosterUnit, Emitter, UnitHistory
|
||||||
|
from backend.routers.roster_edit import record_history, sync_slm_to_slmm_cache
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/roster", tags=["roster-rename"])
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/rename")
|
||||||
|
async def rename_unit(
|
||||||
|
old_id: str = Form(...),
|
||||||
|
new_id: str = Form(...),
|
||||||
|
db: Session = Depends(get_db)
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Rename a unit ID across all tables.
|
||||||
|
Updates the unit ID in roster, emitters, unit_history, and all foreign key references.
|
||||||
|
|
||||||
|
IMPORTANT: This operation updates the primary key, which affects all relationships.
|
||||||
|
"""
|
||||||
|
# Validate input
|
||||||
|
if not old_id or not new_id:
|
||||||
|
raise HTTPException(status_code=400, detail="Both old_id and new_id are required")
|
||||||
|
|
||||||
|
if old_id == new_id:
|
||||||
|
raise HTTPException(status_code=400, detail="New ID must be different from old ID")
|
||||||
|
|
||||||
|
# Check if old unit exists
|
||||||
|
old_unit = db.query(RosterUnit).filter(RosterUnit.id == old_id).first()
|
||||||
|
if not old_unit:
|
||||||
|
raise HTTPException(status_code=404, detail=f"Unit '{old_id}' not found")
|
||||||
|
|
||||||
|
# Check if new ID already exists
|
||||||
|
existing_unit = db.query(RosterUnit).filter(RosterUnit.id == new_id).first()
|
||||||
|
if existing_unit:
|
||||||
|
raise HTTPException(status_code=409, detail=f"Unit ID '{new_id}' already exists")
|
||||||
|
|
||||||
|
device_type = old_unit.device_type
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Record history for the rename operation (using old_id since that's still valid)
|
||||||
|
record_history(
|
||||||
|
db=db,
|
||||||
|
unit_id=old_id,
|
||||||
|
change_type="id_change",
|
||||||
|
field_name="id",
|
||||||
|
old_value=old_id,
|
||||||
|
new_value=new_id,
|
||||||
|
source="manual",
|
||||||
|
notes=f"Unit renamed from '{old_id}' to '{new_id}'"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Update roster table (primary)
|
||||||
|
old_unit.id = new_id
|
||||||
|
old_unit.last_updated = datetime.utcnow()
|
||||||
|
|
||||||
|
# Update emitters table
|
||||||
|
emitter = db.query(Emitter).filter(Emitter.id == old_id).first()
|
||||||
|
if emitter:
|
||||||
|
emitter.id = new_id
|
||||||
|
|
||||||
|
# Update unit_history table (all entries for this unit)
|
||||||
|
db.query(UnitHistory).filter(UnitHistory.unit_id == old_id).update(
|
||||||
|
{"unit_id": new_id},
|
||||||
|
synchronize_session=False
|
||||||
|
)
|
||||||
|
|
||||||
|
# Update deployed_with_modem_id references (units that reference this as modem)
|
||||||
|
db.query(RosterUnit).filter(RosterUnit.deployed_with_modem_id == old_id).update(
|
||||||
|
{"deployed_with_modem_id": new_id},
|
||||||
|
synchronize_session=False
|
||||||
|
)
|
||||||
|
|
||||||
|
# Update unit_assignments table (if exists)
|
||||||
|
try:
|
||||||
|
from backend.models import UnitAssignment
|
||||||
|
db.query(UnitAssignment).filter(UnitAssignment.unit_id == old_id).update(
|
||||||
|
{"unit_id": new_id},
|
||||||
|
synchronize_session=False
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Could not update unit_assignments: {e}")
|
||||||
|
|
||||||
|
# Update recording_sessions table (if exists)
|
||||||
|
try:
|
||||||
|
from backend.models import RecordingSession
|
||||||
|
db.query(RecordingSession).filter(RecordingSession.unit_id == old_id).update(
|
||||||
|
{"unit_id": new_id},
|
||||||
|
synchronize_session=False
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Could not update recording_sessions: {e}")
|
||||||
|
|
||||||
|
# Commit all changes
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
# If sound level meter, sync updated config to SLMM cache
|
||||||
|
if device_type == "slm":
|
||||||
|
logger.info(f"Syncing renamed SLM {new_id} (was {old_id}) config to SLMM cache...")
|
||||||
|
result = await sync_slm_to_slmm_cache(
|
||||||
|
unit_id=new_id,
|
||||||
|
host=old_unit.slm_host,
|
||||||
|
tcp_port=old_unit.slm_tcp_port,
|
||||||
|
ftp_port=old_unit.slm_ftp_port,
|
||||||
|
deployed_with_modem_id=old_unit.deployed_with_modem_id,
|
||||||
|
db=db
|
||||||
|
)
|
||||||
|
|
||||||
|
if not result["success"]:
|
||||||
|
logger.warning(f"SLMM cache sync warning for renamed unit {new_id}: {result['message']}")
|
||||||
|
|
||||||
|
logger.info(f"Successfully renamed unit '{old_id}' to '{new_id}'")
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"message": f"Successfully renamed unit from '{old_id}' to '{new_id}'",
|
||||||
|
"old_id": old_id,
|
||||||
|
"new_id": new_id,
|
||||||
|
"device_type": device_type
|
||||||
|
}
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
db.rollback()
|
||||||
|
logger.error(f"Error renaming unit '{old_id}' to '{new_id}': {e}")
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=500,
|
||||||
|
detail=f"Failed to rename unit: {str(e)}"
|
||||||
|
)
|
||||||
408
backend/routers/scheduler.py
Normal file
@@ -0,0 +1,408 @@
|
|||||||
|
"""
|
||||||
|
Scheduler Router
|
||||||
|
|
||||||
|
Handles scheduled actions for automated recording control.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Request, Depends, HTTPException, Query
|
||||||
|
from fastapi.responses import HTMLResponse, JSONResponse
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from sqlalchemy import and_, or_
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
from typing import Optional
|
||||||
|
import uuid
|
||||||
|
import json
|
||||||
|
|
||||||
|
from backend.database import get_db
|
||||||
|
from backend.models import (
|
||||||
|
Project,
|
||||||
|
ScheduledAction,
|
||||||
|
MonitoringLocation,
|
||||||
|
UnitAssignment,
|
||||||
|
RosterUnit,
|
||||||
|
)
|
||||||
|
from backend.services.scheduler import get_scheduler
|
||||||
|
from backend.templates_config import templates
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/projects/{project_id}/scheduler", tags=["scheduler"])
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Scheduled Actions List
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/actions", response_class=HTMLResponse)
|
||||||
|
async def get_scheduled_actions(
|
||||||
|
project_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
status: Optional[str] = Query(None),
|
||||||
|
start_date: Optional[str] = Query(None),
|
||||||
|
end_date: Optional[str] = Query(None),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Get scheduled actions for a project.
|
||||||
|
Returns HTML partial with agenda/calendar view.
|
||||||
|
"""
|
||||||
|
query = db.query(ScheduledAction).filter_by(project_id=project_id)
|
||||||
|
|
||||||
|
# Filter by status
|
||||||
|
if status:
|
||||||
|
query = query.filter_by(execution_status=status)
|
||||||
|
else:
|
||||||
|
# By default, show pending and upcoming completed/failed
|
||||||
|
query = query.filter(
|
||||||
|
or_(
|
||||||
|
ScheduledAction.execution_status == "pending",
|
||||||
|
and_(
|
||||||
|
ScheduledAction.execution_status.in_(["completed", "failed"]),
|
||||||
|
ScheduledAction.scheduled_time >= datetime.utcnow() - timedelta(days=7),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Filter by date range
|
||||||
|
if start_date:
|
||||||
|
query = query.filter(ScheduledAction.scheduled_time >= datetime.fromisoformat(start_date))
|
||||||
|
if end_date:
|
||||||
|
query = query.filter(ScheduledAction.scheduled_time <= datetime.fromisoformat(end_date))
|
||||||
|
|
||||||
|
actions = query.order_by(ScheduledAction.scheduled_time).all()
|
||||||
|
|
||||||
|
# Enrich with location and unit details
|
||||||
|
actions_data = []
|
||||||
|
for action in actions:
|
||||||
|
location = db.query(MonitoringLocation).filter_by(id=action.location_id).first()
|
||||||
|
|
||||||
|
unit = None
|
||||||
|
if action.unit_id:
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=action.unit_id).first()
|
||||||
|
else:
|
||||||
|
# Get from assignment
|
||||||
|
assignment = db.query(UnitAssignment).filter(
|
||||||
|
and_(
|
||||||
|
UnitAssignment.location_id == action.location_id,
|
||||||
|
UnitAssignment.status == "active",
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
if assignment:
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=assignment.unit_id).first()
|
||||||
|
|
||||||
|
actions_data.append({
|
||||||
|
"action": action,
|
||||||
|
"location": location,
|
||||||
|
"unit": unit,
|
||||||
|
})
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/projects/scheduler_agenda.html", {
|
||||||
|
"request": request,
|
||||||
|
"project_id": project_id,
|
||||||
|
"actions": actions_data,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Create Scheduled Action
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.post("/actions/create")
|
||||||
|
async def create_scheduled_action(
|
||||||
|
project_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Create a new scheduled action.
|
||||||
|
"""
|
||||||
|
project = db.query(Project).filter_by(id=project_id).first()
|
||||||
|
if not project:
|
||||||
|
raise HTTPException(status_code=404, detail="Project not found")
|
||||||
|
|
||||||
|
form_data = await request.form()
|
||||||
|
|
||||||
|
location_id = form_data.get("location_id")
|
||||||
|
location = db.query(MonitoringLocation).filter_by(
|
||||||
|
id=location_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not location:
|
||||||
|
raise HTTPException(status_code=404, detail="Location not found")
|
||||||
|
|
||||||
|
# Determine device type from location
|
||||||
|
device_type = "slm" if location.location_type == "sound" else "seismograph"
|
||||||
|
|
||||||
|
# Get unit_id (optional - can be determined from assignment at execution time)
|
||||||
|
unit_id = form_data.get("unit_id")
|
||||||
|
|
||||||
|
action = ScheduledAction(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=project_id,
|
||||||
|
location_id=location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
action_type=form_data.get("action_type"),
|
||||||
|
device_type=device_type,
|
||||||
|
scheduled_time=datetime.fromisoformat(form_data.get("scheduled_time")),
|
||||||
|
execution_status="pending",
|
||||||
|
notes=form_data.get("notes"),
|
||||||
|
)
|
||||||
|
|
||||||
|
db.add(action)
|
||||||
|
db.commit()
|
||||||
|
db.refresh(action)
|
||||||
|
|
||||||
|
return JSONResponse({
|
||||||
|
"success": True,
|
||||||
|
"action_id": action.id,
|
||||||
|
"message": f"Scheduled action '{action.action_type}' created for {action.scheduled_time}",
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Schedule Recording Session
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.post("/schedule-session")
|
||||||
|
async def schedule_recording_session(
|
||||||
|
project_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Schedule a complete recording session (start + stop).
|
||||||
|
Creates two scheduled actions: start and stop.
|
||||||
|
"""
|
||||||
|
project = db.query(Project).filter_by(id=project_id).first()
|
||||||
|
if not project:
|
||||||
|
raise HTTPException(status_code=404, detail="Project not found")
|
||||||
|
|
||||||
|
form_data = await request.form()
|
||||||
|
|
||||||
|
location_id = form_data.get("location_id")
|
||||||
|
location = db.query(MonitoringLocation).filter_by(
|
||||||
|
id=location_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not location:
|
||||||
|
raise HTTPException(status_code=404, detail="Location not found")
|
||||||
|
|
||||||
|
device_type = "slm" if location.location_type == "sound" else "seismograph"
|
||||||
|
unit_id = form_data.get("unit_id")
|
||||||
|
|
||||||
|
start_time = datetime.fromisoformat(form_data.get("start_time"))
|
||||||
|
duration_minutes = int(form_data.get("duration_minutes", 60))
|
||||||
|
stop_time = start_time + timedelta(minutes=duration_minutes)
|
||||||
|
|
||||||
|
# Create START action
|
||||||
|
start_action = ScheduledAction(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=project_id,
|
||||||
|
location_id=location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
action_type="start",
|
||||||
|
device_type=device_type,
|
||||||
|
scheduled_time=start_time,
|
||||||
|
execution_status="pending",
|
||||||
|
notes=form_data.get("notes"),
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create STOP action
|
||||||
|
stop_action = ScheduledAction(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=project_id,
|
||||||
|
location_id=location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
action_type="stop",
|
||||||
|
device_type=device_type,
|
||||||
|
scheduled_time=stop_time,
|
||||||
|
execution_status="pending",
|
||||||
|
notes=f"Auto-stop after {duration_minutes} minutes",
|
||||||
|
)
|
||||||
|
|
||||||
|
db.add(start_action)
|
||||||
|
db.add(stop_action)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return JSONResponse({
|
||||||
|
"success": True,
|
||||||
|
"start_action_id": start_action.id,
|
||||||
|
"stop_action_id": stop_action.id,
|
||||||
|
"message": f"Recording session scheduled from {start_time} to {stop_time}",
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Update/Cancel Scheduled Action
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.put("/actions/{action_id}")
|
||||||
|
async def update_scheduled_action(
|
||||||
|
project_id: str,
|
||||||
|
action_id: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Update a scheduled action (only if not yet executed).
|
||||||
|
"""
|
||||||
|
action = db.query(ScheduledAction).filter_by(
|
||||||
|
id=action_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not action:
|
||||||
|
raise HTTPException(status_code=404, detail="Action not found")
|
||||||
|
|
||||||
|
if action.execution_status != "pending":
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail="Cannot update action that has already been executed",
|
||||||
|
)
|
||||||
|
|
||||||
|
data = await request.json()
|
||||||
|
|
||||||
|
if "scheduled_time" in data:
|
||||||
|
action.scheduled_time = datetime.fromisoformat(data["scheduled_time"])
|
||||||
|
if "notes" in data:
|
||||||
|
action.notes = data["notes"]
|
||||||
|
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return {"success": True, "message": "Action updated successfully"}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/actions/{action_id}/cancel")
|
||||||
|
async def cancel_scheduled_action(
|
||||||
|
project_id: str,
|
||||||
|
action_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Cancel a pending scheduled action.
|
||||||
|
"""
|
||||||
|
action = db.query(ScheduledAction).filter_by(
|
||||||
|
id=action_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not action:
|
||||||
|
raise HTTPException(status_code=404, detail="Action not found")
|
||||||
|
|
||||||
|
if action.execution_status != "pending":
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail="Can only cancel pending actions",
|
||||||
|
)
|
||||||
|
|
||||||
|
action.execution_status = "cancelled"
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return {"success": True, "message": "Action cancelled successfully"}
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/actions/{action_id}")
|
||||||
|
async def delete_scheduled_action(
|
||||||
|
project_id: str,
|
||||||
|
action_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Delete a scheduled action (only if pending or cancelled).
|
||||||
|
"""
|
||||||
|
action = db.query(ScheduledAction).filter_by(
|
||||||
|
id=action_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not action:
|
||||||
|
raise HTTPException(status_code=404, detail="Action not found")
|
||||||
|
|
||||||
|
if action.execution_status not in ["pending", "cancelled"]:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail="Cannot delete action that has been executed",
|
||||||
|
)
|
||||||
|
|
||||||
|
db.delete(action)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return {"success": True, "message": "Action deleted successfully"}
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Manual Execution
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.post("/actions/{action_id}/execute")
|
||||||
|
async def execute_action_now(
|
||||||
|
project_id: str,
|
||||||
|
action_id: str,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Manually trigger execution of a scheduled action (for testing/debugging).
|
||||||
|
"""
|
||||||
|
action = db.query(ScheduledAction).filter_by(
|
||||||
|
id=action_id,
|
||||||
|
project_id=project_id,
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not action:
|
||||||
|
raise HTTPException(status_code=404, detail="Action not found")
|
||||||
|
|
||||||
|
if action.execution_status != "pending":
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail="Action is not pending",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Execute via scheduler service
|
||||||
|
scheduler = get_scheduler()
|
||||||
|
result = await scheduler.execute_action_by_id(action_id)
|
||||||
|
|
||||||
|
# Refresh from DB to get updated status
|
||||||
|
db.refresh(action)
|
||||||
|
|
||||||
|
return JSONResponse({
|
||||||
|
"success": result.get("success", False),
|
||||||
|
"result": result,
|
||||||
|
"action": {
|
||||||
|
"id": action.id,
|
||||||
|
"execution_status": action.execution_status,
|
||||||
|
"executed_at": action.executed_at.isoformat() if action.executed_at else None,
|
||||||
|
"error_message": action.error_message,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# Scheduler Status
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.get("/status")
|
||||||
|
async def get_scheduler_status():
|
||||||
|
"""
|
||||||
|
Get scheduler service status.
|
||||||
|
"""
|
||||||
|
scheduler = get_scheduler()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"running": scheduler.running,
|
||||||
|
"check_interval": scheduler.check_interval,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/execute-pending")
|
||||||
|
async def trigger_pending_execution():
|
||||||
|
"""
|
||||||
|
Manually trigger execution of all pending actions (for testing).
|
||||||
|
"""
|
||||||
|
scheduler = get_scheduler()
|
||||||
|
results = await scheduler.execute_pending_actions()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"executed_count": len(results),
|
||||||
|
"results": results,
|
||||||
|
}
|
||||||
80
backend/routers/seismo_dashboard.py
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
"""
|
||||||
|
Seismograph Dashboard API Router
|
||||||
|
Provides endpoints for the seismograph-specific dashboard
|
||||||
|
"""
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Request, Depends, Query
|
||||||
|
from fastapi.responses import HTMLResponse
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from backend.database import get_db
|
||||||
|
from backend.models import RosterUnit
|
||||||
|
from backend.templates_config import templates
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/seismo-dashboard", tags=["seismo-dashboard"])
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/stats", response_class=HTMLResponse)
|
||||||
|
async def get_seismo_stats(request: Request, db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Returns HTML partial with seismograph statistics summary
|
||||||
|
"""
|
||||||
|
# Get all seismograph units
|
||||||
|
seismos = db.query(RosterUnit).filter_by(
|
||||||
|
device_type="seismograph",
|
||||||
|
retired=False
|
||||||
|
).all()
|
||||||
|
|
||||||
|
total = len(seismos)
|
||||||
|
deployed = sum(1 for s in seismos if s.deployed)
|
||||||
|
benched = sum(1 for s in seismos if not s.deployed)
|
||||||
|
|
||||||
|
# Count modems assigned to deployed seismographs
|
||||||
|
with_modem = sum(1 for s in seismos if s.deployed and s.deployed_with_modem_id)
|
||||||
|
without_modem = deployed - with_modem
|
||||||
|
|
||||||
|
return templates.TemplateResponse(
|
||||||
|
"partials/seismo_stats.html",
|
||||||
|
{
|
||||||
|
"request": request,
|
||||||
|
"total": total,
|
||||||
|
"deployed": deployed,
|
||||||
|
"benched": benched,
|
||||||
|
"with_modem": with_modem,
|
||||||
|
"without_modem": without_modem
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/units", response_class=HTMLResponse)
|
||||||
|
async def get_seismo_units(
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
search: str = Query(None)
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Returns HTML partial with filterable seismograph unit list
|
||||||
|
"""
|
||||||
|
query = db.query(RosterUnit).filter_by(
|
||||||
|
device_type="seismograph",
|
||||||
|
retired=False
|
||||||
|
)
|
||||||
|
|
||||||
|
# Apply search filter
|
||||||
|
if search:
|
||||||
|
search_lower = search.lower()
|
||||||
|
query = query.filter(
|
||||||
|
(RosterUnit.id.ilike(f"%{search}%")) |
|
||||||
|
(RosterUnit.note.ilike(f"%{search}%")) |
|
||||||
|
(RosterUnit.address.ilike(f"%{search}%"))
|
||||||
|
)
|
||||||
|
|
||||||
|
seismos = query.order_by(RosterUnit.id).all()
|
||||||
|
|
||||||
|
return templates.TemplateResponse(
|
||||||
|
"partials/seismo_unit_list.html",
|
||||||
|
{
|
||||||
|
"request": request,
|
||||||
|
"units": seismos,
|
||||||
|
"search": search or ""
|
||||||
|
}
|
||||||
|
)
|
||||||
@@ -477,3 +477,75 @@ async def upload_snapshot(file: UploadFile = File(...)):
|
|||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise HTTPException(status_code=500, detail=f"Upload failed: {str(e)}")
|
raise HTTPException(status_code=500, detail=f"Upload failed: {str(e)}")
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================================
|
||||||
|
# SLMM SYNC ENDPOINTS
|
||||||
|
# ============================================================================
|
||||||
|
|
||||||
|
@router.post("/slmm/sync-all")
|
||||||
|
async def sync_all_slms(db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Manually trigger full sync of all SLM devices from Terra-View roster to SLMM.
|
||||||
|
|
||||||
|
This ensures SLMM database matches Terra-View roster (source of truth).
|
||||||
|
Also cleans up orphaned devices in SLMM that are not in Terra-View.
|
||||||
|
"""
|
||||||
|
from backend.services.slmm_sync import sync_all_slms_to_slmm, cleanup_orphaned_slmm_devices
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Sync all SLMs
|
||||||
|
sync_results = await sync_all_slms_to_slmm(db)
|
||||||
|
|
||||||
|
# Clean up orphaned devices
|
||||||
|
cleanup_results = await cleanup_orphaned_slmm_devices(db)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"status": "ok",
|
||||||
|
"sync": sync_results,
|
||||||
|
"cleanup": cleanup_results
|
||||||
|
}
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
raise HTTPException(status_code=500, detail=f"Sync failed: {str(e)}")
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/slmm/status")
|
||||||
|
async def get_slmm_sync_status(db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Get status of SLMM synchronization.
|
||||||
|
|
||||||
|
Shows which devices are in Terra-View roster vs SLMM database.
|
||||||
|
"""
|
||||||
|
from backend.services.slmm_sync import get_slmm_devices
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Get devices from both systems
|
||||||
|
roster_slms = db.query(RosterUnit).filter_by(device_type="slm").all()
|
||||||
|
slmm_devices = await get_slmm_devices()
|
||||||
|
|
||||||
|
if slmm_devices is None:
|
||||||
|
raise HTTPException(status_code=503, detail="SLMM service unavailable")
|
||||||
|
|
||||||
|
roster_unit_ids = {unit.unit_type for unit in roster_slms}
|
||||||
|
slmm_unit_ids = set(slmm_devices)
|
||||||
|
|
||||||
|
# Find differences
|
||||||
|
in_roster_only = roster_unit_ids - slmm_unit_ids
|
||||||
|
in_slmm_only = slmm_unit_ids - roster_unit_ids
|
||||||
|
in_both = roster_unit_ids & slmm_unit_ids
|
||||||
|
|
||||||
|
return {
|
||||||
|
"status": "ok",
|
||||||
|
"terra_view_total": len(roster_unit_ids),
|
||||||
|
"slmm_total": len(slmm_unit_ids),
|
||||||
|
"synced": len(in_both),
|
||||||
|
"missing_from_slmm": list(in_roster_only),
|
||||||
|
"orphaned_in_slmm": list(in_slmm_only),
|
||||||
|
"in_sync": len(in_roster_only) == 0 and len(in_slmm_only) == 0
|
||||||
|
}
|
||||||
|
|
||||||
|
except HTTPException:
|
||||||
|
raise
|
||||||
|
except Exception as e:
|
||||||
|
raise HTTPException(status_code=500, detail=f"Status check failed: {str(e)}")
|
||||||
|
|||||||
363
backend/routers/slm_dashboard.py
Normal file
@@ -0,0 +1,363 @@
|
|||||||
|
"""
|
||||||
|
SLM Dashboard Router
|
||||||
|
|
||||||
|
Provides API endpoints for the Sound Level Meters dashboard page.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Request, Depends, Query
|
||||||
|
from fastapi.responses import HTMLResponse
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from sqlalchemy import func
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
import asyncio
|
||||||
|
import httpx
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
|
||||||
|
from backend.database import get_db
|
||||||
|
from backend.models import RosterUnit
|
||||||
|
from backend.routers.roster_edit import sync_slm_to_slmm_cache
|
||||||
|
from backend.templates_config import templates
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/slm-dashboard", tags=["slm-dashboard"])
|
||||||
|
|
||||||
|
# SLMM backend URL - configurable via environment variable
|
||||||
|
SLMM_BASE_URL = os.getenv("SLMM_BASE_URL", "http://localhost:8100")
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/stats", response_class=HTMLResponse)
|
||||||
|
async def get_slm_stats(request: Request, db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Get summary statistics for SLM dashboard.
|
||||||
|
Returns HTML partial with stat cards.
|
||||||
|
"""
|
||||||
|
# Query all SLMs
|
||||||
|
all_slms = db.query(RosterUnit).filter_by(device_type="slm").all()
|
||||||
|
|
||||||
|
# Count deployed vs benched
|
||||||
|
deployed_count = sum(1 for slm in all_slms if slm.deployed and not slm.retired)
|
||||||
|
benched_count = sum(1 for slm in all_slms if not slm.deployed and not slm.retired)
|
||||||
|
retired_count = sum(1 for slm in all_slms if slm.retired)
|
||||||
|
|
||||||
|
# Count recently active (checked in last hour)
|
||||||
|
one_hour_ago = datetime.utcnow() - timedelta(hours=1)
|
||||||
|
active_count = sum(1 for slm in all_slms
|
||||||
|
if slm.slm_last_check and slm.slm_last_check > one_hour_ago)
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/slm_stats.html", {
|
||||||
|
"request": request,
|
||||||
|
"total_count": len(all_slms),
|
||||||
|
"deployed_count": deployed_count,
|
||||||
|
"benched_count": benched_count,
|
||||||
|
"active_count": active_count,
|
||||||
|
"retired_count": retired_count
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/units", response_class=HTMLResponse)
|
||||||
|
async def get_slm_units(
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
search: str = Query(None),
|
||||||
|
project: str = Query(None),
|
||||||
|
include_measurement: bool = Query(False),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Get list of SLM units for the sidebar.
|
||||||
|
Returns HTML partial with unit cards.
|
||||||
|
"""
|
||||||
|
query = db.query(RosterUnit).filter_by(device_type="slm")
|
||||||
|
|
||||||
|
# Filter by project if provided
|
||||||
|
if project:
|
||||||
|
query = query.filter(RosterUnit.project_id == project)
|
||||||
|
|
||||||
|
# Filter by search term if provided
|
||||||
|
if search:
|
||||||
|
search_term = f"%{search}%"
|
||||||
|
query = query.filter(
|
||||||
|
(RosterUnit.id.like(search_term)) |
|
||||||
|
(RosterUnit.slm_model.like(search_term)) |
|
||||||
|
(RosterUnit.address.like(search_term))
|
||||||
|
)
|
||||||
|
|
||||||
|
units = query.order_by(
|
||||||
|
RosterUnit.retired.asc(),
|
||||||
|
RosterUnit.deployed.desc(),
|
||||||
|
RosterUnit.id.asc()
|
||||||
|
).all()
|
||||||
|
|
||||||
|
one_hour_ago = datetime.utcnow() - timedelta(hours=1)
|
||||||
|
for unit in units:
|
||||||
|
unit.is_recent = bool(unit.slm_last_check and unit.slm_last_check > one_hour_ago)
|
||||||
|
|
||||||
|
if include_measurement:
|
||||||
|
async def fetch_measurement_state(client: httpx.AsyncClient, unit_id: str) -> str | None:
|
||||||
|
try:
|
||||||
|
response = await client.get(f"{SLMM_BASE_URL}/api/nl43/{unit_id}/measurement-state")
|
||||||
|
if response.status_code == 200:
|
||||||
|
return response.json().get("measurement_state")
|
||||||
|
except Exception:
|
||||||
|
return None
|
||||||
|
return None
|
||||||
|
|
||||||
|
deployed_units = [unit for unit in units if unit.deployed and not unit.retired]
|
||||||
|
if deployed_units:
|
||||||
|
async with httpx.AsyncClient(timeout=3.0) as client:
|
||||||
|
tasks = [fetch_measurement_state(client, unit.id) for unit in deployed_units]
|
||||||
|
results = await asyncio.gather(*tasks, return_exceptions=True)
|
||||||
|
|
||||||
|
for unit, state in zip(deployed_units, results):
|
||||||
|
if isinstance(state, Exception):
|
||||||
|
unit.measurement_state = None
|
||||||
|
else:
|
||||||
|
unit.measurement_state = state
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/slm_device_list.html", {
|
||||||
|
"request": request,
|
||||||
|
"units": units
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/live-view/{unit_id}", response_class=HTMLResponse)
|
||||||
|
async def get_live_view(request: Request, unit_id: str, db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Get live view panel for a specific SLM unit.
|
||||||
|
Returns HTML partial with live metrics and chart.
|
||||||
|
"""
|
||||||
|
# Get unit from database
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=unit_id, device_type="slm").first()
|
||||||
|
|
||||||
|
if not unit:
|
||||||
|
return templates.TemplateResponse("partials/slm_live_view_error.html", {
|
||||||
|
"request": request,
|
||||||
|
"error": f"Unit {unit_id} not found"
|
||||||
|
})
|
||||||
|
|
||||||
|
# Get modem information if assigned
|
||||||
|
modem = None
|
||||||
|
modem_ip = None
|
||||||
|
if unit.deployed_with_modem_id:
|
||||||
|
modem = db.query(RosterUnit).filter_by(id=unit.deployed_with_modem_id, device_type="modem").first()
|
||||||
|
if modem:
|
||||||
|
modem_ip = modem.ip_address
|
||||||
|
else:
|
||||||
|
logger.warning(f"SLM {unit_id} is assigned to modem {unit.deployed_with_modem_id} but modem not found")
|
||||||
|
|
||||||
|
# Fallback to direct slm_host if no modem assigned (backward compatibility)
|
||||||
|
if not modem_ip and unit.slm_host:
|
||||||
|
modem_ip = unit.slm_host
|
||||||
|
logger.info(f"Using legacy slm_host for {unit_id}: {modem_ip}")
|
||||||
|
|
||||||
|
# Try to get current status from SLMM
|
||||||
|
current_status = None
|
||||||
|
measurement_state = None
|
||||||
|
is_measuring = False
|
||||||
|
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
# Get measurement state
|
||||||
|
state_response = await client.get(
|
||||||
|
f"{SLMM_BASE_URL}/api/nl43/{unit_id}/measurement-state"
|
||||||
|
)
|
||||||
|
if state_response.status_code == 200:
|
||||||
|
state_data = state_response.json()
|
||||||
|
measurement_state = state_data.get("measurement_state", "Unknown")
|
||||||
|
is_measuring = state_data.get("is_measuring", False)
|
||||||
|
|
||||||
|
# Get live status (measurement_start_time is already stored in SLMM database)
|
||||||
|
status_response = await client.get(
|
||||||
|
f"{SLMM_BASE_URL}/api/nl43/{unit_id}/live"
|
||||||
|
)
|
||||||
|
if status_response.status_code == 200:
|
||||||
|
status_data = status_response.json()
|
||||||
|
current_status = status_data.get("data", {})
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to get status for {unit_id}: {e}")
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/slm_live_view.html", {
|
||||||
|
"request": request,
|
||||||
|
"unit": unit,
|
||||||
|
"modem": modem,
|
||||||
|
"modem_ip": modem_ip,
|
||||||
|
"current_status": current_status,
|
||||||
|
"measurement_state": measurement_state,
|
||||||
|
"is_measuring": is_measuring
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/control/{unit_id}/{action}")
|
||||||
|
async def control_slm(unit_id: str, action: str):
|
||||||
|
"""
|
||||||
|
Send control commands to SLM (start, stop, pause, resume, reset).
|
||||||
|
Proxies to SLMM backend.
|
||||||
|
"""
|
||||||
|
valid_actions = ["start", "stop", "pause", "resume", "reset"]
|
||||||
|
|
||||||
|
if action not in valid_actions:
|
||||||
|
return {"status": "error", "detail": f"Invalid action. Must be one of: {valid_actions}"}
|
||||||
|
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post(
|
||||||
|
f"{SLMM_BASE_URL}/api/nl43/{unit_id}/{action}"
|
||||||
|
)
|
||||||
|
|
||||||
|
if response.status_code == 200:
|
||||||
|
return response.json()
|
||||||
|
else:
|
||||||
|
return {
|
||||||
|
"status": "error",
|
||||||
|
"detail": f"SLMM returned status {response.status_code}"
|
||||||
|
}
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to control {unit_id}: {e}")
|
||||||
|
return {
|
||||||
|
"status": "error",
|
||||||
|
"detail": str(e)
|
||||||
|
}
|
||||||
|
|
||||||
|
@router.get("/config/{unit_id}", response_class=HTMLResponse)
|
||||||
|
async def get_slm_config(request: Request, unit_id: str, db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Get configuration form for a specific SLM unit.
|
||||||
|
Returns HTML partial with configuration form.
|
||||||
|
"""
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=unit_id, device_type="slm").first()
|
||||||
|
|
||||||
|
if not unit:
|
||||||
|
return HTMLResponse(
|
||||||
|
content=f'<div class="text-red-500">Unit {unit_id} not found</div>',
|
||||||
|
status_code=404
|
||||||
|
)
|
||||||
|
|
||||||
|
return templates.TemplateResponse("partials/slm_config_form.html", {
|
||||||
|
"request": request,
|
||||||
|
"unit": unit
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/config/{unit_id}")
|
||||||
|
async def save_slm_config(request: Request, unit_id: str, db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Save SLM configuration.
|
||||||
|
Updates unit parameters in the database.
|
||||||
|
"""
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=unit_id, device_type="slm").first()
|
||||||
|
|
||||||
|
if not unit:
|
||||||
|
return {"status": "error", "detail": f"Unit {unit_id} not found"}
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Get form data
|
||||||
|
form_data = await request.form()
|
||||||
|
|
||||||
|
# Update SLM-specific fields
|
||||||
|
unit.slm_model = form_data.get("slm_model") or None
|
||||||
|
unit.slm_serial_number = form_data.get("slm_serial_number") or None
|
||||||
|
unit.slm_frequency_weighting = form_data.get("slm_frequency_weighting") or None
|
||||||
|
unit.slm_time_weighting = form_data.get("slm_time_weighting") or None
|
||||||
|
unit.slm_measurement_range = form_data.get("slm_measurement_range") or None
|
||||||
|
|
||||||
|
# Update network configuration
|
||||||
|
modem_id = form_data.get("deployed_with_modem_id")
|
||||||
|
unit.deployed_with_modem_id = modem_id if modem_id else None
|
||||||
|
|
||||||
|
# Always update TCP and FTP ports (used regardless of modem assignment)
|
||||||
|
unit.slm_tcp_port = int(form_data.get("slm_tcp_port")) if form_data.get("slm_tcp_port") else None
|
||||||
|
unit.slm_ftp_port = int(form_data.get("slm_ftp_port")) if form_data.get("slm_ftp_port") else None
|
||||||
|
|
||||||
|
# Only update direct IP if no modem is assigned
|
||||||
|
if not modem_id:
|
||||||
|
unit.slm_host = form_data.get("slm_host") or None
|
||||||
|
else:
|
||||||
|
# Clear legacy direct IP field when modem is assigned
|
||||||
|
unit.slm_host = None
|
||||||
|
|
||||||
|
db.commit()
|
||||||
|
logger.info(f"Updated configuration for SLM {unit_id}")
|
||||||
|
|
||||||
|
# Sync updated configuration to SLMM cache
|
||||||
|
logger.info(f"Syncing SLM {unit_id} config changes to SLMM cache...")
|
||||||
|
result = await sync_slm_to_slmm_cache(
|
||||||
|
unit_id=unit_id,
|
||||||
|
host=unit.slm_host, # Use the updated host from Terra-View
|
||||||
|
tcp_port=unit.slm_tcp_port,
|
||||||
|
ftp_port=unit.slm_ftp_port,
|
||||||
|
deployed_with_modem_id=unit.deployed_with_modem_id, # Resolve modem IP if assigned
|
||||||
|
db=db
|
||||||
|
)
|
||||||
|
|
||||||
|
if not result["success"]:
|
||||||
|
logger.warning(f"SLMM cache sync warning for {unit_id}: {result['message']}")
|
||||||
|
# Config still saved in Terra-View (source of truth)
|
||||||
|
|
||||||
|
return {"status": "success", "unit_id": unit_id}
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
db.rollback()
|
||||||
|
logger.error(f"Failed to save config for {unit_id}: {e}")
|
||||||
|
return {"status": "error", "detail": str(e)}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/test-modem/{modem_id}")
|
||||||
|
async def test_modem_connection(modem_id: str, db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Test modem connectivity with a simple ping/health check.
|
||||||
|
Returns response time and connection status.
|
||||||
|
"""
|
||||||
|
import subprocess
|
||||||
|
import time
|
||||||
|
|
||||||
|
# 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": response_time,
|
||||||
|
"message": "Modem is responding to ping"
|
||||||
|
}
|
||||||
|
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 (> 2 seconds)"
|
||||||
|
}
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to ping modem {modem_id}: {e}")
|
||||||
|
return {
|
||||||
|
"status": "error",
|
||||||
|
"modem_id": modem_id,
|
||||||
|
"detail": str(e)
|
||||||
|
}
|
||||||
@@ -6,7 +6,6 @@ Provides endpoints for SLM dashboard cards, detail pages, and real-time data.
|
|||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Request
|
from fastapi import APIRouter, Depends, HTTPException, Request
|
||||||
from fastapi.responses import HTMLResponse
|
from fastapi.responses import HTMLResponse
|
||||||
from fastapi.templating import Jinja2Templates
|
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
import httpx
|
import httpx
|
||||||
@@ -15,11 +14,11 @@ import os
|
|||||||
|
|
||||||
from backend.database import get_db
|
from backend.database import get_db
|
||||||
from backend.models import RosterUnit
|
from backend.models import RosterUnit
|
||||||
|
from backend.templates_config import templates
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
router = APIRouter(prefix="/slm", tags=["slm-ui"])
|
router = APIRouter(prefix="/slm", tags=["slm-ui"])
|
||||||
templates = Jinja2Templates(directory="templates")
|
|
||||||
|
|
||||||
SLMM_BASE_URL = os.getenv("SLMM_BASE_URL", "http://172.19.0.1:8100")
|
SLMM_BASE_URL = os.getenv("SLMM_BASE_URL", "http://172.19.0.1:8100")
|
||||||
|
|
||||||
@@ -30,7 +29,7 @@ async def slm_detail_page(request: Request, unit_id: str, db: Session = Depends(
|
|||||||
|
|
||||||
# Get roster unit
|
# Get roster unit
|
||||||
unit = db.query(RosterUnit).filter_by(id=unit_id).first()
|
unit = db.query(RosterUnit).filter_by(id=unit_id).first()
|
||||||
if not unit or unit.device_type != "sound_level_meter":
|
if not unit or unit.device_type != "slm":
|
||||||
raise HTTPException(status_code=404, detail="Sound level meter not found")
|
raise HTTPException(status_code=404, detail="Sound level meter not found")
|
||||||
|
|
||||||
return templates.TemplateResponse("slm_detail.html", {
|
return templates.TemplateResponse("slm_detail.html", {
|
||||||
@@ -46,7 +45,7 @@ async def get_slm_summary(unit_id: str, db: Session = Depends(get_db)):
|
|||||||
|
|
||||||
# Get roster unit
|
# Get roster unit
|
||||||
unit = db.query(RosterUnit).filter_by(id=unit_id).first()
|
unit = db.query(RosterUnit).filter_by(id=unit_id).first()
|
||||||
if not unit or unit.device_type != "sound_level_meter":
|
if not unit or unit.device_type != "slm":
|
||||||
raise HTTPException(status_code=404, detail="Sound level meter not found")
|
raise HTTPException(status_code=404, detail="Sound level meter not found")
|
||||||
|
|
||||||
# Try to get live status from SLMM
|
# Try to get live status from SLMM
|
||||||
@@ -61,7 +60,7 @@ async def get_slm_summary(unit_id: str, db: Session = Depends(get_db)):
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
"unit_id": unit_id,
|
"unit_id": unit_id,
|
||||||
"device_type": "sound_level_meter",
|
"device_type": "slm",
|
||||||
"deployed": unit.deployed,
|
"deployed": unit.deployed,
|
||||||
"model": unit.slm_model or "NL-43",
|
"model": unit.slm_model or "NL-43",
|
||||||
"location": unit.address or unit.location,
|
"location": unit.address or unit.location,
|
||||||
@@ -89,7 +88,7 @@ async def slm_controls_partial(request: Request, unit_id: str, db: Session = Dep
|
|||||||
"""Render SLM control panel partial."""
|
"""Render SLM control panel partial."""
|
||||||
|
|
||||||
unit = db.query(RosterUnit).filter_by(id=unit_id).first()
|
unit = db.query(RosterUnit).filter_by(id=unit_id).first()
|
||||||
if not unit or unit.device_type != "sound_level_meter":
|
if not unit or unit.device_type != "slm":
|
||||||
raise HTTPException(status_code=404, detail="Sound level meter not found")
|
raise HTTPException(status_code=404, detail="Sound level meter not found")
|
||||||
|
|
||||||
# Get current status from SLMM
|
# Get current status from SLMM
|
||||||
|
|||||||
@@ -5,9 +5,11 @@ Proxies requests from SFM to the standalone SLMM backend service.
|
|||||||
SLMM runs on port 8100 and handles NL43/NL53 sound level meter communication.
|
SLMM runs on port 8100 and handles NL43/NL53 sound level meter communication.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, Request, Response
|
from fastapi import APIRouter, HTTPException, Request, Response, WebSocket, WebSocketDisconnect
|
||||||
from fastapi.responses import StreamingResponse
|
from fastapi.responses import StreamingResponse
|
||||||
import httpx
|
import httpx
|
||||||
|
import websockets
|
||||||
|
import asyncio
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
|
||||||
@@ -17,6 +19,8 @@ router = APIRouter(prefix="/api/slmm", tags=["slmm"])
|
|||||||
|
|
||||||
# SLMM backend URL - configurable via environment variable
|
# SLMM backend URL - configurable via environment variable
|
||||||
SLMM_BASE_URL = os.getenv("SLMM_BASE_URL", "http://localhost:8100")
|
SLMM_BASE_URL = os.getenv("SLMM_BASE_URL", "http://localhost:8100")
|
||||||
|
# WebSocket URL derived from HTTP URL
|
||||||
|
SLMM_WS_BASE_URL = SLMM_BASE_URL.replace("http://", "ws://").replace("https://", "wss://")
|
||||||
|
|
||||||
|
|
||||||
@router.get("/health")
|
@router.get("/health")
|
||||||
@@ -61,6 +65,173 @@ async def check_slmm_health():
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# WebSocket routes MUST come before the catch-all route
|
||||||
|
@router.websocket("/{unit_id}/stream")
|
||||||
|
async def proxy_websocket_stream(websocket: WebSocket, unit_id: str):
|
||||||
|
"""
|
||||||
|
Proxy WebSocket connections to SLMM's /stream endpoint.
|
||||||
|
|
||||||
|
This allows real-time streaming of measurement data from NL43 devices
|
||||||
|
through the SFM unified interface.
|
||||||
|
"""
|
||||||
|
await websocket.accept()
|
||||||
|
logger.info(f"WebSocket connection accepted for SLMM unit {unit_id}")
|
||||||
|
|
||||||
|
# Build target WebSocket URL
|
||||||
|
target_ws_url = f"{SLMM_WS_BASE_URL}/api/nl43/{unit_id}/stream"
|
||||||
|
logger.info(f"Connecting to SLMM WebSocket: {target_ws_url}")
|
||||||
|
|
||||||
|
backend_ws = None
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Connect to SLMM backend WebSocket
|
||||||
|
backend_ws = await websockets.connect(target_ws_url)
|
||||||
|
logger.info(f"Connected to SLMM backend WebSocket for {unit_id}")
|
||||||
|
|
||||||
|
# Create tasks for bidirectional communication
|
||||||
|
async def forward_to_backend():
|
||||||
|
"""Forward messages from client to SLMM backend"""
|
||||||
|
try:
|
||||||
|
while True:
|
||||||
|
data = await websocket.receive_text()
|
||||||
|
await backend_ws.send(data)
|
||||||
|
except WebSocketDisconnect:
|
||||||
|
logger.info(f"Client WebSocket disconnected for {unit_id}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error forwarding to backend: {e}")
|
||||||
|
|
||||||
|
async def forward_to_client():
|
||||||
|
"""Forward messages from SLMM backend to client"""
|
||||||
|
try:
|
||||||
|
async for message in backend_ws:
|
||||||
|
await websocket.send_text(message)
|
||||||
|
except websockets.exceptions.ConnectionClosed:
|
||||||
|
logger.info(f"Backend WebSocket closed for {unit_id}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error forwarding to client: {e}")
|
||||||
|
|
||||||
|
# Run both forwarding tasks concurrently
|
||||||
|
await asyncio.gather(
|
||||||
|
forward_to_backend(),
|
||||||
|
forward_to_client(),
|
||||||
|
return_exceptions=True
|
||||||
|
)
|
||||||
|
|
||||||
|
except websockets.exceptions.WebSocketException as e:
|
||||||
|
logger.error(f"WebSocket error connecting to SLMM backend: {e}")
|
||||||
|
try:
|
||||||
|
await websocket.send_json({
|
||||||
|
"error": "Failed to connect to SLMM backend",
|
||||||
|
"detail": str(e)
|
||||||
|
})
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Unexpected error in WebSocket proxy for {unit_id}: {e}")
|
||||||
|
try:
|
||||||
|
await websocket.send_json({
|
||||||
|
"error": "Internal server error",
|
||||||
|
"detail": str(e)
|
||||||
|
})
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
finally:
|
||||||
|
# Clean up connections
|
||||||
|
if backend_ws:
|
||||||
|
try:
|
||||||
|
await backend_ws.close()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
await websocket.close()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
logger.info(f"WebSocket proxy closed for {unit_id}")
|
||||||
|
|
||||||
|
|
||||||
|
@router.websocket("/{unit_id}/live")
|
||||||
|
async def proxy_websocket_live(websocket: WebSocket, unit_id: str):
|
||||||
|
"""
|
||||||
|
Proxy WebSocket connections to SLMM's /live endpoint.
|
||||||
|
|
||||||
|
Alternative WebSocket endpoint that may be used by some frontend components.
|
||||||
|
"""
|
||||||
|
await websocket.accept()
|
||||||
|
logger.info(f"WebSocket connection accepted for SLMM unit {unit_id} (live endpoint)")
|
||||||
|
|
||||||
|
# Build target WebSocket URL - try /stream endpoint as SLMM uses that for WebSocket
|
||||||
|
target_ws_url = f"{SLMM_WS_BASE_URL}/api/nl43/{unit_id}/stream"
|
||||||
|
logger.info(f"Connecting to SLMM WebSocket: {target_ws_url}")
|
||||||
|
|
||||||
|
backend_ws = None
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Connect to SLMM backend WebSocket
|
||||||
|
backend_ws = await websockets.connect(target_ws_url)
|
||||||
|
logger.info(f"Connected to SLMM backend WebSocket for {unit_id} (live endpoint)")
|
||||||
|
|
||||||
|
# Create tasks for bidirectional communication
|
||||||
|
async def forward_to_backend():
|
||||||
|
"""Forward messages from client to SLMM backend"""
|
||||||
|
try:
|
||||||
|
while True:
|
||||||
|
data = await websocket.receive_text()
|
||||||
|
await backend_ws.send(data)
|
||||||
|
except WebSocketDisconnect:
|
||||||
|
logger.info(f"Client WebSocket disconnected for {unit_id} (live)")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error forwarding to backend (live): {e}")
|
||||||
|
|
||||||
|
async def forward_to_client():
|
||||||
|
"""Forward messages from SLMM backend to client"""
|
||||||
|
try:
|
||||||
|
async for message in backend_ws:
|
||||||
|
await websocket.send_text(message)
|
||||||
|
except websockets.exceptions.ConnectionClosed:
|
||||||
|
logger.info(f"Backend WebSocket closed for {unit_id} (live)")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error forwarding to client (live): {e}")
|
||||||
|
|
||||||
|
# Run both forwarding tasks concurrently
|
||||||
|
await asyncio.gather(
|
||||||
|
forward_to_backend(),
|
||||||
|
forward_to_client(),
|
||||||
|
return_exceptions=True
|
||||||
|
)
|
||||||
|
|
||||||
|
except websockets.exceptions.WebSocketException as e:
|
||||||
|
logger.error(f"WebSocket error connecting to SLMM backend (live): {e}")
|
||||||
|
try:
|
||||||
|
await websocket.send_json({
|
||||||
|
"error": "Failed to connect to SLMM backend",
|
||||||
|
"detail": str(e)
|
||||||
|
})
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Unexpected error in WebSocket proxy for {unit_id} (live): {e}")
|
||||||
|
try:
|
||||||
|
await websocket.send_json({
|
||||||
|
"error": "Internal server error",
|
||||||
|
"detail": str(e)
|
||||||
|
})
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
finally:
|
||||||
|
# Clean up connections
|
||||||
|
if backend_ws:
|
||||||
|
try:
|
||||||
|
await backend_ws.close()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
await websocket.close()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
logger.info(f"WebSocket proxy closed for {unit_id} (live)")
|
||||||
|
|
||||||
|
|
||||||
|
# HTTP catch-all route MUST come after specific routes (including WebSocket routes)
|
||||||
@router.api_route("/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "PATCH"])
|
@router.api_route("/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "PATCH"])
|
||||||
async def proxy_to_slmm(path: str, request: Request):
|
async def proxy_to_slmm(path: str, request: Request):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ from typing import Dict, Any
|
|||||||
|
|
||||||
from backend.database import get_db
|
from backend.database import get_db
|
||||||
from backend.services.snapshot import emit_status_snapshot
|
from backend.services.snapshot import emit_status_snapshot
|
||||||
|
from backend.models import RosterUnit
|
||||||
|
|
||||||
router = APIRouter(prefix="/api", tags=["units"])
|
router = APIRouter(prefix="/api", tags=["units"])
|
||||||
|
|
||||||
@@ -42,3 +43,32 @@ def get_unit_detail(unit_id: str, db: Session = Depends(get_db)):
|
|||||||
"note": unit_data.get("note", ""),
|
"note": unit_data.get("note", ""),
|
||||||
"coordinates": coords
|
"coordinates": coords
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/units/{unit_id}")
|
||||||
|
def get_unit_by_id(unit_id: str, db: Session = Depends(get_db)):
|
||||||
|
"""
|
||||||
|
Get unit data directly from the roster (for settings/configuration).
|
||||||
|
"""
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=unit_id).first()
|
||||||
|
|
||||||
|
if not unit:
|
||||||
|
raise HTTPException(status_code=404, detail=f"Unit {unit_id} not found")
|
||||||
|
|
||||||
|
return {
|
||||||
|
"id": unit.id,
|
||||||
|
"unit_type": unit.unit_type,
|
||||||
|
"device_type": unit.device_type,
|
||||||
|
"deployed": unit.deployed,
|
||||||
|
"retired": unit.retired,
|
||||||
|
"note": unit.note,
|
||||||
|
"location": unit.location,
|
||||||
|
"address": unit.address,
|
||||||
|
"coordinates": unit.coordinates,
|
||||||
|
"slm_host": unit.slm_host,
|
||||||
|
"slm_tcp_port": unit.slm_tcp_port,
|
||||||
|
"slm_ftp_port": unit.slm_ftp_port,
|
||||||
|
"slm_model": unit.slm_model,
|
||||||
|
"slm_serial_number": unit.slm_serial_number,
|
||||||
|
"deployed_with_modem_id": unit.deployed_with_modem_id
|
||||||
|
}
|
||||||
|
|||||||
462
backend/services/alert_service.py
Normal file
@@ -0,0 +1,462 @@
|
|||||||
|
"""
|
||||||
|
Alert Service
|
||||||
|
|
||||||
|
Manages in-app alerts for device status changes and system events.
|
||||||
|
Provides foundation for future notification channels (email, webhook).
|
||||||
|
"""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import uuid
|
||||||
|
import logging
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
from typing import Optional, List, Dict, Any
|
||||||
|
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from sqlalchemy import and_, or_
|
||||||
|
|
||||||
|
from backend.models import Alert, RosterUnit
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class AlertService:
|
||||||
|
"""
|
||||||
|
Service for managing alerts.
|
||||||
|
|
||||||
|
Handles alert lifecycle:
|
||||||
|
- Create alerts from various triggers
|
||||||
|
- Query active alerts
|
||||||
|
- Acknowledge/resolve/dismiss alerts
|
||||||
|
- (Future) Dispatch to notification channels
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, db: Session):
|
||||||
|
self.db = db
|
||||||
|
|
||||||
|
def create_alert(
|
||||||
|
self,
|
||||||
|
alert_type: str,
|
||||||
|
title: str,
|
||||||
|
message: str = None,
|
||||||
|
severity: str = "warning",
|
||||||
|
unit_id: str = None,
|
||||||
|
project_id: str = None,
|
||||||
|
location_id: str = None,
|
||||||
|
schedule_id: str = None,
|
||||||
|
metadata: dict = None,
|
||||||
|
expires_hours: int = 24,
|
||||||
|
) -> Alert:
|
||||||
|
"""
|
||||||
|
Create a new alert.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
alert_type: Type of alert (device_offline, device_online, schedule_failed)
|
||||||
|
title: Short alert title
|
||||||
|
message: Detailed description
|
||||||
|
severity: info, warning, or critical
|
||||||
|
unit_id: Related unit ID (optional)
|
||||||
|
project_id: Related project ID (optional)
|
||||||
|
location_id: Related location ID (optional)
|
||||||
|
schedule_id: Related schedule ID (optional)
|
||||||
|
metadata: Additional JSON data
|
||||||
|
expires_hours: Hours until auto-expiry (default 24)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Created Alert instance
|
||||||
|
"""
|
||||||
|
alert = Alert(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
alert_type=alert_type,
|
||||||
|
title=title,
|
||||||
|
message=message,
|
||||||
|
severity=severity,
|
||||||
|
unit_id=unit_id,
|
||||||
|
project_id=project_id,
|
||||||
|
location_id=location_id,
|
||||||
|
schedule_id=schedule_id,
|
||||||
|
alert_metadata=json.dumps(metadata) if metadata else None,
|
||||||
|
status="active",
|
||||||
|
expires_at=datetime.utcnow() + timedelta(hours=expires_hours),
|
||||||
|
)
|
||||||
|
|
||||||
|
self.db.add(alert)
|
||||||
|
self.db.commit()
|
||||||
|
self.db.refresh(alert)
|
||||||
|
|
||||||
|
logger.info(f"Created alert: {alert.title} ({alert.alert_type})")
|
||||||
|
return alert
|
||||||
|
|
||||||
|
def create_device_offline_alert(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
consecutive_failures: int = 0,
|
||||||
|
last_error: str = None,
|
||||||
|
) -> Optional[Alert]:
|
||||||
|
"""
|
||||||
|
Create alert when device becomes unreachable.
|
||||||
|
|
||||||
|
Only creates if no active offline alert exists for this device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: The unit that went offline
|
||||||
|
consecutive_failures: Number of consecutive poll failures
|
||||||
|
last_error: Last error message from polling
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Created Alert or None if alert already exists
|
||||||
|
"""
|
||||||
|
# Check if active offline alert already exists
|
||||||
|
existing = self.db.query(Alert).filter(
|
||||||
|
and_(
|
||||||
|
Alert.unit_id == unit_id,
|
||||||
|
Alert.alert_type == "device_offline",
|
||||||
|
Alert.status == "active",
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if existing:
|
||||||
|
logger.debug(f"Offline alert already exists for {unit_id}")
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Get unit info for title
|
||||||
|
unit = self.db.query(RosterUnit).filter_by(id=unit_id).first()
|
||||||
|
unit_name = unit.id if unit else unit_id
|
||||||
|
|
||||||
|
# Determine severity based on failure count
|
||||||
|
severity = "critical" if consecutive_failures >= 5 else "warning"
|
||||||
|
|
||||||
|
return self.create_alert(
|
||||||
|
alert_type="device_offline",
|
||||||
|
title=f"{unit_name} is offline",
|
||||||
|
message=f"Device has been unreachable after {consecutive_failures} failed connection attempts."
|
||||||
|
+ (f" Last error: {last_error}" if last_error else ""),
|
||||||
|
severity=severity,
|
||||||
|
unit_id=unit_id,
|
||||||
|
metadata={
|
||||||
|
"consecutive_failures": consecutive_failures,
|
||||||
|
"last_error": last_error,
|
||||||
|
},
|
||||||
|
expires_hours=48, # Offline alerts stay longer
|
||||||
|
)
|
||||||
|
|
||||||
|
def resolve_device_offline_alert(self, unit_id: str) -> Optional[Alert]:
|
||||||
|
"""
|
||||||
|
Auto-resolve offline alert when device comes back online.
|
||||||
|
|
||||||
|
Also creates an "device_online" info alert to notify user.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: The unit that came back online
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
The resolved Alert or None if no alert existed
|
||||||
|
"""
|
||||||
|
# Find active offline alert
|
||||||
|
alert = self.db.query(Alert).filter(
|
||||||
|
and_(
|
||||||
|
Alert.unit_id == unit_id,
|
||||||
|
Alert.alert_type == "device_offline",
|
||||||
|
Alert.status == "active",
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not alert:
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Resolve the offline alert
|
||||||
|
alert.status = "resolved"
|
||||||
|
alert.resolved_at = datetime.utcnow()
|
||||||
|
self.db.commit()
|
||||||
|
|
||||||
|
logger.info(f"Resolved offline alert for {unit_id}")
|
||||||
|
|
||||||
|
# Create online notification
|
||||||
|
unit = self.db.query(RosterUnit).filter_by(id=unit_id).first()
|
||||||
|
unit_name = unit.id if unit else unit_id
|
||||||
|
|
||||||
|
self.create_alert(
|
||||||
|
alert_type="device_online",
|
||||||
|
title=f"{unit_name} is back online",
|
||||||
|
message="Device connection has been restored.",
|
||||||
|
severity="info",
|
||||||
|
unit_id=unit_id,
|
||||||
|
expires_hours=6, # Info alerts expire quickly
|
||||||
|
)
|
||||||
|
|
||||||
|
return alert
|
||||||
|
|
||||||
|
def create_schedule_failed_alert(
|
||||||
|
self,
|
||||||
|
schedule_id: str,
|
||||||
|
action_type: str,
|
||||||
|
unit_id: str = None,
|
||||||
|
error_message: str = None,
|
||||||
|
project_id: str = None,
|
||||||
|
location_id: str = None,
|
||||||
|
) -> Alert:
|
||||||
|
"""
|
||||||
|
Create alert when a scheduled action fails.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
schedule_id: The ScheduledAction or RecurringSchedule ID
|
||||||
|
action_type: start, stop, download
|
||||||
|
unit_id: Related unit
|
||||||
|
error_message: Error from execution
|
||||||
|
project_id: Related project
|
||||||
|
location_id: Related location
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Created Alert
|
||||||
|
"""
|
||||||
|
return self.create_alert(
|
||||||
|
alert_type="schedule_failed",
|
||||||
|
title=f"Scheduled {action_type} failed",
|
||||||
|
message=error_message or f"The scheduled {action_type} action did not complete successfully.",
|
||||||
|
severity="warning",
|
||||||
|
unit_id=unit_id,
|
||||||
|
project_id=project_id,
|
||||||
|
location_id=location_id,
|
||||||
|
schedule_id=schedule_id,
|
||||||
|
metadata={"action_type": action_type},
|
||||||
|
expires_hours=24,
|
||||||
|
)
|
||||||
|
|
||||||
|
def create_schedule_completed_alert(
|
||||||
|
self,
|
||||||
|
schedule_id: str,
|
||||||
|
action_type: str,
|
||||||
|
unit_id: str = None,
|
||||||
|
project_id: str = None,
|
||||||
|
location_id: str = None,
|
||||||
|
metadata: dict = None,
|
||||||
|
) -> Alert:
|
||||||
|
"""
|
||||||
|
Create alert when a scheduled action completes successfully.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
schedule_id: The ScheduledAction ID
|
||||||
|
action_type: start, stop, download
|
||||||
|
unit_id: Related unit
|
||||||
|
project_id: Related project
|
||||||
|
location_id: Related location
|
||||||
|
metadata: Additional info (e.g., downloaded folder, index numbers)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Created Alert
|
||||||
|
"""
|
||||||
|
# Build descriptive message based on action type and metadata
|
||||||
|
if action_type == "stop" and metadata:
|
||||||
|
download_folder = metadata.get("downloaded_folder")
|
||||||
|
download_success = metadata.get("download_success", False)
|
||||||
|
if download_success and download_folder:
|
||||||
|
message = f"Measurement stopped and data downloaded ({download_folder})"
|
||||||
|
elif download_success is False and metadata.get("download_attempted"):
|
||||||
|
message = "Measurement stopped but download failed"
|
||||||
|
else:
|
||||||
|
message = "Measurement stopped successfully"
|
||||||
|
elif action_type == "start" and metadata:
|
||||||
|
new_index = metadata.get("new_index")
|
||||||
|
if new_index is not None:
|
||||||
|
message = f"Measurement started (index {new_index:04d})"
|
||||||
|
else:
|
||||||
|
message = "Measurement started successfully"
|
||||||
|
else:
|
||||||
|
message = f"Scheduled {action_type} completed successfully"
|
||||||
|
|
||||||
|
return self.create_alert(
|
||||||
|
alert_type="schedule_completed",
|
||||||
|
title=f"Scheduled {action_type} completed",
|
||||||
|
message=message,
|
||||||
|
severity="info",
|
||||||
|
unit_id=unit_id,
|
||||||
|
project_id=project_id,
|
||||||
|
location_id=location_id,
|
||||||
|
schedule_id=schedule_id,
|
||||||
|
metadata={"action_type": action_type, **(metadata or {})},
|
||||||
|
expires_hours=12, # Info alerts expire quickly
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_active_alerts(
|
||||||
|
self,
|
||||||
|
project_id: str = None,
|
||||||
|
unit_id: str = None,
|
||||||
|
alert_type: str = None,
|
||||||
|
min_severity: str = None,
|
||||||
|
limit: int = 50,
|
||||||
|
) -> List[Alert]:
|
||||||
|
"""
|
||||||
|
Query active alerts with optional filters.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
project_id: Filter by project
|
||||||
|
unit_id: Filter by unit
|
||||||
|
alert_type: Filter by alert type
|
||||||
|
min_severity: Minimum severity (info, warning, critical)
|
||||||
|
limit: Maximum results
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of matching alerts
|
||||||
|
"""
|
||||||
|
query = self.db.query(Alert).filter(Alert.status == "active")
|
||||||
|
|
||||||
|
if project_id:
|
||||||
|
query = query.filter(Alert.project_id == project_id)
|
||||||
|
|
||||||
|
if unit_id:
|
||||||
|
query = query.filter(Alert.unit_id == unit_id)
|
||||||
|
|
||||||
|
if alert_type:
|
||||||
|
query = query.filter(Alert.alert_type == alert_type)
|
||||||
|
|
||||||
|
if min_severity:
|
||||||
|
# Map severity to numeric for comparison
|
||||||
|
severity_levels = {"info": 1, "warning": 2, "critical": 3}
|
||||||
|
min_level = severity_levels.get(min_severity, 1)
|
||||||
|
|
||||||
|
if min_level == 2:
|
||||||
|
query = query.filter(Alert.severity.in_(["warning", "critical"]))
|
||||||
|
elif min_level == 3:
|
||||||
|
query = query.filter(Alert.severity == "critical")
|
||||||
|
|
||||||
|
return query.order_by(Alert.created_at.desc()).limit(limit).all()
|
||||||
|
|
||||||
|
def get_all_alerts(
|
||||||
|
self,
|
||||||
|
status: str = None,
|
||||||
|
project_id: str = None,
|
||||||
|
unit_id: str = None,
|
||||||
|
alert_type: str = None,
|
||||||
|
limit: int = 50,
|
||||||
|
offset: int = 0,
|
||||||
|
) -> List[Alert]:
|
||||||
|
"""
|
||||||
|
Query all alerts with optional filters (includes non-active).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
status: Filter by status (active, acknowledged, resolved, dismissed)
|
||||||
|
project_id: Filter by project
|
||||||
|
unit_id: Filter by unit
|
||||||
|
alert_type: Filter by alert type
|
||||||
|
limit: Maximum results
|
||||||
|
offset: Pagination offset
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of matching alerts
|
||||||
|
"""
|
||||||
|
query = self.db.query(Alert)
|
||||||
|
|
||||||
|
if status:
|
||||||
|
query = query.filter(Alert.status == status)
|
||||||
|
|
||||||
|
if project_id:
|
||||||
|
query = query.filter(Alert.project_id == project_id)
|
||||||
|
|
||||||
|
if unit_id:
|
||||||
|
query = query.filter(Alert.unit_id == unit_id)
|
||||||
|
|
||||||
|
if alert_type:
|
||||||
|
query = query.filter(Alert.alert_type == alert_type)
|
||||||
|
|
||||||
|
return (
|
||||||
|
query.order_by(Alert.created_at.desc())
|
||||||
|
.offset(offset)
|
||||||
|
.limit(limit)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_active_alert_count(self) -> int:
|
||||||
|
"""Get count of active alerts for badge display."""
|
||||||
|
return self.db.query(Alert).filter(Alert.status == "active").count()
|
||||||
|
|
||||||
|
def acknowledge_alert(self, alert_id: str) -> Optional[Alert]:
|
||||||
|
"""
|
||||||
|
Mark alert as acknowledged.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
alert_id: Alert to acknowledge
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Updated Alert or None if not found
|
||||||
|
"""
|
||||||
|
alert = self.db.query(Alert).filter_by(id=alert_id).first()
|
||||||
|
if not alert:
|
||||||
|
return None
|
||||||
|
|
||||||
|
alert.status = "acknowledged"
|
||||||
|
alert.acknowledged_at = datetime.utcnow()
|
||||||
|
self.db.commit()
|
||||||
|
|
||||||
|
logger.info(f"Acknowledged alert: {alert.title}")
|
||||||
|
return alert
|
||||||
|
|
||||||
|
def dismiss_alert(self, alert_id: str) -> Optional[Alert]:
|
||||||
|
"""
|
||||||
|
Dismiss alert (user chose to ignore).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
alert_id: Alert to dismiss
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Updated Alert or None if not found
|
||||||
|
"""
|
||||||
|
alert = self.db.query(Alert).filter_by(id=alert_id).first()
|
||||||
|
if not alert:
|
||||||
|
return None
|
||||||
|
|
||||||
|
alert.status = "dismissed"
|
||||||
|
self.db.commit()
|
||||||
|
|
||||||
|
logger.info(f"Dismissed alert: {alert.title}")
|
||||||
|
return alert
|
||||||
|
|
||||||
|
def resolve_alert(self, alert_id: str) -> Optional[Alert]:
|
||||||
|
"""
|
||||||
|
Manually resolve an alert.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
alert_id: Alert to resolve
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Updated Alert or None if not found
|
||||||
|
"""
|
||||||
|
alert = self.db.query(Alert).filter_by(id=alert_id).first()
|
||||||
|
if not alert:
|
||||||
|
return None
|
||||||
|
|
||||||
|
alert.status = "resolved"
|
||||||
|
alert.resolved_at = datetime.utcnow()
|
||||||
|
self.db.commit()
|
||||||
|
|
||||||
|
logger.info(f"Resolved alert: {alert.title}")
|
||||||
|
return alert
|
||||||
|
|
||||||
|
def cleanup_expired_alerts(self) -> int:
|
||||||
|
"""
|
||||||
|
Remove alerts past their expiration time.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Number of alerts cleaned up
|
||||||
|
"""
|
||||||
|
now = datetime.utcnow()
|
||||||
|
expired = self.db.query(Alert).filter(
|
||||||
|
and_(
|
||||||
|
Alert.expires_at.isnot(None),
|
||||||
|
Alert.expires_at < now,
|
||||||
|
Alert.status == "active",
|
||||||
|
)
|
||||||
|
).all()
|
||||||
|
|
||||||
|
count = len(expired)
|
||||||
|
for alert in expired:
|
||||||
|
alert.status = "dismissed"
|
||||||
|
|
||||||
|
if count > 0:
|
||||||
|
self.db.commit()
|
||||||
|
logger.info(f"Cleaned up {count} expired alerts")
|
||||||
|
|
||||||
|
return count
|
||||||
|
|
||||||
|
|
||||||
|
def get_alert_service(db: Session) -> AlertService:
|
||||||
|
"""Get an AlertService instance with the given database session."""
|
||||||
|
return AlertService(db)
|
||||||
603
backend/services/device_controller.py
Normal file
@@ -0,0 +1,603 @@
|
|||||||
|
"""
|
||||||
|
Device Controller Service
|
||||||
|
|
||||||
|
Routes device operations to the appropriate backend module:
|
||||||
|
- SLMM for sound level meters
|
||||||
|
- SFM for seismographs (future implementation)
|
||||||
|
|
||||||
|
This abstraction allows Projects system to work with any device type
|
||||||
|
without knowing the underlying communication protocol.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from typing import Dict, Any, Optional, List
|
||||||
|
from backend.services.slmm_client import get_slmm_client, SLMMClientError
|
||||||
|
|
||||||
|
|
||||||
|
class DeviceControllerError(Exception):
|
||||||
|
"""Base exception for device controller errors."""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class UnsupportedDeviceTypeError(DeviceControllerError):
|
||||||
|
"""Raised when device type is not supported."""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class DeviceController:
|
||||||
|
"""
|
||||||
|
Unified interface for controlling all device types.
|
||||||
|
|
||||||
|
Routes commands to appropriate backend module based on device_type.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
controller = DeviceController()
|
||||||
|
await controller.start_recording("nl43-001", "slm", config={})
|
||||||
|
await controller.stop_recording("seismo-042", "seismograph")
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
self.slmm_client = get_slmm_client()
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Recording Control
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def start_recording(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
config: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Start recording on a device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
config: Device-specific recording configuration
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response dict from device module
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
UnsupportedDeviceTypeError: Device type not supported
|
||||||
|
DeviceControllerError: Operation failed
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.start_recording(unit_id, config)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
# TODO: Implement SFM client for seismograph control
|
||||||
|
# For now, return a placeholder response
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Seismograph recording control not yet implemented",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(
|
||||||
|
f"Device type '{device_type}' is not supported. "
|
||||||
|
f"Supported types: slm, seismograph"
|
||||||
|
)
|
||||||
|
|
||||||
|
async def stop_recording(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Stop recording on a device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response dict from device module
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.stop_recording(unit_id)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
# TODO: Implement SFM client
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Seismograph recording control not yet implemented",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
|
||||||
|
|
||||||
|
async def pause_recording(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Pause recording on a device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response dict from device module
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.pause_recording(unit_id)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Seismograph pause not yet implemented",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
|
||||||
|
|
||||||
|
async def resume_recording(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Resume paused recording on a device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response dict from device module
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.resume_recording(unit_id)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Seismograph resume not yet implemented",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Status & Monitoring
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def get_device_status(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get current device status.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Status dict from device module
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.get_unit_status(unit_id)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
# TODO: Implement SFM status check
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Seismograph status not yet implemented",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
|
||||||
|
|
||||||
|
async def get_live_data(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get live data from device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Live data dict from device module
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.get_live_data(unit_id)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Seismograph live data not yet implemented",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Data Download
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def download_files(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
destination_path: str,
|
||||||
|
files: Optional[List[str]] = None,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Download data files from device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
destination_path: Local path to save files
|
||||||
|
files: List of filenames, or None for all
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Download result with file list
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.download_files(
|
||||||
|
unit_id,
|
||||||
|
destination_path,
|
||||||
|
files,
|
||||||
|
)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
# TODO: Implement SFM file download
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Seismograph file download not yet implemented",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def update_device_config(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
config: Dict[str, Any],
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Update device configuration.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
config: Configuration parameters
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Updated config from device module
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.update_unit_config(
|
||||||
|
unit_id,
|
||||||
|
host=config.get("host"),
|
||||||
|
tcp_port=config.get("tcp_port"),
|
||||||
|
ftp_port=config.get("ftp_port"),
|
||||||
|
ftp_username=config.get("ftp_username"),
|
||||||
|
ftp_password=config.get("ftp_password"),
|
||||||
|
)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Seismograph config update not yet implemented",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Store/Index Management
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def increment_index(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Increment the store/index number on a device.
|
||||||
|
|
||||||
|
For SLMs, this increments the store name to prevent "overwrite data?" prompts.
|
||||||
|
Should be called before starting a new measurement if auto_increment_index is enabled.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response dict with old_index and new_index
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.increment_index(unit_id)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
# Seismographs may not have the same concept of store index
|
||||||
|
return {
|
||||||
|
"status": "not_applicable",
|
||||||
|
"message": "Index increment not applicable for seismographs",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
|
||||||
|
|
||||||
|
async def get_index_number(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get current store/index number from device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response dict with current index_number
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.get_index_number(unit_id)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
return {
|
||||||
|
"status": "not_applicable",
|
||||||
|
"message": "Index number not applicable for seismographs",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Cycle Commands (for scheduled automation)
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def start_cycle(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
sync_clock: bool = True,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Execute complete start cycle for scheduled automation.
|
||||||
|
|
||||||
|
This handles the full pre-recording workflow:
|
||||||
|
1. Sync device clock to server time
|
||||||
|
2. Find next safe index (with overwrite protection)
|
||||||
|
3. Start measurement
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
sync_clock: Whether to sync device clock to server time
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response dict from device module
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.start_cycle(unit_id, sync_clock)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Seismograph start cycle not yet implemented",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
|
||||||
|
|
||||||
|
async def stop_cycle(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
download: bool = True,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Execute complete stop cycle for scheduled automation.
|
||||||
|
|
||||||
|
This handles the full post-recording workflow:
|
||||||
|
1. Stop measurement
|
||||||
|
2. Enable FTP
|
||||||
|
3. Download measurement folder
|
||||||
|
4. Verify download
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
download: Whether to download measurement data
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response dict from device module
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
return await self.slmm_client.stop_cycle(unit_id, download)
|
||||||
|
except SLMMClientError as e:
|
||||||
|
raise DeviceControllerError(f"SLMM error: {str(e)}")
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Seismograph stop cycle not yet implemented",
|
||||||
|
"unit_id": unit_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise UnsupportedDeviceTypeError(f"Unsupported device type: {device_type}")
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Health Check
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def check_device_connectivity(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
device_type: str,
|
||||||
|
) -> bool:
|
||||||
|
"""
|
||||||
|
Check if device is reachable.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
device_type: "slm" | "seismograph"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if device is reachable, False otherwise
|
||||||
|
"""
|
||||||
|
if device_type == "slm":
|
||||||
|
try:
|
||||||
|
status = await self.slmm_client.get_unit_status(unit_id)
|
||||||
|
return status.get("last_seen") is not None
|
||||||
|
except:
|
||||||
|
return False
|
||||||
|
|
||||||
|
elif device_type == "seismograph":
|
||||||
|
# TODO: Implement SFM connectivity check
|
||||||
|
return False
|
||||||
|
|
||||||
|
else:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
# Singleton instance
|
||||||
|
_default_controller: Optional[DeviceController] = None
|
||||||
|
|
||||||
|
|
||||||
|
def get_device_controller() -> DeviceController:
|
||||||
|
"""
|
||||||
|
Get the default device controller instance.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
DeviceController instance
|
||||||
|
"""
|
||||||
|
global _default_controller
|
||||||
|
if _default_controller is None:
|
||||||
|
_default_controller = DeviceController()
|
||||||
|
return _default_controller
|
||||||
184
backend/services/device_status_monitor.py
Normal file
@@ -0,0 +1,184 @@
|
|||||||
|
"""
|
||||||
|
Device Status Monitor
|
||||||
|
|
||||||
|
Background task that monitors device reachability via SLMM polling status
|
||||||
|
and triggers alerts when devices go offline or come back online.
|
||||||
|
|
||||||
|
This service bridges SLMM's device polling with Terra-View's alert system.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import logging
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Optional, Dict
|
||||||
|
|
||||||
|
from backend.database import SessionLocal
|
||||||
|
from backend.services.slmm_client import get_slmm_client, SLMMClientError
|
||||||
|
from backend.services.alert_service import get_alert_service
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class DeviceStatusMonitor:
|
||||||
|
"""
|
||||||
|
Monitors device reachability via SLMM's polling status endpoint.
|
||||||
|
|
||||||
|
Detects state transitions (online→offline, offline→online) and
|
||||||
|
triggers AlertService to create/resolve alerts.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
monitor = DeviceStatusMonitor()
|
||||||
|
await monitor.start() # Start background monitoring
|
||||||
|
monitor.stop() # Stop monitoring
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, check_interval: int = 60):
|
||||||
|
"""
|
||||||
|
Initialize the monitor.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
check_interval: Seconds between status checks (default: 60)
|
||||||
|
"""
|
||||||
|
self.check_interval = check_interval
|
||||||
|
self.running = False
|
||||||
|
self.task: Optional[asyncio.Task] = None
|
||||||
|
self.slmm_client = get_slmm_client()
|
||||||
|
|
||||||
|
# Track previous device states to detect transitions
|
||||||
|
self._device_states: Dict[str, bool] = {}
|
||||||
|
|
||||||
|
async def start(self):
|
||||||
|
"""Start the monitoring background task."""
|
||||||
|
if self.running:
|
||||||
|
logger.warning("DeviceStatusMonitor is already running")
|
||||||
|
return
|
||||||
|
|
||||||
|
self.running = True
|
||||||
|
self.task = asyncio.create_task(self._monitor_loop())
|
||||||
|
logger.info(f"DeviceStatusMonitor started (checking every {self.check_interval}s)")
|
||||||
|
|
||||||
|
def stop(self):
|
||||||
|
"""Stop the monitoring background task."""
|
||||||
|
self.running = False
|
||||||
|
if self.task:
|
||||||
|
self.task.cancel()
|
||||||
|
logger.info("DeviceStatusMonitor stopped")
|
||||||
|
|
||||||
|
async def _monitor_loop(self):
|
||||||
|
"""Main monitoring loop."""
|
||||||
|
while self.running:
|
||||||
|
try:
|
||||||
|
await self._check_all_devices()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error in device status monitor: {e}", exc_info=True)
|
||||||
|
|
||||||
|
# Sleep in small intervals for graceful shutdown
|
||||||
|
for _ in range(self.check_interval):
|
||||||
|
if not self.running:
|
||||||
|
break
|
||||||
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
|
logger.info("DeviceStatusMonitor loop exited")
|
||||||
|
|
||||||
|
async def _check_all_devices(self):
|
||||||
|
"""
|
||||||
|
Fetch polling status from SLMM and detect state transitions.
|
||||||
|
|
||||||
|
Uses GET /api/slmm/_polling/status (proxied to SLMM)
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
# Get status from SLMM
|
||||||
|
status_response = await self.slmm_client.get_polling_status()
|
||||||
|
devices = status_response.get("devices", [])
|
||||||
|
|
||||||
|
if not devices:
|
||||||
|
logger.debug("No devices in polling status response")
|
||||||
|
return
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
|
||||||
|
for device in devices:
|
||||||
|
unit_id = device.get("unit_id")
|
||||||
|
if not unit_id:
|
||||||
|
continue
|
||||||
|
|
||||||
|
is_reachable = device.get("is_reachable", True)
|
||||||
|
previous_reachable = self._device_states.get(unit_id)
|
||||||
|
|
||||||
|
# Skip if this is the first check (no previous state)
|
||||||
|
if previous_reachable is None:
|
||||||
|
self._device_states[unit_id] = is_reachable
|
||||||
|
logger.debug(f"Initial state for {unit_id}: reachable={is_reachable}")
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Detect offline transition (was online, now offline)
|
||||||
|
if previous_reachable and not is_reachable:
|
||||||
|
logger.warning(f"Device {unit_id} went OFFLINE")
|
||||||
|
alert_service.create_device_offline_alert(
|
||||||
|
unit_id=unit_id,
|
||||||
|
consecutive_failures=device.get("consecutive_failures", 0),
|
||||||
|
last_error=device.get("last_error"),
|
||||||
|
)
|
||||||
|
|
||||||
|
# Detect online transition (was offline, now online)
|
||||||
|
elif not previous_reachable and is_reachable:
|
||||||
|
logger.info(f"Device {unit_id} came back ONLINE")
|
||||||
|
alert_service.resolve_device_offline_alert(unit_id)
|
||||||
|
|
||||||
|
# Update tracked state
|
||||||
|
self._device_states[unit_id] = is_reachable
|
||||||
|
|
||||||
|
# Cleanup expired alerts while we're here
|
||||||
|
alert_service.cleanup_expired_alerts()
|
||||||
|
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
except SLMMClientError as e:
|
||||||
|
logger.warning(f"Could not reach SLMM for status check: {e}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error checking device status: {e}", exc_info=True)
|
||||||
|
|
||||||
|
def get_tracked_devices(self) -> Dict[str, bool]:
|
||||||
|
"""
|
||||||
|
Get the current tracked device states.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict mapping unit_id to is_reachable status
|
||||||
|
"""
|
||||||
|
return dict(self._device_states)
|
||||||
|
|
||||||
|
def clear_tracked_devices(self):
|
||||||
|
"""Clear all tracked device states (useful for testing)."""
|
||||||
|
self._device_states.clear()
|
||||||
|
|
||||||
|
|
||||||
|
# Singleton instance
|
||||||
|
_monitor_instance: Optional[DeviceStatusMonitor] = None
|
||||||
|
|
||||||
|
|
||||||
|
def get_device_status_monitor() -> DeviceStatusMonitor:
|
||||||
|
"""
|
||||||
|
Get the device status monitor singleton instance.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
DeviceStatusMonitor instance
|
||||||
|
"""
|
||||||
|
global _monitor_instance
|
||||||
|
if _monitor_instance is None:
|
||||||
|
_monitor_instance = DeviceStatusMonitor()
|
||||||
|
return _monitor_instance
|
||||||
|
|
||||||
|
|
||||||
|
async def start_device_status_monitor():
|
||||||
|
"""Start the global device status monitor."""
|
||||||
|
monitor = get_device_status_monitor()
|
||||||
|
await monitor.start()
|
||||||
|
|
||||||
|
|
||||||
|
def stop_device_status_monitor():
|
||||||
|
"""Stop the global device status monitor."""
|
||||||
|
monitor = get_device_status_monitor()
|
||||||
|
monitor.stop()
|
||||||
559
backend/services/recurring_schedule_service.py
Normal file
@@ -0,0 +1,559 @@
|
|||||||
|
"""
|
||||||
|
Recurring Schedule Service
|
||||||
|
|
||||||
|
Manages recurring schedule definitions and generates ScheduledAction
|
||||||
|
instances based on patterns (weekly calendar, simple interval).
|
||||||
|
"""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import uuid
|
||||||
|
import logging
|
||||||
|
from datetime import datetime, timedelta, date, time
|
||||||
|
from typing import Optional, List, Dict, Any, Tuple
|
||||||
|
from zoneinfo import ZoneInfo
|
||||||
|
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from sqlalchemy import and_
|
||||||
|
|
||||||
|
from backend.models import RecurringSchedule, ScheduledAction, MonitoringLocation, UnitAssignment
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# Day name mapping
|
||||||
|
DAY_NAMES = ["monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"]
|
||||||
|
|
||||||
|
|
||||||
|
class RecurringScheduleService:
|
||||||
|
"""
|
||||||
|
Service for managing recurring schedules and generating ScheduledActions.
|
||||||
|
|
||||||
|
Supports two schedule types:
|
||||||
|
- weekly_calendar: Specific days with start/end times
|
||||||
|
- simple_interval: Daily stop/download/restart cycles for 24/7 monitoring
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, db: Session):
|
||||||
|
self.db = db
|
||||||
|
|
||||||
|
def create_schedule(
|
||||||
|
self,
|
||||||
|
project_id: str,
|
||||||
|
location_id: str,
|
||||||
|
name: str,
|
||||||
|
schedule_type: str,
|
||||||
|
device_type: str = "slm",
|
||||||
|
unit_id: str = None,
|
||||||
|
weekly_pattern: dict = None,
|
||||||
|
interval_type: str = None,
|
||||||
|
cycle_time: str = None,
|
||||||
|
include_download: bool = True,
|
||||||
|
auto_increment_index: bool = True,
|
||||||
|
timezone: str = "America/New_York",
|
||||||
|
) -> RecurringSchedule:
|
||||||
|
"""
|
||||||
|
Create a new recurring schedule.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
project_id: Project ID
|
||||||
|
location_id: Monitoring location ID
|
||||||
|
name: Schedule name
|
||||||
|
schedule_type: "weekly_calendar" or "simple_interval"
|
||||||
|
device_type: "slm" or "seismograph"
|
||||||
|
unit_id: Specific unit (optional, can use assignment)
|
||||||
|
weekly_pattern: Dict of day patterns for weekly_calendar
|
||||||
|
interval_type: "daily" or "hourly" for simple_interval
|
||||||
|
cycle_time: Time string "HH:MM" for cycle
|
||||||
|
include_download: Whether to download data on cycle
|
||||||
|
auto_increment_index: Whether to auto-increment store index before start
|
||||||
|
timezone: Timezone for schedule times
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Created RecurringSchedule
|
||||||
|
"""
|
||||||
|
schedule = RecurringSchedule(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=project_id,
|
||||||
|
location_id=location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
name=name,
|
||||||
|
schedule_type=schedule_type,
|
||||||
|
device_type=device_type,
|
||||||
|
weekly_pattern=json.dumps(weekly_pattern) if weekly_pattern else None,
|
||||||
|
interval_type=interval_type,
|
||||||
|
cycle_time=cycle_time,
|
||||||
|
include_download=include_download,
|
||||||
|
auto_increment_index=auto_increment_index,
|
||||||
|
enabled=True,
|
||||||
|
timezone=timezone,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Calculate next occurrence
|
||||||
|
schedule.next_occurrence = self._calculate_next_occurrence(schedule)
|
||||||
|
|
||||||
|
self.db.add(schedule)
|
||||||
|
self.db.commit()
|
||||||
|
self.db.refresh(schedule)
|
||||||
|
|
||||||
|
logger.info(f"Created recurring schedule: {name} ({schedule_type})")
|
||||||
|
return schedule
|
||||||
|
|
||||||
|
def update_schedule(
|
||||||
|
self,
|
||||||
|
schedule_id: str,
|
||||||
|
**kwargs,
|
||||||
|
) -> Optional[RecurringSchedule]:
|
||||||
|
"""
|
||||||
|
Update a recurring schedule.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
schedule_id: Schedule to update
|
||||||
|
**kwargs: Fields to update
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Updated schedule or None
|
||||||
|
"""
|
||||||
|
schedule = self.db.query(RecurringSchedule).filter_by(id=schedule_id).first()
|
||||||
|
if not schedule:
|
||||||
|
return None
|
||||||
|
|
||||||
|
for key, value in kwargs.items():
|
||||||
|
if hasattr(schedule, key):
|
||||||
|
if key == "weekly_pattern" and isinstance(value, dict):
|
||||||
|
value = json.dumps(value)
|
||||||
|
setattr(schedule, key, value)
|
||||||
|
|
||||||
|
# Recalculate next occurrence
|
||||||
|
schedule.next_occurrence = self._calculate_next_occurrence(schedule)
|
||||||
|
|
||||||
|
self.db.commit()
|
||||||
|
self.db.refresh(schedule)
|
||||||
|
|
||||||
|
logger.info(f"Updated recurring schedule: {schedule.name}")
|
||||||
|
return schedule
|
||||||
|
|
||||||
|
def delete_schedule(self, schedule_id: str) -> bool:
|
||||||
|
"""
|
||||||
|
Delete a recurring schedule and its pending generated actions.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
schedule_id: Schedule to delete
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if deleted, False if not found
|
||||||
|
"""
|
||||||
|
schedule = self.db.query(RecurringSchedule).filter_by(id=schedule_id).first()
|
||||||
|
if not schedule:
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Delete pending generated actions for this schedule
|
||||||
|
# The schedule_id is stored in the notes field as JSON
|
||||||
|
pending_actions = self.db.query(ScheduledAction).filter(
|
||||||
|
and_(
|
||||||
|
ScheduledAction.execution_status == "pending",
|
||||||
|
ScheduledAction.notes.like(f'%"schedule_id": "{schedule_id}"%'),
|
||||||
|
)
|
||||||
|
).all()
|
||||||
|
|
||||||
|
deleted_count = len(pending_actions)
|
||||||
|
for action in pending_actions:
|
||||||
|
self.db.delete(action)
|
||||||
|
|
||||||
|
self.db.delete(schedule)
|
||||||
|
self.db.commit()
|
||||||
|
|
||||||
|
logger.info(f"Deleted recurring schedule: {schedule.name} (and {deleted_count} pending actions)")
|
||||||
|
return True
|
||||||
|
|
||||||
|
def enable_schedule(self, schedule_id: str) -> Optional[RecurringSchedule]:
|
||||||
|
"""Enable a disabled schedule."""
|
||||||
|
return self.update_schedule(schedule_id, enabled=True)
|
||||||
|
|
||||||
|
def disable_schedule(self, schedule_id: str) -> Optional[RecurringSchedule]:
|
||||||
|
"""Disable a schedule."""
|
||||||
|
return self.update_schedule(schedule_id, enabled=False)
|
||||||
|
|
||||||
|
def generate_actions_for_schedule(
|
||||||
|
self,
|
||||||
|
schedule: RecurringSchedule,
|
||||||
|
horizon_days: int = 7,
|
||||||
|
preview_only: bool = False,
|
||||||
|
) -> List[ScheduledAction]:
|
||||||
|
"""
|
||||||
|
Generate ScheduledAction entries for the next N days based on pattern.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
schedule: The recurring schedule
|
||||||
|
horizon_days: Days ahead to generate
|
||||||
|
preview_only: If True, don't save to DB (for preview)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of generated ScheduledAction instances
|
||||||
|
"""
|
||||||
|
if not schedule.enabled:
|
||||||
|
return []
|
||||||
|
|
||||||
|
if schedule.schedule_type == "weekly_calendar":
|
||||||
|
actions = self._generate_weekly_calendar_actions(schedule, horizon_days)
|
||||||
|
elif schedule.schedule_type == "simple_interval":
|
||||||
|
actions = self._generate_interval_actions(schedule, horizon_days)
|
||||||
|
else:
|
||||||
|
logger.warning(f"Unknown schedule type: {schedule.schedule_type}")
|
||||||
|
return []
|
||||||
|
|
||||||
|
if not preview_only and actions:
|
||||||
|
for action in actions:
|
||||||
|
self.db.add(action)
|
||||||
|
|
||||||
|
schedule.last_generated_at = datetime.utcnow()
|
||||||
|
schedule.next_occurrence = self._calculate_next_occurrence(schedule)
|
||||||
|
|
||||||
|
self.db.commit()
|
||||||
|
logger.info(f"Generated {len(actions)} actions for schedule: {schedule.name}")
|
||||||
|
|
||||||
|
return actions
|
||||||
|
|
||||||
|
def _generate_weekly_calendar_actions(
|
||||||
|
self,
|
||||||
|
schedule: RecurringSchedule,
|
||||||
|
horizon_days: int,
|
||||||
|
) -> List[ScheduledAction]:
|
||||||
|
"""
|
||||||
|
Generate actions from weekly calendar pattern.
|
||||||
|
|
||||||
|
Pattern format:
|
||||||
|
{
|
||||||
|
"monday": {"enabled": true, "start": "19:00", "end": "07:00"},
|
||||||
|
"tuesday": {"enabled": false},
|
||||||
|
...
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
if not schedule.weekly_pattern:
|
||||||
|
return []
|
||||||
|
|
||||||
|
try:
|
||||||
|
pattern = json.loads(schedule.weekly_pattern)
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
logger.error(f"Invalid weekly_pattern JSON for schedule {schedule.id}")
|
||||||
|
return []
|
||||||
|
|
||||||
|
actions = []
|
||||||
|
tz = ZoneInfo(schedule.timezone)
|
||||||
|
now_utc = datetime.utcnow()
|
||||||
|
now_local = now_utc.replace(tzinfo=ZoneInfo("UTC")).astimezone(tz)
|
||||||
|
|
||||||
|
# Get unit_id (from schedule or assignment)
|
||||||
|
unit_id = self._resolve_unit_id(schedule)
|
||||||
|
|
||||||
|
for day_offset in range(horizon_days):
|
||||||
|
check_date = now_local.date() + timedelta(days=day_offset)
|
||||||
|
day_name = DAY_NAMES[check_date.weekday()]
|
||||||
|
day_config = pattern.get(day_name, {})
|
||||||
|
|
||||||
|
if not day_config.get("enabled", False):
|
||||||
|
continue
|
||||||
|
|
||||||
|
start_time_str = day_config.get("start")
|
||||||
|
end_time_str = day_config.get("end")
|
||||||
|
|
||||||
|
if not start_time_str or not end_time_str:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Parse times
|
||||||
|
start_time = self._parse_time(start_time_str)
|
||||||
|
end_time = self._parse_time(end_time_str)
|
||||||
|
|
||||||
|
if not start_time or not end_time:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Create start datetime in local timezone
|
||||||
|
start_local = datetime.combine(check_date, start_time, tzinfo=tz)
|
||||||
|
start_utc = start_local.astimezone(ZoneInfo("UTC")).replace(tzinfo=None)
|
||||||
|
|
||||||
|
# Handle overnight schedules (end time is next day)
|
||||||
|
if end_time <= start_time:
|
||||||
|
end_date = check_date + timedelta(days=1)
|
||||||
|
else:
|
||||||
|
end_date = check_date
|
||||||
|
|
||||||
|
end_local = datetime.combine(end_date, end_time, tzinfo=tz)
|
||||||
|
end_utc = end_local.astimezone(ZoneInfo("UTC")).replace(tzinfo=None)
|
||||||
|
|
||||||
|
# Skip if start time has already passed
|
||||||
|
if start_utc <= now_utc:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Check if action already exists
|
||||||
|
if self._action_exists(schedule.project_id, schedule.location_id, "start", start_utc):
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Build notes with automation metadata
|
||||||
|
start_notes = json.dumps({
|
||||||
|
"schedule_name": schedule.name,
|
||||||
|
"schedule_id": schedule.id,
|
||||||
|
"auto_increment_index": schedule.auto_increment_index,
|
||||||
|
})
|
||||||
|
|
||||||
|
# Create START action
|
||||||
|
start_action = ScheduledAction(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=schedule.project_id,
|
||||||
|
location_id=schedule.location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
action_type="start",
|
||||||
|
device_type=schedule.device_type,
|
||||||
|
scheduled_time=start_utc,
|
||||||
|
execution_status="pending",
|
||||||
|
notes=start_notes,
|
||||||
|
)
|
||||||
|
actions.append(start_action)
|
||||||
|
|
||||||
|
# Create STOP action
|
||||||
|
stop_notes = json.dumps({
|
||||||
|
"schedule_name": schedule.name,
|
||||||
|
"schedule_id": schedule.id,
|
||||||
|
})
|
||||||
|
stop_action = ScheduledAction(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=schedule.project_id,
|
||||||
|
location_id=schedule.location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
action_type="stop",
|
||||||
|
device_type=schedule.device_type,
|
||||||
|
scheduled_time=end_utc,
|
||||||
|
execution_status="pending",
|
||||||
|
notes=stop_notes,
|
||||||
|
)
|
||||||
|
actions.append(stop_action)
|
||||||
|
|
||||||
|
# Create DOWNLOAD action if enabled (1 minute after stop)
|
||||||
|
if schedule.include_download:
|
||||||
|
download_time = end_utc + timedelta(minutes=1)
|
||||||
|
download_notes = json.dumps({
|
||||||
|
"schedule_name": schedule.name,
|
||||||
|
"schedule_id": schedule.id,
|
||||||
|
"schedule_type": "weekly_calendar",
|
||||||
|
})
|
||||||
|
download_action = ScheduledAction(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=schedule.project_id,
|
||||||
|
location_id=schedule.location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
action_type="download",
|
||||||
|
device_type=schedule.device_type,
|
||||||
|
scheduled_time=download_time,
|
||||||
|
execution_status="pending",
|
||||||
|
notes=download_notes,
|
||||||
|
)
|
||||||
|
actions.append(download_action)
|
||||||
|
|
||||||
|
return actions
|
||||||
|
|
||||||
|
def _generate_interval_actions(
|
||||||
|
self,
|
||||||
|
schedule: RecurringSchedule,
|
||||||
|
horizon_days: int,
|
||||||
|
) -> List[ScheduledAction]:
|
||||||
|
"""
|
||||||
|
Generate actions from simple interval pattern.
|
||||||
|
|
||||||
|
For daily cycles: stop, download (optional), start at cycle_time each day.
|
||||||
|
"""
|
||||||
|
if not schedule.cycle_time:
|
||||||
|
return []
|
||||||
|
|
||||||
|
cycle_time = self._parse_time(schedule.cycle_time)
|
||||||
|
if not cycle_time:
|
||||||
|
return []
|
||||||
|
|
||||||
|
actions = []
|
||||||
|
tz = ZoneInfo(schedule.timezone)
|
||||||
|
now_utc = datetime.utcnow()
|
||||||
|
now_local = now_utc.replace(tzinfo=ZoneInfo("UTC")).astimezone(tz)
|
||||||
|
|
||||||
|
# Get unit_id
|
||||||
|
unit_id = self._resolve_unit_id(schedule)
|
||||||
|
|
||||||
|
for day_offset in range(horizon_days):
|
||||||
|
check_date = now_local.date() + timedelta(days=day_offset)
|
||||||
|
|
||||||
|
# Create cycle datetime in local timezone
|
||||||
|
cycle_local = datetime.combine(check_date, cycle_time, tzinfo=tz)
|
||||||
|
cycle_utc = cycle_local.astimezone(ZoneInfo("UTC")).replace(tzinfo=None)
|
||||||
|
|
||||||
|
# Skip if time has passed
|
||||||
|
if cycle_utc <= now_utc:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Check if action already exists
|
||||||
|
if self._action_exists(schedule.project_id, schedule.location_id, "stop", cycle_utc):
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Build notes with metadata
|
||||||
|
stop_notes = json.dumps({
|
||||||
|
"schedule_name": schedule.name,
|
||||||
|
"schedule_id": schedule.id,
|
||||||
|
"cycle_type": "daily",
|
||||||
|
})
|
||||||
|
|
||||||
|
# Create STOP action
|
||||||
|
stop_action = ScheduledAction(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=schedule.project_id,
|
||||||
|
location_id=schedule.location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
action_type="stop",
|
||||||
|
device_type=schedule.device_type,
|
||||||
|
scheduled_time=cycle_utc,
|
||||||
|
execution_status="pending",
|
||||||
|
notes=stop_notes,
|
||||||
|
)
|
||||||
|
actions.append(stop_action)
|
||||||
|
|
||||||
|
# Create DOWNLOAD action if enabled (1 minute after stop)
|
||||||
|
if schedule.include_download:
|
||||||
|
download_time = cycle_utc + timedelta(minutes=1)
|
||||||
|
download_notes = json.dumps({
|
||||||
|
"schedule_name": schedule.name,
|
||||||
|
"schedule_id": schedule.id,
|
||||||
|
"cycle_type": "daily",
|
||||||
|
})
|
||||||
|
download_action = ScheduledAction(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=schedule.project_id,
|
||||||
|
location_id=schedule.location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
action_type="download",
|
||||||
|
device_type=schedule.device_type,
|
||||||
|
scheduled_time=download_time,
|
||||||
|
execution_status="pending",
|
||||||
|
notes=download_notes,
|
||||||
|
)
|
||||||
|
actions.append(download_action)
|
||||||
|
|
||||||
|
# Create START action (2 minutes after stop, or 1 minute after download)
|
||||||
|
start_offset = 2 if schedule.include_download else 1
|
||||||
|
start_time = cycle_utc + timedelta(minutes=start_offset)
|
||||||
|
start_notes = json.dumps({
|
||||||
|
"schedule_name": schedule.name,
|
||||||
|
"schedule_id": schedule.id,
|
||||||
|
"cycle_type": "daily",
|
||||||
|
"auto_increment_index": schedule.auto_increment_index,
|
||||||
|
})
|
||||||
|
start_action = ScheduledAction(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=schedule.project_id,
|
||||||
|
location_id=schedule.location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
action_type="start",
|
||||||
|
device_type=schedule.device_type,
|
||||||
|
scheduled_time=start_time,
|
||||||
|
execution_status="pending",
|
||||||
|
notes=start_notes,
|
||||||
|
)
|
||||||
|
actions.append(start_action)
|
||||||
|
|
||||||
|
return actions
|
||||||
|
|
||||||
|
def _calculate_next_occurrence(self, schedule: RecurringSchedule) -> Optional[datetime]:
|
||||||
|
"""Calculate when the next action should occur."""
|
||||||
|
if not schedule.enabled:
|
||||||
|
return None
|
||||||
|
|
||||||
|
tz = ZoneInfo(schedule.timezone)
|
||||||
|
now_utc = datetime.utcnow()
|
||||||
|
now_local = now_utc.replace(tzinfo=ZoneInfo("UTC")).astimezone(tz)
|
||||||
|
|
||||||
|
if schedule.schedule_type == "weekly_calendar" and schedule.weekly_pattern:
|
||||||
|
try:
|
||||||
|
pattern = json.loads(schedule.weekly_pattern)
|
||||||
|
except:
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Find next enabled day
|
||||||
|
for day_offset in range(8): # Check up to a week ahead
|
||||||
|
check_date = now_local.date() + timedelta(days=day_offset)
|
||||||
|
day_name = DAY_NAMES[check_date.weekday()]
|
||||||
|
day_config = pattern.get(day_name, {})
|
||||||
|
|
||||||
|
if day_config.get("enabled") and day_config.get("start"):
|
||||||
|
start_time = self._parse_time(day_config["start"])
|
||||||
|
if start_time:
|
||||||
|
start_local = datetime.combine(check_date, start_time, tzinfo=tz)
|
||||||
|
start_utc = start_local.astimezone(ZoneInfo("UTC")).replace(tzinfo=None)
|
||||||
|
if start_utc > now_utc:
|
||||||
|
return start_utc
|
||||||
|
|
||||||
|
elif schedule.schedule_type == "simple_interval" and schedule.cycle_time:
|
||||||
|
cycle_time = self._parse_time(schedule.cycle_time)
|
||||||
|
if cycle_time:
|
||||||
|
# Find next cycle time
|
||||||
|
for day_offset in range(2):
|
||||||
|
check_date = now_local.date() + timedelta(days=day_offset)
|
||||||
|
cycle_local = datetime.combine(check_date, cycle_time, tzinfo=tz)
|
||||||
|
cycle_utc = cycle_local.astimezone(ZoneInfo("UTC")).replace(tzinfo=None)
|
||||||
|
if cycle_utc > now_utc:
|
||||||
|
return cycle_utc
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _resolve_unit_id(self, schedule: RecurringSchedule) -> Optional[str]:
|
||||||
|
"""Get unit_id from schedule or active assignment."""
|
||||||
|
if schedule.unit_id:
|
||||||
|
return schedule.unit_id
|
||||||
|
|
||||||
|
# Try to get from active assignment
|
||||||
|
assignment = self.db.query(UnitAssignment).filter(
|
||||||
|
and_(
|
||||||
|
UnitAssignment.location_id == schedule.location_id,
|
||||||
|
UnitAssignment.status == "active",
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
return assignment.unit_id if assignment else None
|
||||||
|
|
||||||
|
def _action_exists(
|
||||||
|
self,
|
||||||
|
project_id: str,
|
||||||
|
location_id: str,
|
||||||
|
action_type: str,
|
||||||
|
scheduled_time: datetime,
|
||||||
|
) -> bool:
|
||||||
|
"""Check if an action already exists for this time slot."""
|
||||||
|
# Allow 5-minute window for duplicate detection
|
||||||
|
time_window_start = scheduled_time - timedelta(minutes=5)
|
||||||
|
time_window_end = scheduled_time + timedelta(minutes=5)
|
||||||
|
|
||||||
|
exists = self.db.query(ScheduledAction).filter(
|
||||||
|
and_(
|
||||||
|
ScheduledAction.project_id == project_id,
|
||||||
|
ScheduledAction.location_id == location_id,
|
||||||
|
ScheduledAction.action_type == action_type,
|
||||||
|
ScheduledAction.scheduled_time >= time_window_start,
|
||||||
|
ScheduledAction.scheduled_time <= time_window_end,
|
||||||
|
ScheduledAction.execution_status == "pending",
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
return exists is not None
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _parse_time(time_str: str) -> Optional[time]:
|
||||||
|
"""Parse time string "HH:MM" to time object."""
|
||||||
|
try:
|
||||||
|
parts = time_str.split(":")
|
||||||
|
return time(int(parts[0]), int(parts[1]))
|
||||||
|
except (ValueError, IndexError):
|
||||||
|
return None
|
||||||
|
|
||||||
|
def get_schedules_for_project(self, project_id: str) -> List[RecurringSchedule]:
|
||||||
|
"""Get all recurring schedules for a project."""
|
||||||
|
return self.db.query(RecurringSchedule).filter_by(project_id=project_id).all()
|
||||||
|
|
||||||
|
def get_enabled_schedules(self) -> List[RecurringSchedule]:
|
||||||
|
"""Get all enabled recurring schedules."""
|
||||||
|
return self.db.query(RecurringSchedule).filter_by(enabled=True).all()
|
||||||
|
|
||||||
|
|
||||||
|
def get_recurring_schedule_service(db: Session) -> RecurringScheduleService:
|
||||||
|
"""Get a RecurringScheduleService instance."""
|
||||||
|
return RecurringScheduleService(db)
|
||||||
541
backend/services/scheduler.py
Normal file
@@ -0,0 +1,541 @@
|
|||||||
|
"""
|
||||||
|
Scheduler Service
|
||||||
|
|
||||||
|
Executes scheduled actions for Projects system.
|
||||||
|
Monitors pending scheduled actions and executes them by calling device modules (SLMM/SFM).
|
||||||
|
|
||||||
|
Extended to support recurring schedules:
|
||||||
|
- Generates ScheduledActions from RecurringSchedule patterns
|
||||||
|
- Cleans up old completed/failed actions
|
||||||
|
|
||||||
|
This service runs as a background task in FastAPI, checking for pending actions
|
||||||
|
every minute and executing them when their scheduled time arrives.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
from typing import Optional, List, Dict, Any
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
from sqlalchemy import and_
|
||||||
|
|
||||||
|
from backend.database import SessionLocal
|
||||||
|
from backend.models import ScheduledAction, RecordingSession, MonitoringLocation, Project, RecurringSchedule
|
||||||
|
from backend.services.device_controller import get_device_controller, DeviceControllerError
|
||||||
|
from backend.services.alert_service import get_alert_service
|
||||||
|
import uuid
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class SchedulerService:
|
||||||
|
"""
|
||||||
|
Service for executing scheduled actions.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
scheduler = SchedulerService()
|
||||||
|
await scheduler.start() # Start background loop
|
||||||
|
scheduler.stop() # Stop background loop
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, check_interval: int = 60):
|
||||||
|
"""
|
||||||
|
Initialize scheduler.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
check_interval: Seconds between checks for pending actions (default: 60)
|
||||||
|
"""
|
||||||
|
self.check_interval = check_interval
|
||||||
|
self.running = False
|
||||||
|
self.task: Optional[asyncio.Task] = None
|
||||||
|
self.device_controller = get_device_controller()
|
||||||
|
|
||||||
|
async def start(self):
|
||||||
|
"""Start the scheduler background task."""
|
||||||
|
if self.running:
|
||||||
|
print("Scheduler is already running")
|
||||||
|
return
|
||||||
|
|
||||||
|
self.running = True
|
||||||
|
self.task = asyncio.create_task(self._run_loop())
|
||||||
|
print(f"Scheduler started (checking every {self.check_interval}s)")
|
||||||
|
|
||||||
|
def stop(self):
|
||||||
|
"""Stop the scheduler background task."""
|
||||||
|
self.running = False
|
||||||
|
if self.task:
|
||||||
|
self.task.cancel()
|
||||||
|
print("Scheduler stopped")
|
||||||
|
|
||||||
|
async def _run_loop(self):
|
||||||
|
"""Main scheduler loop."""
|
||||||
|
# Track when we last generated recurring actions (do this once per hour)
|
||||||
|
last_generation_check = datetime.utcnow() - timedelta(hours=1)
|
||||||
|
|
||||||
|
while self.running:
|
||||||
|
try:
|
||||||
|
# Execute pending actions
|
||||||
|
await self.execute_pending_actions()
|
||||||
|
|
||||||
|
# Generate actions from recurring schedules (every hour)
|
||||||
|
now = datetime.utcnow()
|
||||||
|
if (now - last_generation_check).total_seconds() >= 3600:
|
||||||
|
await self.generate_recurring_actions()
|
||||||
|
last_generation_check = now
|
||||||
|
|
||||||
|
# Cleanup old actions (also every hour, during generation cycle)
|
||||||
|
if (now - last_generation_check).total_seconds() < 60:
|
||||||
|
await self.cleanup_old_actions()
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Scheduler error: {e}", exc_info=True)
|
||||||
|
# Continue running even if there's an error
|
||||||
|
|
||||||
|
await asyncio.sleep(self.check_interval)
|
||||||
|
|
||||||
|
async def execute_pending_actions(self) -> List[Dict[str, Any]]:
|
||||||
|
"""
|
||||||
|
Find and execute all pending scheduled actions that are due.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of execution results
|
||||||
|
"""
|
||||||
|
db = SessionLocal()
|
||||||
|
results = []
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Find pending actions that are due
|
||||||
|
now = datetime.utcnow()
|
||||||
|
pending_actions = db.query(ScheduledAction).filter(
|
||||||
|
and_(
|
||||||
|
ScheduledAction.execution_status == "pending",
|
||||||
|
ScheduledAction.scheduled_time <= now,
|
||||||
|
)
|
||||||
|
).order_by(ScheduledAction.scheduled_time).all()
|
||||||
|
|
||||||
|
if not pending_actions:
|
||||||
|
return []
|
||||||
|
|
||||||
|
print(f"Found {len(pending_actions)} pending action(s) to execute")
|
||||||
|
|
||||||
|
for action in pending_actions:
|
||||||
|
result = await self._execute_action(action, db)
|
||||||
|
results.append(result)
|
||||||
|
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error executing pending actions: {e}")
|
||||||
|
db.rollback()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
return results
|
||||||
|
|
||||||
|
async def _execute_action(
|
||||||
|
self,
|
||||||
|
action: ScheduledAction,
|
||||||
|
db: Session,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Execute a single scheduled action.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
action: ScheduledAction to execute
|
||||||
|
db: Database session
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Execution result dict
|
||||||
|
"""
|
||||||
|
print(f"Executing action {action.id}: {action.action_type} for unit {action.unit_id}")
|
||||||
|
|
||||||
|
result = {
|
||||||
|
"action_id": action.id,
|
||||||
|
"action_type": action.action_type,
|
||||||
|
"unit_id": action.unit_id,
|
||||||
|
"scheduled_time": action.scheduled_time.isoformat(),
|
||||||
|
"success": False,
|
||||||
|
"error": None,
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Determine which unit to use
|
||||||
|
# If unit_id is specified, use it; otherwise get from location assignment
|
||||||
|
unit_id = action.unit_id
|
||||||
|
if not unit_id:
|
||||||
|
# Get assigned unit from location
|
||||||
|
from backend.models import UnitAssignment
|
||||||
|
assignment = db.query(UnitAssignment).filter(
|
||||||
|
and_(
|
||||||
|
UnitAssignment.location_id == action.location_id,
|
||||||
|
UnitAssignment.status == "active",
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not assignment:
|
||||||
|
raise Exception(f"No active unit assigned to location {action.location_id}")
|
||||||
|
|
||||||
|
unit_id = assignment.unit_id
|
||||||
|
|
||||||
|
# Execute the action based on type
|
||||||
|
if action.action_type == "start":
|
||||||
|
response = await self._execute_start(action, unit_id, db)
|
||||||
|
elif action.action_type == "stop":
|
||||||
|
response = await self._execute_stop(action, unit_id, db)
|
||||||
|
elif action.action_type == "download":
|
||||||
|
response = await self._execute_download(action, unit_id, db)
|
||||||
|
else:
|
||||||
|
raise Exception(f"Unknown action type: {action.action_type}")
|
||||||
|
|
||||||
|
# Mark action as completed
|
||||||
|
action.execution_status = "completed"
|
||||||
|
action.executed_at = datetime.utcnow()
|
||||||
|
action.module_response = json.dumps(response)
|
||||||
|
|
||||||
|
result["success"] = True
|
||||||
|
result["response"] = response
|
||||||
|
|
||||||
|
print(f"✓ Action {action.id} completed successfully")
|
||||||
|
|
||||||
|
# Create success alert
|
||||||
|
try:
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
alert_metadata = response.get("cycle_response", {}) if isinstance(response, dict) else {}
|
||||||
|
alert_service.create_schedule_completed_alert(
|
||||||
|
schedule_id=action.id,
|
||||||
|
action_type=action.action_type,
|
||||||
|
unit_id=unit_id,
|
||||||
|
project_id=action.project_id,
|
||||||
|
location_id=action.location_id,
|
||||||
|
metadata=alert_metadata,
|
||||||
|
)
|
||||||
|
except Exception as alert_err:
|
||||||
|
logger.warning(f"Failed to create success alert: {alert_err}")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
# Mark action as failed
|
||||||
|
action.execution_status = "failed"
|
||||||
|
action.executed_at = datetime.utcnow()
|
||||||
|
action.error_message = str(e)
|
||||||
|
|
||||||
|
result["error"] = str(e)
|
||||||
|
|
||||||
|
print(f"✗ Action {action.id} failed: {e}")
|
||||||
|
|
||||||
|
# Create failure alert
|
||||||
|
try:
|
||||||
|
alert_service = get_alert_service(db)
|
||||||
|
alert_service.create_schedule_failed_alert(
|
||||||
|
schedule_id=action.id,
|
||||||
|
action_type=action.action_type,
|
||||||
|
unit_id=unit_id if 'unit_id' in dir() else action.unit_id,
|
||||||
|
error_message=str(e),
|
||||||
|
project_id=action.project_id,
|
||||||
|
location_id=action.location_id,
|
||||||
|
)
|
||||||
|
except Exception as alert_err:
|
||||||
|
logger.warning(f"Failed to create failure alert: {alert_err}")
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
|
async def _execute_start(
|
||||||
|
self,
|
||||||
|
action: ScheduledAction,
|
||||||
|
unit_id: str,
|
||||||
|
db: Session,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""Execute a 'start' action using the start_cycle command.
|
||||||
|
|
||||||
|
start_cycle handles:
|
||||||
|
1. Sync device clock to server time
|
||||||
|
2. Find next safe index (with overwrite protection)
|
||||||
|
3. Start measurement
|
||||||
|
"""
|
||||||
|
# Execute the full start cycle via device controller
|
||||||
|
# SLMM handles clock sync, index increment, and start
|
||||||
|
cycle_response = await self.device_controller.start_cycle(
|
||||||
|
unit_id,
|
||||||
|
action.device_type,
|
||||||
|
sync_clock=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create recording session
|
||||||
|
session = RecordingSession(
|
||||||
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=action.project_id,
|
||||||
|
location_id=action.location_id,
|
||||||
|
unit_id=unit_id,
|
||||||
|
session_type="sound" if action.device_type == "slm" else "vibration",
|
||||||
|
started_at=datetime.utcnow(),
|
||||||
|
status="recording",
|
||||||
|
session_metadata=json.dumps({
|
||||||
|
"scheduled_action_id": action.id,
|
||||||
|
"cycle_response": cycle_response,
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
db.add(session)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"status": "started",
|
||||||
|
"session_id": session.id,
|
||||||
|
"cycle_response": cycle_response,
|
||||||
|
}
|
||||||
|
|
||||||
|
async def _execute_stop(
|
||||||
|
self,
|
||||||
|
action: ScheduledAction,
|
||||||
|
unit_id: str,
|
||||||
|
db: Session,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""Execute a 'stop' action using the stop_cycle command.
|
||||||
|
|
||||||
|
stop_cycle handles:
|
||||||
|
1. Stop measurement
|
||||||
|
2. Enable FTP
|
||||||
|
3. Download measurement folder
|
||||||
|
4. Verify download
|
||||||
|
"""
|
||||||
|
# Parse notes for download preference
|
||||||
|
include_download = True
|
||||||
|
try:
|
||||||
|
if action.notes:
|
||||||
|
notes_data = json.loads(action.notes)
|
||||||
|
include_download = notes_data.get("include_download", True)
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
pass # Notes is plain text, not JSON
|
||||||
|
|
||||||
|
# Execute the full stop cycle via device controller
|
||||||
|
# SLMM handles stop, FTP enable, and download
|
||||||
|
cycle_response = await self.device_controller.stop_cycle(
|
||||||
|
unit_id,
|
||||||
|
action.device_type,
|
||||||
|
download=include_download,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Find and update the active recording session
|
||||||
|
active_session = db.query(RecordingSession).filter(
|
||||||
|
and_(
|
||||||
|
RecordingSession.location_id == action.location_id,
|
||||||
|
RecordingSession.unit_id == unit_id,
|
||||||
|
RecordingSession.status == "recording",
|
||||||
|
)
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if active_session:
|
||||||
|
active_session.stopped_at = datetime.utcnow()
|
||||||
|
active_session.status = "completed"
|
||||||
|
active_session.duration_seconds = int(
|
||||||
|
(active_session.stopped_at - active_session.started_at).total_seconds()
|
||||||
|
)
|
||||||
|
# Store download info in session metadata
|
||||||
|
if cycle_response.get("download_success"):
|
||||||
|
try:
|
||||||
|
metadata = json.loads(active_session.session_metadata or "{}")
|
||||||
|
metadata["downloaded_folder"] = cycle_response.get("downloaded_folder")
|
||||||
|
metadata["local_path"] = cycle_response.get("local_path")
|
||||||
|
active_session.session_metadata = json.dumps(metadata)
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return {
|
||||||
|
"status": "stopped",
|
||||||
|
"session_id": active_session.id if active_session else None,
|
||||||
|
"cycle_response": cycle_response,
|
||||||
|
}
|
||||||
|
|
||||||
|
async def _execute_download(
|
||||||
|
self,
|
||||||
|
action: ScheduledAction,
|
||||||
|
unit_id: str,
|
||||||
|
db: Session,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""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()
|
||||||
|
|
||||||
|
if not location or not project:
|
||||||
|
raise Exception("Project or location not found")
|
||||||
|
|
||||||
|
# Build destination path (for logging/metadata reference)
|
||||||
|
# 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"
|
||||||
|
|
||||||
|
destination_path = (
|
||||||
|
f"data/Projects/{project.id}/{location_type_dir}/"
|
||||||
|
f"{location.name}/session-{session_timestamp}/"
|
||||||
|
)
|
||||||
|
|
||||||
|
# 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 in current measurement folder
|
||||||
|
)
|
||||||
|
|
||||||
|
# TODO: Create DataFile records for downloaded files
|
||||||
|
|
||||||
|
return {
|
||||||
|
"status": "downloaded",
|
||||||
|
"destination_path": destination_path,
|
||||||
|
"device_response": response,
|
||||||
|
}
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Recurring Schedule Generation
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def generate_recurring_actions(self) -> int:
|
||||||
|
"""
|
||||||
|
Generate ScheduledActions from all enabled recurring schedules.
|
||||||
|
|
||||||
|
Runs once per hour to generate actions for the next 7 days.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Total number of actions generated
|
||||||
|
"""
|
||||||
|
db = SessionLocal()
|
||||||
|
total_generated = 0
|
||||||
|
|
||||||
|
try:
|
||||||
|
from backend.services.recurring_schedule_service import get_recurring_schedule_service
|
||||||
|
|
||||||
|
service = get_recurring_schedule_service(db)
|
||||||
|
schedules = service.get_enabled_schedules()
|
||||||
|
|
||||||
|
if not schedules:
|
||||||
|
logger.debug("No enabled recurring schedules found")
|
||||||
|
return 0
|
||||||
|
|
||||||
|
logger.info(f"Generating actions for {len(schedules)} recurring schedule(s)")
|
||||||
|
|
||||||
|
for schedule in schedules:
|
||||||
|
try:
|
||||||
|
actions = service.generate_actions_for_schedule(schedule, horizon_days=7)
|
||||||
|
total_generated += len(actions)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error generating actions for schedule {schedule.id}: {e}")
|
||||||
|
|
||||||
|
if total_generated > 0:
|
||||||
|
logger.info(f"Generated {total_generated} scheduled actions from recurring schedules")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error in generate_recurring_actions: {e}", exc_info=True)
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
return total_generated
|
||||||
|
|
||||||
|
async def cleanup_old_actions(self, retention_days: int = 30) -> int:
|
||||||
|
"""
|
||||||
|
Remove old completed/failed actions to prevent database bloat.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
retention_days: Keep actions newer than this many days
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Number of actions cleaned up
|
||||||
|
"""
|
||||||
|
db = SessionLocal()
|
||||||
|
cleaned = 0
|
||||||
|
|
||||||
|
try:
|
||||||
|
cutoff = datetime.utcnow() - timedelta(days=retention_days)
|
||||||
|
|
||||||
|
old_actions = db.query(ScheduledAction).filter(
|
||||||
|
and_(
|
||||||
|
ScheduledAction.execution_status.in_(["completed", "failed", "cancelled"]),
|
||||||
|
ScheduledAction.executed_at < cutoff,
|
||||||
|
)
|
||||||
|
).all()
|
||||||
|
|
||||||
|
cleaned = len(old_actions)
|
||||||
|
for action in old_actions:
|
||||||
|
db.delete(action)
|
||||||
|
|
||||||
|
if cleaned > 0:
|
||||||
|
db.commit()
|
||||||
|
logger.info(f"Cleaned up {cleaned} old scheduled actions (>{retention_days} days)")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error cleaning up old actions: {e}")
|
||||||
|
db.rollback()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
return cleaned
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Manual Execution (for testing/debugging)
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def execute_action_by_id(self, action_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Manually execute a specific action by ID.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
action_id: ScheduledAction ID
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Execution result
|
||||||
|
"""
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
action = db.query(ScheduledAction).filter_by(id=action_id).first()
|
||||||
|
if not action:
|
||||||
|
return {"success": False, "error": "Action not found"}
|
||||||
|
|
||||||
|
result = await self._execute_action(action, db)
|
||||||
|
db.commit()
|
||||||
|
return result
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
db.rollback()
|
||||||
|
return {"success": False, "error": str(e)}
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
# Singleton instance
|
||||||
|
_scheduler_instance: Optional[SchedulerService] = None
|
||||||
|
|
||||||
|
|
||||||
|
def get_scheduler() -> SchedulerService:
|
||||||
|
"""
|
||||||
|
Get the scheduler singleton instance.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
SchedulerService instance
|
||||||
|
"""
|
||||||
|
global _scheduler_instance
|
||||||
|
if _scheduler_instance is None:
|
||||||
|
_scheduler_instance = SchedulerService()
|
||||||
|
return _scheduler_instance
|
||||||
|
|
||||||
|
|
||||||
|
async def start_scheduler():
|
||||||
|
"""Start the global scheduler instance."""
|
||||||
|
scheduler = get_scheduler()
|
||||||
|
await scheduler.start()
|
||||||
|
|
||||||
|
|
||||||
|
def stop_scheduler():
|
||||||
|
"""Stop the global scheduler instance."""
|
||||||
|
scheduler = get_scheduler()
|
||||||
|
scheduler.stop()
|
||||||
125
backend/services/slm_status_sync.py
Normal file
@@ -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
|
||||||
|
}
|
||||||
781
backend/services/slmm_client.py
Normal file
@@ -0,0 +1,781 @@
|
|||||||
|
"""
|
||||||
|
SLMM API Client Wrapper
|
||||||
|
|
||||||
|
Provides a clean interface for Terra-View to interact with the SLMM backend.
|
||||||
|
All SLM operations should go through this client instead of direct HTTP calls.
|
||||||
|
|
||||||
|
SLMM (Sound Level Meter Manager) is a separate service running on port 8100
|
||||||
|
that handles TCP/FTP communication with Rion NL-43/NL-53 devices.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
import os
|
||||||
|
from typing import Optional, Dict, Any, List
|
||||||
|
from datetime import datetime
|
||||||
|
import json
|
||||||
|
|
||||||
|
|
||||||
|
# SLMM backend base URLs - use environment variable if set (for Docker)
|
||||||
|
SLMM_BASE_URL = os.environ.get("SLMM_BASE_URL", "http://localhost:8100")
|
||||||
|
SLMM_API_BASE = f"{SLMM_BASE_URL}/api/nl43"
|
||||||
|
|
||||||
|
|
||||||
|
class SLMMClientError(Exception):
|
||||||
|
"""Base exception for SLMM client errors."""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class SLMMConnectionError(SLMMClientError):
|
||||||
|
"""Raised when cannot connect to SLMM backend."""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class SLMMDeviceError(SLMMClientError):
|
||||||
|
"""Raised when device operation fails."""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class SLMMClient:
|
||||||
|
"""
|
||||||
|
Client for interacting with SLMM backend.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
client = SLMMClient()
|
||||||
|
units = await client.get_all_units()
|
||||||
|
status = await client.get_unit_status("nl43-001")
|
||||||
|
await client.start_recording("nl43-001", config={...})
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, base_url: str = SLMM_BASE_URL, timeout: float = 30.0):
|
||||||
|
self.base_url = base_url
|
||||||
|
self.api_base = f"{base_url}/api/nl43"
|
||||||
|
self.timeout = timeout
|
||||||
|
|
||||||
|
async def _request(
|
||||||
|
self,
|
||||||
|
method: str,
|
||||||
|
endpoint: str,
|
||||||
|
data: Optional[Dict] = None,
|
||||||
|
params: Optional[Dict] = None,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Make an HTTP request to SLMM backend.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
method: HTTP method (GET, POST, PUT, DELETE)
|
||||||
|
endpoint: API endpoint (e.g., "/units", "/{unit_id}/status")
|
||||||
|
data: JSON body for POST/PUT requests
|
||||||
|
params: Query parameters
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response JSON as dict
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
SLMMConnectionError: Cannot reach SLMM
|
||||||
|
SLMMDeviceError: Device operation failed
|
||||||
|
"""
|
||||||
|
url = f"{self.api_base}{endpoint}"
|
||||||
|
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=self.timeout) as client:
|
||||||
|
response = await client.request(
|
||||||
|
method=method,
|
||||||
|
url=url,
|
||||||
|
json=data,
|
||||||
|
params=params,
|
||||||
|
)
|
||||||
|
response.raise_for_status()
|
||||||
|
|
||||||
|
# Handle empty responses
|
||||||
|
if not response.content:
|
||||||
|
return {}
|
||||||
|
|
||||||
|
return response.json()
|
||||||
|
|
||||||
|
except httpx.ConnectError as e:
|
||||||
|
raise SLMMConnectionError(
|
||||||
|
f"Cannot connect to SLMM backend at {self.base_url}. "
|
||||||
|
f"Is SLMM running? Error: {str(e)}"
|
||||||
|
)
|
||||||
|
except httpx.HTTPStatusError as e:
|
||||||
|
error_detail = "Unknown error"
|
||||||
|
try:
|
||||||
|
error_data = e.response.json()
|
||||||
|
error_detail = error_data.get("detail", str(error_data))
|
||||||
|
except:
|
||||||
|
error_detail = e.response.text or str(e)
|
||||||
|
|
||||||
|
raise SLMMDeviceError(
|
||||||
|
f"SLMM operation failed: {error_detail}"
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
raise SLMMClientError(f"Unexpected error: {str(e)}")
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Unit Management
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def get_all_units(self) -> List[Dict[str, Any]]:
|
||||||
|
"""
|
||||||
|
Get all configured SLM units from SLMM.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of unit dicts with id, config, and status
|
||||||
|
"""
|
||||||
|
# SLMM doesn't have a /units endpoint yet, so we'll need to add this
|
||||||
|
# For now, return empty list or implement when SLMM endpoint is ready
|
||||||
|
try:
|
||||||
|
response = await self._request("GET", "/units")
|
||||||
|
return response.get("units", [])
|
||||||
|
except SLMMClientError:
|
||||||
|
# Endpoint may not exist yet
|
||||||
|
return []
|
||||||
|
|
||||||
|
async def get_unit_config(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get unit configuration from SLMM cache.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier (e.g., "nl43-001")
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Config dict with host, tcp_port, ftp_port, etc.
|
||||||
|
"""
|
||||||
|
return await self._request("GET", f"/{unit_id}/config")
|
||||||
|
|
||||||
|
async def update_unit_config(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
host: Optional[str] = None,
|
||||||
|
tcp_port: Optional[int] = None,
|
||||||
|
ftp_port: Optional[int] = None,
|
||||||
|
ftp_username: Optional[str] = None,
|
||||||
|
ftp_password: Optional[str] = None,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Update unit configuration in SLMM cache.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
host: Device IP address
|
||||||
|
tcp_port: TCP control port (default: 2255)
|
||||||
|
ftp_port: FTP data port (default: 21)
|
||||||
|
ftp_username: FTP username
|
||||||
|
ftp_password: FTP password
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Updated config
|
||||||
|
"""
|
||||||
|
config = {}
|
||||||
|
if host is not None:
|
||||||
|
config["host"] = host
|
||||||
|
if tcp_port is not None:
|
||||||
|
config["tcp_port"] = tcp_port
|
||||||
|
if ftp_port is not None:
|
||||||
|
config["ftp_port"] = ftp_port
|
||||||
|
if ftp_username is not None:
|
||||||
|
config["ftp_username"] = ftp_username
|
||||||
|
if ftp_password is not None:
|
||||||
|
config["ftp_password"] = ftp_password
|
||||||
|
|
||||||
|
return await self._request("PUT", f"/{unit_id}/config", data=config)
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Status & Monitoring
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def get_unit_status(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get cached status snapshot from SLMM.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Status dict with measurement_state, lp, leq, battery, etc.
|
||||||
|
"""
|
||||||
|
return await self._request("GET", f"/{unit_id}/status")
|
||||||
|
|
||||||
|
async def get_live_data(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Request fresh data from device (DOD command).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Live data snapshot
|
||||||
|
"""
|
||||||
|
return await self._request("GET", f"/{unit_id}/live")
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Recording Control
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def start_recording(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
config: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Start recording on a unit.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
config: Optional recording config (interval, settings, etc.)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response from SLMM with success status
|
||||||
|
"""
|
||||||
|
return await self._request("POST", f"/{unit_id}/start", data=config or {})
|
||||||
|
|
||||||
|
async def stop_recording(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Stop recording on a unit.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response from SLMM
|
||||||
|
"""
|
||||||
|
return await self._request("POST", f"/{unit_id}/stop")
|
||||||
|
|
||||||
|
async def pause_recording(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Pause recording on a unit.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response from SLMM
|
||||||
|
"""
|
||||||
|
return await self._request("POST", f"/{unit_id}/pause")
|
||||||
|
|
||||||
|
async def resume_recording(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Resume paused recording on a unit.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response from SLMM
|
||||||
|
"""
|
||||||
|
return await self._request("POST", f"/{unit_id}/resume")
|
||||||
|
|
||||||
|
async def reset_data(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Reset measurement data on a unit.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Response from SLMM
|
||||||
|
"""
|
||||||
|
return await self._request("POST", f"/{unit_id}/reset")
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Store/Index Management
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def get_index_number(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get current store/index number from device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with current index_number (store name)
|
||||||
|
"""
|
||||||
|
return await self._request("GET", f"/{unit_id}/index-number")
|
||||||
|
|
||||||
|
async def set_index_number(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
index_number: int,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Set store/index number on device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
index_number: New index number to set
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Confirmation response
|
||||||
|
"""
|
||||||
|
return await self._request(
|
||||||
|
"PUT",
|
||||||
|
f"/{unit_id}/index-number",
|
||||||
|
data={"index_number": index_number},
|
||||||
|
)
|
||||||
|
|
||||||
|
async def check_overwrite_status(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Check if data exists at the current store index.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with:
|
||||||
|
- overwrite_status: "None" (safe) or "Exist" (would overwrite)
|
||||||
|
- will_overwrite: bool
|
||||||
|
- safe_to_store: bool
|
||||||
|
"""
|
||||||
|
return await self._request("GET", f"/{unit_id}/overwrite-check")
|
||||||
|
|
||||||
|
async def increment_index(self, unit_id: str, max_attempts: int = 100) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Find and set the next available (unused) store/index number.
|
||||||
|
|
||||||
|
Checks the current index - if it would overwrite existing data,
|
||||||
|
increments until finding an unused index number.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
max_attempts: Maximum number of indices to try before giving up
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with old_index, new_index, and attempts_made
|
||||||
|
"""
|
||||||
|
# Get current index
|
||||||
|
current = await self.get_index_number(unit_id)
|
||||||
|
old_index = current.get("index_number", 0)
|
||||||
|
|
||||||
|
# Check if current index is safe
|
||||||
|
overwrite_check = await self.check_overwrite_status(unit_id)
|
||||||
|
if overwrite_check.get("safe_to_store", False):
|
||||||
|
# Current index is safe, no need to increment
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"old_index": old_index,
|
||||||
|
"new_index": old_index,
|
||||||
|
"unit_id": unit_id,
|
||||||
|
"already_safe": True,
|
||||||
|
"attempts_made": 0,
|
||||||
|
}
|
||||||
|
|
||||||
|
# Need to find an unused index
|
||||||
|
attempts = 0
|
||||||
|
test_index = old_index + 1
|
||||||
|
|
||||||
|
while attempts < max_attempts:
|
||||||
|
# Set the new index
|
||||||
|
await self.set_index_number(unit_id, test_index)
|
||||||
|
|
||||||
|
# Check if this index is safe
|
||||||
|
overwrite_check = await self.check_overwrite_status(unit_id)
|
||||||
|
attempts += 1
|
||||||
|
|
||||||
|
if overwrite_check.get("safe_to_store", False):
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"old_index": old_index,
|
||||||
|
"new_index": test_index,
|
||||||
|
"unit_id": unit_id,
|
||||||
|
"already_safe": False,
|
||||||
|
"attempts_made": attempts,
|
||||||
|
}
|
||||||
|
|
||||||
|
# Try next index (wrap around at 9999)
|
||||||
|
test_index = (test_index + 1) % 10000
|
||||||
|
|
||||||
|
# Avoid infinite loops if we've wrapped around
|
||||||
|
if test_index == old_index:
|
||||||
|
break
|
||||||
|
|
||||||
|
# Could not find a safe index
|
||||||
|
raise SLMMDeviceError(
|
||||||
|
f"Could not find unused store index for {unit_id} after {attempts} attempts. "
|
||||||
|
f"Consider downloading and clearing data from the device."
|
||||||
|
)
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Device Settings
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def get_frequency_weighting(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get frequency weighting setting (A, C, or Z).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with current weighting
|
||||||
|
"""
|
||||||
|
return await self._request("GET", f"/{unit_id}/frequency-weighting")
|
||||||
|
|
||||||
|
async def set_frequency_weighting(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
weighting: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Set frequency weighting (A, C, or Z).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
weighting: "A", "C", or "Z"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Confirmation response
|
||||||
|
"""
|
||||||
|
return await self._request(
|
||||||
|
"PUT",
|
||||||
|
f"/{unit_id}/frequency-weighting",
|
||||||
|
data={"weighting": weighting},
|
||||||
|
)
|
||||||
|
|
||||||
|
async def get_time_weighting(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get time weighting setting (F, S, or I).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with current time weighting
|
||||||
|
"""
|
||||||
|
return await self._request("GET", f"/{unit_id}/time-weighting")
|
||||||
|
|
||||||
|
async def set_time_weighting(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
weighting: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Set time weighting (F=Fast, S=Slow, I=Impulse).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
weighting: "F", "S", or "I"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Confirmation response
|
||||||
|
"""
|
||||||
|
return await self._request(
|
||||||
|
"PUT",
|
||||||
|
f"/{unit_id}/time-weighting",
|
||||||
|
data={"weighting": weighting},
|
||||||
|
)
|
||||||
|
|
||||||
|
async def get_all_settings(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get all device settings.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with all settings
|
||||||
|
"""
|
||||||
|
return await self._request("GET", f"/{unit_id}/settings")
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# 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,
|
||||||
|
destination_path: str,
|
||||||
|
files: Optional[List[str]] = None,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Download measurement files from unit via FTP.
|
||||||
|
|
||||||
|
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: Reference path (for logging/metadata, not used by SLMM)
|
||||||
|
files: Ignored - always downloads the current measurement folder
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with download result including local_path, folder_name, etc.
|
||||||
|
"""
|
||||||
|
# Use the new method that automatically determines what to download
|
||||||
|
result = await self.download_current_measurement(unit_id)
|
||||||
|
result["requested_destination"] = destination_path
|
||||||
|
return result
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Cycle Commands (for scheduled automation)
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def start_cycle(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
sync_clock: bool = True,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Execute complete start cycle on device via SLMM.
|
||||||
|
|
||||||
|
This handles the full pre-recording workflow:
|
||||||
|
1. Sync device clock to server time
|
||||||
|
2. Find next safe index (with overwrite protection)
|
||||||
|
3. Start measurement
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
sync_clock: Whether to sync device clock to server time
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with clock_synced, old_index, new_index, started, etc.
|
||||||
|
"""
|
||||||
|
return await self._request(
|
||||||
|
"POST",
|
||||||
|
f"/{unit_id}/start-cycle",
|
||||||
|
data={"sync_clock": sync_clock},
|
||||||
|
)
|
||||||
|
|
||||||
|
async def stop_cycle(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
download: bool = True,
|
||||||
|
download_path: Optional[str] = None,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Execute complete stop cycle on device via SLMM.
|
||||||
|
|
||||||
|
This handles the full post-recording workflow:
|
||||||
|
1. Stop measurement
|
||||||
|
2. Enable FTP
|
||||||
|
3. Download measurement folder (if download=True)
|
||||||
|
4. Verify download
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
download: Whether to download measurement data
|
||||||
|
download_path: Custom path for downloaded ZIP (optional)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with stopped, ftp_enabled, download_success, local_path, etc.
|
||||||
|
"""
|
||||||
|
data = {"download": download}
|
||||||
|
if download_path:
|
||||||
|
data["download_path"] = download_path
|
||||||
|
return await self._request(
|
||||||
|
"POST",
|
||||||
|
f"/{unit_id}/stop-cycle",
|
||||||
|
data=data,
|
||||||
|
)
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Polling Status (for device monitoring/alerts)
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def get_polling_status(self) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get global polling status from SLMM.
|
||||||
|
|
||||||
|
Returns device reachability information for all polled devices.
|
||||||
|
Used by DeviceStatusMonitor to detect offline/online transitions.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with devices list containing:
|
||||||
|
- unit_id
|
||||||
|
- is_reachable
|
||||||
|
- consecutive_failures
|
||||||
|
- last_poll_attempt
|
||||||
|
- last_success
|
||||||
|
- last_error
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=self.timeout) as client:
|
||||||
|
response = await client.get(f"{self.base_url}/api/nl43/_polling/status")
|
||||||
|
response.raise_for_status()
|
||||||
|
return response.json()
|
||||||
|
except httpx.ConnectError:
|
||||||
|
raise SLMMConnectionError("Cannot connect to SLMM for polling status")
|
||||||
|
except Exception as e:
|
||||||
|
raise SLMMClientError(f"Failed to get polling status: {str(e)}")
|
||||||
|
|
||||||
|
async def get_device_polling_config(self, unit_id: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Get polling configuration for a specific device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with poll_enabled and poll_interval_seconds
|
||||||
|
"""
|
||||||
|
return await self._request("GET", f"/{unit_id}/polling/config")
|
||||||
|
|
||||||
|
async def update_device_polling_config(
|
||||||
|
self,
|
||||||
|
unit_id: str,
|
||||||
|
poll_enabled: Optional[bool] = None,
|
||||||
|
poll_interval_seconds: Optional[int] = None,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Update polling configuration for a device.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: Unit identifier
|
||||||
|
poll_enabled: Enable/disable polling
|
||||||
|
poll_interval_seconds: Polling interval (10-3600)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Updated config
|
||||||
|
"""
|
||||||
|
config = {}
|
||||||
|
if poll_enabled is not None:
|
||||||
|
config["poll_enabled"] = poll_enabled
|
||||||
|
if poll_interval_seconds is not None:
|
||||||
|
config["poll_interval_seconds"] = poll_interval_seconds
|
||||||
|
|
||||||
|
return await self._request("PUT", f"/{unit_id}/polling/config", data=config)
|
||||||
|
|
||||||
|
# ========================================================================
|
||||||
|
# Health Check
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
|
async def health_check(self) -> bool:
|
||||||
|
"""
|
||||||
|
Check if SLMM backend is reachable.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if SLMM is responding, False otherwise
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=5.0) as client:
|
||||||
|
response = await client.get(f"{self.base_url}/health")
|
||||||
|
return response.status_code == 200
|
||||||
|
except:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
# Singleton instance for convenience
|
||||||
|
_default_client: Optional[SLMMClient] = None
|
||||||
|
|
||||||
|
|
||||||
|
def get_slmm_client() -> SLMMClient:
|
||||||
|
"""
|
||||||
|
Get the default SLMM client instance.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
SLMMClient instance
|
||||||
|
"""
|
||||||
|
global _default_client
|
||||||
|
if _default_client is None:
|
||||||
|
_default_client = SLMMClient()
|
||||||
|
return _default_client
|
||||||
231
backend/services/slmm_sync.py
Normal file
@@ -0,0 +1,231 @@
|
|||||||
|
"""
|
||||||
|
SLMM Synchronization Service
|
||||||
|
|
||||||
|
This service ensures Terra-View roster is the single source of truth for SLM device configuration.
|
||||||
|
When SLM devices are added, edited, or deleted in Terra-View, changes are automatically synced to SLMM.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import httpx
|
||||||
|
import os
|
||||||
|
from typing import Optional
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from backend.models import RosterUnit
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
SLMM_BASE_URL = os.getenv("SLMM_BASE_URL", "http://localhost:8100")
|
||||||
|
|
||||||
|
|
||||||
|
async def sync_slm_to_slmm(unit: RosterUnit) -> bool:
|
||||||
|
"""
|
||||||
|
Sync a single SLM device from Terra-View roster to SLMM.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit: RosterUnit with device_type="slm"
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if sync successful, False otherwise
|
||||||
|
"""
|
||||||
|
if unit.device_type != "slm":
|
||||||
|
logger.warning(f"Attempted to sync non-SLM unit {unit.id} to SLMM")
|
||||||
|
return False
|
||||||
|
|
||||||
|
if not unit.slm_host:
|
||||||
|
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(
|
||||||
|
f"{SLMM_BASE_URL}/api/nl43/{unit.id}/config",
|
||||||
|
json={
|
||||||
|
"host": unit.slm_host,
|
||||||
|
"tcp_port": unit.slm_tcp_port or 2255,
|
||||||
|
"tcp_enabled": True,
|
||||||
|
"ftp_enabled": True,
|
||||||
|
"ftp_username": "USER", # Default NL43 credentials
|
||||||
|
"ftp_password": "0000",
|
||||||
|
"poll_enabled": should_poll, # Disable polling for benched or retired units
|
||||||
|
"poll_interval_seconds": 3600, # Default to 1 hour polling
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
if response.status_code in [200, 201]:
|
||||||
|
logger.info(f"✓ Synced SLM {unit.id} to SLMM at {unit.slm_host}:{unit.slm_tcp_port or 2255}")
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
logger.error(f"Failed to sync SLM {unit.id} to SLMM: {response.status_code} {response.text}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
except httpx.TimeoutException:
|
||||||
|
logger.error(f"Timeout syncing SLM {unit.id} to SLMM")
|
||||||
|
return False
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error syncing SLM {unit.id} to SLMM: {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
async def delete_slm_from_slmm(unit_id: str) -> bool:
|
||||||
|
"""
|
||||||
|
Delete a device from SLMM database.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
unit_id: The unit ID to delete
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if deletion successful or device doesn't exist, False on error
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=5.0) as client:
|
||||||
|
response = await client.delete(
|
||||||
|
f"{SLMM_BASE_URL}/api/nl43/{unit_id}/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
if response.status_code == 200:
|
||||||
|
logger.info(f"✓ Deleted SLM {unit_id} from SLMM")
|
||||||
|
return True
|
||||||
|
elif response.status_code == 404:
|
||||||
|
logger.info(f"SLM {unit_id} not found in SLMM (already deleted)")
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
logger.error(f"Failed to delete SLM {unit_id} from SLMM: {response.status_code} {response.text}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
except httpx.TimeoutException:
|
||||||
|
logger.error(f"Timeout deleting SLM {unit_id} from SLMM")
|
||||||
|
return False
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error deleting SLM {unit_id} from SLMM: {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
async def sync_all_slms_to_slmm(db: Session) -> dict:
|
||||||
|
"""
|
||||||
|
Sync all SLM devices from Terra-View roster to SLMM.
|
||||||
|
|
||||||
|
This ensures SLMM database matches Terra-View roster as the source of truth.
|
||||||
|
Should be called on Terra-View startup and optionally via admin endpoint.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
db: Database session
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dictionary with sync results
|
||||||
|
"""
|
||||||
|
logger.info("Starting full SLM sync to SLMM...")
|
||||||
|
|
||||||
|
# Get all SLM units from roster
|
||||||
|
slm_units = db.query(RosterUnit).filter_by(device_type="slm").all()
|
||||||
|
|
||||||
|
results = {
|
||||||
|
"total": len(slm_units),
|
||||||
|
"synced": 0,
|
||||||
|
"skipped": 0,
|
||||||
|
"failed": 0
|
||||||
|
}
|
||||||
|
|
||||||
|
for unit in slm_units:
|
||||||
|
# Skip units without host configured
|
||||||
|
if not unit.slm_host:
|
||||||
|
results["skipped"] += 1
|
||||||
|
logger.debug(f"Skipped {unit.unit_type} - no host configured")
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Sync to SLMM
|
||||||
|
success = await sync_slm_to_slmm(unit)
|
||||||
|
if success:
|
||||||
|
results["synced"] += 1
|
||||||
|
else:
|
||||||
|
results["failed"] += 1
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
f"SLM sync complete: {results['synced']} synced, "
|
||||||
|
f"{results['skipped']} skipped, {results['failed']} failed"
|
||||||
|
)
|
||||||
|
|
||||||
|
return results
|
||||||
|
|
||||||
|
|
||||||
|
async def get_slmm_devices() -> Optional[list]:
|
||||||
|
"""
|
||||||
|
Get list of all devices currently in SLMM database.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of device unit_ids, or None on error
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=5.0) as client:
|
||||||
|
response = await client.get(f"{SLMM_BASE_URL}/api/nl43/_polling/status")
|
||||||
|
|
||||||
|
if response.status_code == 200:
|
||||||
|
data = response.json()
|
||||||
|
return [device["unit_id"] for device in data["data"]["devices"]]
|
||||||
|
else:
|
||||||
|
logger.error(f"Failed to get SLMM devices: {response.status_code}")
|
||||||
|
return None
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error getting SLMM devices: {e}")
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
async def cleanup_orphaned_slmm_devices(db: Session) -> dict:
|
||||||
|
"""
|
||||||
|
Remove devices from SLMM that are not in Terra-View roster.
|
||||||
|
|
||||||
|
This cleans up orphaned test devices or devices that were manually added to SLMM.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
db: Database session
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dictionary with cleanup results
|
||||||
|
"""
|
||||||
|
logger.info("Checking for orphaned devices in SLMM...")
|
||||||
|
|
||||||
|
# Get all device IDs from SLMM
|
||||||
|
slmm_devices = await get_slmm_devices()
|
||||||
|
if slmm_devices is None:
|
||||||
|
return {"error": "Failed to get SLMM device list"}
|
||||||
|
|
||||||
|
# Get all SLM unit IDs from Terra-View roster
|
||||||
|
roster_units = db.query(RosterUnit.id).filter_by(device_type="slm").all()
|
||||||
|
roster_unit_ids = {unit.id for unit in roster_units}
|
||||||
|
|
||||||
|
# Find orphaned devices (in SLMM but not in roster)
|
||||||
|
orphaned = [uid for uid in slmm_devices if uid not in roster_unit_ids]
|
||||||
|
|
||||||
|
results = {
|
||||||
|
"total_in_slmm": len(slmm_devices),
|
||||||
|
"total_in_roster": len(roster_unit_ids),
|
||||||
|
"orphaned": len(orphaned),
|
||||||
|
"deleted": 0,
|
||||||
|
"failed": 0,
|
||||||
|
"orphaned_devices": orphaned
|
||||||
|
}
|
||||||
|
|
||||||
|
if not orphaned:
|
||||||
|
logger.info("No orphaned devices found in SLMM")
|
||||||
|
return results
|
||||||
|
|
||||||
|
logger.info(f"Found {len(orphaned)} orphaned devices in SLMM: {orphaned}")
|
||||||
|
|
||||||
|
# Delete orphaned devices
|
||||||
|
for unit_id in orphaned:
|
||||||
|
success = await delete_slm_from_slmm(unit_id)
|
||||||
|
if success:
|
||||||
|
results["deleted"] += 1
|
||||||
|
else:
|
||||||
|
results["failed"] += 1
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
f"Cleanup complete: {results['deleted']} deleted, {results['failed']} failed"
|
||||||
|
)
|
||||||
|
|
||||||
|
return results
|
||||||
@@ -108,6 +108,7 @@ def emit_status_snapshot():
|
|||||||
"last_calibrated": r.last_calibrated.isoformat() if r.last_calibrated else None,
|
"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,
|
"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_modem_id": r.deployed_with_modem_id,
|
||||||
|
"deployed_with_unit_id": r.deployed_with_unit_id,
|
||||||
"ip_address": r.ip_address,
|
"ip_address": r.ip_address,
|
||||||
"phone_number": r.phone_number,
|
"phone_number": r.phone_number,
|
||||||
"hardware_model": r.hardware_model,
|
"hardware_model": r.hardware_model,
|
||||||
@@ -137,6 +138,7 @@ def emit_status_snapshot():
|
|||||||
"last_calibrated": None,
|
"last_calibrated": None,
|
||||||
"next_calibration_due": None,
|
"next_calibration_due": None,
|
||||||
"deployed_with_modem_id": None,
|
"deployed_with_modem_id": None,
|
||||||
|
"deployed_with_unit_id": None,
|
||||||
"ip_address": None,
|
"ip_address": None,
|
||||||
"phone_number": None,
|
"phone_number": None,
|
||||||
"hardware_model": None,
|
"hardware_model": None,
|
||||||
@@ -146,6 +148,34 @@ def emit_status_snapshot():
|
|||||||
"coordinates": "",
|
"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
|
# Separate buckets for UI
|
||||||
active_units = {
|
active_units = {
|
||||||
uid: u for uid, u in units.items()
|
uid: u for uid, u in units.items()
|
||||||
|
|||||||
BIN
backend/static/icons/favicon-16.png
Normal file
|
After Width: | Height: | Size: 424 B |
BIN
backend/static/icons/favicon-32.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 5.0 KiB |
@@ -347,6 +347,3 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
console.error('Failed to initialize offline database:', error);
|
console.error('Failed to initialize offline database:', error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Export for use in other scripts
|
|
||||||
export default OfflineDB;
|
|
||||||
|
|||||||
BIN
backend/static/terra-view-logo-dark.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
backend/static/terra-view-logo-dark@2x.png
Normal file
|
After Width: | Height: | Size: 57 KiB |
BIN
backend/static/terra-view-logo-light.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
backend/static/terra-view-logo-light@2x.png
Normal file
|
After Width: | Height: | Size: 49 KiB |
39
backend/templates_config.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
"""
|
||||||
|
Shared Jinja2 templates configuration.
|
||||||
|
|
||||||
|
All routers should import `templates` from this module to get consistent
|
||||||
|
filter and global function registration.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from fastapi.templating import Jinja2Templates
|
||||||
|
|
||||||
|
# Import timezone utilities
|
||||||
|
from backend.utils.timezone import (
|
||||||
|
format_local_datetime, format_local_time,
|
||||||
|
get_user_timezone, get_timezone_abbreviation
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def jinja_local_datetime(dt, fmt="%Y-%m-%d %H:%M"):
|
||||||
|
"""Jinja filter to convert UTC datetime to local timezone."""
|
||||||
|
return format_local_datetime(dt, fmt)
|
||||||
|
|
||||||
|
|
||||||
|
def jinja_local_time(dt):
|
||||||
|
"""Jinja filter to format time in local timezone."""
|
||||||
|
return format_local_time(dt)
|
||||||
|
|
||||||
|
|
||||||
|
def jinja_timezone_abbr():
|
||||||
|
"""Jinja global to get current timezone abbreviation."""
|
||||||
|
return get_timezone_abbreviation()
|
||||||
|
|
||||||
|
|
||||||
|
# Create templates instance
|
||||||
|
templates = Jinja2Templates(directory="templates")
|
||||||
|
|
||||||
|
# Register Jinja filters and globals
|
||||||
|
templates.env.filters["local_datetime"] = jinja_local_datetime
|
||||||
|
templates.env.filters["local_time"] = jinja_local_time
|
||||||
|
templates.env.globals["timezone_abbr"] = jinja_timezone_abbr
|
||||||
|
templates.env.globals["get_user_timezone"] = get_user_timezone
|
||||||
1
backend/utils/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
# Utils package
|
||||||
173
backend/utils/timezone.py
Normal file
@@ -0,0 +1,173 @@
|
|||||||
|
"""
|
||||||
|
Timezone utilities for Terra-View.
|
||||||
|
|
||||||
|
Provides consistent timezone handling throughout the application.
|
||||||
|
All database times are stored in UTC; this module converts for display.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
from zoneinfo import ZoneInfo
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from backend.database import SessionLocal
|
||||||
|
from backend.models import UserPreferences
|
||||||
|
|
||||||
|
|
||||||
|
# Default timezone if none set
|
||||||
|
DEFAULT_TIMEZONE = "America/New_York"
|
||||||
|
|
||||||
|
|
||||||
|
def get_user_timezone() -> str:
|
||||||
|
"""
|
||||||
|
Get the user's configured timezone from preferences.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Timezone string (e.g., "America/New_York")
|
||||||
|
"""
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
prefs = db.query(UserPreferences).filter_by(id=1).first()
|
||||||
|
if prefs and prefs.timezone:
|
||||||
|
return prefs.timezone
|
||||||
|
return DEFAULT_TIMEZONE
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def get_timezone_info(tz_name: str = None) -> ZoneInfo:
|
||||||
|
"""
|
||||||
|
Get ZoneInfo object for the specified or user's timezone.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
tz_name: Timezone name, or None to use user preference
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
ZoneInfo object
|
||||||
|
"""
|
||||||
|
if tz_name is None:
|
||||||
|
tz_name = get_user_timezone()
|
||||||
|
try:
|
||||||
|
return ZoneInfo(tz_name)
|
||||||
|
except Exception:
|
||||||
|
return ZoneInfo(DEFAULT_TIMEZONE)
|
||||||
|
|
||||||
|
|
||||||
|
def utc_to_local(dt: datetime, tz_name: str = None) -> datetime:
|
||||||
|
"""
|
||||||
|
Convert a UTC datetime to local timezone.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
dt: Datetime in UTC (naive or aware)
|
||||||
|
tz_name: Target timezone, or None to use user preference
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Datetime in local timezone
|
||||||
|
"""
|
||||||
|
if dt is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
tz = get_timezone_info(tz_name)
|
||||||
|
|
||||||
|
# Assume naive datetime is UTC
|
||||||
|
if dt.tzinfo is None:
|
||||||
|
dt = dt.replace(tzinfo=ZoneInfo("UTC"))
|
||||||
|
|
||||||
|
return dt.astimezone(tz)
|
||||||
|
|
||||||
|
|
||||||
|
def local_to_utc(dt: datetime, tz_name: str = None) -> datetime:
|
||||||
|
"""
|
||||||
|
Convert a local datetime to UTC.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
dt: Datetime in local timezone (naive or aware)
|
||||||
|
tz_name: Source timezone, or None to use user preference
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Datetime in UTC (naive, for database storage)
|
||||||
|
"""
|
||||||
|
if dt is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
tz = get_timezone_info(tz_name)
|
||||||
|
|
||||||
|
# Assume naive datetime is in local timezone
|
||||||
|
if dt.tzinfo is None:
|
||||||
|
dt = dt.replace(tzinfo=tz)
|
||||||
|
|
||||||
|
# Convert to UTC and strip tzinfo for database storage
|
||||||
|
return dt.astimezone(ZoneInfo("UTC")).replace(tzinfo=None)
|
||||||
|
|
||||||
|
|
||||||
|
def format_local_datetime(dt: datetime, fmt: str = "%Y-%m-%d %H:%M", tz_name: str = None) -> str:
|
||||||
|
"""
|
||||||
|
Format a UTC datetime as local time string.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
dt: Datetime in UTC
|
||||||
|
fmt: strftime format string
|
||||||
|
tz_name: Target timezone, or None to use user preference
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Formatted datetime string in local time
|
||||||
|
"""
|
||||||
|
if dt is None:
|
||||||
|
return "N/A"
|
||||||
|
|
||||||
|
local_dt = utc_to_local(dt, tz_name)
|
||||||
|
return local_dt.strftime(fmt)
|
||||||
|
|
||||||
|
|
||||||
|
def format_local_time(dt: datetime, tz_name: str = None) -> str:
|
||||||
|
"""
|
||||||
|
Format a UTC datetime as local time (HH:MM format).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
dt: Datetime in UTC
|
||||||
|
tz_name: Target timezone
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Time string in HH:MM format
|
||||||
|
"""
|
||||||
|
return format_local_datetime(dt, "%H:%M", tz_name)
|
||||||
|
|
||||||
|
|
||||||
|
def format_local_date(dt: datetime, tz_name: str = None) -> str:
|
||||||
|
"""
|
||||||
|
Format a UTC datetime as local date (YYYY-MM-DD format).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
dt: Datetime in UTC
|
||||||
|
tz_name: Target timezone
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Date string
|
||||||
|
"""
|
||||||
|
return format_local_datetime(dt, "%Y-%m-%d", tz_name)
|
||||||
|
|
||||||
|
|
||||||
|
def get_timezone_abbreviation(tz_name: str = None) -> str:
|
||||||
|
"""
|
||||||
|
Get the abbreviation for a timezone (e.g., EST, EDT, PST).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
tz_name: Timezone name, or None to use user preference
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Timezone abbreviation
|
||||||
|
"""
|
||||||
|
tz = get_timezone_info(tz_name)
|
||||||
|
now = datetime.now(tz)
|
||||||
|
return now.strftime("%Z")
|
||||||
|
|
||||||
|
|
||||||
|
# Common US timezone choices for settings dropdown
|
||||||
|
TIMEZONE_CHOICES = [
|
||||||
|
("America/New_York", "Eastern Time (ET)"),
|
||||||
|
("America/Chicago", "Central Time (CT)"),
|
||||||
|
("America/Denver", "Mountain Time (MT)"),
|
||||||
|
("America/Los_Angeles", "Pacific Time (PT)"),
|
||||||
|
("America/Anchorage", "Alaska Time (AKT)"),
|
||||||
|
("Pacific/Honolulu", "Hawaii Time (HT)"),
|
||||||
|
("UTC", "UTC"),
|
||||||
|
]
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
services:
|
services:
|
||||||
|
|
||||||
# --- PRODUCTION ---
|
# --- TERRA-VIEW PRODUCTION ---
|
||||||
seismo-backend:
|
terra-view:
|
||||||
build: .
|
build: .
|
||||||
container_name: seismo-fleet-manager
|
container_name: terra-view
|
||||||
ports:
|
ports:
|
||||||
- "8001:8001"
|
- "8001:8001"
|
||||||
volumes:
|
volumes:
|
||||||
@@ -11,8 +11,12 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- PYTHONUNBUFFERED=1
|
- PYTHONUNBUFFERED=1
|
||||||
- ENVIRONMENT=production
|
- ENVIRONMENT=production
|
||||||
- SLMM_BASE_URL=http://172.19.0.1:8100
|
- SLMM_BASE_URL=http://host.docker.internal:8100
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
depends_on:
|
||||||
|
- slmm
|
||||||
|
extra_hosts:
|
||||||
|
- "host.docker.internal:host-gateway"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8001/health"]
|
test: ["CMD", "curl", "-f", "http://localhost:8001/health"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@@ -20,24 +24,48 @@ services:
|
|||||||
retries: 3
|
retries: 3
|
||||||
start_period: 40s
|
start_period: 40s
|
||||||
|
|
||||||
# --- DEVELOPMENT ---
|
# --- TERRA-VIEW DEVELOPMENT ---
|
||||||
sfm-dev:
|
# terra-view-dev:
|
||||||
build: .
|
# build: .
|
||||||
container_name: sfm-dev
|
# container_name: terra-view-dev
|
||||||
ports:
|
# ports:
|
||||||
- "1001:8001"
|
# - "1001:8001"
|
||||||
|
# volumes:
|
||||||
|
# - ./data-dev:/app/data
|
||||||
|
# environment:
|
||||||
|
# - PYTHONUNBUFFERED=1
|
||||||
|
# - ENVIRONMENT=development
|
||||||
|
# - SLMM_BASE_URL=http://slmm:8100
|
||||||
|
# restart: unless-stopped
|
||||||
|
# depends_on:
|
||||||
|
# - slmm
|
||||||
|
# healthcheck:
|
||||||
|
# test: ["CMD", "curl", "-f", "http://localhost:8001/health"]
|
||||||
|
# interval: 30s
|
||||||
|
# timeout: 10s
|
||||||
|
# retries: 3
|
||||||
|
# start_period: 40s
|
||||||
|
|
||||||
|
# --- SLMM (Sound Level Meter Manager) ---
|
||||||
|
slmm:
|
||||||
|
build:
|
||||||
|
context: ../slmm
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
container_name: slmm
|
||||||
|
network_mode: host
|
||||||
volumes:
|
volumes:
|
||||||
- ./data-dev:/app/data
|
- ../slmm/data:/app/data
|
||||||
environment:
|
environment:
|
||||||
- PYTHONUNBUFFERED=1
|
- PYTHONUNBUFFERED=1
|
||||||
- ENVIRONMENT=development
|
- PORT=8100
|
||||||
|
- CORS_ORIGINS=*
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8001/health"]
|
test: ["CMD", "curl", "-f", "http://localhost:8100/health"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
start_period: 40s
|
start_period: 10s
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
|
|||||||
276
docs/DEVICE_TYPE_DASHBOARDS.md
Normal file
@@ -0,0 +1,276 @@
|
|||||||
|
# Device Type Dashboards
|
||||||
|
|
||||||
|
This document describes the separate dashboard system for different device types in SFM.
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
SFM now has dedicated dashboards for each device type:
|
||||||
|
- **Main Dashboard** (`/`) - Combined overview of all devices
|
||||||
|
- **Seismographs Dashboard** (`/seismographs`) - Seismograph-specific view
|
||||||
|
- **Sound Level Meters Dashboard** (`/sound-level-meters`) - SLM-specific view
|
||||||
|
- **Fleet Roster** (`/roster`) - All devices with filtering and management
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
### 1. Main Dashboard
|
||||||
|
|
||||||
|
**Route**: `/`
|
||||||
|
**Template**: [templates/dashboard.html](../templates/dashboard.html)
|
||||||
|
**Purpose**: Combined overview showing all device types
|
||||||
|
|
||||||
|
**Features**:
|
||||||
|
- Fleet summary card now includes device type breakdown
|
||||||
|
- Shows count of seismographs and SLMs separately
|
||||||
|
- Links to dedicated dashboards for each device type
|
||||||
|
- Shared components: map, alerts, recent photos, fleet status
|
||||||
|
|
||||||
|
**Device Type Counts**:
|
||||||
|
The dashboard calculates device type counts in JavaScript from the snapshot data:
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// Device type counts
|
||||||
|
let seismoCount = 0;
|
||||||
|
let slmCount = 0;
|
||||||
|
Object.values(data.units || {}).forEach(unit => {
|
||||||
|
if (unit.retired) return; // Don't count retired units
|
||||||
|
const deviceType = unit.device_type || 'seismograph';
|
||||||
|
if (deviceType === 'seismograph') {
|
||||||
|
seismoCount++;
|
||||||
|
} else if (deviceType === 'sound_level_meter') {
|
||||||
|
slmCount++;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. Seismographs Dashboard
|
||||||
|
|
||||||
|
**Route**: `/seismographs`
|
||||||
|
**Template**: [templates/seismographs.html](../templates/seismographs.html)
|
||||||
|
**Router**: [backend/routers/seismo_dashboard.py](../backend/routers/seismo_dashboard.py)
|
||||||
|
|
||||||
|
**API Endpoints**:
|
||||||
|
- `GET /api/seismo-dashboard/stats` - Statistics summary (HTML partial)
|
||||||
|
- `GET /api/seismo-dashboard/units?search=<query>` - Unit list with search (HTML partial)
|
||||||
|
|
||||||
|
**Features**:
|
||||||
|
- Statistics cards (total, deployed, benched, with/without modem)
|
||||||
|
- Searchable unit list with real-time filtering
|
||||||
|
- Shows modem assignments
|
||||||
|
- Links to individual unit detail pages
|
||||||
|
|
||||||
|
**Stats Calculation** ([backend/routers/seismo_dashboard.py:18](../backend/routers/seismo_dashboard.py#L18)):
|
||||||
|
|
||||||
|
```python
|
||||||
|
seismos = db.query(RosterUnit).filter_by(
|
||||||
|
device_type="seismograph",
|
||||||
|
retired=False
|
||||||
|
).all()
|
||||||
|
|
||||||
|
total = len(seismos)
|
||||||
|
deployed = sum(1 for s in seismos if s.deployed)
|
||||||
|
benched = sum(1 for s in seismos if not s.deployed)
|
||||||
|
with_modem = sum(1 for s in seismos if s.deployed and s.deployed_with_modem_id)
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Sound Level Meters Dashboard
|
||||||
|
|
||||||
|
**Route**: `/sound-level-meters`
|
||||||
|
**Template**: [templates/sound_level_meters.html](../templates/sound_level_meters.html)
|
||||||
|
**Router**: [backend/routers/slm_dashboard.py](../backend/routers/slm_dashboard.py)
|
||||||
|
|
||||||
|
**API Endpoints**:
|
||||||
|
- `GET /api/slm-dashboard/stats` - Statistics summary (HTML partial)
|
||||||
|
- `GET /api/slm-dashboard/units?search=<query>` - Unit list with search (HTML partial)
|
||||||
|
- `GET /api/slm-dashboard/live-view/{unit_id}` - Live view panel (HTML partial)
|
||||||
|
|
||||||
|
**Features**:
|
||||||
|
- Statistics cards (total, deployed, benched, measuring)
|
||||||
|
- Searchable unit list
|
||||||
|
- Live view panel with real-time measurement data
|
||||||
|
- WebSocket integration for DRD streaming
|
||||||
|
- Shows modem assignments and IP resolution
|
||||||
|
|
||||||
|
See [SOUND_LEVEL_METERS_DASHBOARD.md](SOUND_LEVEL_METERS_DASHBOARD.md) for detailed SLM dashboard documentation.
|
||||||
|
|
||||||
|
## Navigation
|
||||||
|
|
||||||
|
The sidebar navigation ([templates/base.html:116-128](../templates/base.html#L116-L128)) includes links to both dashboards:
|
||||||
|
|
||||||
|
```html
|
||||||
|
<a href="/seismographs">
|
||||||
|
<svg>...</svg>
|
||||||
|
Seismographs
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<a href="/sound-level-meters">
|
||||||
|
<svg>...</svg>
|
||||||
|
Sound Level Meters
|
||||||
|
</a>
|
||||||
|
```
|
||||||
|
|
||||||
|
Active page highlighting is automatic based on `request.url.path`.
|
||||||
|
|
||||||
|
## Database Queries
|
||||||
|
|
||||||
|
All dashboards filter by device type using SQLAlchemy:
|
||||||
|
|
||||||
|
### Seismographs Query
|
||||||
|
```python
|
||||||
|
seismos = db.query(RosterUnit).filter_by(
|
||||||
|
device_type="seismograph",
|
||||||
|
retired=False
|
||||||
|
).all()
|
||||||
|
```
|
||||||
|
|
||||||
|
### Sound Level Meters Query
|
||||||
|
```python
|
||||||
|
slms = db.query(RosterUnit).filter_by(
|
||||||
|
device_type="slm",
|
||||||
|
retired=False
|
||||||
|
).all()
|
||||||
|
```
|
||||||
|
|
||||||
|
### With Search Filter
|
||||||
|
```python
|
||||||
|
query = db.query(RosterUnit).filter_by(
|
||||||
|
device_type="seismograph",
|
||||||
|
retired=False
|
||||||
|
)
|
||||||
|
|
||||||
|
if search:
|
||||||
|
query = query.filter(
|
||||||
|
(RosterUnit.id.ilike(f"%{search}%")) |
|
||||||
|
(RosterUnit.note.ilike(f"%{search}%")) |
|
||||||
|
(RosterUnit.address.ilike(f"%{search}%"))
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
## UI Components
|
||||||
|
|
||||||
|
### Stats Cards (Partials)
|
||||||
|
|
||||||
|
**Seismograph Stats**: [templates/partials/seismo_stats.html](../templates/partials/seismo_stats.html)
|
||||||
|
- Total Seismographs
|
||||||
|
- Deployed
|
||||||
|
- Benched
|
||||||
|
- With Modem (showing X / Y deployed)
|
||||||
|
|
||||||
|
**SLM Stats**: [templates/partials/slm_stats.html](../templates/partials/slm_stats.html)
|
||||||
|
- Total SLMs
|
||||||
|
- Deployed
|
||||||
|
- Benched
|
||||||
|
- Currently Measuring (from live status)
|
||||||
|
|
||||||
|
### Unit Lists (Partials)
|
||||||
|
|
||||||
|
**Seismograph List**: [templates/partials/seismo_unit_list.html](../templates/partials/seismo_unit_list.html)
|
||||||
|
|
||||||
|
Table columns:
|
||||||
|
- Unit ID (link to detail page)
|
||||||
|
- Status (Deployed/Benched badge)
|
||||||
|
- Modem (link to modem unit)
|
||||||
|
- Location (address or coordinates)
|
||||||
|
- Notes
|
||||||
|
- Actions (View Details link)
|
||||||
|
|
||||||
|
**SLM List**: [templates/partials/slm_unit_list.html](../templates/partials/slm_unit_list.html)
|
||||||
|
|
||||||
|
Table columns:
|
||||||
|
- Unit ID (link to detail page)
|
||||||
|
- Model (NL-43, NL-53)
|
||||||
|
- Status (Deployed/Benched badge)
|
||||||
|
- Modem (link to modem unit)
|
||||||
|
- Location
|
||||||
|
- Actions (View Details, Live View)
|
||||||
|
|
||||||
|
## HTMX Integration
|
||||||
|
|
||||||
|
Both dashboards use HTMX for dynamic updates:
|
||||||
|
|
||||||
|
### Auto-refresh Stats
|
||||||
|
```html
|
||||||
|
<div hx-get="/api/seismo-dashboard/stats"
|
||||||
|
hx-trigger="load, every 30s"
|
||||||
|
hx-swap="innerHTML">
|
||||||
|
```
|
||||||
|
|
||||||
|
### Search with Debouncing
|
||||||
|
```html
|
||||||
|
<input type="text"
|
||||||
|
hx-get="/api/seismo-dashboard/units"
|
||||||
|
hx-trigger="keyup changed delay:300ms"
|
||||||
|
hx-target="#seismo-units-list"
|
||||||
|
name="search" />
|
||||||
|
```
|
||||||
|
|
||||||
|
## Adding New Device Types
|
||||||
|
|
||||||
|
To add support for a new device type (e.g., "modem"):
|
||||||
|
|
||||||
|
1. **Create Router** (`backend/routers/modem_dashboard.py`):
|
||||||
|
```python
|
||||||
|
@router.get("/stats", response_class=HTMLResponse)
|
||||||
|
async def get_modem_stats(request: Request, db: Session = Depends(get_db)):
|
||||||
|
modems = db.query(RosterUnit).filter_by(
|
||||||
|
device_type="modem",
|
||||||
|
retired=False
|
||||||
|
).all()
|
||||||
|
# Calculate stats and return partial
|
||||||
|
```
|
||||||
|
|
||||||
|
2. **Create Templates**:
|
||||||
|
- `templates/modems.html` - Main dashboard page
|
||||||
|
- `templates/partials/modem_stats.html` - Stats cards
|
||||||
|
- `templates/partials/modem_unit_list.html` - Unit list table
|
||||||
|
|
||||||
|
3. **Register in main.py**:
|
||||||
|
```python
|
||||||
|
from backend.routers import modem_dashboard
|
||||||
|
app.include_router(modem_dashboard.router)
|
||||||
|
|
||||||
|
@app.get("/modems", response_class=HTMLResponse)
|
||||||
|
async def modems_page(request: Request):
|
||||||
|
return templates.TemplateResponse("modems.html", {"request": request})
|
||||||
|
```
|
||||||
|
|
||||||
|
4. **Add to Navigation** (`templates/base.html`):
|
||||||
|
```html
|
||||||
|
<a href="/modems">
|
||||||
|
<svg>...</svg>
|
||||||
|
Modems
|
||||||
|
</a>
|
||||||
|
```
|
||||||
|
|
||||||
|
5. **Update Main Dashboard** (`templates/dashboard.html`):
|
||||||
|
Add modem count to the device type breakdown:
|
||||||
|
```html
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<a href="/modems">Modems</a>
|
||||||
|
<span id="modem-count">--</span>
|
||||||
|
</div>
|
||||||
|
```
|
||||||
|
|
||||||
|
Update JavaScript to count modems:
|
||||||
|
```javascript
|
||||||
|
let modemCount = 0;
|
||||||
|
Object.values(data.units || {}).forEach(unit => {
|
||||||
|
if (unit.device_type === 'modem' && !unit.retired) {
|
||||||
|
modemCount++;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
document.getElementById('modem-count').textContent = modemCount;
|
||||||
|
```
|
||||||
|
|
||||||
|
## Benefits
|
||||||
|
|
||||||
|
1. **Separation of Concerns**: Each device type has its own dedicated interface
|
||||||
|
2. **Scalability**: Easy to add new device types following the established pattern
|
||||||
|
3. **Performance**: Queries are filtered by device type, reducing data transfer
|
||||||
|
4. **User Experience**: Users can focus on specific device types without clutter
|
||||||
|
5. **Maintainability**: Each dashboard is self-contained and easy to modify
|
||||||
|
|
||||||
|
## Related Documentation
|
||||||
|
|
||||||
|
- [SOUND_LEVEL_METERS_DASHBOARD.md](SOUND_LEVEL_METERS_DASHBOARD.md) - SLM dashboard details
|
||||||
|
- [DEVICE_TYPE_SLM_SUPPORT.md](DEVICE_TYPE_SLM_SUPPORT.md) - Adding SLM device type support
|
||||||
|
- [MODEM_INTEGRATION.md](MODEM_INTEGRATION.md) - Modem assignment architecture
|
||||||
288
docs/DEVICE_TYPE_SCHEMA.md
Normal file
@@ -0,0 +1,288 @@
|
|||||||
|
# Device Type Schema - Terra-View
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
Terra-View uses a single roster table to manage three different device types. The `device_type` field is the primary discriminator that determines which fields are relevant for each unit.
|
||||||
|
|
||||||
|
## Official device_type Values
|
||||||
|
|
||||||
|
As of **Terra-View v0.4.3**, the following device_type values are standardized:
|
||||||
|
|
||||||
|
### 1. `"seismograph"` (Default)
|
||||||
|
**Purpose**: Seismic monitoring devices
|
||||||
|
|
||||||
|
**Applicable Fields**:
|
||||||
|
- Common: id, unit_type, deployed, retired, note, project_id, location, address, coordinates
|
||||||
|
- Specific: last_calibrated, next_calibration_due, deployed_with_modem_id
|
||||||
|
|
||||||
|
**Examples**:
|
||||||
|
- `BE1234` - Series 3 seismograph
|
||||||
|
- `UM12345` - Series 4 Micromate unit
|
||||||
|
- `SEISMO-001` - Custom seismograph
|
||||||
|
|
||||||
|
**Unit Type Values**:
|
||||||
|
- `series3` - Series 3 devices (default)
|
||||||
|
- `series4` - Series 4 devices
|
||||||
|
- `micromate` - Micromate devices
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 2. `"modem"`
|
||||||
|
**Purpose**: Field modems and network equipment
|
||||||
|
|
||||||
|
**Applicable Fields**:
|
||||||
|
- Common: id, unit_type, deployed, retired, note, project_id, location, address, coordinates
|
||||||
|
- Specific: ip_address, phone_number, hardware_model
|
||||||
|
|
||||||
|
**Examples**:
|
||||||
|
- `MDM001` - Field modem
|
||||||
|
- `MODEM-2025-01` - Network modem
|
||||||
|
- `RAVEN-XTV-01` - Specific modem model
|
||||||
|
|
||||||
|
**Unit Type Values**:
|
||||||
|
- `modem` - Generic modem
|
||||||
|
- `raven-xtv` - Raven XTV model
|
||||||
|
- Custom values for specific hardware
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 3. `"slm"` ⭐
|
||||||
|
**Purpose**: Sound level meters (Rion NL-43/NL-53)
|
||||||
|
|
||||||
|
**Applicable Fields**:
|
||||||
|
- Common: id, unit_type, deployed, retired, note, project_id, location, address, coordinates
|
||||||
|
- Specific: slm_host, slm_tcp_port, slm_ftp_port, slm_model, slm_serial_number, slm_frequency_weighting, slm_time_weighting, slm_measurement_range, slm_last_check, deployed_with_modem_id
|
||||||
|
|
||||||
|
**Examples**:
|
||||||
|
- `SLM-43-01` - NL-43 sound level meter
|
||||||
|
- `NL43-001` - NL-43 unit
|
||||||
|
- `NL53-002` - NL-53 unit
|
||||||
|
|
||||||
|
**Unit Type Values**:
|
||||||
|
- `nl43` - Rion NL-43 model
|
||||||
|
- `nl53` - Rion NL-53 model
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Migration from Legacy Values
|
||||||
|
|
||||||
|
### Deprecated Values
|
||||||
|
|
||||||
|
The following device_type values have been **deprecated** and should be migrated:
|
||||||
|
|
||||||
|
- ❌ `"sound_level_meter"` → ✅ `"slm"`
|
||||||
|
|
||||||
|
### How to Migrate
|
||||||
|
|
||||||
|
Run the standardization migration script to update existing databases:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/serversdown/tmi/terra-view
|
||||||
|
python3 backend/migrate_standardize_device_types.py
|
||||||
|
```
|
||||||
|
|
||||||
|
This script:
|
||||||
|
- Converts all `"sound_level_meter"` values to `"slm"`
|
||||||
|
- Is idempotent (safe to run multiple times)
|
||||||
|
- Shows before/after distribution of device types
|
||||||
|
- No data loss
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Database Schema
|
||||||
|
|
||||||
|
### RosterUnit Model (`backend/models.py`)
|
||||||
|
|
||||||
|
```python
|
||||||
|
class RosterUnit(Base):
|
||||||
|
"""
|
||||||
|
Supports multiple device types:
|
||||||
|
- "seismograph" - Seismic monitoring devices (default)
|
||||||
|
- "modem" - Field modems and network equipment
|
||||||
|
- "slm" - Sound level meters (NL-43/NL-53)
|
||||||
|
"""
|
||||||
|
__tablename__ = "roster"
|
||||||
|
|
||||||
|
# Core fields (all device types)
|
||||||
|
id = Column(String, primary_key=True)
|
||||||
|
unit_type = Column(String, default="series3")
|
||||||
|
device_type = Column(String, default="seismograph") # "seismograph" | "modem" | "slm"
|
||||||
|
deployed = Column(Boolean, default=True)
|
||||||
|
retired = Column(Boolean, default=False)
|
||||||
|
# ... other common fields
|
||||||
|
|
||||||
|
# Seismograph-specific
|
||||||
|
last_calibrated = Column(Date, nullable=True)
|
||||||
|
next_calibration_due = Column(Date, nullable=True)
|
||||||
|
|
||||||
|
# Modem-specific
|
||||||
|
ip_address = Column(String, nullable=True)
|
||||||
|
phone_number = Column(String, nullable=True)
|
||||||
|
hardware_model = Column(String, nullable=True)
|
||||||
|
|
||||||
|
# SLM-specific
|
||||||
|
slm_host = Column(String, nullable=True)
|
||||||
|
slm_tcp_port = Column(Integer, nullable=True)
|
||||||
|
slm_ftp_port = Column(Integer, nullable=True)
|
||||||
|
slm_model = Column(String, nullable=True)
|
||||||
|
slm_serial_number = Column(String, nullable=True)
|
||||||
|
slm_frequency_weighting = Column(String, nullable=True)
|
||||||
|
slm_time_weighting = Column(String, nullable=True)
|
||||||
|
slm_measurement_range = Column(String, nullable=True)
|
||||||
|
slm_last_check = Column(DateTime, nullable=True)
|
||||||
|
|
||||||
|
# Shared fields (seismograph + SLM)
|
||||||
|
deployed_with_modem_id = Column(String, nullable=True) # FK to modem
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## API Usage
|
||||||
|
|
||||||
|
### Adding a New Unit
|
||||||
|
|
||||||
|
**Seismograph**:
|
||||||
|
```bash
|
||||||
|
curl -X POST http://localhost:8001/api/roster/add \
|
||||||
|
-F "id=BE1234" \
|
||||||
|
-F "device_type=seismograph" \
|
||||||
|
-F "unit_type=series3" \
|
||||||
|
-F "deployed=true"
|
||||||
|
```
|
||||||
|
|
||||||
|
**Modem**:
|
||||||
|
```bash
|
||||||
|
curl -X POST http://localhost:8001/api/roster/add \
|
||||||
|
-F "id=MDM001" \
|
||||||
|
-F "device_type=modem" \
|
||||||
|
-F "ip_address=192.0.2.10" \
|
||||||
|
-F "phone_number=+1-555-0100"
|
||||||
|
```
|
||||||
|
|
||||||
|
**Sound Level Meter**:
|
||||||
|
```bash
|
||||||
|
curl -X POST http://localhost:8001/api/roster/add \
|
||||||
|
-F "id=SLM-43-01" \
|
||||||
|
-F "device_type=slm" \
|
||||||
|
-F "slm_host=63.45.161.30" \
|
||||||
|
-F "slm_tcp_port=2255" \
|
||||||
|
-F "slm_model=NL-43"
|
||||||
|
```
|
||||||
|
|
||||||
|
### CSV Import Format
|
||||||
|
|
||||||
|
```csv
|
||||||
|
unit_id,unit_type,device_type,deployed,slm_host,slm_tcp_port,slm_model
|
||||||
|
SLM-43-01,nl43,slm,true,63.45.161.30,2255,NL-43
|
||||||
|
SLM-43-02,nl43,slm,true,63.45.161.31,2255,NL-43
|
||||||
|
BE1234,series3,seismograph,true,,,
|
||||||
|
MDM001,modem,modem,true,,,
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Frontend Behavior
|
||||||
|
|
||||||
|
### Device Type Selection
|
||||||
|
|
||||||
|
**Templates**: `unit_detail.html`, `roster.html`
|
||||||
|
|
||||||
|
```html
|
||||||
|
<select name="device_type">
|
||||||
|
<option value="seismograph">Seismograph</option>
|
||||||
|
<option value="modem">Modem</option>
|
||||||
|
<option value="slm">Sound Level Meter</option>
|
||||||
|
</select>
|
||||||
|
```
|
||||||
|
|
||||||
|
### Conditional Field Display
|
||||||
|
|
||||||
|
JavaScript functions check `device_type` to show/hide relevant fields:
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
function toggleDetailFields() {
|
||||||
|
const deviceType = document.getElementById('device_type').value;
|
||||||
|
|
||||||
|
if (deviceType === 'seismograph') {
|
||||||
|
// Show calibration fields
|
||||||
|
} else if (deviceType === 'modem') {
|
||||||
|
// Show network fields
|
||||||
|
} else if (deviceType === 'slm') {
|
||||||
|
// Show SLM configuration fields
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Code Conventions
|
||||||
|
|
||||||
|
### Always Use Lowercase
|
||||||
|
|
||||||
|
✅ **Correct**:
|
||||||
|
```python
|
||||||
|
if unit.device_type == "slm":
|
||||||
|
# Handle sound level meter
|
||||||
|
```
|
||||||
|
|
||||||
|
❌ **Incorrect**:
|
||||||
|
```python
|
||||||
|
if unit.device_type == "SLM": # Wrong - case sensitive
|
||||||
|
if unit.device_type == "sound_level_meter": # Deprecated
|
||||||
|
```
|
||||||
|
|
||||||
|
### Query Patterns
|
||||||
|
|
||||||
|
**Filter by device type**:
|
||||||
|
```python
|
||||||
|
# Get all SLMs
|
||||||
|
slms = db.query(RosterUnit).filter_by(device_type="slm").all()
|
||||||
|
|
||||||
|
# Get deployed seismographs
|
||||||
|
seismos = db.query(RosterUnit).filter_by(
|
||||||
|
device_type="seismograph",
|
||||||
|
deployed=True
|
||||||
|
).all()
|
||||||
|
|
||||||
|
# Get all modems
|
||||||
|
modems = db.query(RosterUnit).filter_by(device_type="modem").all()
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
### Verify Device Type Distribution
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Quick check
|
||||||
|
sqlite3 data/seismo_fleet.db "SELECT device_type, COUNT(*) FROM roster GROUP BY device_type;"
|
||||||
|
|
||||||
|
# Detailed view
|
||||||
|
sqlite3 data/seismo_fleet.db "SELECT id, device_type, unit_type, deployed FROM roster ORDER BY device_type, id;"
|
||||||
|
```
|
||||||
|
|
||||||
|
### Check for Legacy Values
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Should return 0 rows after migration
|
||||||
|
sqlite3 data/seismo_fleet.db "SELECT id FROM roster WHERE device_type = 'sound_level_meter';"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Version History
|
||||||
|
|
||||||
|
- **v0.4.3** (2026-01-16) - Standardized device_type values, deprecated `"sound_level_meter"` → `"slm"`
|
||||||
|
- **v0.4.0** (2026-01-05) - Added SLM support with `"sound_level_meter"` value
|
||||||
|
- **v0.2.0** (2025-12-03) - Added modem device type
|
||||||
|
- **v0.1.0** (2024-11-20) - Initial release with seismograph-only support
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Related Documentation
|
||||||
|
|
||||||
|
- [README.md](../README.md) - Main project documentation with data model
|
||||||
|
- [DEVICE_TYPE_SLM_SUPPORT.md](DEVICE_TYPE_SLM_SUPPORT.md) - Legacy SLM implementation notes
|
||||||
|
- [SOUND_LEVEL_METERS_DASHBOARD.md](SOUND_LEVEL_METERS_DASHBOARD.md) - SLM dashboard features
|
||||||
|
- [SLM_CONFIGURATION.md](SLM_CONFIGURATION.md) - SLM device configuration guide
|
||||||
161
docs/DEVICE_TYPE_SLM_SUPPORT.md
Normal file
@@ -0,0 +1,161 @@
|
|||||||
|
# Sound Level Meter Device Type Support
|
||||||
|
|
||||||
|
**⚠️ IMPORTANT**: This documentation uses the legacy `sound_level_meter` device type value. As of v0.4.3, the standardized value is `"slm"`. Run `backend/migrate_standardize_device_types.py` to update your database.
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
Added full support for "Sound Level Meter" as a device type in the roster management system. Users can now create, edit, and manage SLM units through the Fleet Roster interface.
|
||||||
|
|
||||||
|
## Changes Made
|
||||||
|
|
||||||
|
### 1. Frontend - Unit Detail Page
|
||||||
|
|
||||||
|
**File**: `templates/unit_detail.html`
|
||||||
|
|
||||||
|
#### Added Device Type Option
|
||||||
|
- Added "Sound Level Meter" option to device type dropdown (line 243)
|
||||||
|
- Value: `sound_level_meter`
|
||||||
|
|
||||||
|
#### Added SLM-Specific Fields Section (lines 320-370)
|
||||||
|
New form fields for Sound Level Meter configuration:
|
||||||
|
|
||||||
|
- **Host (IP Address)**: Device network address
|
||||||
|
- Field name: `slm_host`
|
||||||
|
- Example: `192.168.1.100`
|
||||||
|
|
||||||
|
- **TCP Port**: Control port (default 2255)
|
||||||
|
- Field name: `slm_tcp_port`
|
||||||
|
- Type: number
|
||||||
|
|
||||||
|
- **Model**: Device model designation
|
||||||
|
- Field name: `slm_model`
|
||||||
|
- Example: `NL-43`, `NL-53`
|
||||||
|
|
||||||
|
- **Serial Number**: Manufacturer serial number
|
||||||
|
- Field name: `slm_serial_number`
|
||||||
|
|
||||||
|
- **Frequency Weighting**: Sound measurement weighting curve
|
||||||
|
- Field name: `slm_frequency_weighting`
|
||||||
|
- Options: A-weighting, C-weighting, Z-weighting (Flat)
|
||||||
|
|
||||||
|
- **Time Weighting**: Temporal averaging method
|
||||||
|
- Field name: `slm_time_weighting`
|
||||||
|
- Options: Fast (125ms), Slow (1s), Impulse (35ms)
|
||||||
|
|
||||||
|
- **Measurement Range**: Device measurement capability
|
||||||
|
- Field name: `slm_measurement_range`
|
||||||
|
- Example: `30-130 dB`
|
||||||
|
|
||||||
|
#### Updated JavaScript Functions
|
||||||
|
|
||||||
|
**toggleDetailFields()** (lines 552-571)
|
||||||
|
- Now handles three device types: seismograph, modem, sound_level_meter
|
||||||
|
- Hides all device-specific sections, then shows only the relevant one
|
||||||
|
- Shows `slmFields` section when device type is `sound_level_meter`
|
||||||
|
|
||||||
|
**populateEditForm()** (lines 527-558)
|
||||||
|
- Populates all 7 SLM-specific fields from unit data
|
||||||
|
- Sets empty string as default if field is null
|
||||||
|
|
||||||
|
### 2. Backend - API Endpoints
|
||||||
|
|
||||||
|
**File**: `backend/routers/roster_edit.py`
|
||||||
|
|
||||||
|
#### Updated Add Unit Endpoint
|
||||||
|
`POST /api/roster/add`
|
||||||
|
|
||||||
|
**New Parameters** (lines 61-67):
|
||||||
|
- `slm_host`: str (optional)
|
||||||
|
- `slm_tcp_port`: int (optional)
|
||||||
|
- `slm_model`: str (optional)
|
||||||
|
- `slm_serial_number`: str (optional)
|
||||||
|
- `slm_frequency_weighting`: str (optional)
|
||||||
|
- `slm_time_weighting`: str (optional)
|
||||||
|
- `slm_measurement_range`: str (optional)
|
||||||
|
|
||||||
|
**Unit Creation** (lines 108-115):
|
||||||
|
All SLM fields are set when creating new unit.
|
||||||
|
|
||||||
|
#### Updated Get Unit Endpoint
|
||||||
|
`GET /api/roster/{unit_id}`
|
||||||
|
|
||||||
|
**New Response Fields** (lines 146-152):
|
||||||
|
Returns all 7 SLM fields in the response, with empty string as default if null.
|
||||||
|
|
||||||
|
#### Updated Edit Unit Endpoint
|
||||||
|
`POST /api/roster/edit/{unit_id}`
|
||||||
|
|
||||||
|
**New Parameters** (lines 177-183):
|
||||||
|
Same 7 SLM-specific parameters as add endpoint.
|
||||||
|
|
||||||
|
**Unit Update** (lines 232-239):
|
||||||
|
All SLM fields are updated when editing existing unit.
|
||||||
|
|
||||||
|
### 3. Database Schema
|
||||||
|
|
||||||
|
**File**: `backend/models.py`
|
||||||
|
|
||||||
|
The database schema already included SLM fields (no changes needed):
|
||||||
|
- All fields are nullable to support multiple device types
|
||||||
|
- Fields are only relevant when `device_type = "slm"`
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
### Creating a New SLM Unit
|
||||||
|
|
||||||
|
1. Go to Fleet Roster page
|
||||||
|
2. Click "Add Unit" or edit an existing unit
|
||||||
|
3. Select "Sound Level Meter" from Device Type dropdown
|
||||||
|
4. Fill in SLM-specific fields (Host, Port, Model, etc.)
|
||||||
|
5. Save
|
||||||
|
|
||||||
|
### Converting Existing Unit to SLM
|
||||||
|
|
||||||
|
1. Open unit detail page
|
||||||
|
2. Click "Edit Unit"
|
||||||
|
3. Change Device Type to "Sound Level Meter"
|
||||||
|
4. SLM fields section will appear
|
||||||
|
5. Fill in required SLM configuration
|
||||||
|
6. Save changes
|
||||||
|
|
||||||
|
### Field Visibility
|
||||||
|
|
||||||
|
The form automatically shows/hides relevant fields based on device type:
|
||||||
|
- **Seismograph**: Shows calibration dates, modem deployment info
|
||||||
|
- **Modem**: Shows IP, phone number, hardware model
|
||||||
|
- **Sound Level Meter**: Shows host, port, model, serial, weightings, range
|
||||||
|
|
||||||
|
## Integration with SLMM Dashboard
|
||||||
|
|
||||||
|
Units with `device_type = "slm"` will:
|
||||||
|
- Appear in the Sound Level Meters dashboard (`/sound-level-meters`)
|
||||||
|
- Be available for live monitoring and control
|
||||||
|
- Use the configured `slm_host` and `slm_tcp_port` for device communication
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
Test SLM units have been added via `add_test_slms.py`:
|
||||||
|
- `nl43-001` - Deployed at construction site A
|
||||||
|
- `nl43-002` - Deployed at construction site B
|
||||||
|
- `nl53-001` - Deployed at residential area
|
||||||
|
- `nl43-003` - Benched for calibration
|
||||||
|
|
||||||
|
You can edit any of these units to verify the form works correctly.
|
||||||
|
|
||||||
|
## Files Modified
|
||||||
|
|
||||||
|
1. `templates/unit_detail.html` - Added dropdown option, SLM fields section, updated JavaScript
|
||||||
|
2. `backend/routers/roster_edit.py` - Added SLM parameters to add/edit/get endpoints
|
||||||
|
3. `backend/models.py` - No changes (schema already supported SLM)
|
||||||
|
|
||||||
|
## Backward Compatibility
|
||||||
|
|
||||||
|
- Existing seismograph and modem units are unaffected
|
||||||
|
- All SLM fields are optional/nullable
|
||||||
|
- Forms gracefully handle units with missing device_type (defaults to seismograph)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Version**: 1.0.0
|
||||||
|
**Date**: January 5, 2026
|
||||||
|
**Related**: SOUND_LEVEL_METERS_DASHBOARD.md
|
||||||
132
docs/DEV_DATABASE_SETUP.md
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
# DEV Database Setup Instructions
|
||||||
|
|
||||||
|
## Current Situation
|
||||||
|
|
||||||
|
The test SLM and modem data was accidentally added to the **PRODUCTION** database (`data/seismo_fleet.db`).
|
||||||
|
|
||||||
|
**Good news**: I've already removed it! The production database is clean.
|
||||||
|
|
||||||
|
**Issue**: The DEV database (`data-dev/seismo_fleet.db`) is:
|
||||||
|
1. Owned by root (read-only for your user)
|
||||||
|
2. Missing the SLM-specific columns in its schema
|
||||||
|
|
||||||
|
## What You Need to Do
|
||||||
|
|
||||||
|
### Step 1: Fix DEV Database Permissions
|
||||||
|
|
||||||
|
Run this command to make the DEV database writable:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/serversdown/sfm/seismo-fleet-manager
|
||||||
|
sudo chown serversdown:serversdown data-dev/seismo_fleet.db
|
||||||
|
sudo chmod 664 data-dev/seismo_fleet.db
|
||||||
|
```
|
||||||
|
|
||||||
|
### Step 2: Migrate DEV Database Schema
|
||||||
|
|
||||||
|
Add the SLM columns to the DEV database:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python3 scripts/migrate_dev_db.py
|
||||||
|
```
|
||||||
|
|
||||||
|
This will add these columns to the `roster` table:
|
||||||
|
- `slm_host`
|
||||||
|
- `slm_tcp_port`
|
||||||
|
- `slm_model`
|
||||||
|
- `slm_serial_number`
|
||||||
|
- `slm_frequency_weighting`
|
||||||
|
- `slm_time_weighting`
|
||||||
|
- `slm_measurement_range`
|
||||||
|
- `slm_last_check`
|
||||||
|
|
||||||
|
### Step 3: Add Test Data to DEV
|
||||||
|
|
||||||
|
Now you can safely add test data to the DEV database:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Add test SLMs
|
||||||
|
python3 scripts/add_test_slms.py
|
||||||
|
|
||||||
|
# Add test modems and assign to SLMs
|
||||||
|
python3 scripts/add_test_modems.py
|
||||||
|
```
|
||||||
|
|
||||||
|
This will create:
|
||||||
|
- 4 test SLM units (nl43-001, nl43-002, nl53-001, nl43-003)
|
||||||
|
- 4 test modem units (modem-001, modem-002, modem-003, modem-004)
|
||||||
|
- Assign modems to the SLMs
|
||||||
|
|
||||||
|
## Production Database Status
|
||||||
|
|
||||||
|
✅ **Production database is CLEAN** - all test data has been removed.
|
||||||
|
|
||||||
|
The production database (`data/seismo_fleet.db`) is ready for real production use.
|
||||||
|
|
||||||
|
## Test Scripts
|
||||||
|
|
||||||
|
All test scripts have been updated to use the DEV database:
|
||||||
|
|
||||||
|
### Scripts Updated:
|
||||||
|
1. `scripts/add_test_slms.py` - Now uses `data-dev/seismo_fleet.db`
|
||||||
|
2. `scripts/add_test_modems.py` - Now uses `data-dev/seismo_fleet.db`
|
||||||
|
|
||||||
|
### Scripts Created:
|
||||||
|
1. `scripts/remove_test_data_from_prod.py` - Removes test data from production (already run)
|
||||||
|
2. `scripts/update_dev_db_schema.py` - Updates schema (doesn't work for SQLite ALTER)
|
||||||
|
3. `scripts/migrate_dev_db.py` - Adds SLM columns to DEV database
|
||||||
|
|
||||||
|
All helper scripts are located in the `scripts/` directory. See [scripts/README.md](../scripts/README.md) for detailed usage instructions.
|
||||||
|
|
||||||
|
## Verification
|
||||||
|
|
||||||
|
After running the steps above, verify everything worked:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Check DEV database has test data
|
||||||
|
sqlite3 data-dev/seismo_fleet.db "SELECT id, device_type FROM roster WHERE device_type IN ('sound_level_meter', 'modem');"
|
||||||
|
```
|
||||||
|
|
||||||
|
You should see:
|
||||||
|
```
|
||||||
|
nl43-001|sound_level_meter
|
||||||
|
nl43-002|sound_level_meter
|
||||||
|
nl53-001|sound_level_meter
|
||||||
|
nl43-003|sound_level_meter
|
||||||
|
modem-001|modem
|
||||||
|
modem-002|modem
|
||||||
|
modem-003|modem
|
||||||
|
modem-004|modem
|
||||||
|
```
|
||||||
|
|
||||||
|
## Development vs Production
|
||||||
|
|
||||||
|
### When to Use DEV Database
|
||||||
|
|
||||||
|
To use the DEV database, set the environment variable:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Not implemented yet, but you could add this to database.py:
|
||||||
|
export DATABASE_ENV=dev
|
||||||
|
```
|
||||||
|
|
||||||
|
Or modify `backend/database.py` to check for an environment variable.
|
||||||
|
|
||||||
|
### Current Setup
|
||||||
|
|
||||||
|
Right now, the application always uses `data/seismo_fleet.db` (production).
|
||||||
|
|
||||||
|
For development/testing, you could:
|
||||||
|
1. Point SFM to use the DEV database temporarily
|
||||||
|
2. Or keep test data in production (not recommended)
|
||||||
|
3. Or implement environment-based database selection
|
||||||
|
|
||||||
|
## Summary
|
||||||
|
|
||||||
|
- ✅ Production DB cleaned (no test data)
|
||||||
|
- ⚠️ DEV DB needs permission fix (run sudo commands above)
|
||||||
|
- ⚠️ DEV DB needs schema migration (run scripts/migrate_dev_db.py)
|
||||||
|
- ✅ Test scripts updated to use DEV DB
|
||||||
|
- ✅ All test data ready to be added to DEV DB
|
||||||
|
|
||||||
|
Run the commands above and you'll be all set!
|
||||||
62
docs/FIX_DEV_PERMISSIONS.md
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
# Fix DEV Database Permissions
|
||||||
|
|
||||||
|
## The Problem
|
||||||
|
|
||||||
|
SQLite needs write access to both the database file AND the directory it's in (to create temporary files like journals and WAL files).
|
||||||
|
|
||||||
|
Currently:
|
||||||
|
- ✅ Database file: `data-dev/seismo_fleet.db` - permissions fixed
|
||||||
|
- ❌ Directory: `data-dev/` - still owned by root
|
||||||
|
|
||||||
|
## The Fix
|
||||||
|
|
||||||
|
Run this command to fix the directory ownership:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo chown -R serversdown:serversdown /home/serversdown/sfm/seismo-fleet-manager/data-dev/
|
||||||
|
```
|
||||||
|
|
||||||
|
Then run the migration again:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python3 scripts/migrate_dev_db.py
|
||||||
|
```
|
||||||
|
|
||||||
|
## Full Setup Commands
|
||||||
|
|
||||||
|
Here's the complete sequence:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/serversdown/sfm/seismo-fleet-manager
|
||||||
|
|
||||||
|
# Fix directory ownership (includes all files inside)
|
||||||
|
sudo chown -R serversdown:serversdown data-dev/
|
||||||
|
|
||||||
|
# Migrate schema
|
||||||
|
python3 scripts/migrate_dev_db.py
|
||||||
|
|
||||||
|
# Add test data
|
||||||
|
python3 scripts/add_test_slms.py
|
||||||
|
python3 scripts/add_test_modems.py
|
||||||
|
```
|
||||||
|
|
||||||
|
## Verify It Worked
|
||||||
|
|
||||||
|
After running the migration, you should see:
|
||||||
|
|
||||||
|
```
|
||||||
|
Migrating DEV database to add SLM columns...
|
||||||
|
============================================================
|
||||||
|
✓ Added column: slm_host
|
||||||
|
✓ Added column: slm_tcp_port
|
||||||
|
✓ Added column: slm_model
|
||||||
|
✓ Added column: slm_serial_number
|
||||||
|
✓ Added column: slm_frequency_weighting
|
||||||
|
✓ Added column: slm_time_weighting
|
||||||
|
✓ Added column: slm_measurement_range
|
||||||
|
✓ Added column: slm_last_check
|
||||||
|
============================================================
|
||||||
|
DEV database migration completed!
|
||||||
|
```
|
||||||
|
|
||||||
|
Then the test data scripts should work without errors!
|
||||||
375
docs/MODEM_INTEGRATION.md
Normal file
@@ -0,0 +1,375 @@
|
|||||||
|
# Modem Integration System
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
The modem integration system allows Sound Level Meters (SLMs) and Seismographs to be deployed with network connectivity modems. Instead of storing IP addresses directly on each device, units are assigned to modems which provide the network connection. This enables:
|
||||||
|
|
||||||
|
- Centralized modem management and tracking
|
||||||
|
- IP address updates in one place
|
||||||
|
- Future modem API integration for diagnostics
|
||||||
|
- Proper asset tracking for network equipment
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
### Database Design
|
||||||
|
|
||||||
|
**Modem Units**: Stored as `RosterUnit` with `device_type = "modem"`
|
||||||
|
|
||||||
|
**Modem-Specific Fields**:
|
||||||
|
- `ip_address`: Network IP address or hostname
|
||||||
|
- `phone_number`: Cellular phone number (if applicable)
|
||||||
|
- `hardware_model`: Modem hardware (e.g., "Raven XTV", "Sierra Wireless AirLink")
|
||||||
|
|
||||||
|
**Device Assignment**:
|
||||||
|
- Both SLMs and Seismographs use `deployed_with_modem_id` to reference their modem
|
||||||
|
- This is a foreign key to another `RosterUnit.id` where `device_type = "modem"`
|
||||||
|
|
||||||
|
### How It Works
|
||||||
|
|
||||||
|
1. **Create Modem Units**
|
||||||
|
- Add modems as regular roster units with `device_type = "modem"`
|
||||||
|
- Set IP address, phone number, and hardware model
|
||||||
|
- Deploy or bench modems like any other asset
|
||||||
|
|
||||||
|
2. **Assign Devices to Modems**
|
||||||
|
- When editing an SLM or Seismograph, select modem from dropdown
|
||||||
|
- The `deployed_with_modem_id` field stores the modem ID
|
||||||
|
- IP address is fetched from the assigned modem at runtime
|
||||||
|
|
||||||
|
3. **Runtime Resolution**
|
||||||
|
- When SLM dashboard needs to connect to a device:
|
||||||
|
1. Load SLM unit data
|
||||||
|
2. Check `deployed_with_modem_id`
|
||||||
|
3. Fetch modem unit
|
||||||
|
4. Use modem's `ip_address` for connection
|
||||||
|
5. Fallback to legacy `slm_host` if no modem assigned
|
||||||
|
|
||||||
|
## Implementation Details
|
||||||
|
|
||||||
|
### Frontend Changes
|
||||||
|
|
||||||
|
#### Unit Detail Page (`templates/unit_detail.html`)
|
||||||
|
|
||||||
|
**SLM Fields** (lines 320-375):
|
||||||
|
- Removed direct "Host (IP Address)" field
|
||||||
|
- Added "Deployed With Modem" dropdown selector
|
||||||
|
- Dropdown populated with all active modems via JavaScript
|
||||||
|
- Shows modem ID, IP address, and hardware model in dropdown
|
||||||
|
|
||||||
|
**JavaScript** (lines 456-485):
|
||||||
|
```javascript
|
||||||
|
async function loadModemsList() {
|
||||||
|
// Fetches all modems from /api/roster/modems
|
||||||
|
// Populates both seismograph and SLM modem dropdowns
|
||||||
|
// Shows format: "modem-001 (192.168.1.100) - Raven XTV"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### SLM Dashboard (`backend/routers/slm_dashboard.py`)
|
||||||
|
|
||||||
|
**Live View Endpoint** (lines 84-148):
|
||||||
|
```python
|
||||||
|
# Get modem information if assigned
|
||||||
|
modem = None
|
||||||
|
modem_ip = None
|
||||||
|
if unit.deployed_with_modem_id:
|
||||||
|
modem = db.query(RosterUnit).filter_by(
|
||||||
|
id=unit.deployed_with_modem_id,
|
||||||
|
device_type="modem"
|
||||||
|
).first()
|
||||||
|
if modem:
|
||||||
|
modem_ip = modem.ip_address
|
||||||
|
|
||||||
|
# Fallback to direct slm_host (backward compatibility)
|
||||||
|
if not modem_ip and unit.slm_host:
|
||||||
|
modem_ip = unit.slm_host
|
||||||
|
```
|
||||||
|
|
||||||
|
**Live View Template** (`templates/partials/slm_live_view.html`):
|
||||||
|
- Displays modem information in header
|
||||||
|
- Shows "via Modem: modem-001 (192.168.1.100)"
|
||||||
|
- Warning if no modem assigned
|
||||||
|
|
||||||
|
### Backend Changes
|
||||||
|
|
||||||
|
#### New API Endpoint (`backend/routers/roster_edit.py`)
|
||||||
|
|
||||||
|
```python
|
||||||
|
GET /api/roster/modems
|
||||||
|
```
|
||||||
|
|
||||||
|
Returns list of all non-retired modem units:
|
||||||
|
```json
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"id": "modem-001",
|
||||||
|
"ip_address": "192.168.1.100",
|
||||||
|
"phone_number": "+1-555-0100",
|
||||||
|
"hardware_model": "Raven XTV",
|
||||||
|
"deployed": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
Used by frontend to populate modem selection dropdowns.
|
||||||
|
|
||||||
|
#### Database Schema (`backend/models.py`)
|
||||||
|
|
||||||
|
**Modem Assignment Field** (line 44):
|
||||||
|
```python
|
||||||
|
# Shared by seismographs and SLMs
|
||||||
|
deployed_with_modem_id = Column(String, nullable=True)
|
||||||
|
```
|
||||||
|
|
||||||
|
**Modem Fields** (lines 46-48):
|
||||||
|
```python
|
||||||
|
ip_address = Column(String, nullable=True)
|
||||||
|
phone_number = Column(String, nullable=True)
|
||||||
|
hardware_model = Column(String, nullable=True)
|
||||||
|
```
|
||||||
|
|
||||||
|
**Legacy SLM Fields** (kept for backward compatibility):
|
||||||
|
```python
|
||||||
|
slm_host = Column(String, nullable=True) # Deprecated - use modem instead
|
||||||
|
slm_tcp_port = Column(Integer, nullable=True) # Still used
|
||||||
|
```
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
### Creating Modem Units
|
||||||
|
|
||||||
|
1. Go to Fleet Roster
|
||||||
|
2. Click "Add Unit"
|
||||||
|
3. Set Device Type to "Modem"
|
||||||
|
4. Fill in:
|
||||||
|
- Unit ID (e.g., "modem-001")
|
||||||
|
- IP Address (e.g., "192.168.1.100")
|
||||||
|
- Phone Number (if cellular)
|
||||||
|
- Hardware Model (e.g., "Raven XTV")
|
||||||
|
- Address/Coordinates (physical location)
|
||||||
|
5. Set Deployed status
|
||||||
|
6. Save
|
||||||
|
|
||||||
|
### Assigning Modem to SLM
|
||||||
|
|
||||||
|
1. Open SLM unit detail page
|
||||||
|
2. Click "Edit Unit"
|
||||||
|
3. Ensure Device Type is "Sound Level Meter"
|
||||||
|
4. In "Deployed With Modem" dropdown, select modem
|
||||||
|
5. Verify TCP Port (default 2255)
|
||||||
|
6. Save
|
||||||
|
|
||||||
|
### Assigning Modem to Seismograph
|
||||||
|
|
||||||
|
Same process - both device types use the same modem selection field.
|
||||||
|
|
||||||
|
## Test Data
|
||||||
|
|
||||||
|
Use the included script to create test modems:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python3 add_test_modems.py
|
||||||
|
```
|
||||||
|
|
||||||
|
This creates:
|
||||||
|
- **modem-001**: 192.168.1.100, Raven XTV → assigned to nl43-001
|
||||||
|
- **modem-002**: 192.168.1.101, Raven XTV → assigned to nl43-002
|
||||||
|
- **modem-003**: 192.168.1.102, Sierra Wireless → assigned to nl53-001
|
||||||
|
- **modem-004**: Spare modem (not deployed)
|
||||||
|
|
||||||
|
## Benefits
|
||||||
|
|
||||||
|
### For Operations
|
||||||
|
|
||||||
|
1. **Centralized IP Management**
|
||||||
|
- Update modem IP once, affects all assigned devices
|
||||||
|
- Easy to track which modem serves which devices
|
||||||
|
- Inventory management for network equipment
|
||||||
|
|
||||||
|
2. **Asset Tracking**
|
||||||
|
- Modems are first-class assets in the roster
|
||||||
|
- Track deployment status, location, notes
|
||||||
|
- Can bench/retire modems independently
|
||||||
|
|
||||||
|
3. **Future Capabilities**
|
||||||
|
- Modem API integration (signal strength, data usage)
|
||||||
|
- Automatic IP updates from DHCP/cellular network
|
||||||
|
- Modem health monitoring
|
||||||
|
- Remote modem diagnostics
|
||||||
|
|
||||||
|
### For Maintenance
|
||||||
|
|
||||||
|
1. **Easier Troubleshooting**
|
||||||
|
- See which modem serves a device
|
||||||
|
- Check modem status separately
|
||||||
|
- Swap modems without reconfiguring devices
|
||||||
|
|
||||||
|
2. **Configuration Changes**
|
||||||
|
- Change IP addresses system-wide
|
||||||
|
- Move devices between modems
|
||||||
|
- Test with backup modems
|
||||||
|
|
||||||
|
## Migration from Legacy System
|
||||||
|
|
||||||
|
### For Existing SLMs with Direct IP
|
||||||
|
|
||||||
|
Legacy SLMs with `slm_host` set still work:
|
||||||
|
- System checks `deployed_with_modem_id` first
|
||||||
|
- Falls back to `slm_host` if no modem assigned
|
||||||
|
- Logs fallback usage for visibility
|
||||||
|
|
||||||
|
### Migration Steps
|
||||||
|
|
||||||
|
1. Create modem units for each IP address
|
||||||
|
2. Assign SLMs to their modems
|
||||||
|
3. System will use modem IP automatically
|
||||||
|
4. Legacy `slm_host` can be cleared (optional)
|
||||||
|
|
||||||
|
Script `add_test_modems.py` demonstrates this:
|
||||||
|
```python
|
||||||
|
# Clear legacy field after modem assignment
|
||||||
|
slm.slm_host = None
|
||||||
|
slm.deployed_with_modem_id = "modem-001"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Future Enhancements
|
||||||
|
|
||||||
|
### Near-term
|
||||||
|
|
||||||
|
1. **Modem Status Dashboard**
|
||||||
|
- List all modems with connection status
|
||||||
|
- Show which devices use each modem
|
||||||
|
- Signal strength, data usage indicators
|
||||||
|
|
||||||
|
2. **Automatic IP Discovery**
|
||||||
|
- Query cellular provider API for modem IPs
|
||||||
|
- Auto-update IP addresses in database
|
||||||
|
- Alert on IP changes
|
||||||
|
|
||||||
|
3. **Modem Health Monitoring**
|
||||||
|
- Ping modems periodically
|
||||||
|
- Check cellular signal quality
|
||||||
|
- Data usage tracking
|
||||||
|
|
||||||
|
### Long-term
|
||||||
|
|
||||||
|
1. **Modem API Integration**
|
||||||
|
- Direct modem management (Raven, Sierra APIs)
|
||||||
|
- Remote reboot capability
|
||||||
|
- Configuration backup/restore
|
||||||
|
- Firmware updates
|
||||||
|
|
||||||
|
2. **Network Topology View**
|
||||||
|
- Graphical view of modem-device relationships
|
||||||
|
- Network health visualization
|
||||||
|
- Troubleshooting tools
|
||||||
|
|
||||||
|
3. **Multi-Modem Support**
|
||||||
|
- Failover between modems
|
||||||
|
- Load balancing
|
||||||
|
- Automatic fallback on modem failure
|
||||||
|
|
||||||
|
## API Reference
|
||||||
|
|
||||||
|
### Get Modems List
|
||||||
|
|
||||||
|
**Endpoint**: `GET /api/roster/modems`
|
||||||
|
|
||||||
|
**Response**:
|
||||||
|
```json
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"id": "modem-001",
|
||||||
|
"ip_address": "192.168.1.100",
|
||||||
|
"phone_number": "+1-555-0100",
|
||||||
|
"hardware_model": "Raven XTV",
|
||||||
|
"deployed": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
**Used By**:
|
||||||
|
- Unit detail page (modem dropdown)
|
||||||
|
- Future modem management dashboard
|
||||||
|
|
||||||
|
### Get Unit with Modem Info
|
||||||
|
|
||||||
|
**Endpoint**: `GET /api/roster/{unit_id}`
|
||||||
|
|
||||||
|
**Response** (for SLM):
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": "nl43-001",
|
||||||
|
"device_type": "slm",
|
||||||
|
"deployed_with_modem_id": "modem-001",
|
||||||
|
"slm_tcp_port": 2255,
|
||||||
|
"slm_model": "NL-43",
|
||||||
|
...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Then fetch modem separately or use dashboard endpoint which resolves it automatically.
|
||||||
|
|
||||||
|
### SLM Live View (with modem resolution)
|
||||||
|
|
||||||
|
**Endpoint**: `GET /api/slm-dashboard/live-view/{unit_id}`
|
||||||
|
|
||||||
|
**Process**:
|
||||||
|
1. Loads SLM unit
|
||||||
|
2. Resolves `deployed_with_modem_id` to modem unit
|
||||||
|
3. Extracts `modem.ip_address`
|
||||||
|
4. Uses IP to connect to SLMM backend
|
||||||
|
5. Returns live view HTML with modem info
|
||||||
|
|
||||||
|
## Files Modified/Created
|
||||||
|
|
||||||
|
### Modified
|
||||||
|
1. `backend/models.py` - Clarified modem assignment field
|
||||||
|
2. `templates/unit_detail.html` - Added modem selector for SLMs
|
||||||
|
3. `backend/routers/roster_edit.py` - Added modems list endpoint
|
||||||
|
4. `backend/routers/slm_dashboard.py` - Modem resolution logic
|
||||||
|
5. `templates/partials/slm_live_view.html` - Display modem info
|
||||||
|
|
||||||
|
### Created
|
||||||
|
1. `add_test_modems.py` - Script to create test modems and assignments
|
||||||
|
2. `docs/MODEM_INTEGRATION.md` - This documentation
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### SLM shows "No modem assigned"
|
||||||
|
|
||||||
|
**Cause**: Unit has no `deployed_with_modem_id` set
|
||||||
|
|
||||||
|
**Solution**:
|
||||||
|
1. Edit the SLM unit
|
||||||
|
2. Select a modem from dropdown
|
||||||
|
3. Save
|
||||||
|
|
||||||
|
### Modem dropdown is empty
|
||||||
|
|
||||||
|
**Cause**: No modem units in database
|
||||||
|
|
||||||
|
**Solution**:
|
||||||
|
1. Create modem units first
|
||||||
|
2. Set `device_type = "modem"`
|
||||||
|
3. Ensure they're not retired
|
||||||
|
|
||||||
|
### Can't connect to SLM
|
||||||
|
|
||||||
|
**Possible Causes**:
|
||||||
|
1. Modem IP is incorrect
|
||||||
|
2. Modem is offline
|
||||||
|
3. SLM TCP port is wrong
|
||||||
|
4. Network routing issue
|
||||||
|
|
||||||
|
**Debug Steps**:
|
||||||
|
1. Check modem unit's IP address
|
||||||
|
2. Ping the modem IP
|
||||||
|
3. Check SLM's `slm_tcp_port` (default 2255)
|
||||||
|
4. Review logs for connection errors
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Version**: 1.0.0
|
||||||
|
**Date**: January 5, 2026
|
||||||
|
**Related**: SOUND_LEVEL_METERS_DASHBOARD.md, DEVICE_TYPE_SLM_SUPPORT.md
|
||||||
275
docs/SLM_CONFIGURATION.md
Normal file
@@ -0,0 +1,275 @@
|
|||||||
|
# SLM Configuration Interface
|
||||||
|
|
||||||
|
This document describes the SLM configuration interface added to the Sound Level Meters dashboard.
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
Sound Level Meters can now be configured directly from the dashboard without needing to navigate to the unit detail page. A configuration button appears on each SLM unit card on hover, opening a modal with all configurable parameters.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
### 1. Quick Access Configuration Button
|
||||||
|
|
||||||
|
- **Location**: Appears on each SLM unit card in the unit list
|
||||||
|
- **Behavior**: Shows on hover (desktop) or always visible (mobile)
|
||||||
|
- **Icon**: Gear/settings icon in top-right corner of unit card
|
||||||
|
|
||||||
|
### 2. Configuration Modal
|
||||||
|
|
||||||
|
The configuration modal provides a comprehensive interface for all SLM parameters:
|
||||||
|
|
||||||
|
#### Device Information
|
||||||
|
- **Model**: Dropdown selection (NL-43, NL-53)
|
||||||
|
- **Serial Number**: Text input for device serial number
|
||||||
|
|
||||||
|
#### Measurement Parameters
|
||||||
|
- **Frequency Weighting**: A, C, or Z (Linear)
|
||||||
|
- **Time Weighting**: Fast (125ms), Slow (1s), or Impulse
|
||||||
|
- **Measurement Range**: 30-130 dB, 40-140 dB, or 50-140 dB
|
||||||
|
|
||||||
|
#### Network Configuration
|
||||||
|
- **Assigned Modem**: Dropdown list of available modems
|
||||||
|
- Shows modem ID and IP address
|
||||||
|
- Option for "No modem (direct connection)"
|
||||||
|
- **Direct IP Address**: Only shown when no modem assigned
|
||||||
|
- **TCP Port**: Only shown when no modem assigned (default: 502)
|
||||||
|
|
||||||
|
### 3. Actions
|
||||||
|
|
||||||
|
The modal provides three action buttons:
|
||||||
|
|
||||||
|
- **Test Connection**: Tests network connectivity to the SLM
|
||||||
|
- Uses current form values (not saved values)
|
||||||
|
- Shows toast notification with results
|
||||||
|
- Green: Connection successful
|
||||||
|
- Yellow: Connection failed or device offline
|
||||||
|
- Red: Test error
|
||||||
|
|
||||||
|
- **Cancel**: Closes modal without saving changes
|
||||||
|
|
||||||
|
- **Save Configuration**: Saves all changes to database
|
||||||
|
- Shows success/error toast
|
||||||
|
- Refreshes unit list on success
|
||||||
|
- Auto-closes modal after 2 seconds
|
||||||
|
|
||||||
|
## Implementation
|
||||||
|
|
||||||
|
### Frontend Components
|
||||||
|
|
||||||
|
#### Unit List Partial
|
||||||
|
**File**: [templates/partials/slm_unit_list.html](../templates/partials/slm_unit_list.html)
|
||||||
|
|
||||||
|
```html
|
||||||
|
<!-- Configure button (appears on hover) -->
|
||||||
|
<button onclick="event.stopPropagation(); openConfigModal('{{ unit.id }}');"
|
||||||
|
class="absolute top-2 right-2 opacity-0 group-hover:opacity-100...">
|
||||||
|
<svg>...</svg>
|
||||||
|
</button>
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Configuration Modal
|
||||||
|
**File**: [templates/sound_level_meters.html](../templates/sound_level_meters.html#L73)
|
||||||
|
|
||||||
|
```html
|
||||||
|
<!-- Configuration Modal -->
|
||||||
|
<div id="config-modal" class="hidden fixed inset-0 bg-black bg-opacity-50...">
|
||||||
|
<div id="config-modal-content">
|
||||||
|
<!-- Content loaded via HTMX -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Configuration Form
|
||||||
|
**File**: [templates/partials/slm_config_form.html](../templates/partials/slm_config_form.html)
|
||||||
|
|
||||||
|
Form fields mapped to database columns:
|
||||||
|
- `slm_model` → `unit.slm_model`
|
||||||
|
- `slm_serial_number` → `unit.slm_serial_number`
|
||||||
|
- `slm_frequency_weighting` → `unit.slm_frequency_weighting`
|
||||||
|
- `slm_time_weighting` → `unit.slm_time_weighting`
|
||||||
|
- `slm_measurement_range` → `unit.slm_measurement_range`
|
||||||
|
- `deployed_with_modem_id` → `unit.deployed_with_modem_id`
|
||||||
|
- `slm_host` → `unit.slm_host` (legacy, only if no modem)
|
||||||
|
- `slm_tcp_port` → `unit.slm_tcp_port` (legacy, only if no modem)
|
||||||
|
|
||||||
|
### Backend Endpoints
|
||||||
|
|
||||||
|
#### GET /api/slm-dashboard/config/{unit_id}
|
||||||
|
**File**: [backend/routers/slm_dashboard.py:184](../backend/routers/slm_dashboard.py#L184)
|
||||||
|
|
||||||
|
Returns configuration form HTML partial with current unit values pre-populated.
|
||||||
|
|
||||||
|
**Response**: HTML partial (slm_config_form.html)
|
||||||
|
|
||||||
|
#### POST /api/slm-dashboard/config/{unit_id}
|
||||||
|
**File**: [backend/routers/slm_dashboard.py:203](../backend/routers/slm_dashboard.py#L203)
|
||||||
|
|
||||||
|
Saves configuration changes to database.
|
||||||
|
|
||||||
|
**Request**: Form data with configuration parameters
|
||||||
|
|
||||||
|
**Response**: JSON
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"status": "success",
|
||||||
|
"unit_id": "nl43-001"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Behavior**:
|
||||||
|
- Updates all SLM-specific fields from form data
|
||||||
|
- If modem is assigned: clears legacy `slm_host` and `slm_tcp_port`
|
||||||
|
- If no modem: uses direct IP fields from form
|
||||||
|
|
||||||
|
### JavaScript Functions
|
||||||
|
|
||||||
|
#### openConfigModal(unitId)
|
||||||
|
**File**: [templates/sound_level_meters.html:127](../templates/sound_level_meters.html#L127)
|
||||||
|
|
||||||
|
Opens configuration modal and loads form via HTMX.
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
function openConfigModal(unitId) {
|
||||||
|
const modal = document.getElementById('config-modal');
|
||||||
|
modal.classList.remove('hidden');
|
||||||
|
|
||||||
|
htmx.ajax('GET', `/api/slm-dashboard/config/${unitId}`, {
|
||||||
|
target: '#config-modal-content',
|
||||||
|
swap: 'innerHTML'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### closeConfigModal()
|
||||||
|
**File**: [templates/sound_level_meters.html:136](../templates/sound_level_meters.html#L136)
|
||||||
|
|
||||||
|
Closes configuration modal.
|
||||||
|
|
||||||
|
#### handleConfigSave(event)
|
||||||
|
**File**: [templates/partials/slm_config_form.html:109](../templates/partials/slm_config_form.html#L109)
|
||||||
|
|
||||||
|
Handles HTMX response after form submission:
|
||||||
|
- Shows success/error toast
|
||||||
|
- Refreshes unit list
|
||||||
|
- Auto-closes modal after 2 seconds
|
||||||
|
|
||||||
|
#### testConnection(unitId)
|
||||||
|
**File**: [templates/partials/slm_config_form.html:129](../templates/partials/slm_config_form.html#L129)
|
||||||
|
|
||||||
|
Tests connection to SLM unit:
|
||||||
|
```javascript
|
||||||
|
async function testConnection(unitId) {
|
||||||
|
const response = await fetch(`/api/slmm/${unitId}/status`);
|
||||||
|
const data = await response.json();
|
||||||
|
|
||||||
|
if (response.ok && data.status === 'online') {
|
||||||
|
// Show success toast
|
||||||
|
} else {
|
||||||
|
// Show warning toast
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### loadModemsForConfig()
|
||||||
|
**File**: [templates/partials/slm_config_form.html:87](../templates/partials/slm_config_form.html#L87)
|
||||||
|
|
||||||
|
Loads available modems from `/api/roster/modems` and populates dropdown.
|
||||||
|
|
||||||
|
## User Workflow
|
||||||
|
|
||||||
|
### Configuring an SLM
|
||||||
|
|
||||||
|
1. Navigate to Sound Level Meters dashboard ([/sound-level-meters](../sound-level-meters))
|
||||||
|
2. Hover over desired SLM unit card in the list
|
||||||
|
3. Click the gear icon that appears in top-right corner
|
||||||
|
4. Configuration modal opens with current values pre-filled
|
||||||
|
5. Modify desired parameters:
|
||||||
|
- Update model/serial if needed
|
||||||
|
- Set measurement parameters (frequency/time weighting, range)
|
||||||
|
- Choose network configuration:
|
||||||
|
- **Option A**: Select a modem from dropdown (recommended)
|
||||||
|
- **Option B**: Enter direct IP address and port
|
||||||
|
6. (Optional) Click "Test Connection" to verify network settings
|
||||||
|
7. Click "Save Configuration"
|
||||||
|
8. Modal shows success message and auto-closes
|
||||||
|
9. Unit list refreshes to show updated information
|
||||||
|
|
||||||
|
### Network Configuration Options
|
||||||
|
|
||||||
|
**Modem Assignment (Recommended)**:
|
||||||
|
- Select modem from dropdown
|
||||||
|
- IP address automatically resolved from modem's `ip_address` field
|
||||||
|
- Direct IP/port fields hidden
|
||||||
|
- Enables modem tracking and management
|
||||||
|
|
||||||
|
**Direct Connection (Legacy)**:
|
||||||
|
- Select "No modem (direct connection)"
|
||||||
|
- Enter IP address and TCP port manually
|
||||||
|
- Direct IP/port fields become visible
|
||||||
|
- Useful for temporary setups or non-modem connections
|
||||||
|
|
||||||
|
## Database Schema
|
||||||
|
|
||||||
|
The configuration interface updates these `roster` table columns:
|
||||||
|
|
||||||
|
```sql
|
||||||
|
-- SLM-specific fields
|
||||||
|
slm_model VARCHAR -- Device model (NL-43, NL-53)
|
||||||
|
slm_serial_number VARCHAR -- Serial number
|
||||||
|
slm_frequency_weighting VARCHAR -- A, C, or Z weighting
|
||||||
|
slm_time_weighting VARCHAR -- Fast, Slow, or Impulse
|
||||||
|
slm_measurement_range VARCHAR -- Measurement range (30-130, 40-140, 50-140)
|
||||||
|
|
||||||
|
-- Network configuration
|
||||||
|
deployed_with_modem_id VARCHAR -- FK to modem unit (preferred method)
|
||||||
|
slm_host VARCHAR -- Legacy direct IP (only if no modem)
|
||||||
|
slm_tcp_port INTEGER -- Legacy TCP port (only if no modem)
|
||||||
|
```
|
||||||
|
|
||||||
|
## UI/UX Design
|
||||||
|
|
||||||
|
### Modal Behavior
|
||||||
|
- **Opens**: Via configure button on unit card
|
||||||
|
- **Closes**:
|
||||||
|
- Cancel button
|
||||||
|
- X button in header
|
||||||
|
- Escape key
|
||||||
|
- Clicking outside modal (on backdrop)
|
||||||
|
- **Auto-close**: After successful save (2 second delay)
|
||||||
|
|
||||||
|
### Responsive Design
|
||||||
|
- **Desktop**: Configuration button appears on hover
|
||||||
|
- **Mobile**: Configuration button always visible
|
||||||
|
- **Modal**: Responsive width, scrollable on small screens
|
||||||
|
- **Form**: Two-column layout on desktop, single column on mobile
|
||||||
|
|
||||||
|
### Visual Feedback
|
||||||
|
- **Loading**: Skeleton loader while form loads
|
||||||
|
- **Saving**: HTMX handles form submission
|
||||||
|
- **Success**: Green toast notification
|
||||||
|
- **Error**: Red toast notification
|
||||||
|
- **Testing**: Blue toast while testing, then green/yellow/red based on result
|
||||||
|
|
||||||
|
### Accessibility
|
||||||
|
- **Keyboard**: Modal can be closed with Escape key
|
||||||
|
- **Focus**: Modal traps focus when open
|
||||||
|
- **Labels**: All form fields have proper labels
|
||||||
|
- **Colors**: Sufficient contrast in dark/light modes
|
||||||
|
|
||||||
|
## Future Enhancements
|
||||||
|
|
||||||
|
Potential improvements for future versions:
|
||||||
|
|
||||||
|
1. **Bulk Configuration**: Configure multiple SLMs at once
|
||||||
|
2. **Configuration Templates**: Save and apply configuration presets
|
||||||
|
3. **Configuration History**: Track configuration changes over time
|
||||||
|
4. **Remote Configuration**: Push configuration directly to device via SLMM
|
||||||
|
5. **Validation**: Real-time validation of IP addresses and ports
|
||||||
|
6. **Advanced Settings**: Additional NL-43/NL-53 specific parameters
|
||||||
|
7. **Configuration Import/Export**: JSON/CSV configuration files
|
||||||
|
|
||||||
|
## Related Documentation
|
||||||
|
|
||||||
|
- [SOUND_LEVEL_METERS_DASHBOARD.md](SOUND_LEVEL_METERS_DASHBOARD.md) - Main SLM dashboard
|
||||||
|
- [MODEM_INTEGRATION.md](MODEM_INTEGRATION.md) - Modem assignment architecture
|
||||||
|
- [DEVICE_TYPE_SLM_SUPPORT.md](DEVICE_TYPE_SLM_SUPPORT.md) - SLM device type implementation
|
||||||
333
docs/SOUND_LEVEL_METERS_DASHBOARD.md
Normal file
@@ -0,0 +1,333 @@
|
|||||||
|
# Sound Level Meters Dashboard
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
The Sound Level Meters dashboard is a new feature in SFM (soon to be rebranded as Terra-view) that provides real-time monitoring and control of Rion NL-43/NL-53 sound level meters through the SLMM backend integration.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
### 1. Dashboard Summary Statistics
|
||||||
|
- **Total Units**: Count of all SLM devices in the system
|
||||||
|
- **Deployed Units**: Active devices currently in the field
|
||||||
|
- **Active Now**: Units that have checked in within the last hour
|
||||||
|
- **Benched Units**: Devices not currently deployed
|
||||||
|
|
||||||
|
### 2. Unit List (Sidebar)
|
||||||
|
- Searchable list of all deployed SLM units
|
||||||
|
- Real-time status indicators:
|
||||||
|
- 🟢 Green: Active (recently checked in)
|
||||||
|
- ⚪ Gray: No check-in data
|
||||||
|
- Quick unit information:
|
||||||
|
- Device model (NL-43, NL-53, etc.)
|
||||||
|
- Location/address
|
||||||
|
- Network address (IP:port)
|
||||||
|
- Click any unit to view its live data
|
||||||
|
|
||||||
|
### 3. Live View Panel
|
||||||
|
|
||||||
|
When a unit is selected, the live view panel displays:
|
||||||
|
|
||||||
|
#### Control Buttons
|
||||||
|
- **Start**: Begin measurement
|
||||||
|
- **Pause**: Pause current measurement
|
||||||
|
- **Stop**: Stop measurement
|
||||||
|
- **Reset**: Reset measurement data
|
||||||
|
- **Start Live Stream**: Open WebSocket connection for real-time DRD data
|
||||||
|
|
||||||
|
#### Real-time Metrics
|
||||||
|
- **Lp (Current)**: Instantaneous sound level in dB
|
||||||
|
- **Leq (Average)**: Equivalent continuous sound level
|
||||||
|
- **Lmax (Peak)**: Maximum sound level recorded
|
||||||
|
- **Lmin**: Minimum sound level recorded
|
||||||
|
|
||||||
|
#### Live Chart
|
||||||
|
- Real-time line chart showing Lp and Leq over time
|
||||||
|
- 60-second rolling window (adjustable)
|
||||||
|
- Chart.js-powered visualization with dark mode support
|
||||||
|
- No animation for smooth real-time updates
|
||||||
|
|
||||||
|
#### Device Information
|
||||||
|
- Battery level and power source
|
||||||
|
- Frequency weighting (A, C, Z)
|
||||||
|
- Time weighting (F, S, I)
|
||||||
|
- SD card remaining space
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
### Frontend Components
|
||||||
|
|
||||||
|
#### Main Template
|
||||||
|
**File**: `templates/sound_level_meters.html`
|
||||||
|
|
||||||
|
The main dashboard page that includes:
|
||||||
|
- Page header and navigation integration
|
||||||
|
- Stats summary section (auto-refreshes every 10s)
|
||||||
|
- Two-column layout: unit list (left) + live view (right)
|
||||||
|
- JavaScript functions for unit selection and WebSocket streaming
|
||||||
|
|
||||||
|
#### Partial Templates
|
||||||
|
|
||||||
|
1. **slm_stats.html** - Summary statistics cards
|
||||||
|
- Auto-loads on page load
|
||||||
|
- Refreshes every 10 seconds via HTMX
|
||||||
|
|
||||||
|
2. **slm_unit_list.html** - Searchable unit list
|
||||||
|
- Auto-loads on page load
|
||||||
|
- Refreshes every 10 seconds via HTMX
|
||||||
|
- Supports search filtering
|
||||||
|
|
||||||
|
3. **slm_live_view.html** - Live data panel for selected unit
|
||||||
|
- Loaded on-demand when unit is selected
|
||||||
|
- Includes Chart.js for visualization
|
||||||
|
- WebSocket connection for streaming data
|
||||||
|
|
||||||
|
4. **slm_live_view_error.html** - Error state display
|
||||||
|
|
||||||
|
### Backend Components
|
||||||
|
|
||||||
|
#### Router: `backend/routers/slm_dashboard.py`
|
||||||
|
|
||||||
|
**Endpoints:**
|
||||||
|
|
||||||
|
```python
|
||||||
|
GET /api/slm-dashboard/stats
|
||||||
|
```
|
||||||
|
Returns HTML partial with summary statistics.
|
||||||
|
|
||||||
|
```python
|
||||||
|
GET /api/slm-dashboard/units?search={term}
|
||||||
|
```
|
||||||
|
Returns HTML partial with filtered unit list.
|
||||||
|
|
||||||
|
```python
|
||||||
|
GET /api/slm-dashboard/live-view/{unit_id}
|
||||||
|
```
|
||||||
|
Returns HTML partial with live view panel for specific unit.
|
||||||
|
- Fetches unit details from database
|
||||||
|
- Queries SLMM API for current measurement state
|
||||||
|
- Queries SLMM API for live status (DOD data)
|
||||||
|
|
||||||
|
```python
|
||||||
|
POST /api/slm-dashboard/control/{unit_id}/{action}
|
||||||
|
```
|
||||||
|
Sends control commands to SLMM backend.
|
||||||
|
- Valid actions: start, stop, pause, resume, reset
|
||||||
|
- Proxies to `http://localhost:8100/api/nl43/{unit_id}/{action}`
|
||||||
|
|
||||||
|
### Integration with SLMM
|
||||||
|
|
||||||
|
The dashboard communicates with the SLMM backend service running on port 8100:
|
||||||
|
|
||||||
|
**REST API Calls:**
|
||||||
|
- `GET /api/nl43/{unit_id}/measurement-state` - Check if measuring
|
||||||
|
- `GET /api/nl43/{unit_id}/live` - Get current DOD data
|
||||||
|
- `POST /api/nl43/{unit_id}/start|stop|pause|resume|reset` - Control commands
|
||||||
|
|
||||||
|
**WebSocket Streaming:**
|
||||||
|
- `WS /api/nl43/{unit_id}/live` - Real-time DRD data stream
|
||||||
|
- Proxied through SFM at `/api/slmm/{unit_id}/live`
|
||||||
|
- Streams continuous measurement data for live charting
|
||||||
|
|
||||||
|
### Database Schema
|
||||||
|
|
||||||
|
**Table**: `roster`
|
||||||
|
|
||||||
|
SLM-specific fields in the RosterUnit model:
|
||||||
|
|
||||||
|
```python
|
||||||
|
device_type = "slm" # Distinguishes SLMs from seismographs
|
||||||
|
slm_host = String # Device IP or hostname
|
||||||
|
slm_tcp_port = Integer # TCP control port (default 2255)
|
||||||
|
slm_model = String # NL-43, NL-53, etc.
|
||||||
|
slm_serial_number = String # Device serial number
|
||||||
|
slm_frequency_weighting = String # A, C, or Z weighting
|
||||||
|
slm_time_weighting = String # F (Fast), S (Slow), I (Impulse)
|
||||||
|
slm_measurement_range = String # e.g., "30-130 dB"
|
||||||
|
slm_last_check = DateTime # Last communication timestamp
|
||||||
|
```
|
||||||
|
|
||||||
|
## Navigation
|
||||||
|
|
||||||
|
The Sound Level Meters page is accessible from:
|
||||||
|
- **URL**: `/sound-level-meters`
|
||||||
|
- **Sidebar**: "Sound Level Meters" menu item (between Fleet Roster and Projects)
|
||||||
|
- **Icon**: Speaker/sound wave SVG icon
|
||||||
|
|
||||||
|
## Real-time Updates
|
||||||
|
|
||||||
|
The dashboard uses three mechanisms for real-time updates:
|
||||||
|
|
||||||
|
1. **HTMX Polling** (10-second intervals)
|
||||||
|
- Summary statistics
|
||||||
|
- Unit list
|
||||||
|
- Ensures data freshness even without user interaction
|
||||||
|
|
||||||
|
2. **On-Demand Loading** (HTMX)
|
||||||
|
- Live view panel loads when unit is selected
|
||||||
|
- Control button responses
|
||||||
|
|
||||||
|
3. **WebSocket Streaming** (continuous)
|
||||||
|
- Real-time DRD data for live charting
|
||||||
|
- User-initiated via "Start Live Stream" button
|
||||||
|
- Automatically closed on page unload or unit change
|
||||||
|
|
||||||
|
## Measurement Duration Tracking
|
||||||
|
|
||||||
|
**Important**: The NL-43/NL-53 devices do not expose measurement duration via their API. Elapsed time and interval counts are only visible on the device's on-screen display (OSD).
|
||||||
|
|
||||||
|
**Solution**: Track measurement start time in your application when calling the `/start` endpoint:
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// When starting measurement
|
||||||
|
const startTime = new Date();
|
||||||
|
localStorage.setItem(`slm_${unitId}_start`, startTime.toISOString());
|
||||||
|
|
||||||
|
// Calculate elapsed time
|
||||||
|
const startTime = new Date(localStorage.getItem(`slm_${unitId}_start`));
|
||||||
|
const elapsed = (new Date() - startTime) / 1000; // seconds
|
||||||
|
```
|
||||||
|
|
||||||
|
**Future Enhancement**: SLMM backend could store measurement start times in a database table to track duration across sessions.
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
### Add Test Data
|
||||||
|
|
||||||
|
Use the included script to add test SLM units:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python3 add_test_slms.py
|
||||||
|
```
|
||||||
|
|
||||||
|
This creates:
|
||||||
|
- 3 deployed test units (nl43-001, nl43-002, nl53-001)
|
||||||
|
- 1 benched unit (nl43-003)
|
||||||
|
|
||||||
|
### Running the Dashboard
|
||||||
|
|
||||||
|
1. Start SLMM backend (port 8100):
|
||||||
|
```bash
|
||||||
|
cd /home/serversdown/slmm
|
||||||
|
uvicorn main:app --host 0.0.0.0 --port 8100
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Start SFM (port 8000):
|
||||||
|
```bash
|
||||||
|
cd /home/serversdown/sfm/seismo-fleet-manager
|
||||||
|
uvicorn backend.main:app --host 0.0.0.0 --port 8000 --reload
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Access dashboard:
|
||||||
|
```
|
||||||
|
http://localhost:8000/sound-level-meters
|
||||||
|
```
|
||||||
|
|
||||||
|
### Testing Without Physical Devices
|
||||||
|
|
||||||
|
The dashboard will work without physical NL-43 devices connected:
|
||||||
|
- Unit list will display based on database records
|
||||||
|
- Live view will show connection errors (gracefully handled)
|
||||||
|
- Mock data can be added to SLMM for testing
|
||||||
|
|
||||||
|
## Future Enhancements
|
||||||
|
|
||||||
|
### Near-term
|
||||||
|
1. **Measurement Duration Tracking**
|
||||||
|
- Add database table to track measurement sessions
|
||||||
|
- Display elapsed time in live view
|
||||||
|
- Store start/stop timestamps
|
||||||
|
|
||||||
|
2. **Historical Data View**
|
||||||
|
- Chart historical Leq intervals
|
||||||
|
- Export measurement data
|
||||||
|
- Comparison between units
|
||||||
|
|
||||||
|
3. **Alerts & Thresholds**
|
||||||
|
- Configurable sound level alerts
|
||||||
|
- Email/SMS notifications when thresholds exceeded
|
||||||
|
- Visual indicators on dashboard
|
||||||
|
|
||||||
|
### Long-term
|
||||||
|
1. **Map View**
|
||||||
|
- Display all SLMs on a map (like seismographs)
|
||||||
|
- Click map markers to view live data
|
||||||
|
- Color-coded by current sound level
|
||||||
|
|
||||||
|
2. **Batch Operations**
|
||||||
|
- Start/stop multiple units simultaneously
|
||||||
|
- Synchronized measurements
|
||||||
|
- Group configurations
|
||||||
|
|
||||||
|
3. **Advanced Analytics**
|
||||||
|
- Noise compliance reports
|
||||||
|
- Statistical summaries
|
||||||
|
- Trend analysis
|
||||||
|
|
||||||
|
## Integration with Terra-view
|
||||||
|
|
||||||
|
When SFM is rebranded to Terra-view:
|
||||||
|
|
||||||
|
1. **Multi-Module Dashboard**
|
||||||
|
- Sound Level Meters module (this dashboard)
|
||||||
|
- Seismograph Fleet Manager module (existing)
|
||||||
|
- Future monitoring modules
|
||||||
|
|
||||||
|
2. **Project Management**
|
||||||
|
- Link SLMs to projects
|
||||||
|
- Combined project view with seismographs + SLMs
|
||||||
|
- Project-level reporting
|
||||||
|
|
||||||
|
3. **Unified Navigation**
|
||||||
|
- Top-level module switcher
|
||||||
|
- Consistent UI/UX across modules
|
||||||
|
- Shared authentication and settings
|
||||||
|
|
||||||
|
## Technical Notes
|
||||||
|
|
||||||
|
### HTMX Integration
|
||||||
|
The dashboard extensively uses HTMX for dynamic updates without full page reloads:
|
||||||
|
- `hx-get`: Fetch and swap content
|
||||||
|
- `hx-trigger`: Auto-refresh intervals
|
||||||
|
- `hx-swap`: Content replacement strategy
|
||||||
|
- `hx-target`: Specify update target
|
||||||
|
|
||||||
|
### Dark Mode Support
|
||||||
|
All components support dark mode:
|
||||||
|
- Chart.js colors adapt to theme
|
||||||
|
- Tailwind dark: classes throughout
|
||||||
|
- Automatic theme detection
|
||||||
|
|
||||||
|
### Performance Considerations
|
||||||
|
- WebSocket connections are per-unit (only one active at a time)
|
||||||
|
- Chart data limited to 60 points (1 minute) to prevent memory bloat
|
||||||
|
- Polling intervals balanced for responsiveness vs server load
|
||||||
|
- Lazy loading of live view panel (only when unit selected)
|
||||||
|
|
||||||
|
## Files Modified/Created
|
||||||
|
|
||||||
|
### New Files
|
||||||
|
- `templates/sound_level_meters.html`
|
||||||
|
- `templates/partials/slm_stats.html`
|
||||||
|
- `templates/partials/slm_unit_list.html`
|
||||||
|
- `templates/partials/slm_live_view.html`
|
||||||
|
- `templates/partials/slm_live_view_error.html`
|
||||||
|
- `backend/routers/slm_dashboard.py`
|
||||||
|
- `add_test_slms.py`
|
||||||
|
- `docs/SOUND_LEVEL_METERS_DASHBOARD.md`
|
||||||
|
|
||||||
|
### Modified Files
|
||||||
|
- `backend/main.py` - Added route and router import
|
||||||
|
- `templates/base.html` - Added navigation menu item
|
||||||
|
|
||||||
|
## Support
|
||||||
|
|
||||||
|
For issues or questions:
|
||||||
|
- Check SLMM API documentation: `/home/serversdown/slmm/docs/API.md`
|
||||||
|
- Review SFM changelog: `CHANGELOG.md`
|
||||||
|
- Submit issues to project repository
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Version**: 1.0.0
|
||||||
|
**Created**: January 2026
|
||||||
|
**Last Updated**: January 5, 2026
|
||||||
546
docs/archive/PROJECTS_SYSTEM_IMPLEMENTATION.md
Normal file
@@ -0,0 +1,546 @@
|
|||||||
|
# Projects System Implementation - Terra-View
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
The Projects system has been successfully scaffolded in Terra-View. This document provides a complete overview of what has been built, how it works, and what needs to be completed.
|
||||||
|
|
||||||
|
## ✅ Completed Components
|
||||||
|
|
||||||
|
### 1. Database Schema
|
||||||
|
|
||||||
|
**Location**: `/backend/models.py`
|
||||||
|
|
||||||
|
Seven new tables have been added:
|
||||||
|
|
||||||
|
- **ProjectType**: Template definitions for project types (Sound, Vibration, Combined)
|
||||||
|
- **Project**: Top-level project organization with type reference
|
||||||
|
- **MonitoringLocation**: Generic locations (NRLs for sound, monitoring points for vibration)
|
||||||
|
- **UnitAssignment**: Links devices to locations
|
||||||
|
- **ScheduledAction**: Automated recording control schedules
|
||||||
|
- **RecordingSession**: Tracks actual recording/monitoring sessions
|
||||||
|
- **DataFile**: File references for downloaded data
|
||||||
|
|
||||||
|
**Key Features**:
|
||||||
|
- Type-aware design (project_type_id determines features)
|
||||||
|
- Flexible metadata fields (JSON columns for type-specific data)
|
||||||
|
- Denormalized fields for efficient queries
|
||||||
|
- Proper indexing on foreign keys
|
||||||
|
|
||||||
|
### 2. Service Layer
|
||||||
|
|
||||||
|
#### SLMM Client (`/backend/services/slmm_client.py`)
|
||||||
|
- Clean wrapper for all SLMM API operations
|
||||||
|
- Methods for: start/stop/pause/resume recording, get status, configure devices
|
||||||
|
- Error handling with custom exceptions
|
||||||
|
- Singleton pattern for easy access
|
||||||
|
|
||||||
|
#### Device Controller (`/backend/services/device_controller.py`)
|
||||||
|
- Routes commands to appropriate backend (SLMM for SLMs, SFM for seismographs)
|
||||||
|
- Unified interface across device types
|
||||||
|
- Ready for future SFM implementation
|
||||||
|
|
||||||
|
#### Scheduler Service (`/backend/services/scheduler.py`)
|
||||||
|
- Background task that checks for pending scheduled actions every 60 seconds
|
||||||
|
- Executes actions by calling device controller
|
||||||
|
- Creates/updates recording sessions
|
||||||
|
- Tracks execution status and errors
|
||||||
|
- Manual execution support for testing
|
||||||
|
|
||||||
|
### 3. API Routers
|
||||||
|
|
||||||
|
#### Projects Router (`/backend/routers/projects.py`)
|
||||||
|
Endpoints:
|
||||||
|
- `GET /api/projects/list` - Project list with stats
|
||||||
|
- `GET /api/projects/stats` - Overview statistics
|
||||||
|
- `POST /api/projects/create` - Create new project
|
||||||
|
- `GET /api/projects/{id}` - Get project details
|
||||||
|
- `PUT /api/projects/{id}` - Update project
|
||||||
|
- `DELETE /api/projects/{id}` - Archive project
|
||||||
|
- `GET /api/projects/{id}/dashboard` - Project dashboard data
|
||||||
|
- `GET /api/projects/types/list` - Get project type templates
|
||||||
|
|
||||||
|
#### Project Locations Router (`/backend/routers/project_locations.py`)
|
||||||
|
Endpoints:
|
||||||
|
- `GET /api/projects/{id}/locations` - List locations
|
||||||
|
- `POST /api/projects/{id}/locations/create` - Create location
|
||||||
|
- `PUT /api/projects/{id}/locations/{location_id}` - Update location
|
||||||
|
- `DELETE /api/projects/{id}/locations/{location_id}` - Delete location
|
||||||
|
- `GET /api/projects/{id}/assignments` - List unit assignments
|
||||||
|
- `POST /api/projects/{id}/locations/{location_id}/assign` - Assign unit
|
||||||
|
- `POST /api/projects/{id}/assignments/{assignment_id}/unassign` - Unassign unit
|
||||||
|
- `GET /api/projects/{id}/available-units` - Get units available for assignment
|
||||||
|
|
||||||
|
#### Scheduler Router (`/backend/routers/scheduler.py`)
|
||||||
|
Endpoints:
|
||||||
|
- `GET /api/projects/{id}/scheduler/actions` - List scheduled actions
|
||||||
|
- `POST /api/projects/{id}/scheduler/actions/create` - Create action
|
||||||
|
- `POST /api/projects/{id}/scheduler/schedule-session` - Schedule recording session
|
||||||
|
- `PUT /api/projects/{id}/scheduler/actions/{action_id}` - Update action
|
||||||
|
- `POST /api/projects/{id}/scheduler/actions/{action_id}/cancel` - Cancel action
|
||||||
|
- `DELETE /api/projects/{id}/scheduler/actions/{action_id}` - Delete action
|
||||||
|
- `POST /api/projects/{id}/scheduler/actions/{action_id}/execute` - Manual execution
|
||||||
|
- `GET /api/projects/{id}/scheduler/status` - Scheduler status
|
||||||
|
- `POST /api/projects/{id}/scheduler/execute-pending` - Trigger pending executions
|
||||||
|
|
||||||
|
### 4. Frontend
|
||||||
|
|
||||||
|
#### Main Page
|
||||||
|
**Location**: `/templates/projects/overview.html`
|
||||||
|
|
||||||
|
Features:
|
||||||
|
- Summary statistics cards (projects, locations, assignments, sessions)
|
||||||
|
- Tabbed interface (All, Active, Completed, Archived)
|
||||||
|
- Project cards grid layout
|
||||||
|
- Create project modal with two-step flow:
|
||||||
|
1. Select project type (Sound/Vibration/Combined)
|
||||||
|
2. Fill project details
|
||||||
|
- HTMX-powered dynamic updates
|
||||||
|
|
||||||
|
#### Navigation
|
||||||
|
**Location**: `/templates/base.html` (updated)
|
||||||
|
- "Projects" link added to sidebar
|
||||||
|
- Active state highlighting
|
||||||
|
|
||||||
|
### 5. Application Integration
|
||||||
|
|
||||||
|
**Location**: `/backend/main.py`
|
||||||
|
|
||||||
|
- Routers registered
|
||||||
|
- Page route added (`/projects`)
|
||||||
|
- Scheduler service starts on application startup
|
||||||
|
- Scheduler stops on application shutdown
|
||||||
|
|
||||||
|
### 6. Database Initialization
|
||||||
|
|
||||||
|
**Script**: `/backend/init_projects_db.py`
|
||||||
|
|
||||||
|
- Creates all project tables
|
||||||
|
- Populates ProjectType with default templates
|
||||||
|
- ✅ Successfully executed - database is ready
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📁 File Organization
|
||||||
|
|
||||||
|
```
|
||||||
|
terra-view/
|
||||||
|
├── backend/
|
||||||
|
│ ├── models.py [✅ Updated]
|
||||||
|
│ ├── init_projects_db.py [✅ Created]
|
||||||
|
│ ├── main.py [✅ Updated]
|
||||||
|
│ ├── routers/
|
||||||
|
│ │ ├── projects.py [✅ Created]
|
||||||
|
│ │ ├── project_locations.py [✅ Created]
|
||||||
|
│ │ └── scheduler.py [✅ Created]
|
||||||
|
│ └── services/
|
||||||
|
│ ├── slmm_client.py [✅ Created]
|
||||||
|
│ ├── device_controller.py [✅ Created]
|
||||||
|
│ └── scheduler.py [✅ Created]
|
||||||
|
├── templates/
|
||||||
|
│ ├── base.html [✅ Updated]
|
||||||
|
│ ├── projects/
|
||||||
|
│ │ └── overview.html [✅ Created]
|
||||||
|
│ └── partials/
|
||||||
|
│ └── projects/ [📁 Created, empty]
|
||||||
|
└── data/
|
||||||
|
└── seismo_fleet.db [✅ Tables created]
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🔨 What Still Needs to be Built
|
||||||
|
|
||||||
|
### 1. Frontend Templates (Partials)
|
||||||
|
|
||||||
|
**Directory**: `/templates/partials/projects/`
|
||||||
|
|
||||||
|
**Required Files**:
|
||||||
|
|
||||||
|
#### `project_stats.html`
|
||||||
|
Stats cards for overview page:
|
||||||
|
- Total/Active/Completed projects
|
||||||
|
- Total locations
|
||||||
|
- Assigned units
|
||||||
|
- Active sessions
|
||||||
|
|
||||||
|
#### `project_list.html`
|
||||||
|
Project cards grid:
|
||||||
|
- Project name, type, status
|
||||||
|
- Location count, unit count
|
||||||
|
- Active session indicator
|
||||||
|
- Link to project dashboard
|
||||||
|
|
||||||
|
#### `project_dashboard.html`
|
||||||
|
Main project dashboard panel with tabs:
|
||||||
|
- Summary stats
|
||||||
|
- Active locations and assignments
|
||||||
|
- Upcoming scheduled actions
|
||||||
|
- Recent sessions
|
||||||
|
|
||||||
|
#### `location_list.html`
|
||||||
|
Location cards/table:
|
||||||
|
- Location name, type, coordinates
|
||||||
|
- Assigned unit (if any)
|
||||||
|
- Session count
|
||||||
|
- Assign/unassign button
|
||||||
|
|
||||||
|
#### `assignment_list.html`
|
||||||
|
Unit assignment table:
|
||||||
|
- Unit ID, device type
|
||||||
|
- Location name
|
||||||
|
- Assignment dates
|
||||||
|
- Status
|
||||||
|
- Unassign button
|
||||||
|
|
||||||
|
#### `scheduler_agenda.html`
|
||||||
|
Calendar/agenda view:
|
||||||
|
- Scheduled actions sorted by time
|
||||||
|
- Action type (start/stop/download)
|
||||||
|
- Location and unit
|
||||||
|
- Status indicator
|
||||||
|
- Cancel/execute buttons
|
||||||
|
|
||||||
|
### 2. Project Dashboard Page
|
||||||
|
|
||||||
|
**Location**: `/templates/projects/project_dashboard.html`
|
||||||
|
|
||||||
|
Full project detail page with:
|
||||||
|
- Header with project name, type, status
|
||||||
|
- Tab navigation (Dashboard, Scheduler, Locations, Units, Data, Settings)
|
||||||
|
- Tab content areas
|
||||||
|
- Modals for adding locations, scheduling sessions
|
||||||
|
|
||||||
|
### 3. Additional UI Components
|
||||||
|
|
||||||
|
- Project type selection cards (with icons)
|
||||||
|
- Location creation modal
|
||||||
|
- Unit assignment modal
|
||||||
|
- Schedule session modal (with date/time picker)
|
||||||
|
- Data file browser
|
||||||
|
|
||||||
|
### 4. SLMM Enhancements
|
||||||
|
|
||||||
|
**Location**: `/slmm/app/routers.py` (SLMM repo)
|
||||||
|
|
||||||
|
New endpoint needed:
|
||||||
|
```python
|
||||||
|
POST /api/nl43/{unit_id}/ftp/download
|
||||||
|
```
|
||||||
|
|
||||||
|
This should:
|
||||||
|
- Accept destination_path and files list
|
||||||
|
- Connect to SLM via FTP
|
||||||
|
- Download specified files
|
||||||
|
- Save to Terra-View's `data/Projects/` directory
|
||||||
|
- Return file list with metadata
|
||||||
|
|
||||||
|
### 5. SFM Client (Future)
|
||||||
|
|
||||||
|
**Location**: `/backend/services/sfm_client.py` (to be created)
|
||||||
|
|
||||||
|
Similar to SLMM client, but for seismographs:
|
||||||
|
- Get seismograph status
|
||||||
|
- Start/stop recording
|
||||||
|
- Download data files
|
||||||
|
- Integrate with device controller
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🚀 Testing the System
|
||||||
|
|
||||||
|
### 1. Start Terra-View
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/serversdown/tmi/terra-view
|
||||||
|
# Start Terra-View (however you normally start it)
|
||||||
|
```
|
||||||
|
|
||||||
|
Verify in logs:
|
||||||
|
```
|
||||||
|
Starting scheduler service...
|
||||||
|
Scheduler service started
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. Navigate to Projects
|
||||||
|
|
||||||
|
Open browser: `http://localhost:8001/projects`
|
||||||
|
|
||||||
|
You should see:
|
||||||
|
- Summary stats cards (all zeros initially)
|
||||||
|
- Tabs (All Projects, Active, Completed, Archived)
|
||||||
|
- "New Project" button
|
||||||
|
|
||||||
|
### 3. Create a Project
|
||||||
|
|
||||||
|
1. Click "New Project"
|
||||||
|
2. Select a project type (e.g., "Sound Monitoring")
|
||||||
|
3. Fill in details:
|
||||||
|
- Name: "Test Sound Project"
|
||||||
|
- Client: "Test Client"
|
||||||
|
- Start Date: Today
|
||||||
|
4. Submit
|
||||||
|
|
||||||
|
### 4. Test API Endpoints
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Get project types
|
||||||
|
curl http://localhost:8001/api/projects/types/list
|
||||||
|
|
||||||
|
# Get projects list
|
||||||
|
curl http://localhost:8001/api/projects/list
|
||||||
|
|
||||||
|
# Get project stats
|
||||||
|
curl http://localhost:8001/api/projects/stats
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. Test Scheduler Status
|
||||||
|
|
||||||
|
```bash
|
||||||
|
curl http://localhost:8001/api/projects/{project_id}/scheduler/status
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📋 Dataflow Examples
|
||||||
|
|
||||||
|
### Creating and Scheduling a Recording Session
|
||||||
|
|
||||||
|
1. **User creates project** → Project record in DB
|
||||||
|
2. **User adds NRL** → MonitoringLocation record
|
||||||
|
3. **User assigns SLM to NRL** → UnitAssignment record
|
||||||
|
4. **User schedules recording** → 2 ScheduledAction records (start + stop)
|
||||||
|
5. **Scheduler runs every minute** → Checks for pending actions
|
||||||
|
6. **Start action time arrives** → Scheduler calls SLMM via device controller
|
||||||
|
7. **SLMM sends TCP command to SLM** → Recording starts
|
||||||
|
8. **RecordingSession created** → Tracks the session
|
||||||
|
9. **Stop action time arrives** → Scheduler stops recording
|
||||||
|
10. **Session updated** → stopped_at, duration_seconds filled
|
||||||
|
11. **User triggers download** → Files copied to `data/Projects/{project_id}/sound/{nrl_name}/`
|
||||||
|
12. **DataFile records created** → Track file references
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🎨 UI Design Patterns
|
||||||
|
|
||||||
|
### Established Patterns (from SLM dashboard):
|
||||||
|
|
||||||
|
1. **Stats Cards**: 4-column grid, auto-refresh every 30s
|
||||||
|
2. **Sidebar Lists**: Searchable, filterable, auto-refresh
|
||||||
|
3. **Main Panel**: Large central area for details
|
||||||
|
4. **Modals**: Centered, overlay background
|
||||||
|
5. **HTMX**: All dynamic updates, minimal JavaScript
|
||||||
|
6. **Tailwind**: Consistent styling with dark mode support
|
||||||
|
|
||||||
|
### Color Scheme:
|
||||||
|
|
||||||
|
- Primary: `seismo-orange` (#f48b1c)
|
||||||
|
- Secondary: `seismo-navy` (#142a66)
|
||||||
|
- Accent: `seismo-burgundy` (#7d234d)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🔧 Configuration
|
||||||
|
|
||||||
|
### Environment Variables
|
||||||
|
|
||||||
|
- `SLMM_BASE_URL`: SLMM backend URL (default: http://localhost:8100)
|
||||||
|
- `ENVIRONMENT`: "development" or "production"
|
||||||
|
|
||||||
|
### Scheduler Settings
|
||||||
|
|
||||||
|
Located in `/backend/services/scheduler.py`:
|
||||||
|
- `check_interval`: 60 seconds (adjust as needed)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📚 Next Steps
|
||||||
|
|
||||||
|
### Immediate (Get Basic UI Working):
|
||||||
|
1. Create partial templates (stats, lists)
|
||||||
|
2. Test creating projects via UI
|
||||||
|
3. Implement project dashboard page
|
||||||
|
|
||||||
|
### Short-term (Core Features):
|
||||||
|
4. Add location management UI
|
||||||
|
5. Add unit assignment UI
|
||||||
|
6. Add scheduler UI (agenda view)
|
||||||
|
|
||||||
|
### Medium-term (Data Flow):
|
||||||
|
7. Implement SLMM download endpoint
|
||||||
|
8. Test full recording workflow
|
||||||
|
9. Add file browser for downloaded data
|
||||||
|
|
||||||
|
### Long-term (Complete System):
|
||||||
|
10. Implement SFM client for seismographs
|
||||||
|
11. Add data visualization
|
||||||
|
12. Add project reporting
|
||||||
|
13. Add user authentication
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🐛 Known Issues / TODOs
|
||||||
|
|
||||||
|
1. **Partial templates missing**: Need to create HTML templates for all partials
|
||||||
|
2. **SLMM download endpoint**: Needs implementation in SLMM backend
|
||||||
|
3. **Project dashboard page**: Not yet created
|
||||||
|
4. **SFM integration**: Placeholder only, needs real implementation
|
||||||
|
5. **File download tracking**: DataFile records not yet created after downloads
|
||||||
|
6. **Error handling**: Need better user-facing error messages
|
||||||
|
7. **Validation**: Form validation could be improved
|
||||||
|
8. **Testing**: No automated tests yet
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📖 API Documentation
|
||||||
|
|
||||||
|
### Project Type Object
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": "sound_monitoring",
|
||||||
|
"name": "Sound Monitoring",
|
||||||
|
"description": "...",
|
||||||
|
"icon": "volume-2",
|
||||||
|
"supports_sound": true,
|
||||||
|
"supports_vibration": false
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Project Object
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": "uuid",
|
||||||
|
"name": "Project Name",
|
||||||
|
"description": "...",
|
||||||
|
"project_type_id": "sound_monitoring",
|
||||||
|
"status": "active",
|
||||||
|
"client_name": "Client Inc",
|
||||||
|
"site_address": "123 Main St",
|
||||||
|
"site_coordinates": "40.7128,-74.0060",
|
||||||
|
"start_date": "2024-01-15",
|
||||||
|
"end_date": null,
|
||||||
|
"created_at": "2024-01-15T10:00:00",
|
||||||
|
"updated_at": "2024-01-15T10:00:00"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### MonitoringLocation Object
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": "uuid",
|
||||||
|
"project_id": "uuid",
|
||||||
|
"location_type": "sound",
|
||||||
|
"name": "NRL-001",
|
||||||
|
"description": "...",
|
||||||
|
"coordinates": "40.7128,-74.0060",
|
||||||
|
"address": "123 Main St",
|
||||||
|
"location_metadata": "{...}",
|
||||||
|
"created_at": "2024-01-15T10:00:00"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### UnitAssignment Object
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": "uuid",
|
||||||
|
"unit_id": "nl43-001",
|
||||||
|
"location_id": "uuid",
|
||||||
|
"project_id": "uuid",
|
||||||
|
"device_type": "sound_level_meter",
|
||||||
|
"assigned_at": "2024-01-15T10:00:00",
|
||||||
|
"assigned_until": null,
|
||||||
|
"status": "active",
|
||||||
|
"notes": "..."
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### ScheduledAction Object
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": "uuid",
|
||||||
|
"project_id": "uuid",
|
||||||
|
"location_id": "uuid",
|
||||||
|
"unit_id": "nl43-001",
|
||||||
|
"action_type": "start",
|
||||||
|
"device_type": "sound_level_meter",
|
||||||
|
"scheduled_time": "2024-01-16T08:00:00",
|
||||||
|
"executed_at": null,
|
||||||
|
"execution_status": "pending",
|
||||||
|
"module_response": null,
|
||||||
|
"error_message": null
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🎓 Architecture Decisions
|
||||||
|
|
||||||
|
### Why Project Types?
|
||||||
|
Allows the system to scale to different monitoring scenarios (air quality, multi-hazard, etc.) without code changes. Just add a new ProjectType record and the UI adapts.
|
||||||
|
|
||||||
|
### Why Generic MonitoringLocation?
|
||||||
|
Instead of separate NRL and MonitoringPoint tables, one table with a `location_type` discriminator keeps the schema clean and allows for combined projects.
|
||||||
|
|
||||||
|
### Why Denormalized Fields?
|
||||||
|
Fields like `project_id` in UnitAssignment (already have via location) enable faster queries without joins.
|
||||||
|
|
||||||
|
### Why Scheduler in Terra-View?
|
||||||
|
Terra-View is the orchestration layer. SLMM only handles device communication. Keeping scheduling logic in Terra-View allows for complex workflows across multiple device types.
|
||||||
|
|
||||||
|
### Why JSON Metadata Columns?
|
||||||
|
Type-specific fields (like ambient_conditions for sound projects) don't apply to all location types. JSON columns provide flexibility without cluttering the schema.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 💡 Tips for Continuing Development
|
||||||
|
|
||||||
|
1. **Follow Existing Patterns**: Look at the SLM dashboard code for reference
|
||||||
|
2. **Use HTMX Aggressively**: Minimize JavaScript, let HTMX handle updates
|
||||||
|
3. **Keep Routers Thin**: Move business logic to service layer
|
||||||
|
4. **Return HTML Partials**: Most endpoints should return HTML, not JSON
|
||||||
|
5. **Test Incrementally**: Build one partial at a time and test in browser
|
||||||
|
6. **Check Logs**: Scheduler logs execution attempts
|
||||||
|
7. **Use Browser DevTools**: Network tab shows HTMX requests
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📞 Support
|
||||||
|
|
||||||
|
For questions or issues:
|
||||||
|
1. Check this document first
|
||||||
|
2. Review existing dashboards (SLM, Seismographs) for patterns
|
||||||
|
3. Check logs for scheduler execution details
|
||||||
|
4. Test API endpoints with curl to isolate issues
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ✅ Checklist for Completion
|
||||||
|
|
||||||
|
- [x] Database schema designed
|
||||||
|
- [x] Models created
|
||||||
|
- [x] Migration script run successfully
|
||||||
|
- [x] Service layer complete (SLMM client, device controller, scheduler)
|
||||||
|
- [x] API routers created (projects, locations, scheduler)
|
||||||
|
- [x] Navigation updated
|
||||||
|
- [x] Main overview page created
|
||||||
|
- [x] Routes registered in main.py
|
||||||
|
- [x] Scheduler service integrated
|
||||||
|
- [ ] Partial templates created
|
||||||
|
- [ ] Project dashboard page created
|
||||||
|
- [ ] Location management UI
|
||||||
|
- [ ] Unit assignment UI
|
||||||
|
- [ ] Scheduler UI (agenda view)
|
||||||
|
- [ ] SLMM download endpoint implemented
|
||||||
|
- [ ] Full workflow tested end-to-end
|
||||||
|
- [ ] SFM client implemented (future)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Last Updated**: 2026-01-12
|
||||||
|
|
||||||
|
**Database Status**: ✅ Initialized
|
||||||
|
|
||||||
|
**Backend Status**: ✅ Complete
|
||||||
|
|
||||||
|
**Frontend Status**: 🟡 Partial (overview page only)
|
||||||
|
|
||||||
|
**Ready for Testing**: ✅ Yes (basic functionality)
|
||||||
17
docs/archive/README.md
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
# Terra-View Documentation Archive
|
||||||
|
|
||||||
|
This directory contains old documentation files that are no longer actively maintained but preserved for historical reference.
|
||||||
|
|
||||||
|
## Archived Documents
|
||||||
|
|
||||||
|
### PROJECTS_SYSTEM_IMPLEMENTATION.md
|
||||||
|
Early implementation notes for the projects system. Superseded by current documentation in main docs directory.
|
||||||
|
|
||||||
|
### .aider.chat.history.md
|
||||||
|
AI assistant chat history from development sessions. Contains context and decision-making process.
|
||||||
|
|
||||||
|
## Note
|
||||||
|
|
||||||
|
These documents may contain outdated information. For current documentation, see:
|
||||||
|
- [Main README](../../README.md)
|
||||||
|
- [Active Documentation](../)
|
||||||
@@ -7,3 +7,4 @@ jinja2==3.1.2
|
|||||||
aiofiles==23.2.1
|
aiofiles==23.2.1
|
||||||
Pillow==10.1.0
|
Pillow==10.1.0
|
||||||
httpx==0.25.2
|
httpx==0.25.2
|
||||||
|
openpyxl==3.1.2
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
|
20
scripts/README.md
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
# Terra-View Utility Scripts
|
||||||
|
|
||||||
|
This directory contains utility scripts for database operations, testing, and maintenance.
|
||||||
|
|
||||||
|
## Scripts
|
||||||
|
|
||||||
|
### create_test_db.py
|
||||||
|
Generate a realistic test database with sample data.
|
||||||
|
|
||||||
|
Usage: python scripts/create_test_db.py
|
||||||
|
|
||||||
|
### rename_unit.py
|
||||||
|
Rename a unit ID across all tables.
|
||||||
|
|
||||||
|
Usage: python scripts/rename_unit.py <old_id> <new_id>
|
||||||
|
|
||||||
|
### sync_slms_to_slmm.py
|
||||||
|
Manually sync all SLM devices from Terra-View to SLMM.
|
||||||
|
|
||||||
|
Usage: python scripts/sync_slms_to_slmm.py
|
||||||
39
scripts/add_slm_ftp_port.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
Add slm_ftp_port column to roster table for FTP data retrieval port
|
||||||
|
"""
|
||||||
|
|
||||||
|
from sqlalchemy import create_engine, text
|
||||||
|
import os
|
||||||
|
|
||||||
|
# Determine database based on environment
|
||||||
|
ENVIRONMENT = os.getenv("ENVIRONMENT", "production")
|
||||||
|
if ENVIRONMENT == "development":
|
||||||
|
DB_URL = "sqlite:///./data-dev/seismo_fleet.db"
|
||||||
|
else:
|
||||||
|
DB_URL = "sqlite:///./data/seismo_fleet.db"
|
||||||
|
|
||||||
|
def add_ftp_port_column():
|
||||||
|
print(f"Adding slm_ftp_port column to {DB_URL}...")
|
||||||
|
print("=" * 60)
|
||||||
|
|
||||||
|
engine = create_engine(DB_URL, connect_args={"check_same_thread": False})
|
||||||
|
|
||||||
|
with engine.connect() as conn:
|
||||||
|
try:
|
||||||
|
# Try to add the column
|
||||||
|
conn.execute(text("ALTER TABLE roster ADD COLUMN slm_ftp_port INTEGER"))
|
||||||
|
conn.commit()
|
||||||
|
print("✓ Added column: slm_ftp_port (INTEGER)")
|
||||||
|
except Exception as e:
|
||||||
|
if "duplicate column name" in str(e).lower():
|
||||||
|
print(" Column slm_ftp_port already exists, skipping")
|
||||||
|
else:
|
||||||
|
print(f"✗ Error adding slm_ftp_port: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
print("=" * 60)
|
||||||
|
print("Migration completed!")
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
add_ftp_port_column()
|
||||||
105
scripts/add_test_modems.py
Executable file
@@ -0,0 +1,105 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
Add test modem units and assign them to SLMs in DEV database
|
||||||
|
"""
|
||||||
|
|
||||||
|
from sqlalchemy import create_engine
|
||||||
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
from backend.models import RosterUnit
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
# DEV database
|
||||||
|
DEV_DB_URL = "sqlite:///./data-dev/seismo_fleet.db"
|
||||||
|
|
||||||
|
def add_test_modems():
|
||||||
|
engine = create_engine(DEV_DB_URL, connect_args={"check_same_thread": False})
|
||||||
|
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||||
|
db = SessionLocal()
|
||||||
|
|
||||||
|
# Test modems
|
||||||
|
test_modems = [
|
||||||
|
{
|
||||||
|
"id": "modem-001",
|
||||||
|
"device_type": "modem",
|
||||||
|
"deployed": True,
|
||||||
|
"retired": False,
|
||||||
|
"note": "Raven XTV modem for Construction Site A",
|
||||||
|
"address": "123 Main St, Construction Site A",
|
||||||
|
"coordinates": "34.0522,-118.2437",
|
||||||
|
"ip_address": "192.168.1.100",
|
||||||
|
"phone_number": "+1-555-0100",
|
||||||
|
"hardware_model": "Raven XTV"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "modem-002",
|
||||||
|
"device_type": "modem",
|
||||||
|
"deployed": True,
|
||||||
|
"retired": False,
|
||||||
|
"note": "Raven XTV modem for Construction Site B",
|
||||||
|
"address": "456 Oak Ave, Construction Site B",
|
||||||
|
"coordinates": "34.0622,-118.2537",
|
||||||
|
"ip_address": "192.168.1.101",
|
||||||
|
"phone_number": "+1-555-0101",
|
||||||
|
"hardware_model": "Raven XTV"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "modem-003",
|
||||||
|
"device_type": "modem",
|
||||||
|
"deployed": True,
|
||||||
|
"retired": False,
|
||||||
|
"note": "Sierra Wireless modem for Residential Area",
|
||||||
|
"address": "789 Elm St, Residential Area",
|
||||||
|
"coordinates": "34.0722,-118.2637",
|
||||||
|
"ip_address": "192.168.1.102",
|
||||||
|
"phone_number": "+1-555-0102",
|
||||||
|
"hardware_model": "Sierra Wireless AirLink"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "modem-004",
|
||||||
|
"device_type": "modem",
|
||||||
|
"deployed": False,
|
||||||
|
"retired": False,
|
||||||
|
"note": "Spare modem - not deployed",
|
||||||
|
"ip_address": None,
|
||||||
|
"phone_number": "+1-555-0103",
|
||||||
|
"hardware_model": "Raven XTV"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
for modem_data in test_modems:
|
||||||
|
# Check if modem already exists
|
||||||
|
existing = db.query(RosterUnit).filter_by(id=modem_data["id"]).first()
|
||||||
|
if existing:
|
||||||
|
print(f"Modem {modem_data['id']} already exists, skipping...")
|
||||||
|
continue
|
||||||
|
|
||||||
|
modem = RosterUnit(**modem_data)
|
||||||
|
db.add(modem)
|
||||||
|
print(f"Added {modem_data['id']}")
|
||||||
|
|
||||||
|
# Assign modems to existing SLMs
|
||||||
|
slm_modem_assignments = {
|
||||||
|
"nl43-001": "modem-001",
|
||||||
|
"nl43-002": "modem-002",
|
||||||
|
"nl53-001": "modem-003"
|
||||||
|
}
|
||||||
|
|
||||||
|
for slm_id, modem_id in slm_modem_assignments.items():
|
||||||
|
slm = db.query(RosterUnit).filter_by(id=slm_id).first()
|
||||||
|
if slm:
|
||||||
|
slm.deployed_with_modem_id = modem_id
|
||||||
|
# Remove legacy slm_host since we're using modems now
|
||||||
|
slm.slm_host = None
|
||||||
|
print(f"Assigned {slm_id} to {modem_id}")
|
||||||
|
else:
|
||||||
|
print(f"SLM {slm_id} not found, skipping assignment...")
|
||||||
|
|
||||||
|
db.commit()
|
||||||
|
db.close()
|
||||||
|
print("\nTest modems added and assigned to SLMs successfully in DEV database (data-dev/seismo_fleet.db)!")
|
||||||
|
print("\nModem assignments:")
|
||||||
|
for slm_id, modem_id in slm_modem_assignments.items():
|
||||||
|
print(f" {slm_id} → {modem_id}")
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
add_test_modems()
|
||||||
106
scripts/add_test_slms.py
Executable file
@@ -0,0 +1,106 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
Add test Sound Level Meter units to the DEV database
|
||||||
|
"""
|
||||||
|
|
||||||
|
from sqlalchemy import create_engine
|
||||||
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
from backend.models import RosterUnit
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
# DEV database
|
||||||
|
DEV_DB_URL = "sqlite:///./data-dev/seismo_fleet.db"
|
||||||
|
|
||||||
|
def add_test_slms():
|
||||||
|
engine = create_engine(DEV_DB_URL, connect_args={"check_same_thread": False})
|
||||||
|
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||||
|
db = SessionLocal()
|
||||||
|
|
||||||
|
test_slms = [
|
||||||
|
{
|
||||||
|
"id": "nl43-001",
|
||||||
|
"device_type": "sound_level_meter",
|
||||||
|
"deployed": True,
|
||||||
|
"retired": False,
|
||||||
|
"note": "Test unit at construction site A",
|
||||||
|
"address": "123 Main St, Construction Site A",
|
||||||
|
"coordinates": "34.0522,-118.2437",
|
||||||
|
"slm_host": "192.168.1.100",
|
||||||
|
"slm_tcp_port": 2255,
|
||||||
|
"slm_model": "NL-43",
|
||||||
|
"slm_serial_number": "123456",
|
||||||
|
"slm_frequency_weighting": "A",
|
||||||
|
"slm_time_weighting": "F",
|
||||||
|
"slm_measurement_range": "30-130 dB",
|
||||||
|
"slm_last_check": datetime.utcnow()
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "nl43-002",
|
||||||
|
"device_type": "sound_level_meter",
|
||||||
|
"deployed": True,
|
||||||
|
"retired": False,
|
||||||
|
"note": "Test unit at construction site B",
|
||||||
|
"address": "456 Oak Ave, Construction Site B",
|
||||||
|
"coordinates": "34.0622,-118.2537",
|
||||||
|
"slm_host": "192.168.1.101",
|
||||||
|
"slm_tcp_port": 2255,
|
||||||
|
"slm_model": "NL-43",
|
||||||
|
"slm_serial_number": "123457",
|
||||||
|
"slm_frequency_weighting": "A",
|
||||||
|
"slm_time_weighting": "S",
|
||||||
|
"slm_measurement_range": "30-130 dB",
|
||||||
|
"slm_last_check": datetime.utcnow()
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "nl53-001",
|
||||||
|
"device_type": "sound_level_meter",
|
||||||
|
"deployed": True,
|
||||||
|
"retired": False,
|
||||||
|
"note": "Test unit at residential monitoring",
|
||||||
|
"address": "789 Elm St, Residential Area",
|
||||||
|
"coordinates": "34.0722,-118.2637",
|
||||||
|
"slm_host": "192.168.1.102",
|
||||||
|
"slm_tcp_port": 2255,
|
||||||
|
"slm_model": "NL-53",
|
||||||
|
"slm_serial_number": "234567",
|
||||||
|
"slm_frequency_weighting": "C",
|
||||||
|
"slm_time_weighting": "F",
|
||||||
|
"slm_measurement_range": "25-140 dB",
|
||||||
|
"slm_last_check": datetime.utcnow()
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "nl43-003",
|
||||||
|
"device_type": "sound_level_meter",
|
||||||
|
"deployed": False,
|
||||||
|
"retired": False,
|
||||||
|
"note": "Benched for calibration",
|
||||||
|
"address": None,
|
||||||
|
"coordinates": None,
|
||||||
|
"slm_host": None,
|
||||||
|
"slm_tcp_port": None,
|
||||||
|
"slm_model": "NL-43",
|
||||||
|
"slm_serial_number": "123458",
|
||||||
|
"slm_frequency_weighting": "A",
|
||||||
|
"slm_time_weighting": "F",
|
||||||
|
"slm_measurement_range": "30-130 dB",
|
||||||
|
"slm_last_check": None
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
for slm_data in test_slms:
|
||||||
|
# Check if unit already exists
|
||||||
|
existing = db.query(RosterUnit).filter_by(id=slm_data["id"]).first()
|
||||||
|
if existing:
|
||||||
|
print(f"Unit {slm_data['id']} already exists, skipping...")
|
||||||
|
continue
|
||||||
|
|
||||||
|
unit = RosterUnit(**slm_data)
|
||||||
|
db.add(unit)
|
||||||
|
print(f"Added {slm_data['id']}")
|
||||||
|
|
||||||
|
db.commit()
|
||||||
|
db.close()
|
||||||
|
print("\nTest SLM units added successfully to DEV database (data-dev/seismo_fleet.db)!")
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
add_test_slms()
|
||||||
46
scripts/migrate_dev_db.py
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
Migrate DEV database to add SLM-specific columns
|
||||||
|
"""
|
||||||
|
|
||||||
|
from sqlalchemy import create_engine, text
|
||||||
|
|
||||||
|
# DEV database
|
||||||
|
DEV_DB_URL = "sqlite:///./data-dev/seismo_fleet.db"
|
||||||
|
|
||||||
|
def migrate_dev_database():
|
||||||
|
print("Migrating DEV database to add SLM columns...")
|
||||||
|
print("=" * 60)
|
||||||
|
|
||||||
|
engine = create_engine(DEV_DB_URL, connect_args={"check_same_thread": False})
|
||||||
|
|
||||||
|
# SLM columns to add
|
||||||
|
slm_columns = [
|
||||||
|
("slm_host", "VARCHAR"),
|
||||||
|
("slm_tcp_port", "INTEGER"),
|
||||||
|
("slm_model", "VARCHAR"),
|
||||||
|
("slm_serial_number", "VARCHAR"),
|
||||||
|
("slm_frequency_weighting", "VARCHAR"),
|
||||||
|
("slm_time_weighting", "VARCHAR"),
|
||||||
|
("slm_measurement_range", "VARCHAR"),
|
||||||
|
("slm_last_check", "DATETIME"),
|
||||||
|
]
|
||||||
|
|
||||||
|
with engine.connect() as conn:
|
||||||
|
for column_name, column_type in slm_columns:
|
||||||
|
try:
|
||||||
|
# Try to add the column
|
||||||
|
conn.execute(text(f"ALTER TABLE roster ADD COLUMN {column_name} {column_type}"))
|
||||||
|
conn.commit()
|
||||||
|
print(f"✓ Added column: {column_name}")
|
||||||
|
except Exception as e:
|
||||||
|
if "duplicate column name" in str(e).lower():
|
||||||
|
print(f" Column {column_name} already exists, skipping")
|
||||||
|
else:
|
||||||
|
print(f"✗ Error adding {column_name}: {e}")
|
||||||
|
|
||||||
|
print("=" * 60)
|
||||||
|
print("DEV database migration completed!")
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
migrate_dev_database()
|
||||||
45
scripts/remove_test_data_from_prod.py
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
Remove test SLMs and modems from PRODUCTION database
|
||||||
|
"""
|
||||||
|
|
||||||
|
from sqlalchemy import create_engine
|
||||||
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
from backend.models import RosterUnit
|
||||||
|
|
||||||
|
# PRODUCTION database
|
||||||
|
PROD_DB_URL = "sqlite:///./data/seismo_fleet.db"
|
||||||
|
|
||||||
|
def remove_test_data():
|
||||||
|
engine = create_engine(PROD_DB_URL, connect_args={"check_same_thread": False})
|
||||||
|
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||||
|
db = SessionLocal()
|
||||||
|
|
||||||
|
# IDs to remove
|
||||||
|
test_slm_ids = ["nl43-001", "nl43-002", "nl53-001", "nl43-003"]
|
||||||
|
test_modem_ids = ["modem-001", "modem-002", "modem-003", "modem-004"]
|
||||||
|
|
||||||
|
all_test_ids = test_slm_ids + test_modem_ids
|
||||||
|
|
||||||
|
removed = []
|
||||||
|
for unit_id in all_test_ids:
|
||||||
|
unit = db.query(RosterUnit).filter_by(id=unit_id).first()
|
||||||
|
if unit:
|
||||||
|
db.delete(unit)
|
||||||
|
removed.append(unit_id)
|
||||||
|
print(f"Removed {unit_id}")
|
||||||
|
|
||||||
|
if removed:
|
||||||
|
db.commit()
|
||||||
|
print(f"\nRemoved {len(removed)} test units from PRODUCTION database")
|
||||||
|
else:
|
||||||
|
print("No test units found in production database")
|
||||||
|
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
print("Removing test data from PRODUCTION database...")
|
||||||
|
print("=" * 60)
|
||||||
|
remove_test_data()
|
||||||
|
print("=" * 60)
|
||||||
|
print("Done! Production database is clean.")
|
||||||
138
scripts/rename_unit.py
Normal file
@@ -0,0 +1,138 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
Script to rename a unit ID in the database.
|
||||||
|
This updates the unit across all tables with proper foreign key handling.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import sys
|
||||||
|
from sqlalchemy import create_engine, text
|
||||||
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
|
||||||
|
DATABASE_URL = "sqlite:///data/sfm.db"
|
||||||
|
|
||||||
|
def rename_unit(old_id: str, new_id: str):
|
||||||
|
"""
|
||||||
|
Rename a unit ID across all relevant tables.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
old_id: Current unit ID (e.g., "SLM4301")
|
||||||
|
new_id: New unit ID (e.g., "SLM-43-01")
|
||||||
|
"""
|
||||||
|
engine = create_engine(DATABASE_URL)
|
||||||
|
Session = sessionmaker(bind=engine)
|
||||||
|
session = Session()
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Check if old unit exists
|
||||||
|
result = session.execute(
|
||||||
|
text("SELECT id, device_type FROM roster WHERE id = :old_id"),
|
||||||
|
{"old_id": old_id}
|
||||||
|
).fetchone()
|
||||||
|
|
||||||
|
if not result:
|
||||||
|
print(f"❌ Error: Unit '{old_id}' not found in roster")
|
||||||
|
return False
|
||||||
|
|
||||||
|
device_type = result[1]
|
||||||
|
print(f"✓ Found unit '{old_id}' (device_type: {device_type})")
|
||||||
|
|
||||||
|
# Check if new ID already exists
|
||||||
|
result = session.execute(
|
||||||
|
text("SELECT id FROM roster WHERE id = :new_id"),
|
||||||
|
{"new_id": new_id}
|
||||||
|
).fetchone()
|
||||||
|
|
||||||
|
if result:
|
||||||
|
print(f"❌ Error: Unit ID '{new_id}' already exists")
|
||||||
|
return False
|
||||||
|
|
||||||
|
print(f"\n🔄 Renaming '{old_id}' → '{new_id}'...\n")
|
||||||
|
|
||||||
|
# Update roster table (primary)
|
||||||
|
session.execute(
|
||||||
|
text("UPDATE roster SET id = :new_id WHERE id = :old_id"),
|
||||||
|
{"new_id": new_id, "old_id": old_id}
|
||||||
|
)
|
||||||
|
print(f" ✓ Updated roster")
|
||||||
|
|
||||||
|
# Update emitters table
|
||||||
|
result = session.execute(
|
||||||
|
text("UPDATE emitters SET id = :new_id WHERE id = :old_id"),
|
||||||
|
{"new_id": new_id, "old_id": old_id}
|
||||||
|
)
|
||||||
|
if result.rowcount > 0:
|
||||||
|
print(f" ✓ Updated emitters ({result.rowcount} rows)")
|
||||||
|
|
||||||
|
# Update unit_history table
|
||||||
|
result = session.execute(
|
||||||
|
text("UPDATE unit_history SET unit_id = :new_id WHERE unit_id = :old_id"),
|
||||||
|
{"new_id": new_id, "old_id": old_id}
|
||||||
|
)
|
||||||
|
if result.rowcount > 0:
|
||||||
|
print(f" ✓ Updated unit_history ({result.rowcount} rows)")
|
||||||
|
|
||||||
|
# Update deployed_with_modem_id references
|
||||||
|
result = session.execute(
|
||||||
|
text("UPDATE roster SET deployed_with_modem_id = :new_id WHERE deployed_with_modem_id = :old_id"),
|
||||||
|
{"new_id": new_id, "old_id": old_id}
|
||||||
|
)
|
||||||
|
if result.rowcount > 0:
|
||||||
|
print(f" ✓ Updated modem references ({result.rowcount} rows)")
|
||||||
|
|
||||||
|
# Update unit_assignments table (if exists)
|
||||||
|
try:
|
||||||
|
result = session.execute(
|
||||||
|
text("UPDATE unit_assignments SET unit_id = :new_id WHERE unit_id = :old_id"),
|
||||||
|
{"new_id": new_id, "old_id": old_id}
|
||||||
|
)
|
||||||
|
if result.rowcount > 0:
|
||||||
|
print(f" ✓ Updated unit_assignments ({result.rowcount} rows)")
|
||||||
|
except Exception:
|
||||||
|
pass # Table may not exist
|
||||||
|
|
||||||
|
# Update recording_sessions table (if exists)
|
||||||
|
try:
|
||||||
|
result = session.execute(
|
||||||
|
text("UPDATE recording_sessions SET unit_id = :new_id WHERE unit_id = :old_id"),
|
||||||
|
{"new_id": new_id, "old_id": old_id}
|
||||||
|
)
|
||||||
|
if result.rowcount > 0:
|
||||||
|
print(f" ✓ Updated recording_sessions ({result.rowcount} rows)")
|
||||||
|
except Exception:
|
||||||
|
pass # Table may not exist
|
||||||
|
|
||||||
|
# Commit all changes
|
||||||
|
session.commit()
|
||||||
|
print(f"\n✅ Successfully renamed unit '{old_id}' to '{new_id}'")
|
||||||
|
return True
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
session.rollback()
|
||||||
|
print(f"\n❌ Error during rename: {e}")
|
||||||
|
return False
|
||||||
|
finally:
|
||||||
|
session.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
if len(sys.argv) != 3:
|
||||||
|
print("Usage: python rename_unit.py <old_id> <new_id>")
|
||||||
|
print("Example: python rename_unit.py SLM4301 SLM-43-01")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
old_id = sys.argv[1]
|
||||||
|
new_id = sys.argv[2]
|
||||||
|
|
||||||
|
print(f"Unit Renaming Tool")
|
||||||
|
print(f"=" * 50)
|
||||||
|
print(f"Old ID: {old_id}")
|
||||||
|
print(f"New ID: {new_id}")
|
||||||
|
print(f"=" * 50)
|
||||||
|
|
||||||
|
confirm = input(f"\nAre you sure you want to rename '{old_id}' to '{new_id}'? (yes/no): ")
|
||||||
|
if confirm.lower() != 'yes':
|
||||||
|
print("❌ Rename cancelled")
|
||||||
|
sys.exit(0)
|
||||||
|
|
||||||
|
success = rename_unit(old_id, new_id)
|
||||||
|
sys.exit(0 if success else 1)
|
||||||
67
scripts/sync_slms_to_slmm.py
Executable file
@@ -0,0 +1,67 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
One-time script to sync existing SLM devices from Terra-View roster to SLMM cache.
|
||||||
|
Run this after implementing the automatic sync to backfill existing devices.
|
||||||
|
"""
|
||||||
|
import asyncio
|
||||||
|
import sys
|
||||||
|
import os
|
||||||
|
|
||||||
|
# Add parent directory to path for imports
|
||||||
|
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
||||||
|
from backend.database import SessionLocal
|
||||||
|
from backend.models import RosterUnit
|
||||||
|
from backend.routers.roster_edit import sync_slm_to_slmm_cache
|
||||||
|
import logging
|
||||||
|
|
||||||
|
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
async def sync_all_slms():
|
||||||
|
"""Sync all SLM devices from Terra-View roster to SLMM cache."""
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
# Get all SLM devices from Terra-View (source of truth)
|
||||||
|
slm_devices = db.query(RosterUnit).filter_by(
|
||||||
|
device_type="slm"
|
||||||
|
).all()
|
||||||
|
|
||||||
|
logger.info(f"Found {len(slm_devices)} SLM devices in Terra-View roster")
|
||||||
|
|
||||||
|
success_count = 0
|
||||||
|
failed_count = 0
|
||||||
|
|
||||||
|
for device in slm_devices:
|
||||||
|
logger.info(f"\nProcessing: {device.id}")
|
||||||
|
logger.info(f" Host: {device.slm_host}")
|
||||||
|
logger.info(f" TCP Port: {device.slm_tcp_port}")
|
||||||
|
logger.info(f" Modem: {device.deployed_with_modem_id}")
|
||||||
|
|
||||||
|
result = await sync_slm_to_slmm_cache(
|
||||||
|
unit_id=device.id,
|
||||||
|
host=device.slm_host,
|
||||||
|
tcp_port=device.slm_tcp_port,
|
||||||
|
ftp_port=device.slm_ftp_port,
|
||||||
|
deployed_with_modem_id=device.deployed_with_modem_id,
|
||||||
|
db=db
|
||||||
|
)
|
||||||
|
|
||||||
|
if result["success"]:
|
||||||
|
logger.info(f"✓ {device.id}: {result['message']}")
|
||||||
|
success_count += 1
|
||||||
|
else:
|
||||||
|
logger.error(f"✗ {device.id}: {result['message']}")
|
||||||
|
failed_count += 1
|
||||||
|
|
||||||
|
logger.info(f"\n{'='*60}")
|
||||||
|
logger.info(f"Cache sync complete: {success_count} succeeded, {failed_count} failed")
|
||||||
|
logger.info(f"{'='*60}")
|
||||||
|
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
asyncio.run(sync_all_slms())
|
||||||
39
scripts/update_dev_db_schema.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
Update DEV database schema to match current models
|
||||||
|
"""
|
||||||
|
|
||||||
|
from sqlalchemy import create_engine, inspect
|
||||||
|
from backend.models import Base
|
||||||
|
|
||||||
|
# DEV database
|
||||||
|
DEV_DB_URL = "sqlite:///./data-dev/seismo_fleet.db"
|
||||||
|
|
||||||
|
def update_schema():
|
||||||
|
print("Updating DEV database schema...")
|
||||||
|
print("=" * 60)
|
||||||
|
|
||||||
|
engine = create_engine(DEV_DB_URL, connect_args={"check_same_thread": False})
|
||||||
|
|
||||||
|
# Create all tables (will update existing tables with new columns)
|
||||||
|
Base.metadata.create_all(bind=engine)
|
||||||
|
|
||||||
|
# Inspect to see what we have
|
||||||
|
inspector = inspect(engine)
|
||||||
|
tables = inspector.get_table_names()
|
||||||
|
|
||||||
|
print(f"Tables in DEV database: {tables}")
|
||||||
|
|
||||||
|
if 'roster' in tables:
|
||||||
|
columns = [col['name'] for col in inspector.get_columns('roster')]
|
||||||
|
print(f"\nColumns in roster table:")
|
||||||
|
for col in sorted(columns):
|
||||||
|
print(f" - {col}")
|
||||||
|
|
||||||
|
print("=" * 60)
|
||||||
|
print("DEV database schema updated successfully!")
|
||||||
|
print("\nNote: SQLite doesn't support ALTER COLUMN, so existing")
|
||||||
|
print("columns won't be modified, but new columns will be added.")
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
update_schema()
|
||||||
@@ -20,6 +20,9 @@
|
|||||||
|
|
||||||
<!-- PWA Manifest -->
|
<!-- PWA Manifest -->
|
||||||
<link rel="manifest" href="/static/manifest.json">
|
<link rel="manifest" href="/static/manifest.json">
|
||||||
|
<link rel="icon" type="image/png" sizes="32x32" href="/static/icons/favicon-32.png">
|
||||||
|
<link rel="icon" type="image/png" sizes="16x16" href="/static/icons/favicon-16.png">
|
||||||
|
<link rel="apple-touch-icon" sizes="180x180" href="/static/icons/icon-192.png">
|
||||||
<meta name="theme-color" content="#f48b1c">
|
<meta name="theme-color" content="#f48b1c">
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
|
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
|
||||||
@@ -68,7 +71,7 @@
|
|||||||
|
|
||||||
{% block extra_head %}{% endblock %}
|
{% block extra_head %}{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
<body class="bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-gray-100">
|
<body class="bg-gray-100 dark:bg-slate-800 text-gray-900 dark:text-gray-100">
|
||||||
|
|
||||||
<!-- Offline Indicator -->
|
<!-- Offline Indicator -->
|
||||||
<div id="offlineIndicator" class="offline-indicator">
|
<div id="offlineIndicator" class="offline-indicator">
|
||||||
@@ -85,10 +88,10 @@
|
|||||||
<aside id="sidebar" class="sidebar w-64 bg-white dark:bg-slate-800 shadow-lg flex flex-col">
|
<aside id="sidebar" class="sidebar w-64 bg-white dark:bg-slate-800 shadow-lg flex flex-col">
|
||||||
<!-- Logo -->
|
<!-- Logo -->
|
||||||
<div class="p-6 border-b border-gray-200 dark:border-gray-700">
|
<div class="p-6 border-b border-gray-200 dark:border-gray-700">
|
||||||
<h1 class="text-2xl font-bold text-seismo-navy dark:text-seismo-orange">
|
<a href="/" class="block">
|
||||||
Seismo<br>
|
<img src="/static/terra-view-logo-light.png" srcset="/static/terra-view-logo-light.png 1x, /static/terra-view-logo-light@2x.png 2x" alt="Terra-View" class="block dark:hidden w-44 h-auto">
|
||||||
<span class="text-seismo-orange dark:text-seismo-burgundy">Fleet Manager</span>
|
<img src="/static/terra-view-logo-dark.png" srcset="/static/terra-view-logo-dark.png 1x, /static/terra-view-logo-dark@2x.png 2x" alt="Terra-View" class="hidden dark:block w-44 h-auto">
|
||||||
</h1>
|
</a>
|
||||||
<div class="flex items-center justify-between mt-2">
|
<div class="flex items-center justify-between mt-2">
|
||||||
<p class="text-xs text-gray-500 dark:text-gray-400">v {{ version }}</p>
|
<p class="text-xs text-gray-500 dark:text-gray-400">v {{ version }}</p>
|
||||||
{% if environment == 'development' %}
|
{% if environment == 'development' %}
|
||||||
@@ -110,10 +113,38 @@
|
|||||||
<svg class="w-5 h-5 mr-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<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="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2"></path>
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2"></path>
|
||||||
</svg>
|
</svg>
|
||||||
Fleet Roster
|
Devices
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a href="#" class="flex items-center px-4 py-3 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 opacity-50 cursor-not-allowed">
|
<a href="/seismographs" class="flex items-center px-4 py-3 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 {% if request.url.path == '/seismographs' %}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="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>
|
||||||
|
Seismographs
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<a href="/sound-level-meters" class="flex items-center px-4 py-3 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 {% if request.url.path == '/sound-level-meters' %}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="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>
|
||||||
|
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">
|
<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>
|
<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>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -180,7 +211,7 @@
|
|||||||
<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2"></path>
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2"></path>
|
||||||
</svg>
|
</svg>
|
||||||
<span>Roster</span>
|
<span>Devices</span>
|
||||||
</button>
|
</button>
|
||||||
<button class="bottom-nav-btn" data-href="/settings" onclick="window.location.href='/settings'">
|
<button class="bottom-nav-btn" data-href="/settings" onclick="window.location.href='/settings'">
|
||||||
<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
@@ -360,10 +391,10 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- Offline Database -->
|
<!-- Offline Database -->
|
||||||
<script src="/static/offline-db.js?v=0.4.0"></script>
|
<script src="/static/offline-db.js?v=0.5.1"></script>
|
||||||
|
|
||||||
<!-- Mobile JavaScript -->
|
<!-- Mobile JavaScript -->
|
||||||
<script src="/static/mobile.js?v=0.4.0"></script>
|
<script src="/static/mobile.js?v=0.5.1"></script>
|
||||||
|
|
||||||
{% block extra_scripts %}{% endblock %}
|
{% block extra_scripts %}{% endblock %}
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -27,10 +27,10 @@
|
|||||||
hx-swap="none"
|
hx-swap="none"
|
||||||
hx-on::after-request="updateDashboard(event)">
|
hx-on::after-request="updateDashboard(event)">
|
||||||
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-8">
|
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mb-8">
|
||||||
|
|
||||||
<!-- Fleet Summary Card -->
|
<!-- Fleet Summary Card -->
|
||||||
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-800 p-6" id="fleet-summary-card">
|
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-700 p-6" id="fleet-summary-card">
|
||||||
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('fleet-summary')">
|
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('fleet-summary')">
|
||||||
<h2 class="text-lg font-semibold text-gray-900 dark:text-white">Fleet Summary</h2>
|
<h2 class="text-lg font-semibold text-gray-900 dark:text-white">Fleet Summary</h2>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
@@ -57,6 +57,27 @@
|
|||||||
<span class="text-gray-600 dark:text-gray-400">Benched</span>
|
<span class="text-gray-600 dark:text-gray-400">Benched</span>
|
||||||
<span id="benched-units" class="text-3xl md:text-2xl font-bold text-gray-600 dark:text-gray-400">--</span>
|
<span id="benched-units" class="text-3xl md:text-2xl font-bold text-gray-600 dark:text-gray-400">--</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="border-t border-gray-200 dark:border-gray-700 pt-3 mt-3">
|
||||||
|
<p class="text-xs text-gray-500 dark:text-gray-500 mb-2 italic">By Device Type:</p>
|
||||||
|
<div class="flex justify-between items-center mb-1">
|
||||||
|
<div class="flex items-center">
|
||||||
|
<svg class="w-4 h-4 mr-1.5 text-blue-500" 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>
|
||||||
|
<a href="/seismographs" class="text-sm text-gray-600 dark:text-gray-400 hover:text-blue-600 dark:hover:text-blue-400">Seismographs</a>
|
||||||
|
</div>
|
||||||
|
<span id="seismo-count" class="font-semibold text-blue-600 dark:text-blue-400">--</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex justify-between items-center mb-2">
|
||||||
|
<div class="flex items-center">
|
||||||
|
<svg class="w-4 h-4 mr-1.5 text-purple-500" 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>
|
||||||
|
<a href="/sound-level-meters" class="text-sm text-gray-600 dark:text-gray-400 hover:text-purple-600 dark:hover:text-purple-400">Sound Level Meters</a>
|
||||||
|
</div>
|
||||||
|
<span id="slm-count" class="font-semibold text-purple-600 dark:text-purple-400">--</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="border-t border-gray-200 dark:border-gray-700 pt-3 mt-3">
|
<div class="border-t border-gray-200 dark:border-gray-700 pt-3 mt-3">
|
||||||
<p class="text-xs text-gray-500 dark:text-gray-500 mb-2 italic">Deployed Status:</p>
|
<p class="text-xs text-gray-500 dark:text-gray-500 mb-2 italic">Deployed Status:</p>
|
||||||
<div class="flex justify-between items-center mb-2" title="Units reporting normally (last seen < 12 hours)">
|
<div class="flex justify-between items-center mb-2" title="Units reporting normally (last seen < 12 hours)">
|
||||||
@@ -97,7 +118,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Recent Alerts Card -->
|
<!-- Recent Alerts Card -->
|
||||||
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-800 p-6" id="recent-alerts-card">
|
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-700 p-6" id="recent-alerts-card">
|
||||||
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('recent-alerts')">
|
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('recent-alerts')">
|
||||||
<h2 class="text-lg font-semibold text-gray-900 dark:text-white">Recent Alerts</h2>
|
<h2 class="text-lg font-semibold text-gray-900 dark:text-white">Recent Alerts</h2>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
@@ -117,7 +138,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Recently Called In Units Card -->
|
<!-- Recently Called In Units Card -->
|
||||||
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-800 p-6" id="recent-callins-card">
|
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-700 p-6" id="recent-callins-card">
|
||||||
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('recent-callins')">
|
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('recent-callins')">
|
||||||
<h2 class="text-lg font-semibold text-gray-900 dark:text-white">Recent Call-Ins</h2>
|
<h2 class="text-lg font-semibold text-gray-900 dark:text-white">Recent Call-Ins</h2>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
@@ -141,10 +162,95 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Today's Scheduled Actions Card -->
|
||||||
|
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-700 p-6" id="todays-actions-card">
|
||||||
|
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('todays-actions')">
|
||||||
|
<h2 class="text-lg font-semibold text-gray-900 dark:text-white">Today's Schedule</h2>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<svg class="w-6 h-6 text-seismo-orange" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
|
||||||
|
d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z">
|
||||||
|
</path>
|
||||||
|
</svg>
|
||||||
|
<svg class="w-5 h-5 text-gray-500 transition-transform md:hidden chevron" id="todays-actions-chevron" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card-content" id="todays-actions-content"
|
||||||
|
hx-get="/dashboard/todays-actions"
|
||||||
|
hx-trigger="load, every 30s"
|
||||||
|
hx-swap="innerHTML">
|
||||||
|
<p class="text-sm text-gray-500 dark:text-gray-400">Loading scheduled actions...</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</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>
|
</div>
|
||||||
|
|
||||||
<!-- Fleet Map -->
|
<!-- Fleet Map -->
|
||||||
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-800 p-6 mb-8" id="fleet-map-card">
|
<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')">
|
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('fleet-map')">
|
||||||
<h2 class="text-xl font-semibold text-gray-900 dark:text-white">Fleet Map</h2>
|
<h2 class="text-xl font-semibold text-gray-900 dark:text-white">Fleet Map</h2>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
@@ -160,7 +266,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Recent Photos Section -->
|
<!-- Recent Photos Section -->
|
||||||
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-800 p-6 mb-8" id="recent-photos-card">
|
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-700 p-6 mb-8" id="recent-photos-card">
|
||||||
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('recent-photos')">
|
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('recent-photos')">
|
||||||
<h2 class="text-xl font-semibold text-gray-900 dark:text-white">Recent Photos</h2>
|
<h2 class="text-xl font-semibold text-gray-900 dark:text-white">Recent Photos</h2>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
@@ -180,7 +286,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Fleet Status Section with Tabs -->
|
<!-- Fleet Status Section with Tabs -->
|
||||||
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-800 p-6" id="fleet-status-card">
|
<div class="rounded-xl shadow-lg bg-white dark:bg-slate-700 p-6" id="fleet-status-card">
|
||||||
|
|
||||||
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('fleet-status')">
|
<div class="flex items-center justify-between mb-4 cursor-pointer md:cursor-default" onclick="toggleCard('fleet-status')">
|
||||||
<h2 class="text-xl font-semibold text-gray-900 dark:text-white">Fleet Status</h2>
|
<h2 class="text-xl font-semibold text-gray-900 dark:text-white">Fleet Status</h2>
|
||||||
@@ -258,6 +364,254 @@
|
|||||||
|
|
||||||
|
|
||||||
<script>
|
<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)
|
// Toggle card collapse/expand (mobile only)
|
||||||
function toggleCard(cardName) {
|
function toggleCard(cardName) {
|
||||||
// Only work on mobile
|
// Only work on mobile
|
||||||
@@ -295,7 +649,7 @@ function toggleCard(cardName) {
|
|||||||
// Restore card states from localStorage on page load
|
// Restore card states from localStorage on page load
|
||||||
function restoreCardStates() {
|
function restoreCardStates() {
|
||||||
const cardStates = JSON.parse(localStorage.getItem('dashboardCardStates') || '{}');
|
const cardStates = JSON.parse(localStorage.getItem('dashboardCardStates') || '{}');
|
||||||
const cardNames = ['fleet-summary', 'recent-alerts', 'recent-callins', 'fleet-map', 'fleet-status'];
|
const cardNames = ['fleet-summary', 'recent-alerts', 'recent-callins', 'todays-actions', 'fleet-map', 'fleet-status'];
|
||||||
|
|
||||||
cardNames.forEach(cardName => {
|
cardNames.forEach(cardName => {
|
||||||
const content = document.getElementById(`${cardName}-content`);
|
const content = document.getElementById(`${cardName}-content`);
|
||||||
@@ -322,8 +676,17 @@ if (document.readyState === 'loading') {
|
|||||||
|
|
||||||
function updateDashboard(event) {
|
function updateDashboard(event) {
|
||||||
try {
|
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);
|
const data = JSON.parse(event.detail.xhr.response);
|
||||||
|
|
||||||
|
// Store data for filter re-application
|
||||||
|
currentSnapshotData = data;
|
||||||
|
|
||||||
// Update "Last updated" timestamp with timezone
|
// Update "Last updated" timestamp with timezone
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const timezone = localStorage.getItem('timezone') || 'America/New_York';
|
const timezone = localStorage.getItem('timezone') || 'America/New_York';
|
||||||
@@ -335,7 +698,7 @@ function updateDashboard(event) {
|
|||||||
timeZoneName: 'short'
|
timeZoneName: 'short'
|
||||||
});
|
});
|
||||||
|
|
||||||
// ===== Fleet summary numbers =====
|
// ===== Fleet summary numbers (always unfiltered) =====
|
||||||
document.getElementById('total-units').textContent = data.summary?.total ?? 0;
|
document.getElementById('total-units').textContent = data.summary?.total ?? 0;
|
||||||
document.getElementById('deployed-units').textContent = data.summary?.active ?? 0;
|
document.getElementById('deployed-units').textContent = data.summary?.active ?? 0;
|
||||||
document.getElementById('benched-units').textContent = data.summary?.benched ?? 0;
|
document.getElementById('benched-units').textContent = data.summary?.benched ?? 0;
|
||||||
@@ -343,41 +706,37 @@ function updateDashboard(event) {
|
|||||||
document.getElementById('status-pending').textContent = data.summary?.pending ?? 0;
|
document.getElementById('status-pending').textContent = data.summary?.pending ?? 0;
|
||||||
document.getElementById('status-missing').textContent = data.summary?.missing ?? 0;
|
document.getElementById('status-missing').textContent = data.summary?.missing ?? 0;
|
||||||
|
|
||||||
// ===== Alerts =====
|
// ===== Device type counts (always unfiltered) =====
|
||||||
const alertsList = document.getElementById('alerts-list');
|
let seismoCount = 0;
|
||||||
// Only show alerts for deployed units that are MISSING (not pending)
|
let slmCount = 0;
|
||||||
const missingUnits = Object.entries(data.active).filter(([_, u]) => u.status === 'Missing');
|
let modemCount = 0;
|
||||||
|
Object.values(data.units || {}).forEach(unit => {
|
||||||
if (!missingUnits.length) {
|
if (unit.retired) return; // Don't count retired units
|
||||||
alertsList.innerHTML =
|
const deviceType = unit.device_type || 'seismograph';
|
||||||
'<p class="text-sm text-green-600 dark:text-green-400">✓ All units reporting normally</p>';
|
if (deviceType === 'seismograph') {
|
||||||
} else {
|
seismoCount++;
|
||||||
let alertsHtml = '';
|
} else if (deviceType === 'sound_level_meter') {
|
||||||
|
slmCount++;
|
||||||
missingUnits.forEach(([id, unit]) => {
|
} else if (deviceType === 'modem') {
|
||||||
alertsHtml += `
|
modemCount++;
|
||||||
<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;
|
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
document.getElementById('seismo-count').textContent = seismoCount;
|
||||||
|
document.getElementById('slm-count').textContent = slmCount;
|
||||||
|
|
||||||
// ===== Update Fleet Map =====
|
// ===== Apply filters and render map + alerts =====
|
||||||
updateFleetMap(data);
|
renderFilteredDashboard(data);
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("Dashboard update error:", err);
|
console.error("Dashboard update error:", err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle tab switching
|
// Handle tab switching and initialize components
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
// Load filter preferences
|
||||||
|
loadFilterPreferences();
|
||||||
|
|
||||||
const tabButtons = document.querySelectorAll('.tab-button');
|
const tabButtons = document.querySelectorAll('.tab-button');
|
||||||
|
|
||||||
tabButtons.forEach(button => {
|
tabButtons.forEach(button => {
|
||||||
@@ -417,64 +776,6 @@ function initFleetMap() {
|
|||||||
}, 100);
|
}, 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) {
|
function parseLocation(location) {
|
||||||
if (!location) return null;
|
if (!location) return null;
|
||||||
|
|
||||||
|
|||||||
102
templates/modems.html
Normal file
@@ -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 %}
|
||||||
563
templates/nrl_detail.html
Normal file
@@ -0,0 +1,563 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}{{ location.name }} - NRL Detail{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<!-- Breadcrumb Navigation -->
|
||||||
|
<div class="mb-6">
|
||||||
|
<nav class="flex items-center space-x-2 text-sm">
|
||||||
|
<a href="/projects" class="text-seismo-orange hover:text-seismo-navy flex items-center">
|
||||||
|
<svg class="w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path>
|
||||||
|
</svg>
|
||||||
|
Projects
|
||||||
|
</a>
|
||||||
|
<svg class="w-4 h-4 text-gray-400" 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 href="/projects/{{ project_id }}" class="text-seismo-orange hover:text-seismo-navy">
|
||||||
|
{{ project.name }}
|
||||||
|
</a>
|
||||||
|
<svg class="w-4 h-4 text-gray-400" 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>
|
||||||
|
<span class="text-gray-900 dark:text-white font-medium">{{ location.name }}</span>
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Header -->
|
||||||
|
<div class="mb-8">
|
||||||
|
<div class="flex justify-between items-start">
|
||||||
|
<div>
|
||||||
|
<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="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"></path>
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"></path>
|
||||||
|
</svg>
|
||||||
|
{{ location.name }}
|
||||||
|
</h1>
|
||||||
|
<p class="text-gray-600 dark:text-gray-400 mt-1">
|
||||||
|
Noise Recording Location • {{ project.name }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="flex gap-2">
|
||||||
|
{% if assigned_unit %}
|
||||||
|
<span class="px-3 py-1 rounded-full text-sm font-medium bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-300">
|
||||||
|
<svg class="w-4 h-4 inline mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
|
||||||
|
</svg>
|
||||||
|
Unit Assigned
|
||||||
|
</span>
|
||||||
|
{% else %}
|
||||||
|
<span class="px-3 py-1 rounded-full text-sm font-medium bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300">
|
||||||
|
No Unit Assigned
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Tab Navigation -->
|
||||||
|
<div class="mb-6 border-b border-gray-200 dark:border-gray-700">
|
||||||
|
<nav class="flex space-x-6">
|
||||||
|
<button onclick="switchTab('overview')"
|
||||||
|
data-tab="overview"
|
||||||
|
class="tab-button px-4 py-3 border-b-2 font-medium text-sm transition-colors border-seismo-orange text-seismo-orange">
|
||||||
|
Overview
|
||||||
|
</button>
|
||||||
|
<button onclick="switchTab('settings')"
|
||||||
|
data-tab="settings"
|
||||||
|
class="tab-button px-4 py-3 border-b-2 border-transparent font-medium text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-white hover:border-gray-300 dark:hover:border-gray-600 transition-colors">
|
||||||
|
Settings
|
||||||
|
</button>
|
||||||
|
{% if assigned_unit %}
|
||||||
|
<button onclick="switchTab('command')"
|
||||||
|
data-tab="command"
|
||||||
|
class="tab-button px-4 py-3 border-b-2 border-transparent font-medium text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-white hover:border-gray-300 dark:hover:border-gray-600 transition-colors">
|
||||||
|
Command Center
|
||||||
|
</button>
|
||||||
|
{% endif %}
|
||||||
|
<button onclick="switchTab('sessions')"
|
||||||
|
data-tab="sessions"
|
||||||
|
class="tab-button px-4 py-3 border-b-2 border-transparent font-medium text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-white hover:border-gray-300 dark:hover:border-gray-600 transition-colors">
|
||||||
|
Recording Sessions
|
||||||
|
</button>
|
||||||
|
<button onclick="switchTab('data')"
|
||||||
|
data-tab="data"
|
||||||
|
class="tab-button px-4 py-3 border-b-2 border-transparent font-medium text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-white hover:border-gray-300 dark:hover:border-gray-600 transition-colors">
|
||||||
|
Data Files
|
||||||
|
</button>
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Tab Content -->
|
||||||
|
<div id="tab-content">
|
||||||
|
<!-- Overview Tab -->
|
||||||
|
<div id="overview-tab" class="tab-panel">
|
||||||
|
<div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
|
||||||
|
<!-- Location Details Card -->
|
||||||
|
<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6">
|
||||||
|
<h2 class="text-xl font-semibold text-gray-900 dark:text-white mb-4">Location Details</h2>
|
||||||
|
<div class="space-y-4">
|
||||||
|
<div>
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400">Name</div>
|
||||||
|
<div class="text-lg font-medium text-gray-900 dark:text-white">{{ location.name }}</div>
|
||||||
|
</div>
|
||||||
|
{% if location.description %}
|
||||||
|
<div>
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400">Description</div>
|
||||||
|
<div class="text-gray-900 dark:text-white">{{ location.description }}</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if location.address %}
|
||||||
|
<div>
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400">Address</div>
|
||||||
|
<div class="text-gray-900 dark:text-white">{{ location.address }}</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if location.coordinates %}
|
||||||
|
<div>
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400">Coordinates</div>
|
||||||
|
<div class="text-gray-900 dark:text-white font-mono text-sm">{{ location.coordinates }}</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
<div>
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400">Created</div>
|
||||||
|
<div class="text-gray-900 dark:text-white">{{ location.created_at|local_datetime if location.created_at else 'N/A' }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Assignment Card -->
|
||||||
|
<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6">
|
||||||
|
<h2 class="text-xl font-semibold text-gray-900 dark:text-white mb-4">Unit Assignment</h2>
|
||||||
|
{% if assigned_unit %}
|
||||||
|
<div class="space-y-4">
|
||||||
|
<div>
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400">Assigned Unit</div>
|
||||||
|
<div class="text-lg font-medium text-gray-900 dark:text-white">
|
||||||
|
<a href="/slm/{{ assigned_unit.id }}?from_project={{ project_id }}&from_nrl={{ location_id }}" class="text-seismo-orange hover:text-seismo-navy">
|
||||||
|
{{ assigned_unit.id }}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% if assigned_unit.slm_model %}
|
||||||
|
<div>
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400">Model</div>
|
||||||
|
<div class="text-gray-900 dark:text-white">{{ assigned_unit.slm_model }}</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if assignment %}
|
||||||
|
<div>
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400">Assigned Since</div>
|
||||||
|
<div class="text-gray-900 dark:text-white">{{ assignment.assigned_at|local_datetime if assignment.assigned_at else 'N/A' }}</div>
|
||||||
|
</div>
|
||||||
|
{% if assignment.notes %}
|
||||||
|
<div>
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400">Notes</div>
|
||||||
|
<div class="text-gray-900 dark:text-white text-sm">{{ assignment.notes }}</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
<div class="pt-2">
|
||||||
|
<button onclick="unassignUnit('{{ assignment.id }}')"
|
||||||
|
class="px-4 py-2 bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300 rounded-lg hover:bg-amber-200 dark:hover:bg-amber-900/50 transition-colors">
|
||||||
|
Unassign Unit
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="text-center py-8">
|
||||||
|
<svg class="w-16 h-16 mx-auto mb-4 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>
|
||||||
|
<p class="text-gray-500 dark:text-gray-400 mb-4">No unit currently assigned</p>
|
||||||
|
<button onclick="openAssignModal()"
|
||||||
|
class="px-4 py-2 bg-seismo-orange text-white rounded-lg hover:bg-seismo-navy transition-colors">
|
||||||
|
Assign a Unit
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Stats Cards -->
|
||||||
|
<div class="grid grid-cols-1 md:grid-cols-3 gap-6 mt-6">
|
||||||
|
<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">Total Sessions</p>
|
||||||
|
<p class="text-3xl font-bold text-gray-900 dark:text-white mt-2">{{ session_count }}</p>
|
||||||
|
</div>
|
||||||
|
<div class="w-12 h-12 bg-blue-100 dark:bg-blue-900/30 rounded-lg flex items-center justify-center">
|
||||||
|
<svg class="w-6 h-6 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="M9 19V6l12-3v13M9 19c0 1.105-1.343 2-3 2s-3-.895-3-2 1.343-2 3-2 3 .895 3 2zm12-3c0 1.105-1.343 2-3 2s-3-.895-3-2 1.343-2 3-2 3 .895 3 2zM9 10l12-3"></path>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<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">Data Files</p>
|
||||||
|
<p class="text-3xl font-bold text-gray-900 dark:text-white mt-2">{{ file_count }}</p>
|
||||||
|
</div>
|
||||||
|
<div class="w-12 h-12 bg-green-100 dark:bg-green-900/30 rounded-lg flex items-center justify-center">
|
||||||
|
<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="M7 21h10a2 2 0 002-2V9.414a1 1 0 00-.293-.707l-5.414-5.414A1 1 0 0012.586 3H7a2 2 0 00-2 2v14a2 2 0 002 2z"></path>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<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">Active Session</p>
|
||||||
|
<p class="text-lg font-semibold text-gray-900 dark:text-white mt-2">
|
||||||
|
{% if active_session %}
|
||||||
|
<span class="text-green-600 dark:text-green-400">Recording</span>
|
||||||
|
{% else %}
|
||||||
|
<span class="text-gray-500">Idle</span>
|
||||||
|
{% endif %}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="w-12 h-12 bg-purple-100 dark:bg-purple-900/30 rounded-lg flex items-center justify-center">
|
||||||
|
<svg class="w-6 h-6 text-purple-600 dark:text-purple-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"></path>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Settings Tab -->
|
||||||
|
<div id="settings-tab" class="tab-panel hidden">
|
||||||
|
<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6">
|
||||||
|
<h2 class="text-xl font-semibold text-gray-900 dark:text-white mb-6">Location Settings</h2>
|
||||||
|
|
||||||
|
<form id="location-settings-form" class="space-y-6">
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Name</label>
|
||||||
|
<input type="text" id="settings-name" value="{{ location.name }}"
|
||||||
|
class="w-full px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white" required>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Description</label>
|
||||||
|
<textarea id="settings-description" rows="3"
|
||||||
|
class="w-full px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white">{{ location.description or '' }}</textarea>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Address</label>
|
||||||
|
<input type="text" id="settings-address" value="{{ location.address or '' }}"
|
||||||
|
class="w-full px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Coordinates</label>
|
||||||
|
<input type="text" id="settings-coordinates" value="{{ location.coordinates or '' }}"
|
||||||
|
placeholder="40.7128,-74.0060"
|
||||||
|
class="w-full px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white">
|
||||||
|
<p class="text-xs text-gray-500 mt-1">Format: latitude,longitude</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="settings-error" class="hidden text-sm text-red-600"></div>
|
||||||
|
|
||||||
|
<div class="flex justify-end gap-3 pt-2">
|
||||||
|
<button type="button" onclick="window.location.href='/projects/{{ project_id }}'"
|
||||||
|
class="px-6 py-2 border border-gray-300 dark:border-gray-600 rounded-lg text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700">
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
<button type="submit"
|
||||||
|
class="px-6 py-2 bg-seismo-orange hover:bg-seismo-navy text-white rounded-lg font-medium">
|
||||||
|
Save Changes
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Command Center Tab -->
|
||||||
|
{% if assigned_unit %}
|
||||||
|
<div id="command-tab" class="tab-panel hidden">
|
||||||
|
<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6">
|
||||||
|
<h2 class="text-xl font-semibold text-gray-900 dark:text-white mb-6">
|
||||||
|
SLM Command Center - {{ assigned_unit.id }}
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<div id="slm-command-center"
|
||||||
|
hx-get="/api/slm-dashboard/live-view/{{ assigned_unit.id if assigned_unit else '' }}"
|
||||||
|
hx-trigger="load"
|
||||||
|
hx-swap="innerHTML">
|
||||||
|
<div class="text-center py-8 text-gray-500">
|
||||||
|
<div class="animate-spin rounded-full h-12 w-12 border-b-2 border-seismo-orange mx-auto mb-4"></div>
|
||||||
|
<p>Loading command center...</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<!-- Recording Sessions Tab -->
|
||||||
|
<div id="sessions-tab" class="tab-panel hidden">
|
||||||
|
<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">Recording Sessions</h2>
|
||||||
|
{% if assigned_unit %}
|
||||||
|
<button onclick="openScheduleModal()"
|
||||||
|
class="px-4 py-2 bg-seismo-orange text-white rounded-lg hover:bg-seismo-navy transition-colors">
|
||||||
|
Schedule Session
|
||||||
|
</button>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="sessions-list"
|
||||||
|
hx-get="/api/projects/{{ project_id }}/nrl/{{ location_id }}/sessions"
|
||||||
|
hx-trigger="load, every 30s"
|
||||||
|
hx-swap="innerHTML">
|
||||||
|
<div class="text-center py-8 text-gray-500">Loading sessions...</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Data Files Tab -->
|
||||||
|
<div id="data-tab" class="tab-panel hidden">
|
||||||
|
<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">Data Files</h2>
|
||||||
|
<div class="text-sm text-gray-500">
|
||||||
|
<span class="font-medium">{{ file_count }}</span> files
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="data-files-list"
|
||||||
|
hx-get="/api/projects/{{ project_id }}/nrl/{{ location_id }}/files"
|
||||||
|
hx-trigger="load"
|
||||||
|
hx-swap="innerHTML">
|
||||||
|
<div class="text-center py-8 text-gray-500">Loading data files...</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Assign Unit Modal -->
|
||||||
|
<div id="assign-modal" class="hidden fixed inset-0 bg-black bg-opacity-50 z-50 flex items-center justify-center">
|
||||||
|
<div class="bg-white dark:bg-slate-800 rounded-xl shadow-2xl w-full max-w-2xl max-h-[90vh] overflow-y-auto m-4">
|
||||||
|
<div class="p-6 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between">
|
||||||
|
<div>
|
||||||
|
<h2 class="text-2xl font-bold text-gray-900 dark:text-white">Assign Unit</h2>
|
||||||
|
<p class="text-gray-600 dark:text-gray-400 mt-1">Attach a sound level meter to this location</p>
|
||||||
|
</div>
|
||||||
|
<button onclick="closeAssignModal()" class="text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200">
|
||||||
|
<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>
|
||||||
|
|
||||||
|
<form id="assign-form" class="p-6 space-y-4">
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Available Units</label>
|
||||||
|
<select id="assign-unit-id" name="unit_id"
|
||||||
|
class="w-full px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white" required>
|
||||||
|
<option value="">Loading units...</option>
|
||||||
|
</select>
|
||||||
|
<p id="assign-empty" class="hidden text-xs text-gray-500 mt-2">No available units for this location type.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Notes</label>
|
||||||
|
<textarea id="assign-notes" name="notes" rows="2"
|
||||||
|
class="w-full px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white"></textarea>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="assign-error" class="hidden text-sm text-red-600"></div>
|
||||||
|
|
||||||
|
<div class="flex justify-end gap-3 pt-2">
|
||||||
|
<button type="button" onclick="closeAssignModal()"
|
||||||
|
class="px-6 py-2 border border-gray-300 dark:border-gray-600 rounded-lg text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700">
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
<button type="submit"
|
||||||
|
class="px-6 py-2 bg-seismo-orange hover:bg-seismo-navy text-white rounded-lg font-medium">
|
||||||
|
Assign Unit
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
const projectId = "{{ project_id }}";
|
||||||
|
const locationId = "{{ location_id }}";
|
||||||
|
|
||||||
|
// Tab switching
|
||||||
|
function switchTab(tabName) {
|
||||||
|
// Hide all tab panels
|
||||||
|
document.querySelectorAll('.tab-panel').forEach(panel => {
|
||||||
|
panel.classList.add('hidden');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Reset all tab buttons
|
||||||
|
document.querySelectorAll('.tab-button').forEach(button => {
|
||||||
|
button.classList.remove('border-seismo-orange', 'text-seismo-orange');
|
||||||
|
button.classList.add('border-transparent', 'text-gray-600', 'dark:text-gray-400');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Show selected tab panel
|
||||||
|
const panel = document.getElementById(`${tabName}-tab`);
|
||||||
|
if (panel) {
|
||||||
|
panel.classList.remove('hidden');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Highlight selected tab button
|
||||||
|
const button = document.querySelector(`[data-tab="${tabName}"]`);
|
||||||
|
if (button) {
|
||||||
|
button.classList.remove('border-transparent', 'text-gray-600', 'dark:text-gray-400');
|
||||||
|
button.classList.add('border-seismo-orange', 'text-seismo-orange');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Location settings form submission
|
||||||
|
document.getElementById('location-settings-form').addEventListener('submit', async function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
const payload = {
|
||||||
|
name: document.getElementById('settings-name').value.trim(),
|
||||||
|
description: document.getElementById('settings-description').value.trim() || null,
|
||||||
|
address: document.getElementById('settings-address').value.trim() || null,
|
||||||
|
coordinates: document.getElementById('settings-coordinates').value.trim() || null,
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/projects/${projectId}/locations/${locationId}`, {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: {'Content-Type': 'application/json'},
|
||||||
|
body: JSON.stringify(payload)
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const data = await response.json().catch(() => ({}));
|
||||||
|
throw new Error(data.detail || 'Failed to update location');
|
||||||
|
}
|
||||||
|
|
||||||
|
window.location.reload();
|
||||||
|
} catch (err) {
|
||||||
|
const errorEl = document.getElementById('settings-error');
|
||||||
|
errorEl.textContent = err.message || 'Failed to update location.';
|
||||||
|
errorEl.classList.remove('hidden');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assign modal functions
|
||||||
|
function openAssignModal() {
|
||||||
|
const modal = document.getElementById('assign-modal');
|
||||||
|
modal.classList.remove('hidden');
|
||||||
|
loadAvailableUnits();
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeAssignModal() {
|
||||||
|
document.getElementById('assign-modal').classList.add('hidden');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadAvailableUnits() {
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/projects/${projectId}/available-units?location_type=sound`);
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to load available units');
|
||||||
|
}
|
||||||
|
const data = await response.json();
|
||||||
|
const select = document.getElementById('assign-unit-id');
|
||||||
|
select.innerHTML = '<option value="">Select a unit</option>';
|
||||||
|
|
||||||
|
if (!data.length) {
|
||||||
|
document.getElementById('assign-empty').classList.remove('hidden');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
data.forEach(unit => {
|
||||||
|
const option = document.createElement('option');
|
||||||
|
option.value = unit.id;
|
||||||
|
option.textContent = `${unit.id} • ${unit.model || unit.device_type}`;
|
||||||
|
select.appendChild(option);
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
const errorEl = document.getElementById('assign-error');
|
||||||
|
errorEl.textContent = err.message || 'Failed to load units.';
|
||||||
|
errorEl.classList.remove('hidden');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
document.getElementById('assign-form').addEventListener('submit', async function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
const unitId = document.getElementById('assign-unit-id').value;
|
||||||
|
const notes = document.getElementById('assign-notes').value.trim();
|
||||||
|
|
||||||
|
if (!unitId) {
|
||||||
|
document.getElementById('assign-error').textContent = 'Select a unit to assign.';
|
||||||
|
document.getElementById('assign-error').classList.remove('hidden');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const formData = new FormData();
|
||||||
|
formData.append('unit_id', unitId);
|
||||||
|
formData.append('notes', notes);
|
||||||
|
|
||||||
|
const response = await fetch(`/api/projects/${projectId}/locations/${locationId}/assign`, {
|
||||||
|
method: 'POST',
|
||||||
|
body: formData
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const data = await response.json().catch(() => ({}));
|
||||||
|
throw new Error(data.detail || 'Failed to assign unit');
|
||||||
|
}
|
||||||
|
|
||||||
|
window.location.reload();
|
||||||
|
} catch (err) {
|
||||||
|
const errorEl = document.getElementById('assign-error');
|
||||||
|
errorEl.textContent = err.message || 'Failed to assign unit.';
|
||||||
|
errorEl.classList.remove('hidden');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
async function unassignUnit(assignmentId) {
|
||||||
|
if (!confirm('Unassign this unit from the location?')) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/projects/${projectId}/assignments/${assignmentId}/unassign`, {
|
||||||
|
method: 'POST'
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const data = await response.json().catch(() => ({}));
|
||||||
|
throw new Error(data.detail || 'Failed to unassign unit');
|
||||||
|
}
|
||||||
|
|
||||||
|
window.location.reload();
|
||||||
|
} catch (err) {
|
||||||
|
alert(err.message || 'Failed to unassign unit.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Keyboard shortcuts
|
||||||
|
document.addEventListener('keydown', function(e) {
|
||||||
|
if (e.key === 'Escape') {
|
||||||
|
closeAssignModal();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Click outside to close modal
|
||||||
|
document.getElementById('assign-modal')?.addEventListener('click', function(e) {
|
||||||
|
if (e.target === this) {
|
||||||
|
closeAssignModal();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% endblock %}
|
||||||
566
templates/pair_devices.html
Normal file
@@ -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 %}
|
||||||
87
templates/partials/alerts/alert_dropdown.html
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
<!-- Alert Dropdown Content -->
|
||||||
|
<!-- Loaded via HTMX into the alert dropdown in the navbar -->
|
||||||
|
|
||||||
|
<div class="max-h-96 overflow-y-auto">
|
||||||
|
{% if alerts %}
|
||||||
|
{% for item in alerts %}
|
||||||
|
<div class="p-3 border-b border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700/50 transition-colors
|
||||||
|
{% if item.alert.severity == 'critical' %}bg-red-50 dark:bg-red-900/20{% endif %}">
|
||||||
|
<div class="flex items-start gap-3">
|
||||||
|
<!-- Severity icon -->
|
||||||
|
{% if item.alert.severity == 'critical' %}
|
||||||
|
<span class="text-red-500 flex-shrink-0 mt-0.5">
|
||||||
|
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
</span>
|
||||||
|
{% elif item.alert.severity == 'warning' %}
|
||||||
|
<span class="text-yellow-500 flex-shrink-0 mt-0.5">
|
||||||
|
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
</span>
|
||||||
|
{% else %}
|
||||||
|
<span class="text-blue-500 flex-shrink-0 mt-0.5">
|
||||||
|
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="flex-1 min-w-0">
|
||||||
|
<p class="text-sm font-medium text-gray-900 dark:text-white truncate">
|
||||||
|
{{ item.alert.title }}
|
||||||
|
</p>
|
||||||
|
{% if item.alert.message %}
|
||||||
|
<p class="text-xs text-gray-500 dark:text-gray-400 line-clamp-2 mt-0.5">
|
||||||
|
{{ item.alert.message }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
<p class="text-xs text-gray-400 dark:text-gray-500 mt-1">
|
||||||
|
{{ item.time_ago }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Actions -->
|
||||||
|
<div class="flex items-center gap-1 flex-shrink-0">
|
||||||
|
<button hx-post="/api/alerts/{{ item.alert.id }}/acknowledge"
|
||||||
|
hx-swap="none"
|
||||||
|
hx-on::after-request="htmx.trigger('#alert-dropdown-content', 'refresh')"
|
||||||
|
class="p-1.5 text-gray-400 hover:text-green-600 dark:hover:text-green-400 rounded transition-colors"
|
||||||
|
title="Acknowledge">
|
||||||
|
<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="M5 13l4 4L19 7"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
<button hx-post="/api/alerts/{{ item.alert.id }}/dismiss"
|
||||||
|
hx-swap="none"
|
||||||
|
hx-on::after-request="htmx.trigger('#alert-dropdown-content', 'refresh')"
|
||||||
|
class="p-1.5 text-gray-400 hover:text-red-600 dark:hover:text-red-400 rounded transition-colors"
|
||||||
|
title="Dismiss">
|
||||||
|
<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"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% else %}
|
||||||
|
<div class="p-8 text-center">
|
||||||
|
<svg class="w-12 h-12 mx-auto mb-3 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="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"/>
|
||||||
|
</svg>
|
||||||
|
<p class="text-gray-500 dark:text-gray-400 text-sm">No active alerts</p>
|
||||||
|
<p class="text-gray-400 dark:text-gray-500 text-xs mt-1">All systems operational</p>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- View all link -->
|
||||||
|
{% if total_count > 0 %}
|
||||||
|
<div class="p-3 border-t border-gray-200 dark:border-gray-700 text-center bg-gray-50 dark:bg-gray-800/50">
|
||||||
|
<a href="/alerts" class="text-sm text-seismo-orange hover:text-seismo-navy dark:hover:text-orange-300 font-medium">
|
||||||
|
View all {{ total_count }} alert{{ 's' if total_count != 1 else '' }}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
125
templates/partials/alerts/alert_list.html
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
<!-- Alert List Partial -->
|
||||||
|
<!-- Full list of alerts for the alerts page -->
|
||||||
|
|
||||||
|
<div class="space-y-3">
|
||||||
|
{% if alerts %}
|
||||||
|
{% for item in alerts %}
|
||||||
|
<div class="bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 p-4
|
||||||
|
{% if item.alert.severity == 'critical' and item.alert.status == 'active' %}border-l-4 border-l-red-500{% endif %}
|
||||||
|
{% if item.alert.severity == 'warning' and item.alert.status == 'active' %}border-l-4 border-l-yellow-500{% endif %}
|
||||||
|
{% if item.alert.status != 'active' %}opacity-60{% endif %}">
|
||||||
|
<div class="flex items-start gap-4">
|
||||||
|
<!-- Severity icon -->
|
||||||
|
<div class="flex-shrink-0">
|
||||||
|
{% if item.alert.severity == 'critical' %}
|
||||||
|
<div class="w-10 h-10 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center">
|
||||||
|
<svg class="w-5 h-5 text-red-600 dark:text-red-400" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
{% elif item.alert.severity == 'warning' %}
|
||||||
|
<div class="w-10 h-10 rounded-full bg-yellow-100 dark:bg-yellow-900/30 flex items-center justify-center">
|
||||||
|
<svg class="w-5 h-5 text-yellow-600 dark:text-yellow-400" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="w-10 h-10 rounded-full bg-blue-100 dark:bg-blue-900/30 flex items-center justify-center">
|
||||||
|
<svg class="w-5 h-5 text-blue-600 dark:text-blue-400" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Content -->
|
||||||
|
<div class="flex-1 min-w-0">
|
||||||
|
<div class="flex items-center gap-2 mb-1">
|
||||||
|
<h3 class="text-base font-semibold text-gray-900 dark:text-white">
|
||||||
|
{{ item.alert.title }}
|
||||||
|
</h3>
|
||||||
|
<!-- Status badge -->
|
||||||
|
{% if item.alert.status == 'active' %}
|
||||||
|
<span class="px-2 py-0.5 text-xs font-medium rounded-full bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-300">
|
||||||
|
Active
|
||||||
|
</span>
|
||||||
|
{% elif item.alert.status == 'acknowledged' %}
|
||||||
|
<span class="px-2 py-0.5 text-xs font-medium rounded-full bg-yellow-100 text-yellow-700 dark:bg-yellow-900/30 dark:text-yellow-300">
|
||||||
|
Acknowledged
|
||||||
|
</span>
|
||||||
|
{% elif item.alert.status == 'resolved' %}
|
||||||
|
<span class="px-2 py-0.5 text-xs font-medium rounded-full bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-300">
|
||||||
|
Resolved
|
||||||
|
</span>
|
||||||
|
{% elif item.alert.status == 'dismissed' %}
|
||||||
|
<span class="px-2 py-0.5 text-xs font-medium rounded-full bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-400">
|
||||||
|
Dismissed
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% if item.alert.message %}
|
||||||
|
<p class="text-sm text-gray-600 dark:text-gray-300 mb-2">
|
||||||
|
{{ item.alert.message }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="flex items-center gap-4 text-xs text-gray-500 dark:text-gray-400">
|
||||||
|
<span>{{ item.time_ago }}</span>
|
||||||
|
{% if item.alert.unit_id %}
|
||||||
|
<span class="flex items-center gap-1">
|
||||||
|
<svg class="w-3.5 h-3.5" 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"/>
|
||||||
|
</svg>
|
||||||
|
{{ item.alert.unit_id }}
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
<span class="capitalize">{{ item.alert.alert_type | replace('_', ' ') }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Actions -->
|
||||||
|
{% if item.alert.status == 'active' %}
|
||||||
|
<div class="flex items-center gap-2 flex-shrink-0">
|
||||||
|
<button hx-post="/api/alerts/{{ item.alert.id }}/acknowledge"
|
||||||
|
hx-swap="none"
|
||||||
|
hx-on::after-request="htmx.trigger('#alert-list', 'refresh')"
|
||||||
|
class="px-3 py-1.5 text-sm bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors">
|
||||||
|
Acknowledge
|
||||||
|
</button>
|
||||||
|
<button hx-post="/api/alerts/{{ item.alert.id }}/resolve"
|
||||||
|
hx-swap="none"
|
||||||
|
hx-on::after-request="htmx.trigger('#alert-list', 'refresh')"
|
||||||
|
class="px-3 py-1.5 text-sm bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-300 rounded-lg hover:bg-green-200 dark:hover:bg-green-900/50 transition-colors">
|
||||||
|
Resolve
|
||||||
|
</button>
|
||||||
|
<button hx-post="/api/alerts/{{ item.alert.id }}/dismiss"
|
||||||
|
hx-swap="none"
|
||||||
|
hx-on::after-request="htmx.trigger('#alert-list', 'refresh')"
|
||||||
|
class="px-3 py-1.5 text-sm text-gray-500 hover:text-red-600 dark:hover:text-red-400 transition-colors"
|
||||||
|
title="Dismiss">
|
||||||
|
<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="M6 18L18 6M6 6l12 12"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% else %}
|
||||||
|
<div class="bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 p-12 text-center">
|
||||||
|
<svg class="w-16 h-16 mx-auto mb-4 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="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"/>
|
||||||
|
</svg>
|
||||||
|
<h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No alerts</h3>
|
||||||
|
<p class="text-gray-500 dark:text-gray-400">
|
||||||
|
{% if status_filter %}
|
||||||
|
No {{ status_filter }} alerts found.
|
||||||
|
{% else %}
|
||||||
|
All systems are operating normally.
|
||||||
|
{% endif %}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
131
templates/partials/dashboard/todays_actions.html
Normal file
@@ -0,0 +1,131 @@
|
|||||||
|
<!-- Today's Scheduled Actions - Dashboard Card Content -->
|
||||||
|
|
||||||
|
<!-- Summary stats -->
|
||||||
|
<div class="flex items-center gap-4 mb-4 text-sm">
|
||||||
|
{% if pending_count > 0 %}
|
||||||
|
<div class="flex items-center gap-1.5">
|
||||||
|
<span class="w-2 h-2 bg-yellow-400 rounded-full"></span>
|
||||||
|
<span class="text-gray-600 dark:text-gray-400">{{ pending_count }} pending</span>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if completed_count > 0 %}
|
||||||
|
<div class="flex items-center gap-1.5">
|
||||||
|
<span class="w-2 h-2 bg-green-400 rounded-full"></span>
|
||||||
|
<span class="text-gray-600 dark:text-gray-400">{{ completed_count }} completed</span>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if failed_count > 0 %}
|
||||||
|
<div class="flex items-center gap-1.5">
|
||||||
|
<span class="w-2 h-2 bg-red-400 rounded-full"></span>
|
||||||
|
<span class="text-gray-600 dark:text-gray-400">{{ failed_count }} failed</span>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if total_count == 0 %}
|
||||||
|
<span class="text-gray-500 dark:text-gray-400">No actions scheduled for today</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Actions list -->
|
||||||
|
{% if actions %}
|
||||||
|
<div class="space-y-2 max-h-64 overflow-y-auto">
|
||||||
|
{% for item in actions %}
|
||||||
|
<div class="flex items-center gap-3 p-2 rounded-lg
|
||||||
|
{% if item.action.execution_status == 'pending' %}bg-yellow-50 dark:bg-yellow-900/20
|
||||||
|
{% elif item.action.execution_status == 'completed' %}bg-green-50 dark:bg-green-900/20
|
||||||
|
{% elif item.action.execution_status == 'failed' %}bg-red-50 dark:bg-red-900/20
|
||||||
|
{% else %}bg-gray-50 dark:bg-gray-700/50{% endif %}">
|
||||||
|
|
||||||
|
<!-- Action type icon -->
|
||||||
|
<div class="flex-shrink-0">
|
||||||
|
{% if item.action.action_type == 'start' %}
|
||||||
|
<div class="w-8 h-8 rounded-full bg-green-100 dark:bg-green-900/30 flex items-center justify-center">
|
||||||
|
<svg class="w-4 h-4 text-green-600 dark:text-green-400" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
{% elif item.action.action_type == 'stop' %}
|
||||||
|
<div class="w-8 h-8 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center">
|
||||||
|
<svg class="w-4 h-4 text-red-600 dark:text-red-400" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V8a1 1 0 00-1-1H8z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
{% elif item.action.action_type == 'download' %}
|
||||||
|
<div class="w-8 h-8 rounded-full bg-blue-100 dark:bg-blue-900/30 flex items-center justify-center">
|
||||||
|
<svg class="w-4 h-4 text-blue-600 dark:text-blue-400" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M3 17a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zm3.293-7.707a1 1 0 011.414 0L9 10.586V3a1 1 0 112 0v7.586l1.293-1.293a1 1 0 111.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Action details -->
|
||||||
|
<div class="flex-1 min-w-0">
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<span class="font-medium text-sm text-gray-900 dark:text-white capitalize">{{ item.action.action_type }}</span>
|
||||||
|
|
||||||
|
<!-- Status indicator -->
|
||||||
|
{% if item.action.execution_status == 'pending' %}
|
||||||
|
<span class="text-xs text-yellow-600 dark:text-yellow-400">
|
||||||
|
{{ item.action.scheduled_time|local_datetime('%H:%M') }}
|
||||||
|
</span>
|
||||||
|
{% elif item.action.execution_status == 'completed' %}
|
||||||
|
<svg class="w-4 h-4 text-green-500" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
{% elif item.action.execution_status == 'failed' %}
|
||||||
|
<svg class="w-4 h-4 text-red-500" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd"/>
|
||||||
|
</svg>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Location/Project info -->
|
||||||
|
<div class="text-xs text-gray-500 dark:text-gray-400 truncate">
|
||||||
|
{% if item.location %}
|
||||||
|
<a href="/projects/{{ item.action.project_id }}/nrl/{{ item.location.id }}"
|
||||||
|
class="hover:text-seismo-orange">
|
||||||
|
{{ item.location.name }}
|
||||||
|
</a>
|
||||||
|
{% elif item.project %}
|
||||||
|
<a href="/projects/{{ item.project.id }}" class="hover:text-seismo-orange">
|
||||||
|
{{ item.project.name }}
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Result details for completed/failed -->
|
||||||
|
{% if item.action.execution_status == 'completed' and item.result %}
|
||||||
|
{% if item.result.cycle_response and item.result.cycle_response.downloaded_folder %}
|
||||||
|
<div class="text-xs text-green-600 dark:text-green-400">
|
||||||
|
{{ item.result.cycle_response.downloaded_folder }}
|
||||||
|
{% if item.result.cycle_response.download_success %}downloaded{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% elif item.action.execution_status == 'failed' and item.action.error_message %}
|
||||||
|
<div class="text-xs text-red-600 dark:text-red-400 truncate" title="{{ item.action.error_message }}">
|
||||||
|
{{ item.action.error_message[:50] }}{% if item.action.error_message|length > 50 %}...{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Time -->
|
||||||
|
<div class="flex-shrink-0 text-right">
|
||||||
|
{% if item.action.execution_status == 'pending' %}
|
||||||
|
<span class="text-xs text-gray-500 dark:text-gray-400">Scheduled</span>
|
||||||
|
{% elif item.action.executed_at %}
|
||||||
|
<span class="text-xs text-gray-500 dark:text-gray-400">
|
||||||
|
{{ item.action.executed_at|local_datetime('%H:%M') }}
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="text-center py-6 text-gray-500 dark:text-gray-400">
|
||||||
|
<svg class="w-10 h-10 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="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"></path>
|
||||||
|
</svg>
|
||||||
|
<p class="text-sm">No scheduled actions for today</p>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
494
templates/partials/devices_table.html
Normal file
@@ -0,0 +1,494 @@
|
|||||||
|
<!-- Desktop Table View -->
|
||||||
|
<div class="hidden md:block rounded-xl shadow-lg bg-white dark:bg-slate-800 overflow-hidden">
|
||||||
|
<table id="roster-table" class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
|
||||||
|
<thead class="bg-gray-50 dark:bg-gray-700">
|
||||||
|
<tr>
|
||||||
|
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-600 select-none" onclick="sortTable('status')">
|
||||||
|
<div class="flex items-center gap-1">
|
||||||
|
Status
|
||||||
|
<span class="sort-indicator" data-column="status"></span>
|
||||||
|
</div>
|
||||||
|
</th>
|
||||||
|
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-600 select-none" onclick="sortTable('id')">
|
||||||
|
<div class="flex items-center gap-1">
|
||||||
|
Unit ID
|
||||||
|
<span class="sort-indicator" data-column="id"></span>
|
||||||
|
</div>
|
||||||
|
</th>
|
||||||
|
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-600 select-none" onclick="sortTable('type')">
|
||||||
|
<div class="flex items-center gap-1">
|
||||||
|
Type
|
||||||
|
<span class="sort-indicator" data-column="type"></span>
|
||||||
|
</div>
|
||||||
|
</th>
|
||||||
|
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
|
||||||
|
Details
|
||||||
|
</th>
|
||||||
|
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-600 select-none" onclick="sortTable('last_seen')">
|
||||||
|
<div class="flex items-center gap-1">
|
||||||
|
Last Seen
|
||||||
|
<span class="sort-indicator" data-column="last_seen"></span>
|
||||||
|
</div>
|
||||||
|
</th>
|
||||||
|
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-600 select-none" onclick="sortTable('age')">
|
||||||
|
<div class="flex items-center gap-1">
|
||||||
|
Age
|
||||||
|
<span class="sort-indicator" data-column="age"></span>
|
||||||
|
</div>
|
||||||
|
</th>
|
||||||
|
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-600 select-none" onclick="sortTable('note')">
|
||||||
|
<div class="flex items-center gap-1">
|
||||||
|
Note
|
||||||
|
<span class="sort-indicator" data-column="note"></span>
|
||||||
|
</div>
|
||||||
|
</th>
|
||||||
|
<th scope="col" class="px-6 py-3 text-right text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
|
||||||
|
Actions
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody id="roster-tbody" class="bg-white dark:bg-slate-800 divide-y divide-gray-200 dark:divide-gray-700">
|
||||||
|
{% for unit in units %}
|
||||||
|
<tr class="hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors"
|
||||||
|
data-device-type="{{ unit.device_type }}"
|
||||||
|
data-status="{% if unit.deployed %}deployed{% elif unit.retired %}retired{% elif unit.ignored %}ignored{% else %}benched{% endif %}"
|
||||||
|
data-health="{{ unit.status }}"
|
||||||
|
data-id="{{ unit.id }}"
|
||||||
|
data-type="{{ unit.device_type }}"
|
||||||
|
data-last-seen="{{ unit.last_seen }}"
|
||||||
|
data-age="{{ unit.age }}"
|
||||||
|
data-note="{{ unit.note if unit.note else '' }}">
|
||||||
|
<td class="px-6 py-4 whitespace-nowrap">
|
||||||
|
<div class="flex items-center space-x-2">
|
||||||
|
{% if unit.status == 'OK' %}
|
||||||
|
<span class="w-3 h-3 rounded-full bg-green-500" title="OK"></span>
|
||||||
|
{% elif unit.status == 'Pending' %}
|
||||||
|
<span class="w-3 h-3 rounded-full bg-yellow-500" title="Pending"></span>
|
||||||
|
{% else %}
|
||||||
|
<span class="w-3 h-3 rounded-full bg-red-500" title="Missing"></span>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if unit.deployed %}
|
||||||
|
<span class="w-2 h-2 rounded-full bg-blue-500" title="Deployed"></span>
|
||||||
|
{% else %}
|
||||||
|
<span class="w-2 h-2 rounded-full bg-gray-300 dark:bg-gray-600" title="Benched"></span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="px-6 py-4 whitespace-nowrap">
|
||||||
|
<a href="/unit/{{ unit.id }}" class="text-sm font-medium text-seismo-orange hover:text-seismo-burgundy hover:underline">
|
||||||
|
{{ unit.id }}
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
<td class="px-6 py-4 whitespace-nowrap">
|
||||||
|
{% if unit.device_type == 'modem' %}
|
||||||
|
<span class="px-2 py-1 rounded-full bg-purple-100 dark:bg-purple-900/30 text-purple-800 dark:text-purple-300 text-xs font-medium">
|
||||||
|
Modem
|
||||||
|
</span>
|
||||||
|
{% elif unit.device_type == 'slm' %}
|
||||||
|
<span class="px-2 py-1 rounded-full bg-orange-100 dark:bg-orange-900/30 text-orange-800 dark:text-orange-300 text-xs font-medium">
|
||||||
|
SLM
|
||||||
|
</span>
|
||||||
|
{% else %}
|
||||||
|
<span class="px-2 py-1 rounded-full bg-blue-100 dark:bg-blue-900/30 text-blue-800 dark:text-blue-300 text-xs font-medium">
|
||||||
|
Seismograph
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
<td class="px-6 py-4 whitespace-nowrap">
|
||||||
|
<div class="text-xs text-gray-600 dark:text-gray-400 space-y-1">
|
||||||
|
{% if unit.device_type == 'modem' %}
|
||||||
|
{% if unit.ip_address %}
|
||||||
|
<div><span class="font-mono">{{ unit.ip_address }}</span></div>
|
||||||
|
{% endif %}
|
||||||
|
{% if unit.phone_number %}
|
||||||
|
<div>{{ unit.phone_number }}</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if unit.deployed_with_unit_id %}
|
||||||
|
<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 %}
|
||||||
|
<div>
|
||||||
|
<span class="text-gray-500 dark:text-gray-500">Cal Due:</span>
|
||||||
|
<span class="font-medium">{{ unit.next_calibration_due }}</span>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if unit.deployed_with_modem_id %}
|
||||||
|
<div>
|
||||||
|
<span class="text-gray-500 dark:text-gray-500">Modem:</span>
|
||||||
|
<a href="/unit/{{ unit.deployed_with_modem_id }}" class="text-seismo-orange hover:underline font-medium">
|
||||||
|
{{ unit.deployed_with_modem_id }}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="px-6 py-4 whitespace-nowrap">
|
||||||
|
<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
|
||||||
|
{% if unit.status == 'Missing' %}text-red-600 dark:text-red-400 font-semibold
|
||||||
|
{% elif unit.status == 'Pending' %}text-yellow-600 dark:text-yellow-400
|
||||||
|
{% else %}text-gray-500 dark:text-gray-400
|
||||||
|
{% endif %}">
|
||||||
|
{{ unit.age }}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="px-6 py-4">
|
||||||
|
<div class="text-sm text-gray-500 dark:text-gray-400 truncate max-w-xs" title="{{ unit.note }}">
|
||||||
|
{{ unit.note if unit.note else '-' }}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
|
||||||
|
<div class="flex justify-end gap-2">
|
||||||
|
<button onclick="editUnit('{{ unit.id }}')"
|
||||||
|
class="text-seismo-orange hover:text-seismo-burgundy p-1" title="Edit">
|
||||||
|
<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>
|
||||||
|
</button>
|
||||||
|
{% if unit.deployed %}
|
||||||
|
<button onclick="toggleDeployed('{{ unit.id }}', false)"
|
||||||
|
class="text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300 p-1" title="Mark as Benched">
|
||||||
|
<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="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"></path>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
{% else %}
|
||||||
|
<button onclick="toggleDeployed('{{ unit.id }}', true)"
|
||||||
|
class="text-green-600 hover:text-green-800 dark:text-green-400 dark:hover:text-green-300 p-1" title="Mark as Deployed">
|
||||||
|
<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="M5 13l4 4L19 7"></path>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
{% endif %}
|
||||||
|
<button onclick="moveToIgnore('{{ unit.id }}')"
|
||||||
|
class="text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-300 p-1" title="Move to Ignore List">
|
||||||
|
<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="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>
|
||||||
|
</button>
|
||||||
|
<button onclick="deleteUnit('{{ unit.id }}')"
|
||||||
|
class="text-red-600 hover:text-red-800 dark:text-red-400 dark:hover:text-red-300 p-1" title="Delete Unit">
|
||||||
|
<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="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<!-- Last updated indicator -->
|
||||||
|
<div class="px-6 py-3 bg-gray-50 dark:bg-gray-700 text-xs text-gray-500 dark:text-gray-400 text-right">
|
||||||
|
Last updated: <span id="last-updated">{{ timestamp }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Mobile Card View -->
|
||||||
|
<div class="md:hidden space-y-3">
|
||||||
|
{% for unit in units %}
|
||||||
|
<div class="unit-card device-card"
|
||||||
|
onclick="openUnitModal('{{ unit.id }}', '{{ unit.status }}', '{{ unit.age }}')"
|
||||||
|
data-device-type="{{ unit.device_type }}"
|
||||||
|
data-status="{% if unit.deployed %}deployed{% elif unit.retired %}retired{% elif unit.ignored %}ignored{% else %}benched{% endif %}"
|
||||||
|
data-health="{{ unit.status }}"
|
||||||
|
data-unit-id="{{ unit.id }}"
|
||||||
|
data-age="{{ unit.age }}">
|
||||||
|
<!-- Header: Status Dot + Unit ID + Status Badge -->
|
||||||
|
<div class="flex items-center justify-between mb-2">
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
{% if unit.status == 'OK' %}
|
||||||
|
<span class="w-4 h-4 rounded-full bg-green-500" title="OK"></span>
|
||||||
|
{% elif unit.status == 'Pending' %}
|
||||||
|
<span class="w-4 h-4 rounded-full bg-yellow-500" title="Pending"></span>
|
||||||
|
{% elif unit.status == 'Missing' %}
|
||||||
|
<span class="w-4 h-4 rounded-full bg-red-500" title="Missing"></span>
|
||||||
|
{% else %}
|
||||||
|
<span class="w-4 h-4 rounded-full bg-gray-400" title="No Data"></span>
|
||||||
|
{% endif %}
|
||||||
|
<span class="font-bold text-lg text-seismo-orange dark:text-seismo-orange">{{ unit.id }}</span>
|
||||||
|
</div>
|
||||||
|
<span class="px-3 py-1 rounded-full text-xs font-medium
|
||||||
|
{% if unit.status == 'OK' %}bg-green-100 dark:bg-green-900/30 text-green-800 dark:text-green-300
|
||||||
|
{% elif unit.status == 'Pending' %}bg-yellow-100 dark:bg-yellow-900/30 text-yellow-800 dark:text-yellow-300
|
||||||
|
{% elif unit.status == 'Missing' %}bg-red-100 dark:bg-red-900/30 text-red-800 dark:text-red-300
|
||||||
|
{% else %}bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-400
|
||||||
|
{% endif %}">
|
||||||
|
{% if unit.status in ['N/A', 'Unknown'] %}Benched{% else %}{{ unit.status }}{% endif %}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Type Badge -->
|
||||||
|
<div class="mb-2">
|
||||||
|
{% if unit.device_type == 'modem' %}
|
||||||
|
<span class="px-2 py-1 rounded-full bg-purple-100 dark:bg-purple-900/30 text-purple-800 dark:text-purple-300 text-xs font-medium">
|
||||||
|
Modem
|
||||||
|
</span>
|
||||||
|
{% else %}
|
||||||
|
<span class="px-2 py-1 rounded-full bg-blue-100 dark:bg-blue-900/30 text-blue-800 dark:text-blue-300 text-xs font-medium">
|
||||||
|
Seismograph
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Location -->
|
||||||
|
{% if unit.address %}
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400 mb-1">
|
||||||
|
📍 {{ unit.address }}
|
||||||
|
</div>
|
||||||
|
{% elif unit.coordinates %}
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400 mb-1">
|
||||||
|
📍 {{ unit.coordinates }}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<!-- Project ID -->
|
||||||
|
{% if unit.project_id %}
|
||||||
|
<div class="text-sm text-gray-600 dark:text-gray-400 mb-1">
|
||||||
|
🏗️ {{ unit.project_id }}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<!-- Last Seen -->
|
||||||
|
<div class="text-sm text-gray-500 dark:text-gray-500 mt-2">
|
||||||
|
🕐 {{ unit.age }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Deployed/Benched Indicator -->
|
||||||
|
<div class="mt-2">
|
||||||
|
{% if unit.deployed %}
|
||||||
|
<span class="text-xs text-blue-600 dark:text-blue-400">
|
||||||
|
⚡ Deployed
|
||||||
|
</span>
|
||||||
|
{% else %}
|
||||||
|
<span class="text-xs text-gray-500 dark:text-gray-500">
|
||||||
|
📦 Benched
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Tap Hint -->
|
||||||
|
<div class="text-xs text-gray-400 mt-2 text-center border-t border-gray-200 dark:border-gray-700 pt-2">
|
||||||
|
Tap for details
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
<!-- Mobile Last Updated -->
|
||||||
|
<div class="text-xs text-gray-500 dark:text-gray-400 text-center py-2">
|
||||||
|
Last updated: <span id="last-updated-mobile">{{ timestamp }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Unit Detail Modal -->
|
||||||
|
<div id="unitModal" class="unit-modal">
|
||||||
|
<!-- Backdrop -->
|
||||||
|
<div class="unit-modal-backdrop" onclick="closeUnitModal(event)"></div>
|
||||||
|
|
||||||
|
<!-- Modal Content -->
|
||||||
|
<div class="unit-modal-content">
|
||||||
|
<!-- Handle Bar (Mobile Only) -->
|
||||||
|
<div class="modal-handle"></div>
|
||||||
|
|
||||||
|
<!-- Header -->
|
||||||
|
<div class="flex items-center justify-between px-6 py-4 border-b border-gray-200 dark:border-gray-700">
|
||||||
|
<h3 id="modalUnitId" class="text-xl font-bold text-gray-900 dark:text-white"></h3>
|
||||||
|
<button onclick="closeUnitModal(event)" data-close-modal class="w-10 h-10 flex items-center justify-center text-gray-500 hover:text-gray-700 dark:text-gray-400 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>
|
||||||
|
|
||||||
|
<!-- Content -->
|
||||||
|
<div id="modalContent" class="p-6">
|
||||||
|
<!-- Content will be populated by JavaScript -->
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Actions -->
|
||||||
|
<div class="p-6 border-t border-gray-200 dark:border-gray-700 space-y-3">
|
||||||
|
<button id="modalEditBtn" class="w-full h-12 bg-seismo-orange hover:bg-orange-600 text-white rounded-lg font-medium transition-colors">
|
||||||
|
Edit Unit
|
||||||
|
</button>
|
||||||
|
<div class="grid grid-cols-2 gap-3">
|
||||||
|
<button id="modalDeployBtn" class="h-12 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors">
|
||||||
|
Deploy/Bench
|
||||||
|
</button>
|
||||||
|
<button id="modalDeleteBtn" class="h-12 border border-red-300 dark:border-red-600 text-red-600 dark:text-red-400 rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20 transition-colors">
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.sort-indicator::after {
|
||||||
|
content: '⇅';
|
||||||
|
opacity: 0.3;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
.sort-indicator.asc::after {
|
||||||
|
content: '↑';
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
.sort-indicator.desc::after {
|
||||||
|
content: '↓';
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
</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) {
|
||||||
|
timestampElement.textContent = new Date().toLocaleTimeString();
|
||||||
|
}
|
||||||
|
const timestampMobileElement = document.getElementById('last-updated-mobile');
|
||||||
|
if (timestampMobileElement) {
|
||||||
|
timestampMobileElement.textContent = new Date().toLocaleTimeString();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Keep a lightweight status map around for the mobile modal
|
||||||
|
const rosterUnits = {{ units | tojson }};
|
||||||
|
window.rosterStatusMap = rosterUnits.reduce((acc, unit) => {
|
||||||
|
acc[unit.id] = {
|
||||||
|
status: unit.status || 'Unknown',
|
||||||
|
age: unit.age || 'N/A',
|
||||||
|
last: unit.last_seen || 'Never'
|
||||||
|
};
|
||||||
|
return acc;
|
||||||
|
}, {});
|
||||||
|
})();
|
||||||
|
|
||||||
|
// Sorting state (needs to persist across swaps)
|
||||||
|
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 (window.currentSort.column === column) {
|
||||||
|
window.currentSort.direction = window.currentSort.direction === 'asc' ? 'desc' : 'asc';
|
||||||
|
} else {
|
||||||
|
window.currentSort.column = column;
|
||||||
|
window.currentSort.direction = 'asc';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort rows
|
||||||
|
rows.sort((a, b) => {
|
||||||
|
let aVal = a.getAttribute(`data-${column}`) || '';
|
||||||
|
let bVal = b.getAttribute(`data-${column}`) || '';
|
||||||
|
|
||||||
|
// Special handling for different column types
|
||||||
|
if (column === 'age') {
|
||||||
|
// Parse age strings like "2h 15m" or "45m" or "3d 5h"
|
||||||
|
aVal = parseAge(aVal);
|
||||||
|
bVal = parseAge(bVal);
|
||||||
|
} else if (column === 'status') {
|
||||||
|
// Sort by status priority: Missing > Pending > OK
|
||||||
|
const statusOrder = { 'Missing': 0, 'Pending': 1, 'OK': 2, '': 3 };
|
||||||
|
aVal = statusOrder[aVal] !== undefined ? statusOrder[aVal] : 999;
|
||||||
|
bVal = statusOrder[bVal] !== undefined ? statusOrder[bVal] : 999;
|
||||||
|
} else if (column === 'last_seen') {
|
||||||
|
// Sort by date
|
||||||
|
aVal = new Date(aVal).getTime() || 0;
|
||||||
|
bVal = new Date(bVal).getTime() || 0;
|
||||||
|
} else {
|
||||||
|
// String comparison (case-insensitive)
|
||||||
|
aVal = aVal.toLowerCase();
|
||||||
|
bVal = bVal.toLowerCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (aVal < bVal) return window.currentSort.direction === 'asc' ? -1 : 1;
|
||||||
|
if (aVal > bVal) return window.currentSort.direction === 'asc' ? 1 : -1;
|
||||||
|
return 0;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Re-append rows in sorted order
|
||||||
|
rows.forEach(row => tbody.appendChild(row));
|
||||||
|
|
||||||
|
// Update sort indicators
|
||||||
|
updateSortIndicators();
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseAge(ageStr) {
|
||||||
|
// Parse age strings like "2h 15m", "45m", "3d 5h", "2w 3d"
|
||||||
|
if (!ageStr) return 0;
|
||||||
|
|
||||||
|
let totalMinutes = 0;
|
||||||
|
const weeks = ageStr.match(/(\d+)w/);
|
||||||
|
const days = ageStr.match(/(\d+)d/);
|
||||||
|
const hours = ageStr.match(/(\d+)h/);
|
||||||
|
const minutes = ageStr.match(/(\d+)m/);
|
||||||
|
|
||||||
|
if (weeks) totalMinutes += parseInt(weeks[1]) * 7 * 24 * 60;
|
||||||
|
if (days) totalMinutes += parseInt(days[1]) * 24 * 60;
|
||||||
|
if (hours) totalMinutes += parseInt(hours[1]) * 60;
|
||||||
|
if (minutes) totalMinutes += parseInt(minutes[1]);
|
||||||
|
|
||||||
|
return totalMinutes;
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateSortIndicators() {
|
||||||
|
// Clear all indicators
|
||||||
|
document.querySelectorAll('.sort-indicator').forEach(indicator => {
|
||||||
|
indicator.className = 'sort-indicator';
|
||||||
|
});
|
||||||
|
|
||||||
|
// Set current indicator
|
||||||
|
if (window.currentSort.column) {
|
||||||
|
const indicator = document.querySelector(`.sort-indicator[data-column="${window.currentSort.column}"]`);
|
||||||
|
if (indicator) {
|
||||||
|
indicator.className = `sort-indicator ${window.currentSort.direction}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
127
templates/partials/modem_list.html
Normal file
@@ -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 %}
|
||||||
51
templates/partials/modem_paired_device.html
Normal file
@@ -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 %}
|
||||||
128
templates/partials/modem_picker.html
Normal file
@@ -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>
|
||||||
61
templates/partials/modem_search_results.html
Normal file
@@ -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 %}
|
||||||
63
templates/partials/modem_stats.html
Normal file
@@ -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>
|
||||||
233
templates/partials/project_create_modal.html
Normal file
@@ -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>
|
||||||
128
templates/partials/project_picker.html
Normal file
@@ -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>
|
||||||
69
templates/partials/project_search_results.html
Normal file
@@ -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 %}
|
||||||
30
templates/partials/projects/assignment_list.html
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
<!-- Project Assignments List -->
|
||||||
|
{% if assignments %}
|
||||||
|
<div class="space-y-3">
|
||||||
|
{% for item in assignments %}
|
||||||
|
<div class="border border-gray-200 dark:border-gray-700 rounded-lg p-4">
|
||||||
|
<div class="flex items-start justify-between gap-3">
|
||||||
|
<div>
|
||||||
|
<p class="font-semibold text-gray-900 dark:text-white">{{ item.unit.id if item.unit else item.assignment.unit_id }}</p>
|
||||||
|
{% if item.location %}
|
||||||
|
<p class="text-xs text-gray-500 dark:text-gray-400 mt-1">Location: {{ item.location.name }}</p>
|
||||||
|
{% endif %}
|
||||||
|
<p class="text-xs text-gray-500 dark:text-gray-400 mt-1">
|
||||||
|
Assigned: {% if item.assignment.assigned_at %}{{ item.assignment.assigned_at|local_datetime }}{% else %}Unknown{% endif %}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<button onclick="unassignUnit('{{ item.assignment.id }}')" class="text-xs px-3 py-1 rounded-full bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300">
|
||||||
|
Unassign
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="text-center py-8 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="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>
|
||||||
|
<p>No active assignments</p>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
620
templates/partials/projects/ftp_browser.html
Normal file
@@ -0,0 +1,620 @@
|
|||||||
|
<!-- FTP File Browser for SLMs v2.0 - Folder Download Support -->
|
||||||
|
<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6 mb-6">
|
||||||
|
<h2 class="text-xl font-semibold text-gray-900 dark:text-white mb-4">Download Files from SLMs</h2>
|
||||||
|
|
||||||
|
{% if units %}
|
||||||
|
<div class="space-y-6">
|
||||||
|
{% for unit_item in units %}
|
||||||
|
<div class="border border-gray-200 dark:border-gray-700 rounded-lg overflow-hidden">
|
||||||
|
<!-- Unit Header -->
|
||||||
|
<div class="bg-gray-50 dark:bg-gray-900 px-4 py-3 flex items-center justify-between">
|
||||||
|
<div class="flex items-center gap-3">
|
||||||
|
<h3 class="font-semibold text-gray-900 dark:text-white">
|
||||||
|
{{ unit_item.unit.id }}
|
||||||
|
</h3>
|
||||||
|
{% if unit_item.location %}
|
||||||
|
<span class="text-xs text-gray-500 dark:text-gray-400">
|
||||||
|
@ {{ unit_item.location.name }}
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
<span id="ftp-status-{{ unit_item.unit.id }}" class="px-2 py-1 text-xs font-medium rounded-full bg-gray-200 text-gray-700 dark:bg-gray-700 dark:text-gray-300">
|
||||||
|
Checking...
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<button onclick="showFTPSettings('{{ unit_item.unit.id }}')"
|
||||||
|
id="settings-ftp-{{ unit_item.unit.id }}"
|
||||||
|
class="px-3 py-1 text-xs bg-gray-600 text-white rounded-lg hover:bg-gray-700 transition-colors flex items-center gap-1"
|
||||||
|
title="Configure FTP credentials">
|
||||||
|
<svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"></path>
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"></path>
|
||||||
|
</svg>
|
||||||
|
Settings
|
||||||
|
</button>
|
||||||
|
<button onclick="enableFTP('{{ unit_item.unit.id }}')"
|
||||||
|
id="enable-ftp-{{ unit_item.unit.id }}"
|
||||||
|
class="px-3 py-1 text-xs bg-green-600 text-white rounded-lg hover:bg-green-700 transition-colors"
|
||||||
|
disabled>
|
||||||
|
Enable FTP
|
||||||
|
</button>
|
||||||
|
<button onclick="disableFTP('{{ unit_item.unit.id }}')"
|
||||||
|
id="disable-ftp-{{ unit_item.unit.id }}"
|
||||||
|
class="px-3 py-1 text-xs bg-red-600 text-white rounded-lg hover:bg-red-700 transition-colors"
|
||||||
|
disabled>
|
||||||
|
Disable FTP
|
||||||
|
</button>
|
||||||
|
<button onclick="loadFTPFiles('{{ unit_item.unit.id }}', '/NL-43')"
|
||||||
|
id="browse-ftp-{{ unit_item.unit.id }}"
|
||||||
|
class="px-3 py-1 text-xs bg-seismo-orange text-white rounded-lg hover:bg-seismo-navy transition-colors"
|
||||||
|
disabled>
|
||||||
|
Browse Files
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- FTP File List -->
|
||||||
|
<div id="ftp-files-{{ unit_item.unit.id }}" class="hidden" data-location-id="{{ unit_item.location.id if unit_item.location else '' }}">
|
||||||
|
<div class="p-4">
|
||||||
|
<div class="flex items-center gap-2 mb-3">
|
||||||
|
<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="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"></path>
|
||||||
|
</svg>
|
||||||
|
<span id="current-path-{{ unit_item.unit.id }}" class="text-sm font-mono text-gray-600 dark:text-gray-400">/NL-43</span>
|
||||||
|
<button onclick="loadFTPFiles('{{ unit_item.unit.id }}', '/NL-43')"
|
||||||
|
class="ml-auto text-xs px-2 py-1 bg-gray-100 dark:bg-gray-700 rounded hover:bg-gray-200 dark:hover:bg-gray-600">
|
||||||
|
<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="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>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div id="ftp-file-list-{{ unit_item.unit.id }}" class="space-y-1">
|
||||||
|
<!-- Files will be loaded here -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="text-center py-8 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="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>
|
||||||
|
<p>No units assigned to this project</p>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
async function checkFTPStatus(unitId) {
|
||||||
|
const statusSpan = document.getElementById(`ftp-status-${unitId}`);
|
||||||
|
const enableBtn = document.getElementById(`enable-ftp-${unitId}`);
|
||||||
|
const disableBtn = document.getElementById(`disable-ftp-${unitId}`);
|
||||||
|
const browseBtn = document.getElementById(`browse-ftp-${unitId}`);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/slmm/${unitId}/ftp/status`);
|
||||||
|
const data = await response.json();
|
||||||
|
|
||||||
|
if (data.ftp_enabled) {
|
||||||
|
statusSpan.textContent = 'FTP Enabled';
|
||||||
|
statusSpan.className = 'px-2 py-1 text-xs font-medium rounded-full bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-300';
|
||||||
|
enableBtn.disabled = true;
|
||||||
|
disableBtn.disabled = false;
|
||||||
|
browseBtn.disabled = false;
|
||||||
|
} else {
|
||||||
|
statusSpan.textContent = 'FTP Disabled';
|
||||||
|
statusSpan.className = 'px-2 py-1 text-xs font-medium rounded-full bg-gray-200 text-gray-700 dark:bg-gray-700 dark:text-gray-300';
|
||||||
|
enableBtn.disabled = false;
|
||||||
|
disableBtn.disabled = true;
|
||||||
|
browseBtn.disabled = true;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
statusSpan.textContent = 'Error';
|
||||||
|
statusSpan.className = 'px-2 py-1 text-xs font-medium rounded-full bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-300';
|
||||||
|
console.error('Error checking FTP status:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function enableFTP(unitId) {
|
||||||
|
const enableBtn = document.getElementById(`enable-ftp-${unitId}`);
|
||||||
|
enableBtn.disabled = true;
|
||||||
|
enableBtn.textContent = 'Enabling...';
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/slmm/${unitId}/ftp/enable`, {
|
||||||
|
method: 'POST'
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
await checkFTPStatus(unitId);
|
||||||
|
// Auto-load files after enabling
|
||||||
|
setTimeout(() => loadFTPFiles(unitId, '/NL-43'), 1000);
|
||||||
|
} else {
|
||||||
|
alert('Failed to enable FTP');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
alert('Error enabling FTP: ' + error);
|
||||||
|
} finally {
|
||||||
|
enableBtn.textContent = 'Enable FTP';
|
||||||
|
enableBtn.disabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function disableFTP(unitId) {
|
||||||
|
if (!confirm('Disable FTP on this unit? This will close the FTP connection.')) return;
|
||||||
|
|
||||||
|
const disableBtn = document.getElementById(`disable-ftp-${unitId}`);
|
||||||
|
disableBtn.disabled = true;
|
||||||
|
disableBtn.textContent = 'Disabling...';
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/slmm/${unitId}/ftp/disable`, {
|
||||||
|
method: 'POST'
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
await checkFTPStatus(unitId);
|
||||||
|
// Hide file list
|
||||||
|
document.getElementById(`ftp-files-${unitId}`).classList.add('hidden');
|
||||||
|
} else {
|
||||||
|
alert('Failed to disable FTP');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
alert('Error disabling FTP: ' + error);
|
||||||
|
} finally {
|
||||||
|
disableBtn.textContent = 'Disable FTP';
|
||||||
|
disableBtn.disabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadFTPFiles(unitId, path) {
|
||||||
|
const fileListDiv = document.getElementById(`ftp-file-list-${unitId}`);
|
||||||
|
const filesContainer = document.getElementById(`ftp-files-${unitId}`);
|
||||||
|
const currentPathSpan = document.getElementById(`current-path-${unitId}`);
|
||||||
|
|
||||||
|
// Show loading
|
||||||
|
fileListDiv.innerHTML = '<div class="text-center py-4 text-gray-500">Loading files...</div>';
|
||||||
|
filesContainer.classList.remove('hidden');
|
||||||
|
currentPathSpan.textContent = path;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/slmm/${unitId}/ftp/files?path=${encodeURIComponent(path)}`);
|
||||||
|
const data = await response.json();
|
||||||
|
|
||||||
|
if (!data.files || data.files.length === 0) {
|
||||||
|
fileListDiv.innerHTML = '<div class="text-center py-4 text-gray-500">No files found</div>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort: directories first, then files
|
||||||
|
const sorted = data.files.sort((a, b) => {
|
||||||
|
if (a.is_dir && !b.is_dir) return -1;
|
||||||
|
if (!a.is_dir && b.is_dir) return 1;
|
||||||
|
return a.name.localeCompare(b.name);
|
||||||
|
});
|
||||||
|
|
||||||
|
function escapeForAttribute(str) {
|
||||||
|
return String(str).replace(/'/g, "\\'").replace(/"/g, '"');
|
||||||
|
}
|
||||||
|
|
||||||
|
function escapeHtml(str) {
|
||||||
|
const div = document.createElement('div');
|
||||||
|
div.textContent = str;
|
||||||
|
return div.innerHTML;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getFileIcon(file) {
|
||||||
|
if (file.is_dir) {
|
||||||
|
return '<svg class="w-5 h-5 mr-3 text-blue-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"></path></svg>';
|
||||||
|
} else if (file.name.toLowerCase().endsWith('.csv')) {
|
||||||
|
return '<svg class="w-5 h-5 mr-3 text-green-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg>';
|
||||||
|
} else if (file.name.toLowerCase().match(/\.(txt|log)$/)) {
|
||||||
|
return '<svg class="w-5 h-5 mr-3 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg>';
|
||||||
|
}
|
||||||
|
return '<svg class="w-5 h-5 mr-3 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 21h10a2 2 0 002-2V9.414a1 1 0 00-.293-.707l-5.414-5.414A1 1 0 0012.586 3H7a2 2 0 00-2 2v14a2 2 0 002 2z"></path></svg>';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Render file list with collapsible folders
|
||||||
|
let html = '<div class="space-y-1">';
|
||||||
|
for (const file of sorted) {
|
||||||
|
const icon = getFileIcon(file);
|
||||||
|
const sizeStr = file.is_dir ? '' : formatFileSize(file.size);
|
||||||
|
const folderId = 'proj-folder-' + file.path.replace(/[^a-zA-Z0-9]/g, '-');
|
||||||
|
|
||||||
|
if (file.is_dir) {
|
||||||
|
// Collapsible folder row
|
||||||
|
html += `
|
||||||
|
<div class="border border-gray-200 dark:border-gray-600 rounded mb-1">
|
||||||
|
<div class="flex items-center justify-between p-3 hover:bg-gray-50 dark:hover:bg-gray-700 rounded transition-colors cursor-pointer"
|
||||||
|
onclick="toggleFTPFolderProject('${unitId}', '${escapeForAttribute(file.path)}', '${folderId}', this)">
|
||||||
|
<div class="flex items-center flex-1">
|
||||||
|
<svg class="w-4 h-4 mr-2 text-gray-400 transition-transform folder-chevron" 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>
|
||||||
|
${icon}
|
||||||
|
<span class="text-gray-900 dark:text-white font-medium">${escapeHtml(file.name)}</span>
|
||||||
|
<span class="ml-2 text-xs text-gray-400 folder-status"></span>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-2 flex-shrink-0 ml-4">
|
||||||
|
<span class="text-xs text-gray-500 hidden sm:inline">${file.modified || ''}</span>
|
||||||
|
<button onclick="event.stopPropagation(); downloadFolderToServer('${unitId}', '${escapeForAttribute(file.path)}', '${escapeForAttribute(file.name)}')"
|
||||||
|
class="px-3 py-1 text-xs bg-seismo-orange text-white rounded hover:bg-seismo-navy transition-colors flex items-center"
|
||||||
|
title="Download folder from device to server and add to project database">
|
||||||
|
<svg class="w-3 h-3 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"></path>
|
||||||
|
</svg>
|
||||||
|
Download & Save
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="${folderId}" class="hidden pl-6 pr-2 pb-2 border-t border-gray-100 dark:border-gray-700">
|
||||||
|
<div class="text-sm text-gray-500 py-2">Click to load contents...</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
} else {
|
||||||
|
html += `
|
||||||
|
<div class="flex items-center justify-between p-3 hover:bg-gray-50 dark:hover:bg-gray-700 rounded transition-colors">
|
||||||
|
<div class="flex items-center flex-1 min-w-0">
|
||||||
|
${icon}
|
||||||
|
<span class="text-gray-900 dark:text-white truncate">${escapeHtml(file.name)}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-3 flex-shrink-0 ml-4">
|
||||||
|
<span class="text-xs text-gray-500 hidden sm:inline">${sizeStr}</span>
|
||||||
|
<span class="text-xs text-gray-500 hidden md:inline">${file.modified || ''}</span>
|
||||||
|
<button onclick="downloadToServer('${unitId}', '${escapeForAttribute(file.path)}', '${escapeForAttribute(file.name)}')"
|
||||||
|
class="px-3 py-1 text-xs bg-seismo-orange text-white rounded hover:bg-seismo-navy transition-colors flex items-center"
|
||||||
|
title="Download file from device to server and add to project database">
|
||||||
|
<svg class="w-3 h-3 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"></path>
|
||||||
|
</svg>
|
||||||
|
Download & Save
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
html += '</div>';
|
||||||
|
|
||||||
|
fileListDiv.innerHTML = html;
|
||||||
|
} catch (error) {
|
||||||
|
fileListDiv.innerHTML = '<div class="text-center py-4 text-red-500">Error loading files: ' + error + '</div>';
|
||||||
|
console.error('Error loading FTP files:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Toggle folder expand/collapse and load contents for Project FTP browser
|
||||||
|
async function toggleFTPFolderProject(unitId, folderPath, folderId, headerElement) {
|
||||||
|
const contentDiv = document.getElementById(folderId);
|
||||||
|
const chevron = headerElement.querySelector('.folder-chevron');
|
||||||
|
const statusSpan = headerElement.querySelector('.folder-status');
|
||||||
|
|
||||||
|
if (!contentDiv) return;
|
||||||
|
|
||||||
|
const isExpanded = !contentDiv.classList.contains('hidden');
|
||||||
|
|
||||||
|
if (isExpanded) {
|
||||||
|
// Collapse
|
||||||
|
contentDiv.classList.add('hidden');
|
||||||
|
chevron.style.transform = 'rotate(0deg)';
|
||||||
|
} else {
|
||||||
|
// Expand and load contents if not already loaded
|
||||||
|
contentDiv.classList.remove('hidden');
|
||||||
|
chevron.style.transform = 'rotate(90deg)';
|
||||||
|
|
||||||
|
// Check if already loaded
|
||||||
|
if (contentDiv.dataset.loaded === 'true') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show loading state
|
||||||
|
contentDiv.innerHTML = '<div class="text-sm text-gray-500 py-2 flex items-center"><svg class="w-4 h-4 mr-2 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>Loading...</div>';
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/slmm/${unitId}/ftp/files?path=${encodeURIComponent(folderPath)}`);
|
||||||
|
const result = await response.json();
|
||||||
|
|
||||||
|
if (result.status !== 'ok' && !result.files) {
|
||||||
|
throw new Error(result.detail || 'Failed to list files');
|
||||||
|
}
|
||||||
|
|
||||||
|
const files = result.files || [];
|
||||||
|
|
||||||
|
if (files.length === 0) {
|
||||||
|
contentDiv.innerHTML = '<div class="text-sm text-gray-500 py-2 italic">Empty folder</div>';
|
||||||
|
statusSpan.textContent = '(empty)';
|
||||||
|
contentDiv.dataset.loaded = 'true';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort: directories first, then by name
|
||||||
|
files.sort((a, b) => {
|
||||||
|
if (a.is_dir && !b.is_dir) return -1;
|
||||||
|
if (!a.is_dir && b.is_dir) return 1;
|
||||||
|
return a.name.localeCompare(b.name);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Update status with file count
|
||||||
|
const dirCount = files.filter(f => f.is_dir).length;
|
||||||
|
const fileCount = files.length - dirCount;
|
||||||
|
let statusText = [];
|
||||||
|
if (dirCount > 0) statusText.push(`${dirCount} folder${dirCount > 1 ? 's' : ''}`);
|
||||||
|
if (fileCount > 0) statusText.push(`${fileCount} file${fileCount > 1 ? 's' : ''}`);
|
||||||
|
statusSpan.textContent = `(${statusText.join(', ')})`;
|
||||||
|
|
||||||
|
function escapeForAttribute(str) {
|
||||||
|
return String(str).replace(/'/g, "\\'").replace(/"/g, '"');
|
||||||
|
}
|
||||||
|
|
||||||
|
function escapeHtml(str) {
|
||||||
|
const div = document.createElement('div');
|
||||||
|
div.textContent = str;
|
||||||
|
return div.innerHTML;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getFileIcon(file) {
|
||||||
|
if (file.is_dir) {
|
||||||
|
return '<svg class="w-4 h-4 mr-2 text-blue-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"></path></svg>';
|
||||||
|
} else if (file.name.toLowerCase().endsWith('.csv')) {
|
||||||
|
return '<svg class="w-4 h-4 mr-2 text-green-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg>';
|
||||||
|
} else if (file.name.toLowerCase().match(/\.(txt|log)$/)) {
|
||||||
|
return '<svg class="w-4 h-4 mr-2 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path></svg>';
|
||||||
|
}
|
||||||
|
return '<svg class="w-4 h-4 mr-2 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 21h10a2 2 0 002-2V9.414a1 1 0 00-.293-.707l-5.414-5.414A1 1 0 0012.586 3H7a2 2 0 00-2 2v14a2 2 0 002 2z"></path></svg>';
|
||||||
|
}
|
||||||
|
|
||||||
|
let html = '<div class="space-y-1 mt-2">';
|
||||||
|
|
||||||
|
files.forEach(file => {
|
||||||
|
const fullPath = file.path || `${folderPath}/${file.name}`;
|
||||||
|
const icon = getFileIcon(file);
|
||||||
|
const sizeText = file.size ? formatFileSize(file.size) : '';
|
||||||
|
const subFolderId = 'proj-folder-' + fullPath.replace(/[^a-zA-Z0-9]/g, '-');
|
||||||
|
|
||||||
|
if (file.is_dir) {
|
||||||
|
// Nested collapsible folder
|
||||||
|
html += `
|
||||||
|
<div class="border border-gray-200 dark:border-gray-600 rounded">
|
||||||
|
<div class="flex items-center justify-between p-2 hover:bg-gray-50 dark:hover:bg-gray-700 rounded transition-colors cursor-pointer text-sm"
|
||||||
|
onclick="toggleFTPFolderProject('${unitId}', '${escapeForAttribute(fullPath)}', '${subFolderId}', this)">
|
||||||
|
<div class="flex items-center flex-1">
|
||||||
|
<svg class="w-3 h-3 mr-2 text-gray-400 transition-transform folder-chevron" 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>
|
||||||
|
${icon}
|
||||||
|
<span class="text-gray-900 dark:text-white font-medium">${escapeHtml(file.name)}</span>
|
||||||
|
<span class="ml-2 text-xs text-gray-400 folder-status"></span>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-2 flex-shrink-0 ml-2">
|
||||||
|
<button onclick="event.stopPropagation(); downloadFolderToServer('${unitId}', '${escapeForAttribute(fullPath)}', '${escapeForAttribute(file.name)}')"
|
||||||
|
class="px-2 py-1 bg-seismo-orange hover:bg-seismo-navy text-white text-xs rounded transition-colors flex items-center"
|
||||||
|
title="Download folder to server">
|
||||||
|
<svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"></path>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="${subFolderId}" class="hidden pl-4 pr-2 pb-2 border-t border-gray-100 dark:border-gray-700">
|
||||||
|
<div class="text-sm text-gray-500 py-2">Click to load contents...</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
} else {
|
||||||
|
html += `
|
||||||
|
<div class="flex items-center justify-between p-2 hover:bg-gray-50 dark:hover:bg-gray-700 rounded transition-colors text-sm">
|
||||||
|
<div class="flex items-center flex-1 min-w-0">
|
||||||
|
${icon}
|
||||||
|
<span class="text-gray-900 dark:text-white truncate">${escapeHtml(file.name)}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-2 flex-shrink-0 ml-2">
|
||||||
|
<span class="text-xs text-gray-500 hidden sm:inline">${sizeText}</span>
|
||||||
|
<button onclick="downloadToServer('${unitId}', '${escapeForAttribute(fullPath)}', '${escapeForAttribute(file.name)}')"
|
||||||
|
class="px-2 py-1 bg-seismo-orange hover:bg-seismo-navy text-white text-xs rounded transition-colors"
|
||||||
|
title="Download to server">
|
||||||
|
<svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"></path>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
html += '</div>';
|
||||||
|
contentDiv.innerHTML = html;
|
||||||
|
contentDiv.dataset.loaded = 'true';
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to load folder contents:', error);
|
||||||
|
contentDiv.innerHTML = `<div class="text-sm text-red-500 py-2">Error: ${error.message}</div>`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function downloadFTPFile(unitId, remotePath, fileName) {
|
||||||
|
const btn = event.target;
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.textContent = 'Downloading...';
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/slmm/${unitId}/ftp/download`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
remote_path: remotePath
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
const blob = await response.blob();
|
||||||
|
const url = window.URL.createObjectURL(blob);
|
||||||
|
const a = document.createElement('a');
|
||||||
|
a.href = url;
|
||||||
|
a.download = fileName;
|
||||||
|
document.body.appendChild(a);
|
||||||
|
a.click();
|
||||||
|
window.URL.revokeObjectURL(url);
|
||||||
|
document.body.removeChild(a);
|
||||||
|
} else {
|
||||||
|
const errorData = await response.json();
|
||||||
|
alert('Download failed: ' + (errorData.detail || 'Unknown error'));
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
alert('Error downloading file: ' + error);
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.textContent = 'Download';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function downloadFTPFolder(unitId, remotePath, folderName) {
|
||||||
|
const btn = event.target;
|
||||||
|
const originalHTML = btn.innerHTML;
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.innerHTML = '<svg class="w-3 h-3 inline mr-1 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>Downloading...';
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/slmm/${unitId}/ftp/download-folder`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
remote_path: remotePath
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
const blob = await response.blob();
|
||||||
|
const url = window.URL.createObjectURL(blob);
|
||||||
|
const a = document.createElement('a');
|
||||||
|
a.href = url;
|
||||||
|
a.download = `${folderName}.zip`;
|
||||||
|
document.body.appendChild(a);
|
||||||
|
a.click();
|
||||||
|
window.URL.revokeObjectURL(url);
|
||||||
|
document.body.removeChild(a);
|
||||||
|
|
||||||
|
// Show success message
|
||||||
|
alert(`✓ Folder "${folderName}" downloaded successfully as ZIP file!`);
|
||||||
|
} else {
|
||||||
|
const errorData = await response.json();
|
||||||
|
alert('Folder download failed: ' + (errorData.detail || 'Unknown error'));
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
alert('Error downloading folder: ' + error);
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.innerHTML = originalHTML;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function downloadFolderToServer(unitId, remotePath, folderName) {
|
||||||
|
const btn = event.target;
|
||||||
|
const originalHTML = btn.innerHTML;
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.innerHTML = '<svg class="w-3 h-3 inline mr-1 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>Downloading...';
|
||||||
|
|
||||||
|
// Get location_id from the unit's data attribute
|
||||||
|
const unitContainer = btn.closest('[id^="ftp-files-"]');
|
||||||
|
const locationId = unitContainer.dataset.locationId;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/projects/{{ project_id }}/ftp-download-folder-to-server`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
unit_id: unitId,
|
||||||
|
remote_path: remotePath,
|
||||||
|
location_id: locationId
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
// Show success message
|
||||||
|
alert(`✓ Folder "${folderName}" downloaded successfully!\n\n${data.file_count} files extracted\nTotal size: ${formatFileSize(data.total_size)}\n\nFiles are now available in the Project Files section below.`);
|
||||||
|
|
||||||
|
// Refresh the unified files list
|
||||||
|
htmx.trigger('#unified-files', 'refresh');
|
||||||
|
} else {
|
||||||
|
alert('Folder download to server failed: ' + (data.detail || 'Unknown error'));
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
alert('Error downloading folder to server: ' + error);
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.innerHTML = originalHTML;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function downloadToServer(unitId, remotePath, fileName) {
|
||||||
|
const btn = event.target;
|
||||||
|
const originalText = btn.innerHTML;
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.innerHTML = '<svg class="w-3 h-3 inline mr-1 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>Downloading...';
|
||||||
|
|
||||||
|
// Get location_id from the unit's data attribute
|
||||||
|
const unitContainer = btn.closest('[id^="ftp-files-"]');
|
||||||
|
const locationId = unitContainer.dataset.locationId;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/projects/{{ project_id }}/ftp-download-to-server`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
unit_id: unitId,
|
||||||
|
remote_path: remotePath,
|
||||||
|
location_id: locationId
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
// Show success message
|
||||||
|
alert(`✓ ${fileName} downloaded to server successfully!\n\nFile ID: ${data.file_id}\nSize: ${formatFileSize(data.file_size)}`);
|
||||||
|
|
||||||
|
// Refresh the unified files list
|
||||||
|
htmx.trigger('#unified-files', 'refresh');
|
||||||
|
} else {
|
||||||
|
alert('Download to server failed: ' + (data.detail || 'Unknown error'));
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
alert('Error downloading to server: ' + error);
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.innerHTML = originalText;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatFileSize(bytes) {
|
||||||
|
if (bytes < 1024) return bytes + ' B';
|
||||||
|
if (bytes < 1048576) return (bytes / 1024).toFixed(1) + ' KB';
|
||||||
|
if (bytes < 1073741824) return (bytes / 1048576).toFixed(1) + ' MB';
|
||||||
|
return (bytes / 1073741824).toFixed(2) + ' GB';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check FTP status for all units on load
|
||||||
|
// Use setTimeout to ensure DOM elements exist when HTMX loads this partial
|
||||||
|
setTimeout(function() {
|
||||||
|
{% for unit_item in units %}
|
||||||
|
checkFTPStatus('{{ unit_item.unit.id }}');
|
||||||
|
{% endfor %}
|
||||||
|
}, 100);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<!-- Include the unified SLM Settings Modal -->
|
||||||
|
{% include 'partials/slm_settings_modal.html' %}
|
||||||