ositah 24.8.dev1__py3-none-any.whl → 24.9.dev2__py3-none-any.whl

ositah/apps/analysis.py

@@ -596,7 +596,7 @@ def ijclab_export_to_csv(_, team, team_selection_date, source, period_date):
             columns["hours"],
         ]
     ]
-    exported_data[columns["hours"]] = np.round(exported_data[columns["hours"]]).astype("int")
+    exported_data.loc[:, columns["hours"]] = np.round(exported_data[columns["hours"]]).astype("int")
     column_renames = {}
     for c in exported_data.columns.tolist():
         if c in EXPORT_COLUMN_NAMES:

ositah/apps/validation/tables.py

@@ -176,6 +176,7 @@ def build_validation_table(team, team_selection_date, declaration_set: int, peri
         selected_declarations = declaration_list[~declaration_list["validated"]]
     else:
         return general_error_jumbotron(f"Invalid declaration set ID ({declaration_set})")
+    selected_declarations.sort_values(by=["fullname"], ignore_index=True, inplace=True)
 
     columns = [*data_columns]
     columns.insert(0, column_names["fullname"])

ositah/apps/validation/tools.py

@@ -5,7 +5,6 @@ Various functions used by Validation sub-application
 from datetime import datetime
 
 import dash_bootstrap_components as dbc
-import numpy as np
 import pandas as pd
 from dash import html
 
@@ -341,9 +340,10 @@ def category_declarations(
             ]
         category_declarations.drop(columns=columns["hours"], inplace=True)
         category_declarations.fillna(0, inplace=True)
+        category_declarations = category_declarations.infer_objects(copy=False)
 
-        agg_functions = {c: np.sum for c in categories}
-        agg_functions["suspect"] = np.any
+        agg_functions = {c: "sum" for c in categories}
+        agg_functions["suspect"] = "any"
         category_declarations_pt = pd.pivot_table(
             category_declarations,
             index=[

ositah/utils/agents.py

@@ -64,8 +64,9 @@ 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)]
+            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"] = ""

ositah/utils/projects.py

@@ -367,7 +367,7 @@ def get_team_projects(
                 columns["email"],
             ],
             values=[columns["hours"], columns["quotite"]],
-            aggfunc={columns["hours"]: np.sum, columns["quotite"]: np.mean},
+            aggfunc={columns["hours"]: "sum", columns["quotite"]: "mean"},
         )
         declarations = pd.DataFrame(global_declarations_pt.to_records())
         declarations[[columns["masterproject"], columns["project"]]] = declarations[
@@ -519,7 +519,7 @@ def build_projects_data(team, team_selection_date, period_date: str, source):
                 columns["category"],
             ],
             values=[columns["hours"]],
-            aggfunc={columns["hours"]: np.sum},
+            aggfunc={columns["hours"]: "sum"},
         )
         projects_data = pd.DataFrame(projects_data_pt.to_records())
         projects_data[columns["hours"]] = np.round(projects_data[columns["hours"]]).astype("int")

