Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
36def1e201 | ||
|
|
a6c24244bd | ||
|
|
502dcc2f65 | ||
|
|
d4e83364e2 | ||
|
|
fa4b3d8df2 | ||
|
|
a67ddd582c | ||
|
|
7ee7b00b37 | ||
|
|
ebaefeeedf | ||
|
|
2e8b75c384 | ||
|
|
a56da30330 | ||
|
|
9b7c76c801 | ||
|
|
bf4a669446 | ||
|
|
e92a37f02a |
+44
-34
@@ -1,6 +1,5 @@
|
||||
import json
|
||||
import re
|
||||
import datetime
|
||||
from paho.mqtt import client as mqtt_client
|
||||
from core.config import config, logger
|
||||
from core.database import save_to_sqlite
|
||||
@@ -19,7 +18,7 @@ def on_connect(client, userdata, flags, reason_code, properties=None):
|
||||
default_topics = [
|
||||
"servizi/+/stat", "dmr-gateway/+/json", "devices/+/services",
|
||||
"nxdn-gateway/+/json", "ysf-gateway/+/json", "p25-gateway/+/json",
|
||||
"dstar-gateway/+/json", "mmdvm/+/json", "data/#", "aprs-gateway/aprs"
|
||||
"dstar-gateway/+/json", "mmdvm/+/json", "data/#"
|
||||
]
|
||||
|
||||
topics_list = config.get('mqtt', {}).get('topics', default_topics)
|
||||
@@ -43,35 +42,6 @@ def on_message(client, userdata, msg):
|
||||
try:
|
||||
topic = msg.topic
|
||||
payload = msg.payload.decode('utf-8', errors='replace').strip()
|
||||
|
||||
# NUOVO BLOCCO APRS
|
||||
if topic == "aprs-gateway/aprs":
|
||||
try:
|
||||
raw_aprs = payload
|
||||
# Formato atteso: SOURCE>DEST,PATH:PAYLOAD
|
||||
if ">" in raw_aprs and ":" in raw_aprs:
|
||||
header, aprs_payload = raw_aprs.split(":", 1)
|
||||
source, rest = header.split(">", 1)
|
||||
|
||||
if "," in rest:
|
||||
dest, path = rest.split(",", 1)
|
||||
else:
|
||||
dest = rest
|
||||
path = ""
|
||||
|
||||
aprs_data = {
|
||||
"time": datetime.datetime.now().strftime("%H:%M:%S"),
|
||||
"source": source.strip(),
|
||||
"dest": dest.strip(),
|
||||
"path": path.strip(),
|
||||
"payload": aprs_payload.strip()
|
||||
}
|
||||
|
||||
state.socketio.emit('aprs_msg', aprs_data)
|
||||
except Exception as e:
|
||||
logger.error(f"Errore decodifica APRS: {e}")
|
||||
return # Esci per non processare il resto della logica su questo topic
|
||||
|
||||
parts = topic.split('/')
|
||||
if len(parts) < 2:
|
||||
return
|
||||
@@ -334,12 +304,42 @@ def on_message(client, userdata, msg):
|
||||
if m and "running" not in m.lower():
|
||||
save_to_sqlite(cid, {'src_id': f"🌐 {m}", 'dst_id': 'NET'}, protocol=proto)
|
||||
|
||||
# --- LETTURA STATO MODI DA TOPIC data/+/MMDVM ---
|
||||
|
||||
|
||||
# --- 7.5 EVENTI APRS ---
|
||||
elif p0 == 'aprsgateway' and len(parts) >= 2 and parts[1].lower() == 'aprs':
|
||||
try:
|
||||
if not payload:
|
||||
return
|
||||
|
||||
# Payload RAW APRS: CALLSIGN>DEST,PATH:PAYLOAD
|
||||
data = {"source": "---", "dest": "---", "path": "", "payload": payload, "time": ""}
|
||||
|
||||
if ">" in payload and ":" in payload:
|
||||
src_part, rest = payload.split(">", 1)
|
||||
header_part, pld_part = rest.split(":", 1)
|
||||
|
||||
header_tokens = header_part.split(",")
|
||||
dest_part = header_tokens[0]
|
||||
path_str = ",".join(header_tokens[1:]) if len(header_tokens) > 1 else ""
|
||||
|
||||
data["source"] = src_part.strip()
|
||||
data["dest"] = dest_part.strip()
|
||||
data["path"] = path_str.strip()
|
||||
data["payload"] = pld_part.strip()
|
||||
else:
|
||||
logger.warning(f"Formato APRS non decodificato: {payload}")
|
||||
|
||||
logger.info(f"📍 Inoltro pacchetto APRS al frontend: {data['source']} -> {data['dest']} via [{data['path']}]")
|
||||
state.socketio.emit('aprs_msg', data)
|
||||
except Exception as e:
|
||||
logger.error(f"Errore parsing APRS: {e}")
|
||||
|
||||
# --- MODI OPERATIVI MMDVM ---
|
||||
elif len(parts) == 3 and p0 == 'data' and p2 == 'mmdvm':
|
||||
try:
|
||||
cid = parts[1].lower()
|
||||
data = json.loads(payload)
|
||||
state.operating_modes[cid] = data
|
||||
state.operating_modes[cid] = json.loads(payload)
|
||||
state.notify_update()
|
||||
except Exception as e:
|
||||
logger.error(f"Errore parsing MMDVM modes per {cid}: {e}")
|
||||
@@ -359,6 +359,16 @@ def on_message(client, userdata, msg):
|
||||
|
||||
state.client_telemetry[cid]["idle"] = False
|
||||
|
||||
# --- ALLINEAMENTO MODI PER BEACON ---
|
||||
curr_mode = data.get('MMDVM', {}).get('mode', '')
|
||||
if curr_mode:
|
||||
if curr_mode.upper() == 'DMR':
|
||||
state.client_telemetry[cid]["alt"] = ""
|
||||
else:
|
||||
old_alt = state.client_telemetry[cid].get("alt", "")
|
||||
if not any(i in old_alt for i in ['🟢','🟣','🔵','🟠']):
|
||||
state.client_telemetry[cid]["alt"] = f"📡 {curr_mode.upper()} BEACON"
|
||||
|
||||
if 'DMR' in data:
|
||||
d = data['DMR']
|
||||
act = d.get('action')
|
||||
|
||||
@@ -0,0 +1,279 @@
|
||||
/* =========================================
|
||||
LAYOUT 2: TACTICAL (Ispirato alla versione dark/ambra)
|
||||
========================================= */
|
||||
body.layout-tactical {
|
||||
--bg-main: #111318;
|
||||
--card-bg: #1c2128;
|
||||
--primary: #f5b041; /* Giallo/Ambra */
|
||||
--accent: #c0392b; /* Rosso scuro */
|
||||
--success: #2ecc71; /* Verde */
|
||||
--danger: #e74c3c;
|
||||
--text-main: #e6edf3;
|
||||
--text-muted: #7d8590;
|
||||
--border-main: #444c56;
|
||||
--border-light: #30363d;
|
||||
background-color: var(--bg-main);
|
||||
}
|
||||
body.layout-tactical .card, body.layout-tactical .modal-content {
|
||||
background: var(--card-bg) !important;
|
||||
border: 1px solid var(--border-light) !important;
|
||||
border-radius: 4px !important;
|
||||
box-shadow: 0 4px 10px rgba(0,0,0,0.4) !important;
|
||||
}
|
||||
body.layout-tactical .title-brand {
|
||||
color: var(--primary);
|
||||
}
|
||||
body.layout-tactical .tactical-led {
|
||||
border-radius: 2px !important; /* LED quadrati e rigidi */
|
||||
}
|
||||
body.layout-tactical .terminal-log {
|
||||
background: #0d1117;
|
||||
border-color: var(--border-light);
|
||||
}
|
||||
|
||||
/* =========================================
|
||||
LAYOUT 3: LIGHT (Clean & Bright - Modalità diurna)
|
||||
========================================= */
|
||||
body.layout-light {
|
||||
--bg-main: #f8fafc;
|
||||
--card-bg: #ffffff;
|
||||
--primary: #0ea5e9; /* Azzurro pulito */
|
||||
--accent: #8b5cf6;
|
||||
--success: #10b981;
|
||||
--danger: #ef4444;
|
||||
--text-main: #1e293b;
|
||||
--text-muted: #64748b;
|
||||
--border-main: #cbd5e1;
|
||||
--border-light: #e2e8f0;
|
||||
|
||||
background-color: var(--bg-main) !important;
|
||||
background-image: none !important; /* Rimozione della griglia blueprint! */
|
||||
color: var(--text-main);
|
||||
}
|
||||
|
||||
/* --- Override for the main layout grid from original style.css --- */
|
||||
body.layout-light div.card,
|
||||
body.layout-light div.modal-content,
|
||||
body.layout-light div.mini-card {
|
||||
background: #ffffff !important;
|
||||
border: 1px solid var(--border-main) !important;
|
||||
border-radius: 8px !important;
|
||||
box-shadow: 0 2px 8px rgba(0,0,0,0.04) !important;
|
||||
}
|
||||
|
||||
body.layout-light .filter-bar {
|
||||
background: #ffffff !important;
|
||||
border: 1px solid var(--border-main) !important;
|
||||
}
|
||||
|
||||
body.layout-light .filter-pill {
|
||||
color: var(--text-muted) !important;
|
||||
border-color: var(--border-main) !important;
|
||||
}
|
||||
body.layout-light .filter-pill.active {
|
||||
color: var(--primary) !important;
|
||||
border-color: var(--primary) !important;
|
||||
background: #f0f9ff !important;
|
||||
}
|
||||
body.layout-light .filter-pill:hover {
|
||||
background: #f8fafc !important;
|
||||
}
|
||||
|
||||
/* Fix per la mappa */
|
||||
body.layout-light .dark-tiles {
|
||||
filter: none !important;
|
||||
-webkit-filter: none !important;
|
||||
}
|
||||
|
||||
body.layout-light .custom-map-pin.pin-online {
|
||||
background: var(--success);
|
||||
border-color: #059669;
|
||||
box-shadow: 0 0 10px rgba(16, 185, 129, 0.4);
|
||||
color: white;
|
||||
}
|
||||
body.layout-light .custom-map-pin.pin-offline {
|
||||
background: var(--danger);
|
||||
border-color: #b91c1c;
|
||||
box-shadow: 0 0 10px rgba(239, 68, 68, 0.4);
|
||||
color: white;
|
||||
}
|
||||
|
||||
/* --- Top Bar --- */
|
||||
body.layout-light #top-bar-container,
|
||||
body.layout-light #top-bar {
|
||||
background: #ffffff !important;
|
||||
border-bottom: 1px solid var(--border-main) !important;
|
||||
box-shadow: 0 2px 10px rgba(0,0,0,0.03);
|
||||
}
|
||||
body.layout-light .title-brand {
|
||||
color: var(--primary) !important;
|
||||
text-shadow: none !important;
|
||||
}
|
||||
|
||||
/* Testi scuri sulle mini card */
|
||||
body.layout-light .mini-card-name {
|
||||
color: var(--text-main) !important;
|
||||
font-weight: 600;
|
||||
}
|
||||
body.layout-light .mini-card[style*="grayscale"] {
|
||||
opacity: 0.5 !important;
|
||||
background: #f1f5f9 !important;
|
||||
}
|
||||
|
||||
/* Bottoni, Tab e Navigazione */
|
||||
body.layout-light .nav-tab { color: var(--text-muted); }
|
||||
body.layout-light .nav-tab.active {
|
||||
color: var(--primary) !important;
|
||||
border-bottom: 2px solid var(--primary) !important;
|
||||
background: transparent !important;
|
||||
}
|
||||
body.layout-light .theme-switch {
|
||||
border: 1px solid var(--border-main) !important;
|
||||
color: var(--text-muted) !important;
|
||||
background: transparent !important;
|
||||
}
|
||||
body.layout-light .btn-cmd {
|
||||
color: var(--text-main) !important;
|
||||
border-color: var(--border-main) !important;
|
||||
background: #ffffff;
|
||||
}
|
||||
body.layout-light .btn-cmd:hover {
|
||||
background: #f1f5f9;
|
||||
}
|
||||
|
||||
/* Fix per i pannelli informativi a bordo */
|
||||
body.layout-light .freq-bar,
|
||||
body.layout-light .node-meta,
|
||||
body.layout-light .health-bar {
|
||||
border-color: var(--border-light) !important;
|
||||
color: var(--text-muted) !important;
|
||||
}
|
||||
body.layout-light .health-bar span {
|
||||
border-right-color: var(--border-light) !important;
|
||||
}
|
||||
body.layout-light .seen-bar {
|
||||
border-color: var(--border-light) !important;
|
||||
}
|
||||
|
||||
/* Testo interno delle Card dei Nodi */
|
||||
body.layout-light .client-name {
|
||||
color: var(--text-main) !important;
|
||||
}
|
||||
body.layout-light .badge-id {
|
||||
color: var(--text-muted) !important;
|
||||
}
|
||||
body.layout-light .type-badge.type-repeater {
|
||||
color: var(--primary) !important;
|
||||
border-color: var(--primary) !important;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
body.layout-light .status-display {
|
||||
color: var(--text-main) !important;
|
||||
border-color: var(--border-light) !important;
|
||||
}
|
||||
|
||||
/* Fix tabelle */
|
||||
body.layout-light table { background: transparent; }
|
||||
body.layout-light thead th, body.layout-light thead tr {
|
||||
background: #f1f5f9 !important;
|
||||
color: var(--text-muted) !important;
|
||||
border-bottom: 2px solid var(--border-main) !important;
|
||||
font-weight: 600;
|
||||
}
|
||||
body.layout-light tbody tr, body.layout-light td {
|
||||
background: #ffffff !important;
|
||||
border-bottom: 1px solid var(--border-light) !important;
|
||||
color: var(--text-main) !important;
|
||||
}
|
||||
body.layout-light tbody tr:nth-child(even), body.layout-light tbody tr:nth-child(even) td {
|
||||
background: #f8fafc !important;
|
||||
}
|
||||
body.layout-light tbody tr:hover, body.layout-light tbody tr:hover td {
|
||||
background: #f1f5f9 !important;
|
||||
}
|
||||
|
||||
/* Input */
|
||||
body.layout-light select, body.layout-light input, body.layout-light textarea {
|
||||
background: #ffffff !important;
|
||||
color: var(--text-main) !important;
|
||||
border: 1px solid var(--border-main) !important;
|
||||
}
|
||||
body.layout-light .terminal-log {
|
||||
background: #f1f5f9 !important;
|
||||
color: #334155 !important;
|
||||
border-color: var(--border-main) !important;
|
||||
}
|
||||
|
||||
/* Fix visibilità dei pin mappa nel tema chiaro */
|
||||
body.layout-light .custom-map-pin {
|
||||
color: #ffffff !important;
|
||||
font-weight: bold !important;
|
||||
font-size: 16px !important;
|
||||
line-height: 24px !important;
|
||||
}
|
||||
body.layout-light .custom-map-pin.pin-online {
|
||||
background-color: var(--success) !important;
|
||||
border: 2px solid #059669 !important;
|
||||
box-shadow: 0 0 12px rgba(16, 185, 129, 0.6) !important;
|
||||
}
|
||||
body.layout-light .custom-map-pin.pin-offline {
|
||||
background-color: var(--danger) !important;
|
||||
border: 2px solid #b91c1c !important;
|
||||
box-shadow: 0 0 12px rgba(239, 68, 68, 0.6) !important;
|
||||
}
|
||||
body.layout-light .custom-map-pin.pin-tx {
|
||||
background-color: var(--primary) !important;
|
||||
border: 2px solid #0284c7 !important;
|
||||
box-shadow: 0 0 15px rgba(2, 132, 199, 0.8) !important;
|
||||
}
|
||||
body.layout-light .custom-map-pin.pin-warn {
|
||||
background-color: var(--accent) !important;
|
||||
border: 2px solid #7c3aed !important;
|
||||
}
|
||||
|
||||
/* Fix per i container delle popup di Leaflet */
|
||||
body.layout-light .leaflet-popup-content-wrapper,
|
||||
body.layout-light .leaflet-popup-tip {
|
||||
background: #ffffff !important;
|
||||
color: var(--text-main) !important;
|
||||
box-shadow: 0 4px 15px rgba(0,0,0,0.1) !important;
|
||||
}
|
||||
body.layout-light .leaflet-popup-content div {
|
||||
color: var(--text-main);
|
||||
}
|
||||
/* =========================================
|
||||
LAYOUT 4: GLASSMORPHISM & NEON
|
||||
Layout moderno, traslucido con sfocature
|
||||
========================================= */
|
||||
body.layout-glass {
|
||||
--bg-main: #0f172a;
|
||||
--primary: #38bdf8;
|
||||
--accent: #c084fc;
|
||||
--success: #34d399;
|
||||
--danger: #fb7185;
|
||||
--card-bg: rgba(255, 255, 255, 0.03);
|
||||
--border-light: rgba(255,255,255,0.1);
|
||||
background: linear-gradient(135deg, #0f172a 0%, #1e1b4b 100%);
|
||||
background-attachment: fixed;
|
||||
}
|
||||
body.layout-glass .card, body.layout-glass .modal-content {
|
||||
background: var(--card-bg) !important;
|
||||
backdrop-filter: blur(16px);
|
||||
-webkit-backdrop-filter: blur(16px);
|
||||
border: 1px solid rgba(255,255,255,0.08) !important;
|
||||
border-radius: 24px !important;
|
||||
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.5) !important;
|
||||
}
|
||||
body.layout-glass .btn-cmd, body.layout-glass .filter-pill {
|
||||
border-radius: 12px;
|
||||
}
|
||||
body.layout-glass .card-header {
|
||||
border-bottom: 1px solid rgba(255,255,255,0.05);
|
||||
padding-bottom: 15px;
|
||||
}
|
||||
body.layout-glass input, body.layout-glass select, body.layout-glass textarea {
|
||||
background: rgba(0,0,0,0.3);
|
||||
border-radius: 8px;
|
||||
border: 1px solid rgba(255,255,255,0.1);
|
||||
}
|
||||
+165
-36
@@ -1,5 +1,14 @@
|
||||
function updateClock() {
|
||||
const clockEl = document.getElementById('live-clock');
|
||||
if (clockEl) {
|
||||
const now = new Date();
|
||||
const dateStr = now.toLocaleDateString('it-IT', { day: '2-digit', month: '2-digit', year: 'numeric' });
|
||||
const timeStr = now.toLocaleTimeString('it-IT', { hour12: false, hour: '2-digit', minute:'2-digit', second:'2-digit' });
|
||||
clockEl.innerHTML = `<span style="color:var(--primary);">SYS_TIME:</span> ${dateStr} // <b style="color:var(--text-main);">${timeStr}</b> LOC`;
|
||||
}
|
||||
}
|
||||
|
||||
// --- VARIABILI GLOBALI E UI VIEW ---
|
||||
const HANG_TIME_MS = 3000;
|
||||
let clients = [];
|
||||
let me = { logged_in: false, user: '', role: '', allowed_nodes: '' };
|
||||
let isAuthenticated = false;
|
||||
@@ -21,13 +30,41 @@ let currentMmdvmConfig = "";
|
||||
let currentMmdvmConfigAlias = "";
|
||||
let currentMmdvmServiceName = "";
|
||||
|
||||
// --- LAYOUT SWITCHER ---
|
||||
const layouts = ['layout-blueprint', 'layout-tactical', 'layout-light', 'layout-glass'];
|
||||
const layoutLabels = ['[ L: BLU ]', '[ L: TAC ]', '[ L: LGT ]', '[ L: GLASS ]'];
|
||||
let currentLayoutIdx = 0;
|
||||
|
||||
function initLayout() {
|
||||
const saved = localStorage.getItem('fleetLayout') || 'layout-blueprint';
|
||||
currentLayoutIdx = layouts.indexOf(saved) > -1 ? layouts.indexOf(saved) : 0;
|
||||
applyLayout();
|
||||
}
|
||||
|
||||
function cycleLayout() {
|
||||
currentLayoutIdx = (currentLayoutIdx + 1) % layouts.length;
|
||||
localStorage.setItem('fleetLayout', layouts[currentLayoutIdx]);
|
||||
applyLayout();
|
||||
}
|
||||
|
||||
function applyLayout() {
|
||||
document.body.classList.remove(...layouts);
|
||||
if (layouts[currentLayoutIdx] !== 'layout-blueprint') {
|
||||
document.body.classList.add(layouts[currentLayoutIdx]);
|
||||
}
|
||||
const btn = document.getElementById('layout-btn');
|
||||
if (btn) btn.innerText = layoutLabels[currentLayoutIdx];
|
||||
}
|
||||
|
||||
|
||||
// Mappatura Modo -> Gateway service name
|
||||
const MODE_GATEWAYS = {
|
||||
'DMR': ['dmrgateway'],
|
||||
'NXDN': ['nxdngateway'],
|
||||
'System Fusion': ['ysfgateway'],
|
||||
'D-Star': ['dstargateway', 'dstar-gateway'],
|
||||
'P25': ['p25gateway']
|
||||
'P25': ['p25gateway'],
|
||||
'M17': ['m17gateway', 'm17-gateway']
|
||||
};
|
||||
|
||||
function switchView(viewName) {
|
||||
@@ -99,8 +136,10 @@ function closeNodeFocus() {
|
||||
window.addEventListener('DOMContentLoaded', () => {
|
||||
const savedView = localStorage.getItem('fleetDefaultView') || 'home';
|
||||
switchView(savedView);
|
||||
initLayout();
|
||||
initUI();
|
||||
checkPushStatus();
|
||||
setInterval(updateClock, 1000); updateClock();
|
||||
setInterval(refreshStates, 15000);
|
||||
setInterval(() => { refreshLogs(); refreshStats(); }, 60000);
|
||||
checkServerUpdate();
|
||||
@@ -327,7 +366,9 @@ function renderModeToggles(clientId, statusMsg = "") {
|
||||
{ id: 'D-Star', label: 'D-STAR', color: '#f97316' },
|
||||
{ id: 'System Fusion', label: 'YSF', color: '#8b5cf6' },
|
||||
{ id: 'NXDN', label: 'NXDN', color: 'var(--success)' },
|
||||
{ id: 'P25', label: 'P25', color: 'var(--accent)' }
|
||||
{ id: 'P25', label: 'P25', color: 'var(--accent)' },
|
||||
{ id: 'FM', label: 'FM', color: '#14b8a6' },
|
||||
{ id: 'M17', label: 'M17', color: '#ec4899' } // Aggiunto modo M17 (Rosa/Pink)
|
||||
];
|
||||
|
||||
let html = "";
|
||||
@@ -358,14 +399,20 @@ function renderModeToggles(clientId, statusMsg = "") {
|
||||
? `border-color: ${m.color}; color: ${m.color} !important; box-shadow: inset 0 0 8px ${m.color}; font-weight: bold;`
|
||||
: `border-color: var(--border-light); color: var(--text-muted) !important; opacity: 0.4;`;
|
||||
|
||||
html += `<button class="btn-cmd" style="padding: 10px 15px; font-size: 1.1rem; width: auto; flex: 1; min-width: 80px; transition: all 0.2s ease; ${btnStyle}" onclick="toggleOperatingMode('${clientId}', '${m.id}', ${!enabled})">${m.label}</button>`;
|
||||
// Rimosso flex:1 per evitare che l'ultimo bottone si allarghi al 100% sulla riga vuota
|
||||
html += `<button class="btn-cmd" style="padding: 10px; font-size: 1.1rem; width: 100%; transition: all 0.2s ease; ${btnStyle}" onclick="toggleOperatingMode('${clientId}', '${m.id}', ${!enabled})">${m.label}</button>`;
|
||||
}
|
||||
});
|
||||
|
||||
if (html === "") html = '<span style="color:var(--text-muted); font-size: 0.9rem;">NO MODES FOUND IN CONFIG</span>';
|
||||
if (html === "") {
|
||||
html = '<span style="color:var(--text-muted); font-size: 0.9rem;">NO MODES FOUND IN CONFIG</span>';
|
||||
} else {
|
||||
// Avvolgiamo i bottoni in una CSS Grid per un allineamento perfetto e proporzionato
|
||||
html = `<div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(75px, 1fr)); gap: 10px; width: 100%;">${html}</div>`;
|
||||
}
|
||||
|
||||
if (statusMsg) {
|
||||
html += `<div style="width: 100%; margin-top: 8px; font-family: 'JetBrains Mono', monospace;">${statusMsg}</div>`;
|
||||
html += `<div style="width: 100%; margin-top: 12px; font-family: 'JetBrains Mono', monospace;">${statusMsg}</div>`;
|
||||
}
|
||||
|
||||
container.innerHTML = html;
|
||||
@@ -572,12 +619,13 @@ async function initUI() {
|
||||
const miniGrid = document.getElementById('home-mini-nodes');
|
||||
if (miniGrid) {
|
||||
miniGrid.innerHTML = clients.map(c => `
|
||||
<div id="mini-card-${c.id}" class="mini-card" onclick="openNodeFocus('${c.id}')">
|
||||
<div class="mini-card-content">
|
||||
<div id="mini-card-${c.id}" class="mini-card" onclick="openNodeFocus('${c.id}')" style="width: 180px !important; min-width: 180px !important; height: 125px !important; display: flex; flex-direction: column; justify-content: space-between; padding-bottom: 12px; box-sizing: border-box;">
|
||||
<div class="mini-card-content" style="flex: 1; display: flex; flex-direction: column; justify-content: center; align-items: center;">
|
||||
<div id="mini-name-${c.id}" class="mini-card-name" title="${esc(c.name)}">${esc(c.name)}</div>
|
||||
<div id="mini-id-${c.id}" style="font-family: 'JetBrains Mono', monospace; font-size: 0.65rem; color: var(--text-muted); margin-top: 2px;">ID: ${c.id.toUpperCase()}</div>
|
||||
<div id="mini-caller-${c.id}" style="font-family: 'JetBrains Mono', monospace; font-size: 0.9rem; font-weight: bold; margin-top: 6px; display: none; text-align: center; line-height: 1.1;"></div>
|
||||
</div>
|
||||
<div id="mini-status-${c.id}" class="mini-card-status" title="OFFLINE">OFFLINE</div>
|
||||
<div id="mini-status-${c.id}" class="mini-card-status" title="OFFLINE" style="position: relative !important; bottom: auto !important; left: auto !important; transform: none !important; width: 90%; margin: 0 auto; flex-shrink: 0;">OFFLINE</div>
|
||||
</div>
|
||||
`).join('');
|
||||
}
|
||||
@@ -623,7 +671,10 @@ function initOrUpdateMap() {
|
||||
const isOnline = !state.toUpperCase().includes("OFF") && state !== "";
|
||||
const health = latestStatesData.health && latestStatesData.health[cid];
|
||||
const card = document.getElementById(`card-${c.id}`);
|
||||
const isTx = card && card.dataset.lastTx && (Date.now() - parseInt(card.dataset.lastTx) < 3000);
|
||||
|
||||
// Recupariamo lo stato calcolato in refreshStates()
|
||||
const isTx = card && card.dataset.isTx === 'true';
|
||||
const isHold = card && card.dataset.isHold === 'true';
|
||||
const warns = (latestStatesData.warnings && latestStatesData.warnings[cid]) || [];
|
||||
|
||||
if (info && info.lat && info.lon && parseFloat(info.lat) !== 0 && parseFloat(info.lon) !== 0) {
|
||||
@@ -632,7 +683,7 @@ function initOrUpdateMap() {
|
||||
bounds.push([lat, lon]);
|
||||
|
||||
let pinClass = isOnline ? (warns.length > 0 ? 'pin-warn' : 'pin-online') : 'pin-offline';
|
||||
if (isTx) pinClass += ' pin-tx';
|
||||
if (isTx || isHold) pinClass += ' pin-tx';
|
||||
|
||||
let iconSymbol = "+";
|
||||
if (warns.length > 0 && !isTx) iconSymbol = "!";
|
||||
@@ -832,9 +883,26 @@ async function refreshStates() {
|
||||
else if (action === 'unlinked') { badgeColor = 'var(--text-muted)'; badgeBorder = 'var(--border-light)'; suffix = ' [UNL]'; }
|
||||
else { badgeColor = gw.color; badgeBorder = gw.color; }
|
||||
|
||||
const chipBase = "display:inline-flex; align-items:center; gap:5px; font-size:0.75rem; font-family:'JetBrains Mono',monospace; padding:2px 6px; margin:2px 4px 2px 0; border-radius:3px; background:rgba(0,0,0,0.5); border:1px solid ";
|
||||
|
||||
if (gw.proto === 'DMR' && gwData['DMR_NETS'] && gwData['DMR_NETS'].length > 0) {
|
||||
gwData['DMR_NETS'].forEach(netName => { let netSuffix = (action === 'linking') ? ' [LNK]' : (action === 'failed' ? ' [ERR]' : (dest && action !== 'status' ? `:${dest}` : '')); gwHtml += `<span style="font-size:0.65rem; font-family:'JetBrains Mono', monospace; font-weight:400; padding:2px 4px; border:1px dashed ${badgeBorder}; background:transparent; color:${badgeColor} !important; margin-right: 4px; display: inline-block;">DMR:${esc(netName)}${esc(netSuffix)}</span>`; });
|
||||
} else { gwHtml += `<span style="font-size:0.65rem; font-family:'JetBrains Mono', monospace; font-weight:400; padding:2px 4px; border:1px dashed ${badgeBorder}; background:transparent; color:${badgeColor} !important; margin-right: 4px; display: inline-block;">${gw.label}${esc(suffix)}</span>`; }
|
||||
gwData['DMR_NETS'].forEach(netName => {
|
||||
let tagStatus = (action === 'linking') ? '<span style="color:#f59e0b;font-weight:700;">LNK</span>' : (action === 'failed' ? '<span style="color:var(--danger);font-weight:700;">ERR</span>' : (dest && action !== 'status' ? `<span style="color:#ffffff;font-weight:600;">${esc(dest)}</span>` : ''));
|
||||
gwHtml += `<span style="${chipBase}${badgeBorder};"><b style="color:${gw.color};">DMR</b><span style="color:#e2e8f0;">${esc(netName)}</span>${tagStatus ? '<span style="color:var(--text-muted);opacity:0.6;">·</span>' + tagStatus : ''}</span>`;
|
||||
});
|
||||
} else {
|
||||
let destText = dest ? `<span style="color:#ffffff; font-weight:600;">${esc(dest)}</span>` : '';
|
||||
let statusPill = '';
|
||||
if (action === 'linking') statusPill = '<span style="color:#f59e0b; font-weight:700;">LNK</span>';
|
||||
else if (action === 'failed') statusPill = '<span style="color:var(--danger); font-weight:700;">ERR</span>';
|
||||
else if (action === 'unlinked') statusPill = '<span style="color:var(--text-muted);">UNL</span>';
|
||||
|
||||
let content = `<b style="color:${gw.color};">${gw.label}</b>`;
|
||||
if (destText) content += `<span style="color:var(--text-muted);opacity:0.6;">·</span>${destText}`;
|
||||
if (statusPill) content += `<span style="color:var(--text-muted);opacity:0.6;">·</span>${statusPill}`;
|
||||
|
||||
gwHtml += `<span style="${chipBase}${badgeBorder};">${content}</span>`;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -892,14 +960,22 @@ async function refreshStates() {
|
||||
}
|
||||
}
|
||||
|
||||
let timeSinceTx = 0;
|
||||
if (isTx && isOnline && !isIdle) {
|
||||
cardDiv.dataset.lastTx = Date.now();
|
||||
} else {
|
||||
timeSinceTx = Date.now() - (parseInt(cardDiv.dataset.lastTx) || 0);
|
||||
// --- NESSUN TIMER LOCALE: COMANDA MQTT ---
|
||||
// Memorizza l'ultimo modo dedotto per usarlo durante l'Hangtime o i Beacon
|
||||
if (!isIdle && isOnline) {
|
||||
cardDiv.dataset.lastMode = txModeStr.replace("TX ", "").trim();
|
||||
cardDiv.dataset.lastColor = activeModeColor;
|
||||
}
|
||||
|
||||
let isHold = (!isTx && !isIdle && timeSinceTx < 6000);
|
||||
// Se non è in TX e MMDVM NON ha ancora dichiarato 'idle' -> siamo in Hold
|
||||
let isHold = (!isTx && !isIdle && isOnline);
|
||||
|
||||
// Salviamo lo stato sul DOM per la mappa
|
||||
cardDiv.dataset.isTx = isTx ? 'true' : 'false';
|
||||
cardDiv.dataset.isHold = isHold ? 'true' : 'false';
|
||||
|
||||
let holdMode = cardDiv.dataset.lastMode || "DMR";
|
||||
let holdColor = cardDiv.dataset.lastColor || "var(--primary)";
|
||||
|
||||
let displayState = stateValue;
|
||||
let statusColor = "";
|
||||
@@ -909,21 +985,38 @@ async function refreshStates() {
|
||||
if (!isOnline) {
|
||||
displayState = stateValue;
|
||||
cBorder = "var(--border-light)";
|
||||
} else if (isTx && !isIdle) {
|
||||
} else if (isTx) {
|
||||
displayState = `( ${txModeStr} )`;
|
||||
statusColor = activeModeColor;
|
||||
statusBorder = activeModeColor;
|
||||
cBorder = activeModeColor;
|
||||
} else if (isHold) {
|
||||
displayState = `[ ${txModeStr.replace("TX ", "")} ]`;
|
||||
statusColor = activeModeColor;
|
||||
statusBorder = activeModeColor;
|
||||
displayState = `[ ${holdMode} ]`;
|
||||
statusColor = holdColor;
|
||||
statusBorder = holdColor;
|
||||
cBorder = holdColor;
|
||||
}
|
||||
|
||||
if (isOnline) {
|
||||
cardDiv.classList.add('online'); statusDiv.classList.remove('status-offline');
|
||||
cardDiv.style.opacity = "1"; cardDiv.style.filter = "none";
|
||||
|
||||
cardDiv.style.setProperty('border-top-color', (isTx || isHold) ? statusColor : "var(--border-color)", 'important');
|
||||
if(isTx) {
|
||||
let shadowRGB = '59, 130, 246';
|
||||
if (activeModeColor === '#10b981') shadowRGB = '16, 185, 129';
|
||||
else if (activeModeColor === '#8b5cf6') shadowRGB = '139, 92, 246';
|
||||
else if (activeModeColor === '#06b6d4') shadowRGB = '6, 182, 212';
|
||||
else if (activeModeColor === '#f59e0b') shadowRGB = '245, 158, 11';
|
||||
cardDiv.style.boxShadow = `0 0 20px rgba(${shadowRGB}, 0.5) !important`;
|
||||
} else {
|
||||
cardDiv.style.boxShadow = '0 4px 12px rgba(0,0,0,0.2) !important';
|
||||
}
|
||||
} else {
|
||||
cardDiv.classList.remove('online'); statusDiv.classList.add('status-offline');
|
||||
cardDiv.style.opacity = "0.7"; cardDiv.style.filter = "grayscale(80%)";
|
||||
cardDiv.style.setProperty('border-top-color', '#64748b', 'important');
|
||||
cardDiv.style.boxShadow = 'none !important';
|
||||
}
|
||||
|
||||
cardDiv.style.borderColor = cBorder;
|
||||
@@ -935,36 +1028,69 @@ async function refreshStates() {
|
||||
|
||||
const miniCard = document.getElementById(`mini-card-${c.id}`);
|
||||
const miniStatus = document.getElementById(`mini-status-${c.id}`);
|
||||
if (miniCard && miniStatus) {
|
||||
if (genObj && isOnline) {
|
||||
const miniName = document.getElementById(`mini-name-${c.id}`);
|
||||
const miniId = document.getElementById(`mini-id-${c.id}`);
|
||||
if (miniName) miniName.innerText = genObj.callsign;
|
||||
if (miniId) miniId.innerText = `ID:${genObj.radio_id}`;
|
||||
const miniCaller = document.getElementById(`mini-caller-${c.id}`);
|
||||
|
||||
if (miniCard && miniStatus) {
|
||||
if (genObj && isOnline) {
|
||||
if(miniName) miniName.innerText = genObj.callsign;
|
||||
if(miniId) miniId.innerText = `ID:${genObj.radio_id}`;
|
||||
}
|
||||
|
||||
if (isOnline) {
|
||||
miniCard.style.opacity = "1";
|
||||
miniCard.style.filter = "none";
|
||||
|
||||
if (miniCaller) {
|
||||
let activeCaller = "";
|
||||
if (isTx) {
|
||||
let rawStr = (telemetryObj.alt && telemetryObj.alt !== "") ? telemetryObj.alt : ((String(telemetryObj.ts1 ?? '').includes("🎙️") || String(telemetryObj.ts1 ?? '').includes("TX")) ? String(telemetryObj.ts1) : String(telemetryObj.ts2 ?? ''));
|
||||
// Rimuove emoji, prefissi come "D-Star:", "YSF:" e pulisce
|
||||
let cleaned = rawStr.replace(/[^\x00-\x7F]/g, '')
|
||||
.replace(/(TX)?\s*(D-STAR|YSF|NXDN|P25|DMR|FM|M17)\s*:/ig, '')
|
||||
.replace(/TX/ig, '')
|
||||
.trim();
|
||||
if (cleaned) activeCaller = cleaned.split(' ')[0];
|
||||
}
|
||||
|
||||
if (isTx && activeCaller) {
|
||||
miniCaller.innerText = activeCaller;
|
||||
miniCaller.style.display = "block";
|
||||
miniCaller.style.color = activeModeColor;
|
||||
} else {
|
||||
miniCaller.style.display = "none";
|
||||
miniCaller.innerText = "";
|
||||
}
|
||||
}
|
||||
|
||||
if (warns.length > 0 && !isTx && !isHold) {
|
||||
miniCard.style.borderColor = "var(--accent)";
|
||||
miniStatus.innerText = "(!) ALERT";
|
||||
miniStatus.title = warns.join(" | ");
|
||||
miniStatus.style.color = "var(--accent)";
|
||||
miniStatus.style.borderColor = "var(--accent)";
|
||||
miniCard.style.boxShadow = 'none';
|
||||
} else {
|
||||
let mcBorder = "var(--border-main)";
|
||||
let mStatus = stateValue;
|
||||
let mColor = "var(--success)";
|
||||
let mBorderColor = "var(--border-light)";
|
||||
|
||||
if (isTx && !isIdle) {
|
||||
if (isTx) {
|
||||
mcBorder = activeModeColor;
|
||||
mStatus = `( ${txModeStr} )`;
|
||||
mColor = activeModeColor;
|
||||
mBorderColor = activeModeColor;
|
||||
miniCard.style.boxShadow = `0 0 12px ${activeModeColor}60`; // GLOW in TX
|
||||
} else if (isHold) {
|
||||
mStatus = `[ ${txModeStr.replace("TX ", "")} ]`;
|
||||
mColor = activeModeColor;
|
||||
mBorderColor = activeModeColor;
|
||||
mcBorder = "var(--border-main)"; // Bordo grigio per non confonderlo con TX
|
||||
mStatus = `[ ${holdMode} ]`;
|
||||
mColor = holdColor; // Solo testo colorato
|
||||
mBorderColor = "var(--border-light)";
|
||||
miniCard.style.boxShadow = 'none'; // Nessun glow in hold
|
||||
} else {
|
||||
miniCard.style.boxShadow = 'none';
|
||||
}
|
||||
|
||||
miniCard.style.borderColor = mcBorder;
|
||||
@@ -974,11 +1100,14 @@ async function refreshStates() {
|
||||
miniStatus.style.borderColor = mBorderColor;
|
||||
}
|
||||
} else {
|
||||
miniCard.style.opacity = "0.7";
|
||||
miniCard.style.filter = "grayscale(80%)";
|
||||
miniCard.style.borderColor = "var(--border-light)";
|
||||
miniStatus.innerText = "OFFLINE";
|
||||
miniStatus.title = "OFFLINE";
|
||||
miniStatus.style.color = "var(--danger)";
|
||||
miniStatus.style.borderColor = "var(--border-light)";
|
||||
miniCard.style.boxShadow = 'none';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -989,20 +1118,20 @@ async function refreshStates() {
|
||||
let fsColor = isOnline ? 'var(--success)' : 'var(--danger)';
|
||||
|
||||
if (isOnline) {
|
||||
if (isTx && !isIdle) {
|
||||
if (isTx) {
|
||||
fsState = `( ${txModeStr} )`;
|
||||
fsColor = activeModeColor;
|
||||
} else if (isHold) {
|
||||
fsState = `[ ${txModeStr.replace("TX ", "")} ]`;
|
||||
fsColor = activeModeColor;
|
||||
fsState = `[ ${holdMode} ]`;
|
||||
fsColor = holdColor;
|
||||
}
|
||||
}
|
||||
|
||||
focusStatus.innerText = fsState;
|
||||
focusStatus.style.color = fsColor;
|
||||
|
||||
let focusLedColor = isOnline ? (isTx && !isIdle ? activeModeColor : 'var(--success)') : 'var(--border-light)';
|
||||
let focusLedBg = (isOnline && isTx && !isIdle) ? activeModeColor : 'transparent';
|
||||
let focusLedColor = isOnline ? (isTx ? activeModeColor : (isHold ? holdColor : 'var(--success)')) : 'var(--border-light)';
|
||||
let focusLedBg = (isOnline && isTx) ? activeModeColor : 'transparent';
|
||||
document.getElementById('focus-name').innerHTML = `<span style="display:inline-block; border-radius:50%; width:20px; height:20px; border:2px solid ${focusLedColor}; background:${focusLedBg}"></span> ${esc(genObj ? genObj.callsign : c.name)}`;
|
||||
|
||||
document.getElementById('focus-id').innerText = `NET-ID: ${genObj ? genObj.radio_id : c.id.toUpperCase()}`;
|
||||
|
||||
@@ -20,12 +20,17 @@
|
||||
|
||||
<!-- Foglio di Stile Esterno Modularizzato (Cache Buster) -->
|
||||
<link rel="stylesheet" href="/static/css/style.css?v=blueprint-header-fix">
|
||||
<!-- Foglio Stili Layout Alternativi -->
|
||||
<link rel="stylesheet" href="/static/css/layouts.css?v=6">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div id="top-bar-container">
|
||||
<div id="top-bar">
|
||||
<div class="title-brand">SCHEMATIC // FLEET C2</div>
|
||||
<div class="brand-container" style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start;">
|
||||
<div class="title-brand" style="line-height: 1.1; padding-bottom: 2px;">SCHEMATIC // FLEET C2</div>
|
||||
<div id="live-clock" style="font-family: 'JetBrains Mono', monospace; font-size: 0.7rem; color: var(--text-muted); letter-spacing: 1px; padding-left: 2px;">SYS_TIME: --:--:--</div>
|
||||
</div>
|
||||
|
||||
<div class="nav-tabs">
|
||||
<button class="nav-tab active" onclick="switchView('home')" id="tab-home">HOME</button>
|
||||
@@ -36,6 +41,7 @@
|
||||
|
||||
<div class="top-bar-right">
|
||||
<span id="mqtt-badge" class="mqtt-badge mqtt-offline">MQTT: CHK</span>
|
||||
<button class="theme-switch" id="layout-btn" onclick="cycleLayout()" title="Cambia Layout">[ L: BLU ]</button>
|
||||
<button class="theme-switch" id="lang-btn" onclick="toggleLang()" data-i18n-title="ttLang">ITA</button>
|
||||
<button class="theme-switch" id="push-btn" onclick="subscribeToPush()">PUSH</button>
|
||||
<div id="auth-container" style="display:flex; align-items:center; gap:8px; flex-wrap:wrap; justify-content:flex-end;"></div>
|
||||
@@ -268,7 +274,7 @@
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<div style="text-align: center; padding: 25px; color: var(--border-light); font-size: 0.85rem; font-weight: 300; display: flex; justify-content: center; align-items: center; gap: 15px; flex-wrap: wrap;">
|
||||
<div style="text-align: center; padding: 25px; color: var(--text-muted); font-size: 0.85rem; font-weight: 300; display: flex; justify-content: center; align-items: center; gap: 15px; flex-wrap: wrap;">
|
||||
<span>SYS_OP: IV3JDV @ ARIFVG</span>
|
||||
<span>|</span>
|
||||
<a href="https://git.arifvg.it/iv3jdv/fleet-control-server" target="_blank" style="color: inherit; text-decoration: none;">GITEA_REPO</a>
|
||||
@@ -440,7 +446,7 @@
|
||||
|
||||
<!-- MOTORE MODULARIZZATO JS (Cache Buster aggiunto per forzare il refresh) -->
|
||||
<script src="/static/js/modals.js?v=blueprint4"></script>
|
||||
<script src="/static/js/app.js?v=blueprint-modes-admin-only-final"></script>
|
||||
<script src="/static/js/app.js?v=1793656210"></script>
|
||||
|
||||
<!-- SERVICE WORKER -->
|
||||
<script>
|
||||
|
||||
Reference in New Issue
Block a user