ositah 24.12.dev1__tar.gz → 25.9.dev1__tar.gz

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

@@ -1,12 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ositah
-Version: 24.12.dev1
+Version: 25.9.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
+License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://gitlab.in2p3.fr/hito/ositah
 Project-URL: Bug Tracker, https://gitlab.in2p3.fr/hito/ositah/-/issues
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
@@ -26,6 +25,7 @@ Requires-Dist: python-ldap
 Requires-Dist: pyyaml
 Requires-Dist: simplejson
 Requires-Dist: sqlalchemy~=2.0
+Dynamic: license-file
 
 # OSITAH : Outil de Suivi de Temps et d'Activités basé sur Hito
 

{ositah-24.12.dev1 → ositah-25.9.dev1}/ositah/apps/export.py

@@ -54,6 +54,7 @@ NSIP_EXPORT_SELECTION_STATUS_ID = "export-nsip-selection-update-status"
 EXPORT_LOAD_INDICATOR_ID = "export-nsip-load-indicator"
 EXPORT_SAVED_LOAD_INDICATOR_ID = "export-nsip-saved-load-indicator"
 EXPORT_LOAD_TRIGGER_INTERVAL_ID = "export-nsip-load-callback-interval"
+EXPORT_MAX_FAILDED_UPDATES = 30
 EXPORT_PROGRESS_BAR_MAX_DURATION = 8  # seconds
 EXPORT_SAVED_ACTIVE_TAB_ID = "export-nsip-saved-active-tab"
 
@@ -287,6 +288,8 @@ def nsip_export_table(team, team_selection_date, period_date: str, declarations_
             # 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
+            if "reference.name" not in nsip_declarations:
+                nsip_declarations["reference.name"] = np.NaN
             nsip_declarations.loc[
                 nsip_declarations["project.name"].isna(),
                 "nsip_project",
@@ -1015,8 +1018,8 @@ def nsip_export_selected_count(*_):
 )
 def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
     """
-    Push into NSIP declarations by all the selected users. All project declarations for the user
-    are added/updated. This callback is entered twice: the first time it displays a progess
+    Push into NSIP declarations for all the selected users. All project declarations for the user
+    are added/updated. This callback is entered twice: the first time it displays a progress
     bar and start a dcc.Interval, the second time it does the real synchronisation work.
 
     :param n_clicks: checkbox state
@@ -1033,8 +1036,9 @@ def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
     declarations = session_data.nsip_declarations
     selected_declarations = declarations[declarations.selectable & declarations.selected]
     failed_updates = []
+    failed_exports = 0
+    successful_exports = 0
 
-    updated_declarations = 0
     if n_clicks and n_clicks >= 1:
         if sync_indicator > previous_sync_indicator:
             for row in selected_declarations.itertuples(index=False):
@@ -1096,6 +1100,7 @@ def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
                         ),
                         flush=True,
                     )
+                    successful_exports += 1
 
                 else:
                     if http_status:
@@ -1111,12 +1116,17 @@ def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
                         ),
                         flush=True,
                     )
-                    failed_updates.append(
-                        f"{row.email_auth}/{'projet' if project_type else 'reference'}"
-                        f"/{int(activity_id)}"
-                    )
+                    failed_exports += 1
+                    # Limit the number of explicit failed update displayed to avoid a too long
+                    # 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)}"
+                        )
+                    elif failed_exports == EXPORT_MAX_FAILDED_UPDATES:
+                        failed_updates.append("...")
 
-                updated_declarations += 1
                 previous_sync_indicator += 1
         else:
             component = html.Div(
@@ -1137,17 +1147,26 @@ def nsip_export_button(n_clicks, sync_indicator, previous_sync_indicator):
     else:
         raise PreventUpdate
 
-    if len(failed_updates) == 0:
+    if failed_exports == 0:
         update_status_msg = (
-            f"Toutes les déclarations sélectionnées ({updated_declarations})"
+            f"Toutes les déclarations sélectionnées ({successful_exports})"
             f" ont été enregistrées dans NSIP"
         )
         color = "success"
     else:
-        update_status_msg = (
-            f"{'Un export a' if len(failed_updates) == 1 else 'Plusieurs exports ont'} échoués :"
-            f" {', '.join(failed_updates)}"
-        )
+        update_status_msg = [
+            (
+                f"{failed_exports} export{' a' if failed_exports == 1 else 's ont'} échoué :"
+                f" {', '.join(failed_updates)}"
+            ),
+            html.Br(),
+            (
+                f"{successful_exports} déclaration"
+                f"{' a' if successful_exports == 1 else 's ont'}"
+                f" été synchronisée{'' if successful_exports == 1 else 's'}"
+                f" avec succès"
+            ),
+        ]
         color = "warning"
     return update_status_msg, True, color, previous_sync_indicator
 

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

@@ -1,12 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ositah
-Version: 24.12.dev1
+Version: 25.9.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
+License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://gitlab.in2p3.fr/hito/ositah
 Project-URL: Bug Tracker, https://gitlab.in2p3.fr/hito/ositah/-/issues
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
@@ -26,6 +25,7 @@ Requires-Dist: python-ldap
 Requires-Dist: pyyaml
 Requires-Dist: simplejson
 Requires-Dist: sqlalchemy~=2.0
+Dynamic: license-file
 
 # OSITAH : Outil de Suivi de Temps et d'Activités basé sur Hito
 

{ositah-24.12.dev1 → ositah-25.9.dev1}/pyproject.toml

@@ -4,12 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ositah"
-version = "24.12.dev1"
+version = "25.9.dev1"
 description = "Outils de Suivi d'Activités basé sur Hito"
 readme = "README.md"
 requires-python = ">=3.9"
 classifiers = [
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
 ]
@@ -30,9 +29,7 @@ dependencies = [
     "sqlalchemy~=2.0",
 ]
 dynamic = []
-
-[project.license]
-text = "BSD 3-Clause License"
+license = "BSD-3-Clause"
 
 [[project.authors]]
 name = "Michel Jouvin"