Start fixing calculation reset

Deltares-research · Jan 13, 2025 · cd43de6 · cd43de6
1 parent e813acc
commit cd43de6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/source/package/pathways_app/controls/editable_cell.py b/source/package/pathways_app/controls/editable_cell.py
@@ -62,14 +62,20 @@ def __init__(
             ),
             padding=padding,
             bgcolor=theme.colors.calculated_bg if self.is_calculated else None,
-            on_click=self.toggle_editing,
+            on_click=self.set_editing,
         )
 
         super().__init__(control=self.cell_content)
 
-    def toggle_editing(self, _):
-        self.is_editing = not self.is_editing
+    def set_editing(self, _):
+        self.is_editing = True
+        self.update_controls()
 
+    def set_not_editing(self, _):
+        self.is_editing = False
+        self.update_controls()
+
+    def update_controls(self):
         if self.is_editing:
             self.update_input()
         else:
@@ -122,7 +128,7 @@ def __init__(self, source: object, value_attribute: str, on_finished_editing=Non
             suffix_style=theme.text.textfield_symbol,
             expand=True,
             content_padding=ft.padding.symmetric(4, 6),
-            on_blur=self.toggle_editing,
+            on_blur=self.set_not_editing,
         )
 
         def on_finished_editing_internal(_):

diff --git a/source/package/pathways_app/controls/metric_value.py b/source/package/pathways_app/controls/metric_value.py
@@ -37,7 +37,7 @@ def __init__(self, metric: Metric, value: MetricValue, on_finished_editing=None)
             text_align=ft.TextAlign.RIGHT,
             expand=True,
             content_padding=ft.padding.symmetric(4, 6),
-            on_blur=self.toggle_editing,
+            on_blur=self.set_not_editing,
         )
         self.update_input()
 
@@ -50,9 +50,9 @@ def __init__(self, metric: Metric, value: MetricValue, on_finished_editing=None)
             alignment=ft.alignment.center_right,
         )
 
-    def on_edited(self):
+    def on_edited(self, _):
         new_value = float(self.input_content.value)
-        print(new_value)
+
         if new_value != self.value.value and self.value.is_estimate:
             self.value.state = MetricValueState.OVERRIDE
         self.value.value = new_value
@@ -62,7 +62,8 @@ def on_edited(self):
 
     def on_reset_to_calculated(self):
         self.value.state = MetricValueState.ESTIMATE
-        self.on_edited()
+        self.set_not_editing()
+        print(self.value)
 
     def update_display(self):
         self.display_content.value = self.metric.unit.format(self.value.value)