ositah 24.7.dev2__tar.gz → 24.8__tar.gz

{ositah-24.7.dev2/ositah.egg-info → ositah-24.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.7.dev2
+Version: 24.8
 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.7.dev2 → ositah-24.8}/ositah/apps/validation/tables.py

@@ -298,7 +298,7 @@ def build_validation_table(team, team_selection_date, declaration_set: int, peri
                         html.Em(
                             (
                                 f"Temps déclarés de l'équipe / total ="
-                                f" {round(selected_declarations['percent_global'].mean(),1)}%"
+                                f" {round(selected_declarations['percent_global'].mean(), 1)}%"
                                 f" (100%={SEMESTER_WEEKS} semaines)"
                             )
                         )
@@ -341,12 +341,7 @@ def build_missing_agents_table(team, team_selection_date, period_date: str):
             title_class="text-danger",
         )
 
-    agents = get_agents(period_date)
-
-    if team == TEAM_LIST_ALL_AGENTS:
-        agent_list = agents
-    else:
-        agent_list = agents[agents.team.notna() & agents[column_names["team"]].str.match(team)]
+    agent_list = get_agents(period_date, team)
 
     if declarations is None:
         missing_agents = agent_list
@@ -459,13 +454,7 @@ def build_statistics_table(team, team_selection_date, period_date: str):
             title_class="text-danger",
         )
 
-    agents = get_agents(period_date)
-    if team == TEAM_LIST_ALL_AGENTS:
-        agent_list = agents
-        # If the agent doesn't belong to a team, set team to an empty string rather than None
-        agent_list.loc[agent_list.team.isna(), "team"] = ""
-    else:
-        agent_list = agents[agents.team.notna() & agents[column_names["team"]].str.match(team)]
+    agent_list = get_agents(period_date, team)
 
     add_no_team_row = False
     if declarations is None:

{ositah-24.7.dev2 → ositah-24.8}/ositah/utils/agents.py

@@ -64,7 +64,12 @@ def get_agents(period_date: str, team: str = None) -> pd.DataFrame:
         # agent_list = agent_list.loc[(agent_list.archive == 0) |
         #                          (agent_list.date_fin >= start_date.date().isoformat())]
         if team and team != TEAM_LIST_ALL_AGENTS:
-            agent_list = agent_list[agent_list["team"].str.match(team, case=False, na=False)]
+            agent_list = agent_list[
+                agent_list.team.notna() & agent_list[columns["team"]].str.match(team)
+            ]
+        else:
+            # If the agent doesn't belong to a team, set team to an empty string rather than None
+            agent_list.loc[agent_list.team.isna(), "team"] = ""
         agent_list[columns["fullname"]] = agent_list[
             [columns["lastname"], columns["firstname"]]
         ].agg(" ".join, axis=1)

{ositah-24.7.dev2 → ositah-24.8}/ositah/utils/hito_db_model.py

@@ -199,12 +199,16 @@ class ActiviteDetail(db.Model):
 
 
 class OSITAHSession(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True)
     email = db.Column(db.String(255), nullable=False)
     last_use = db.Column(db.DateTime, nullable=False)
 
 
 class OSITAHValidation(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True, default=new_uuid)
     validated = db.Column(db.Boolean, nullable=False)
     timestamp = db.Column(db.DateTime, nullable=False)
@@ -221,6 +225,8 @@ class OSITAHValidation(db.Model):
 
 
 class OSITAHValidationPeriod(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True, default=new_uuid)
     name = db.Column(db.String(255), unique=True, nullable=False)
     start_date = db.Column(db.DateTime, nullable=False)
@@ -229,6 +235,8 @@ class OSITAHValidationPeriod(db.Model):
 
 
 class OSITAHProjectDeclaration(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True, default=new_uuid)
     projet = db.Column(db.String(255), nullable=False)
     masterprojet = db.Column(db.String(255), nullable=False)

{ositah-24.7.dev2 → ositah-24.8/ositah.egg-info}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ositah"
-version = "24.7.dev2"
+version = "24.8"
 description = "Outils de Suivi d'Activités basé sur Hito"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -31,16 +31,13 @@ dependencies = [
 ]
 dynamic = []
 
+[project.license]
+text = "BSD 3-Clause License"
+
 [[project.authors]]
 name = "Michel Jouvin"
 email = "michel.jouvin@ijclab.in2p3.fr"
 
-
-[tool]
-
-[project.license]
-text = "BSD 3-Clause License"
-
 [project.urls]
 Homepage = "https://gitlab.in2p3.fr/hito/ositah"
 "Bug Tracker" = "https://gitlab.in2p3.fr/hito/ositah/-/issues"
@@ -49,4 +46,4 @@ Homepage = "https://gitlab.in2p3.fr/hito/ositah"
 ositah = "ositah.main:main"
 
 [tool.setuptools]
-packages = [ "ositah" ]
+packages = [ "ositah",]