ositah 24.1.dev1__tar.gz → 24.4.dev1__tar.gz

{ositah-24.1.dev1/ositah.egg-info → ositah-24.4.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.1.dev1
+Version: 24.4.dev1
 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.1.dev1 → ositah-24.4.dev1}/ositah/main.py

@@ -117,7 +117,7 @@ def url_not_found(path):
 # valid role missing jumbotron
 def valid_role_missing(msg):
     return ositah_jumbotron(
-        "You don't havea valid Hito role to OSITAH",
+        "You don't have a valid Hito role to OSITAH",
         msg,
         title_class="text-warning",
     )
@@ -204,9 +204,7 @@ def render_page_content(pathname, login_menu):
             if not user_session_data.agent_teams:
                 if role == HITO_ROLE_TEAM_MGR:
                     # For a team manager, show only the teams he/she is a manager
-                    teams = Team.query.filter(
-                        Team.managers.any(email_auth=session["user_email"])
-                    ).all()
+                    teams = Team.query.filter(Team.managers.any(email=session["user_email"])).all()
                     if len(teams) == 0:
                         # A user with role ROLE_RESP but is not the manager of any team is degraded
                         # to ROLE_AGENT

{ositah-24.1.dev1 → ositah-24.4.dev1}/ositah/ositah.example.cfg

@@ -85,7 +85,7 @@ 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: 2021-07-01
+  #default_date: 2021-07-01
   # max_hours specifies the upper valid value for activities declared in hours
   max_hours: 400
   # Agent statut whose declaration is not mandatory

{ositah-24.1.dev1 → ositah-24.4.dev1}/ositah/utils/exceptions.py

@@ -24,7 +24,8 @@ class InvalidDataSource(Exception):
 class InvalidHitoProjectName(Exception):
     def __init__(self, projects):
         self.msg = (
-            f"The following Hito projects have an invalid name format (name empty): {projects}"
+            f"The following Hito project names don't match the format 'masterproject / project' :"
+            f" {', '.join(projects)}"
         )
         self.status = EXIT_STATUS_GENERAL_ERROR
 

{ositah-24.1.dev1 → ositah-24.4.dev1}/ositah/utils/projects.py

@@ -425,7 +425,7 @@ def get_team_projects(
         invalid_hito_projects = declarations.loc[declarations[columns["project"]].isnull()]
         if not invalid_hito_projects.empty:
             raise InvalidHitoProjectName(
-                pd.Series(invalid_hito_projects[columns["masterproject"]]).values
+                pd.Series(invalid_hito_projects[columns["masterproject"]]).unique()
             )
 
     else:

{ositah-24.1.dev1 → ositah-24.4.dev1}/ositah/utils/utils.py

@@ -5,6 +5,7 @@ from typing import List
 
 import dash_bootstrap_components as dbc
 from dash import html
+from dateutil.relativedelta import relativedelta
 from flask import session
 from flask_sqlalchemy import SQLAlchemy
 from hito_tools.exceptions import ConfigFileEmpty, ConfigMissingParam
@@ -388,7 +389,7 @@ def define_config_params(file):
         config["declaration"]["thresholds"] = {"low": 50, "suspect": 75, "good": 100}
     # 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()
+        config["declaration"]["default_date"] = datetime.now() - relativedelta(months=10)
     global_params.declaration_options = config["declaration"]
 
     if "validation" not in config:

{ositah-24.1.dev1 → ositah-24.4.dev1/ositah.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.1.dev1
+Version: 24.4.dev1
 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.1.dev1 → ositah-24.4.dev1}/pyproject.toml

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