diff --git a/src/wireviz/wv_bom.py b/src/wireviz/wv_bom.py index 3a2d55c..2e5cbb2 100644 --- a/src/wireviz/wv_bom.py +++ b/src/wireviz/wv_bom.py @@ -31,14 +31,20 @@ def get_additional_component_table(harness: "Harness", component: Union[Connecto columns = [] if harness.show_bom_item_numbers: columns.append(bom_bubble(id)) - columns.append(f'{part.qty * component.get_qty_multiplier(part.qty_multiplier)}' + (f' {part.unit}' if part.unit else ' x')) + columns.append(f'{part.qty * component.get_qty_multiplier(part.qty_multiplier)}' + (f' {part.unit}' if part.unit else 'x')) columns.append(f'{part.type}') if harness.show_part_numbers: columns.append(f'P/N: {part.pn}' if part.pn else '') columns.append(f'{manufacturer_str}' if manufacturer_str else '') columns.append(f'{part.note}' if part.note else '') - rowstr = '\n \n' + ''.join([f' {html_line_breaks(col)}\n' for col in columns]) + ' ' + # TODO: Remove empty columns + + rowstr = '\n \n' + for index, column in enumerate(columns): + sides = "tbl" if index == 0 else "tbr" if index == len(columns) -1 else "tb" + rowstr = rowstr + f' {html_line_breaks(column)}\n' + rowstr = rowstr + ' ' rows.append(rowstr) pre = '' diff --git a/test/bomnumbertest.bom.tsv b/test/bomnumbertest.bom.tsv new file mode 100644 index 0000000..fb6b2da --- /dev/null +++ b/test/bomnumbertest.bom.tsv @@ -0,0 +1,9 @@ +Id Item Qty Unit Designators P/N Manufacturer MPN +1 Cable, 4 x 0.25 mm² 99 m W1 qwerty uiop +2 Connector, Plug, 4 pins 1 X1 123 ACME ABC +3 Connector, Receptacle, 4 pins 1 X2 234 ACME DEF +4 Crimp 1 X2 876 ACME WVU +5 Crimp 4 X1 987 ACME ZYX +6 Housing 1 X1 345 OTHER +7 Label 1 X1 +8 Sleeving 5 m W1