feat: support for day time monitoring data, combined report generation now compaitible with mixed day and night types.
This commit is contained in:
131
backend/migrate_add_session_period_type.py
Normal file
131
backend/migrate_add_session_period_type.py
Normal file
@@ -0,0 +1,131 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Migration: Add session_label and period_type columns to monitoring_sessions.
|
||||
|
||||
session_label - user-editable display name, e.g. "NRL-1 Sun 2/23 Night"
|
||||
period_type - one of: weekday_day | weekday_night | weekend_day | weekend_night
|
||||
Auto-derived from started_at when NULL.
|
||||
|
||||
Period definitions (used in report stats table):
|
||||
weekday_day Mon-Fri 07:00-22:00 -> Daytime (7AM-10PM)
|
||||
weekday_night Mon-Fri 22:00-07:00 -> Nighttime (10PM-7AM)
|
||||
weekend_day Sat-Sun 07:00-22:00 -> Daytime (7AM-10PM)
|
||||
weekend_night Sat-Sun 22:00-07:00 -> Nighttime (10PM-7AM)
|
||||
|
||||
Run once inside the Docker container:
|
||||
docker exec terra-view python3 backend/migrate_add_session_period_type.py
|
||||
"""
|
||||
from pathlib import Path
|
||||
from datetime import datetime
|
||||
|
||||
DB_PATH = Path("data/seismo_fleet.db")
|
||||
|
||||
|
||||
def _derive_period_type(started_at_str: str) -> str | None:
|
||||
"""Derive period_type from a started_at ISO datetime string."""
|
||||
if not started_at_str:
|
||||
return None
|
||||
try:
|
||||
dt = datetime.fromisoformat(started_at_str)
|
||||
except ValueError:
|
||||
return None
|
||||
is_weekend = dt.weekday() >= 5 # 5=Sat, 6=Sun
|
||||
is_night = dt.hour >= 22 or dt.hour < 7
|
||||
if is_weekend:
|
||||
return "weekend_night" if is_night else "weekend_day"
|
||||
else:
|
||||
return "weekday_night" if is_night else "weekday_day"
|
||||
|
||||
|
||||
def _build_label(started_at_str: str, location_name: str | None, period_type: str | None) -> str | None:
|
||||
"""Build a human-readable session label."""
|
||||
if not started_at_str:
|
||||
return None
|
||||
try:
|
||||
dt = datetime.fromisoformat(started_at_str)
|
||||
except ValueError:
|
||||
return None
|
||||
|
||||
day_abbr = dt.strftime("%a") # Mon, Tue, Sun, etc.
|
||||
date_str = dt.strftime("%-m/%-d") # 2/23
|
||||
|
||||
period_labels = {
|
||||
"weekday_day": "Day",
|
||||
"weekday_night": "Night",
|
||||
"weekend_day": "Day",
|
||||
"weekend_night": "Night",
|
||||
}
|
||||
period_str = period_labels.get(period_type or "", "")
|
||||
|
||||
parts = []
|
||||
if location_name:
|
||||
parts.append(location_name)
|
||||
parts.append(f"{day_abbr} {date_str}")
|
||||
if period_str:
|
||||
parts.append(period_str)
|
||||
return " — ".join(parts)
|
||||
|
||||
|
||||
def migrate():
|
||||
import sqlite3
|
||||
|
||||
if not DB_PATH.exists():
|
||||
print(f"Database not found at {DB_PATH}. Are you running from /home/serversdown/terra-view?")
|
||||
return
|
||||
|
||||
conn = sqlite3.connect(DB_PATH)
|
||||
conn.row_factory = sqlite3.Row
|
||||
cur = conn.cursor()
|
||||
|
||||
# 1. Add columns (idempotent)
|
||||
cur.execute("PRAGMA table_info(monitoring_sessions)")
|
||||
existing_cols = {row["name"] for row in cur.fetchall()}
|
||||
|
||||
for col, typedef in [("session_label", "TEXT"), ("period_type", "TEXT")]:
|
||||
if col not in existing_cols:
|
||||
cur.execute(f"ALTER TABLE monitoring_sessions ADD COLUMN {col} {typedef}")
|
||||
conn.commit()
|
||||
print(f"✓ Added column {col} to monitoring_sessions")
|
||||
else:
|
||||
print(f"○ Column {col} already exists — skipping ALTER TABLE")
|
||||
|
||||
# 2. Backfill existing rows
|
||||
cur.execute(
|
||||
"""SELECT ms.id, ms.started_at, ms.location_id
|
||||
FROM monitoring_sessions ms
|
||||
WHERE ms.period_type IS NULL OR ms.session_label IS NULL"""
|
||||
)
|
||||
sessions = cur.fetchall()
|
||||
print(f"Backfilling {len(sessions)} session(s)...")
|
||||
|
||||
updated = 0
|
||||
for row in sessions:
|
||||
session_id = row["id"]
|
||||
started_at = row["started_at"]
|
||||
location_id = row["location_id"]
|
||||
|
||||
# Look up location name
|
||||
location_name = None
|
||||
if location_id:
|
||||
cur.execute("SELECT name FROM monitoring_locations WHERE id = ?", (location_id,))
|
||||
loc_row = cur.fetchone()
|
||||
if loc_row:
|
||||
location_name = loc_row["name"]
|
||||
|
||||
period_type = _derive_period_type(started_at)
|
||||
label = _build_label(started_at, location_name, period_type)
|
||||
|
||||
cur.execute(
|
||||
"UPDATE monitoring_sessions SET period_type = ?, session_label = ? WHERE id = ?",
|
||||
(period_type, label, session_id),
|
||||
)
|
||||
updated += 1
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
print(f"✓ Backfilled {updated} session(s).")
|
||||
print("Migration complete.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
migrate()
|
||||
@@ -272,6 +272,14 @@ class MonitoringSession(Base):
|
||||
duration_seconds = Column(Integer, nullable=True)
|
||||
status = Column(String, default="recording") # recording, completed, failed
|
||||
|
||||
# Human-readable label auto-derived from date/location, editable by user.
|
||||
# e.g. "NRL-1 — Sun 2/23 — Night"
|
||||
session_label = Column(String, nullable=True)
|
||||
|
||||
# Period classification for report stats columns.
|
||||
# weekday_day | weekday_night | weekend_day | weekend_night
|
||||
period_type = Column(String, nullable=True)
|
||||
|
||||
# Snapshot of device configuration at recording time
|
||||
session_metadata = Column(Text, nullable=True) # JSON
|
||||
|
||||
|
||||
@@ -35,6 +35,37 @@ from backend.templates_config import templates
|
||||
router = APIRouter(prefix="/api/projects/{project_id}", tags=["project-locations"])
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Session period helpers
|
||||
# ============================================================================
|
||||
|
||||
def _derive_period_type(dt: datetime) -> str:
|
||||
"""
|
||||
Classify a session start time into one of four period types.
|
||||
Night = 22:00–07:00, Day = 07:00–22:00.
|
||||
Weekend = Saturday (5) or Sunday (6).
|
||||
"""
|
||||
is_weekend = dt.weekday() >= 5
|
||||
is_night = dt.hour >= 22 or dt.hour < 7
|
||||
if is_weekend:
|
||||
return "weekend_night" if is_night else "weekend_day"
|
||||
return "weekday_night" if is_night else "weekday_day"
|
||||
|
||||
|
||||
def _build_session_label(dt: datetime, location_name: str, period_type: str) -> str:
|
||||
"""Build a human-readable session label, e.g. 'NRL-1 — Sun 2/23 — Night'."""
|
||||
day_abbr = dt.strftime("%a")
|
||||
date_str = f"{dt.month}/{dt.day}"
|
||||
period_str = {
|
||||
"weekday_day": "Day",
|
||||
"weekday_night": "Night",
|
||||
"weekend_day": "Day",
|
||||
"weekend_night": "Night",
|
||||
}.get(period_type, "")
|
||||
parts = [p for p in [location_name, f"{day_abbr} {date_str}", period_str] if p]
|
||||
return " — ".join(parts)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Monitoring Locations CRUD
|
||||
# ============================================================================
|
||||
@@ -676,6 +707,9 @@ async def upload_nrl_data(
|
||||
index_number = rnh_meta.get("index_number", "")
|
||||
|
||||
# --- Step 3: Create MonitoringSession ---
|
||||
period_type = _derive_period_type(started_at) if started_at else None
|
||||
session_label = _build_session_label(started_at, location.name, period_type) if started_at else None
|
||||
|
||||
session_id = str(uuid.uuid4())
|
||||
monitoring_session = MonitoringSession(
|
||||
id=session_id,
|
||||
@@ -687,6 +721,8 @@ async def upload_nrl_data(
|
||||
stopped_at=stopped_at,
|
||||
duration_seconds=duration_seconds,
|
||||
status="completed",
|
||||
session_label=session_label,
|
||||
period_type=period_type,
|
||||
session_metadata=json.dumps({
|
||||
"source": "manual_upload",
|
||||
"store_name": store_name,
|
||||
|
||||
@@ -1794,6 +1794,34 @@ async def delete_session(
|
||||
})
|
||||
|
||||
|
||||
VALID_PERIOD_TYPES = {"weekday_day", "weekday_night", "weekend_day", "weekend_night"}
|
||||
|
||||
@router.patch("/{project_id}/sessions/{session_id}")
|
||||
async def patch_session(
|
||||
project_id: str,
|
||||
session_id: str,
|
||||
data: dict,
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""Update session_label and/or period_type on a monitoring session."""
|
||||
session = db.query(MonitoringSession).filter_by(id=session_id).first()
|
||||
if not session:
|
||||
raise HTTPException(status_code=404, detail="Session not found")
|
||||
if session.project_id != project_id:
|
||||
raise HTTPException(status_code=403, detail="Session does not belong to this project")
|
||||
|
||||
if "session_label" in data:
|
||||
session.session_label = str(data["session_label"]).strip() or None
|
||||
if "period_type" in data:
|
||||
pt = data["period_type"]
|
||||
if pt and pt not in VALID_PERIOD_TYPES:
|
||||
raise HTTPException(status_code=400, detail=f"Invalid period_type. Must be one of: {', '.join(sorted(VALID_PERIOD_TYPES))}")
|
||||
session.period_type = pt or None
|
||||
|
||||
db.commit()
|
||||
return JSONResponse({"status": "success", "session_label": session.session_label, "period_type": session.period_type})
|
||||
|
||||
|
||||
@router.get("/{project_id}/files/{file_id}/view-rnd", response_class=HTMLResponse)
|
||||
async def view_rnd_file(
|
||||
request: Request,
|
||||
@@ -3277,32 +3305,59 @@ async def combined_report_wizard(
|
||||
):
|
||||
"""Configuration page for the combined multi-location report wizard."""
|
||||
from backend.models import ReportTemplate
|
||||
from pathlib import Path as _Path
|
||||
|
||||
project = db.query(Project).filter_by(id=project_id).first()
|
||||
if not project:
|
||||
raise HTTPException(status_code=404, detail="Project not found")
|
||||
|
||||
sessions = db.query(MonitoringSession).filter_by(project_id=project_id).all()
|
||||
sessions = db.query(MonitoringSession).filter_by(project_id=project_id).order_by(MonitoringSession.started_at).all()
|
||||
|
||||
# Build location list with Leq file counts (no filtering)
|
||||
location_file_counts: dict = {}
|
||||
# Build location -> sessions list, only including sessions that have Leq files
|
||||
location_sessions: dict = {} # loc_name -> list of session dicts
|
||||
for session in sessions:
|
||||
files = db.query(DataFile).filter_by(session_id=session.id).all()
|
||||
has_leq = False
|
||||
for file in files:
|
||||
if not file.file_path or not file.file_path.lower().endswith('.rnd'):
|
||||
continue
|
||||
from pathlib import Path as _Path
|
||||
abs_path = _Path("data") / file.file_path
|
||||
peek = _peek_rnd_headers(abs_path)
|
||||
if not _is_leq_file(file.file_path, peek):
|
||||
if _is_leq_file(file.file_path, peek):
|
||||
has_leq = True
|
||||
break
|
||||
if not has_leq:
|
||||
continue
|
||||
|
||||
location = db.query(MonitoringLocation).filter_by(id=session.location_id).first() if session.location_id else None
|
||||
loc_name = location.name if location else f"Session {session.id[:8]}"
|
||||
location_file_counts[loc_name] = location_file_counts.get(loc_name, 0) + 1
|
||||
|
||||
if loc_name not in location_sessions:
|
||||
location_sessions[loc_name] = []
|
||||
|
||||
# Build a display date and day-of-week from started_at
|
||||
date_display = ""
|
||||
day_of_week = ""
|
||||
if session.started_at:
|
||||
date_display = session.started_at.strftime("%-m/%-d/%Y")
|
||||
day_of_week = session.started_at.strftime("%A") # Monday, Sunday, etc.
|
||||
|
||||
location_sessions[loc_name].append({
|
||||
"session_id": session.id,
|
||||
"session_label": session.session_label or "",
|
||||
"date_display": date_display,
|
||||
"day_of_week": day_of_week,
|
||||
"started_at": session.started_at.isoformat() if session.started_at else "",
|
||||
"stopped_at": session.stopped_at.isoformat() if session.stopped_at else "",
|
||||
"duration_h": (session.duration_seconds // 3600) if session.duration_seconds else 0,
|
||||
"duration_m": ((session.duration_seconds % 3600) // 60) if session.duration_seconds else 0,
|
||||
"period_type": session.period_type or "",
|
||||
"status": session.status,
|
||||
})
|
||||
|
||||
locations = [
|
||||
{"name": name, "file_count": count}
|
||||
for name, count in sorted(location_file_counts.items())
|
||||
{"name": name, "sessions": sess_list}
|
||||
for name, sess_list in sorted(location_sessions.items())
|
||||
]
|
||||
|
||||
report_templates = db.query(ReportTemplate).all()
|
||||
@@ -3312,10 +3367,111 @@ async def combined_report_wizard(
|
||||
"project": project,
|
||||
"project_id": project_id,
|
||||
"locations": locations,
|
||||
"locations_json": json.dumps(locations),
|
||||
"report_templates": report_templates,
|
||||
})
|
||||
|
||||
|
||||
def _build_location_data_from_sessions(project_id: str, db, selected_session_ids: list) -> dict:
|
||||
"""
|
||||
Build per-location spreadsheet data using an explicit list of session IDs.
|
||||
Only rows from those sessions are included. Per-session period_type is
|
||||
stored on each row so the report can filter stats correctly.
|
||||
"""
|
||||
from pathlib import Path as _Path
|
||||
|
||||
project = db.query(Project).filter_by(id=project_id).first()
|
||||
if not project:
|
||||
raise HTTPException(status_code=404, detail="Project not found")
|
||||
|
||||
if not selected_session_ids:
|
||||
raise HTTPException(status_code=400, detail="No sessions selected.")
|
||||
|
||||
# Load every requested session — one entry per (session_id, loc_name) pair.
|
||||
# Keyed by session_id so overnight sessions are never split by calendar date.
|
||||
session_entries: dict = {} # session_id -> {loc_name, session_label, period_type, rows[]}
|
||||
|
||||
for session_id in selected_session_ids:
|
||||
session = db.query(MonitoringSession).filter_by(id=session_id, project_id=project_id).first()
|
||||
if not session:
|
||||
continue
|
||||
location = db.query(MonitoringLocation).filter_by(id=session.location_id).first() if session.location_id else None
|
||||
loc_name = location.name if location else f"Session {session_id[:8]}"
|
||||
|
||||
session_entries[session_id] = {
|
||||
"loc_name": loc_name,
|
||||
"session_label": session.session_label or "",
|
||||
"period_type": session.period_type or "",
|
||||
"started_at": session.started_at,
|
||||
"rows": [],
|
||||
}
|
||||
|
||||
files = db.query(DataFile).filter_by(session_id=session_id).all()
|
||||
for file in files:
|
||||
if not file.file_path or not file.file_path.lower().endswith('.rnd'):
|
||||
continue
|
||||
abs_path = _Path("data") / file.file_path
|
||||
peek = _peek_rnd_headers(abs_path)
|
||||
if not _is_leq_file(file.file_path, peek):
|
||||
continue
|
||||
rows = _read_rnd_file_rows(file.file_path)
|
||||
rows, _ = _normalize_rnd_rows(rows)
|
||||
session_entries[session_id]["rows"].extend(rows)
|
||||
|
||||
if not any(e["rows"] for e in session_entries.values()):
|
||||
raise HTTPException(status_code=404, detail="No Leq data found in the selected sessions.")
|
||||
|
||||
location_data = []
|
||||
for session_id in selected_session_ids:
|
||||
entry = session_entries.get(session_id)
|
||||
if not entry or not entry["rows"]:
|
||||
continue
|
||||
|
||||
loc_name = entry["loc_name"]
|
||||
period_type = entry["period_type"]
|
||||
raw_rows = sorted(entry["rows"], key=lambda r: r.get('Start Time', ''))
|
||||
|
||||
spreadsheet_data = []
|
||||
for idx, row in enumerate(raw_rows, 1):
|
||||
start_time_str = row.get('Start Time', '')
|
||||
date_str = time_str = ''
|
||||
if start_time_str:
|
||||
try:
|
||||
dt = datetime.strptime(start_time_str, '%Y/%m/%d %H:%M:%S')
|
||||
date_str = dt.strftime('%Y-%m-%d')
|
||||
time_str = dt.strftime('%H:%M')
|
||||
except ValueError:
|
||||
date_str = start_time_str
|
||||
|
||||
lmax = row.get('Lmax(Main)', '')
|
||||
ln1 = row.get('LN1(Main)', '')
|
||||
ln2 = row.get('LN2(Main)', '')
|
||||
|
||||
spreadsheet_data.append([
|
||||
idx,
|
||||
date_str,
|
||||
time_str,
|
||||
lmax if lmax else '',
|
||||
ln1 if ln1 else '',
|
||||
ln2 if ln2 else '',
|
||||
'',
|
||||
period_type, # col index 7 — hidden, used by report gen for day/night bucketing
|
||||
])
|
||||
|
||||
location_data.append({
|
||||
"session_id": session_id,
|
||||
"location_name": loc_name,
|
||||
"session_label": entry["session_label"],
|
||||
"period_type": period_type,
|
||||
"started_at": entry["started_at"].isoformat() if entry["started_at"] else "",
|
||||
"raw_count": len(raw_rows),
|
||||
"filtered_count": len(raw_rows),
|
||||
"spreadsheet_data": spreadsheet_data,
|
||||
})
|
||||
|
||||
return {"project": project, "location_data": location_data}
|
||||
|
||||
|
||||
@router.get("/{project_id}/combined-report-preview", response_class=HTMLResponse)
|
||||
async def combined_report_preview(
|
||||
request: Request,
|
||||
@@ -3323,38 +3479,19 @@ async def combined_report_preview(
|
||||
report_title: str = Query("Background Noise Study"),
|
||||
project_name: str = Query(""),
|
||||
client_name: str = Query(""),
|
||||
start_time: str = Query(""),
|
||||
end_time: str = Query(""),
|
||||
start_date: str = Query(""),
|
||||
end_date: str = Query(""),
|
||||
enabled_locations: str = Query(""),
|
||||
selected_sessions: str = Query(""), # comma-separated session IDs
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""Preview and edit combined report data before generating the Excel file."""
|
||||
enabled_list = [loc.strip() for loc in enabled_locations.split(',') if loc.strip()] if enabled_locations else None
|
||||
session_ids = [s.strip() for s in selected_sessions.split(',') if s.strip()] if selected_sessions else []
|
||||
|
||||
result = _build_combined_location_data(
|
||||
project_id, db,
|
||||
start_time=start_time,
|
||||
end_time=end_time,
|
||||
start_date=start_date,
|
||||
end_date=end_date,
|
||||
enabled_locations=enabled_list,
|
||||
)
|
||||
result = _build_location_data_from_sessions(project_id, db, session_ids)
|
||||
|
||||
project = result["project"]
|
||||
location_data = result["location_data"]
|
||||
|
||||
total_rows = sum(loc["filtered_count"] for loc in location_data)
|
||||
final_project_name = project_name if project_name else project.name
|
||||
|
||||
# Build time filter display string
|
||||
time_filter_desc = ""
|
||||
if start_time and end_time:
|
||||
time_filter_desc = f"{start_time} – {end_time}"
|
||||
elif start_time or end_time:
|
||||
time_filter_desc = f"{start_time or ''} – {end_time or ''}"
|
||||
|
||||
return templates.TemplateResponse("combined_report_preview.html", {
|
||||
"request": request,
|
||||
"project": project,
|
||||
@@ -3362,11 +3499,7 @@ async def combined_report_preview(
|
||||
"report_title": report_title,
|
||||
"project_name": final_project_name,
|
||||
"client_name": client_name,
|
||||
"start_time": start_time,
|
||||
"end_time": end_time,
|
||||
"start_date": start_date,
|
||||
"end_date": end_date,
|
||||
"time_filter_desc": time_filter_desc,
|
||||
"time_filter_desc": f"{len(session_ids)} session{'s' if len(session_ids) != 1 else ''} selected",
|
||||
"location_data": location_data,
|
||||
"locations_json": json.dumps(location_data),
|
||||
"total_rows": total_rows,
|
||||
@@ -3481,6 +3614,7 @@ async def generate_combined_from_preview(
|
||||
ln1 = row[4] if len(row) > 4 else ''
|
||||
ln2 = row[5] if len(row) > 5 else ''
|
||||
comment = row[6] if len(row) > 6 else ''
|
||||
row_period = row[7] if len(row) > 7 else '' # hidden period_type from session
|
||||
|
||||
c = ws.cell(row=dr, column=1, value=test_num)
|
||||
c.font = f_data; c.alignment = center_a; c.border = b_left
|
||||
@@ -3505,15 +3639,8 @@ async def generate_combined_from_preview(
|
||||
if isinstance(ln2, (int, float)):
|
||||
ln2_vals.append(ln2)
|
||||
|
||||
if time_val and isinstance(lmax, (int, float)) and isinstance(ln1, (int, float)) and isinstance(ln2, (int, float)):
|
||||
try:
|
||||
try:
|
||||
row_dt = datetime.strptime(str(time_val), '%H:%M')
|
||||
except ValueError:
|
||||
row_dt = datetime.strptime(str(time_val), '%H:%M:%S')
|
||||
parsed_rows.append((row_dt, float(lmax), float(ln1), float(ln2)))
|
||||
except (ValueError, TypeError):
|
||||
pass
|
||||
if isinstance(lmax, (int, float)) and isinstance(ln1, (int, float)) and isinstance(ln2, (int, float)):
|
||||
parsed_rows.append((row_period, float(lmax), float(ln1), float(ln2)))
|
||||
|
||||
data_end_row = data_start_row + len(day_rows) - 1
|
||||
|
||||
@@ -3548,44 +3675,109 @@ async def generate_combined_from_preview(
|
||||
ws.merge_cells(start_row=29, start_column=9, end_row=29, end_column=14)
|
||||
|
||||
hdr_fill_tbl = PatternFill(start_color="F2F2F2", end_color="F2F2F2", fill_type="solid")
|
||||
c = ws.cell(row=31, column=9, value=""); c.border = tbl_top_left; c.font = f_bold
|
||||
c = ws.cell(row=31, column=10, value="Evening (7PM to 10PM)")
|
||||
c.font = f_bold; c.alignment = Alignment(horizontal='center', vertical='center', wrap_text=True)
|
||||
c.border = tbl_top_mid; c.fill = hdr_fill_tbl
|
||||
ws.merge_cells(start_row=31, start_column=10, end_row=31, end_column=11)
|
||||
c = ws.cell(row=31, column=12, value="Nighttime (10PM to 7AM)")
|
||||
c.font = f_bold; c.alignment = Alignment(horizontal='center', vertical='center', wrap_text=True)
|
||||
c.border = tbl_top_right; c.fill = hdr_fill_tbl
|
||||
ws.merge_cells(start_row=31, start_column=12, end_row=31, end_column=13)
|
||||
ws.row_dimensions[31].height = 15
|
||||
|
||||
evening = [(lmx, l1, l2) for dt, lmx, l1, l2 in parsed_rows if 19 <= dt.hour < 22]
|
||||
nighttime = [(lmx, l1, l2) for dt, lmx, l1, l2 in parsed_rows if dt.hour >= 22 or dt.hour < 7]
|
||||
|
||||
def _avg(vals): return round(sum(vals) / len(vals), 1) if vals else None
|
||||
def _max(vals): return round(max(vals), 1) if vals else None
|
||||
|
||||
def write_stat(row_num, label, eve_val, night_val, is_last=False):
|
||||
# --- Dynamic period detection ----------------------------------------
|
||||
# Use the period_type stored on each row (from the session record).
|
||||
# Rows without a period_type fall back to time-of-day detection.
|
||||
# The four canonical types map to two display columns:
|
||||
# Day -> "Daytime (7AM to 10PM)"
|
||||
# Night -> "Nighttime (10PM to 7AM)"
|
||||
PERIOD_TYPE_IS_DAY = {"weekday_day", "weekend_day"}
|
||||
PERIOD_TYPE_IS_NIGHT = {"weekday_night", "weekend_night"}
|
||||
|
||||
day_rows_data = []
|
||||
night_rows_data = []
|
||||
for pt, lmx, l1, l2 in parsed_rows:
|
||||
if pt in PERIOD_TYPE_IS_DAY:
|
||||
day_rows_data.append((lmx, l1, l2))
|
||||
elif pt in PERIOD_TYPE_IS_NIGHT:
|
||||
night_rows_data.append((lmx, l1, l2))
|
||||
else:
|
||||
# No period_type — fall back to time-of-day (shouldn't happen for
|
||||
# new uploads, but handles legacy data gracefully)
|
||||
# We can't derive from time here since parsed_rows no longer stores dt.
|
||||
# Put in day as a safe default.
|
||||
day_rows_data.append((lmx, l1, l2))
|
||||
|
||||
all_candidate_periods = [
|
||||
("Daytime (7AM to 10PM)", day_rows_data),
|
||||
("Nighttime (10PM to 7AM)", night_rows_data),
|
||||
]
|
||||
active_periods = [(label, rows) for label, rows in all_candidate_periods if rows]
|
||||
|
||||
# If nothing at all, show both columns empty
|
||||
if not active_periods:
|
||||
active_periods = [("Daytime (7AM to 10PM)", []), ("Nighttime (10PM to 7AM)", [])]
|
||||
|
||||
# Build header row (row 31) with one merged pair of columns per active period
|
||||
# Layout: col 9 = row label, then pairs: (10,11), (12,13), (14,15)
|
||||
num_periods = len(active_periods)
|
||||
period_start_cols = [10 + i * 2 for i in range(num_periods)]
|
||||
|
||||
# Left/right border helpers for the header row
|
||||
def _hdr_border(i, n):
|
||||
is_first = (i == 0)
|
||||
is_last = (i == n - 1)
|
||||
return Border(
|
||||
left=med if is_first else thin,
|
||||
right=med if is_last else thin,
|
||||
top=med,
|
||||
bottom=thin,
|
||||
)
|
||||
def _mid_border(i, n, is_data_last=False):
|
||||
is_first = (i == 0)
|
||||
is_last = (i == n - 1)
|
||||
b = tbl_bot_mid if is_data_last else tbl_mid_mid
|
||||
return Border(
|
||||
left=med if is_first else thin,
|
||||
right=med if is_last else thin,
|
||||
top=b.top,
|
||||
bottom=b.bottom,
|
||||
)
|
||||
|
||||
c = ws.cell(row=31, column=9, value=""); c.border = tbl_top_left; c.font = f_bold
|
||||
ws.row_dimensions[31].height = 30
|
||||
|
||||
for i, (period_label, _) in enumerate(active_periods):
|
||||
sc = period_start_cols[i]
|
||||
is_last_col = (i == num_periods - 1)
|
||||
c = ws.cell(row=31, column=sc, value=period_label.replace('\n', ' '))
|
||||
c.font = f_bold
|
||||
c.alignment = Alignment(horizontal='center', vertical='center', wrap_text=True)
|
||||
c.border = _hdr_border(i, num_periods)
|
||||
c.fill = hdr_fill_tbl
|
||||
ws.merge_cells(start_row=31, start_column=sc, end_row=31, end_column=sc + 1)
|
||||
|
||||
def write_stat_dynamic(row_num, row_label, period_vals_list, is_last=False):
|
||||
bl = tbl_bot_left if is_last else tbl_mid_left
|
||||
bm = tbl_bot_mid if is_last else tbl_mid_mid
|
||||
br = tbl_bot_right if is_last else tbl_mid_right
|
||||
lbl = ws.cell(row=row_num, column=9, value=label)
|
||||
lbl = ws.cell(row=row_num, column=9, value=row_label)
|
||||
lbl.font = f_data; lbl.border = bl
|
||||
lbl.alignment = Alignment(horizontal='left', vertical='center')
|
||||
ev_str = f"{eve_val} dBA" if eve_val is not None else ""
|
||||
ev = ws.cell(row=row_num, column=10, value=ev_str)
|
||||
ev.font = f_bold; ev.border = bm
|
||||
ev.alignment = Alignment(horizontal='center', vertical='center')
|
||||
ws.merge_cells(start_row=row_num, start_column=10, end_row=row_num, end_column=11)
|
||||
ni_str = f"{night_val} dBA" if night_val is not None else ""
|
||||
ni = ws.cell(row=row_num, column=12, value=ni_str)
|
||||
ni.font = f_bold; ni.border = br
|
||||
ni.alignment = Alignment(horizontal='center', vertical='center')
|
||||
ws.merge_cells(start_row=row_num, start_column=12, end_row=row_num, end_column=13)
|
||||
n = len(period_vals_list)
|
||||
for i, val in enumerate(period_vals_list):
|
||||
sc = period_start_cols[i]
|
||||
is_last_col = (i == n - 1)
|
||||
val_str = f"{val} dBA" if val is not None else ""
|
||||
c = ws.cell(row=row_num, column=sc, value=val_str)
|
||||
c.font = f_bold
|
||||
c.alignment = Alignment(horizontal='center', vertical='center')
|
||||
c.border = Border(
|
||||
left=med if i == 0 else thin,
|
||||
right=med if is_last_col else thin,
|
||||
top=tbl_bot_mid.top if is_last else tbl_mid_mid.top,
|
||||
bottom=tbl_bot_mid.bottom if is_last else tbl_mid_mid.bottom,
|
||||
)
|
||||
ws.merge_cells(start_row=row_num, start_column=sc, end_row=row_num, end_column=sc + 1)
|
||||
|
||||
write_stat(32, "LAmax", _max([v[0] for v in evening]), _max([v[0] for v in nighttime]))
|
||||
write_stat(33, "LA01 Average", _avg([v[1] for v in evening]), _avg([v[1] for v in nighttime]))
|
||||
write_stat(34, "LA10 Average", _avg([v[2] for v in evening]), _avg([v[2] for v in nighttime]), is_last=True)
|
||||
write_stat_dynamic(32, "LAmax",
|
||||
[_max([v[0] for v in rows]) for _, rows in active_periods])
|
||||
write_stat_dynamic(33, "LA01 Average",
|
||||
[_avg([v[1] for v in rows]) for _, rows in active_periods])
|
||||
write_stat_dynamic(34, "LA10 Average",
|
||||
[_avg([v[2] for v in rows]) for _, rows in active_periods], is_last=True)
|
||||
|
||||
ws.sheet_properties.pageSetUpPr = PageSetupProperties(fitToPage=False)
|
||||
ws.page_setup.orientation = 'portrait'
|
||||
@@ -3624,58 +3816,58 @@ async def generate_combined_from_preview(
|
||||
summary_ws.cell(row=idx, column=5, value=s['ln2_avg'] or '-').border = thin_border
|
||||
|
||||
# ----------------------------------------------------------------
|
||||
# Split each location's rows by date, collect all unique dates
|
||||
# Build one workbook per session (each location entry is one session)
|
||||
# ----------------------------------------------------------------
|
||||
# Structure: dates_map[date_str][loc_name] = [row, ...]
|
||||
dates_map: dict = {}
|
||||
for loc_info in locations:
|
||||
loc_name = loc_info.get("location_name", "Unknown")
|
||||
rows = loc_info.get("spreadsheet_data", [])
|
||||
for row in rows:
|
||||
date_val = str(row[1]).strip() if len(row) > 1 else ''
|
||||
if not date_val:
|
||||
date_val = "Unknown Date"
|
||||
dates_map.setdefault(date_val, {}).setdefault(loc_name, []).append(row)
|
||||
if not locations:
|
||||
raise HTTPException(status_code=400, detail="No location data provided")
|
||||
|
||||
if not dates_map:
|
||||
raise HTTPException(status_code=400, detail="No data rows found in provided location data")
|
||||
|
||||
sorted_dates = sorted(dates_map.keys())
|
||||
project_name_clean = "".join(c for c in project_name if c.isalnum() or c in ('_', '-', ' ')).strip().replace(' ', '_')
|
||||
final_title = f"{report_title} - {project_name}"
|
||||
|
||||
# ----------------------------------------------------------------
|
||||
# Build one workbook per day, zip them
|
||||
# ----------------------------------------------------------------
|
||||
zip_buffer = io.BytesIO()
|
||||
with zipfile.ZipFile(zip_buffer, 'w', zipfile.ZIP_DEFLATED) as zf:
|
||||
for date_str in sorted_dates:
|
||||
loc_data_for_day = dates_map[date_str]
|
||||
final_title = f"{report_title} - {project_name}"
|
||||
for loc_info in locations:
|
||||
loc_name = loc_info.get("location_name", "Unknown")
|
||||
session_label = loc_info.get("session_label", "")
|
||||
period_type = loc_info.get("period_type", "")
|
||||
started_at_str = loc_info.get("started_at", "")
|
||||
rows = loc_info.get("spreadsheet_data", [])
|
||||
if not rows:
|
||||
continue
|
||||
|
||||
# Re-number interval # sequentially
|
||||
for i, row in enumerate(rows):
|
||||
if len(row) > 0:
|
||||
row[0] = i + 1
|
||||
|
||||
wb = openpyxl.Workbook()
|
||||
wb.remove(wb.active)
|
||||
|
||||
loc_summaries = []
|
||||
for loc_name in sorted(loc_data_for_day.keys()):
|
||||
day_rows = loc_data_for_day[loc_name]
|
||||
# Re-number interval # sequentially for this day
|
||||
for i, row in enumerate(day_rows):
|
||||
if len(row) > 0:
|
||||
row[0] = i + 1
|
||||
safe_sheet = "".join(c for c in loc_name if c.isalnum() or c in (' ', '-', '_'))[:31]
|
||||
ws = wb.create_sheet(title=safe_sheet)
|
||||
summary = _build_location_sheet(ws, loc_name, rows, final_title)
|
||||
|
||||
safe_name = "".join(c for c in loc_name if c.isalnum() or c in (' ', '-', '_'))[:31]
|
||||
ws = wb.create_sheet(title=safe_name)
|
||||
summary = _build_location_sheet(ws, loc_name, day_rows, final_title)
|
||||
loc_summaries.append(summary)
|
||||
# Derive a date label for the summary sheet from started_at or first row
|
||||
day_label = session_label or loc_name
|
||||
if started_at_str:
|
||||
try:
|
||||
_dt = datetime.fromisoformat(started_at_str)
|
||||
day_label = _dt.strftime('%-m/%-d/%Y')
|
||||
if session_label:
|
||||
day_label = session_label
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
_build_summary_sheet(wb, date_str, project_name, loc_summaries)
|
||||
_build_summary_sheet(wb, day_label, project_name, [summary])
|
||||
|
||||
xlsx_buf = io.BytesIO()
|
||||
wb.save(xlsx_buf)
|
||||
xlsx_buf.seek(0)
|
||||
|
||||
date_clean = date_str.replace('/', '-').replace(' ', '_')
|
||||
xlsx_name = f"{project_name_clean}_{date_clean}_report.xlsx"
|
||||
# Build a clean filename from label or location+date
|
||||
label_clean = session_label or loc_name
|
||||
label_clean = "".join(c for c in label_clean if c.isalnum() or c in (' ', '-', '_', '/')).strip().replace(' ', '_').replace('/', '-')
|
||||
xlsx_name = f"{project_name_clean}_{label_clean}_report.xlsx"
|
||||
zf.writestr(xlsx_name, xlsx_buf.read())
|
||||
|
||||
zip_buffer.seek(0)
|
||||
|
||||
@@ -74,105 +74,134 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Time Filter Card -->
|
||||
<!-- Sessions Card -->
|
||||
<div class="bg-white dark:bg-slate-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 p-6">
|
||||
<h2 class="text-lg font-semibold text-gray-900 dark:text-white mb-4">Time Filter</h2>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mb-4">Applied to all locations. Leave blank to include all data.</p>
|
||||
|
||||
<!-- Preset Buttons -->
|
||||
<div class="flex flex-wrap gap-2 mb-4">
|
||||
<button type="button" onclick="setTimePreset('night')" data-preset="night"
|
||||
class="preset-btn px-3 py-1.5 text-sm rounded-md bg-gray-200 dark:bg-gray-700 text-gray-700 dark:text-gray-300 hover:bg-gray-300 dark:hover:bg-gray-600 transition-colors">
|
||||
Night 7PM – 7AM
|
||||
</button>
|
||||
<button type="button" onclick="setTimePreset('day')" data-preset="day"
|
||||
class="preset-btn px-3 py-1.5 text-sm rounded-md bg-gray-200 dark:bg-gray-700 text-gray-700 dark:text-gray-300 hover:bg-gray-300 dark:hover:bg-gray-600 transition-colors">
|
||||
Day 7AM – 7PM
|
||||
</button>
|
||||
<button type="button" onclick="setTimePreset('all')" data-preset="all"
|
||||
class="preset-btn px-3 py-1.5 text-sm rounded-md bg-emerald-600 text-white hover:bg-emerald-700 transition-colors">
|
||||
All Day
|
||||
</button>
|
||||
<button type="button" onclick="setTimePreset('custom')" data-preset="custom"
|
||||
class="preset-btn px-3 py-1.5 text-sm rounded-md bg-gray-200 dark:bg-gray-700 text-gray-700 dark:text-gray-300 hover:bg-gray-300 dark:hover:bg-gray-600 transition-colors">
|
||||
Custom
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- Time Inputs -->
|
||||
<div class="grid grid-cols-2 gap-4 mb-4">
|
||||
<div>
|
||||
<label for="start-time" class="block text-xs text-gray-500 dark:text-gray-400 mb-1">Start Time</label>
|
||||
<input type="time" id="start-time" value=""
|
||||
onchange="updatePresetButtons()"
|
||||
class="block w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-emerald-500 focus:border-emerald-500 sm:text-sm">
|
||||
</div>
|
||||
<div>
|
||||
<label for="end-time" class="block text-xs text-gray-500 dark:text-gray-400 mb-1">End Time</label>
|
||||
<input type="time" id="end-time" value=""
|
||||
onchange="updatePresetButtons()"
|
||||
class="block w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-emerald-500 focus:border-emerald-500 sm:text-sm">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Date Range -->
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
|
||||
Date Range <span class="text-gray-400 font-normal">(optional)</span>
|
||||
</label>
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label for="start-date" class="block text-xs text-gray-500 dark:text-gray-400 mb-1">From</label>
|
||||
<input type="date" id="start-date" value=""
|
||||
class="block w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-emerald-500 focus:border-emerald-500 sm:text-sm">
|
||||
</div>
|
||||
<div>
|
||||
<label for="end-date" class="block text-xs text-gray-500 dark:text-gray-400 mb-1">To</label>
|
||||
<input type="date" id="end-date" value=""
|
||||
class="block w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-emerald-500 focus:border-emerald-500 sm:text-sm">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Locations Card -->
|
||||
<div class="bg-white dark:bg-slate-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 p-6">
|
||||
<div class="flex items-center justify-between mb-4">
|
||||
<div>
|
||||
<h2 class="text-lg font-semibold text-gray-900 dark:text-white">Locations to Include</h2>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mt-0.5">
|
||||
<span id="selected-count">{{ locations|length }}</span> of {{ locations|length }} selected
|
||||
</p>
|
||||
</div>
|
||||
<div class="flex items-center justify-between mb-1">
|
||||
<h2 class="text-lg font-semibold text-gray-900 dark:text-white">Monitoring Sessions</h2>
|
||||
<div class="flex gap-3 text-sm">
|
||||
<button type="button" onclick="selectAll()" class="text-emerald-600 dark:text-emerald-400 hover:underline">Select All</button>
|
||||
<button type="button" onclick="deselectAll()" class="text-gray-500 dark:text-gray-400 hover:underline">Deselect All</button>
|
||||
<button type="button" onclick="selectAllSessions()" class="text-emerald-600 dark:text-emerald-400 hover:underline">Select All</button>
|
||||
<button type="button" onclick="deselectAllSessions()" class="text-gray-500 dark:text-gray-400 hover:underline">Deselect All</button>
|
||||
</div>
|
||||
</div>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mb-4">
|
||||
<span id="selected-count">0</span> session(s) selected — each selected session becomes one sheet in the ZIP.
|
||||
Change the period type per session to control how stats are bucketed (Day vs Night).
|
||||
</p>
|
||||
|
||||
{% if locations %}
|
||||
<div class="divide-y divide-gray-100 dark:divide-gray-700">
|
||||
{% for loc in locations %}
|
||||
<label class="flex items-center gap-3 py-3 cursor-pointer hover:bg-gray-50 dark:hover:bg-slate-700/50 px-2 rounded-md transition-colors">
|
||||
<input type="checkbox" name="location" value="{{ loc.name }}" checked
|
||||
onchange="updateSelectedCount()"
|
||||
class="h-4 w-4 text-emerald-600 border-gray-300 dark:border-gray-600 rounded focus:ring-emerald-500">
|
||||
<span class="flex-1 text-sm text-gray-900 dark:text-white font-medium">{{ loc.name }}</span>
|
||||
<span class="text-xs text-gray-400 dark:text-gray-500">{{ loc.file_count }} file{{ 's' if loc.file_count != 1 else '' }}</span>
|
||||
</label>
|
||||
{% set loc_name = loc.name %}
|
||||
{% set sessions = loc.sessions %}
|
||||
<div class="border border-gray-200 dark:border-gray-700 rounded-lg mb-3 overflow-hidden">
|
||||
<!-- Location header / toggle -->
|
||||
<button type="button"
|
||||
onclick="toggleLocation('loc-{{ loop.index }}')"
|
||||
class="w-full flex items-center justify-between px-4 py-3 bg-gray-50 dark:bg-slate-700/50 hover:bg-gray-100 dark:hover:bg-slate-700 transition-colors text-left">
|
||||
<div class="flex items-center gap-3">
|
||||
<svg id="chevron-loc-{{ loop.index }}" class="w-4 h-4 text-gray-400 transition-transform" 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>
|
||||
<span class="font-medium text-gray-900 dark:text-white text-sm">{{ loc_name }}</span>
|
||||
<span class="text-xs text-gray-400 dark:text-gray-500">{{ sessions|length }} session{{ 's' if sessions|length != 1 else '' }}</span>
|
||||
</div>
|
||||
<div class="flex items-center gap-3 text-xs" onclick="event.stopPropagation()">
|
||||
<button type="button" onclick="selectLocation('loc-{{ loop.index }}')"
|
||||
class="text-emerald-600 dark:text-emerald-400 hover:underline">All</button>
|
||||
<button type="button" onclick="deselectLocation('loc-{{ loop.index }}')"
|
||||
class="text-gray-400 hover:underline">None</button>
|
||||
</div>
|
||||
</button>
|
||||
|
||||
<!-- Session rows -->
|
||||
<div id="loc-{{ loop.index }}" class="divide-y divide-gray-100 dark:divide-gray-700/50">
|
||||
{% for s in sessions %}
|
||||
{% set pt_colors = {
|
||||
'weekday_day': 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-300',
|
||||
'weekday_night': 'bg-indigo-100 text-indigo-800 dark:bg-indigo-900/30 dark:text-indigo-300',
|
||||
'weekend_day': 'bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300',
|
||||
'weekend_night': 'bg-purple-100 text-purple-800 dark:bg-purple-900/30 dark:text-purple-300',
|
||||
} %}
|
||||
{% set pt_labels = {
|
||||
'weekday_day': 'Weekday Day',
|
||||
'weekday_night': 'Weekday Night',
|
||||
'weekend_day': 'Weekend Day',
|
||||
'weekend_night': 'Weekend Night',
|
||||
} %}
|
||||
<div class="flex items-center gap-3 px-4 py-3 hover:bg-gray-50 dark:hover:bg-slate-700/30 transition-colors">
|
||||
<!-- Checkbox -->
|
||||
<input type="checkbox"
|
||||
class="session-cb loc-{{ loop.index }}-cb h-4 w-4 text-emerald-600 border-gray-300 dark:border-gray-600 rounded focus:ring-emerald-500 shrink-0"
|
||||
value="{{ s.session_id }}"
|
||||
checked
|
||||
onchange="updateSelectionStats()">
|
||||
|
||||
<!-- Date/day info -->
|
||||
<div class="min-w-0 flex-1">
|
||||
<div class="flex flex-wrap items-center gap-2">
|
||||
<span class="text-sm font-medium text-gray-900 dark:text-white">
|
||||
{{ s.day_of_week }} {{ s.date_display }}
|
||||
</span>
|
||||
{% if s.session_label %}
|
||||
<span class="text-xs text-gray-400 dark:text-gray-500 truncate">{{ s.session_label }}</span>
|
||||
{% endif %}
|
||||
{% if s.status == 'recording' %}
|
||||
<span class="px-1.5 py-0.5 text-xs bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-300 rounded-full flex items-center gap-1">
|
||||
<span class="w-1.5 h-1.5 bg-red-500 rounded-full animate-pulse"></span>Recording
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="flex items-center gap-3 mt-0.5 text-xs text-gray-400 dark:text-gray-500">
|
||||
{% if s.started_at %}
|
||||
<span>{{ s.started_at }}</span>
|
||||
{% endif %}
|
||||
{% if s.duration_h is not none %}
|
||||
<span>{{ s.duration_h }}h {{ s.duration_m }}m</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Period type dropdown -->
|
||||
<div class="relative shrink-0" id="wiz-period-wrap-{{ s.session_id }}">
|
||||
<button type="button"
|
||||
onclick="toggleWizPeriodMenu('{{ s.session_id }}')"
|
||||
id="wiz-period-badge-{{ s.session_id }}"
|
||||
class="px-2 py-0.5 text-xs font-medium rounded-full flex items-center gap-1 transition-colors {{ pt_colors.get(s.period_type, 'bg-gray-100 text-gray-500 dark:bg-gray-700 dark:text-gray-400') }}"
|
||||
title="Click to change period type">
|
||||
<span id="wiz-period-label-{{ s.session_id }}">{{ pt_labels.get(s.period_type, 'Set period') }}</span>
|
||||
<svg class="w-3 h-3 opacity-60 shrink-0" 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>
|
||||
</button>
|
||||
<div id="wiz-period-menu-{{ s.session_id }}"
|
||||
class="hidden absolute right-0 top-full mt-1 z-20 bg-white dark:bg-slate-700 border border-gray-200 dark:border-gray-600 rounded-lg shadow-lg min-w-[160px] py-1">
|
||||
{% for pt, pt_label in [('weekday_day','Weekday Day'),('weekday_night','Weekday Night'),('weekend_day','Weekend Day'),('weekend_night','Weekend Night')] %}
|
||||
<button type="button"
|
||||
onclick="setWizPeriodType('{{ s.session_id }}', '{{ pt }}')"
|
||||
class="w-full text-left px-3 py-1.5 text-xs hover:bg-gray-100 dark:hover:bg-slate-600 text-gray-700 dark:text-gray-300 {% if s.period_type == pt %}font-bold{% endif %}">
|
||||
{{ pt_label }}
|
||||
</button>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<div class="text-center py-8 text-gray-500 dark:text-gray-400">
|
||||
<p>No Leq measurement files found in this project.</p>
|
||||
<p class="text-sm mt-1">Upload RND files with '_Leq_' in the filename to generate reports.</p>
|
||||
<div class="text-center py-10 text-gray-500 dark:text-gray-400">
|
||||
<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 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>
|
||||
<p>No monitoring sessions found.</p>
|
||||
<p class="text-sm mt-1">Upload data files to create sessions first.</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<!-- Footer Buttons -->
|
||||
<div class="flex flex-col sm:flex-row items-center justify-between gap-3 pb-6">
|
||||
<a href="/api/projects/{{ project_id }}"
|
||||
<a href="/projects/{{ project_id }}"
|
||||
class="w-full sm:w-auto px-6 py-2.5 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-600 transition-colors text-center text-sm font-medium">
|
||||
Cancel
|
||||
</a>
|
||||
@@ -191,180 +220,173 @@
|
||||
</div>
|
||||
|
||||
<script>
|
||||
let reportTemplates = [];
|
||||
const PROJECT_ID = '{{ project_id }}';
|
||||
|
||||
// ---- Template management (same as rnd_viewer.html) ----
|
||||
const PERIOD_COLORS = {
|
||||
weekday_day: 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-300',
|
||||
weekday_night: 'bg-indigo-100 text-indigo-800 dark:bg-indigo-900/30 dark:text-indigo-300',
|
||||
weekend_day: 'bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300',
|
||||
weekend_night: 'bg-purple-100 text-purple-800 dark:bg-purple-900/30 dark:text-purple-300',
|
||||
};
|
||||
const PERIOD_LABELS = {
|
||||
weekday_day: 'Weekday Day',
|
||||
weekday_night: 'Weekday Night',
|
||||
weekend_day: 'Weekend Day',
|
||||
weekend_night: 'Weekend Night',
|
||||
};
|
||||
const ALL_PERIOD_BADGE_CLASSES = [
|
||||
'bg-gray-100','text-gray-500','dark:bg-gray-700','dark:text-gray-400',
|
||||
...new Set(Object.values(PERIOD_COLORS).flatMap(s => s.split(' ')))
|
||||
];
|
||||
|
||||
// ── Location accordion ────────────────────────────────────────────
|
||||
|
||||
function toggleLocation(locId) {
|
||||
const body = document.getElementById(locId);
|
||||
const chevron = document.getElementById('chevron-' + locId);
|
||||
body.classList.toggle('hidden');
|
||||
chevron.style.transform = body.classList.contains('hidden') ? 'rotate(-90deg)' : '';
|
||||
}
|
||||
|
||||
function selectLocation(locId) {
|
||||
document.querySelectorAll('.' + locId + '-cb').forEach(cb => cb.checked = true);
|
||||
updateSelectionStats();
|
||||
}
|
||||
|
||||
function deselectLocation(locId) {
|
||||
document.querySelectorAll('.' + locId + '-cb').forEach(cb => cb.checked = false);
|
||||
updateSelectionStats();
|
||||
}
|
||||
|
||||
function selectAllSessions() {
|
||||
document.querySelectorAll('.session-cb').forEach(cb => cb.checked = true);
|
||||
updateSelectionStats();
|
||||
}
|
||||
|
||||
function deselectAllSessions() {
|
||||
document.querySelectorAll('.session-cb').forEach(cb => cb.checked = false);
|
||||
updateSelectionStats();
|
||||
}
|
||||
|
||||
function updateSelectionStats() {
|
||||
const count = document.querySelectorAll('.session-cb:checked').length;
|
||||
document.getElementById('selected-count').textContent = count;
|
||||
document.getElementById('preview-btn').disabled = count === 0;
|
||||
}
|
||||
|
||||
// ── Period type dropdown (wizard) ─────────────────────────────────
|
||||
|
||||
function toggleWizPeriodMenu(sessionId) {
|
||||
const menu = document.getElementById('wiz-period-menu-' + sessionId);
|
||||
document.querySelectorAll('[id^="wiz-period-menu-"]').forEach(m => {
|
||||
if (m.id !== 'wiz-period-menu-' + sessionId) m.classList.add('hidden');
|
||||
});
|
||||
menu.classList.toggle('hidden');
|
||||
}
|
||||
|
||||
document.addEventListener('click', function(e) {
|
||||
if (!e.target.closest('[id^="wiz-period-wrap-"]')) {
|
||||
document.querySelectorAll('[id^="wiz-period-menu-"]').forEach(m => m.classList.add('hidden'));
|
||||
}
|
||||
});
|
||||
|
||||
async function setWizPeriodType(sessionId, periodType) {
|
||||
document.getElementById('wiz-period-menu-' + sessionId).classList.add('hidden');
|
||||
const badge = document.getElementById('wiz-period-badge-' + sessionId);
|
||||
badge.disabled = true;
|
||||
try {
|
||||
const resp = await fetch(`/api/projects/${PROJECT_ID}/sessions/${sessionId}`, {
|
||||
method: 'PATCH',
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({period_type: periodType}),
|
||||
});
|
||||
if (!resp.ok) throw new Error(await resp.text());
|
||||
ALL_PERIOD_BADGE_CLASSES.forEach(c => badge.classList.remove(c));
|
||||
const colorStr = PERIOD_COLORS[periodType] || 'bg-gray-100 text-gray-500 dark:bg-gray-700 dark:text-gray-400';
|
||||
badge.classList.add(...colorStr.split(' ').filter(Boolean));
|
||||
document.getElementById('wiz-period-label-' + sessionId).textContent = PERIOD_LABELS[periodType] || periodType;
|
||||
} catch(err) {
|
||||
alert('Failed to update period type: ' + err.message);
|
||||
} finally {
|
||||
badge.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
// ── Template management ───────────────────────────────────────────
|
||||
|
||||
let reportTemplates = [];
|
||||
|
||||
async function loadTemplates() {
|
||||
try {
|
||||
const response = await fetch('/api/report-templates?project_id={{ project_id }}');
|
||||
if (response.ok) {
|
||||
reportTemplates = await response.json();
|
||||
const resp = await fetch('/api/report-templates?project_id=' + PROJECT_ID);
|
||||
if (resp.ok) {
|
||||
reportTemplates = await resp.json();
|
||||
populateTemplateDropdown();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error loading templates:', error);
|
||||
}
|
||||
} catch(e) { console.error('Error loading templates:', e); }
|
||||
}
|
||||
|
||||
function populateTemplateDropdown() {
|
||||
const select = document.getElementById('template-select');
|
||||
if (!select) return;
|
||||
select.innerHTML = '<option value="">-- Select a template --</option>';
|
||||
reportTemplates.forEach(template => {
|
||||
const option = document.createElement('option');
|
||||
option.value = template.id;
|
||||
option.textContent = template.name;
|
||||
option.dataset.config = JSON.stringify(template);
|
||||
select.appendChild(option);
|
||||
reportTemplates.forEach(t => {
|
||||
const opt = document.createElement('option');
|
||||
opt.value = t.id;
|
||||
opt.textContent = t.name;
|
||||
opt.dataset.config = JSON.stringify(t);
|
||||
select.appendChild(opt);
|
||||
});
|
||||
}
|
||||
|
||||
function applyTemplate() {
|
||||
const select = document.getElementById('template-select');
|
||||
const selectedOption = select.options[select.selectedIndex];
|
||||
if (!selectedOption.value) return;
|
||||
const template = JSON.parse(selectedOption.dataset.config);
|
||||
if (template.report_title) document.getElementById('report-title').value = template.report_title;
|
||||
if (template.start_time) document.getElementById('start-time').value = template.start_time;
|
||||
if (template.end_time) document.getElementById('end-time').value = template.end_time;
|
||||
if (template.start_date) document.getElementById('start-date').value = template.start_date;
|
||||
if (template.end_date) document.getElementById('end-date').value = template.end_date;
|
||||
updatePresetButtons();
|
||||
const opt = select.options[select.selectedIndex];
|
||||
if (!opt.value) return;
|
||||
const t = JSON.parse(opt.dataset.config);
|
||||
if (t.report_title) document.getElementById('report-title').value = t.report_title;
|
||||
}
|
||||
|
||||
async function saveAsTemplate() {
|
||||
const name = prompt('Enter a name for this template:');
|
||||
if (!name) return;
|
||||
const templateData = {
|
||||
name: name,
|
||||
project_id: '{{ project_id }}',
|
||||
const data = {
|
||||
name,
|
||||
project_id: PROJECT_ID,
|
||||
report_title: document.getElementById('report-title').value || 'Background Noise Study',
|
||||
start_time: document.getElementById('start-time').value || null,
|
||||
end_time: document.getElementById('end-time').value || null,
|
||||
start_date: document.getElementById('start-date').value || null,
|
||||
end_date: document.getElementById('end-date').value || null
|
||||
};
|
||||
try {
|
||||
const response = await fetch('/api/report-templates', {
|
||||
const resp = await fetch('/api/report-templates', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(templateData)
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify(data),
|
||||
});
|
||||
if (response.ok) {
|
||||
alert('Template saved successfully!');
|
||||
loadTemplates();
|
||||
} else {
|
||||
alert('Failed to save template');
|
||||
}
|
||||
} catch (error) {
|
||||
alert('Error saving template: ' + error.message);
|
||||
}
|
||||
if (resp.ok) { alert('Template saved!'); loadTemplates(); }
|
||||
else alert('Failed to save template');
|
||||
} catch(e) { alert('Error: ' + e.message); }
|
||||
}
|
||||
|
||||
// ---- Time preset buttons ----
|
||||
|
||||
function setTimePreset(preset) {
|
||||
const startTimeInput = document.getElementById('start-time');
|
||||
const endTimeInput = document.getElementById('end-time');
|
||||
|
||||
document.querySelectorAll('.preset-btn').forEach(btn => {
|
||||
btn.classList.remove('bg-emerald-600', 'text-white');
|
||||
btn.classList.add('bg-gray-200', 'dark:bg-gray-700', 'text-gray-700', 'dark:text-gray-300');
|
||||
});
|
||||
|
||||
switch (preset) {
|
||||
case 'night':
|
||||
startTimeInput.value = '19:00';
|
||||
endTimeInput.value = '07:00';
|
||||
break;
|
||||
case 'day':
|
||||
startTimeInput.value = '07:00';
|
||||
endTimeInput.value = '19:00';
|
||||
break;
|
||||
case 'all':
|
||||
startTimeInput.value = '';
|
||||
endTimeInput.value = '';
|
||||
break;
|
||||
case 'custom':
|
||||
break;
|
||||
}
|
||||
|
||||
const activeBtn = document.querySelector(`[data-preset="${preset}"]`);
|
||||
if (activeBtn) {
|
||||
activeBtn.classList.remove('bg-gray-200', 'dark:bg-gray-700', 'text-gray-700', 'dark:text-gray-300');
|
||||
activeBtn.classList.add('bg-emerald-600', 'text-white');
|
||||
}
|
||||
}
|
||||
|
||||
function updatePresetButtons() {
|
||||
const startTime = document.getElementById('start-time').value;
|
||||
const endTime = document.getElementById('end-time').value;
|
||||
|
||||
document.querySelectorAll('.preset-btn').forEach(btn => {
|
||||
btn.classList.remove('bg-emerald-600', 'text-white');
|
||||
btn.classList.add('bg-gray-200', 'dark:bg-gray-700', 'text-gray-700', 'dark:text-gray-300');
|
||||
});
|
||||
|
||||
let preset = 'custom';
|
||||
if (startTime === '19:00' && endTime === '07:00') preset = 'night';
|
||||
else if (startTime === '07:00' && endTime === '19:00') preset = 'day';
|
||||
else if (!startTime && !endTime) preset = 'all';
|
||||
|
||||
const activeBtn = document.querySelector(`[data-preset="${preset}"]`);
|
||||
if (activeBtn) {
|
||||
activeBtn.classList.remove('bg-gray-200', 'dark:bg-gray-700', 'text-gray-700', 'dark:text-gray-300');
|
||||
activeBtn.classList.add('bg-emerald-600', 'text-white');
|
||||
}
|
||||
}
|
||||
|
||||
// ---- Location checkboxes ----
|
||||
|
||||
function updateSelectedCount() {
|
||||
const checked = document.querySelectorAll('input[name="location"]:checked').length;
|
||||
document.getElementById('selected-count').textContent = checked;
|
||||
document.getElementById('preview-btn').disabled = checked === 0;
|
||||
}
|
||||
|
||||
function selectAll() {
|
||||
document.querySelectorAll('input[name="location"]').forEach(cb => cb.checked = true);
|
||||
updateSelectedCount();
|
||||
}
|
||||
|
||||
function deselectAll() {
|
||||
document.querySelectorAll('input[name="location"]').forEach(cb => cb.checked = false);
|
||||
updateSelectedCount();
|
||||
}
|
||||
|
||||
function getCheckedLocations() {
|
||||
return Array.from(document.querySelectorAll('input[name="location"]:checked')).map(cb => cb.value);
|
||||
}
|
||||
|
||||
// ---- Navigate to preview ----
|
||||
// ── Navigate to preview ───────────────────────────────────────────
|
||||
|
||||
function gotoPreview() {
|
||||
const checked = getCheckedLocations();
|
||||
const checked = Array.from(document.querySelectorAll('.session-cb:checked')).map(cb => cb.value);
|
||||
if (checked.length === 0) {
|
||||
alert('Please select at least one location.');
|
||||
alert('Please select at least one session.');
|
||||
return;
|
||||
}
|
||||
|
||||
const params = new URLSearchParams({
|
||||
report_title: document.getElementById('report-title').value || 'Background Noise Study',
|
||||
project_name: document.getElementById('report-project').value || '',
|
||||
client_name: document.getElementById('report-client').value || '',
|
||||
start_time: document.getElementById('start-time').value || '',
|
||||
end_time: document.getElementById('end-time').value || '',
|
||||
start_date: document.getElementById('start-date').value || '',
|
||||
end_date: document.getElementById('end-date').value || '',
|
||||
enabled_locations: checked.join(','),
|
||||
selected_sessions: checked.join(','),
|
||||
});
|
||||
|
||||
window.location.href = `/api/projects/{{ project_id }}/combined-report-preview?${params.toString()}`;
|
||||
window.location.href = `/api/projects/${PROJECT_ID}/combined-report-preview?${params.toString()}`;
|
||||
}
|
||||
|
||||
// ---- Init ----
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
// ── Init ─────────────────────────────────────────────────────────
|
||||
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
updateSelectionStats();
|
||||
loadTemplates();
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -1,79 +1,149 @@
|
||||
<!-- Monitoring Sessions List -->
|
||||
{% if sessions %}
|
||||
<div class="space-y-4">
|
||||
<div class="space-y-3">
|
||||
{% for item in sessions %}
|
||||
<div class="border border-gray-200 dark:border-gray-700 rounded-lg p-4 hover:bg-gray-50 dark:hover:bg-gray-800/50 transition-colors">
|
||||
<div class="flex items-start justify-between gap-3">
|
||||
{% set s = item.session %}
|
||||
{% set loc = item.location %}
|
||||
{% set unit = item.unit %}
|
||||
|
||||
{# Period display maps #}
|
||||
{% set period_labels = {
|
||||
'weekday_day': 'Weekday Day',
|
||||
'weekday_night': 'Weekday Night',
|
||||
'weekend_day': 'Weekend Day',
|
||||
'weekend_night': 'Weekend Night',
|
||||
} %}
|
||||
{% set period_colors = {
|
||||
'weekday_day': 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-300',
|
||||
'weekday_night': 'bg-indigo-100 text-indigo-800 dark:bg-indigo-900/30 dark:text-indigo-300',
|
||||
'weekend_day': 'bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300',
|
||||
'weekend_night': 'bg-purple-100 text-purple-800 dark:bg-purple-900/30 dark:text-purple-300',
|
||||
} %}
|
||||
|
||||
<div class="border border-gray-200 dark:border-gray-700 rounded-lg bg-white dark:bg-slate-800 hover:border-gray-300 dark:hover:border-gray-600 transition-colors"
|
||||
id="session-card-{{ s.id }}">
|
||||
<div class="flex items-start justify-between gap-3 p-4 pb-3">
|
||||
<div class="min-w-0 flex-1">
|
||||
<div class="flex items-center gap-3 mb-2">
|
||||
<h4 class="font-semibold text-gray-900 dark:text-white">
|
||||
Session {{ item.session.id[:8] }}...
|
||||
</h4>
|
||||
{% if item.session.status == 'recording' %}
|
||||
<span class="px-2 py-1 text-xs font-medium bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-300 rounded-full flex items-center">
|
||||
<span class="w-2 h-2 bg-red-500 rounded-full mr-1.5 animate-pulse"></span>
|
||||
Recording
|
||||
|
||||
<!-- Label + badges -->
|
||||
<div class="flex flex-wrap items-center gap-2 mb-2">
|
||||
<span id="label-display-{{ s.id }}"
|
||||
class="font-semibold text-gray-900 dark:text-white text-sm cursor-pointer hover:text-seismo-orange"
|
||||
title="Click to edit label"
|
||||
onclick="startEditLabel('{{ s.id }}')">
|
||||
{{ s.session_label or ('Session ' + s.id[:8] + '…') }}
|
||||
</span>
|
||||
{% elif item.session.status == 'completed' %}
|
||||
<span class="px-2 py-1 text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-300 rounded-full">
|
||||
Completed
|
||||
</span>
|
||||
{% elif item.session.status == 'paused' %}
|
||||
<span class="px-2 py-1 text-xs font-medium bg-yellow-100 text-yellow-800 dark:bg-yellow-900/30 dark:text-yellow-300 rounded-full">
|
||||
Paused
|
||||
</span>
|
||||
{% elif item.session.status == 'failed' %}
|
||||
<span class="px-2 py-1 text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300 rounded-full">
|
||||
Failed
|
||||
<input id="label-input-{{ s.id }}"
|
||||
class="hidden text-sm font-semibold bg-transparent border-b border-seismo-orange text-gray-900 dark:text-white focus:outline-none min-w-[180px]"
|
||||
value="{{ s.session_label or '' }}"
|
||||
onblur="saveLabel('{{ s.id }}')"
|
||||
onkeydown="if(event.key==='Enter'){saveLabel('{{ s.id }}');}if(event.key==='Escape'){cancelEditLabel('{{ s.id }}');}">
|
||||
|
||||
{% if s.status == 'recording' %}
|
||||
<span class="px-2 py-0.5 text-xs font-medium bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-300 rounded-full flex items-center gap-1">
|
||||
<span class="w-1.5 h-1.5 bg-red-500 rounded-full animate-pulse"></span>Recording
|
||||
</span>
|
||||
{% elif s.status == 'completed' %}
|
||||
<span class="px-2 py-0.5 text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-300 rounded-full">Completed</span>
|
||||
{% elif s.status == 'failed' %}
|
||||
<span class="px-2 py-0.5 text-xs font-medium bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-400 rounded-full">Failed</span>
|
||||
{% endif %}
|
||||
|
||||
<!-- Period type badge (click to change) -->
|
||||
<div class="relative" id="period-wrap-{{ s.id }}">
|
||||
<button onclick="togglePeriodMenu('{{ s.id }}')"
|
||||
id="period-badge-{{ s.id }}"
|
||||
class="px-2 py-0.5 text-xs font-medium rounded-full flex items-center gap-1 transition-colors {{ period_colors.get(s.period_type, 'bg-gray-100 text-gray-500 dark:bg-gray-700 dark:text-gray-400') }}"
|
||||
title="Click to change period type">
|
||||
<span id="period-label-{{ s.id }}">{{ period_labels.get(s.period_type, 'Set period') }}</span>
|
||||
<svg class="w-3 h-3 opacity-60 shrink-0" 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>
|
||||
</button>
|
||||
<div id="period-menu-{{ s.id }}"
|
||||
class="hidden absolute left-0 top-full mt-1 z-20 bg-white dark:bg-slate-700 border border-gray-200 dark:border-gray-600 rounded-lg shadow-lg min-w-[160px] py-1">
|
||||
{% for pt, pt_label in [('weekday_day','Weekday Day'),('weekday_night','Weekday Night'),('weekend_day','Weekend Day'),('weekend_night','Weekend Night')] %}
|
||||
<button onclick="setPeriodType('{{ s.id }}', '{{ pt }}')"
|
||||
class="w-full text-left px-3 py-1.5 text-xs hover:bg-gray-100 dark:hover:bg-slate-600 text-gray-700 dark:text-gray-300 {% if s.period_type == pt %}font-bold{% endif %}">
|
||||
{{ pt_label }}
|
||||
</button>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-2 gap-3 text-sm text-gray-600 dark:text-gray-400">
|
||||
{% if item.unit %}
|
||||
<div>
|
||||
<span class="text-xs text-gray-500 dark:text-gray-500">Unit:</span>
|
||||
<a href="/slm/{{ item.unit.id }}?from_project={{ project_id }}" class="text-seismo-orange hover:text-seismo-navy font-medium ml-1">
|
||||
{{ item.unit.id }}
|
||||
</a>
|
||||
<!-- Info grid -->
|
||||
<div class="grid grid-cols-2 sm:grid-cols-4 gap-x-4 gap-y-1 text-xs text-gray-500 dark:text-gray-400">
|
||||
{% if loc %}
|
||||
<div class="flex items-center gap-1">
|
||||
<svg class="w-3.5 h-3.5 shrink-0 text-gray-400" 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>
|
||||
<span class="font-medium text-gray-700 dark:text-gray-300">{{ loc.name }}</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div>
|
||||
<span class="text-xs text-gray-500">Started:</span>
|
||||
<span class="ml-1">{{ item.session.started_at|local_datetime if item.session.started_at else 'N/A' }}</span>
|
||||
</div>
|
||||
|
||||
{% if item.session.stopped_at %}
|
||||
<div>
|
||||
<span class="text-xs text-gray-500">Ended:</span>
|
||||
<span class="ml-1">{{ item.session.stopped_at|local_datetime }}</span>
|
||||
{% if s.started_at %}
|
||||
<div class="flex items-center gap-1">
|
||||
<svg class="w-3.5 h-3.5 shrink-0 text-gray-400" 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>
|
||||
<span>{{ s.started_at|local_datetime }}</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if item.session.duration_seconds %}
|
||||
<div>
|
||||
<span class="text-xs text-gray-500">Duration:</span>
|
||||
<span class="ml-1">{{ (item.session.duration_seconds // 3600) }}h {{ ((item.session.duration_seconds % 3600) // 60) }}m</span>
|
||||
{% if s.stopped_at %}
|
||||
<div class="flex items-center gap-1">
|
||||
<svg class="w-3.5 h-3.5 shrink-0 text-gray-400" 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>
|
||||
<span>Ended {{ s.stopped_at|local_datetime }}</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if s.duration_seconds %}
|
||||
<div class="flex items-center gap-1">
|
||||
<svg class="w-3.5 h-3.5 shrink-0 text-gray-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>
|
||||
<span>{{ (s.duration_seconds // 3600) }}h {{ ((s.duration_seconds % 3600) // 60) }}m</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if unit %}
|
||||
<div class="flex items-center gap-1">
|
||||
<svg class="w-3.5 h-3.5 shrink-0 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 3H5a2 2 0 00-2 2v4m6-6h10a2 2 0 012 2v4M9 3v18m0 0h10a2 2 0 002-2v-4M9 21H5a2 2 0 01-2-2v-4m0 0h18"></path>
|
||||
</svg>
|
||||
<a href="/slm/{{ unit.id }}?from_project={{ project_id }}"
|
||||
class="text-seismo-orange hover:underline font-medium">{{ unit.id }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if s.device_model %}
|
||||
<div class="flex items-center gap-1">
|
||||
<svg class="w-3.5 h-3.5 shrink-0 text-gray-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>
|
||||
<span>{{ s.device_model }}</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% if item.session.notes %}
|
||||
<p class="text-xs text-gray-500 dark:text-gray-400 mt-2">
|
||||
{{ item.session.notes }}
|
||||
</p>
|
||||
{% if s.notes %}
|
||||
<p class="text-xs text-gray-400 dark:text-gray-500 mt-2 italic">{{ s.notes }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="flex items-center gap-2">
|
||||
{% if item.session.status == 'recording' %}
|
||||
<button onclick="stopRecording('{{ item.session.id }}')"
|
||||
<div class="flex items-center gap-2 shrink-0">
|
||||
{% if s.status == 'recording' %}
|
||||
<button onclick="stopRecording('{{ s.id }}')"
|
||||
class="px-3 py-1 text-xs bg-red-600 text-white rounded-lg hover:bg-red-700 transition-colors">
|
||||
Stop
|
||||
</button>
|
||||
{% endif %}
|
||||
<button onclick="viewSession('{{ item.session.id }}')"
|
||||
<button onclick="viewSession('{{ s.id }}')"
|
||||
class="px-3 py-1 text-xs bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors">
|
||||
Details
|
||||
</button>
|
||||
@@ -84,24 +154,107 @@
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="text-center py-12">
|
||||
<svg class="w-16 h-16 mx-auto mb-4 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<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 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>
|
||||
<p class="text-gray-500 dark:text-gray-400 mb-2">No monitoring sessions yet</p>
|
||||
<p class="text-sm text-gray-400 dark:text-gray-500">Schedule a session to get started</p>
|
||||
<p class="text-gray-500 dark:text-gray-400 mb-1">No monitoring sessions yet</p>
|
||||
<p class="text-sm text-gray-400 dark:text-gray-500">Upload data to create sessions</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<script>
|
||||
const PERIOD_COLORS = {
|
||||
weekday_day: 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-300',
|
||||
weekday_night: 'bg-indigo-100 text-indigo-800 dark:bg-indigo-900/30 dark:text-indigo-300',
|
||||
weekend_day: 'bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300',
|
||||
weekend_night: 'bg-purple-100 text-purple-800 dark:bg-purple-900/30 dark:text-purple-300',
|
||||
};
|
||||
const PERIOD_LABELS = {
|
||||
weekday_day: 'Weekday Day',
|
||||
weekday_night: 'Weekday Night',
|
||||
weekend_day: 'Weekend Day',
|
||||
weekend_night: 'Weekend Night',
|
||||
};
|
||||
const FALLBACK_COLORS = ['bg-gray-100','text-gray-500','dark:bg-gray-700','dark:text-gray-400'];
|
||||
const ALL_BADGE_COLORS = [...new Set([
|
||||
...FALLBACK_COLORS,
|
||||
...Object.values(PERIOD_COLORS).flatMap(s => s.split(' '))
|
||||
])];
|
||||
|
||||
function togglePeriodMenu(sessionId) {
|
||||
const menu = document.getElementById('period-menu-' + sessionId);
|
||||
document.querySelectorAll('[id^="period-menu-"]').forEach(m => {
|
||||
if (m.id !== 'period-menu-' + sessionId) m.classList.add('hidden');
|
||||
});
|
||||
menu.classList.toggle('hidden');
|
||||
}
|
||||
|
||||
document.addEventListener('click', function(e) {
|
||||
if (!e.target.closest('[id^="period-wrap-"]')) {
|
||||
document.querySelectorAll('[id^="period-menu-"]').forEach(m => m.classList.add('hidden'));
|
||||
}
|
||||
});
|
||||
|
||||
async function setPeriodType(sessionId, periodType) {
|
||||
document.getElementById('period-menu-' + sessionId).classList.add('hidden');
|
||||
const badge = document.getElementById('period-badge-' + sessionId);
|
||||
badge.disabled = true;
|
||||
try {
|
||||
const resp = await fetch(`/api/projects/{{ project_id }}/sessions/${sessionId}`, {
|
||||
method: 'PATCH',
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({period_type: periodType}),
|
||||
});
|
||||
if (!resp.ok) throw new Error(await resp.text());
|
||||
ALL_BADGE_COLORS.forEach(c => badge.classList.remove(c));
|
||||
badge.classList.add(...(PERIOD_COLORS[periodType] || FALLBACK_COLORS.join(' ')).split(' ').filter(Boolean));
|
||||
document.getElementById('period-label-' + sessionId).textContent = PERIOD_LABELS[periodType] || periodType;
|
||||
} catch(err) {
|
||||
alert('Failed to update period type: ' + err.message);
|
||||
} finally {
|
||||
badge.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
function startEditLabel(sessionId) {
|
||||
document.getElementById('label-display-' + sessionId).classList.add('hidden');
|
||||
const input = document.getElementById('label-input-' + sessionId);
|
||||
input.classList.remove('hidden');
|
||||
input.focus();
|
||||
input.select();
|
||||
}
|
||||
|
||||
function cancelEditLabel(sessionId) {
|
||||
document.getElementById('label-input-' + sessionId).classList.add('hidden');
|
||||
document.getElementById('label-display-' + sessionId).classList.remove('hidden');
|
||||
}
|
||||
|
||||
async function saveLabel(sessionId) {
|
||||
const display = document.getElementById('label-display-' + sessionId);
|
||||
const input = document.getElementById('label-input-' + sessionId);
|
||||
const newLabel = input.value.trim();
|
||||
try {
|
||||
const resp = await fetch(`/api/projects/{{ project_id }}/sessions/${sessionId}`, {
|
||||
method: 'PATCH',
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({session_label: newLabel}),
|
||||
});
|
||||
if (!resp.ok) throw new Error(await resp.text());
|
||||
display.textContent = newLabel || ('Session ' + sessionId.slice(0, 8) + '…');
|
||||
} catch(err) {
|
||||
alert('Failed to save label: ' + err.message);
|
||||
} finally {
|
||||
input.classList.add('hidden');
|
||||
display.classList.remove('hidden');
|
||||
}
|
||||
}
|
||||
|
||||
function viewSession(sessionId) {
|
||||
// TODO: Implement session detail modal or page
|
||||
alert('Session details coming soon: ' + sessionId);
|
||||
}
|
||||
|
||||
function stopRecording(sessionId) {
|
||||
if (!confirm('Stop this monitoring session?')) return;
|
||||
|
||||
// TODO: Implement stop recording API call
|
||||
alert('Stop recording API coming soon for session: ' + sessionId);
|
||||
}
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user