ositah 24.9.dev7__py3-none-any.whl → 24.12.dev1__py3-none-any.whl

ositah/apps/export.py

@@ -164,8 +164,10 @@ def nsip_export_table(team, team_selection_date, period_date: str, declarations_
         )
         agent_list = get_agents(period_date, team)
         if team is None or team == TEAM_LIST_ALL_AGENTS:
-            # If no team is selected, merge left to include declarations from agents who are no
-            # longer active in Hito (e.g. agents who left the lab during the declaration period)
+            # If no team is selected, merge left to include declarations from agents whose
+            # email_auth don't match between Hito and NSIP. It is typically the case for agents
+            # who are no longer active in NSIP (e.g. agents who left the lab during the
+            # declaration period).
             merge_how = "left"
         else:
             merge_how = "inner"
@@ -210,7 +212,8 @@ def nsip_export_table(team, team_selection_date, period_date: str, declarations_
         # For OSITAH entries not found in NSIP, it may be that the agent left the lab during
         # the declaration period: in this case there is an entry in NSIP where the RESEDA email
         # has been replaced by a UUID allowing to update NSIP data. Check if such an entry
-        # exists in NSIP with a matching fullname and use it if it exists
+        # exists in NSIP with a matching fullname and use it if it exists. It also happens if the
+        # agent email_auth changed during the period.
         # To make matching easier, index is temporarily set to fullname instead of an integer.
         nsip_missing_agent_names = declaration_list.loc[
             declaration_list["_merge"] == "left_only", columns["fullname"]
@@ -258,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
@@ -279,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",
@@ -350,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 {
@@ -365,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
@@ -472,6 +479,16 @@ def nsip_export_table(team, team_selection_date, period_date: str, declarations_
             )
         ),
     ]
+    if team and team != TEAM_LIST_ALL_AGENTS:
+        page_title.append(
+            html.Div(
+                (
+                    "Certains agents peuvent apparaitre non synchronisés s'ils ont quitté"
+                    f" le laboratoire: utiliser '{TEAM_LIST_ALL_AGENTS}' pour vérifier"
+                ),
+                style={"fontStyle": "italic", "fontWeight": "bold"},
+            )
+        )
 
     if declarations_set == NSIP_DECLARATIONS_SELECT_ALL:
         selected_declarations = declaration_list

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.dev7.dist-info → ositah-24.12.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev7
+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
@@ -13,19 +13,19 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: blinker
-Requires-Dist: dash >=2.17
+Requires-Dist: dash>=2.17
 Requires-Dist: dash-bootstrap-components
 Requires-Dist: flask
 Requires-Dist: flask-multipass
-Requires-Dist: flask-sqlalchemy ~=3.0
+Requires-Dist: flask-sqlalchemy~=3.0
 Requires-Dist: flask-wtf
-Requires-Dist: hito-tools >=24.8.1
-Requires-Dist: pandas >=2.2
+Requires-Dist: hito-tools>=24.8.1
+Requires-Dist: pandas>=2.2
 Requires-Dist: pymysql
 Requires-Dist: python-ldap
 Requires-Dist: pyyaml
 Requires-Dist: simplejson
-Requires-Dist: sqlalchemy ~=2.0
+Requires-Dist: sqlalchemy~=2.0
 
 # OSITAH : Outil de Suivi de Temps et d'Activités basé sur Hito
 

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

@@ -4,7 +4,7 @@ ositah/main.py,sha256=97IhSMIqIVWC6GdXWievxE-tu30-UboivbW9_NTNzww,15644
 ositah/ositah.example.cfg,sha256=4zQOL3ynGN9bO6j-bekJeJWUe7Xq-c0eySNOHKMr2K8,8000
 ositah/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ositah/apps/analysis.py,sha256=J9oE93g6wIvKh9TnT4TudmUdW75wzArx1CaB_1yuRB8,28634
-ositah/apps/export.py,sha256=i1SGeS_peohnoMRRDm0VmGsWWmn9ypix-qIKkZml1d0,47531
+ositah/apps/export.py,sha256=KCz1b8u2IIG_LCpVXXJ9MMqIG7lHB8hrHnAY2npJ_3g,48416
 ositah/apps/configuration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ositah/apps/configuration/callbacks.py,sha256=HbsyE0WeCTmPl14SAs-mDglvMywxA4qSeVN72jSv-bM,33455
 ositah/apps/configuration/main.py,sha256=LbyupMqFUPDJCZBuRzoGREuHNxbinj3Ooj1HTJCeYUM,20349
@@ -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=ZuaiZ2gvSIjd23isvygEVoAvonH4ehbexjrS4EwSGyI,4258
-ositah/utils/projects.py,sha256=LuyUVtKqTb3qUWbsgwrE-9DqyW1bkV9y-n_n0oRaotQ,43476
+ositah/utils/projects.py,sha256=hdbjXa0pGg1KLm---TgyxPOI0qcNaW64QBWSVbrgjeY,43543
 ositah/utils/teams.py,sha256=K8Z6kqs-kFpNiIg6wgmmZ3_tmfUPaB7wp0OAGmmZPG4,1234
 ositah/utils/utils.py,sha256=NQq0roHDvIkKj1gl88yu3bvloH0dPnBE1rKXVP_hdK4,17082
-ositah-24.9.dev7.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
-ositah-24.9.dev7.dist-info/METADATA,sha256=aO5d5QA88vIU0COaY2TN5QYDn6-Q7dnPFH-HDdsIozE,8106
-ositah-24.9.dev7.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-ositah-24.9.dev7.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
-ositah-24.9.dev7.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
-ositah-24.9.dev7.dist-info/RECORD,,
+ositah-24.12.dev1.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
+ositah-24.12.dev1.dist-info/METADATA,sha256=XvSHRKs4jevkgYMdlYpqh9xTRidxZ74bH4sPUA82r28,8102
+ositah-24.12.dev1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ositah-24.12.dev1.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
+ositah-24.12.dev1.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
+ositah-24.12.dev1.dist-info/RECORD,,

{ositah-24.9.dev7.dist-info → ositah-24.12.dev1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any