From 9b53b4302b72447c8df0238b84d810e5c0363f36 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Tue, 21 Nov 2023 09:10:11 +0100
Subject: [PATCH] BC,IC: Enable to get time int from float string (fix #21).
---
src/Model/BoundaryCondition/BoundaryCondition.py | 7 +++++--
src/Model/LateralContribution/LateralContribution.py | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/Model/BoundaryCondition/BoundaryCondition.py b/src/Model/BoundaryCondition/BoundaryCondition.py
index 6368cc86..be44da2c 100644
--- a/src/Model/BoundaryCondition/BoundaryCondition.py
+++ b/src/Model/BoundaryCondition/BoundaryCondition.py
@@ -188,8 +188,11 @@ class BoundaryCondition(SQLSubModel):
@classmethod
def time_convert(cls, data):
- if type(data) is str and data.count(":") == 3:
- return old_pamhyr_date_to_timestamp(data)
+ if type(data) is str:
+ if data.count(":") == 3:
+ return old_pamhyr_date_to_timestamp(data)
+ if data.count(".") == 1:
+ return round(float(data))
return int(data)
diff --git a/src/Model/LateralContribution/LateralContribution.py b/src/Model/LateralContribution/LateralContribution.py
index a59de8e8..c7248abe 100644
--- a/src/Model/LateralContribution/LateralContribution.py
+++ b/src/Model/LateralContribution/LateralContribution.py
@@ -188,8 +188,11 @@ class LateralContribution(SQLSubModel):
@classmethod
def time_convert(cls, data):
- if data is str and data.count(":") == 3:
- return old_pamhyr_date_to_timestamp(data)
+ if type(data) is str:
+ if data.count(":") == 3:
+ return old_pamhyr_date_to_timestamp(data)
+ if data.count(".") == 1:
+ return round(float(data))
return int(data)
--
GitLab