From afb3483fe342d2860bac883f4432ee721d13e184 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Tue, 16 Jul 2024 08:58:12 +0200
Subject: [PATCH] pamhyr: Fix windows timestamp.
---
src/Model/Study.py | 6 +++---
src/View/Tools/PamhyrDelegate.py | 6 ++++--
src/tools.py | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/Model/Study.py b/src/Model/Study.py
index eee59905..aed5d689 100644
--- a/src/Model/Study.py
+++ b/src/Model/Study.py
@@ -230,16 +230,16 @@ class Study(SQLModel):
)
self.execute(
"INSERT INTO info VALUES ('date', " +
- f"'{self._date.timestamp()}')"
+ f"'{timestamp(self._date)}')"
)
self.execute(
"INSERT INTO info VALUES ('creation_date', " +
- f"'{self.creation_date.timestamp()}')"
+ f"'{timestamp(self.creation_date)}')"
)
self.execute(
"INSERT INTO info VALUES ('last_save_date', " +
- f"'{self.last_save_date.timestamp()}')"
+ f"'{timestamp(self.last_save_date)}')"
)
self._create_submodel()
diff --git a/src/View/Tools/PamhyrDelegate.py b/src/View/Tools/PamhyrDelegate.py
index 00e09eed..1a9d4cbf 100644
--- a/src/View/Tools/PamhyrDelegate.py
+++ b/src/View/Tools/PamhyrDelegate.py
@@ -18,6 +18,8 @@
import logging
+from tools import timestamp
+
from PyQt5.QtCore import (
Qt, QRect, QTime, QDateTime, pyqtSlot,
)
@@ -55,8 +57,8 @@ class PamhyrExTimeDelegate(QItemDelegate):
if self._mode == "time":
model.setData(index, int(time.total_seconds()))
else:
- logger.debug(str(time.timestamp()))
- model.setData(index, int(time.timestamp()))
+ logger.debug(str(timestamp(time)))
+ model.setData(index, int(timestamp(time)))
editor.close()
editor.deleteLater()
diff --git a/src/tools.py b/src/tools.py
index 422fcdd6..d7ba936d 100644
--- a/src/tools.py
+++ b/src/tools.py
@@ -237,7 +237,7 @@ def timestamp(dt: datetime):
def date_iso_to_timestamp(date: str):
if type(date) is str:
- return datetime.fromisoformat(date).timestamp()
+ return timestamp(datetime.fromisoformat(date))
else:
return datetime.isoformat(date)
--
GitLab