ositah 24.9.dev7__py3-none-any.whl → 24.9.dev8__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"]
@@ -472,6 +475,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-24.9.dev7.dist-info → ositah-24.9.dev8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev7
+Version: 24.9.dev8
 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.dev7.dist-info → ositah-24.9.dev8.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=lOQWSF0A06kXp5cPshY30J9vjRltmPzASvHYCmek3Qw,48146
 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
@@ -38,9 +38,9 @@ ositah/utils/period.py,sha256=ZuaiZ2gvSIjd23isvygEVoAvonH4ehbexjrS4EwSGyI,4258
 ositah/utils/projects.py,sha256=LuyUVtKqTb3qUWbsgwrE-9DqyW1bkV9y-n_n0oRaotQ,43476
 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.9.dev8.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
+ositah-24.9.dev8.dist-info/METADATA,sha256=4UDKlnEf21czK8POzIlacouIZ3WHB7bxMqrzandzjW8,8106
+ositah-24.9.dev8.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+ositah-24.9.dev8.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
+ositah-24.9.dev8.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
+ositah-24.9.dev8.dist-info/RECORD,,

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

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