ositah 24.9.dev1__py3-none-any.whl → 24.9.dev3__py3-none-any.whl

ositah/apps/analysis.py

@@ -301,11 +301,22 @@ def project_agents_time(declarations, project):
     global_params = GlobalParams()
     columns = global_params.columns
 
-    project_agents = declarations[declarations[columns["activity"]] == project].sort_values(
-        by="nom"
+    project_agents = declarations[declarations[columns["activity"]] == project]
+    project_agents.loc[:, columns["hours"]] = np.round(project_agents[columns["hours"]]).astype(
+        "int"
+    )
+    project_agents.loc[:, columns["weeks"]] = np.round(
+        project_agents.loc[:, columns["hours"]] / WEEK_HOURS, 1
+    )
+    if global_params.analysis_params["contributions_sorted_by_name"]:
+        sort_by = ["nom", columns["hours"]]
+        sort_ascending = True
+    else:
+        sort_by = [columns["hours"], "nom"]
+        sort_ascending = False
+    project_agents.sort_values(
+        by=sort_by, ascending=sort_ascending, ignore_index=True, inplace=True
     )
-    project_agents[columns["hours"]] = np.round(project_agents[columns["hours"]]).astype("int")
-    project_agents[columns["weeks"]] = np.round(project_agents[columns["hours"]] / WEEK_HOURS, 1)
     return html.Div(
         [
             html.Div(

ositah/ositah.example.cfg

@@ -105,6 +105,10 @@ declaration:
     suspect: 80
     good: 100
 
+# Information related to declaration analysis
+analysis:
+  contributions_sorted_by_name: False
+
 # Information related to validation
 validation:
   override_period:

ositah/utils/utils.py

@@ -224,6 +224,7 @@ class OSITAHSessionData:
 class GlobalParams:
     def __init__(self):
         self.agent_query = None
+        self.analysis_params = None
         self.category_patterns = {}
         self.columns = COLUMN_NAMES
         self.column_titles = None
@@ -391,6 +392,12 @@ def define_config_params(file):
         config["declaration"]["default_date"] = datetime.now()
     global_params.declaration_options = config["declaration"]
 
+    if "analysis" not in config:
+        config["analysis"] = {}
+    if "contributions_sorted_by_name" not in config["analysis"]:
+        config["analysis"]["contributions_sorted_by_name"] = True
+    global_params.analysis_params = config["analysis"]
+
     if "validation" not in config:
         config["validation"] = {}
     if "override_period" not in config["validation"]:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev1
+Version: 24.9.dev3
 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,7 +9,7 @@ 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
@@ -22,7 +22,6 @@ Requires-Dist: flask-wtf
 Requires-Dist: hito-tools >=24.8
 Requires-Dist: pandas >=2.2
 Requires-Dist: pymysql
-Requires-Dist: python >=3.9
 Requires-Dist: python-ldap
 Requires-Dist: pyyaml
 Requires-Dist: simplejson

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

@@ -1,9 +1,9 @@
 ositah/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ositah/app.py,sha256=53ylXmqBSo31omZt-XBPBhOzlkGQBuDenU0Q8m7efCg,428
 ositah/main.py,sha256=vw8PBYP3ugtWKWUta3UKagh8lbp-ogl8LUNF-KSyo0s,15673
-ositah/ositah.example.cfg,sha256=-k6Bytmuml3KHQn_1gGxW2k2bBAc39zPN6Ew5rG14xw,7472
+ositah/ositah.example.cfg,sha256=uLJAcPNziiOBFqjnUGLs7fPEhntpRJ3Pzu5Ab4CSxXQ,7571
 ositah/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ositah/apps/analysis.py,sha256=lGcXTOCZuP9mIYpZA3zgKdAPk_s0pvfso2u_Qux0DRo,28266
+ositah/apps/analysis.py,sha256=9EDXcCtXtAiCdyG8kZXJDAQXLuTG7gTZbsnKnL_ehiw,28635
 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
@@ -37,10 +37,10 @@ ositah/utils/menus.py,sha256=Xoyo2ySX0MD7phzyO5WjEcR0PCXwsX1TSrzONXnX4yI,12005
 ositah/utils/period.py,sha256=CxT77mAQasD59BmecXRUwme-_76hOr2kotOwTy6ZKfk,4058
 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.9.dev1.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
-ositah-24.9.dev1.dist-info/METADATA,sha256=KKkzRXR9BmbAY0YcF0290ij3QUCsCwQ0v7WaX2qZOp4,8133
-ositah-24.9.dev1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-ositah-24.9.dev1.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
-ositah-24.9.dev1.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
-ositah-24.9.dev1.dist-info/RECORD,,
+ositah/utils/utils.py,sha256=N7Ze4PshzRi8v204mRdDJ6QSmUZvckqH3oHKkI7WaWI,16667
+ositah-24.9.dev3.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
+ositah-24.9.dev3.dist-info/METADATA,sha256=jibVKLeSDzkEn_7pljac1KFSwTmoAPDHLUHk9EMGVR8,8104
+ositah-24.9.dev3.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+ositah-24.9.dev3.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
+ositah-24.9.dev3.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
+ositah-24.9.dev3.dist-info/RECORD,,