ositah 24.9.dev4__tar.gz → 24.9.dev5__tar.gz

{ositah-24.9.dev4/ositah.egg-info → ositah-24.9.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev4
+Version: 24.9.dev5
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License

{ositah-24.9.dev4 → ositah-24.9.dev5}/ositah/ositah.example.cfg

@@ -84,8 +84,10 @@ server:
 
 # Options related to declarations
 declaration:
-  # Default date must be a date included into the selected validation period. It is a default, if no other explicitly select
+  # Default date must be a date included into the selected validation period. It is a default, if no other explicitly selection
   #default_date: 2021-07-01
+  # Delay (in days) before setting the default period to the next one, after the end of the period. Ignored if default_date is defined
+  period_change_delay: 60
   # max_hours specifies the upper valid value for activities declared in hours
   max_hours: 400
   # Agent statut whose declaration is not mandatory

{ositah-24.9.dev4 → ositah-24.9.dev5}/ositah/utils/period.py

@@ -119,7 +119,8 @@ def get_declaration_periods(descending: bool = True) -> List[OSITAHDeclarationPe
 def get_default_period_date(periods: List[OSITAHDeclarationPeriod], date: datetime.date):
     """
     Return the start date of the default period. The default period is selected by passing a date
-    that must be between period start and end dates (included).
+    that must be between period start and end dates (included). If none matches, select the last
+    period.
 
     :param periods: period list
     :param date: date that must be inside the period (string)
@@ -127,9 +128,12 @@ def get_default_period_date(periods: List[OSITAHDeclarationPeriod], date: dateti
     """
 
     period_date = date.isoformat()
+    last_start_date = None
 
     for p in periods:
         if period_date >= p.start_date and period_date <= p.end_date:
             return p.start_date
+        if last_start_date is None or p.start_date > last_start_date:
+            last_start_date = p.start_date
 
-    return None
+    return last_start_date

{ositah-24.9.dev4 → ositah-24.9.dev5}/ositah/utils/utils.py

@@ -1,6 +1,6 @@
 # Convenience objects for OSITAH application
 
-from datetime import datetime
+from datetime import datetime, timedelta
 from typing import List
 
 import dash_bootstrap_components as dbc
@@ -394,7 +394,11 @@ def define_config_params(file):
         raise ConfigMissingParam(", ".join(missing_params), file)
     # Default declaration period date defaults to current day if not explicitly defined
     if "default_date" not in config["declaration"]:
-        config["declaration"]["default_date"] = datetime.now()
+        if "period_change_delay" in config["declaration"]:
+            change_delay = config["declaration"]["period_change_delay"]
+        else:
+            change_delay = 0
+        config["declaration"]["default_date"] = datetime.now() - timedelta(days=change_delay)
     global_params.declaration_options = config["declaration"]
 
     if "analysis" not in config:

{ositah-24.9.dev4 → ositah-24.9.dev5/ositah.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev4
+Version: 24.9.dev5
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License

{ositah-24.9.dev4 → ositah-24.9.dev5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ositah"
-version = "24.9.dev4"
+version = "24.9.dev5"
 description = "Outils de Suivi d'Activités basé sur Hito"
 readme = "README.md"
 requires-python = ">=3.9"