ositah 24.9.dev5__tar.gz → 24.9.dev7__tar.gz

{ositah-24.9.dev5/ositah.egg-info → ositah-24.9.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev5
+Version: 24.9.dev7
 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.dev5 → ositah-24.9.dev7}/ositah/apps/analysis.py

@@ -416,7 +416,7 @@ def analysis_layout():
             # The following dcc.Store is used to ensure that the the ijclab_export input exists
             # before the export page is created
             dcc.Store(id=DATA_SELECTED_SOURCE_ID, data=DATA_SOURCE_HITO),
-            html.Div(analysis_submenus(), id="analysis-submenus", style={"margin-top": "3em"}),
+            html.Div(analysis_submenus(), id="analysis-submenus", style={"marginTop": "3em"}),
             dcc.Store(id=ANALYSIS_LOAD_INDICATOR_ID, data=0),
             dcc.Store(id=ANALYSIS_SAVED_INDICATOR_ID, data=0),
             dcc.Store(id=ANALYSIS_SAVED_ACTIVE_TAB_ID, data=""),

{ositah-24.9.dev5 → ositah-24.9.dev7}/ositah/apps/configuration/callbacks.py

@@ -6,7 +6,6 @@ from datetime import datetime
 from typing import Any, List
 
 import dash_bootstrap_components as dbc
-import numpy as np
 from dash import callback_context, html
 from dash.dependencies import Input, Output, State
 from dash.exceptions import PreventUpdate
@@ -66,7 +65,7 @@ def check_activity_changes(project_activity: bool):
         indicator=True,
         suffixes=[None, "_nsip"],
     )
-    activity_changes["status"] = np.NaN
+    activity_changes["status"] = None
     activity_changes.loc[activity_changes._merge == "left_only", "status"] = PROJECT_CHANGE_REMOVED
     activity_changes.loc[activity_changes._merge == "right_only", "status"] = PROJECT_CHANGE_ADDED
     activity_changes.loc[

{ositah-24.9.dev5 → ositah-24.9.dev7}/ositah/apps/configuration/main.py

@@ -27,7 +27,7 @@ def configuration_layout():
             html.Div(
                 configuration_submenus(),
                 id="configuration-submenus",
-                style={"margin-top": "3em"},
+                style={"marginTop": "3em"},
             ),
             # The following dcc.Store coupled with tables must be created in the layout for
             # the callback to work
@@ -70,7 +70,7 @@ def declaration_periods_layout():
                 dbc.Label(
                     "Date de début",
                     html_for=DECLARATION_PERIOD_START_DATE_ID,
-                    style={"font-weight": "bold"},
+                    style={"fontWeight": "bold"},
                     width="5",
                 ),
                 dbc.Col(
@@ -83,14 +83,14 @@ def declaration_periods_layout():
                     class_name="me-3",
                 ),
             ],
-            style={"margin-bottom": "10px"},
+            style={"marginBottom": "10px"},
         ),
         dbc.Row(
             [
                 dbc.Label(
                     "Date de validation",
                     html_for=DECLARATION_PERIOD_VALIDATION_DATE_ID,
-                    style={"font-weight": "bold"},
+                    style={"fontWeight": "bold"},
                     width="5",
                 ),
                 dbc.Col(
@@ -103,14 +103,14 @@ def declaration_periods_layout():
                     class_name="me-3",
                 ),
             ],
-            style={"margin-bottom": "10px"},
+            style={"marginBottom": "10px"},
         ),
         dbc.Row(
             [
                 dbc.Label(
                     "Date de fin",
                     html_for=DECLARATION_PERIOD_END_DATE_ID,
-                    style={"font-weight": "bold"},
+                    style={"fontWeight": "bold"},
                     width="5",
                 ),
                 dbc.Col(
@@ -123,14 +123,14 @@ def declaration_periods_layout():
                     class_name="me-3",
                 ),
             ],
-            style={"margin-bottom": "10px"},
+            style={"marginBottom": "10px"},
         ),
         dbc.Row(
             [
                 dbc.Label(
                     "Nom",
                     html_for=DECLARATION_PERIOD_NAME_ID,
-                    style={"font-weight": "bold"},
+                    style={"fontWeight": "bold"},
                     width="5",
                 ),
                 dbc.Col(
@@ -168,8 +168,8 @@ def declaration_periods_layout():
                         id=DECLARATION_PERIOD_PARAMS_ID,
                         style={
                             "border": "1px solid",
-                            "border-radius": "4px",
-                            "border-sizing": "border-box",
+                            "borderRadius": "4px",
+                            "borderSizing": "border-box",
                             "padding": "10px 10px",
                             "visibility": "hidden",
                         },
@@ -211,7 +211,7 @@ def declaration_periods_layout():
                     ),
                 ],
                 justify="evenly",
-                style={"margin-top": "3em"},
+                style={"marginTop": "3em"},
             ),
             dcc.Store(id=DECLARATION_PERIODS_CREATE_CLICK_ID, data=0),
             # The 2 following Stores are used to control if the status must be displayed or not.
@@ -352,19 +352,19 @@ def project_teams_layout():
                                             html.I(className="bi bi-chevron-double-right"),
                                             id=ACTIVITY_TEAMS_BUTTON_ADD_ID,
                                             disabled=True,
-                                            style={"margin-top": "1em"},
+                                            style={"marginTop": "1em"},
                                         ),
                                         dbc.Button(
                                             html.I(className="bi bi-chevron-double-left"),
                                             id=ACTIVITY_TEAMS_BUTTON_REMOVE_ID,
                                             disabled=True,
-                                            style={"margin-top": "2em"},
+                                            style={"marginTop": "2em"},
                                         ),
                                     ],
                                     vertical=True,
                                 ),
                             ],
