ositah 24.2.dev1__py3-none-any.whl → 24.7__py3-none-any.whl

ositah/apps/configuration/main.py

@@ -55,7 +55,11 @@ def declaration_periods_layout():
 
     # Disable creation of a new (next) period if the period matching the current already exists
     today = date.today().isoformat()
-    if today >= declaration_periods[-1].start_date and today <= declaration_periods[-1].end_date:
+    if (
+        len(declaration_periods) > 0
+        and today >= declaration_periods[-1].start_date
+        and today <= declaration_periods[-1].end_date
+    ):
         current_period_exists = True
     else:
         current_period_exists = False

ositah/apps/validation/tables.py

@@ -298,7 +298,7 @@ def build_validation_table(team, team_selection_date, declaration_set: int, peri
                         html.Em(
                             (
                                 f"Temps déclarés de l'équipe / total ="
-                                f" {round(selected_declarations['percent_global'].mean(),1)}%"
+                                f" {round(selected_declarations['percent_global'].mean(), 1)}%"
                                 f" (100%={SEMESTER_WEEKS} semaines)"
                             )
                         )

ositah/main.py

@@ -117,7 +117,7 @@ def url_not_found(path):
 # valid role missing jumbotron
 def valid_role_missing(msg):
     return ositah_jumbotron(
-        "You don't havea valid Hito role to OSITAH",
+        "You don't have a valid Hito role to OSITAH",
         msg,
         title_class="text-warning",
     )
@@ -204,9 +204,7 @@ def render_page_content(pathname, login_menu):
             if not user_session_data.agent_teams:
                 if role == HITO_ROLE_TEAM_MGR:
                     # For a team manager, show only the teams he/she is a manager
-                    teams = Team.query.filter(
-                        Team.managers.any(email_auth=session["user_email"])
-                    ).all()
+                    teams = Team.query.filter(Team.managers.any(email=session["user_email"])).all()
                     if len(teams) == 0:
                         # A user with role ROLE_RESP but is not the manager of any team is degraded
                         # to ROLE_AGENT

ositah/ositah.example.cfg

@@ -85,7 +85,7 @@ server:
 # Options related to declarations
 declaration:
   # Default date must be a date included into the selected validation period. It is a default, if no other explicitly select
-  default_date: 2021-07-01
+  #default_date: 2021-07-01
   # max_hours specifies the upper valid value for activities declared in hours
   max_hours: 400
   # Agent statut whose declaration is not mandatory

ositah/utils/hito_db_model.py

@@ -199,12 +199,16 @@ class ActiviteDetail(db.Model):
 
 
 class OSITAHSession(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True)
     email = db.Column(db.String(255), nullable=False)
     last_use = db.Column(db.DateTime, nullable=False)
 
 
 class OSITAHValidation(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True, default=new_uuid)
     validated = db.Column(db.Boolean, nullable=False)
     timestamp = db.Column(db.DateTime, nullable=False)
@@ -221,6 +225,8 @@ class OSITAHValidation(db.Model):
 
 
 class OSITAHValidationPeriod(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True, default=new_uuid)
     name = db.Column(db.String(255), unique=True, nullable=False)
     start_date = db.Column(db.DateTime, nullable=False)
@@ -229,6 +235,8 @@ class OSITAHValidationPeriod(db.Model):
 
 
 class OSITAHProjectDeclaration(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True, default=new_uuid)
     projet = db.Column(db.String(255), nullable=False)
     masterprojet = db.Column(db.String(255), nullable=False)

ositah/utils/menus.py

@@ -324,7 +324,7 @@ def ositah_jumbotron(title: str, main_text: str, details: str = None, title_clas
     return html.Div(
         dbc.Container(
             [
-                html.H1(title, className=f"display-3 {title_class if ( title_class ) else ''}"),
+                html.H1(title, className=f"display-3 {title_class if (title_class) else ''}"),
                 html.P(
                     main_text,
                     className="lead",

ositah/utils/teams.py

@@ -1,42 +1,42 @@
-import re
-from typing import Dict, List
-
-import pandas as pd
-
-
-def get_hito_teams():
-    """
-    Return Hito teams as a Dataframe
-
-    :return: Hito teams
-    """
-
-    from .hito_db import Team, db
-
-    team_query = Team.query
-
-    teams = pd.read_sql(team_query.statement, con=db.session.bind)
-
-    return teams
-
-
-def get_project_team_ids(team_config: Dict[str, str], project: str) -> List[str]:
-    """
-    Return the list of team ID associated with the project based on the configuration passed.
-    The configuration is a dict where the key is a pattern applied to the project name and
-    the value is the list of team names.
-
-    :param team_config: dict describing the teams associated with a project
-    :param project: project name
-    :return: list of team ids or None if no match is found
-    """
-
-    for pattern, team_list in team_config.items():
-        if re.match(pattern, project):
-            hito_teams = get_hito_teams()
-            hito_teams["selected"] = False
-            for team_pattern in team_list:
-                hito_teams.loc[hito_teams.nom.str.match(f"{team_pattern}$"), "selected"] = True
-            return hito_teams["id"].to_list()
-
-    return None
+import re
+from typing import Dict, List
+
+import pandas as pd
+
+
+def get_hito_teams():
+    """
+    Return Hito teams as a Dataframe
+
+    :return: Hito teams
+    """
+
+    from .hito_db_model import Team, db
+
+    team_query = Team.query
+
+    teams = pd.read_sql(team_query.statement, con=db.session.bind)
+
+    return teams
+
+
+def get_project_team_ids(team_config: Dict[str, str], project: str) -> List[str]:
+    """
+    Return the list of team ID associated with the project based on the configuration passed.
+    The configuration is a dict where the key is a pattern applied to the project name and
+    the value is the list of team names.
+
+    :param team_config: dict describing the teams associated with a project
+    :param project: project name
+    :return: list of team ids or None if no match is found
+    """
+
+    for pattern, team_list in team_config.items():
+        if re.match(pattern, project):
+            hito_teams = get_hito_teams()
+            hito_teams["selected"] = False
+            for team_pattern in team_list:
+                hito_teams.loc[hito_teams.nom.str.match(f"{team_pattern}$"), "selected"] = True
+            return hito_teams["id"].to_list()
+
+    return None

{ositah-24.2.dev1.dist-info → ositah-24.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.2.dev1
+Version: 24.7
 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.2.dev1.dist-info → ositah-24.7.dist-info}/RECORD

@@ -1,20 +1,20 @@
 ositah/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ositah/app.py,sha256=53ylXmqBSo31omZt-XBPBhOzlkGQBuDenU0Q8m7efCg,428
-ositah/main.py,sha256=k6Iv_5a9swWgcmT4g_pObu9Yh3Nu20iPYiG0sfFA6aU,15725
-ositah/ositah.example.cfg,sha256=dwmTDeclGDsPNfx_892CBJEfN7QoA0E3mXmCGJzHiPg,7471
+ositah/main.py,sha256=vw8PBYP3ugtWKWUta3UKagh8lbp-ogl8LUNF-KSyo0s,15673
+ositah/ositah.example.cfg,sha256=-k6Bytmuml3KHQn_1gGxW2k2bBAc39zPN6Ew5rG14xw,7472
 ositah/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ositah/apps/analysis.py,sha256=8bmP5m4nmfMODu1_YpzqCiFR2U2TMOOxAHbujY8od8g,28259
 ositah/apps/export.py,sha256=4h9_nk9uKopwfxgzqKyFk5u4qVQ9mtgGvk3zmxbhTV0,47532
 ositah/apps/configuration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ositah/apps/configuration/callbacks.py,sha256=J1bWwxQF2JRX6vvkTF22XXr4R2HEEXyK3ht75hbFgAM,33477
-ositah/apps/configuration/main.py,sha256=K0pQePovp88r5RRJiBwXi7RNK2P7S6iTN1a-TUYUU6I,20299
+ositah/apps/configuration/main.py,sha256=Kc0HU74bq2vV5RY5izYWlYAkkVfNyB2MxC20XquLDCc,20368
 ositah/apps/configuration/parameters.py,sha256=KmEVdC--IJRC3yzCN97FY1SooOKFy3bMneFBo1sGa54,3862
 ositah/apps/configuration/tools.py,sha256=e4CYt3F_2NY34vILwxHBWtvFntq082gwpKNsZZVexHE,3982
 ositah/apps/validation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ositah/apps/validation/callbacks.py,sha256=N9j0HLe8Xp1zZUrVgx0woeDBwVtJLQZ_BPVNaJ9UIZo,9557
 ositah/apps/validation/main.py,sha256=en9D6c65DUosbU31dxLR6BhLCU3yj7uxyoS3MYzvw30,2896
 ositah/apps/validation/parameters.py,sha256=tDHqDnoWv1QhcTad2yhqLT9_wCpj8sTYxKWsi1UF-uk,1003
-ositah/apps/validation/tables.py,sha256=Zz-yJw6Bw2fQOa87PW4EmW3nQZmmZF1kqr11NfWvQOI,24770
+ositah/apps/validation/tables.py,sha256=7NL4tvZ9zF1LwJ2YHJGrSvw2NqzhyK7OCLscchBfKNM,24771
 ositah/apps/validation/tools.py,sha256=omz6M10cCI5A8aTWllpkqFDEcIQFEhjzxOCiJKhHuDc,18046
 ositah/assets/arrow_down_up.svg,sha256=jH7QOmbLkYnNENa2PlBktOYHKDGN5KbrrFcV6UpgkCY,503
 ositah/assets/ositah.css,sha256=_T3mwonAYMPoDJoHYgJ5XgdFllHMcE28vnMMDd_hdOQ,1094
@@ -32,15 +32,15 @@ ositah/utils/cache.py,sha256=mM1iKDzQbVJZvTOgfPnvbxSBWi-OVGly6MncQ09CtEY,504
 ositah/utils/core.py,sha256=OFML9h5JNmXXeMo7n90FSBDHtivWOY7ff2SJcG4uYEM,295
 ositah/utils/exceptions.py,sha256=ZVngkr28pBxO-kZAeKW9FWAFyhzuWL98-S92mieHMSk,1911
 ositah/utils/hito_db.py,sha256=awVGrd1DAyj6BaEkLjTVN1l9A5SjZUJ1-fQ5PAik7bI,1510
-ositah/utils/hito_db_model.py,sha256=gtj0URvmxg0Ms7xcEXhkf84Blb3RZl4F8nWmsqrqwXk,8988
-ositah/utils/menus.py,sha256=Ypb4nXVBuW3eA2iIBR4T_s3N4PAKHA5_udiCSLKcgII,12007
+ositah/utils/hito_db_model.py,sha256=GvCHp5u-mPQinbZPvF6ONJAWIc2no1KN_VNJv6NCaPk,9356
+ositah/utils/menus.py,sha256=Xoyo2ySX0MD7phzyO5WjEcR0PCXwsX1TSrzONXnX4yI,12005
 ositah/utils/period.py,sha256=CxT77mAQasD59BmecXRUwme-_76hOr2kotOwTy6ZKfk,4058
 ositah/utils/projects.py,sha256=xLQ0RpJzMmCpx9Xdy8sHPQ-tijeWvSFPVSgOl5D6aSk,43479
-ositah/utils/teams.py,sha256=q8oRriecvM19whPWnIlScS2oqWIhGIdJHP0T1pK12W8,1186
+ositah/utils/teams.py,sha256=K8Z6kqs-kFpNiIg6wgmmZ3_tmfUPaB7wp0OAGmmZPG4,1234
 ositah/utils/utils.py,sha256=rUp366CNWLX3GMMHcJsau_y6kp52uCs1Hels2ESatGY,16372
-ositah-24.2.dev1.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
-ositah-24.2.dev1.dist-info/METADATA,sha256=T2invjMqUgwd0KRzzYDi97qmB5MUMK3ATr9oVRqZfeA,8103
-ositah-24.2.dev1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ositah-24.2.dev1.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
-ositah-24.2.dev1.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
-ositah-24.2.dev1.dist-info/RECORD,,
+ositah-24.7.dist-info/LICENSE,sha256=2C86YWCx1fvz92WySupcb6_t4NhHCVPE_ucy0YMTuoc,1550
+ositah-24.7.dist-info/METADATA,sha256=DbSd9LDthyUuMrSnunkOmpszD3cVkSiXJZEPRy8knY0,8098
+ositah-24.7.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+ositah-24.7.dist-info/entry_points.txt,sha256=t9oDDLUO1LwHJewlE862LbJMHpDTEyqbeUAPw_F7Q3I,44
+ositah-24.7.dist-info/top_level.txt,sha256=3kfj_oK4xoZFt0nsw6KKT_aoqshELBu0ryLXECbcqNI,7
+ositah-24.7.dist-info/RECORD,,

{ositah-24.2.dev1.dist-info → ositah-24.7.dist-info}/WHEEL

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