Compare commits

...
14 Commits
Author SHA1 Message Date
iv3jdv 8fc08f1c23 reaorganize home header 2026-11-03 15:04:19 +01:00
iv3jdv 66cd63a181 feat(ui,api): layout mini-card fisso, nominativo tx pulito, cache-busting index e check Gitea asincrono 2026-11-03 13:03:55 +01:00
iv3jdv 36def1e201 fix mini-card width v2 2026-11-02 22:52:27 +01:00
iv3jdv a6c24244bd fix mini-card width 2026-11-02 22:43:47 +01:00
iv3jdv 502dcc2f65 Restyling badge 2026-11-02 22:31:44 +01:00
iv3jdv d4e83364e2 add time/date 2026-11-02 22:01:51 +01:00
iv3jdv fa4b3d8df2 fix mode spacing 2026-11-01 20:09:40 +01:00
iv3jdv a67ddd582c feat(ui): aggiunto supporto per i modi FM e M17 nei toggle operativi 2026-11-01 18:57:06 +01:00
iv3jdv 7ee7b00b37 fix(ui): restyling chip gateway ad alto contrasto e parsing aprs raw 2026-11-01 14:28:25 +01:00
iv3jdv ebaefeeedf fix(aprs): parsing stringhe raw ax25 e mapping colonna path 2026-11-01 11:41:45 +01:00
iv3jdv 2e8b75c384 feat(ui): implementazione multi-layout (Blueprint, Tactical, Light, Glass) e fix visivi 2026-11-01 10:52:20 +01:00
iv3jdv a56da30330 restored interactive map 2026-11-01 09:42:44 +01:00
iv3jdv 9b7c76c801 fix(telemetry): allineamento stati hangtime e risoluzione falsi positivi sui beacon
- Backend (mqtt_service.py): Aggiunta logica per intercettare i pacchetti beacon in assenza di traffico voce. Il sistema ora pulisce la memoria dei modi alternativi (es. D-Star/YSF) se il beacon è DMR, prevenendo il blocco dell'interfaccia su un vecchio protocollo.
- Frontend (app.js): La memorizzazione del colore e del modo per la gestione dell'hangtime (Hold) ora scatta con la condizione `!isIdle` anziché solo con il PTT voce (`isTx`).
- I badge della dashboard Home ora mostrano coerentemente il protocollo corretto per tutta la durata dell'hangtime, sia dopo un passaggio voce che dopo un beacon di rete.
2026-11-01 09:31:40 +01:00
iv3jdv bf4a669446 fix badge color 2026-10-31 21:42:26 +01:00
6 changed files with 513 additions and 83 deletions
+26 -13
View File
@@ -15,6 +15,10 @@ from services.mqtt_service import mqtt_publish
from services.push_service import node_allowed
from routes.auth_routes import get_auth, json_body, err
# --- AGGIUNTE PER GITEA BACKGROUND CHECK ---
GLOBAL_SERVER_UPDATE_AVAILABLE = False
LAST_GITEA_CHECK_TIME = 0
api_bp = Blueprint('api', __name__)
# --- REGEX & COSTANTI COMANDI ---
@@ -128,7 +132,7 @@ def get_stats():
top_tgs = [{"target": row[0], "count": row[1]} for row in c.fetchall()]
c.execute(f"""SELECT source_id, COUNT(*) as cnt FROM radio_logs
WHERE source_id NOT LIKE '🌐%'
WHERE source_id NOT LIKE '倹%'
AND timestamp >= date('now', 'localtime') AND timestamp < date('now', 'localtime', '+1 day'){node_filter}
GROUP BY source_id ORDER BY cnt DESC LIMIT 5""", params)
top_calls = [{"call": row[0], "count": row[1]} for row in c.fetchall()]
@@ -182,7 +186,7 @@ def cmd():
return err("Broker MQTT non raggiungibile - comando non inviato", 503)
audit(auth['username'], cid, cmd_type)
state.client_telemetry[cid] = {"ts1": "🔄 Inviato...", "ts2": "🔄 Inviato...", "alt": ""}
state.client_telemetry[cid] = {"ts1": "売 Inviato...", "ts2": "売 Inviato...", "alt": ""}
return jsonify({"success": True})
@api_bp.route('/api/global_command', methods=['POST'])
@@ -243,7 +247,7 @@ def update_nodes():
return err("Non autorizzato", 403)
if not mqtt_publish("devices/control/request", "update"):
return err("Broker MQTT non raggiungibile", 503)
logger.info(f"📢 REQ CONFIG inviata a tutta la flotta da {auth['username']}")
logger.info(f"討 REQ CONFIG inviata a tutta la flotta da {auth['username']}")
audit(auth['username'], '*', 'REQ_CONFIG_ALL')
return jsonify({"success": True})
@@ -356,21 +360,30 @@ def save_config_file():
# --- AGGIORNAMENTO SERVER OTA ---
@api_bp.route('/api/server_update/check', methods=['GET'])
def check_server_update():
auth = get_auth()
if not auth or auth['role'] != 'admin':
return err("Non autorizzato", 403)
def background_gitea_check():
global GLOBAL_SERVER_UPDATE_AVAILABLE, LAST_GITEA_CHECK_TIME
try:
subprocess.run(['git', 'fetch'], timeout=10, cwd=BASE_DIR)
local_hash = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=BASE_DIR).decode('utf-8').strip()
remote_hash = subprocess.check_output(['git', 'rev-parse', '@{u}'], cwd=BASE_DIR).decode('utf-8').strip()
update_available = local_hash != remote_hash
return jsonify({"success": True, "update_available": update_available})
GLOBAL_SERVER_UPDATE_AVAILABLE = (local_hash != remote_hash)
LAST_GITEA_CHECK_TIME = time.time()
except Exception as e:
logger.error(f"Errore controllo aggiornamenti server: {e}")
return jsonify({"success": False, "error": "Impossibile verificare aggiornamenti"})
logger.error(f"Errore controllo Gitea in background: {e}")
@api_bp.route('/api/server_update/status', methods=['GET'])
def get_server_update_status():
global LAST_GITEA_CHECK_TIME
auth = get_auth()
if not auth or auth['role'] != 'admin':
return err("Non autorizzato", 403)
# Se è passata più di un'ora (3600 secondi) dall'ultimo controllo, avvia il thread
if time.time() - LAST_GITEA_CHECK_TIME > 3600:
import threading
threading.Thread(target=background_gitea_check, daemon=True).start()
return jsonify({"success": True, "update_available": GLOBAL_SERVER_UPDATE_AVAILABLE})
@api_bp.route('/api/server_update/apply', methods=['POST'])
def apply_server_update():
+44 -34
View File
@@ -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')
Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

