ositah 24.7.dev3__py3-none-any.whl → 24.8__py3-none-any.whl

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/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/utils/hito_db_model.py

@@ -199,7 +199,7 @@ class ActiviteDetail(db.Model):
 
 
 class OSITAHSession(db.Model):
-    __table_args__ = {'mysql_charset':'utf8mb4','mysql_collate':'utf8mb4_unicode_ci'}
+    __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)
@@ -207,7 +207,7 @@ class OSITAHSession(db.Model):
 
 
 class OSITAHValidation(db.Model):
-    __table_args__ = {'mysql_charset':'utf8mb4','mysql_collate':'utf8mb4_unicode_ci'}
+    __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)
@@ -225,7 +225,7 @@ class OSITAHValidation(db.Model):
 
 
 class OSITAHValidationPeriod(db.Model):
-    __table_args__ = {'mysql_charset':'utf8mb4','mysql_collate':'utf8mb4_unicode_ci'}
+    __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)
@@ -235,7 +235,7 @@ class OSITAHValidationPeriod(db.Model):
 
 
 class OSITAHProjectDeclaration(db.Model):
-    __table_args__ = {'mysql_charset':'utf8mb4','mysql_collate':'utf8mb4_unicode_ci'}
+    __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)

{ositah-24.7.dev3.dist-info → ositah-24.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.7.dev3
+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.dev3.dist-info → ositah-24.8.dist-info}/RECORD

@@ -14,7 +14,7 @@ ositah/apps/validation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 ositah/apps/validation/callbacks.py,sha256=N9j0HLe8Xp1zZUrVgx0woeDBwVtJLQZ_BPVNaJ9UIZo,9557
 ositah/apps/validation/main.py,sha256=en9D6c65DUosbU31dxLR6BhLCU3yj7uxyoS3MYzvw30,2896
 ositah/apps/validation/parameters.py,sha256=tDHqDnoWv1QhcTad2yhqLT9_wCpj8sTYxKWsi1UF-uk,1003
-ositah/apps/validation/tables.py,sha256=Zz-yJw6Bw2fQOa87PW4EmW3nQZmmZF1kqr11NfWvQOI,24770
+ositah/apps/validation/tables.py,sha256=4pqWUtbIkyv40CE6VgzPu71i0hv_BWGGj3dDaQtS7sc,24283
 ositah/apps/validation/tools.py,sha256=omz6M10cCI5A8aTWllpkqFDEcIQFEhjzxOCiJKhHuDc,18046
 ositah/assets/arrow_down_up.svg,sha256=jH7QOmbLkYnNENa2PlBktOYHKDGN5KbrrFcV6UpgkCY,503
 ositah/assets/ositah.css,sha256=_T3mwonAYMPoDJoHYgJ5XgdFllHMcE28vnMMDd_hdOQ,1094
@@ -26,21 +26,21 @@ ositah/templates/base.html,sha256=qKZLLrIOn2eZ_mIoSZEN8ZP6qyeSg1butPEVuv5lYDs,71
 ositah/templates/bootstrap_login.html,sha256=Gp3FTx1uWMHeVvnYcLehdYE8vfZ1RBzIjrxD6IGKPA4,1608
 ositah/templates/login_form.html,sha256=BjcnWd5svC0xy039-MToODcDswehe1YVQnTnctD9kdU,1033
 ositah/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ositah/utils/agents.py,sha256=Cxe2BUCP_wT63Ewduk1JUIyFVOfHJSD9BJX2QjDy7n4,4453
+ositah/utils/agents.py,sha256=wZ9xpWgQD4D6anuAnp9erHnkuM8y49y3yQWNn4PGMoU,4677
 ositah/utils/authentication.py,sha256=VfT3MrIPX6U4HAma0O0UScB86-EukBdfEg26NP5ndpk,9149
 ositah/utils/cache.py,sha256=mM1iKDzQbVJZvTOgfPnvbxSBWi-OVGly6MncQ09CtEY,504
 ositah/utils/core.py,sha256=OFML9h5JNmXXeMo7n90FSBDHtivWOY7ff2SJcG4uYEM,295
 ositah/utils/exceptions.py,sha256=ZVngkr28pBxO-kZAeKW9FWAFyhzuWL98-S92mieHMSk,1911
 ositah/utils/hito_db.py,sha256=awVGrd1DAyj6BaEkLjTVN1l9A5SjZUJ1-fQ5PAik7bI,1510
-ositah/utils/hito_db_model.py,sha256=0-JpCqgG9nLpVT00SYbFxfq4hASEDcdJvEamxGkHP-g,9344
+ositah/utils/hito_db_model.py,sha256=GvCHp5u-mPQinbZPvF6ONJAWIc2no1KN_VNJv6NCaPk,9356
 ositah/utils/menus.py,sha256=Xoyo2ySX0MD7phzyO5WjEcR0PCXwsX1TSrzONXnX4yI,12005
 ositah/utils/period.py,sha256=CxT77mAQasD59BmecXRUwme-_76hOr2kotOwTy6ZKfk,4058
 ositah/utils/projects.py,sha256=xLQ0RpJzMmCpx9Xdy8sHPQ-tijeWvSFPVSgOl5D6aSk,43479
 ositah/utils/teams.py,sha256=K8Z6kqs-kFpNiIg6wgmmZ3_tmfUPaB7wp0OAGmmZPG4,1234
 ositah/utils/utils.py,sha256=rUp366CNWLX3GMMHcJsau_y6kp52uCs1Hels2ESatGY,16372
-ositah-24.7.dev3.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
-ositah-24.7.dev3.dist-info/METADATA,sha256=q4h3R_VpVBTY0js1F6OOCC-0IIEnVc6VS4ULoI9y2Eo,8103
-ositah-24.7.dev3.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-ositah-24.7.dev3.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
-ositah-24.7.dev3.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
-ositah-24.7.dev3.dist-info/RECORD,,
+ositah-24.8.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
+ositah-24.8.dist-info/METADATA,sha256=-73nhv2fdX4u70EyJ64Hd2jLlYQHrPYGNqzEc8T4HDc,8098
+ositah-24.8.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+ositah-24.8.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
+ositah-24.8.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
+ositah-24.8.dist-info/RECORD,,

{ositah-24.7.dev3.dist-info → ositah-24.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any