ositah 24.9.dev8__tar.gz → 24.12.dev1__tar.gz

{ositah-24.9.dev8/ositah.egg-info → ositah-24.12.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev8
+Version: 24.12.dev1
 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.dev8 → ositah-24.12.dev1}/ositah/apps/export.py

@@ -261,7 +261,7 @@ def nsip_export_table(team, team_selection_date, period_date: str, declarations_
         declaration_list.drop(columns="_merge", inplace=True)
 
         nsip_declarations = get_nsip_declarations(start_date, team)
-        if nsip_declarations is None or len(nsip_declarations) == 0:
+        if nsip_declarations.empty:
             # nsip_missing is True if the OSITAH declaration has no matching declaration in NSIP
             declaration_list["nsip_missing"] = True
             # time_unit_mismatch is True only if there is a matching declaration in NSIP and time
@@ -282,6 +282,16 @@ def nsip_export_table(team, team_selection_date, period_date: str, declarations_
             declaration_list["nsip_reference_id"] = declaration_list["nsip_reference_id"].astype(
                 int
             )
+            # In case nsip_declarations contains only references (no project), create the
+            # project.name column required later as it is used both for references and projects.
+            # Also copy reference.name into project.name if it is a reference.
+            if "project.name" not in nsip_declarations:
+                nsip_declarations["project.name"] = np.NaN
+            nsip_declarations.loc[
+                nsip_declarations["project.name"].isna(),
+                "nsip_project",
+            ] = nsip_declarations["reference.name"]
+            # Merge OSITAH declarations with those possibly present in NSIP
             declaration_list = declaration_list.merge(
                 nsip_declarations,
                 how="outer",
@@ -353,7 +363,7 @@ def nsip_export_table(team, team_selection_date, period_date: str, declarations_
             )
             # nsip_missing is True if the OSITAH declaration has no matching declaration in NSIP
             declaration_list["nsip_missing"] = declaration_list["_merge"] == "left_only"
-            # ositah_missing is True if a declaratipn is found in NSIP without a matching
+            # ositah_missing is True if a declaration is found in NSIP without a matching
             # declaration in OSITAH
             declaration_list["ositah_missing"] = declaration_list["_merge"] == "right_only"
             for ositah_column, nsip_column in {
@@ -368,12 +378,6 @@ def nsip_export_table(team, team_selection_date, period_date: str, declarations_
                 declaration_list.loc[declaration_list["ositah_missing"], ositah_column] = (
                     declaration_list[nsip_column]
                 )
-            # Fix nsip_project if it was set to the project name when the activity is a reference
-            declaration_list.loc[
-                declaration_list["nsip_project"].isna()
-                & (declaration_list["nsip_reference_id"] != 0),
-                "nsip_project",
-            ] = declaration_list["reference.name"]
             declaration_list.loc[
                 declaration_list["nsip_agent_missing"].isna(), "nsip_agent_missing"
             ] = False

{ositah-24.9.dev8 → ositah-24.12.dev1}/ositah/utils/projects.py

@@ -734,6 +734,9 @@ def get_nsip_declarations(period_date: str, team: str):
 
     if global_params.nsip:
         declarations = pd.json_normalize(global_params.nsip.get_declarations(period_date))
+        if declarations.empty:
+            return declarations
+
         declarations.rename(columns={"id": "id_declaration"}, inplace=True)
         # Set NaN to 0 in reference as np.NaN is a float and prevent casting to int. As it will
         # be used in a merge better to have a 0 than a NaN.

{ositah-24.9.dev8 → ositah-24.12.dev1/ositah.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev8
+Version: 24.12.dev1
 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.dev8 → ositah-24.12.dev1}/pyproject.toml

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