- adds translations

- adds defect widgets to scheduler completed item quick editor

Author: MAKOMO

src/artisanlib/main.py

@@ -18614,18 +18614,18 @@ def settingsLoad(self, filename:Optional[str] = None, theme:bool = False, machin
             self.scale1_model = settings.value('scale1_model',self.scale1_model)
             self.scale1_name = settings.value('scale1_name',self.scale1_name)
             self.scale1_id = settings.value('scale1_id',self.scale1_id)
-            self.container1_idx = settings.value('container1_idx',self.container1_idx)
+            self.container1_idx = toInt(settings.value('container1_idx',int(self.container1_idx)))
             self.scale2_model = settings.value('scale2_model',self.scale2_model)
             self.scale2_name = settings.value('scale2_name',self.scale2_name)
             self.scale2_id = settings.value('scale2_id',self.scale2_id)
-            self.container2_idx = settings.value('container2_idx',self.container2_idx)
+            self.container2_idx = toInt(settings.value('container2_idx',int(self.container2_idx)))
             settings.endGroup()
 #--- END GROUP Scales
 
             self.schedule_day_filter =toBool(settings.value('ScheduleDayFilter',self.schedule_day_filter))
             self.schedule_user_filter = toBool(settings.value('ScheduleUserFilter',self.schedule_user_filter))
             self.schedule_machine_filter = toBool(settings.value('ScheduleMachineFilter',self.schedule_machine_filter))
-            self.schedule_visible_filter =toBool(settings.value('ScheduleVisibleFilter',self.schedule_visible_filter))
+            self.schedule_visible_filter = toBool(settings.value('ScheduleVisibleFilter',self.schedule_visible_filter))
             self.scheduled_items_uuids = list(toStringList(settings.value('scheduled_items',self.scheduled_items_uuids)))
             self.scheduleFlag = toBool(settings.value('Schedule',self.scheduleFlag))
             self.scheduler_tasks_visible = toBool(settings.value('SchedulerTasks',self.scheduler_tasks_visible))

src/artisanlib/roast_properties.py

@@ -2846,7 +2846,7 @@ def changeWeightUnit(self, i:int) -> None:
         try:
             if self.aw.schedule_window is not None:
                 # we need to ensure that an open completed item edit is cleared/closed not to use the wrong unit which might have changed here
-                self.aw.schedule_window.clearCompletedItemSelection()
+                self.aw.schedule_window.cancel_completed_item_edit()
         except Exception: # pylint: disable=broad-except
             pass
 

src/includes/Machines/IMF/RM_control_2PID.aset

@@ -464,6 +464,7 @@ def applyServerUpdates(data:Dict[str, Any]) -> None:
             win:float = aw.qmc.weight[0]
             wout:float = aw.qmc.weight[1]
             wunit:str = aw.qmc.weight[2]
+            wdefects: float = aw.qmc.roasted_defects_weight
             if 'amount' in data and data['amount'] is not None:
                 assert isinstance(data['amount'], (int, float))
                 w = convertWeight(
@@ -486,6 +487,18 @@ def applyServerUpdates(data:Dict[str, Any]) -> None:
             if dirty:
                 # register new data
                 aw.qmc.weight = (win,wout,wunit)
+            if 'defects_weight' in data and data['defects_weight'] is not None:
+                w = convertWeight(
+                    data['defects_weight'],
+                    weight_units.index('Kg'),
+                    weight_units.index(wunit),
+                )
+                if w != wdefects:
+                    wdefects = w
+                    dirty = True
+            if dirty:
+                # register new data
+                aw.qmc.roasted_defects_weight = wdefects
             if 'batch_number' in data:
                 if data['batch_number'] != aw.qmc.roastbatchnr:
                     aw.qmc.roastbatchnr = data['batch_number']

src/plus/schedule.py

@@ -25,7 +25,7 @@ pytest-cov==6.1.1
 #pytest-bdd==6.1.1
 #pytest-benchmark==4.0.0
 #pytest-mock==3.11.1
-hypothesis>=6.131.3
+hypothesis>=6.131.6
 coverage>=7.8.0
 coverage-badge==1.1.2
 codespell==2.4.1

src/plus/sync.py

@@ -52,7 +52,7 @@ psutil==7.0.0
 typing-extensions==4.10.0; python_version < '3.8' # required for supporting Final and TypeDict on Python <3.8
 protobuf==5.29.3 # v5.30.x drops support for Python 3.8!
 numpy==1.24.3; python_version < '3.9' # last Python 3.8 release
-numpy==2.2.4; python_version >= '3.9'
+numpy==2.2.5; python_version >= '3.9'
 scipy==1.10.1; python_version < '3.9' # last Python 3.8 release
 scipy==1.15.2; python_version >= '3.9'
 wquantiles==0.6
@@ -67,7 +67,7 @@ matplotlib==3.7.3; python_version < '3.9' # last Python 3.8 release
 matplotlib==3.10.0; python_version >= '3.9'
 jinja2==3.1.5
 aiohttp==3.10.11; python_version < '3.9' # last Python 3.8 release
-aiohttp==3.11.16; python_version >= '3.9'
+aiohttp==3.11.17; python_version >= '3.9'
 aiohttp_jinja2==1.6
 python-bidi==0.4.2; python_version < '3.9' # last Python 3.8 release
 python-bidi==0.6.6; python_version >= '3.9'