diff --git a/main.py b/main.py index 195ea641f89b0d325774a1103b94a8f3a89e53c2..6028185cd62e35e30d2da4104abef65a9f07b6ea 100644 --- a/main.py +++ b/main.py @@ -269,9 +269,11 @@ class page(): # Tab 2: XML Unit Validator self.upload_widget = FileInput(accept=".xml") self.upload_widget.on_change('value', self.process_xml) - self.valid_units_message = Div(text="No valid units found", css_classes=["msg-negative"]) + self.valid_units_message = Div(text="Upload an XML file to validate units", css_classes=["msg-neutral"]) + self.invalid_units_message = Div(text="", css_classes=["msg-neutral"]) self.invalid_units_column = column() - tab2_layout = column(self.upload_widget, self.valid_units_message, self.invalid_units_column) + + tab2_layout = column(self.upload_widget, self.valid_units_message, self.invalid_units_message, self.invalid_units_column) tab2 = TabPanel(child=tab2_layout, title="XML Unit Validator") tabs = Tabs(tabs=[tab1, tab2]) @@ -291,15 +293,22 @@ class page(): self.valid_units_message.text = "No valid units found" self.valid_units_message.css_classes = ["msg-negative"] + # Update invalid units message + if invalid_units: + self.invalid_units_message.text = f"{len(invalid_units)} invalid units found" + self.invalid_units_message.css_classes = ["msg-negative"] + else: + self.invalid_units_message.text = "" + self.invalid_units_message.css_classes = ["msg-neutral"] + # Update invalid units column self.invalid_units_column.children = [] for line_num, details in invalid_units.items(): - warnings_div = column([Div(text=warning) for warning in details.get("warnings", [])]) - parsedunit=dsiUnit(details["unit"]) + warnings_div = column([Div(text=warning, css_classes=["msg-warning"]) for warning in details.get("warnings", [])]) unit_div = row([ - Div(text=str(line_num)), - Div(text=details["unit"]), - Div(text=parsedunit.toLatex()), + Div(text=str(line_num), css_classes=["msg-neutral"]), + Div(text=f"{dsiUnit(details['unit']).toLatex()}"), + Div(text=details["unit"], css_classes=["msg-raw"]), warnings_div ]) self.invalid_units_column.children.append(unit_div)