diff --git a/src/ui/recipe_selection/recipe_selection.py b/src/ui/recipe_selection/recipe_selection.py index 0c70191..5c08994 100755 --- a/src/ui/recipe_selection/recipe_selection.py +++ b/src/ui/recipe_selection/recipe_selection.py @@ -106,8 +106,12 @@ class Recipe_Selection(Widget): self.crud.db_tw.setColumnWidth(3, 200) self.crud.db_tw.setColumnWidth(4, 200) self.crud.db_tw.setColumnWidth(5, 400) - self.import_b.clicked.connect(lambda checked, self=weakref.ref(self): self().import_recipes()) - self.export_b.clicked.connect(lambda checked, self=weakref.ref(self): self().export_recipes()) + if session.is_admin: + self.import_b.clicked.connect(lambda checked, self=weakref.ref(self): self().import_recipes()) + self.export_b.clicked.connect(lambda checked, self=weakref.ref(self): self().export_recipes()) + else: + self.import_b.setVisible(False) + self.export_b.setVisible(False) # TESTING if "--auto-select" in sys.argv or "--test" in sys.argv: recipe = "TEST" diff --git a/src/ui/test_resistance/test_resistance.py b/src/ui/test_resistance/test_resistance.py index da3f1d8..46159b3 100644 --- a/src/ui/test_resistance/test_resistance.py +++ b/src/ui/test_resistance/test_resistance.py @@ -110,13 +110,17 @@ class Test_Resistance(Test_Test): if type(v) is float: v = round(v, 2) l.setText(str(v)) - ok = data.get("results", {}).get("ok", None) is True + ok = data.get("results", {}).get("ok", None) + r = d.get("measure", None) i = ok p = ok - if i is None and data.get("results", {}).get("data", None) != 1e9: + if i is None and r != 1e9: i = False - if p is None and data.get("results", {}).get("data", None) == 1e9: - p = "warning" + if p is None: + if r == 1e9: + p = "warning" + else: + p = False bg = self.status_palettes[p].color(QPalette.Base) color = f"rgb({bg.red()}, {bg.green()}, {bg.blue()})" self.resistance_l.setStyleSheet(f"background-color: {color};\nborder: 1px solid black;\n")