Merge pull request #278 from dreng/274_power_panels_wrong_names

Fixes #274: Incorrect names displayed for power panels/feeds
This commit is contained in:
Mario
2023-04-17 15:30:41 +02:00
committed by GitHub
+4 -4
View File
@@ -64,7 +64,7 @@ def create_node(
node = {} node = {}
node_content = "" node_content = ""
if isinstance(device, Circuit): if isinstance(device, Circuit):
dev_name = f"Circuit {device.cid}" dev_name = device.cid
node["id"] = f"c{device.pk}" node["id"] = f"c{device.pk}"
if device.provider is not None: if device.provider is not None:
@@ -74,7 +74,7 @@ def create_node(
if device.type is not None: if device.type is not None:
node_content += f"<tr><th>Type: </th><td>{device.type.name}</td></tr>" node_content += f"<tr><th>Type: </th><td>{device.type.name}</td></tr>"
elif isinstance(device, PowerPanel): elif isinstance(device, PowerPanel):
dev_name = f"Power Panel {device.pk}" dev_name = device.name
node["id"] = f"p{device.pk}" node["id"] = f"p{device.pk}"
if device.site is not None: if device.site is not None:
@@ -84,7 +84,7 @@ def create_node(
f"<tr><th>Location: </th><td>{device.location.name}</td></tr>" f"<tr><th>Location: </th><td>{device.location.name}</td></tr>"
) )
elif isinstance(device, PowerFeed): elif isinstance(device, PowerFeed):
dev_name = f"Power Feed {device.pk}" dev_name = device.name
node["id"] = f"f{device.pk}" node["id"] = f"f{device.pk}"
if device.power_panel is not None: if device.power_panel is not None:
@@ -104,7 +104,7 @@ def create_node(
else: else:
dev_name = device.name dev_name = device.name
if dev_name is None: if dev_name is None:
dev_name = "device name unknown" dev_name = device.device_type.get_full_name
if device.device_type is not None: if device.device_type is not None:
node_content += ( node_content += (