From 0401f26cad1133013595207d2e03a6c99130b7f3 Mon Sep 17 00:00:00 2001 From: germano2239 Date: Tue, 26 Jul 2022 15:34:09 +0200 Subject: [PATCH] dev gg --- config/machine_settings/defaults.ini | 4 ++-- src/lib/db/__init__.py | 18 ++++++++++++++---- src/ui/crud/crud.py | 6 ++++++ src/ui/recipe_selection/recipe_selection.py | 4 ++-- .../recipe_spec_and_step_editor.ui | 2 +- .../recipes_management/recipes_management.py | 2 +- src/ui/steps_management/steps_management.py | 2 +- src/ui/test/test.py | 1 - 8 files changed, 27 insertions(+), 12 deletions(-) diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index c5ca5f5..2286f40 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -27,8 +27,8 @@ service_account_json: data/secrets/MACHINE-bucket-sevice-account_errecinque-prod bucket_id: MACHINE [label_printer] -platform: cups -printer: +platform: windows +printer: zd421 [tecna_t3] diff --git a/src/lib/db/__init__.py b/src/lib/db/__init__.py index d8f0a4f..d06e5c5 100644 --- a/src/lib/db/__init__.py +++ b/src/lib/db/__init__.py @@ -115,11 +115,21 @@ Users.register(username="USER", password="user") # register test recipe Recipes.replace( id=0, - name="TEST", - client="TEST_CLIENT", - part_number="TEST_PART_NUMBER", + name="Ferrari 923578", + client="Ferrari", + part_number="923578", spec={"steps": []}, - description="TEST_DESCRIPTION", + description="Tubo plastica doppia biforcazione con termorestringente centrale", + archived=False, +).execute() + +Recipes.replace( + id=1, + name="BLOW-BY 5802814210", + client="", + part_number="5802814210", + spec={"steps": []}, + description="Tubo blow-by", archived=False, ).execute() diff --git a/src/ui/crud/crud.py b/src/ui/crud/crud.py index c831ad7..f427aad 100755 --- a/src/ui/crud/crud.py +++ b/src/ui/crud/crud.py @@ -340,6 +340,12 @@ class Crud(Widget): self.db_tw.setColumnCount(len(self.select)) self.db_tw.setHorizontalHeaderLabels(self.fields_aliases.values()) self.db_tw.setRowCount(1) + self.db_tw.setColumnWidth(0, 25) + self.db_tw.setColumnWidth(1, 200) + self.db_tw.setColumnWidth(2, 200) + self.db_tw.setColumnWidth(3, 200) + self.db_tw.setColumnWidth(4, 200) + self.db_tw.setColumnWidth(5, 400) if self.readonly is None or self.readonly is True: self.db_tw.verticalHeader().setHidden(True) else: diff --git a/src/ui/recipe_selection/recipe_selection.py b/src/ui/recipe_selection/recipe_selection.py index 1226ae8..ad0e5e3 100755 --- a/src/ui/recipe_selection/recipe_selection.py +++ b/src/ui/recipe_selection/recipe_selection.py @@ -24,7 +24,7 @@ class Recipe_Selection(Widget): "client": "Cliente", "part_number": "N° disegno", "spec": "Specifica", - "description": "Desccrizione", + "description": "Descrizione", "archived": "Archiviata", } filters = None @@ -35,7 +35,7 @@ class Recipe_Selection(Widget): "client": "Cliente", "part_number": "N° disegno", "spec": "Specifica", - "description": "Desccrizione", + "description": "Descrizione", # "archived": "Archiviata", } filters = {"archived": False} diff --git a/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui b/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui index 30efe43..8a3eb6f 100644 --- a/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui +++ b/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui @@ -17,7 +17,7 @@ - Salva configurasione + Salva configurazione Fasi di Test diff --git a/src/ui/recipes_management/recipes_management.py b/src/ui/recipes_management/recipes_management.py index c0b1b3f..0bebc58 100644 --- a/src/ui/recipes_management/recipes_management.py +++ b/src/ui/recipes_management/recipes_management.py @@ -12,7 +12,7 @@ class Recipes_Management(Widget): "client": "Cliente", "part_number": "N° disegno", "spec": "Specifica", - "description": "Desccrizione", + "description": "Descrizione", "archived": "Archiviata", } self.crud = Crud( diff --git a/src/ui/steps_management/steps_management.py b/src/ui/steps_management/steps_management.py index 4a5735a..c17e86c 100644 --- a/src/ui/steps_management/steps_management.py +++ b/src/ui/steps_management/steps_management.py @@ -63,7 +63,7 @@ class Steps_Management(Widget): "name": "Fase di test", "type": "Tipo", "spec": "Specifica", - "description": "Desccrizione", + "description": "Descrizione", "archived": "Archiviata", } self.crud = Crud( diff --git a/src/ui/test/test.py b/src/ui/test/test.py index 297d699..a198a23 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -282,7 +282,6 @@ class Test(Widget): "DATETIME": str(archived.time.isoformat()), "SHIFT": "-", "STATION": "-", - "SHIFT": "-", "OPERATOR": str(Users.get_session().user.username), "PMAX": "-", "PMIN": "-",