ositah 25.9.dev1__py3-none-any.whl → 25.9.dev2__py3-none-any.whl

ositah/apps/export.py

@@ -1096,7 +1096,8 @@ def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
                         (
                             f"Declaration {http_status} for user {row.email_auth} (NSIP ID:"
                             f" {row.email_reseda}), {'project' if project_type else 'reference'}"
-                            f" ID {int(activity_id)} {action} NSIP"
+                            f" ID={int(activity_id)}, master={row.nsip_master}, name="
+                            f"{row.nsip_project} {action} NSIP"
                         ),
                         flush=True,
                     )
@@ -1111,8 +1112,9 @@ def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
                         (
                             f"ERROR: update of declaration failed for user {row.email_auth}"
                             f" (NSIP ID: {row.email_reseda}),"
-                            f" {'project' if project_type else 'reference'} ID"
-                            f" {int(activity_id)}{http_error}"
+                            f" {'project' if project_type else 'reference'} ID="
+                            f"{int(activity_id)}, master={row.nsip_master}, name="
+                            f"{row.nsip_project}{http_error}"
                         ),
                         flush=True,
                     )
@@ -1121,8 +1123,7 @@ def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
                     # message
                     if failed_exports < EXPORT_MAX_FAILDED_UPDATES:
                         failed_updates.append(
-                            f"{row.email_auth}/{'projet' if project_type else 'reference'}"
-                            f"/{int(activity_id)}"
+                            f"{row.email_auth}:{row.nsip_master}/{row.nsip_project}"
                         )
                     elif failed_exports == EXPORT_MAX_FAILDED_UPDATES:
                         failed_updates.append("...")

ositah/utils/projects.py

@@ -745,6 +745,7 @@ def get_nsip_declarations(period_date: str, team: str):
             declarations["project.id"] = declarations["project.id"].astype(int)
         else:
             declarations["project.id"] = 0
+            declarations["project.name"] = np.NaN
         if "reference.id" in declarations.columns:
             declarations.loc[declarations["reference.id"].isna(), "reference.id"] = 0
             declarations["reference.id"] = declarations["reference.id"].astype(int)

{ositah-25.9.dev1.dist-info → ositah-25.9.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ositah
-Version: 25.9.dev1
+Version: 25.9.dev2
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License-Expression: BSD-3-Clause

{ositah-25.9.dev1.dist-info → ositah-25.9.dev2.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=U-sc6dl1Tf78kF1eZkLyL0QNUrReV4h8v9SeOUakjx8,49290
+ositah/apps/export.py,sha256=IeAFb_QtRtaaEFdbKFJLTNBDezukQzzvBY_ZENZ0jdc,49399
 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=hdbjXa0pGg1KLm---TgyxPOI0qcNaW64QBWSVbrgjeY,43543
+ositah/utils/projects.py,sha256=vAS0JDN_XycoumqL-YSi5vf_PDSZyy1jfyfEShcudi0,43594
 ositah/utils/teams.py,sha256=K8Z6kqs-kFpNiIg6wgmmZ3_tmfUPaB7wp0OAGmmZPG4,1234
 ositah/utils/utils.py,sha256=NQq0roHDvIkKj1gl88yu3bvloH0dPnBE1rKXVP_hdK4,17082
-ositah-25.9.dev1.dist-info/licenses/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
-ositah-25.9.dev1.dist-info/METADATA,sha256=Kn3pGb54eJmbeDsGgekFm8HWrnoS5OjZzYzoJRw-b94,8075
-ositah-25.9.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ositah-25.9.dev1.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
-ositah-25.9.dev1.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
-ositah-25.9.dev1.dist-info/RECORD,,
+ositah-25.9.dev2.dist-info/licenses/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
+ositah-25.9.dev2.dist-info/METADATA,sha256=B5ODI4wK-vGQz8RGhoBqmcTPjEHgfmc09V0Q2ylb8bU,8075
+ositah-25.9.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ositah-25.9.dev2.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
+ositah-25.9.dev2.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
+ositah-25.9.dev2.dist-info/RECORD,,