From b4ee76416e4b3368fb9f7a6e83dc7ff95557c9d7 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr> Date: Mon, 27 Nov 2023 09:37:23 +0100 Subject: [PATCH] BC, LC: Disable time delegate (fix #23). --- src/Model/BoundaryCondition/BoundaryCondition.py | 2 ++ src/Model/LateralContribution/LateralContribution.py | 2 ++ src/View/BoundaryCondition/Edit/Window.py | 2 +- src/View/LateralContribution/Edit/Window.py | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Model/BoundaryCondition/BoundaryCondition.py b/src/Model/BoundaryCondition/BoundaryCondition.py index be44da2c..5a955b37 100644 --- a/src/Model/BoundaryCondition/BoundaryCondition.py +++ b/src/Model/BoundaryCondition/BoundaryCondition.py @@ -191,6 +191,8 @@ class BoundaryCondition(SQLSubModel): if type(data) is str: if data.count(":") == 3: return old_pamhyr_date_to_timestamp(data) + if data.count(":") == 2: + return old_pamhyr_date_to_timestamp("00:" + data) if data.count(".") == 1: return round(float(data)) diff --git a/src/Model/LateralContribution/LateralContribution.py b/src/Model/LateralContribution/LateralContribution.py index c7248abe..2d956c02 100644 --- a/src/Model/LateralContribution/LateralContribution.py +++ b/src/Model/LateralContribution/LateralContribution.py @@ -191,6 +191,8 @@ class LateralContribution(SQLSubModel): if type(data) is str: if data.count(":") == 3: return old_pamhyr_date_to_timestamp(data) + if data.count(":") == 2: + return old_pamhyr_date_to_timestamp("00:" + data) if data.count(".") == 1: return round(float(data)) diff --git a/src/View/BoundaryCondition/Edit/Window.py b/src/View/BoundaryCondition/Edit/Window.py index de6415c0..ccec087b 100644 --- a/src/View/BoundaryCondition/Edit/Window.py +++ b/src/View/BoundaryCondition/Edit/Window.py @@ -160,7 +160,7 @@ class EditBoundaryConditionWindow(PamhyrWindow): table_headers=headers, editable_headers=self._data.header, delegates={ - "time": self._delegate_time, + #"time": self._delegate_time, }, data=self._data, undo=self._undo_stack, diff --git a/src/View/LateralContribution/Edit/Window.py b/src/View/LateralContribution/Edit/Window.py index 72c59b4c..745fd15e 100644 --- a/src/View/LateralContribution/Edit/Window.py +++ b/src/View/LateralContribution/Edit/Window.py @@ -101,7 +101,7 @@ class EditLateralContributionWindow(PamhyrWindow): table_headers=headers, editable_headers=self._data.header, delegates={ - "time": self._delegate_time, + #"time": self._delegate_time, }, data=self._data, undo=self._undo_stack, -- GitLab