diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index 01e0b75..83b4057 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -69,5 +69,7 @@ recipe_name_field: codice_ricetta ; recipe_name_field: codice_ricetta_cl barcode_enable_field: verifica_codice_a_barre_abilitata ; barcode_enable_field: verifica_codice_a_barre_abilitata_cl +barcode_serial_field: codice_a_barre +; barcode_serial_field: codice_a_barre_cl label_template_field: modello_etichetta ; label_template_field: modello_etichetta_cl diff --git a/config/machine_settings/stten3.ini b/config/machine_settings/stten3.ini index a4fa624..23f7710 100644 --- a/config/machine_settings/stten3.ini +++ b/config/machine_settings/stten3.ini @@ -17,6 +17,6 @@ port: COM10 ; recipe_name_field: codice_ricetta recipe_name_field: codice_ricetta_cl ; barcode_enable_field: verifica_codice_a_barre_abilitata -; barcode_enable_field: verifica_codice_a_barre_abilitata_cl +barcode_enable_field: verifica_codice_a_barre_abilitata_cl ; label_template_field: modello_etichetta -; label_template_field: modello_etichetta_cl +label_template_field: modello_etichetta_cl diff --git a/src/ui/recipe_selection/recipe_selection.py b/src/ui/recipe_selection/recipe_selection.py index 7f8615f..d8678db 100755 --- a/src/ui/recipe_selection/recipe_selection.py +++ b/src/ui/recipe_selection/recipe_selection.py @@ -150,13 +150,14 @@ class Recipe_Selection(Widget): def read_steps(self, row, defaults=None): if defaults is None: defaults = self.defaults + barcode_serial_field = self.config.get("recipe", {}).get("barcode_serial_field", "codice_a_barre").strip() print_template_field = self.config.get("recipe", {}).get("label_template_field", "modello_etichetta").strip() return { "connector": { "connector": row.get("connettore", defaults["connettore"]), }, "barcodes": { - "serial": row.get("codice_a_barre", defaults["codice_a_barre"]), + "serial": row.get(barcode_serial_field, defaults["codice_a_barre"]), }, "resistance": { "scale": float(row.get("scala_resistenza", defaults["scala_resistenza"])), @@ -292,6 +293,7 @@ class Recipe_Selection(Widget): os.makedirs(csv_dir, exist_ok=True) recipe_name_field = self.config.get("recipe", {}).get("recipe_name_field", "codice_ricetta").strip() barcode_enale_field = self.config.get("recipe", {}).get("barcode_enable_field", "verifica_codice_a_barre_abilitata").strip() + barcode_serial_field = self.config.get("recipe", {}).get("barcode_serial_field", "codice_a_barre").strip() print_template_field = self.config.get("recipe", {}).get("label_template_field", "modello_etichetta").strip() data = [] fieldnames = [ @@ -301,7 +303,7 @@ class Recipe_Selection(Widget): "verifica_connettore_abilitata", "connettore", barcode_enale_field, - "codice_a_barre", + barcode_serial_field, "verifica_resistenza_connettore_abilitata", "scala_resistenza", "resistenza_attesa", @@ -346,7 +348,7 @@ class Recipe_Selection(Widget): "verifica_connettore_abilitata": "x" if recipe.spec["connector"] else "", "connettore": steps["connector"].spec["connector"], barcode_enale_field: "x" if recipe.spec["barcodes"] else "", - "codice_a_barre": steps["barcodes"].spec["serial"], + barcode_serial_field: steps["barcodes"].spec["serial"], "verifica_resistenza_connettore_abilitata": "x" if recipe.spec["resistance"] else "", "scala_resistenza": steps["resistance"].spec["scale"], "resistenza_attesa": steps["resistance"].spec["expected"],