Skip to content

Group switch tile channels under device headings #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mot-yelraf merged 1 commit into from
Sep 11, 2026
Merged

Group switch tile channels under device headings #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/user_guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ The technical sensor or switch ID remains the stable identity used by settings,

### Switch Tiles

Switch Tiles show local Raspberry Pi relay channels and remote Nodus switch channels through the same interface. Each Switch Tile represents one channel and has a label, current state, and recent state changes. Sensorius groups Switch Tiles under their switch-device heading. Manual toggles send commands through the shared switch controller. For Nodus switches, commands are sent through MQTT and Sensorius waits for state to return from the device.
Switch Tiles show local Raspberry Pi relay channels and remote Nodus switch channels through the same interface. Each Switch Tile represents one channel and has a label, current state, and recent state changes. Sensorius groups switches by location. When multiple devices share a location, the title identifies the first device and shows its settings gear. Each additional device has a centered, full-width divider with its ID, settings gear, and location above its channel labels, styled to match the title. Manual toggles send commands through the shared switch controller. For Nodus switches, commands are sent through MQTT and Sensorius waits for state to return from the device.

If an enabled Advanced automation owns a switch channel, Sensorius blocks manual toggles for that channel so the automation remains in control.

Expand Down
2 changes: 1 addition & 1 deletion sensorius/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
release notes, and supporting tooling can report a consistent build identity.
"""

__version__ = "v0.26.253.5"
__version__ = "v0.26.253.8"
40 changes: 19 additions & 21 deletions sensorius/saiHtml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1297,7 +1297,6 @@ def _render_switch_cards_for_location(location: str, matched_switches: list):
rendered_swids_here: set[str] = set()
switch_rows: list[dict] = []
switch_ids_here: list[str] = []
label_counts: dict[str, int] = defaultdict(int)

for switch_ctrl in matched_switches:
sw_id: str = (getattr(switch_ctrl, "switch_id", "") or "").strip()
Expand Down Expand Up @@ -1398,7 +1397,6 @@ def _render_switch_cards_for_location(location: str, matched_switches: list):
continue

for label in render_labels:
label_counts[str(label or "").strip().lower()] += 1
switch_rows.append({
"empty": False,
"switch_ctrl": switch_ctrl,
Expand All @@ -1414,16 +1412,15 @@ def _render_switch_cards_for_location(location: str, matched_switches: list):
header_id = _safe(f"{'_'.join(switch_ids_here) if switch_ids_here else location}_header")
yield f"<div class='switch-metric-container' data-switch-ids='{switch_ids_attr}'>"
yield "<div style='text-align:center; width:100%; margin-top:-1.5rem; margin-bottom:-1.0rem;'>"
if not multi_switch_card and switch_ids_here:
if switch_ids_here:
header_sw_id = switch_ids_here[0]
yield f"<h3 id='{header_id}'>{header_sw_id.upper()} "
yield f"<h3 id='{header_id}' class='switch-device-title'>{header_sw_id.upper()} "
yield f" <a href='javascript:void(0)' onclick='editSwitchSettings(\"{header_sw_id}\")' title='Open {header_sw_id} Settings' style='display:inline-flex; align-items:center; justify-content:center; line-height:1; margin-left:2px; margin-right:8px; text-decoration:none; font-size:0.8em; vertical-align:middle;'>"
yield from _settings_gear_svg_lines(indent=" ")
yield " </a>"
yield f"{location}</h3>"
else:
header_devices = ", ".join(sw.upper() for sw in switch_ids_here if sw)
yield f"<h3 id='{header_id}'>SWITCHES <span style='font-size:0.72em; font-weight:normal;'>{header_devices}</span> {location}</h3>"
yield f"<h3 id='{header_id}'>SWITCHES {location}</h3>"
yield "</div>"

yield "<div class='switch-container'>"
Expand All @@ -1434,15 +1431,28 @@ def _render_switch_cards_for_location(location: str, matched_switches: list):
yield "</tr></thead>"
yield "<tbody>"

if not any(not row.get("empty") for row in switch_rows):
if not multi_switch_card and not any(not row.get("empty") for row in switch_rows):
yield "<tr><td colspan='3' style='opacity:0.7;'>No enabled switch channels</td></tr>"

previous_device_id = switch_rows[0]["sw_id"]
for row in switch_rows:
sw_id = row["sw_id"]
if multi_switch_card and sw_id != previous_device_id:
previous_device_id = sw_id
yield "<tr class='switch-device-divider'><th colspan='3'><h3 class='switch-device-title'>"
yield html_escape(sw_id.upper() or "Unknown device")
if sw_id:
settings_action = html_escape(f"editSwitchSettings({json.dumps(sw_id)})")
yield f" <a href='javascript:void(0)' onclick='{settings_action}' title='Open {html_escape(sw_id)} Settings' style='display:inline-flex; align-items:center; justify-content:center; line-height:1; margin-left:2px; margin-right:8px; text-decoration:none; font-size:0.8em; vertical-align:middle;'>"
yield from _settings_gear_svg_lines(indent="", aria_hidden=True)
yield "</a>"
yield f" {html_escape(location)}</h3></th></tr>"
if row.get("empty"):
if multi_switch_card:
yield "<tr><td colspan='3' style='opacity:0.7;'>No enabled switch channels</td></tr>"
continue

switch_ctrl = row["switch_ctrl"]
sw_id = row["sw_id"]
label = row["label"]
safe_label = label.lower().replace(" ", "_")
is_on = bool(getattr(switch_ctrl, "last_state", {}).get(label, False))
Expand Down Expand Up @@ -1500,19 +1510,7 @@ def _render_switch_cards_for_location(location: str, matched_switches: list):
if automation_enabled:
state_cell_classes += " automation-enabled"

label_key = label_norm.lower()
display_label = label
if label_counts.get(label_key, 0) > 1 and sw_id:
display_label = f"{label} ({sw_id.upper()})"

label_cell = html_escape(display_label)
if multi_switch_card and sw_id:
label_cell += (
f" <a href='javascript:void(0)' onclick='editSwitchSettings(\"{sw_id}\")' "
f"title='Open {sw_id} Settings' style='display:inline-flex; align-items:center; justify-content:center; line-height:1; margin-left:4px; text-decoration:none; font-size:0.8em; vertical-align:middle;'>"
)
label_cell += "".join(_settings_gear_svg_lines(indent="", aria_hidden=True))
label_cell += "</a>"
label_cell = html_escape(label)

yield "<tr>"
yield f"<td>{label_cell}</td>"
Expand Down
6 changes: 6 additions & 0 deletions ui_static/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,12 @@ body.dashboard-page #sensor_header{
background-color:var(--dashboard-card-bg); color:var(--dashboard-card-text);
}
.switch-table th{ font-weight:bold; }
.switch-device-title{ font-size:1.17rem; font-weight:bold; }
.switch-device-divider .switch-device-title{ margin:0; }
.switch-table .switch-device-divider th{
text-align:center; overflow-wrap:anywhere;
border-top:2px solid var(--dashboard-card-border);
}

.switch-state-cell{
display:flex; flex-direction:column; align-items:center; justify-content:flex-start; gap:.05rem;
Expand Down