{ositah-24.8.dev1.dist-info → ositah-24.9.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.8.dev1
+Version: 24.9.dev2
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License
@@ -9,18 +9,18 @@ Project-URL: Bug Tracker, https://gitlab.in2p3.fr/hito/ositah/-/issues
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: blinker
-Requires-Dist: dash
+Requires-Dist: dash >=2.17
 Requires-Dist: dash-bootstrap-components
-Requires-Dist: flask ~=2.2
+Requires-Dist: flask
 Requires-Dist: flask-multipass
 Requires-Dist: flask-sqlalchemy ~=3.0
 Requires-Dist: flask-wtf
-Requires-Dist: hito-tools >=23.2
-Requires-Dist: pandas ==2.*
+Requires-Dist: hito-tools >=24.8
+Requires-Dist: pandas >=2.2
 Requires-Dist: pymysql
 Requires-Dist: python-ldap
 Requires-Dist: pyyaml

{ositah-24.8.dev1.dist-info → ositah-24.9.dev2.dist-info}/RECORD

@@ -3,7 +3,7 @@ ositah/app.py,sha256=53ylXmqBSo31omZt-XBPBhOzlkGQBuDenU0Q8m7efCg,428
 ositah/main.py,sha256=vw8PBYP3ugtWKWUta3UKagh8lbp-ogl8LUNF-KSyo0s,15673
 ositah/ositah.example.cfg,sha256=-k6Bytmuml3KHQn_1gGxW2k2bBAc39zPN6Ew5rG14xw,7472
 ositah/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ositah/apps/analysis.py,sha256=8bmP5m4nmfMODu1_YpzqCiFR2U2TMOOxAHbujY8od8g,28259
+ositah/apps/analysis.py,sha256=lGcXTOCZuP9mIYpZA3zgKdAPk_s0pvfso2u_Qux0DRo,28266
 ositah/apps/export.py,sha256=4h9_nk9uKopwfxgzqKyFk5u4qVQ9mtgGvk3zmxbhTV0,47532
 ositah/apps/configuration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ositah/apps/configuration/callbacks.py,sha256=J1bWwxQF2JRX6vvkTF22XXr4R2HEEXyK3ht75hbFgAM,33477
@@ -14,8 +14,8 @@ 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=4pqWUtbIkyv40CE6VgzPu71i0hv_BWGGj3dDaQtS7sc,24283
-ositah/apps/validation/tools.py,sha256=omz6M10cCI5A8aTWllpkqFDEcIQFEhjzxOCiJKhHuDc,18046
+ositah/apps/validation/tables.py,sha256=avzGAX2qRiuLCg0BLLt0a4cf6ZRD1bNBp5cHQVrShNI,24372
+ositah/apps/validation/tools.py,sha256=jyKQtVMylYkurVLTmRLtuICpjwN5LM4YMB4PPS4GMaA,18105
 ositah/assets/arrow_down_up.svg,sha256=jH7QOmbLkYnNENa2PlBktOYHKDGN5KbrrFcV6UpgkCY,503
 ositah/assets/ositah.css,sha256=_T3mwonAYMPoDJoHYgJ5XgdFllHMcE28vnMMDd_hdOQ,1094
 ositah/assets/sort_ascending.svg,sha256=Rg4wPgEBEBU9hDPgNnenFYkFLC18qKw0flaBk_8Y-uM,593
@@ -26,7 +26,7 @@ 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=k8LPE2j9X4UhOQUB4r4XYrDdQMn8aVJ-UqTdHZQTPLM,4741
+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
@@ -35,12 +35,12 @@ ositah/utils/hito_db.py,sha256=awVGrd1DAyj6BaEkLjTVN1l9A5SjZUJ1-fQ5PAik7bI,1510
 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/projects.py,sha256=LuyUVtKqTb3qUWbsgwrE-9DqyW1bkV9y-n_n0oRaotQ,43476
 ositah/utils/teams.py,sha256=K8Z6kqs-kFpNiIg6wgmmZ3_tmfUPaB7wp0OAGmmZPG4,1234
 ositah/utils/utils.py,sha256=rUp366CNWLX3GMMHcJsau_y6kp52uCs1Hels2ESatGY,16372
-ositah-24.8.dev1.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
-ositah-24.8.dev1.dist-info/METADATA,sha256=lYwhqbAWbrl0bz5YALdNg9-4zVxrZ_bupDLoGfOLbnU,8103
-ositah-24.8.dev1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-ositah-24.8.dev1.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
-ositah-24.8.dev1.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
-ositah-24.8.dev1.dist-info/RECORD,,
+ositah-24.9.dev2.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
+ositah-24.9.dev2.dist-info/METADATA,sha256=ryiLBIDLx3lxFT0_dH30Gu2Y3nd88C6wtIorHmaeri0,8104
+ositah-24.9.dev2.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+ositah-24.9.dev2.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
+ositah-24.9.dev2.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
+ositah-24.9.dev2.dist-info/RECORD,,