Merge pull request #201 from statisticsnorway/modify-init.py

Modify init.py

Author: alexcroz

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ssb-dash-framework"
-version = "0.1.4a1"
+version = "0.1.4a2"
 description = "SSB Dash Framework"
 authors = [{ name = "Magnus Theodor Engh", email = "dor@ssb.no" }]
 license = "GPL-3.0"

src/ssb_dash_framework/__init__.py

@@ -59,6 +59,7 @@
 from .utils import enable_app_logging
 from .utils import module_validator
 from .utils import sidebar_button
+from .utils import apply_edits
 
 # from .modals import HBMethod
 # from .utils import _get_kostra_r

src/ssb_dash_framework/modules/building_blocks/tables.py

@@ -109,7 +109,7 @@ def __init__(
         self.module_layout = self._create_layout()
         self.module_callbacks()
         self._is_valid()
-        self.timestamp = int(time.time() * 1000)
+        self.tz = zoneinfo.ZoneInfo("Europe/Oslo")
         module_validator(self)
 
     def _is_valid(self) -> None:
@@ -414,8 +414,6 @@ def confirm_edit(
                 edit_with_reason["user"] = self.user
                 edit_with_reason["change_event"] = "manual"
 
-                # Create timestamp that can be compared with datetime.now() running from users IDE
-                tz = zoneinfo.ZoneInfo("Europe/Oslo")
                 aware_timestamp = datetime.now(tz)  # timezone-aware
                 naive_timestamp = aware_timestamp.replace(tzinfo=None)  # drop tzinfo
                 edit_with_reason["timestamp"] = naive_timestamp
@@ -506,7 +504,10 @@ def immediate_edit(
                 if not edited:
                     raise PreventUpdate
                 edit = edited[0]
-                edit["timestamp"] = int(time.time() * 1000)
+
+                aware_timestamp = datetime.now(self.tz)  # timezone-aware
+                naive_timestamp = aware_timestamp.replace(tzinfo=None)  # drop tzinfo
+                edit["timestamp"] = naive_timestamp
                 if self.log_filepath:
                     with open(self.log_filepath, "a", encoding="utf-8") as f:
                         f.write(

src/ssb_dash_framework/utils/prosesslogg.py

@@ -1,6 +1,6 @@
 import datetime
-
 import pandas as pd
+import warnings
 
 
 def apply_edits(
@@ -39,6 +39,7 @@ def apply_edits(
     - Rows in `df` without matching uuids remain unchanged.
     - This function does not modify `df` in place; it returns an edited copy.
     """
+    
     df_edited = df.copy()
     log = pd.read_json(filepath_log, lines=True)
     log = log.loc[log["timestamp"] > app_timestamp].copy()
@@ -63,9 +64,10 @@ def apply_edits(
         ]
 
         mapping = mapping[~mapping.index.duplicated(keep="last")]
-
-        df_edited.loc[df_edited["uuid"].isin(mapping.index), col] = (
-            df_edited["uuid"].map(mapping).fillna(df_edited[col])
-        )
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", category=FutureWarning)
+            df_edited.loc[df_edited["uuid"].isin(mapping.index), col] = (
+                df_edited["uuid"].map(mapping).fillna(df_edited[col])
+            )
 
     return df_edited