-                            style={"display": "flex", "justify-content": "center"},
+                            style={"display": "flex", "justifyContent": "center"},
                         ),
                         width=ACTIVITY_TEAMS_LIST_BOX_INTERVAL,
                         align="center",
@@ -382,7 +382,7 @@ def project_teams_layout():
                     ),
                 ],
                 justify="start",
-                style={"margin-top": "5em"},
+                style={"marginTop": "5em"},
             ),
             dbc.Row(
                 [
@@ -404,7 +404,7 @@ def project_teams_layout():
                     ),
                 ],
                 justify="evenly",
-                style={"margin-top": "3em"},
+                style={"marginTop": "3em"},
             ),
             dcc.Store(id=ACTIVITY_TEAMS_PROJECT_ACTIVITY_ID, data=True),
             dcc.Store(id=ACTIVITY_TEAMS_ADDED_TEAMS_ID, data=[]),
@@ -449,7 +449,7 @@ def project_mgt_layout():
                     ),
                 ],
                 justify="center",
-                style={"margin-top": "1em"},
+                style={"marginTop": "1em"},
             ),
             dbc.Row(
                 [
@@ -478,7 +478,7 @@ def project_mgt_layout():
                         xxl={"size": PROJECT_MGT_LIST_BOX_WIDTH_XXL, "offset": 0},
                     ),
                 ],
-                style={"margin-top": "1em"},
+                style={"marginTop": "1em"},
             ),
             dbc.Row(
                 dbc.Col(
@@ -489,7 +489,7 @@ def project_mgt_layout():
                         style={"visibility": "hidden"},
                     ),
                 ),
-                style={"margin-top": "3em"},
+                style={"marginTop": "3em"},
             ),
             dcc.Store(id=PROJECT_MGT_PROJECT_ACTIVITY_ID, data=True),
         ],

{ositah-24.9.dev5 → ositah-24.9.dev7}/ositah/apps/export.py

@@ -108,7 +108,7 @@ def export_layout():
             # The following dcc.Store is used to ensure that the the ijclab_export input exists
             # before the export page is created
             dcc.Store(id=DATA_SELECTED_SOURCE_ID, data=DATA_SOURCE_OSITAH),
-            html.Div(export_submenus(), id="export-submenus", style={"margin-top": "3em"}),
+            html.Div(export_submenus(), id="export-submenus", style={"marginTop": "3em"}),
             dcc.Store(id=EXPORT_LOAD_INDICATOR_ID, data=0),
             dcc.Store(id=EXPORT_SAVED_LOAD_INDICATOR_ID, data=0),
             dcc.Store(id=EXPORT_SAVED_ACTIVE_TAB_ID, data=""),

{ositah-24.9.dev5 → ositah-24.9.dev7}/ositah/apps/validation/main.py

@@ -65,7 +65,7 @@ def validation_layout():
             html.Div(
                 validation_submenus(),
                 id="validation-submenus",
-                style={"margin-top": "3em"},
+                style={"marginTop": "3em"},
             ),
             dcc.Store(id=VALIDATION_LOAD_INDICATOR_ID, data=0),
             dcc.Store(id=VALIDATION_SAVED_INDICATOR_ID, data=0),

{ositah-24.9.dev5 → ositah-24.9.dev7}/ositah/main.py

@@ -83,14 +83,14 @@ SIDEBAR_STYLE = {
     "bottom": 0,
     "width": f"{SIDEBAR_WIDTH}rem",
     "padding": "2rem 1rem",
-    "background-color": "#f8f9fa",
+    "backgroundColor": "#f8f9fa",
 }
 
 # the styles for the main content position it to the right of the sidebar and
 # add some padding.
 CONTENT_STYLE = {
-    "margin-left": f"{SIDEBAR_WIDTH+2}rem",
-    "margin-right": "2rem",
+    "marginLeft": f"{SIDEBAR_WIDTH+2}rem",
+    "marginRight": "2rem",
     "padding": "2rem 1rem",
 }
 
@@ -192,7 +192,7 @@ def render_page_content(pathname, login_menu):
 
     if user_authenticated:
         user_session_data = global_params.session_data
-        user = get_agent_by_email(session["user_email"])
+        user = get_agent_by_email()
         role_ok = False
         user_roles = user.roles
         for role in AUTHORIZED_ROLES:
@@ -216,7 +216,7 @@ def render_page_content(pathname, login_menu):
                     else:
                         teams.extend(
                             Team.query.filter(
-                                Team.children_managers.any(email_auth=session["user_email"])
+                                Team.children_managers.any(email=session["user_email"])
                             ).all()
                         )
                         team_list = sorted([t.nom for t in teams])

{ositah-24.9.dev5 → ositah-24.9.dev7}/ositah/utils/agents.py

@@ -12,18 +12,20 @@ NSIP_AGENT_COLUMNS = {
 }
 
 
-def get_agent_by_email(connexion_email: str) -> str:
+def get_agent_by_email(agent_email: str = None) -> str:
     """
-    Retrieve an agent from Hito using the connexion email. If the connexion email is not
-    defined for the agent, try to use the contact email.
+    Retrieve an agent from Hito using his email. If the agent email argument
+    is not present, use the session user_email attribute.
 
-    :param connexion_email: agent's email
+    :param: agent_email: agent's email
     :return: agent entry (row)
     """
 
     from ositah.utils.hito_db_model import Agent
 
-    user = Agent.query.filter_by(email_auth=session["user_email"]).first()
+    if agent_email is None:
+        agent_email = session["user_email"]
+    user = Agent.query.filter_by(email_auth=agent_email).first()
     if user is None:
         user = Agent.query.filter_by(email=session["user_email"]).first()
 

{ositah-24.9.dev5 → ositah-24.9.dev7/ositah.egg-info}/PKG-INFO

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

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