ositah 24.9.dev2__tar.gz → 24.9.dev3__tar.gz

{ositah-24.9.dev2/ositah.egg-info → ositah-24.9.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev2
+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

{ositah-24.9.dev2 → ositah-24.9.dev3}/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-24.9.dev2 → ositah-24.9.dev3}/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-24.9.dev2 → ositah-24.9.dev3}/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.dev2 → ositah-24.9.dev3/ositah.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev2
+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

{ositah-24.9.dev2 → ositah-24.9.dev3}/pyproject.toml

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