Eduardo_Scripniciuc/st-ten-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
neo-dl 2022-09-26 13:08:48 +02:00
commit cab4587a1b
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/machine_settings/defaults.ini
View File

@ -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

4
config/machine_settings/stten3.ini
View File

@ -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

8
src/ui/recipe_selection/recipe_selection.py
View File

@ -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"],