ositah 24.9.dev2__tar.gz → 24.9.dev4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev2
+Version: 24.9.dev4
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License
@@ -19,7 +19,7 @@ Requires-Dist: flask
 Requires-Dist: flask-multipass
 Requires-Dist: flask-sqlalchemy~=3.0
 Requires-Dist: flask-wtf
-Requires-Dist: hito-tools>=24.8
+Requires-Dist: hito-tools>=24.8.1
 Requires-Dist: pandas>=2.2
 Requires-Dist: pymysql
 Requires-Dist: python-ldap

{ositah-24.9.dev2 → ositah-24.9.dev4}/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.dev4}/ositah/apps/validation/tables.py

@@ -23,6 +23,7 @@ from ositah.apps.validation.tools import (
     agent_project_time,
     agent_tooltip_txt,
     category_declarations,
+    define_declaration_thresholds,
     get_all_validation_status,
     validation_started,
 )
@@ -71,6 +72,7 @@ def build_validation_table(team, team_selection_date, declaration_set: int, peri
             validation_disabled = not validation_started(period_date)
 
     validation_data = get_all_validation_status(period_date)
+    define_declaration_thresholds(period_date)
 
     try:
         project_declarations = get_team_projects(

{ositah-24.9.dev2 → ositah-24.9.dev4}/ositah/apps/validation/tools.py

@@ -2,7 +2,7 @@
 Various functions used by Validation sub-application
 """
 
-from datetime import datetime
+from datetime import date, datetime
 
 import dash_bootstrap_components as dbc
 import pandas as pd
@@ -54,7 +54,7 @@ def activity_time_cell(row, column, row_index):
     cell_id = f"validation-table-value-{row_index}-{column}"
 
     if column == "percent_global":
-        thresholds = global_params.declaration_options["thresholds"]
+        thresholds = global_params.declaration_options["thresholds"]["current"]
         percent = round(row["percent_global"], 1)
         if percent <= thresholds["low"]:
             percent_class = "table-danger"
@@ -374,6 +374,25 @@ def category_declarations(
     return category_declarations
 
 
+def define_declaration_thresholds(period_date: str):
+    """
+    Define the declaration thresholds (low, suspect, normal) for the current period
+
+    :param period_date: a date that must be inside the declaration period
+    """
+    global_params = GlobalParams()
+
+    period_datetime = date.fromisoformat(period_date)
+    if period_datetime.month >= 7:
+        global_params.declaration_options["thresholds"]["current"] = (
+            global_params.declaration_options["thresholds"]["s2"]
+        )
+    else:
+        global_params.declaration_options["thresholds"]["current"] = (
+            global_params.declaration_options["thresholds"]["s1"]
+        )
+
+
 def get_validation_data(agent_id, period_date: str, session=None):
     """
     Return the validation data for an agent or None if there is no entry in the database for this

{ositah-24.9.dev2 → ositah-24.9.dev4}/ositah/ositah.example.cfg

@@ -99,11 +99,23 @@ declaration:
     - Administration
     - Support
   # Thresholds used to mark declarations as low, suspect or good
-  # The value is the upper bound for the corresonding class
+  # The value is the upper bound for the corresponding class
+  # Thresholds are declared by semester as they are typically different
   thresholds:
-    low: 50
-    suspect: 80
-    good: 100
+    # S1: assume ho holidays as the default
+    s1:
+      low: 50
+      suspect: 80
+      good: 100
+    # S2: assume 4 weeks of holidays by default (summer + Christmas)
+    s2:
+      low: 50
+      suspect: 70
+      good: 85
+
+# Information related to declaration analysis
+analysis:
+  contributions_sorted_by_name: False
 
 # Information related to validation
 validation:

{ositah-24.9.dev2 → ositah-24.9.dev4}/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
@@ -380,17 +381,28 @@ def define_config_params(file):
     if "max_hours" not in config["declaration"]:
         # Set a very high value
         config["declaration"]["max_hours"] = 99999
-    if "thresholds" in config["declaration"]:
+    missing_params = []
+    for semester in ["s1", "s2"]:
         for k in ["low", "suspect", "good"]:
-            if k not in config["declaration"]["thresholds"]:
-                raise ConfigMissingParam(f"declaration/thresholds/{k}", file)
-    else:
-        config["declaration"]["thresholds"] = {"low": 50, "suspect": 75, "good": 100}
+            if (
+                "thresholds" not in config["declaration"]
+                or semester not in config["declaration"]["thresholds"]
+                or k not in config["declaration"]["thresholds"][semester]
+            ):
+                missing_params.append(f"declaration/thresholds/{semester}/{k}")
+    if len(missing_params) > 0:
+        raise ConfigMissingParam(", ".join(missing_params), file)
     # Default declaration period date defaults to current day if not explicitly defined
     if "default_date" not in config["declaration"]:
         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.dev4/ositah.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev2
+Version: 24.9.dev4
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License
@@ -19,7 +19,7 @@ Requires-Dist: flask
 Requires-Dist: flask-multipass
 Requires-Dist: flask-sqlalchemy~=3.0
 Requires-Dist: flask-wtf
-Requires-Dist: hito-tools>=24.8
+Requires-Dist: hito-tools>=24.8.1
 Requires-Dist: pandas>=2.2
 Requires-Dist: pymysql
 Requires-Dist: python-ldap

{ositah-24.9.dev2 → ositah-24.9.dev4}/ositah.egg-info/requires.txt

@@ -5,7 +5,7 @@ flask
 flask-multipass
 flask-sqlalchemy~=3.0
 flask-wtf
-hito-tools>=24.8
+hito-tools>=24.8.1
 pandas>=2.2
 pymysql
 python-ldap

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ositah"
-version = "24.9.dev2"
+version = "24.9.dev4"
 description = "Outils de Suivi d'Activités basé sur Hito"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -21,7 +21,7 @@ dependencies = [
     "flask-multipass",
     "flask-sqlalchemy~=3.0",
     "flask-wtf",
-    "hito-tools>=24.8",
+    "hito-tools>=24.8.1",
     "pandas>=2.2",
     "pymysql",
     "python-ldap",