+279
View File
@@ -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);
}
+122 -17
View File
@@ -1,3 +1,13 @@
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 ---
let clients = [];
let me = { logged_in: false, user: '', role: '', allowed_nodes: '' };
@@ -20,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) {
@@ -67,6 +105,9 @@ function openNodeFocus(clientId) {
document.getElementById('tab-aprs').classList.remove('active');
document.getElementById('view-focus').style.display = 'block';
window.scrollTo({ top: 0, behavior: 'smooth' });
const role = me.role || '';
@@ -98,8 +139,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();
@@ -326,7 +369,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 = "";
@@ -357,14 +402,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;
@@ -571,12 +622,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('');
}
@@ -622,7 +674,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) {
@@ -631,7 +686,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 = "!";
@@ -831,9 +886,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,8 +964,8 @@ async function refreshStates() {
}
// --- NESSUN TIMER LOCALE: COMANDA MQTT ---
// Memorizza l'ultimo modo in trasmissione per usarlo durante l'Hangtime
if (isTx && isOnline) {
// 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;
}
@@ -901,6 +973,10 @@ async function refreshStates() {
// 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)";
@@ -957,6 +1033,7 @@ async function refreshStates() {
const miniStatus = document.getElementById(`mini-status-${c.id}`);
const miniName = document.getElementById(`mini-name-${c.id}`);
const miniId = document.getElementById(`mini-id-${c.id}`);
const miniCaller = document.getElementById(`mini-caller-${c.id}`);
if (miniCard && miniStatus) {
if (genObj && isOnline) {
@@ -968,12 +1045,35 @@ async function refreshStates() {
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;
@@ -985,11 +1085,15 @@ async function refreshStates() {
mStatus = `( ${txModeStr} )`;
mColor = activeModeColor;
mBorderColor = activeModeColor;
miniCard.style.boxShadow = `0 0 12px ${activeModeColor}60`; // GLOW in TX
} else if (isHold) {
mcBorder = holdColor;
mcBorder = "var(--border-main)"; // Bordo grigio per non confonderlo con TX
mStatus = `[ ${holdMode} ]`;
mColor = holdColor;
mBorderColor = holdColor;
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;
@@ -1006,6 +1110,7 @@ async function refreshStates() {
miniStatus.title = "OFFLINE";
miniStatus.style.color = "var(--danger)";
miniStatus.style.borderColor = "var(--border-light)";
miniCard.style.boxShadow = 'none';
}
}
+41 -18
View File
@@ -20,30 +20,50 @@
<!-- 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 id="top-bar-container" style="border-bottom: 2px solid var(--border-main); background: var(--bg-main, #04102e);">
<div id="top-bar" style="display: flex; justify-content: space-between; align-items: stretch; padding: 0; min-height: 90px; flex-wrap: wrap;">
<div class="nav-tabs">
<button class="nav-tab active" onclick="switchView('home')" id="tab-home">HOME</button>
<button class="nav-tab" onclick="switchView('nodes')" id="tab-nodes">NODES</button>
<button class="nav-tab" onclick="switchView('map')" id="tab-map">MAP</button>
<button class="nav-tab" onclick="switchView('aprs')" id="tab-aprs">APRS</button>
<!-- HEADER SX: BANNER CON RIEMPIMENTO ASSOLUTO A FILO -->
<div id="master-banner-container" style="display: none; flex: 0 0 45%; max-width: 45%; border-right: 2px solid var(--border-main); background: #020b1e; align-items: stretch; justify-content: stretch; padding: 0; box-sizing: border-box; overflow: hidden;">
<img src="/static/banners/banner.png" style="width: 100%; height: 100%; object-fit: cover; object-position: center; display: block;"
onload="this.parentElement.style.display='flex';"
onerror="this.parentElement.style.display='none';">
</div>
<div class="top-bar-right">
<span id="mqtt-badge" class="mqtt-badge mqtt-offline">MQTT: CHK</span>
<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>
<!-- HEADER DX: STRUTTURA FLUIDA A 3 RIGHE -->
<div id="header-right-controls" style="flex: 1; display: flex; flex-direction: column; gap: 10px; justify-content: center; padding: 12px 20px; box-sizing: border-box; background: rgba(0, 15, 45, 0.25); min-width: 350px;">
<!-- RIGA 1: BRAND E OROLOGIO -->
<div style="display: flex; justify-content: space-between; align-items: baseline; flex-wrap: wrap; gap: 10px; border-bottom: 1px dashed var(--border-light, rgba(255,255,255,0.15)); padding-bottom: 4px;">
<span class="title-brand" style="font-size: 1.15rem; font-weight: 700; letter-spacing: 2px; color: var(--text-main);">SCHEMATIC // FLEET C2</span>
<span id="live-clock" style="font-family: 'JetBrains Mono', monospace; font-size: 0.8rem; color: var(--primary); letter-spacing: 1px;">SYS_TIME: --:--:--</span>
</div>
<!-- RIGA 2: TASTI DI NAVIGAZIONE -->
<div class="nav-tabs" style="display: flex; flex-wrap: wrap; gap: 8px; border: none; margin: 0; padding: 0; width: 100%;">
<button class="nav-tab active" onclick="switchView('home')" id="tab-home" style="flex: 1; min-width: 80px; padding: 6px 0; font-size: 0.85rem; font-weight: bold; letter-spacing: 1.5px; text-align: center; border-radius: 4px;">HOME</button>
<button class="nav-tab" onclick="switchView('nodes')" id="tab-nodes" style="flex: 1; min-width: 80px; padding: 6px 0; font-size: 0.85rem; font-weight: bold; letter-spacing: 1.5px; text-align: center; border-radius: 4px;">NODES</button>
<button class="nav-tab" onclick="switchView('map')" id="tab-map" style="flex: 1; min-width: 80px; padding: 6px 0; font-size: 0.85rem; font-weight: bold; letter-spacing: 1.5px; text-align: center; border-radius: 4px;">MAP</button>
<button class="nav-tab" onclick="switchView('aprs')" id="tab-aprs" style="flex: 1; min-width: 80px; padding: 6px 0; font-size: 0.85rem; font-weight: bold; letter-spacing: 1.5px; text-align: center; border-radius: 4px;">APRS</button>
</div>
<!-- RIGA 3: BADGES E TASTI ADMIN -->
<div class="top-bar-right" style="display: flex; flex-wrap: wrap; justify-content: flex-end; align-items: center; gap: 6px; border: none; margin: 0; padding: 0; width: 100%;">
<span id="mqtt-badge" class="mqtt-badge mqtt-offline" style="padding: 4px 10px; font-size: 0.75rem; font-weight: bold; letter-spacing: 1px;">MQTT: CHK</span>
<button class="theme-switch" id="layout-btn" onclick="cycleLayout()" title="Cambia Layout" style="padding: 4px 10px; font-size: 0.75rem;">[ L: BLU ]</button>
<button class="theme-switch" id="lang-btn" onclick="toggleLang()" data-i18n-title="ttLang" style="padding: 4px 10px; font-size: 0.75rem;">ITA</button>
<button class="theme-switch" id="push-btn" onclick="subscribeToPush()" style="padding: 4px 10px; font-size: 0.75rem;">PUSH</button>
<div id="auth-container" style="display: flex; flex-wrap: wrap; align-items: center; gap: 6px; justify-content: flex-end;"></div>
</div>
</div>
</div>
</div>
<!-- VISTA FLEET MAP -->
</div><!-- VISTA FLEET MAP -->
<div id="view-map" style="display: none; padding: 0 20px;">
<div id="map-container"></div>
</div>
@@ -85,6 +105,7 @@
</div>
</div>
<!-- BANNER PERSONALIZZATO -->
<div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));">
<!-- COLONNA SX: HARDWARE E RF -->
<div style="display: flex; flex-direction: column; gap: 20px;">
@@ -193,6 +214,8 @@
<!-- VISTA HOME -->
<div id="view-home">
<div style="max-width: 1400px; margin: 0 auto 20px auto; padding: 0 20px;">
<h3 style="margin: 0 0 15px 0; font-weight: 300; letter-spacing: 2px; color: var(--text-main); border-bottom: 1px dashed var(--border-main); padding-bottom: 5px;">
[ FLEET_STATUS ]
</h3>
@@ -268,7 +291,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 +463,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>