From 1b9ba0b03f7cc0e6914ab4d04da8fa7588d37dfb Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Thu, 20 Apr 2023 15:25:21 -0400
Subject: [PATCH] connector: small fixes

---
 src/wireviz/templates/connector.html        | 6 +++---
 src/wireviz/templates/simple-connector.html | 2 +-
 src/wireviz/wv_graphviz.py                  | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/wireviz/templates/connector.html b/src/wireviz/templates/connector.html
index 0230f7a..bcddf9c 100644
--- a/src/wireviz/templates/connector.html
+++ b/src/wireviz/templates/connector.html
@@ -6,9 +6,8 @@
     <td>
       <table border="0" cellborder="1" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
         <tr>
-          <td>
-            <b> {{ designator }} </b>
-          </td>
+          <td colspan="2"> <b> {{ designator }} </b> </td>
+          <!-- <td> BOM: {{ bom_id }} </td> !-->
         </tr>
       </table>
     </td>
@@ -21,6 +20,7 @@
           <td> {{ subtype }} </td>
           {% if show_pincount %} <td > {{ pincount }}-pin </td> {% endif %}
           {% if color %} <td > {{ color }} </td> {% endif %}
+          {% if color %} {{ colors.colorbar_cells(color, color_len) }} {% endif %}
         </tr>
       </table>
     </td>
diff --git a/src/wireviz/templates/simple-connector.html b/src/wireviz/templates/simple-connector.html
index 5bcd0c0..77fb3f5 100644
--- a/src/wireviz/templates/simple-connector.html
+++ b/src/wireviz/templates/simple-connector.html
@@ -8,7 +8,7 @@
       <table border="0" cellborder="1" cellpadding="3" cellspacing="0">
         <tr>
           <td port="p1l"> {{ type }} </td>
-          <td > {{ subtype }} </td>
+          {% if subtype %} <td > {{ subtype }} </td> {% endif %}
           {% if show_pincount %} <td> {{ pincount }}-pin </td> {% endif %}
           {% if color %} <td > {{ color }} </td> {% endif %}
           {% if color %} {{ colors.colorbar_cells(color, color_len, "p1r") }} {% endif %}
diff --git a/src/wireviz/wv_graphviz.py b/src/wireviz/wv_graphviz.py
index dde0111..4c870d7 100644
--- a/src/wireviz/wv_graphviz.py
+++ b/src/wireviz/wv_graphviz.py
@@ -70,6 +70,7 @@ def gv_node_connector(connector: Connector) -> Table:
         'use_right': use_right,
         'pins': pins,
         'columns': columns,
+        'bom_id': connector.bom_entry.id,
         # TODO: support asdict(connector)
         'type': html_line_breaks(connector.type),
         'subtype': html_line_breaks(connector.subtype),