diff --git a/README.md b/README.md index 6c79f8bb..d0194b45 100644 --- a/README.md +++ b/README.md @@ -176,7 +176,7 @@ puis snakeviz -s --hostname 0.0.0.0 -p 5555 /opt/scodoc-data/GET.ScoDoc......prof -# Paquet Debian 11 +## Paquet Debian 12 Les scripts associés au paquet Debian (.deb) sont dans `tools/debian`. Le plus important est `postinst`qui se charge de configurer le système (install ou diff --git a/app/__init__.py b/app/__init__.py old mode 100644 new mode 100755 index c2b78959..f1fba060 --- a/app/__init__.py +++ b/app/__init__.py @@ -148,7 +148,7 @@ def handle_invalid_usage(error): # JSON ENCODING # used by some internal finctions -# the API is now using flask_son, NOT THIS ENCODER +# the API is now using flask_json, NOT THIS ENCODER class ScoDocJSONEncoder(json.JSONEncoder): def default(self, o): # pylint: disable=E0202 if isinstance(o, (datetime.date, datetime.datetime)): @@ -260,7 +260,13 @@ def create_app(config_class=DevConfig): CAS(app, url_prefix="/cas", configuration_function=cas.set_cas_configuration) app.wsgi_app = ReverseProxied(app.wsgi_app) - FlaskJSON(app) + app_json = FlaskJSON(app) + + @app_json.encoder + def scodoc_json_encoder(o): + "Overide default date encoding (RFC 822) and use ISO" + if isinstance(o, (datetime.date, datetime.datetime)): + return o.isoformat() # Pour conserver l'ordre des objets dans les JSON: # e.g. l'ordre des UE dans les bulletins @@ -322,6 +328,7 @@ def create_app(config_class=DevConfig): from app.views import notes_bp from app.views import users_bp from app.views import absences_bp + from app.views import assiduites_bp from app.api import api_bp from app.api import api_web_bp @@ -340,6 +347,9 @@ def create_app(config_class=DevConfig): app.register_blueprint( absences_bp, url_prefix="/ScoDoc//Scolarite/Absences" ) + app.register_blueprint( + assiduites_bp, url_prefix="/ScoDoc//Scolarite/Assiduites" + ) app.register_blueprint(api_bp, url_prefix="/ScoDoc/api") app.register_blueprint(api_web_bp, url_prefix="/ScoDoc//api") diff --git a/app/api/__init__.py b/app/api/__init__.py index d5b43688..bb8f6cc5 100644 --- a/app/api/__init__.py +++ b/app/api/__init__.py @@ -1,8 +1,9 @@ """api.__init__ """ - +from flask_json import as_json from flask import Blueprint -from flask import request +from flask import request, g +from app import db from app.scodoc import sco_utils as scu from app.scodoc.sco_exceptions import ScoException @@ -34,9 +35,27 @@ def requested_format(default_format="json", allowed_formats=None): return None +@as_json +def get_model_api_object(model_cls: db.Model, model_id: int, join_cls: db.Model = None): + """ + Retourne une réponse contenant la représentation api de l'objet "Model[model_id]" + + Filtrage du département en fonction d'une classe de jointure (eg: Identite, Formsemstre) -> join_cls + + exemple d'utilisation : fonction "justificatif()" -> app/api/justificatifs.py + """ + query = model_cls.query.filter_by(id=model_id) + if g.scodoc_dept and join_cls is not None: + query = query.join(join_cls).filter_by(dept_id=g.scodoc_dept_id) + unique: model_cls = query.first_or_404() + + return unique.to_dict(format_api=True) + + from app.api import tokens from app.api import ( absences, + assiduites, billets_absences, departements, etudiants, @@ -44,6 +63,7 @@ from app.api import ( formations, formsemestres, jury, + justificatifs, logos, partitions, semset, diff --git a/app/api/assiduites.py b/app/api/assiduites.py new file mode 100644 index 00000000..48f54db6 --- /dev/null +++ b/app/api/assiduites.py @@ -0,0 +1,1039 @@ +############################################################################## +# ScoDoc +# Copyright (c) 1999 - 2022 Emmanuel Viennet. All rights reserved. +# See LICENSE +############################################################################## +"""ScoDoc 9 API : Assiduités +""" +from datetime import datetime + +from flask import g, request +from flask_json import as_json +from flask_login import current_user, login_required + +from app import db, log +import app.scodoc.sco_assiduites as scass +import app.scodoc.sco_utils as scu +from app.api import api_bp as bp +from app.api import api_web_bp, get_model_api_object, tools +from app.decorators import permission_required, scodoc +from app.models import ( + Assiduite, + FormSemestre, + Identite, + ModuleImpl, + Scolog, + Justificatif, +) +from app.models.assiduites import get_assiduites_justif +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_utils import json_error + + +@bp.route("/assiduite/") +@api_web_bp.route("/assiduite/") +@scodoc +@permission_required(Permission.ScoView) +def assiduite(assiduite_id: int = None): + """Retourne un objet assiduité à partir de son id + + Exemple de résultat: + { + "assiduite_id": 1, + "etudid": 2, + "moduleimpl_id": 3, + "date_debut": "2022-10-31T08:00+01:00", + "date_fin": "2022-10-31T10:00+01:00", + "etat": "retard", + "desc": "une description", + "user_id: 1 or null, + "est_just": False or True, + } + """ + + return get_model_api_object(Assiduite, assiduite_id, Identite) + + +@bp.route("/assiduite//justificatifs", defaults={"long": False}) +@api_web_bp.route( + "/assiduite//justificatifs", defaults={"long": False} +) +@bp.route("/assiduite//justificatifs/long", defaults={"long": True}) +@api_web_bp.route( + "/assiduite//justificatifs/long", defaults={"long": True} +) +@scodoc +@permission_required(Permission.ScoView) +@as_json +def assiduite_justificatifs(assiduite_id: int = None, long: bool = False): + """Retourne la liste des justificatifs qui justifie cette assiduitée + + Exemple de résultat: + [ + 1, + 2, + 3, + ... + ] + """ + + return get_assiduites_justif(assiduite_id, True) + + +# etudid +@bp.route("/assiduites//count", defaults={"with_query": False}) +@api_web_bp.route("/assiduites//count", defaults={"with_query": False}) +@bp.route("/assiduites//count/query", defaults={"with_query": True}) +@api_web_bp.route("/assiduites//count/query", defaults={"with_query": True}) +@bp.route("/assiduites/etudid//count", defaults={"with_query": False}) +@api_web_bp.route("/assiduites/etudid//count", defaults={"with_query": False}) +@bp.route("/assiduites/etudid//count/query", defaults={"with_query": True}) +@api_web_bp.route( + "/assiduites/etudid//count/query", defaults={"with_query": True} +) +# nip +@bp.route("/assiduites/nip//count", defaults={"with_query": False}) +@api_web_bp.route("/assiduites/nip//count", defaults={"with_query": False}) +@bp.route("/assiduites/nip//count/query", defaults={"with_query": True}) +@api_web_bp.route("/assiduites/nip//count/query", defaults={"with_query": True}) +# ine +@bp.route("/assiduites/ine//count", defaults={"with_query": False}) +@api_web_bp.route("/assiduites/ine//count", defaults={"with_query": False}) +@bp.route("/assiduites/ine//count/query", defaults={"with_query": True}) +@api_web_bp.route("/assiduites/ine//count/query", defaults={"with_query": True}) +# +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoView) +def count_assiduites( + etudid: int = None, nip: str = None, ine: str = None, with_query: bool = False +): + """ + Retourne le nombre d'assiduités d'un étudiant + chemin : /assiduites//count + + Un filtrage peut être donné avec une query + chemin : /assiduites//count/query? + + Les différents filtres : + Type (type de comptage -> journee, demi, heure, nombre d'assiduite): + query?type=(journee, demi, heure) -> une seule valeur parmis les trois + ex: .../query?type=heure + Comportement par défaut : compte le nombre d'assiduité enregistrée + + Etat (etat de l'étudiant -> absent, present ou retard): + query?etat=[- liste des états séparé par une virgule -] + ex: .../query?etat=present,retard + Date debut + (date de début de l'assiduité, sont affichés les assiduités + dont la date de début est supérieur ou égale à la valeur donnée): + query?date_debut=[- date au format iso -] + ex: query?date_debut=2022-11-03T08:00+01:00 + Date fin + (date de fin de l'assiduité, sont affichés les assiduités + dont la date de fin est inférieure ou égale à la valeur donnée): + query?date_fin=[- date au format iso -] + ex: query?date_fin=2022-11-03T10:00+01:00 + Moduleimpl_id (l'id du module concerné par l'assiduité): + query?moduleimpl_id=[- int ou vide -] + ex: query?moduleimpl_id=1234 + query?moduleimpl_od= + Formsemstre_id (l'id du formsemestre concerné par l'assiduité) + query?formsemestre_id=[int] + ex query?formsemestre_id=3 + user_id (l'id de l'auteur de l'assiduité) + query?user_id=[int] + ex query?user_id=3 + est_just (si l'assiduité est justifié (fait aussi filtre par abs/retard)) + query?est_just=[bool] + query?est_just=f + query?est_just=t + + + + + """ + # query = Identite.query.filter_by(id=etudid) + # if g.scodoc_dept: + # query = query.filter_by(dept_id=g.scodoc_dept_id) + + # etud: Identite = query.first_or_404(etudid) + + etud: Identite = tools.get_etud(etudid, nip, ine) + + if etud is None: + return json_error( + 404, + message="étudiant inconnu", + ) + + filtered: dict[str, object] = {} + metric: str = "all" + + if with_query: + metric, filtered = _count_manager(request) + + return scass.get_assiduites_stats( + assiduites=etud.assiduites, metric=metric, filtered=filtered + ) + + +# etudid +@bp.route("/assiduites/", defaults={"with_query": False}) +@api_web_bp.route("/assiduites/", defaults={"with_query": False}) +@bp.route("/assiduites//query", defaults={"with_query": True}) +@api_web_bp.route("/assiduites//query", defaults={"with_query": True}) +@bp.route("/assiduites/etudid/", defaults={"with_query": False}) +@api_web_bp.route("/assiduites/etudid/", defaults={"with_query": False}) +@bp.route("/assiduites/etudid//query", defaults={"with_query": True}) +@api_web_bp.route("/assiduites/etudid//query", defaults={"with_query": True}) +# nip +@bp.route("/assiduites/nip/", defaults={"with_query": False}) +@api_web_bp.route("/assiduites/nip/", defaults={"with_query": False}) +@bp.route("/assiduites/nip//query", defaults={"with_query": True}) +@api_web_bp.route("/assiduites/nip//query", defaults={"with_query": True}) +# ine +@bp.route("/assiduites/ine/", defaults={"with_query": False}) +@api_web_bp.route("/assiduites/ine/", defaults={"with_query": False}) +@bp.route("/assiduites/ine//query", defaults={"with_query": True}) +@api_web_bp.route("/assiduites/ine//query", defaults={"with_query": True}) +# +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoView) +def assiduites(etudid: int = None, nip=None, ine=None, with_query: bool = False): + """ + Retourne toutes les assiduités d'un étudiant + chemin : /assiduites/ + + Un filtrage peut être donné avec une query + chemin : /assiduites//query? + + Les différents filtres : + Etat (etat de l'étudiant -> absent, present ou retard): + query?etat=[- liste des états séparé par une virgule -] + ex: .../query?etat=present,retard + Date debut + (date de début de l'assiduité, sont affichés les assiduités + dont la date de début est supérieur ou égale à la valeur donnée): + query?date_debut=[- date au format iso -] + ex: query?date_debut=2022-11-03T08:00+01:00 + Date fin + (date de fin de l'assiduité, sont affichés les assiduités + dont la date de fin est inférieure ou égale à la valeur donnée): + query?date_fin=[- date au format iso -] + ex: query?date_fin=2022-11-03T10:00+01:00 + Moduleimpl_id (l'id du module concerné par l'assiduité): + query?moduleimpl_id=[- int ou vide -] + ex: query?moduleimpl_id=1234 + query?moduleimpl_od= + Formsemstre_id (l'id du formsemestre concerné par l'assiduité) + query?formsemstre_id=[int] + ex query?formsemestre_id=3 + user_id (l'id de l'auteur de l'assiduité) + query?user_id=[int] + ex query?user_id=3 + est_just (si l'assiduité est justifié (fait aussi filtre par abs/retard)) + query?est_just=[bool] + query?est_just=f + query?est_just=t + + + """ + + # query = Identite.query.filter_by(id=etudid) + # if g.scodoc_dept: + # query = query.filter_by(dept_id=g.scodoc_dept_id) + + # etud: Identite = query.first_or_404(etudid) + etud: Identite = tools.get_etud(etudid, nip, ine) + + if etud is None: + return json_error( + 404, + message="étudiant inconnu", + ) + assiduites_query = etud.assiduites + + if with_query: + assiduites_query = _filter_manager(request, assiduites_query) + + data_set: list[dict] = [] + for ass in assiduites_query.all(): + data = ass.to_dict(format_api=True) + data = _with_justifs(data) + data_set.append(data) + + return data_set + + +@bp.route("/assiduites/group/query", defaults={"with_query": True}) +@api_web_bp.route("/assiduites/group/query", defaults={"with_query": True}) +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoView) +def assiduites_group(with_query: bool = False): + """ + Retourne toutes les assiduités d'un groupe d'étudiants + chemin : /assiduites/group/query?etudids=1,2,3 + + Un filtrage peut être donné avec une query + chemin : /assiduites/group/query?etudids=1,2,3 + + Les différents filtres : + Etat (etat de l'étudiant -> absent, present ou retard): + query?etat=[- liste des états séparé par une virgule -] + ex: .../query?etat=present,retard + Date debut + (date de début de l'assiduité, sont affichés les assiduités + dont la date de début est supérieur ou égale à la valeur donnée): + query?date_debut=[- date au format iso -] + ex: query?date_debut=2022-11-03T08:00+01:00 + Date fin + (date de fin de l'assiduité, sont affichés les assiduités + dont la date de fin est inférieure ou égale à la valeur donnée): + query?date_fin=[- date au format iso -] + ex: query?date_fin=2022-11-03T10:00+01:00 + Moduleimpl_id (l'id du module concerné par l'assiduité): + query?moduleimpl_id=[- int ou vide -] + ex: query?moduleimpl_id=1234 + query?moduleimpl_od= + Formsemstre_id (l'id du formsemestre concerné par l'assiduité) + query?formsemstre_id=[int] + ex query?formsemestre_id=3 + user_id (l'id de l'auteur de l'assiduité) + query?user_id=[int] + ex query?user_id=3 + est_just (si l'assiduité est justifié (fait aussi filtre par abs/retard)) + query?est_just=[bool] + query?est_just=f + query?est_just=t + + + """ + + etuds = request.args.get("etudids", "") + etuds = etuds.split(",") + try: + etuds = [int(etu) for etu in etuds] + except ValueError: + return json_error(404, "Le champs etudids n'est pas correctement formé") + + query = Identite.query.filter(Identite.id.in_(etuds)) + if g.scodoc_dept: + query = query.filter_by(dept_id=g.scodoc_dept_id) + + if len(etuds) != query.count() or len(etuds) == 0: + return json_error( + 404, + "Tous les étudiants ne sont pas dans le même département et/ou n'existe pas.", + ) + assiduites_query = Assiduite.query.filter(Assiduite.etudid.in_(etuds)) + + if with_query: + assiduites_query = _filter_manager(request, assiduites_query) + + data_set: dict[list[dict]] = {str(key): [] for key in etuds} + for ass in assiduites_query.all(): + data = ass.to_dict(format_api=True) + data = _with_justifs(data) + data_set.get(str(data["etudid"])).append(data) + return data_set + + +@bp.route( + "/assiduites/formsemestre/", defaults={"with_query": False} +) +@api_web_bp.route( + "/assiduites/formsemestre/", defaults={"with_query": False} +) +@bp.route( + "/assiduites/formsemestre//query", + defaults={"with_query": True}, +) +@api_web_bp.route( + "/assiduites/formsemestre//query", + defaults={"with_query": True}, +) +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoView) +def assiduites_formsemestre(formsemestre_id: int, with_query: bool = False): + """Retourne toutes les assiduités du formsemestre""" + formsemestre: FormSemestre = None + formsemestre_id = int(formsemestre_id) + formsemestre = FormSemestre.query.filter_by(id=formsemestre_id).first() + + if formsemestre is None: + return json_error(404, "le paramètre 'formsemestre_id' n'existe pas") + + assiduites_query = scass.filter_by_formsemestre(Assiduite.query,Assiduite, formsemestre) + + if with_query: + assiduites_query = _filter_manager(request, assiduites_query) + + data_set: list[dict] = [] + for ass in assiduites_query.all(): + data = ass.to_dict(format_api=True) + data = _with_justifs(data) + data_set.append(data) + + return data_set + + +@bp.route( + "/assiduites/formsemestre//count", + defaults={"with_query": False}, +) +@api_web_bp.route( + "/assiduites/formsemestre//count", + defaults={"with_query": False}, +) +@bp.route( + "/assiduites/formsemestre//count/query", + defaults={"with_query": True}, +) +@api_web_bp.route( + "/assiduites/formsemestre//count/query", + defaults={"with_query": True}, +) +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoView) +def count_assiduites_formsemestre( + formsemestre_id: int = None, with_query: bool = False +): + """Comptage des assiduités du formsemestre""" + formsemestre: FormSemestre = None + formsemestre_id = int(formsemestre_id) + formsemestre = FormSemestre.query.filter_by(id=formsemestre_id).first() + + if formsemestre is None: + return json_error(404, "le paramètre 'formsemestre_id' n'existe pas") + + etuds = formsemestre.etuds.all() + etuds_id = [etud.id for etud in etuds] + + assiduites_query = Assiduite.query.filter(Assiduite.etudid.in_(etuds_id)) + assiduites_query = scass.filter_by_formsemestre( + assiduites_query, Assiduite, formsemestre + ) + metric: str = "all" + filtered: dict = {} + if with_query: + metric, filtered = _count_manager(request) + + return scass.get_assiduites_stats(assiduites_query, metric, filtered) + + +# etudid +@bp.route("/assiduite//create", methods=["POST"]) +@api_web_bp.route("/assiduite//create", methods=["POST"]) +@bp.route("/assiduite/etudid//create", methods=["POST"]) +@api_web_bp.route("/assiduite/etudid//create", methods=["POST"]) +# nip +@bp.route("/assiduite/nip//create", methods=["POST"]) +@api_web_bp.route("/assiduite/nip//create", methods=["POST"]) +# ine +@bp.route("/assiduite/ine//create", methods=["POST"]) +@api_web_bp.route("/assiduite/ine//create", methods=["POST"]) +# +@scodoc +@as_json +@login_required +@permission_required(Permission.ScoAbsChange) +def assiduite_create(etudid: int = None, nip=None, ine=None): + """ + Création d'une assiduité pour l'étudiant (etudid) + La requête doit avoir un content type "application/json": + [ + { + "date_debut": str, + "date_fin": str, + "etat": str, + }, + { + "date_debut": str, + "date_fin": str, + "etat": str, + "moduleimpl_id": int, + "desc":str, + } + ... + ] + + """ + etud: Identite = tools.get_etud(etudid, nip, ine) + + if etud is None: + return json_error( + 404, + message="étudiant inconnu", + ) + + create_list: list[object] = request.get_json(force=True) + + if not isinstance(create_list, list): + return json_error(404, "Le contenu envoyé n'est pas une liste") + + errors: list = [] + success: list = [] + for i, data in enumerate(create_list): + code, obj = _create_singular(data, etud) + if code == 404: + errors.append({"indice": i, "message": obj}) + else: + success.append({"indice": i, "message": obj}) + scass.simple_invalidate_cache(data, etud.id) + + db.session.commit() + + return {"errors": errors, "success": success} + + +@bp.route("/assiduites/create", methods=["POST"]) +@api_web_bp.route("/assiduites/create", methods=["POST"]) +@scodoc +@as_json +@login_required +@permission_required(Permission.ScoAbsChange) +def assiduites_create(): + """ + Création d'une assiduité ou plusieurs assiduites + La requête doit avoir un content type "application/json": + [ + { + "date_debut": str, + "date_fin": str, + "etat": str, + "etudid":int, + }, + { + "date_debut": str, + "date_fin": str, + "etat": str, + "etudid":int, + + "moduleimpl_id": int, + "desc":str, + } + ... + ] + + """ + + create_list: list[object] = request.get_json(force=True) + + if not isinstance(create_list, list): + return json_error(404, "Le contenu envoyé n'est pas une liste") + + errors: list = [] + success: list = [] + for i, data in enumerate(create_list): + etud: Identite = Identite.query.filter_by(id=data["etudid"]).first() + if etud is None: + errors.append({"indice": i, "message": "Cet étudiant n'existe pas."}) + continue + + code, obj = _create_singular(data, etud) + if code == 404: + errors.append({"indice": i, "message": obj}) + else: + success.append({"indice": i, "message": obj}) + scass.simple_invalidate_cache(data) + + return {"errors": errors, "success": success} + + +def _create_singular( + data: dict, + etud: Identite, +) -> tuple[int, object]: + errors: list[str] = [] + + # -- vérifications de l'objet json -- + # cas 1 : ETAT + etat = data.get("etat", None) + if etat is None: + errors.append("param 'etat': manquant") + elif not scu.EtatAssiduite.contains(etat): + errors.append("param 'etat': invalide") + + etat = scu.EtatAssiduite.get(etat) + + # cas 2 : date_debut + date_debut = data.get("date_debut", None) + if date_debut is None: + errors.append("param 'date_debut': manquant") + deb = scu.is_iso_formated(date_debut, convert=True) + if deb is None: + errors.append("param 'date_debut': format invalide") + + # cas 3 : date_fin + date_fin = data.get("date_fin", None) + if date_fin is None: + errors.append("param 'date_fin': manquant") + fin = scu.is_iso_formated(date_fin, convert=True) + if fin is None: + errors.append("param 'date_fin': format invalide") + + # cas 4 : moduleimpl_id + + moduleimpl_id = data.get("moduleimpl_id", False) + moduleimpl: ModuleImpl = None + + if moduleimpl_id not in [False, None]: + moduleimpl = ModuleImpl.query.filter_by(id=int(moduleimpl_id)).first() + if moduleimpl is None: + errors.append("param 'moduleimpl_id': invalide") + + # cas 5 : desc + + desc: str = data.get("desc", None) + + external_data = data.get("external_data", False) + if external_data is not False: + if not isinstance(external_data, dict): + errors.append("param 'external_data' : n'est pas un objet JSON") + + if errors: + err: str = ", ".join(errors) + return (404, err) + + # TOUT EST OK + try: + nouv_assiduite: Assiduite = Assiduite.create_assiduite( + date_debut=deb, + date_fin=fin, + etat=etat, + etud=etud, + moduleimpl=moduleimpl, + description=desc, + user_id=current_user.id, + external_data=external_data, + ) + + db.session.add(nouv_assiduite) + db.session.commit() + + return (200, {"assiduite_id": nouv_assiduite.id}) + except ScoValueError as excp: + return ( + 404, + excp.args[0], + ) + + +@bp.route("/assiduite/delete", methods=["POST"]) +@api_web_bp.route("/assiduite/delete", methods=["POST"]) +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoAbsChange) +def assiduite_delete(): + """ + Suppression d'une assiduité à partir de son id + + Forme des données envoyées : + + [ + , + ... + ] + + + """ + assiduites_list: list[int] = request.get_json(force=True) + if not isinstance(assiduites_list, list): + return json_error(404, "Le contenu envoyé n'est pas une liste") + + output = {"errors": [], "success": []} + + for i, ass in enumerate(assiduites_list): + code, msg = _delete_singular(ass, db) + if code == 404: + output["errors"].append({"indice": i, "message": msg}) + else: + output["success"].append({"indice": i, "message": "OK"}) + + db.session.commit() + return output + + +def _delete_singular(assiduite_id: int, database): + assiduite_unique: Assiduite = Assiduite.query.filter_by(id=assiduite_id).first() + if assiduite_unique is None: + return (404, "Assiduite non existante") + ass_dict = assiduite_unique.to_dict() + log(f"delete_assiduite: {assiduite_unique.etudiant.id} {assiduite_unique}") + Scolog.logdb( + method="delete_assiduite", + etudid=assiduite_unique.etudiant.id, + msg=f"assiduité: {assiduite_unique}", + ) + database.session.delete(assiduite_unique) + scass.simple_invalidate_cache(ass_dict) + return (200, "OK") + + +@bp.route("/assiduite//edit", methods=["POST"]) +@api_web_bp.route("/assiduite//edit", methods=["POST"]) +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoAbsChange) +def assiduite_edit(assiduite_id: int): + """ + Edition d'une assiduité à partir de son id + La requête doit avoir un content type "application/json": + { + "etat"?: str, + "moduleimpl_id"?: int + "desc"?: str + "est_just"?: bool + } + """ + assiduite_unique: Assiduite = Assiduite.query.filter_by( + id=assiduite_id + ).first_or_404() + errors: list[str] = [] + data = request.get_json(force=True) + + # Vérifications de data + + # Cas 1 : Etat + if data.get("etat") is not None: + etat = scu.EtatAssiduite.get(data.get("etat")) + if etat is None: + errors.append("param 'etat': invalide") + else: + assiduite_unique.etat = etat + + # Cas 2 : Moduleimpl_id + moduleimpl_id = data.get("moduleimpl_id", False) + moduleimpl: ModuleImpl = None + + if moduleimpl_id is not False: + if moduleimpl_id is not None and moduleimpl_id != "": + moduleimpl = ModuleImpl.query.filter_by(id=int(moduleimpl_id)).first() + if moduleimpl is None: + errors.append("param 'moduleimpl_id': invalide") + else: + if not moduleimpl.est_inscrit( + Identite.query.filter_by(id=assiduite_unique.etudid).first() + ): + errors.append("param 'moduleimpl_id': etud non inscrit") + else: + assiduite_unique.moduleimpl_id = moduleimpl_id + else: + assiduite_unique.moduleimpl_id = None + + # Cas 3 : desc + desc = data.get("desc", False) + if desc is not False: + assiduite_unique.description = desc + + # Cas 4 : est_just + est_just = data.get("est_just") + if est_just is not None: + if not isinstance(est_just, bool): + errors.append("param 'est_just' : booléen non reconnu") + else: + assiduite_unique.est_just = est_just + + external_data = data.get("external_data") + if external_data is not None: + if not isinstance(external_data, dict): + errors.append("param 'external_data' : n'est pas un objet JSON") + else: + assiduite_unique.external_data = external_data + + if errors: + err: str = ", ".join(errors) + return json_error(404, err) + + log(f"assiduite_edit: {assiduite_unique.etudiant.id} {assiduite_unique}") + Scolog.logdb( + "assiduite_edit", + assiduite_unique.etudiant.id, + msg=f"assiduite: modif {assiduite_unique}", + ) + db.session.add(assiduite_unique) + db.session.commit() + scass.simple_invalidate_cache(assiduite_unique.to_dict()) + + return {"OK": True} + + +@bp.route("/assiduites/edit", methods=["POST"]) +@api_web_bp.route("/assiduites/edit", methods=["POST"]) +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoAbsChange) +def assiduites_edit(): + """ + Edition de plusieurs assiduités + La requête doit avoir un content type "application/json": + [ + { + "assiduite_id" : int, + "etat"?: str, + "moduleimpl_id"?: int + "desc"?: str + "est_just"?: bool + } + ] + """ + edit_list: list[object] = request.get_json(force=True) + + if not isinstance(edit_list, list): + return json_error(404, "Le contenu envoyé n'est pas une liste") + + errors: list[dict] = [] + success: list[dict] = [] + for i, data in enumerate(edit_list): + assi: Identite = Assiduite.query.filter_by(id=data["assiduite_id"]).first() + if assi is None: + errors.append( + { + "indice": i, + "message": f"assiduité {data['assiduite_id']} n'existe pas.", + } + ) + continue + + code, obj = _edit_singular(assi, data) + obj_retour = { + "indice": i, + "message": obj, + } + if code == 404: + errors.append(obj_retour) + else: + success.append(obj_retour) + + db.session.commit() + + return {"errors": errors, "success": success} + + +def _edit_singular(assiduite_unique, data): + errors: list[str] = [] + + # Vérifications de data + + # Cas 1 : Etat + if data.get("etat") is not None: + etat = scu.EtatAssiduite.get(data.get("etat")) + if etat is None: + errors.append("param 'etat': invalide") + else: + assiduite_unique.etat = etat + + # Cas 2 : Moduleimpl_id + moduleimpl_id = data.get("moduleimpl_id", False) + moduleimpl: ModuleImpl = None + + if moduleimpl_id is not False: + if moduleimpl_id is not None: + moduleimpl = ModuleImpl.query.filter_by(id=int(moduleimpl_id)).first() + if moduleimpl is None: + errors.append("param 'moduleimpl_id': invalide") + else: + if not moduleimpl.est_inscrit( + Identite.query.filter_by(id=assiduite_unique.etudid).first() + ): + errors.append("param 'moduleimpl_id': etud non inscrit") + else: + assiduite_unique.moduleimpl_id = moduleimpl_id + else: + assiduite_unique.moduleimpl_id = moduleimpl_id + + # Cas 3 : desc + desc = data.get("desc", False) + if desc is not False: + assiduite_unique.desc = desc + + # Cas 4 : est_just + est_just = data.get("est_just") + if est_just is not None: + if not isinstance(est_just, bool): + errors.append("param 'est_just' : booléen non reconnu") + else: + assiduite_unique.est_just = est_just + + if errors: + err: str = ", ".join(errors) + return (404, err) + + log(f"_edit_singular: {assiduite_unique.etudiant.id} {assiduite_unique}") + Scolog.logdb( + "assiduite_edit", + assiduite_unique.etudiant.id, + msg=f"assiduite: modif {assiduite_unique}", + ) + db.session.add(assiduite_unique) + scass.simple_invalidate_cache(assiduite_unique.to_dict()) + + return (200, "OK") + + +# -- Utils -- + + +def _count_manager(requested) -> tuple[str, dict]: + """ + Retourne la/les métriques à utiliser ainsi que le filtre donnés en query de la requête + """ + filtered: dict = {} + # cas 1 : etat assiduite + etat = requested.args.get("etat") + if etat is not None: + filtered["etat"] = etat + + # cas 2 : date de début + deb = requested.args.get("date_debut", "").replace(" ", "+") + deb: datetime = scu.is_iso_formated(deb, True) + if deb is not None: + filtered["date_debut"] = deb + + # cas 3 : date de fin + fin = requested.args.get("date_fin", "").replace(" ", "+") + fin = scu.is_iso_formated(fin, True) + + if fin is not None: + filtered["date_fin"] = fin + + # cas 4 : moduleimpl_id + module = requested.args.get("moduleimpl_id", False) + try: + if module is False: + raise ValueError + if module != "": + module = int(module) + else: + module = None + except ValueError: + module = False + + if module is not False: + filtered["moduleimpl_id"] = module + + # cas 5 : formsemestre_id + formsemestre_id = requested.args.get("formsemestre_id") + + if formsemestre_id is not None: + formsemestre: FormSemestre = None + formsemestre_id = int(formsemestre_id) + formsemestre = FormSemestre.query.filter_by(id=formsemestre_id).first() + filtered["formsemestre"] = formsemestre + + # cas 6 : type + metric = requested.args.get("metric", "all") + + # cas 7 : est_just + + est_just: str = requested.args.get("est_just") + if est_just is not None: + trues: tuple[str] = ("v", "t", "vrai", "true") + falses: tuple[str] = ("f", "faux", "false") + + if est_just.lower() in trues: + filtered["est_just"] = True + elif est_just.lower() in falses: + filtered["est_just"] = False + + # cas 8 : user_id + + user_id = requested.args.get("user_id", False) + if user_id is not False: + filtered["user_id"] = user_id + + return (metric, filtered) + + +def _filter_manager(requested, assiduites_query: Assiduite): + """ + Retourne les assiduites entrées filtrées en fonction de la request + """ + # cas 1 : etat assiduite + etat = requested.args.get("etat") + if etat is not None: + assiduites_query = scass.filter_assiduites_by_etat(assiduites_query, etat) + + # cas 2 : date de début + deb = requested.args.get("date_debut", "").replace(" ", "+") + deb: datetime = scu.is_iso_formated(deb, True) + + # cas 3 : date de fin + fin = requested.args.get("date_fin", "").replace(" ", "+") + fin = scu.is_iso_formated(fin, True) + + if (deb, fin) != (None, None): + assiduites_query: Assiduite = scass.filter_by_date( + assiduites_query, Assiduite, deb, fin + ) + + # cas 4 : moduleimpl_id + module = requested.args.get("moduleimpl_id", False) + try: + if module is False: + raise ValueError + if module != "": + module = int(module) + else: + module = None + except ValueError: + module = False + + if module is not False: + assiduites_query = scass.filter_by_module_impl(assiduites_query, module) + + # cas 5 : formsemestre_id + formsemestre_id = requested.args.get("formsemestre_id") + + if formsemestre_id is not None: + formsemestre: FormSemestre = None + formsemestre_id = int(formsemestre_id) + formsemestre = FormSemestre.query.filter_by(id=formsemestre_id).first() + assiduites_query = scass.filter_by_formsemestre( + assiduites_query, Assiduite, formsemestre + ) + + # cas 6 : est_just + + est_just: str = requested.args.get("est_just") + if est_just is not None: + trues: tuple[str] = ("v", "t", "vrai", "true") + falses: tuple[str] = ("f", "faux", "false") + + if est_just.lower() in trues: + assiduites_query: Assiduite = scass.filter_assiduites_by_est_just( + assiduites_query, True + ) + elif est_just.lower() in falses: + assiduites_query: Assiduite = scass.filter_assiduites_by_est_just( + assiduites_query, False + ) + + # cas 8 : user_id + + user_id = requested.args.get("user_id", False) + if user_id is not False: + assiduites_query: Assiduite = scass.filter_by_user_id(assiduites_query, user_id) + + return assiduites_query + + +def _with_justifs(assi): + if request.args.get("with_justifs") is None: + return assi + assi["justificatifs"] = get_assiduites_justif(assi["assiduite_id"], True) + return assi diff --git a/app/api/etudiants.py b/app/api/etudiants.py old mode 100644 new mode 100755 index e8030b01..fd1acdf6 --- a/app/api/etudiants.py +++ b/app/api/etudiants.py @@ -34,6 +34,7 @@ from app.scodoc.sco_bulletins import do_formsemestre_bulletinetud from app.scodoc.sco_permissions import Permission from app.scodoc.sco_utils import json_error, suppress_accents +import app.scodoc.sco_photos as sco_photos # Un exemple: # @bp.route("/api_function/") @@ -136,6 +137,45 @@ def etudiant(etudid: int = None, nip: str = None, ine: str = None): return etud.to_dict_api() +@bp.route("/etudiant/etudid//photo") +@bp.route("/etudiant/nip//photo") +@bp.route("/etudiant/ine//photo") +@api_web_bp.route("/etudiant/etudid//photo") +@api_web_bp.route("/etudiant/nip//photo") +@api_web_bp.route("/etudiant/ine//photo") +@login_required +@scodoc +@permission_required(Permission.ScoView) +def get_photo_image(etudid: int = None, nip: str = None, ine: str = None): + """ + Retourne la photo de l'étudiant + correspondant ou un placeholder si non existant. + + etudid : l'etudid de l'étudiant + nip : le code nip de l'étudiant + ine : le code ine de l'étudiant + + Attention : Ne peut être qu'utilisée en tant que route de département + """ + + etud = tools.get_etud(etudid, nip, ine) + + if etud is None: + return json_error( + 404, + message="étudiant inconnu", + ) + if not etudid: + filename = sco_photos.UNKNOWN_IMAGE_PATH + + size = request.args.get("size", "orig") + filename = sco_photos.photo_pathname(etud.photo_filename, size=size) + if not filename: + filename = sco_photos.UNKNOWN_IMAGE_PATH + res = sco_photos.build_image_response(filename) + return res + + @bp.route("/etudiants/etudid/", methods=["GET"]) @bp.route("/etudiants/nip/", methods=["GET"]) @bp.route("/etudiants/ine/", methods=["GET"]) diff --git a/app/api/justificatifs.py b/app/api/justificatifs.py new file mode 100644 index 00000000..30357d81 --- /dev/null +++ b/app/api/justificatifs.py @@ -0,0 +1,700 @@ +############################################################################## +# ScoDoc +# Copyright (c) 1999 - 2022 Emmanuel Viennet. All rights reserved. +# See LICENSE +############################################################################## +"""ScoDoc 9 API : Assiduités +""" +from datetime import datetime + +from flask_json import as_json +from flask import g, jsonify, request +from flask_login import login_required, current_user + +import app.scodoc.sco_assiduites as scass +import app.scodoc.sco_utils as scu +from app import db +from app.api import api_bp as bp +from app.api import api_web_bp +from app.api import get_model_api_object, tools +from app.decorators import permission_required, scodoc +from app.models import Identite, Justificatif, Departement, FormSemestre +from app.models.assiduites import ( + compute_assiduites_justified, +) +from app.scodoc.sco_archives_justificatifs import JustificatifArchiver +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_utils import json_error + + +# Partie Modèle +@bp.route("/justificatif/") +@api_web_bp.route("/justificatif/") +@scodoc +@permission_required(Permission.ScoView) +def justificatif(justif_id: int = None): + """Retourne un objet justificatif à partir de son id + + Exemple de résultat: + { + "justif_id": 1, + "etudid": 2, + "date_debut": "2022-10-31T08:00+01:00", + "date_fin": "2022-10-31T10:00+01:00", + "etat": "valide", + "fichier": "archive_id", + "raison": "une raison", + "entry_date": "2022-10-31T08:00+01:00", + "user_id": 1 or null, + } + + """ + + return get_model_api_object(Justificatif, justif_id, Identite) + + +# etudid +@bp.route("/justificatifs/", defaults={"with_query": False}) +@api_web_bp.route("/justificatifs/", defaults={"with_query": False}) +@bp.route("/justificatifs//query", defaults={"with_query": True}) +@api_web_bp.route("/justificatifs//query", defaults={"with_query": True}) +@bp.route("/justificatifs/etudid/", defaults={"with_query": False}) +@api_web_bp.route("/justificatifs/etudid/", defaults={"with_query": False}) +@bp.route("/justificatifs/etudid//query", defaults={"with_query": True}) +@api_web_bp.route("/justificatifs/etudid//query", defaults={"with_query": True}) +# nip +@bp.route("/justificatifs/nip/", defaults={"with_query": False}) +@api_web_bp.route("/justificatifs/nip/", defaults={"with_query": False}) +@bp.route("/justificatifs/nip//query", defaults={"with_query": True}) +@api_web_bp.route("/justificatifs/nip//query", defaults={"with_query": True}) +# ine +@bp.route("/justificatifs/ine/", defaults={"with_query": False}) +@api_web_bp.route("/justificatifs/ine/", defaults={"with_query": False}) +@bp.route("/justificatifs/ine//query", defaults={"with_query": True}) +@api_web_bp.route("/justificatifs/ine//query", defaults={"with_query": True}) +# +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoView) +def justificatifs(etudid: int = None, nip=None, ine=None, with_query: bool = False): + """ + Retourne toutes les assiduités d'un étudiant + chemin : /justificatifs/ + + Un filtrage peut être donné avec une query + chemin : /justificatifs//query? + + Les différents filtres : + Etat (etat du justificatif -> validé, non validé, modifé, en attente): + query?etat=[- liste des états séparé par une virgule -] + ex: .../query?etat=validé,modifié + Date debut + (date de début du justificatif, sont affichés les justificatifs + dont la date de début est supérieur ou égale à la valeur donnée): + query?date_debut=[- date au format iso -] + ex: query?date_debut=2022-11-03T08:00+01:00 + Date fin + (date de fin du justificatif, sont affichés les justificatifs + dont la date de fin est inférieure ou égale à la valeur donnée): + query?date_fin=[- date au format iso -] + ex: query?date_fin=2022-11-03T10:00+01:00 + user_id (l'id de l'auteur du justificatif) + query?user_id=[int] + ex query?user_id=3 + """ + + etud: Identite = tools.get_etud(etudid, nip, ine) + + if etud is None: + return json_error( + 404, + message="étudiant inconnu", + ) + justificatifs_query = etud.justificatifs + + if with_query: + justificatifs_query = _filter_manager(request, justificatifs_query) + + data_set: list[dict] = [] + for just in justificatifs_query.all(): + data = just.to_dict(format_api=True) + data_set.append(data) + + return data_set + + +@api_web_bp.route("/justificatifs/dept/", defaults={"with_query": False}) +@api_web_bp.route( + "/justificatifs/dept//query", defaults={"with_query": True} +) +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoView) +def justificatifs_dept(dept_id: int = None, with_query: bool = False): + """ """ + dept = Departement.query.get_or_404(dept_id) + etuds = [etud.id for etud in dept.etudiants] + + justificatifs_query = Justificatif.query.filter(Justificatif.etudid.in_(etuds)) + + if with_query: + justificatifs_query = _filter_manager(request, justificatifs_query) + data_set: list[dict] = [] + for just in justificatifs_query.all(): + data = just.to_dict(format_api=True) + data_set.append(data) + + return data_set + + +@bp.route("/justificatif//create", methods=["POST"]) +@api_web_bp.route("/justificatif//create", methods=["POST"]) +@bp.route("/justificatif/etudid//create", methods=["POST"]) +@api_web_bp.route("/justificatif/etudid//create", methods=["POST"]) +# nip +@bp.route("/justificatif/nip//create", methods=["POST"]) +@api_web_bp.route("/justificatif/nip//create", methods=["POST"]) +# ine +@bp.route("/justificatif/ine//create", methods=["POST"]) +@api_web_bp.route("/justificatif/ine//create", methods=["POST"]) +@scodoc +@login_required +@as_json +@permission_required(Permission.ScoAbsChange) +def justif_create(etudid: int = None, nip=None, ine=None): + """ + Création d'un justificatif pour l'étudiant (etudid) + La requête doit avoir un content type "application/json": + [ + { + "date_debut": str, + "date_fin": str, + "etat": str, + }, + { + "date_debut": str, + "date_fin": str, + "etat": str, + "raison":str, + } + ... + ] + + """ + etud: Identite = tools.get_etud(etudid, nip, ine) + + if etud is None: + return json_error( + 404, + message="étudiant inconnu", + ) + + create_list: list[object] = request.get_json(force=True) + + if not isinstance(create_list, list): + return json_error(404, "Le contenu envoyé n'est pas une liste") + + errors: list = [] + success: list = [] + justifs: list = [] + for i, data in enumerate(create_list): + code, obj, justi = _create_singular(data, etud) + if code == 404: + errors.append({"indice": i, "message": obj}) + else: + success.append({"indice": i, "message": obj}) + justifs.append(justi) + scass.simple_invalidate_cache(data, etud.id) + + compute_assiduites_justified(etud.etudid, justifs) + return {"errors": errors, "success": success} + + +def _create_singular( + data: dict, + etud: Identite, +) -> tuple[int, object]: + errors: list[str] = [] + + # -- vérifications de l'objet json -- + # cas 1 : ETAT + etat = data.get("etat", None) + if etat is None: + errors.append("param 'etat': manquant") + elif not scu.EtatJustificatif.contains(etat): + errors.append("param 'etat': invalide") + + etat = scu.EtatJustificatif.get(etat) + + # cas 2 : date_debut + date_debut = data.get("date_debut", None) + if date_debut is None: + errors.append("param 'date_debut': manquant") + deb = scu.is_iso_formated(date_debut, convert=True) + if deb is None: + errors.append("param 'date_debut': format invalide") + + # cas 3 : date_fin + date_fin = data.get("date_fin", None) + if date_fin is None: + errors.append("param 'date_fin': manquant") + fin = scu.is_iso_formated(date_fin, convert=True) + if fin is None: + errors.append("param 'date_fin': format invalide") + + # cas 4 : raison + + raison: str = data.get("raison", None) + + external_data = data.get("external_data") + if external_data is not None: + if not isinstance(external_data, dict): + errors.append("param 'external_data' : n'est pas un objet JSON") + + if errors: + err: str = ", ".join(errors) + return (404, err, None) + + # TOUT EST OK + + try: + nouv_justificatif: Justificatif = Justificatif.create_justificatif( + date_debut=deb, + date_fin=fin, + etat=etat, + etud=etud, + raison=raison, + user_id=current_user.id, + external_data=external_data, + ) + + db.session.add(nouv_justificatif) + db.session.commit() + + return ( + 200, + { + "justif_id": nouv_justificatif.id, + "couverture": scass.justifies(nouv_justificatif), + }, + nouv_justificatif, + ) + except ScoValueError as excp: + return ( + 404, + excp.args[0], + ) + + +@bp.route("/justificatif//edit", methods=["POST"]) +@api_web_bp.route("/justificatif//edit", methods=["POST"]) +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoAbsChange) +def justif_edit(justif_id: int): + """ + Edition d'un justificatif à partir de son id + La requête doit avoir un content type "application/json": + + { + "etat"?: str, + "raison"?: str + "date_debut"?: str + "date_fin"?: str + } + """ + justificatif_unique: Justificatif = Justificatif.query.filter_by( + id=justif_id + ).first_or_404() + + errors: list[str] = [] + data = request.get_json(force=True) + avant_ids: list[int] = scass.justifies(justificatif_unique) + # Vérifications de data + + # Cas 1 : Etat + if data.get("etat") is not None: + etat = scu.EtatJustificatif.get(data.get("etat")) + if etat is None: + errors.append("param 'etat': invalide") + else: + justificatif_unique.etat = etat + + # Cas 2 : raison + raison = data.get("raison", False) + if raison is not False: + justificatif_unique.raison = raison + + deb, fin = None, None + + # cas 3 : date_debut + date_debut = data.get("date_debut", False) + if date_debut is not False: + if date_debut is None: + errors.append("param 'date_debut': manquant") + deb = scu.is_iso_formated(date_debut.replace(" ", "+"), convert=True) + if deb is None: + errors.append("param 'date_debut': format invalide") + + # cas 4 : date_fin + date_fin = data.get("date_fin", False) + if date_fin is not False: + if date_fin is None: + errors.append("param 'date_fin': manquant") + fin = scu.is_iso_formated(date_fin.replace(" ", "+"), convert=True) + if fin is None: + errors.append("param 'date_fin': format invalide") + + # Mise à jour des dates + deb = deb if deb is not None else justificatif_unique.date_debut + fin = fin if fin is not None else justificatif_unique.date_fin + + external_data = data.get("external_data") + if external_data is not None: + if not isinstance(external_data, dict): + errors.append("param 'external_data' : n'est pas un objet JSON") + else: + justificatif_unique.external_data = external_data + + if fin <= deb: + errors.append("param 'dates' : Date de début après date de fin") + + justificatif_unique.date_debut = deb + justificatif_unique.date_fin = fin + + if errors: + err: str = ", ".join(errors) + return json_error(404, err) + + db.session.add(justificatif_unique) + db.session.commit() + + retour = { + "couverture": { + "avant": avant_ids, + "après": compute_assiduites_justified( + justificatif_unique.etudid, + [justificatif_unique], + False, + ), + } + } + + scass.simple_invalidate_cache(justificatif_unique.to_dict()) + return retour + + +@bp.route("/justificatif/delete", methods=["POST"]) +@api_web_bp.route("/justificatif/delete", methods=["POST"]) +@login_required +@scodoc +@as_json +@permission_required(Permission.ScoAbsChange) +def justif_delete(): + """ + Suppression d'un justificatif à partir de son id + + Forme des données envoyées : + + [ + , + ... + ] + + + """ + justificatifs_list: list[int] = request.get_json(force=True) + if not isinstance(justificatifs_list, list): + return json_error(404, "Le contenu envoyé n'est pas une liste") + + output = {"errors": [], "success": []} + + for i, ass in enumerate(justificatifs_list): + code, msg = _delete_singular(ass, db) + if code == 404: + output["errors"].append({"indice": i, "message": msg}) + else: + output["success"].append({"indice": i, "message": "OK"}) + + db.session.commit() + + return output + + +def _delete_singular(justif_id: int, database): + justificatif_unique: Justificatif = Justificatif.query.filter_by( + id=justif_id + ).first() + if justificatif_unique is None: + return (404, "Justificatif non existant") + + archive_name: str = justificatif_unique.fichier + + if archive_name is not None: + archiver: JustificatifArchiver = JustificatifArchiver() + try: + archiver.delete_justificatif(justificatif_unique.etudid, archive_name) + except ValueError: + pass + + scass.simple_invalidate_cache(justificatif_unique.to_dict()) + database.session.delete(justificatif_unique) + compute_assiduites_justified( + justificatif_unique.etudid, + Justificatif.query.filter_by(etudid=justificatif_unique.etudid).all(), + True, + ) + + return (200, "OK") + + +# Partie archivage +@bp.route("/justificatif//import", methods=["POST"]) +@api_web_bp.route("/justificatif//import", methods=["POST"]) +@scodoc +@login_required +@as_json +@permission_required(Permission.ScoAbsChange) +def justif_import(justif_id: int = None): + """ + Importation d'un fichier (création d'archive) + """ + if len(request.files) == 0: + return json_error(404, "Il n'y a pas de fichier joint") + + file = list(request.files.values())[0] + if file.filename == "": + return json_error(404, "Il n'y a pas de fichier joint") + + query = Justificatif.query.filter_by(id=justif_id) + if g.scodoc_dept: + query = query.join(Identite).filter_by(dept_id=g.scodoc_dept_id) + + justificatif_unique: Justificatif = query.first_or_404() + + archive_name: str = justificatif_unique.fichier + + archiver: JustificatifArchiver = JustificatifArchiver() + try: + fname: str + archive_name, fname = archiver.save_justificatif( + etudid=justificatif_unique.etudid, + filename=file.filename, + data=file.stream.read(), + archive_name=archive_name, + user_id=current_user.id, + ) + + justificatif_unique.fichier = archive_name + + db.session.add(justificatif_unique) + db.session.commit() + + return {"filename": fname} + except ScoValueError as err: + return json_error(404, err.args[0]) + + +@bp.route("/justificatif//export/", methods=["POST"]) +@api_web_bp.route("/justificatif//export/", methods=["POST"]) +@scodoc +@login_required +@permission_required(Permission.ScoAbsChange) +def justif_export(justif_id: int = None, filename: str = None): + """ + Retourne un fichier d'une archive d'un justificatif + """ + + query = Justificatif.query.filter_by(id=justif_id) + if g.scodoc_dept: + query = query.join(Identite).filter_by(dept_id=g.scodoc_dept_id) + + justificatif_unique: Justificatif = query.first_or_404() + + archive_name: str = justificatif_unique.fichier + if archive_name is None: + return json_error(404, "le justificatif ne possède pas de fichier") + + archiver: JustificatifArchiver = JustificatifArchiver() + + try: + return archiver.get_justificatif_file( + archive_name, justificatif_unique.etudid, filename + ) + except ScoValueError as err: + return json_error(404, err.args[0]) + + +@bp.route("/justificatif//remove", methods=["POST"]) +@api_web_bp.route("/justificatif//remove", methods=["POST"]) +@scodoc +@login_required +@as_json +@permission_required(Permission.ScoAbsChange) +def justif_remove(justif_id: int = None): + """ + Supression d'un fichier ou d'une archive + # TOTALK: Doc, expliquer les noms coté server + { + "remove": <"all"/"list"> + + "filenames"?: [ + , + ... + ] + } + """ + + data: dict = request.get_json(force=True) + + query = Justificatif.query.filter_by(id=justif_id) + if g.scodoc_dept: + query = query.join(Identite).filter_by(dept_id=g.scodoc_dept_id) + + justificatif_unique: Justificatif = query.first_or_404() + + archive_name: str = justificatif_unique.fichier + if archive_name is None: + return json_error(404, "le justificatif ne possède pas de fichier") + + remove: str = data.get("remove") + if remove is None or remove not in ("all", "list"): + return json_error(404, "param 'remove': Valeur invalide") + archiver: JustificatifArchiver = JustificatifArchiver() + etudid: int = justificatif_unique.etudid + try: + if remove == "all": + archiver.delete_justificatif(etudid=etudid, archive_name=archive_name) + justificatif_unique.fichier = None + db.session.add(justificatif_unique) + db.session.commit() + + else: + for fname in data.get("filenames", []): + archiver.delete_justificatif( + etudid=etudid, + archive_name=archive_name, + filename=fname, + ) + + if len(archiver.list_justificatifs(archive_name, etudid)) == 0: + archiver.delete_justificatif(etudid, archive_name) + justificatif_unique.fichier = None + db.session.add(justificatif_unique) + db.session.commit() + + except ScoValueError as err: + return json_error(404, err.args[0]) + + return {"response": "removed"} + + +@bp.route("/justificatif//list", methods=["GET"]) +@api_web_bp.route("/justificatif//list", methods=["GET"]) +@scodoc +@login_required +@as_json +@permission_required(Permission.ScoView) +def justif_list(justif_id: int = None): + """ + Liste les fichiers du justificatif + """ + + query = Justificatif.query.filter_by(id=justif_id) + if g.scodoc_dept: + query = query.join(Identite).filter_by(dept_id=g.scodoc_dept_id) + + justificatif_unique: Justificatif = query.first_or_404() + + archive_name: str = justificatif_unique.fichier + + filenames: list[str] = [] + + archiver: JustificatifArchiver = JustificatifArchiver() + if archive_name is not None: + filenames = archiver.list_justificatifs( + archive_name, justificatif_unique.etudid + ) + + retour = {"total": len(filenames), "filenames": []} + + for fi in filenames: + if int(fi[1]) == current_user.id or current_user.has_permission( + Permission.ScoJustifView + ): + retour["filenames"].append(fi[0]) + return retour + + +# Partie justification +@bp.route("/justificatif//justifies", methods=["GET"]) +@api_web_bp.route("/justificatif//justifies", methods=["GET"]) +@scodoc +@login_required +@as_json +@permission_required(Permission.ScoAbsChange) +def justif_justifies(justif_id: int = None): + """ + Liste assiduite_id justifiées par le justificatif + """ + + query = Justificatif.query.filter_by(id=justif_id) + if g.scodoc_dept: + query = query.join(Identite).filter_by(dept_id=g.scodoc_dept_id) + + justificatif_unique: Justificatif = query.first_or_404() + + assiduites_list: list[int] = scass.justifies(justificatif_unique) + + return assiduites_list + + +# -- Utils -- + + +def _filter_manager(requested, justificatifs_query): + """ + Retourne les justificatifs entrés filtrés en fonction de la request + """ + # cas 1 : etat justificatif + etat = requested.args.get("etat") + if etat is not None: + justificatifs_query = scass.filter_justificatifs_by_etat( + justificatifs_query, etat + ) + + # cas 2 : date de début + deb = requested.args.get("date_debut", "").replace(" ", "+") + deb: datetime = scu.is_iso_formated(deb, True) + + # cas 3 : date de fin + fin = requested.args.get("date_fin", "").replace(" ", "+") + fin = scu.is_iso_formated(fin, True) + + if (deb, fin) != (None, None): + justificatifs_query: Justificatif = scass.filter_by_date( + justificatifs_query, Justificatif, deb, fin + ) + + user_id = requested.args.get("user_id", False) + if user_id is not False: + justificatifs_query: Justificatif = scass.filter_by_user_id( + justificatifs_query, user_id + ) + + # cas 5 : formsemestre_id + formsemestre_id = requested.args.get("formsemestre_id") + + if formsemestre_id is not None: + formsemestre: FormSemestre = None + formsemestre_id = int(formsemestre_id) + formsemestre = FormSemestre.query.filter_by(id=formsemestre_id).first() + justificatifs_query = scass.filter_by_formsemestre( + justificatifs_query, Justificatif, formsemestre + ) + + return justificatifs_query diff --git a/app/api/partitions.py b/app/api/partitions.py index 2be45abc..5d7f5642 100644 --- a/app/api/partitions.py +++ b/app/api/partitions.py @@ -110,7 +110,7 @@ def formsemestre_partitions(formsemestre_id: int): def etud_in_group(group_id: int): """ Retourne la liste des étudiants dans un groupe - + (inscrits au groupe et inscrits au semestre). group_id : l'id d'un groupe Exemple de résultat : @@ -133,7 +133,15 @@ def etud_in_group(group_id: int): query.join(Partition).join(FormSemestre).filter_by(dept_id=g.scodoc_dept_id) ) group = query.first_or_404() - return [etud.to_dict_short() for etud in group.etuds] + + query = ( + Identite.query.join(group_membership) + .filter_by(group_id=group_id) + .join(FormSemestreInscription) + .filter_by(formsemestre_id=group.partition.formsemestre_id) + ) + + return [etud.to_dict_short() for etud in query] @bp.route("/group//etudiants/query") @@ -161,7 +169,6 @@ def etud_in_group_query(group_id: int): query = query.filter_by(etat=etat) query = query.join(group_membership).filter_by(group_id=group_id) - return [etud.to_dict_short() for etud in query] @@ -223,7 +230,9 @@ def group_remove_etud(group_id: int, etudid: int): commit=True, ) # Update parcours - group.partition.formsemestre.update_inscriptions_parcours_from_groups() + group.partition.formsemestre.update_inscriptions_parcours_from_groups( + etudid=etudid + ) sco_cache.invalidate_formsemestre(group.partition.formsemestre_id) return {"group_id": group_id, "etudid": etudid} @@ -270,7 +279,7 @@ def partition_remove_etud(partition_id: int, etudid: int): ) db.session.commit() # Update parcours - partition.formsemestre.update_inscriptions_parcours_from_groups() + partition.formsemestre.update_inscriptions_parcours_from_groups(etudid=etudid) app.set_sco_dept(partition.formsemestre.departement.acronym) sco_cache.invalidate_formsemestre(partition.formsemestre_id) return {"partition_id": partition_id, "etudid": etudid} diff --git a/app/but/bulletin_but.py b/app/but/bulletin_but.py index 9bac0703..3231cc88 100644 --- a/app/but/bulletin_but.py +++ b/app/but/bulletin_but.py @@ -387,6 +387,11 @@ class BulletinBUT: semestre_infos["absences"] = { "injustifie": nbabs - nbabsjust, "total": nbabs, + "metrique": { + "H.": "Heure(s)", + "J.": "Journée(s)", + "1/2 J.": "1/2 Jour.", + }.get(sco_preferences.get_preference("assi_metrique")), } decisions_ues = self.res.get_etud_decisions_ue(etud.id) or {} if self.prefs["bul_show_ects"]: diff --git a/app/but/bulletin_but_court.py b/app/but/bulletin_but_court.py new file mode 100644 index 00000000..1831cf6f --- /dev/null +++ b/app/but/bulletin_but_court.py @@ -0,0 +1,87 @@ +############################################################################## +# ScoDoc +# Copyright (c) 1999 - 2023 Emmanuel Viennet. All rights reserved. +# See LICENSE +############################################################################## + +"""Génération bulletin BUT synthétique en une page + +On génère du HTML. Il sera si possible traduit en PDF par weasyprint. + +Le HTML est lui même généré à partir d'un template Jinja. + +## Données + +Ces données sont des objets passés au template. + +- `etud: Identite` : l'étudiant +- `formsemestre: FormSemestre` : le formsemestre d'où est émis ce bulletin +- `bulletins_sem: BulletinBUT` les données bulletins pour tous les étudiants +- `bul: dict` : le bulletin (dict, même structure que le json publié) +- `cursus: EtudCursusBUT`: infos sur le cursus BUT (niveaux validés etc) +- `decision_ues: dict`: `{ acronyme_ue : { 'code' : 'ADM' }}` accès aux décisions + de jury d'UE +- `ects_total` : nombre d'ECTS validées dans ce cursus +- `ue_validation_by_niveau : dict` : les validations d'UE de chaque niveau du cursus +""" +import datetime +import time + +from flask import render_template, url_for +from flask import g, request + +from app.but.bulletin_but import BulletinBUT +from app.but import cursus_but, validations_view +from app.decorators import ( + scodoc, + permission_required, +) +from app.models import FormSemestre, FormSemestreInscription, Identite +from app.scodoc.sco_exceptions import ScoNoReferentielCompetences +from app.scodoc.sco_logos import find_logo +from app.scodoc.sco_permissions import Permission +from app.views import notes_bp as bp +from app.views import ScoData + + +@bp.route("/bulletin_but//") +@scodoc +@permission_required(Permission.ScoView) +def bulletin_but(formsemestre_id: int, etudid: int = None): + """Page HTML affichant le bulletin BUT simplifié""" + etud: Identite = Identite.query.get_or_404(etudid) + formsemestre: FormSemestre = ( + FormSemestre.query.filter_by(id=formsemestre_id) + .join(FormSemestreInscription) + .filter_by(etudid=etudid) + .first_or_404() + ) + bulletins_sem = BulletinBUT(formsemestre) + bul = bulletins_sem.bulletin_etud(etud, formsemestre) # dict + decision_ues = {x["acronyme"]: x for x in bul["semestre"]["decision_ue"]} + cursus = cursus_but.EtudCursusBUT(etud, formsemestre.formation) + refcomp = formsemestre.formation.referentiel_competence + if refcomp is None: + raise ScoNoReferentielCompetences(formation=formsemestre.formation) + ue_validation_by_niveau = validations_view.get_ue_validation_by_niveau( + refcomp, etud + ) + ects_total = sum((v.ects() for v in ue_validation_by_niveau.values())) + + logo = find_logo(logoname="header", dept_id=g.scodoc_dept_id) + + return render_template( + "but/bulletin_court_page.j2", + bul=bul, + bulletins_sem=bulletins_sem, + cursus=cursus, + datetime=datetime, + decision_ues=decision_ues, + ects_total=ects_total, + etud=etud, + formsemestre=formsemestre, + logo=logo, + sco=ScoData(formsemestre=formsemestre, etud=etud), + time=time, + ue_validation_by_niveau=ue_validation_by_niveau, + ) diff --git a/app/but/bulletin_but_pdf.py b/app/but/bulletin_but_pdf.py index 0d5b6b2d..ce215c14 100644 --- a/app/but/bulletin_but_pdf.py +++ b/app/but/bulletin_but_pdf.py @@ -212,6 +212,34 @@ class BulletinGeneratorStandardBUT(BulletinGeneratorStandard): else: self.ue_std_rows(rows, ue, title_bg) + @staticmethod + def affichage_bonus_malus(ue: dict) -> list: + fields_bmr = [] + # lecture des bonus sport culture et malus (ou bonus autre) (0 si valeur non numérique) + try: + bonus_sc = float(ue.get("bonus", 0.0)) or 0 + except ValueError: + bonus_sc = 0 + try: + malus = float(ue.get("malus", 0.0)) or 0 + except ValueError: + malus = 0 + # Calcul de l affichage + if malus < 0: + if bonus_sc > 0: + fields_bmr.append(f"Bonus sport/culture: {bonus_sc}") + fields_bmr.append(f"Bonus autres: {-malus}") + else: + fields_bmr.append(f"Bonus: {-malus}") + elif malus > 0: + if bonus_sc > 0: + fields_bmr.append(f"Bonus: {bonus_sc}") + fields_bmr.append(f"Malus: {malus}") + else: + if bonus_sc > 0: + fields_bmr.append(f"Bonus: {bonus_sc}") + return fields_bmr + def ue_std_rows(self, rows: list, ue: dict, title_bg: tuple): "Lignes décrivant une UE standard dans la table de synthèse" # 2eme ligne titre UE (bonus/malus/ects) @@ -220,20 +248,7 @@ class BulletinGeneratorStandardBUT(BulletinGeneratorStandard): else: ects_txt = "" # case Bonus/Malus/Rang "bmr" - fields_bmr = [] - try: - value = float(ue.get("bonus", 0.0)) - if value != 0: - fields_bmr.append(f"Bonus: {ue['bonus']}") - except ValueError: - pass - try: - value = float(ue.get("malus", 0.0)) - if value != 0: - fields_bmr.append(f"Malus: {ue['malus']}") - except ValueError: - pass - + fields_bmr = BulletinGeneratorStandardBUT.affichage_bonus_malus(ue) moy_ue = ue.get("moyenne", "-") if isinstance(moy_ue, dict): # UE non capitalisées if self.preferences["bul_show_ue_rangs"]: diff --git a/app/forms/main/config_assiduites.py b/app/forms/main/config_assiduites.py new file mode 100644 index 00000000..1c18135d --- /dev/null +++ b/app/forms/main/config_assiduites.py @@ -0,0 +1,88 @@ +# -*- mode: python -*- +# -*- coding: utf-8 -*- + +############################################################################## +# +# ScoDoc +# +# Copyright (c) 1999 - 2023 Emmanuel Viennet. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Emmanuel Viennet emmanuel.viennet@viennet.net +# +############################################################################## + +""" +Formulaire configuration Module Assiduités +""" + +from flask_wtf import FlaskForm +from wtforms import SubmitField, DecimalField +from wtforms.fields.simple import StringField +from wtforms.widgets import TimeInput +import datetime + + +class TimeField(StringField): + """HTML5 time input.""" + + widget = TimeInput() + + def __init__(self, label=None, validators=None, fmt="%H:%M:%S", **kwargs): + super(TimeField, self).__init__(label, validators, **kwargs) + self.fmt = fmt + self.data = None + + def _value(self): + if self.raw_data: + return " ".join(self.raw_data) + if self.data and isinstance(self.data, str): + self.data = datetime.time(*map(int, self.data.split(":"))) + return self.data and self.data.strftime(self.fmt) or "" + + def process_formdata(self, valuelist): + if valuelist: + time_str = " ".join(valuelist) + try: + components = time_str.split(":") + hour = 0 + minutes = 0 + seconds = 0 + if len(components) in range(2, 4): + hour = int(components[0]) + minutes = int(components[1]) + + if len(components) == 3: + seconds = int(components[2]) + else: + raise ValueError + self.data = datetime.time(hour, minutes, seconds) + except ValueError: + self.data = None + raise ValueError(self.gettext("Not a valid time string")) + + +class ConfigAssiduitesForm(FlaskForm): + "Formulaire paramétrage Module Assiduités" + + morning_time = TimeField("Début de la journée") + lunch_time = TimeField("Heure de midi (date pivot entre Matin et Après Midi)") + afternoon_time = TimeField("Fin de la journée") + + tick_time = DecimalField("Granularité de la Time Line (temps en minutes)", places=0) + + submit = SubmitField("Valider") + cancel = SubmitField("Annuler", render_kw={"formnovalidate": True}) diff --git a/app/forms/main/config_personalized_links.py b/app/forms/main/config_personalized_links.py new file mode 100644 index 00000000..1aed3130 --- /dev/null +++ b/app/forms/main/config_personalized_links.py @@ -0,0 +1,72 @@ +""" +Formulaire configuration liens personalisés (menu "Liens") +""" + +from flask import g, url_for +from flask_wtf import FlaskForm +from wtforms import FieldList, Form, validators +from wtforms.fields.simple import BooleanField, StringField, SubmitField + +from app.models import ScoDocSiteConfig + + +class _PersonalizedLinksForm(FlaskForm): + "form. définition des liens personnalisés" + # construit dynamiquement ci-dessous + + +def PersonalizedLinksForm() -> _PersonalizedLinksForm: + "Création d'un formulaire pour éditer les liens" + + # Formulaire dynamique, on créé une classe ad-hoc + class F(_PersonalizedLinksForm): + pass + + F.links_by_id = dict(enumerate(ScoDocSiteConfig.get_perso_links())) + + def _gen_link_form(idx): + setattr( + F, + f"link_{idx}", + StringField( + f"Titre", + validators=[ + validators.Optional(), + validators.Length(min=1, max=80), + ], + default="", + render_kw={"size": 6}, + ), + ) + setattr( + F, + f"link_url_{idx}", + StringField( + f"URL", + description="adresse, incluant le http.", + validators=[ + validators.Optional(), + validators.URL(), + validators.Length(min=1, max=256), + ], + default="", + ), + ) + setattr( + F, + f"link_with_args_{idx}", + BooleanField( + f"ajouter arguments", + description="query string avec ids", + ), + ) + + # Initialise un champ de saisie par lien + for idx in F.links_by_id: + _gen_link_form(idx) + _gen_link_form("new") + + F.submit = SubmitField("Valider") + F.cancel = SubmitField("Annuler", render_kw={"formnovalidate": True}) + + return F() diff --git a/app/models/__init__.py b/app/models/__init__.py index 39a8d3e2..032ddc86 100644 --- a/app/models/__init__.py +++ b/app/models/__init__.py @@ -81,3 +81,5 @@ from app.models.but_refcomp import ( from app.models.but_validations import ApcValidationAnnee, ApcValidationRCUE from app.models.config import ScoDocSiteConfig + +from app.models.assiduites import Assiduite, Justificatif diff --git a/app/models/assiduites.py b/app/models/assiduites.py new file mode 100644 index 00000000..0cea4781 --- /dev/null +++ b/app/models/assiduites.py @@ -0,0 +1,384 @@ +# -*- coding: UTF-8 -* +"""Gestion de l'assiduité (assiduités + justificatifs) +""" +from datetime import datetime + +from app import db, log +from app.models import ModuleImpl, Scolog +from app.models.etudiants import Identite +from app.auth.models import User +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_utils import ( + EtatAssiduite, + EtatJustificatif, + localize_datetime, +) + + +class Assiduite(db.Model): + """ + Représente une assiduité: + - une plage horaire lié à un état et un étudiant + - un module si spécifiée + - une description si spécifiée + """ + + __tablename__ = "assiduites" + + id = db.Column(db.Integer, primary_key=True, nullable=False) + assiduite_id = db.synonym("id") + + date_debut = db.Column( + db.DateTime(timezone=True), server_default=db.func.now(), nullable=False + ) + date_fin = db.Column( + db.DateTime(timezone=True), server_default=db.func.now(), nullable=False + ) + + moduleimpl_id = db.Column( + db.Integer, + db.ForeignKey("notes_moduleimpl.id", ondelete="SET NULL"), + ) + etudid = db.Column( + db.Integer, + db.ForeignKey("identite.id", ondelete="CASCADE"), + index=True, + nullable=False, + ) + etat = db.Column(db.Integer, nullable=False) + + description = db.Column(db.Text) + + entry_date = db.Column(db.DateTime(timezone=True), server_default=db.func.now()) + + user_id = db.Column( + db.Integer, + db.ForeignKey("user.id", ondelete="SET NULL"), + nullable=True, + ) + + est_just = db.Column(db.Boolean, server_default="false", nullable=False) + + external_data = db.Column(db.JSON, nullable=True) + + # Déclare la relation "joined" car on va très souvent vouloir récupérer + # l'étudiant en même tant que l'assiduité (perf.: évite nouvelle requete SQL) + etudiant = db.relationship("Identite", back_populates="assiduites", lazy="joined") + + def to_dict(self, format_api=True) -> dict: + """Retourne la représentation json de l'assiduité""" + etat = self.etat + username = self.user_id + if format_api: + etat = EtatAssiduite.inverse().get(self.etat).name + if self.user_id is not None: + user: User = db.session.get(User, self.user_id) + + if user is None: + username = "Non renseigné" + else: + username = user.get_prenomnom() + data = { + "assiduite_id": self.id, + "etudid": self.etudid, + "code_nip": self.etudiant.code_nip, + "moduleimpl_id": self.moduleimpl_id, + "date_debut": self.date_debut, + "date_fin": self.date_fin, + "etat": etat, + "desc": self.description, + "entry_date": self.entry_date, + "user_id": username, + "est_just": self.est_just, + "external_data": self.external_data, + } + return data + + def __str__(self) -> str: + "chaine pour journaux et debug (lisible par humain français)" + try: + etat_str = EtatAssiduite(self.etat).name.lower().capitalize() + except ValueError: + etat_str = "Invalide" + return f"""{etat_str} { + "just." if self.est_just else "non just." + } de { + self.date_debut.strftime("%d/%m/%Y %Hh%M") + } à { + self.date_fin.strftime("%d/%m/%Y %Hh%M") + }""" + + @classmethod + def create_assiduite( + cls, + etud: Identite, + date_debut: datetime, + date_fin: datetime, + etat: EtatAssiduite, + moduleimpl: ModuleImpl = None, + description: str = None, + entry_date: datetime = None, + user_id: int = None, + est_just: bool = False, + external_data: dict = None, + ) -> object or int: + """Créer une nouvelle assiduité pour l'étudiant""" + # Vérification de non duplication des périodes + assiduites: list[Assiduite] = etud.assiduites + if is_period_conflicting(date_debut, date_fin, assiduites, Assiduite): + raise ScoValueError( + "Duplication des assiduités (la période rentrée rentre en conflit avec une assiduité enregistrée)" + ) + + if not est_just: + est_just = ( + len(_get_assiduites_justif(etud.etudid, date_debut, date_fin)) > 0 + ) + + if moduleimpl is not None: + # Vérification de l'existence du module pour l'étudiant + if moduleimpl.est_inscrit(etud): + nouv_assiduite = Assiduite( + date_debut=date_debut, + date_fin=date_fin, + etat=etat, + etudiant=etud, + moduleimpl_id=moduleimpl.id, + description=description, + entry_date=entry_date, + user_id=user_id, + est_just=est_just, + external_data=external_data, + ) + else: + raise ScoValueError("L'étudiant n'est pas inscrit au moduleimpl") + else: + nouv_assiduite = Assiduite( + date_debut=date_debut, + date_fin=date_fin, + etat=etat, + etudiant=etud, + description=description, + entry_date=entry_date, + user_id=user_id, + est_just=est_just, + external_data=external_data, + ) + db.session.add(nouv_assiduite) + log(f"create_assiduite: {etud.id} {nouv_assiduite}") + Scolog.logdb( + method="create_assiduite", + etudid=etud.id, + msg=f"assiduité: {nouv_assiduite}", + ) + return nouv_assiduite + + +class Justificatif(db.Model): + """ + Représente un justificatif: + - une plage horaire lié à un état et un étudiant + - une raison si spécifiée + - un fichier si spécifié + """ + + __tablename__ = "justificatifs" + + id = db.Column(db.Integer, primary_key=True) + justif_id = db.synonym("id") + + date_debut = db.Column( + db.DateTime(timezone=True), server_default=db.func.now(), nullable=False + ) + date_fin = db.Column( + db.DateTime(timezone=True), server_default=db.func.now(), nullable=False + ) + + etudid = db.Column( + db.Integer, + db.ForeignKey("identite.id", ondelete="CASCADE"), + index=True, + nullable=False, + ) + etat = db.Column( + db.Integer, + nullable=False, + ) + + entry_date = db.Column(db.DateTime(timezone=True), server_default=db.func.now()) + + user_id = db.Column( + db.Integer, + db.ForeignKey("user.id", ondelete="SET NULL"), + nullable=True, + index=True, + ) + + raison = db.Column(db.Text()) + + # Archive_id -> sco_archives_justificatifs.py + fichier = db.Column(db.Text()) + + # Déclare la relation "joined" car on va très souvent vouloir récupérer + # l'étudiant en même tant que le justificatif (perf.: évite nouvelle requete SQL) + etudiant = db.relationship( + "Identite", back_populates="justificatifs", lazy="joined" + ) + + external_data = db.Column(db.JSON, nullable=True) + + def to_dict(self, format_api: bool = False) -> dict: + """transformation de l'objet en dictionnaire sérialisable""" + + etat = self.etat + username = self.user_id + + if format_api: + etat = EtatJustificatif.inverse().get(self.etat).name + if self.user_id is not None: + user: User = db.session.get(User, self.user_id) + if user is None: + username = "Non renseigné" + else: + username = user.get_prenomnom() + + data = { + "justif_id": self.justif_id, + "etudid": self.etudid, + "code_nip": self.etudiant.code_nip, + "date_debut": self.date_debut, + "date_fin": self.date_fin, + "etat": etat, + "raison": self.raison, + "fichier": self.fichier, + "entry_date": self.entry_date, + "user_id": username, + "external_data": self.external_data, + } + return data + + def __str__(self) -> str: + "chaine pour journaux et debug (lisible par humain français)" + try: + etat_str = EtatJustificatif(self.etat).name + except ValueError: + etat_str = "Invalide" + return f"""Justificatif {etat_str} de { + self.date_debut.strftime("%d/%m/%Y %Hh%M") + } à { + self.date_fin.strftime("%d/%m/%Y %Hh%M") + }""" + + @classmethod + def create_justificatif( + cls, + etud: Identite, + date_debut: datetime, + date_fin: datetime, + etat: EtatJustificatif, + raison: str = None, + entry_date: datetime = None, + user_id: int = None, + external_data: dict = None, + ) -> object or int: + """Créer un nouveau justificatif pour l'étudiant""" + nouv_justificatif = Justificatif( + date_debut=date_debut, + date_fin=date_fin, + etat=etat, + etudiant=etud, + raison=raison, + entry_date=entry_date, + user_id=user_id, + external_data=external_data, + ) + + db.session.add(nouv_justificatif) + + log(f"create_justificatif: {etud.id} {nouv_justificatif}") + Scolog.logdb( + method="create_justificatif", + etudid=etud.id, + msg=f"justificatif: {nouv_justificatif}", + ) + return nouv_justificatif + + +def is_period_conflicting( + date_debut: datetime, + date_fin: datetime, + collection: list[Assiduite or Justificatif], + collection_cls: Assiduite or Justificatif, +) -> bool: + """ + Vérifie si une date n'entre pas en collision + avec les justificatifs ou assiduites déjà présentes + """ + + date_debut = localize_datetime(date_debut) + date_fin = localize_datetime(date_fin) + + if ( + collection.filter_by(date_debut=date_debut, date_fin=date_fin).first() + is not None + ): + return True + + count: int = collection.filter( + collection_cls.date_debut < date_fin, collection_cls.date_fin > date_debut + ).count() + + return count > 0 + + +def compute_assiduites_justified( + etudid: int, justificatifs: list[Justificatif] = None, reset: bool = False +) -> list[int]: + """ + compute_assiduites_justified_faster + + Args: + etudid (int): l'identifiant de l'étudiant + justificatifs (list[Justificatif]): La liste des justificatifs qui seront utilisés + reset (bool, optional): remet à false les assiduites non justifiés. Defaults to False. + + Returns: + list[int]: la liste des assiduités qui ont été justifiées. + """ + if justificatifs is None: + justificatifs: Justificatif = Justificatif.query.filter_by(etudid=etudid).all() + + assiduites: Assiduite = Assiduite.query.filter_by(etudid=etudid) + + assiduites_justifiees: list[int] = [] + + for assi in assiduites: + if any( + assi.date_debut >= j.date_debut and assi.date_fin <= j.date_fin + for j in justificatifs + ): + assi.est_just = True + assiduites_justifiees.append(assi.assiduite_id) + db.session.add(assi) + elif reset: + assi.est_just = False + db.session.add(assi) + db.session.commit() + return assiduites_justifiees + + +def get_assiduites_justif(assiduite_id: int, long: bool): + assi: Assiduite = Assiduite.query.get_or_404(assiduite_id) + return _get_assiduites_justif(assi.etudid, assi.date_debut, assi.date_fin, long) + + +def _get_assiduites_justif( + etudid: int, date_debut: datetime, date_fin: datetime, long: bool = False +): + justifs: Justificatif = Justificatif.query.filter( + Justificatif.etudid == etudid, + Justificatif.date_debut <= date_debut, + Justificatif.date_fin >= date_fin, + ) + + return [j.justif_id if not long else j.to_dict(True) for j in justifs] diff --git a/app/models/but_refcomp.py b/app/models/but_refcomp.py index 2cb1145d..73ddf9f7 100644 --- a/app/models/but_refcomp.py +++ b/app/models/but_refcomp.py @@ -471,9 +471,16 @@ class ApcNiveau(db.Model, XMLModel): for pn in parcour_niveaux ] else: - niveaux: list[ApcNiveau] = competence.niveaux.filter_by( - annee=f"BUT{int(annee)}" - ).all() + niveaux: list[ApcNiveau] = ( + ApcNiveau.query.filter_by(annee=f"BUT{int(annee)}") + .join(ApcCompetence) + .filter_by(id=competence.id) + .join(ApcParcoursNiveauCompetence) + .filter(ApcParcoursNiveauCompetence.niveau == ApcNiveau.ordre) + .join(ApcAnneeParcours) + .filter_by(parcours_id=parcour.id) + .all() + ) _cache[key] = niveaux return niveaux diff --git a/app/models/config.py b/app/models/config.py index 5212ff38..c436248f 100644 --- a/app/models/config.py +++ b/app/models/config.py @@ -3,11 +3,17 @@ """Model : site config WORK IN PROGRESS #WIP """ +import json +import urllib.parse + from flask import flash from app import current_app, db, log from app.comp import bonus_spo +from app.scodoc.sco_exceptions import ScoValueError from app.scodoc import sco_utils as scu +from datetime import time + from app.scodoc.codes_cursus import ( ABAN, ABL, @@ -96,6 +102,10 @@ class ScoDocSiteConfig(db.Model): "cas_logout_route": str, "cas_validate_route": str, "cas_attribute_id": str, + # Assiduités + "morning_time": str, + "lunch_time": str, + "afternoon_time": str, } def __init__(self, name, value): @@ -247,7 +257,7 @@ class ScoDocSiteConfig(db.Model): cfg = ScoDocSiteConfig.query.filter_by(name=name).first() if cfg is None: return default - return cfg.value or "" + return cls.NAMES.get(name, lambda x: x)(cfg.value or "") @classmethod def set(cls, name: str, value: str) -> bool: @@ -336,3 +346,47 @@ class ScoDocSiteConfig(db.Model): log(f"set_month_debut_periode2({month})") return True return False + + @classmethod + def get_perso_links(cls) -> list["PersonalizedLink"]: + "Return links" + data_links = cls.get("personalized_links") + if not data_links: + return [] + try: + links_dict = json.loads(data_links) + except json.decoder.JSONDecodeError as exc: + # Corrupted data ? erase content + cls.set("personalized_links", "") + raise ScoValueError( + "Attention: liens personnalisés erronés: ils ont été effacés." + ) + return [PersonalizedLink(**item) for item in links_dict] + + @classmethod + def set_perso_links(cls, links: list["PersonalizedLink"] = None): + "Store all links" + if not links: + links = [] + links_dict = [link.to_dict() for link in links] + data_links = json.dumps(links_dict) + cls.set("personalized_links", data_links) + + +class PersonalizedLink: + def __init__(self, title: str = "", url: str = "", with_args: bool = False): + self.title = str(title or "") + self.url = str(url or "") + self.with_args = bool(with_args) + + def get_url(self, params: dict = {}) -> str: + if not self.with_args: + return self.url + query_string = urllib.parse.urlencode(params) + if "?" in self.url: + return self.url + "&" + query_string + return self.url + "?" + query_string + + def to_dict(self) -> dict: + "as dict" + return {"title": self.title, "url": self.url, "with_args": self.with_args} diff --git a/app/models/etudiants.py b/app/models/etudiants.py index d67a8482..5c4ea31e 100644 --- a/app/models/etudiants.py +++ b/app/models/etudiants.py @@ -73,6 +73,12 @@ class Identite(db.Model): passive_deletes=True, ) + # Relations avec les assiduites et les justificatifs + assiduites = db.relationship("Assiduite", back_populates="etudiant", lazy="dynamic") + justificatifs = db.relationship( + "Justificatif", back_populates="etudiant", lazy="dynamic" + ) + def __repr__(self): return ( f"" diff --git a/app/models/formsemestre.py b/app/models/formsemestre.py index b5e21b25..e4690a06 100644 --- a/app/models/formsemestre.py +++ b/app/models/formsemestre.py @@ -39,9 +39,11 @@ from app.models.validations import ScolarFormSemestreValidation from app.scodoc import codes_cursus, sco_preferences from app.scodoc.sco_exceptions import ScoValueError from app.scodoc.sco_permissions import Permission -from app.scodoc.sco_utils import MONTH_NAMES_ABBREV +from app.scodoc.sco_utils import MONTH_NAMES_ABBREV, translate_assiduites_metric from app.scodoc.sco_vdi import ApoEtapeVDI +from app.scodoc.sco_utils import translate_assiduites_metric + GROUPS_AUTO_ASSIGNMENT_DATA_MAX = 1024 * 1024 # bytes @@ -712,10 +714,14 @@ class FormSemestre(db.Model): tuple (nb abs, nb abs justifiées) Utilise un cache. """ - from app.scodoc import sco_abs + from app.scodoc import sco_assiduites - return sco_abs.get_abs_count_in_interval( - etudid, self.date_debut.isoformat(), self.date_fin.isoformat() + metrique = sco_preferences.get_preference("assi_metrique", self.id) + return sco_assiduites.get_assiduites_count_in_interval( + etudid, + self.date_debut.isoformat(), + self.date_fin.isoformat(), + translate_assiduites_metric(metrique), ) def get_codes_apogee(self, category=None) -> set[str]: @@ -812,11 +818,15 @@ class FormSemestre(db.Model): db.session.commit() - def update_inscriptions_parcours_from_groups(self) -> None: + def update_inscriptions_parcours_from_groups(self, etudid: int = None) -> None: """Met à jour les inscriptions dans les parcours du semestres en fonction des groupes de parcours. + Les groupes de parcours sont ceux de la partition scu.PARTITION_PARCOURS et leur nom est le code du parcours (eg "Cyber"). + + Si etudid est sépcifié, n'affecte que cet étudiant, + sinon traite tous les inscrits du semestre. """ if self.formation.referentiel_competence_id is None: return # safety net @@ -827,17 +837,32 @@ class FormSemestre(db.Model): return # Efface les inscriptions aux parcours: - db.session.execute( - text( - """UPDATE notes_formsemestre_inscription - SET parcour_id=NULL - WHERE formsemestre_id=:formsemestre_id - """ - ), - { - "formsemestre_id": self.id, - }, - ) + if etudid: + db.session.execute( + text( + """UPDATE notes_formsemestre_inscription + SET parcour_id=NULL + WHERE formsemestre_id=:formsemestre_id + AND etudid=:etudid + """ + ), + { + "formsemestre_id": self.id, + "etudid": etudid, + }, + ) + else: + db.session.execute( + text( + """UPDATE notes_formsemestre_inscription + SET parcour_id=NULL + WHERE formsemestre_id=:formsemestre_id + """ + ), + { + "formsemestre_id": self.id, + }, + ) # Inscrit les étudiants des groupes de parcours: for group in partition.groups: query = ( @@ -855,22 +880,42 @@ class FormSemestre(db.Model): ) continue parcour = query.first() - db.session.execute( - text( - """UPDATE notes_formsemestre_inscription ins - SET parcour_id=:parcour_id - FROM group_membership gm - WHERE formsemestre_id=:formsemestre_id - AND gm.etudid = ins.etudid - AND gm.group_id = :group_id - """ - ), - { - "formsemestre_id": self.id, - "parcour_id": parcour.id, - "group_id": group.id, - }, - ) + if etudid: + db.session.execute( + text( + """UPDATE notes_formsemestre_inscription ins + SET parcour_id=:parcour_id + FROM group_membership gm + WHERE formsemestre_id=:formsemestre_id + AND ins.etudid = :etudid + AND gm.etudid = :etudid + AND gm.group_id = :group_id + """ + ), + { + "etudid": etudid, + "formsemestre_id": self.id, + "parcour_id": parcour.id, + "group_id": group.id, + }, + ) + else: + db.session.execute( + text( + """UPDATE notes_formsemestre_inscription ins + SET parcour_id=:parcour_id + FROM group_membership gm + WHERE formsemestre_id=:formsemestre_id + AND gm.etudid = ins.etudid + AND gm.group_id = :group_id + """ + ), + { + "formsemestre_id": self.id, + "parcour_id": parcour.id, + "group_id": group.id, + }, + ) db.session.commit() def etud_validations_description_html(self, etudid: int) -> str: diff --git a/app/models/moduleimpls.py b/app/models/moduleimpls.py index 8a7dcb01..c4d7c3fe 100644 --- a/app/models/moduleimpls.py +++ b/app/models/moduleimpls.py @@ -122,6 +122,22 @@ class ModuleImpl(db.Model): raise AccessDenied(f"Modification impossible pour {user}") return False + def est_inscrit(self, etud: Identite) -> bool: + """ + Vérifie si l'étudiant est bien inscrit au moduleimpl + + Retourne Vrai si c'est le cas, faux sinon + """ + + is_module: int = ( + ModuleImplInscription.query.filter_by( + etudid=etud.id, moduleimpl_id=self.id + ).count() + > 0 + ) + + return is_module + # Enseignants (chargés de TD ou TP) d'un moduleimpl notes_modules_enseignants = db.Table( diff --git a/app/profiler.py b/app/profiler.py new file mode 100644 index 00000000..0e61d385 --- /dev/null +++ b/app/profiler.py @@ -0,0 +1,43 @@ +from time import time +from datetime import datetime + + +class Profiler: + OUTPUT: str = "/tmp/scodoc.profiler.csv" + + def __init__(self, tag: str) -> None: + self.tag: str = tag + self.start_time: time = None + self.stop_time: time = None + + def start(self): + self.start_time = time() + return self + + def stop(self): + self.stop_time = time() + return self + + def elapsed(self) -> float: + return self.stop_time - self.start_time + + def dates(self) -> tuple[datetime, datetime]: + return datetime.fromtimestamp(self.start_time), datetime.fromtimestamp( + self.stop_time + ) + + def write(self): + with open(Profiler.OUTPUT, "a") as file: + dates: tuple = self.dates() + date_str = (dates[0].isoformat(), dates[1].isoformat()) + file.write(f"\n{self.tag},{self.elapsed() : .2}") + + @classmethod + def write_in(cls, msg: str): + with open(cls.OUTPUT, "a") as file: + file.write(f"\n# {msg}") + + @classmethod + def clear(cls): + with open(cls.OUTPUT, "w") as file: + file.write("") diff --git a/app/scodoc/html_sco_header.py b/app/scodoc/html_sco_header.py index 76e8727a..fd627370 100644 --- a/app/scodoc/html_sco_header.py +++ b/app/scodoc/html_sco_header.py @@ -30,7 +30,7 @@ import html -from flask import render_template +from flask import g, render_template from flask import request from flask_login import current_user @@ -148,6 +148,8 @@ def sco_header( "Main HTML page header for ScoDoc" from app.scodoc.sco_formsemestre_status import formsemestre_page_title + if etudid is not None: + g.current_etudid = etudid scodoc_flash_status_messages() # Get head message from http request: diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py old mode 100644 new mode 100755 index 33132a05..820bf898 --- a/app/scodoc/html_sidebar.py +++ b/app/scodoc/html_sidebar.py @@ -54,9 +54,12 @@ def sidebar_common():

Scolarité

Semestres
Programmes
- Absences
""" ] + if current_user.has_permission(Permission.ScoAbsChange): + H.append( + f""" Assiduités
""" + ) if current_user.has_permission( Permission.ScoUsersAdmin ) or current_user.has_permission(Permission.ScoUsersView): @@ -76,7 +79,7 @@ def sidebar_common(): def sidebar(etudid: int = None): "Main HTML page sidebar" # rewritten from legacy DTML code - from app.scodoc import sco_abs + from app.scodoc import sco_assiduites from app.scodoc import sco_etud params = {} @@ -116,19 +119,18 @@ def sidebar(etudid: int = None): ) if etud["cursem"]: cur_sem = etud["cursem"] - nbabs, nbabsjust = sco_abs.get_abs_count(etudid, cur_sem) + nbabs, nbabsjust = sco_assiduites.get_assiduites_count(etudid, cur_sem) nbabsnj = nbabs - nbabsjust H.append( - f"""(1/2 j.) + f"""({sco_preferences.get_preference("assi_metrique", None)})
{ nbabsjust } J., { nbabsnj } N.J.""" ) H.append(" """ ) diff --git a/app/scodoc/imageresize.py b/app/scodoc/imageresize.py index 5a5af483..93f874f0 100644 --- a/app/scodoc/imageresize.py +++ b/app/scodoc/imageresize.py @@ -6,7 +6,7 @@ from PIL import Image as PILImage def ImageScale(img_file, maxx, maxy): im = PILImage.open(img_file) - im.thumbnail((maxx, maxy), PILImage.ANTIALIAS) + im.thumbnail((maxx, maxy), PILImage.LANCZOS) out_file_str = io.BytesIO() im.save(out_file_str, im.format) out_file_str.seek(0) @@ -20,7 +20,7 @@ def ImageScaleH(img_file, W=None, H=90): if W is None: # keep aspect W = int((im.size[0] * H) / float(im.size[1])) - im.thumbnail((W, H), PILImage.ANTIALIAS) + im.thumbnail((W, H), PILImage.LANCZOS) out_file_str = io.BytesIO() im.save(out_file_str, im.format) out_file_str.seek(0) diff --git a/app/scodoc/sco_abs.py b/app/scodoc/sco_abs.py old mode 100644 new mode 100755 diff --git a/app/scodoc/sco_abs_notification.py b/app/scodoc/sco_abs_notification.py index c01aa491..7ff95d77 100644 --- a/app/scodoc/sco_abs_notification.py +++ b/app/scodoc/sco_abs_notification.py @@ -47,6 +47,7 @@ import app.scodoc.notesdb as ndb from app.scodoc import sco_etud from app.scodoc import sco_preferences from app.scodoc import sco_users +from app.scodoc import sco_utils as scu def abs_notify(etudid, date): @@ -55,14 +56,21 @@ def abs_notify(etudid, date): (s'il n'y a pas de semestre courant, ne fait rien, car l'etudiant n'est pas inscrit au moment de l'absence!). """ - from app.scodoc import sco_abs + from app.scodoc import sco_assiduites formsemestre = retreive_current_formsemestre(etudid, date) if not formsemestre: return # non inscrit a la date, pas de notification - nbabs, nbabsjust = sco_abs.get_abs_count_in_interval( - etudid, formsemestre.date_debut.isoformat(), formsemestre.date_fin.isoformat() + nbabs, nbabsjust = sco_assiduites.get_assiduites_count_in_interval( + etudid, + formsemestre.date_debut.isoformat(), + formsemestre.date_fin.isoformat(), + scu.translate_assiduites_metric( + sco_preferences.get_preference( + "assi_metrique", formsemestre.formsemestre_id + ) + ), ) do_abs_notify(formsemestre, etudid, date, nbabs, nbabsjust) @@ -85,6 +93,7 @@ def do_abs_notify(formsemestre: FormSemestre, etudid, date, nbabs, nbabsjust): return # abort # Vérification fréquence (pour ne pas envoyer de mails trop souvent) + # TODO Mettre la fréquence dans les préférences assiduités abs_notify_max_freq = sco_preferences.get_preference("abs_notify_max_freq") destinations_filtered = [] for email_addr in destinations: @@ -174,6 +183,8 @@ def abs_notify_is_above_threshold(etudid, nbabs, nbabsjust, formsemestre_id): (nbabs > abs_notify_abs_threshold) (nbabs - nbabs_last_notified) > abs_notify_abs_increment + + TODO Mettre à jour avec le module assiduité + fonctionnement métrique """ abs_notify_abs_threshold = sco_preferences.get_preference( "abs_notify_abs_threshold", formsemestre_id diff --git a/app/scodoc/sco_archives.py b/app/scodoc/sco_archives.py index 00e02c9d..c6a646ee 100644 --- a/app/scodoc/sco_archives.py +++ b/app/scodoc/sco_archives.py @@ -68,7 +68,7 @@ from app import log, ScoDocJSONEncoder from app.but import jury_but_pv from app.comp import res_sem from app.comp.res_compat import NotesTableCompat -from app.models import Departement, FormSemestre +from app.models import FormSemestre from app.scodoc.TrivialFormulator import TrivialFormulator from app.scodoc.sco_exceptions import ScoException, ScoPermissionDenied from app.scodoc import html_sco_header @@ -86,6 +86,11 @@ class BaseArchiver(object): self.archive_type = archive_type self.initialized = False self.root = None + self.dept_id = None + + def set_dept_id(self, dept_id: int): + "set dept" + self.dept_id = dept_id def initialize(self): if self.initialized: @@ -107,6 +112,8 @@ class BaseArchiver(object): finally: scu.GSL.release() self.initialized = True + if self.dept_id is None: + self.dept_id = getattr(g, "scodoc_dept_id") def get_obj_dir(self, oid: int): """ @@ -114,8 +121,7 @@ class BaseArchiver(object): If directory does not yet exist, create it. """ self.initialize() - dept = Departement.query.filter_by(acronym=g.scodoc_dept).first() - dept_dir = os.path.join(self.root, str(dept.id)) + dept_dir = os.path.join(self.root, str(self.dept_id)) try: scu.GSL.acquire() if not os.path.isdir(dept_dir): @@ -140,8 +146,7 @@ class BaseArchiver(object): :return: list of archive oids """ self.initialize() - dept = Departement.query.filter_by(acronym=g.scodoc_dept).first() - base = os.path.join(self.root, str(dept.id)) + os.path.sep + base = os.path.join(self.root, str(self.dept_id)) + os.path.sep dirs = glob.glob(base + "*") return [os.path.split(x)[1] for x in dirs] diff --git a/app/scodoc/sco_archives_justificatifs.py b/app/scodoc/sco_archives_justificatifs.py new file mode 100644 index 00000000..0030d203 --- /dev/null +++ b/app/scodoc/sco_archives_justificatifs.py @@ -0,0 +1,231 @@ +""" +Gestion de l'archivage des justificatifs + +Ecrit par Matthias HARTMANN +""" +import os +from datetime import datetime +from shutil import rmtree + +from app.models import Identite +from app.scodoc.sco_archives import BaseArchiver +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_utils import is_iso_formated + + +class Trace: + """gestionnaire de la trace des fichiers justificatifs""" + + def __init__(self, path: str) -> None: + self.path: str = path + "/_trace.csv" + self.content: dict[str, list[datetime, datetime, str]] = {} + self.import_from_file() + + def import_from_file(self): + """import trace from file""" + if os.path.isfile(self.path): + with open(self.path, "r", encoding="utf-8") as file: + for line in file.readlines(): + csv = line.split(",") + if len(csv) < 4: + continue + fname: str = csv[0] + entry_date: datetime = is_iso_formated(csv[1], True) + delete_date: datetime = is_iso_formated(csv[2], True) + user_id = csv[3] + + self.content[fname] = [entry_date, delete_date, user_id] + + def set_trace(self, *fnames: str, mode: str = "entry", current_user: str = None): + """Ajoute une trace du fichier donné + mode : entry / delete + """ + modes: list[str] = ["entry", "delete", "user_id"] + for fname in fnames: + if fname in modes: + continue + traced: list[datetime, datetime, str] = self.content.get(fname, False) + if not traced: + self.content[fname] = [None, None, None] + traced = self.content[fname] + + traced[modes.index(mode)] = ( + datetime.now() if mode != "user_id" else current_user + ) + self.save_trace() + + def save_trace(self): + """Enregistre la trace dans le fichier _trace.csv""" + lines: list[str] = [] + for fname, traced in self.content.items(): + date_fin: datetime or None = traced[1].isoformat() if traced[1] else "None" + if traced[0] is not None: + lines.append(f"{fname},{traced[0].isoformat()},{date_fin}, {traced[2]}") + with open(self.path, "w", encoding="utf-8") as file: + file.write("\n".join(lines)) + + def get_trace( + self, fnames: list[str] = None + ) -> dict[str, list[datetime, datetime, str]]: + """Récupère la trace pour les noms de fichiers. + si aucun nom n'est donné, récupère tous les fichiers""" + + if fnames is None: + return self.content + + traced: dict = {} + for fname in fnames: + traced[fname] = self.content.get(fname, None) + + return traced + + +class JustificatifArchiver(BaseArchiver): + """ + + TOTALK: + - oid -> etudid + - archive_id -> date de création de l'archive (une archive par dépot de document) + + justificatif + └── + └── + ├── [_trace.csv] + └── + ├── [_description.txt] + └── [] + + """ + + def __init__(self): + BaseArchiver.__init__(self, archive_type="justificatifs") + + def save_justificatif( + self, + etudid: int, + filename: str, + data: bytes or str, + archive_name: str = None, + description: str = "", + user_id: str = None, + ) -> str: + """ + Ajoute un fichier dans une archive "justificatif" pour l'etudid donné + Retourne l'archive_name utilisé + """ + self._set_dept(etudid) + if archive_name is None: + archive_id: str = self.create_obj_archive( + oid=etudid, description=description + ) + else: + archive_id: str = self.get_id_from_name(etudid, archive_name) + + fname: str = self.store(archive_id, filename, data) + + trace = Trace(self.get_obj_dir(etudid)) + trace.set_trace(fname, mode="entry") + if user_id is not None: + trace.set_trace(fname, mode="user_id", current_user=user_id) + + return self.get_archive_name(archive_id), fname + + def delete_justificatif( + self, + etudid: int, + archive_name: str, + filename: str = None, + has_trace: bool = True, + ): + """ + Supprime une archive ou un fichier particulier de l'archivage de l'étudiant donné + + Si trace == True : sauvegarde le nom du/des fichier(s) supprimé(s) dans la trace de l'étudiant + """ + self._set_dept(etudid) + if str(etudid) not in self.list_oids(): + raise ValueError(f"Aucune archive pour etudid[{etudid}]") + + archive_id = self.get_id_from_name(etudid, archive_name) + + if filename is not None: + if filename not in self.list_archive(archive_id): + raise ValueError( + f"filename {filename} inconnu dans l'archive archive_id[{archive_id}] -> etudid[{etudid}]" + ) + + path: str = os.path.join(self.get_obj_dir(etudid), archive_id, filename) + + if os.path.isfile(path): + if has_trace: + trace = Trace(self.get_obj_dir(etudid)) + trace.set_trace(filename, mode="delete") + os.remove(path) + + else: + if has_trace: + trace = Trace(self.get_obj_dir(etudid)) + trace.set_trace(*self.list_archive(archive_id), mode="delete") + + self.delete_archive( + os.path.join( + self.get_obj_dir(etudid), + archive_id, + ) + ) + + def list_justificatifs( + self, archive_name: str, etudid: int + ) -> list[tuple[str, int]]: + """ + Retourne la liste des noms de fichiers dans l'archive donnée + """ + self._set_dept(etudid) + filenames: list[str] = [] + archive_id = self.get_id_from_name(etudid, archive_name) + + filenames = self.list_archive(archive_id) + trace: Trace = Trace(self.get_obj_dir(etudid)) + traced = trace.get_trace(filenames) + retour = [(key, value[2]) for key, value in traced.items()] + + return retour + + def get_justificatif_file(self, archive_name: str, etudid: int, filename: str): + """ + Retourne une réponse de téléchargement de fichier si le fichier existe + """ + self._set_dept(etudid) + archive_id: str = self.get_id_from_name(etudid, archive_name) + if filename in self.list_archive(archive_id): + return self.get_archived_file(etudid, archive_name, filename) + raise ScoValueError( + f"Fichier {filename} introuvable dans l'archive {archive_name}" + ) + + def _set_dept(self, etudid: int): + """ + Mets à jour le dept_id de l'archiver en fonction du département de l'étudiant + """ + etud: Identite = Identite.query.filter_by(id=etudid).first() + self.set_dept_id(etud.dept_id) + + def remove_dept_archive(self, dept_id: int = None): + """ + Supprime toutes les archives d'un département (ou de tous les départements) + ⚠ Supprime aussi les fichiers de trace ⚠ + """ + self.set_dept_id(1) + self.initialize() + + if dept_id is None: + rmtree(self.root, ignore_errors=True) + else: + rmtree(os.path.join(self.root, str(dept_id)), ignore_errors=True) + + def get_trace( + self, etudid: int, *fnames: str + ) -> dict[str, list[datetime, datetime]]: + """Récupère la trace des justificatifs de l'étudiant""" + trace = Trace(self.get_obj_dir(etudid)) + return trace.get_trace(fnames) diff --git a/app/scodoc/sco_assiduites.py b/app/scodoc/sco_assiduites.py new file mode 100644 index 00000000..c78d1b8f --- /dev/null +++ b/app/scodoc/sco_assiduites.py @@ -0,0 +1,507 @@ +""" +Ecrit par Matthias Hartmann. +""" +from datetime import date, datetime, time, timedelta +from pytz import UTC + +from app import log +import app.scodoc.sco_utils as scu +from app.models.assiduites import Assiduite, Justificatif +from app.models.etudiants import Identite +from app.models.formsemestre import FormSemestre, FormSemestreInscription +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_preferences +from app.scodoc import sco_cache +from app.scodoc import sco_etud + + +class CountCalculator: + """Classe qui gére le comptage des assiduités""" + + def __init__( + self, + morning: time = time(8, 0), + noon: time = time(12, 0), + after_noon: time = time(14, 00), + evening: time = time(18, 0), + skip_saturday: bool = True, + ) -> None: + self.morning: time = morning + self.noon: time = noon + self.after_noon: time = after_noon + self.evening: time = evening + self.skip_saturday: bool = skip_saturday + + delta_total: timedelta = datetime.combine(date.min, evening) - datetime.combine( + date.min, morning + ) + delta_lunch: timedelta = datetime.combine( + date.min, after_noon + ) - datetime.combine(date.min, noon) + + self.hour_per_day: float = (delta_total - delta_lunch).total_seconds() / 3600 + + self.days: list[date] = [] + self.half_days: list[tuple[date, bool]] = [] # tuple -> (date, morning:bool) + self.hours: float = 0.0 + + self.count: int = 0 + + def reset(self): + """Remet à zero le compteur""" + self.days = [] + self.half_days = [] + self.hours = 0.0 + self.count = 0 + + def add_half_day(self, day: date, is_morning: bool = True): + """Ajoute une demi journée dans le comptage""" + key: tuple[date, bool] = (day, is_morning) + if key not in self.half_days: + self.half_days.append(key) + + def add_day(self, day: date): + """Ajoute un jour dans le comptage""" + if day not in self.days: + self.days.append(day) + + def check_in_morning(self, period: tuple[datetime, datetime]) -> bool: + """Vérifiée si la période donnée fait partie du matin + (Test sur la date de début) + """ + + interval_morning: tuple[datetime, datetime] = ( + scu.localize_datetime(datetime.combine(period[0].date(), self.morning)), + scu.localize_datetime(datetime.combine(period[0].date(), self.noon)), + ) + + in_morning: bool = scu.is_period_overlapping( + period, interval_morning, bornes=False + ) + return in_morning + + def check_in_evening(self, period: tuple[datetime, datetime]) -> bool: + """Vérifie si la période fait partie de l'aprèm + (test sur la date de début) + """ + + interval_evening: tuple[datetime, datetime] = ( + scu.localize_datetime(datetime.combine(period[0].date(), self.after_noon)), + scu.localize_datetime(datetime.combine(period[0].date(), self.evening)), + ) + + in_evening: bool = scu.is_period_overlapping(period, interval_evening) + + return in_evening + + def compute_long_assiduite(self, assi: Assiduite): + """Calcule les métriques sur une assiduité longue (plus d'un jour)""" + + pointer_date: date = assi.date_debut.date() + timedelta(days=1) + start_hours: timedelta = assi.date_debut - scu.localize_datetime( + datetime.combine(assi.date_debut, self.morning) + ) + finish_hours: timedelta = assi.date_fin - scu.localize_datetime( + datetime.combine(assi.date_fin, self.morning) + ) + + self.add_day(assi.date_debut.date()) + self.add_day(assi.date_fin.date()) + + start_period: tuple[datetime, datetime] = ( + assi.date_debut, + scu.localize_datetime( + datetime.combine(assi.date_debut.date(), self.evening) + ), + ) + + finish_period: tuple[datetime, datetime] = ( + scu.localize_datetime(datetime.combine(assi.date_fin.date(), self.morning)), + assi.date_fin, + ) + hours = 0.0 + for period in (start_period, finish_period): + if self.check_in_evening(period): + self.add_half_day(period[0].date(), False) + if self.check_in_morning(period): + self.add_half_day(period[0].date()) + + while pointer_date < assi.date_fin.date(): + # TODO : Utiliser la préférence de département : workdays + if pointer_date.weekday() < (6 - self.skip_saturday): + self.add_day(pointer_date) + self.add_half_day(pointer_date) + self.add_half_day(pointer_date, False) + self.hours += self.hour_per_day + hours += self.hour_per_day + + pointer_date += timedelta(days=1) + + self.hours += finish_hours.total_seconds() / 3600 + self.hours += self.hour_per_day - (start_hours.total_seconds() / 3600) + + def compute_assiduites(self, assiduites: Assiduite): + """Calcule les métriques pour la collection d'assiduité donnée""" + assi: Assiduite + assiduites: list[Assiduite] = ( + assiduites.all() if isinstance(assiduites, Assiduite) else assiduites + ) + for assi in assiduites: + self.count += 1 + delta: timedelta = assi.date_fin - assi.date_debut + + if delta.days > 0: + # raise Exception(self.hours) + self.compute_long_assiduite(assi) + + continue + + period: tuple[datetime, datetime] = (assi.date_debut, assi.date_fin) + deb_date: date = assi.date_debut.date() + if self.check_in_morning(period): + self.add_half_day(deb_date) + if self.check_in_evening(period): + self.add_half_day(deb_date, False) + + self.add_day(deb_date) + + self.hours += delta.total_seconds() / 3600 + + def to_dict(self) -> dict[str, object]: + """Retourne les métriques sous la forme d'un dictionnaire""" + return { + "compte": self.count, + "journee": len(self.days), + "demi": len(self.half_days), + "heure": round(self.hours, 2), + } + + +def get_assiduites_stats( + assiduites: Assiduite, metric: str = "all", filtered: dict[str, object] = None +) -> Assiduite: + """Compte les assiduités en fonction des filtres""" + + if filtered is not None: + deb, fin = None, None + for key in filtered: + if key == "etat": + assiduites = filter_assiduites_by_etat(assiduites, filtered[key]) + elif key == "date_fin": + fin = filtered[key] + elif key == "date_debut": + deb = filtered[key] + elif key == "moduleimpl_id": + assiduites = filter_by_module_impl(assiduites, filtered[key]) + elif key == "formsemestre": + assiduites = filter_by_formsemestre( + assiduites, Assiduite, filtered[key] + ) + elif key == "est_just": + assiduites = filter_assiduites_by_est_just(assiduites, filtered[key]) + elif key == "user_id": + assiduites = filter_by_user_id(assiduites, filtered[key]) + if (deb, fin) != (None, None): + assiduites = filter_by_date(assiduites, Assiduite, deb, fin) + + calculator: CountCalculator = CountCalculator() + calculator.compute_assiduites(assiduites) + count: dict = calculator.to_dict() + + metrics: list[str] = metric.split(",") + + output: dict = {} + + for key, val in count.items(): + if key in metrics: + output[key] = val + return output if output else count + + +def filter_assiduites_by_etat(assiduites: Assiduite, etat: str) -> Assiduite: + """ + Filtrage d'une collection d'assiduites en fonction de leur état + """ + etats: list[str] = list(etat.split(",")) + etats = [scu.EtatAssiduite.get(e, -1) for e in etats] + return assiduites.filter(Assiduite.etat.in_(etats)) + + +def filter_assiduites_by_est_just( + assiduites: Assiduite, est_just: bool +) -> Justificatif: + """ + Filtrage d'une collection d'assiduites en fonction de s'ils sont justifiés + """ + return assiduites.filter_by(est_just=est_just) + + +def filter_by_user_id( + collection: Assiduite or Justificatif, + user_id: int, +) -> Justificatif: + """ + Filtrage d'une collection en fonction de l'user_id + """ + return collection.filter_by(user_id=user_id) + + +def filter_by_date( + collection: Assiduite or Justificatif, + collection_cls: Assiduite or Justificatif, + date_deb: datetime = None, + date_fin: datetime = None, + strict: bool = False, +): + """ + Filtrage d'une collection d'assiduites en fonction d'une date + """ + if date_deb is None: + date_deb = datetime.min + if date_fin is None: + date_fin = datetime.max + + date_deb = scu.localize_datetime(date_deb) + date_fin = scu.localize_datetime(date_fin) + if not strict: + return collection.filter( + collection_cls.date_debut <= date_fin, collection_cls.date_fin >= date_deb + ) + return collection.filter( + collection_cls.date_debut < date_fin, collection_cls.date_fin > date_deb + ) + + +def filter_justificatifs_by_etat( + justificatifs: Justificatif, etat: str +) -> Justificatif: + """ + Filtrage d'une collection de justificatifs en fonction de leur état + """ + etats: list[str] = list(etat.split(",")) + etats = [scu.EtatJustificatif.get(e, -1) for e in etats] + return justificatifs.filter(Justificatif.etat.in_(etats)) + + +def filter_by_module_impl( + assiduites: Assiduite, module_impl_id: int or None +) -> Assiduite: + """ + Filtrage d'une collection d'assiduites en fonction de l'ID du module_impl + """ + return assiduites.filter(Assiduite.moduleimpl_id == module_impl_id) + + +def filter_by_formsemestre( + collection_query: Assiduite or Justificatif, + collection_class: Assiduite or Justificatif, + formsemestre: FormSemestre, +): + """ + Filtrage d'une collection en fonction d'un formsemestre + """ + + if formsemestre is None: + return collection_query.filter(False) + + collection_result = ( + collection_query.join(Identite, collection_class.etudid == Identite.id) + .join( + FormSemestreInscription, + Identite.id == FormSemestreInscription.etudid, + ) + .filter(FormSemestreInscription.formsemestre_id == formsemestre.id) + ) + + form_date_debut = formsemestre.date_debut + timedelta(days=1) + form_date_fin = formsemestre.date_fin + timedelta(days=1) + + collection_result = collection_result.filter( + collection_class.date_debut >= form_date_debut + ) + + return collection_result.filter(collection_class.date_fin <= form_date_fin) + + +def justifies(justi: Justificatif, obj: bool = False) -> list[int]: + """ + Retourne la liste des assiduite_id qui sont justifié par la justification + Une assiduité est justifiée si elle est COMPLETEMENT ou PARTIELLEMENT comprise dans la plage du justificatif + et que l'état du justificatif est "valide" + renvoie des id si obj == False, sinon les Assiduités + """ + + if justi.etat != scu.EtatJustificatif.VALIDE: + return [] + + assiduites_query: Assiduite = Assiduite.query.filter_by(etudid=justi.etudid) + assiduites_query = assiduites_query.filter( + Assiduite.date_debut >= justi.date_debut, Assiduite.date_fin <= justi.date_fin + ) + + if not obj: + return [assi.id for assi in assiduites_query.all()] + + return assiduites_query + + +def get_all_justified( + etudid: int, date_deb: datetime = None, date_fin: datetime = None +) -> list[Assiduite]: + """Retourne toutes les assiduités justifiées sur une période""" + + if date_deb is None: + date_deb = datetime.min + if date_fin is None: + date_fin = datetime.max + + date_deb = scu.localize_datetime(date_deb) + date_fin = scu.localize_datetime(date_fin) + justified = Assiduite.query.filter_by(est_just=True, etudid=etudid) + after = filter_by_date( + justified, + Assiduite, + date_deb, + date_fin, + ) + return after + + +# Gestion du cache +def get_assiduites_count(etudid, sem): + """Les comptes d'absences de cet étudiant dans ce semestre: + tuple (nb abs non justifiées, nb abs justifiées) + Utilise un cache. + """ + metrique = sco_preferences.get_preference("assi_metrique", sem["formsemestre_id"]) + return get_assiduites_count_in_interval( + etudid, + sem["date_debut_iso"], + sem["date_fin_iso"], + scu.translate_assiduites_metric(metrique), + ) + + +def get_assiduites_count_in_interval( + etudid, date_debut_iso, date_fin_iso, metrique="demi" +): + """Les comptes d'absences de cet étudiant entre ces deux dates, incluses: + tuple (nb abs, nb abs justifiées) + Utilise un cache. + """ + key = ( + str(etudid) + + "_" + + date_debut_iso + + "_" + + date_fin_iso + + f"{metrique}_assiduites" + ) + r = sco_cache.AbsSemEtudCache.get(key) + if not r: + date_debut: datetime.datetime = scu.is_iso_formated(date_debut_iso, True) + date_fin: datetime.datetime = scu.is_iso_formated(date_fin_iso, True) + + assiduites: Assiduite = Assiduite.query.filter_by(etudid=etudid) + assiduites = assiduites.filter(Assiduite.etat == scu.EtatAssiduite.ABSENT) + justificatifs: Justificatif = Justificatif.query.filter_by(etudid=etudid) + + assiduites = filter_by_date(assiduites, Assiduite, date_debut, date_fin) + justificatifs = filter_by_date( + justificatifs, Justificatif, date_debut, date_fin + ) + + calculator: CountCalculator = CountCalculator() + calculator.compute_assiduites(assiduites) + nb_abs: dict = calculator.to_dict()[metrique] + + abs_just: list[Assiduite] = get_all_justified(etudid, date_debut, date_fin) + + calculator.reset() + calculator.compute_assiduites(abs_just) + nb_abs_just: dict = calculator.to_dict()[metrique] + + r = (nb_abs, nb_abs_just) + ans = sco_cache.AbsSemEtudCache.set(key, r) + if not ans: + log("warning: get_assiduites_count failed to cache") + return r + + +def invalidate_assiduites_count(etudid, sem): + """Invalidate (clear) cached counts""" + date_debut = sem["date_debut_iso"] + date_fin = sem["date_fin_iso"] + for met in ["demi", "journee", "compte", "heure"]: + key = str(etudid) + "_" + date_debut + "_" + date_fin + f"{met}_assiduites" + sco_cache.AbsSemEtudCache.delete(key) + + +def invalidate_assiduites_count_sem(sem): + """Invalidate (clear) cached abs counts for all the students of this semestre""" + inscriptions = ( + sco_formsemestre_inscriptions.do_formsemestre_inscription_listinscrits( + sem["formsemestre_id"] + ) + ) + for ins in inscriptions: + invalidate_assiduites_count(ins["etudid"], sem) + + +def invalidate_assiduites_etud_date(etudid, date: datetime): + """Doit etre appelé à chaque modification des assiduites pour cet étudiant et cette date. + Invalide cache absence et caches semestre + date: date au format ISO + """ + from app.scodoc import sco_compute_moy + + # Semestres a cette date: + etud = sco_etud.get_etud_info(etudid=etudid, filled=True) + if len(etud) == 0: + return + else: + etud = etud[0] + sems = [ + sem + for sem in etud["sems"] + if scu.is_iso_formated(sem["date_debut_iso"], True).replace(tzinfo=UTC) + <= date.replace(tzinfo=UTC) + and scu.is_iso_formated(sem["date_fin_iso"], True).replace(tzinfo=UTC) + >= date.replace(tzinfo=UTC) + ] + + # Invalide les PDF et les absences: + for sem in sems: + # Inval cache bulletin et/ou note_table + if sco_compute_moy.formsemestre_expressions_use_abscounts( + sem["formsemestre_id"] + ): + # certaines formules utilisent les absences + pdfonly = False + else: + # efface toujours le PDF car il affiche en général les absences + pdfonly = True + + sco_cache.invalidate_formsemestre( + formsemestre_id=sem["formsemestre_id"], pdfonly=pdfonly + ) + + # Inval cache compteurs absences: + invalidate_assiduites_count(etudid, sem) + + +def simple_invalidate_cache(obj: dict, etudid: str or int = None): + """Invalide le cache de l'étudiant et du / des semestres""" + date_debut = ( + obj["date_debut"] + if isinstance(obj["date_debut"], datetime) + else scu.is_iso_formated(obj["date_debut"], True) + ) + date_fin = ( + obj["date_fin"] + if isinstance(obj["date_fin"], datetime) + else scu.is_iso_formated(obj["date_fin"], True) + ) + etudid = etudid if etudid is not None else obj["etudid"] + invalidate_assiduites_etud_date(etudid, date_debut) + invalidate_assiduites_etud_date(etudid, date_fin) diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py index 428ac4e2..1596a11f 100644 --- a/app/scodoc/sco_bulletins.py +++ b/app/scodoc/sco_bulletins.py @@ -56,7 +56,7 @@ from app.scodoc.sco_permissions import Permission from app.scodoc.sco_exceptions import AccessDenied, ScoValueError from app.scodoc import html_sco_header from app.scodoc import htmlutils -from app.scodoc import sco_abs +from app.scodoc import sco_assiduites from app.scodoc import sco_abs_views from app.scodoc import sco_bulletins_generator from app.scodoc import sco_bulletins_json @@ -142,7 +142,7 @@ def formsemestre_bulletinetud_dict(formsemestre_id, etudid, version="long"): Cette fonction est utilisée pour les bulletins CLASSIQUES (DUT, ...) en HTML et PDF, mais pas ceux en XML. """ - from app.scodoc import sco_abs + from app.scodoc import sco_assiduites if version not in scu.BULLETINS_VERSIONS: raise ValueError("invalid version code !") @@ -197,7 +197,7 @@ def formsemestre_bulletinetud_dict(formsemestre_id, etudid, version="long"): pid = partition["partition_id"] partitions_etud_groups[pid] = sco_groups.get_etud_groups_in_partition(pid) # --- Absences - I["nbabs"], I["nbabsjust"] = sco_abs.get_abs_count(etudid, nt.sem) + I["nbabs"], I["nbabsjust"] = sco_assiduites.get_assiduites_count(etudid, nt.sem) # --- Decision Jury infos, dpv = etud_descr_situation_semestre( @@ -489,7 +489,7 @@ def _ue_mod_bulletin( ) # peut etre 'NI' is_malus = mod["module"]["module_type"] == ModuleType.MALUS if bul_show_abs_modules: - nbabs, nbabsjust = sco_abs.get_abs_count(etudid, sem) + nbabs, nbabsjust = sco_assiduites.get_assiduites_count(etudid, sem) mod_abs = [nbabs, nbabsjust] mod["mod_abs_txt"] = scu.fmt_abs(mod_abs) else: diff --git a/app/scodoc/sco_bulletins_json.py b/app/scodoc/sco_bulletins_json.py index 85d4f60b..8efcec25 100644 --- a/app/scodoc/sco_bulletins_json.py +++ b/app/scodoc/sco_bulletins_json.py @@ -43,7 +43,7 @@ from app.models.formsemestre import FormSemestre import app.scodoc.sco_utils as scu import app.scodoc.notesdb as ndb -from app.scodoc import sco_abs +from app.scodoc import sco_assiduites from app.scodoc import sco_edit_ue from app.scodoc import sco_evaluations from app.scodoc import sco_evaluation_db @@ -297,7 +297,7 @@ def formsemestre_bulletinetud_published_dict( # --- Absences if prefs["bul_show_abs"]: - nbabs, nbabsjust = sco_abs.get_abs_count(etudid, sem) + nbabs, nbabsjust = sco_assiduites.get_assiduites_count(etudid, sem) d["absences"] = dict(nbabs=nbabs, nbabsjust=nbabsjust) # --- Décision Jury @@ -426,6 +426,7 @@ def dict_decision_jury( etud: Identite, formsemestre: FormSemestre, with_decisions: bool = False ) -> dict: """dict avec decision pour bulletins json + - autorisation_inscription - decision : décision semestre - decision_ue : list des décisions UE - situation @@ -511,7 +512,10 @@ def dict_decision_jury( d["autorisation_inscription"] = [] for aut in decision["autorisations"]: d["autorisation_inscription"].append( - dict(semestre_id=aut["semestre_id"]) + dict( + semestre_id=aut["semestre_id"], + date=aut["date"].isoformat() if aut["date"] else None, + ) ) else: d["decision"] = dict(code="", etat="DEM") diff --git a/app/scodoc/sco_bulletins_xml.py b/app/scodoc/sco_bulletins_xml.py index e2ad7661..178b0296 100644 --- a/app/scodoc/sco_bulletins_xml.py +++ b/app/scodoc/sco_bulletins_xml.py @@ -51,7 +51,7 @@ import app.scodoc.notesdb as ndb from app import log from app.but.bulletin_but_xml_compat import bulletin_but_xml_compat from app.models.formsemestre import FormSemestre -from app.scodoc import sco_abs +from app.scodoc import sco_assiduites from app.scodoc import codes_cursus from app.scodoc import sco_edit_ue from app.scodoc import sco_evaluation_db @@ -63,6 +63,7 @@ from app.scodoc import sco_etud from app.scodoc import sco_xml from app.scodoc.sco_xml import quote_xml_attr + # -------- Bulletin en XML # (fonction séparée: n'utilise pas formsemestre_bulletinetud_dict() # pour simplifier le code, mais attention a la maintenance !) @@ -369,7 +370,7 @@ def make_xml_formsemestre_bulletinetud( # --- Absences if sco_preferences.get_preference("bul_show_abs", formsemestre_id): - nbabs, nbabsjust = sco_abs.get_abs_count(etudid, sem) + nbabs, nbabsjust = sco_assiduites.get_assiduites_count(etudid, sem) doc.append(Element("absences", nbabs=str(nbabs), nbabsjust=str(nbabsjust))) # --- Decision Jury if ( diff --git a/app/scodoc/sco_evaluations.py b/app/scodoc/sco_evaluations.py index ed34842a..12440d11 100644 --- a/app/scodoc/sco_evaluations.py +++ b/app/scodoc/sco_evaluations.py @@ -40,7 +40,6 @@ from flask import request from app.comp import res_sem from app.comp.res_compat import NotesTableCompat from app.models import FormSemestre -from app.models import ScolarNews import app.scodoc.sco_utils as scu from app.scodoc.sco_utils import ModuleType @@ -217,19 +216,19 @@ def do_evaluation_etat( (TotalNbMissing > 0) and (E["evaluation_type"] != scu.EVALUATION_RATTRAPAGE) and (E["evaluation_type"] != scu.EVALUATION_SESSION2) - and not is_malus ): complete = False else: complete = True - if ( - TotalNbMissing > 0 - and ((TotalNbMissing == TotalNbAtt) or E["publish_incomplete"]) - and not is_malus - ): - evalattente = True - else: - evalattente = False + + complete = ( + (TotalNbMissing == 0) + or (E["evaluation_type"] == scu.EVALUATION_RATTRAPAGE) + or (E["evaluation_type"] == scu.EVALUATION_SESSION2) + ) + evalattente = (TotalNbMissing > 0) and ( + (TotalNbMissing == TotalNbAtt) or E["publish_incomplete"] + ) # mais ne met pas en attente les evals immediates sans aucune notes: if E["publish_incomplete"] and nb_notes == 0: evalattente = False @@ -668,10 +667,13 @@ def evaluation_describe(evaluation_id="", edit_in_place=True, link_saisie=True): group_id = sco_groups.get_default_group(formsemestre_id) H.append( f"""(absences ce jour)""" ) diff --git a/app/scodoc/sco_formsemestre.py b/app/scodoc/sco_formsemestre.py index bac3352a..40a34a2a 100644 --- a/app/scodoc/sco_formsemestre.py +++ b/app/scodoc/sco_formsemestre.py @@ -93,7 +93,7 @@ _formsemestreEditor = ndb.EditableTable( ) -def get_formsemestre(formsemestre_id: int): +def get_formsemestre(formsemestre_id: int) -> dict: "list ONE formsemestre" if formsemestre_id is None: raise ValueError("get_formsemestre: id manquant") diff --git a/app/scodoc/sco_formsemestre_custommenu.py b/app/scodoc/sco_formsemestre_custommenu.py index ce9557eb..a98c07ac 100644 --- a/app/scodoc/sco_formsemestre_custommenu.py +++ b/app/scodoc/sco_formsemestre_custommenu.py @@ -29,7 +29,10 @@ """ import flask from flask import g, url_for, request +from flask_login import current_user +from app.models.config import ScoDocSiteConfig, PersonalizedLink +from app.models import FormSemestre import app.scodoc.sco_utils as scu import app.scodoc.notesdb as ndb from app.scodoc.TrivialFormulator import TrivialFormulator @@ -58,6 +61,28 @@ def formsemestre_custommenu_get(formsemestre_id): return vals +def build_context_dict(formsemestre_id: int) -> dict: + """returns a dict with "current" ids, to pass to external links""" + params = { + "dept": g.scodoc_dept, + "formsemestre_id": formsemestre_id, + "user_name": current_user.user_name, + } + cas_id = getattr(current_user, "cas_id", None) + if cas_id: + params["cas_id"] = cas_id + etudid = getattr(g, "current_etudid", None) + if etudid is not None: + params["etudid"] = etudid + evaluation_id = getattr(g, "current_evaluation_id", None) + if evaluation_id is not None: + params["evaluation_id"] = evaluation_id + moduleimpl_id = getattr(g, "current_moduleimpl_id", None) + if moduleimpl_id is not None: + params["moduleimpl_id"] = moduleimpl_id + return params + + def formsemestre_custommenu_html(formsemestre_id): "HTML code for custom menu" menu = [] @@ -66,6 +91,13 @@ def formsemestre_custommenu_html(formsemestre_id): ics_url = sco_edt_cal.formsemestre_get_ics_url(sem) if ics_url: menu.append({"title": "Emploi du temps (ics)", "url": ics_url}) + # Liens globaux (config. générale) + params = build_context_dict(formsemestre_id) + for link in ScoDocSiteConfig.get_perso_links(): + if link.title: + menu.append({"title": link.title, "url": link.get_url(params=params)}) + + # Liens propres à ce semestre menu += formsemestre_custommenu_get(formsemestre_id) menu.append( { @@ -79,14 +111,25 @@ def formsemestre_custommenu_html(formsemestre_id): def formsemestre_custommenu_edit(formsemestre_id): """Dialog to edit the custom menu""" - sem = sco_formsemestre.get_formsemestre(formsemestre_id) - dest_url = ( - scu.NotesURL() + "/formsemestre_status?formsemestre_id=%s" % formsemestre_id + formsemestre: FormSemestre = FormSemestre.query.get_or_404(formsemestre_id) + dest_url = url_for( + "notes.formsemestre_status", + scodoc_dept=g.scodoc_dept, + formsemestre_id=formsemestre_id, ) H = [ html_sco_header.html_sem_header("Modification du menu du semestre "), - """

Ce menu, spécifique à chaque semestre, peut être utilisé pour placer des liens vers vos applications préférées.

-

Procédez en plusieurs fois si vous voulez ajouter plusieurs items.

""", + """
+

Ce menu, spécifique à chaque semestre, peut être utilisé pour + placer des liens vers vos applications préférées. +

+

Les premiers liens du menus sont définis au niveau global (pour tous les + départements) et peuvent être modifiés par l'administrateur via la page + de configuration principale. +

+

Procédez en plusieurs fois si vous voulez ajouter plusieurs items. +

+ """, ] descr = [ ("formsemestre_id", {"input_type": "hidden"}), diff --git a/app/scodoc/sco_formsemestre_inscriptions.py b/app/scodoc/sco_formsemestre_inscriptions.py index 82744b8f..24943558 100644 --- a/app/scodoc/sco_formsemestre_inscriptions.py +++ b/app/scodoc/sco_formsemestre_inscriptions.py @@ -314,7 +314,7 @@ def do_formsemestre_inscription_with_modules( formsemestre_id=formsemestre_id, ) # Mise à jour des inscriptions aux parcours: - formsemestre.update_inscriptions_parcours_from_groups() + formsemestre.update_inscriptions_parcours_from_groups(etudid=etudid) def formsemestre_inscription_with_modules_etud( diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py old mode 100644 new mode 100755 index 4e4be867..e37ba39d --- a/app/scodoc/sco_formsemestre_status.py +++ b/app/scodoc/sco_formsemestre_status.py @@ -219,13 +219,14 @@ def formsemestre_status_menubar(formsemestre: FormSemestre) -> str: "enabled": True, "helpmsg": "", }, - { - "title": "Vérifier absences aux évaluations", - "endpoint": "notes.formsemestre_check_absences_html", - "args": {"formsemestre_id": formsemestre_id}, - "enabled": True, - "helpmsg": "", - }, + # TODO: Mettre à jour avec module Assiduités + # { + # "title": "Vérifier absences aux évaluations", + # "endpoint": "notes.formsemestre_check_absences_html", + # "args": {"formsemestre_id": formsemestre_id}, + # "enabled": True, + # "helpmsg": "", + # }, { "title": "Lister tous les enseignants", "endpoint": "notes.formsemestre_enseignants_list", @@ -837,40 +838,29 @@ def _make_listes_sem(formsemestre: FormSemestre, with_absences=True): weekday = datetime.datetime.today().weekday() try: if with_absences: - first_monday = sco_abs.ddmmyyyy( - formsemestre.date_debut.strftime("%d/%m/%Y") - ).prev_monday() form_abs_tmpl = f""" - absences - - -
- - - - - - - saisie par semaine -
+ + + """ else: - form_abs_tmpl = "" + form_abs_tmpl = f""" + + + + """ except ScoInvalidDateError: # dates incorrectes dans semestres ? form_abs_tmpl = "" # @@ -917,8 +907,7 @@ def _make_listes_sem(formsemestre: FormSemestre, with_absences=True): """ ) - if with_absences: - H.append(form_abs_tmpl % group) + H.append(form_abs_tmpl % group) H.append("") H.append("") @@ -935,12 +924,11 @@ def _make_listes_sem(formsemestre: FormSemestre, with_absences=True): H.append("

") if sco_groups.sco_permissions_check.can_change_groups(formsemestre.id): H.append( - f"""

Ajouter une partition

""" ) diff --git a/app/scodoc/sco_formsemestre_validation.py b/app/scodoc/sco_formsemestre_validation.py index e7bfecdd..8743a046 100644 --- a/app/scodoc/sco_formsemestre_validation.py +++ b/app/scodoc/sco_formsemestre_validation.py @@ -54,7 +54,7 @@ from app.scodoc.codes_cursus import * from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message from app.scodoc import html_sco_header -from app.scodoc import sco_abs +from app.scodoc import sco_assiduites from app.scodoc import codes_cursus from app.scodoc import sco_cache from app.scodoc import sco_edit_ue @@ -704,7 +704,7 @@ def formsemestre_recap_parcours_table( f"""{scu.fmt_note(nt.get_etud_moy_gen(etudid))}""" ) # Absences (nb d'abs non just. dans ce semestre) - nbabs, nbabsjust = sco_abs.get_abs_count(etudid, sem) + nbabs, nbabsjust = sco_assiduites.get_assiduites_count(etudid, sem) H.append(f"""{nbabs - nbabsjust}""") # UEs diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py index c5f68fe0..ecdf9b9d 100644 --- a/app/scodoc/sco_groups.py +++ b/app/scodoc/sco_groups.py @@ -684,7 +684,7 @@ def change_etud_group_in_partition(etudid: int, group: GroupDescr) -> bool: # - Update parcours if group.partition.partition_name == scu.PARTITION_PARCOURS: - formsemestre.update_inscriptions_parcours_from_groups() + formsemestre.update_inscriptions_parcours_from_groups(etudid=etudid) # - invalidate cache sco_cache.invalidate_formsemestre( diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py index bfb75902..6b534f0e 100644 --- a/app/scodoc/sco_groups_view.py +++ b/app/scodoc/sco_groups_view.py @@ -33,7 +33,6 @@ import collections import datetime -import operator import urllib from urllib.parse import parse_qs import time @@ -42,6 +41,8 @@ import time from flask import url_for, g, request from flask_login import current_user +from app import db +from app.models import FormSemestre import app.scodoc.sco_utils as scu from app.scodoc import html_sco_header from app.scodoc import sco_abs @@ -65,6 +66,7 @@ JAVASCRIPTS = html_sco_header.BOOTSTRAP_MULTISELECT_JS + [ CSSSTYLES = html_sco_header.BOOTSTRAP_MULTISELECT_CSS + # view: def groups_view( group_ids=(), @@ -285,7 +287,7 @@ if (group_id) { return "\n".join(H) -class DisplayedGroupsInfos(object): +class DisplayedGroupsInfos: """Container with attributes describing groups to display in the page .groups_query_args : 'group_ids=xxx&group_ids=yyy' .base_url : url de la requete, avec les groupes, sans les autres paramètres @@ -346,7 +348,7 @@ class DisplayedGroupsInfos(object): self.tous_les_etuds_du_sem = ( False # affiche tous les etuds du semestre ? (si un seul semestre) ) - self.sems = collections.OrderedDict() # formsemestre_id : sem + self.sems = {} # formsemestre_id : sem self.formsemestre = None self.formsemestre_id = formsemestre_id self.nbdem = 0 # nombre d'étudiants démissionnaires en tout @@ -422,6 +424,13 @@ class DisplayedGroupsInfos(object): H.append(f'') return "\n".join(H) + def get_formsemestre(self) -> FormSemestre: + return ( + db.session.get(FormSemestre, self.formsemestre_id) + if self.formsemestre_id + else None + ) + # Ancien ZScolar.group_list renommé ici en group_table def groups_table( diff --git a/app/scodoc/sco_logos.py b/app/scodoc/sco_logos.py index 21a84bd0..04be70be 100644 --- a/app/scodoc/sco_logos.py +++ b/app/scodoc/sco_logos.py @@ -33,7 +33,6 @@ avec `ext` membre de LOGOS_IMAGES_ALLOWED_TYPES (= jpg, png) SCODOC_LOGOS_DIR /opt/scodoc-data/config/logos """ import glob -import imghdr import os import re import shutil @@ -41,6 +40,7 @@ from pathlib import Path from flask import current_app, url_for from PIL import Image as PILImage +import puremagic from werkzeug.utils import secure_filename from app import log @@ -51,99 +51,6 @@ from app.scodoc.sco_exceptions import ScoValueError GLOBAL = "_" # category for server level logos -def find_logo(logoname, dept_id=None, strict=False, prefix=scu.LOGO_FILE_PREFIX): - """ - "Recherche un logo 'name' existant. - Deux strategies: - si strict: - reherche uniquement dans le département puis si non trouvé au niveau global - sinon - On recherche en local au dept d'abord puis si pas trouvé recherche globale - quelque soit la stratégie, retourne None si pas trouvé - :param logoname: le nom recherche - :param dept_id: l'id du département dans lequel se fait la recherche (None si global) - :param strict: stratégie de recherche (strict = False => dept ou global) - :param prefix: le prefix utilisé (parmi scu.LOGO_FILE_PREFIX / scu.BACKGROUND_FILE_PREFIX) - :return: un objet Logo désignant le fichier image trouvé (ou None) - """ - logo = Logo(logoname, dept_id, prefix).select() - if logo is None and not strict: - logo = Logo(logoname=logoname, dept_id=None, prefix=prefix).select() - return logo - - -def delete_logo(name, dept_id=None): - """Delete all files matching logo (dept_id, name) (including all allowed extensions) - Args: - name: The name of the logo - dept_id: the dept_id (if local). Use None to destroy globals logos - """ - logo = find_logo(logoname=name, dept_id=dept_id) - while logo is not None: - os.unlink(logo.select().filepath) - logo = find_logo(logoname=name, dept_id=dept_id) - - -def write_logo(stream, name, dept_id=None): - """Crée le fichier logo sur le serveur. - Le suffixe du fichier (parmi LOGO_IMAGES_ALLOWED_TYPES) est déduit du contenu du stream""" - Logo(logoname=name, dept_id=dept_id).create(stream) - - -def rename_logo(old_name, new_name, dept_id): - logo = find_logo(old_name, dept_id, True) - logo.rename(new_name) - - -def list_logos(): - """Crée l'inventaire de tous les logos existants. - L'inventaire se présente comme un dictionnaire de dictionnaire de Logo: - [None][name] pour les logos globaux - [dept_id][name] pour les logos propres à un département (attention id numérique du dept) - Les départements sans logos sont absents du résultat - """ - inventory = {None: _list_dept_logos()} # logos globaux (header / footer) - for dept in Departement.query.filter_by(visible=True).all(): - logos_dept = _list_dept_logos(dept_id=dept.id) - if logos_dept: - inventory[dept.id] = _list_dept_logos(dept.id) - return inventory - - -def _list_dept_logos(dept_id=None, prefix=scu.LOGO_FILE_PREFIX): - """Inventorie toutes les images existantes pour un niveau (GLOBAL ou un département). - retourne un dictionnaire de Logo [logoname] -> Logo - les noms des fichiers concernés doivent être de la forme: /. - : répertoire de recherche (déduit du dept_id) - : le prefix (LOGO_FILE_PREFIX pour les logos) - : un des suffixes autorisés - :param dept_id: l'id du departement concerné (si None -> global) - :param prefix: le préfixe utilisé - :return: le résultat de la recherche ou None si aucune image trouvée - """ - allowed_ext = "|".join(scu.LOGOS_IMAGES_ALLOWED_TYPES) - # parse filename 'logo_. . be carefull: logoname may include '.' - filename_parser = re.compile(f"{prefix}(([^.]*.)+)({allowed_ext})") - logos = {} - path_dir = Path(scu.SCODOC_LOGOS_DIR) - if dept_id: - path_dir = Path( - os.path.sep.join( - [scu.SCODOC_LOGOS_DIR, scu.LOGOS_DIR_PREFIX + str(dept_id)] - ) - ) - if path_dir.exists(): - for entry in path_dir.iterdir(): - if os.access(path_dir.joinpath(entry).absolute(), os.R_OK): - result = filename_parser.match(entry.name) - if result: - logoname = result.group(1)[ - :-1 - ] # retreive logoname from filename (less final dot) - logos[logoname] = Logo(logoname=logoname, dept_id=dept_id).select() - return logos if len(logos.keys()) > 0 else None - - class Logo: """Responsable des opérations (select, create), du calcul des chemins et url ainsi que de la récupération des informations sur un logo. @@ -212,7 +119,7 @@ class Logo: def create(self, stream): img_type = guess_image_type(stream) if img_type not in scu.LOGOS_IMAGES_ALLOWED_TYPES: - raise ScoValueError("type d'image invalide") + raise ScoValueError(f"type d'image invalide ({img_type})") self._set_format(img_type) self._ensure_directory_exists() filename = self.basepath + "." + self.suffix @@ -310,14 +217,118 @@ class Logo: ) old_path.rename(new_path) + def html(self) -> str: + "élément HTML img affichant ce logo" + return f"""""" + + +def find_logo( + logoname: str, + dept_id: int | None = None, + strict: bool = False, + prefix: str = scu.LOGO_FILE_PREFIX, +) -> Logo | None: + """ + "Recherche un logo 'name' existant. + Deux strategies: + si strict: + recherche uniquement dans le département puis si non trouvé au niveau global + sinon + On recherche en local au dept d'abord puis si pas trouvé recherche globale + quelque soit la stratégie, retourne None si pas trouvé + :param logoname: le nom recherche + :param dept_id: l'id du département dans lequel se fait la recherche (None si global) + :param strict: stratégie de recherche (strict = False => dept ou global) + :param prefix: le prefix utilisé (parmi scu.LOGO_FILE_PREFIX / scu.BACKGROUND_FILE_PREFIX) + :return: un objet Logo désignant le fichier image trouvé (ou None) + """ + logo = Logo(logoname, dept_id, prefix).select() + if logo is None and not strict: + logo = Logo(logoname=logoname, dept_id=None, prefix=prefix).select() + return logo + + +def delete_logo(name, dept_id=None): + """Delete all files matching logo (dept_id, name) (including all allowed extensions) + Args: + name: The name of the logo + dept_id: the dept_id (if local). Use None to destroy globals logos + """ + logo = find_logo(logoname=name, dept_id=dept_id) + while logo is not None: + os.unlink(logo.select().filepath) + logo = find_logo(logoname=name, dept_id=dept_id) + + +def write_logo(stream, name, dept_id=None): + """Crée le fichier logo sur le serveur. + Le suffixe du fichier (parmi LOGO_IMAGES_ALLOWED_TYPES) est déduit du contenu du stream + """ + Logo(logoname=name, dept_id=dept_id).create(stream) + + +def rename_logo(old_name, new_name, dept_id): + logo = find_logo(old_name, dept_id, True) + logo.rename(new_name) + + +def list_logos(): + """Crée l'inventaire de tous les logos existants. + L'inventaire se présente comme un dictionnaire de dictionnaire de Logo: + [None][name] pour les logos globaux + [dept_id][name] pour les logos propres à un département (attention id numérique du dept) + Les départements sans logos sont absents du résultat + """ + inventory = {None: _list_dept_logos()} # logos globaux (header / footer) + for dept in Departement.query.filter_by(visible=True).all(): + logos_dept = _list_dept_logos(dept_id=dept.id) + if logos_dept: + inventory[dept.id] = _list_dept_logos(dept.id) + return inventory + + +def _list_dept_logos(dept_id=None, prefix=scu.LOGO_FILE_PREFIX): + """Inventorie toutes les images existantes pour un niveau (GLOBAL ou un département). + retourne un dictionnaire de Logo [logoname] -> Logo + les noms des fichiers concernés doivent être de la forme: /. + : répertoire de recherche (déduit du dept_id) + : le prefix (LOGO_FILE_PREFIX pour les logos) + : un des suffixes autorisés + :param dept_id: l'id du departement concerné (si None -> global) + :param prefix: le préfixe utilisé + :return: le résultat de la recherche ou None si aucune image trouvée + """ + allowed_ext = "|".join(scu.LOGOS_IMAGES_ALLOWED_TYPES) + # parse filename 'logo_. . be carefull: logoname may include '.' + filename_parser = re.compile(f"{prefix}(([^.]*.)+)({allowed_ext})") + logos = {} + path_dir = Path(scu.SCODOC_LOGOS_DIR) + if dept_id: + path_dir = Path( + os.path.sep.join( + [scu.SCODOC_LOGOS_DIR, scu.LOGOS_DIR_PREFIX + str(dept_id)] + ) + ) + if path_dir.exists(): + for entry in path_dir.iterdir(): + if os.access(path_dir.joinpath(entry).absolute(), os.R_OK): + result = filename_parser.match(entry.name) + if result: + logoname = result.group(1)[ + :-1 + ] # retreive logoname from filename (less final dot) + logos[logoname] = Logo(logoname=logoname, dept_id=dept_id).select() + return logos if len(logos.keys()) > 0 else None + def guess_image_type(stream) -> str: "guess image type from header in stream" - header = stream.read(512) - stream.seek(0) - fmt = imghdr.what(None, header) - if not fmt: + ext = puremagic.from_stream(stream) + if not ext or not ext.startswith("."): return None + fmt = ext[1:] # remove leading . + if fmt == "jfif": + fmt = "jpg" return fmt if fmt != "jpeg" else "jpg" diff --git a/app/scodoc/sco_moduleimpl_status.py b/app/scodoc/sco_moduleimpl_status.py index 55813afc..84e5766a 100644 --- a/app/scodoc/sco_moduleimpl_status.py +++ b/app/scodoc/sco_moduleimpl_status.py @@ -138,10 +138,13 @@ def moduleimpl_evaluation_menu(evaluation_id, nbnotes=0) -> str: }, { "title": "Absences ce jour", - "endpoint": "absences.EtatAbsencesDate", + "endpoint": "assiduites.get_etat_abs_date", "args": { - "date": E["jour"], "group_ids": group_id, + "desc": E["description"], + "jour": E["jour"], + "heure_debut": E["heure_debut"], + "heure_fin": E["heure_fin"], }, "enabled": E["jour"], }, @@ -191,6 +194,7 @@ def moduleimpl_status(moduleimpl_id=None, partition_id=None): if not isinstance(moduleimpl_id, int): raise ScoInvalidIdType("moduleimpl_id must be an integer !") modimpl: ModuleImpl = ModuleImpl.query.get_or_404(moduleimpl_id) + g.current_moduleimpl_id = modimpl.id module: Module = modimpl.module formsemestre_id = modimpl.formsemestre_id formsemestre: FormSemestre = modimpl.formsemestre @@ -560,7 +564,10 @@ def _ligne_evaluation( if modimpl.module.ue.type != UE_SPORT: # Avertissement si coefs x poids nuls if coef < scu.NOTES_PRECISION: - H.append("""coef. nul !""") + if modimpl.module.module_type == scu.ModuleType.MALUS: + H.append("""malus""") + else: + H.append("""coef. nul !""") elif is_apc: # visualisation des poids (Hinton map) H.append(_evaluation_poids_html(evaluation, max_poids)) diff --git a/app/scodoc/sco_permissions.py b/app/scodoc/sco_permissions.py index 8c4edd88..11497367 100644 --- a/app/scodoc/sco_permissions.py +++ b/app/scodoc/sco_permissions.py @@ -57,6 +57,8 @@ _SCO_PERMISSIONS = ( (1 << 29, "ScoUsersChangeCASId", "Paramétrer l'id CAS"), # (1 << 40, "ScoEtudChangePhoto", "Modifier la photo d'un étudiant"), + # Permissions du module Assiduité) + (1 << 50, "ScoJustifView", "Visualisation des fichiers justificatifs"), # Attention: les permissions sont codées sur 64 bits. ) @@ -71,7 +73,7 @@ class Permission: @staticmethod def init_permissions(): - for (perm, symbol, description) in _SCO_PERMISSIONS: + for perm, symbol, description in _SCO_PERMISSIONS: setattr(Permission, symbol, perm) Permission.description[symbol] = description Permission.permission_by_name[symbol] = perm diff --git a/app/scodoc/sco_photos.py b/app/scodoc/sco_photos.py old mode 100644 new mode 100755 index b1e73dcb..467d3578 --- a/app/scodoc/sco_photos.py +++ b/app/scodoc/sco_photos.py @@ -148,11 +148,11 @@ def get_photo_image(etudid=None, size="small"): filename = photo_pathname(etud.photo_filename, size=size) if not filename: filename = UNKNOWN_IMAGE_PATH - r = _http_jpeg_file(filename) + r = build_image_response(filename) return r -def _http_jpeg_file(filename): +def build_image_response(filename): """returns an image as a Flask response""" st = os.stat(filename) last_modified = st.st_mtime # float timestamp @@ -338,7 +338,7 @@ def scale_height(img, W=None, H=REDUCED_HEIGHT): if W is None: # keep aspect W = int((img.size[0] * H) / img.size[1]) - img.thumbnail((W, H), PILImage.ANTIALIAS) + img.thumbnail((W, H), PILImage.LANCZOS) return img diff --git a/app/scodoc/sco_poursuite_dut.py b/app/scodoc/sco_poursuite_dut.py index 605cbc07..77c631e4 100644 --- a/app/scodoc/sco_poursuite_dut.py +++ b/app/scodoc/sco_poursuite_dut.py @@ -37,7 +37,7 @@ from app.comp import res_sem from app.comp.res_compat import NotesTableCompat from app.models import FormSemestre import app.scodoc.sco_utils as scu -from app.scodoc import sco_abs +from app.scodoc import sco_assiduites from app.scodoc import sco_cache from app.scodoc import sco_formsemestre from app.scodoc import sco_groups @@ -107,7 +107,7 @@ def etud_get_poursuite_info(sem, etud): rangs.append(["rang_" + codeModule, rangModule]) # Absences - nbabs, nbabsjust = sco_abs.get_abs_count(etudid, nt.sem) + nbabs, nbabsjust = sco_assiduites.get_assiduites_count(etudid, nt.sem) if ( dec and not sem_descr # not sem_descr pour ne prendre que le semestre validé le plus récent diff --git a/app/scodoc/sco_preferences.py b/app/scodoc/sco_preferences.py index fd49ff67..e286ea12 100644 --- a/app/scodoc/sco_preferences.py +++ b/app/scodoc/sco_preferences.py @@ -204,6 +204,7 @@ PREF_CATEGORIES = ( ("misc", {"title": "Divers"}), ("apc", {"title": "BUT et Approches par Compétences"}), ("abs", {"title": "Suivi des absences", "related": ("bul",)}), + ("assi", {"title": "Gestion de l'assiduité"}), ("portal", {"title": "Liaison avec portail (Apogée, etc)"}), ("apogee", {"title": "Exports Apogée"}), ( @@ -598,6 +599,85 @@ class BasePreferences(object): "category": "abs", }, ), + # Assiduités + ( + "forcer_module", + { + "initvalue": 0, + "title": "Forcer la déclaration du module.", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "assi", + }, + ), + ( + "forcer_present", + { + "initvalue": 0, + "title": "Forcer l'appel des présents", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "assi", + }, + ), + ( + "periode_defaut", + { + "initvalue": 2.0, + "size": 10, + "title": "Durée par défaut d'un créneau", + "type": "float", + "category": "assi", + "only_global": True, + }, + ), + ( + "assi_etat_defaut", + { + "initvalue": "aucun", + "input_type": "menu", + "labels": ["aucun", "present", "retard", "absent"], + "allowed_values": ["aucun", "present", "retard", "absent"], + "title": "Définir l'état par défaut", + "category": "assi", + }, + ), + ( + "non_travail", + { + "initvalue": "sam, dim", + "title": "Jours non travaillés", + "size": 40, + "category": "assi", + "only_global": True, + "explanation": "Liste des jours (lun,mar,mer,jeu,ven,sam,dim)", + }, + ), + ( + "assi_metrique", + { + "initvalue": "1/2 J.", + "input_type": "menu", + "labels": ["1/2 J.", "J.", "H."], + "allowed_values": ["1/2 J.", "J.", "H."], + "title": "Métrique de l'assiduité", + "explanation": "Unité utilisée dans la fiche étudiante, le bilan, et dans les calculs (J. = journée, H. = heure)", + "category": "assi", + "only_global": True, + }, + ), + ( + "assi_seuil", + { + "initvalue": 3.0, + "size": 10, + "title": "Seuil d'alerte des absences", + "type": "float", + "explanation": "Nombres d'absences limite avant alerte dans le bilan (utilisation de l'unité métrique ↑ )", + "category": "assi", + "only_global": True, + }, + ), # portal ( "portal_url", @@ -1700,7 +1780,7 @@ class BasePreferences(object): ( "feuille_releve_abs_taille", { - "initvalue": "A3", + "initvalue": "A4", "input_type": "menu", "labels": ["A3", "A4"], "allowed_values": ["A3", "A4"], diff --git a/app/scodoc/sco_prepajury.py b/app/scodoc/sco_prepajury.py index fc369efc..ab54df69 100644 --- a/app/scodoc/sco_prepajury.py +++ b/app/scodoc/sco_prepajury.py @@ -39,7 +39,7 @@ from flask_login import current_user from app.comp import res_sem from app.comp.res_compat import NotesTableCompat from app.models import FormSemestre, Identite, ScolarAutorisationInscription -from app.scodoc import sco_abs +from app.scodoc import sco_assiduites from app.scodoc import codes_cursus from app.scodoc import sco_groups from app.scodoc import sco_etud @@ -139,7 +139,7 @@ def feuille_preparation_jury(formsemestre_id): main_partition_id, "" ) # absences: - e_nbabs, e_nbabsjust = sco_abs.get_abs_count(etud.id, sem) + e_nbabs, e_nbabsjust = sco_assiduites.get_assiduites_count(etud.id, sem) nbabs[etud.id] = e_nbabs nbabsjust[etud.id] = e_nbabs - e_nbabsjust diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py index d42774df..6208c16e 100644 --- a/app/scodoc/sco_utils.py +++ b/app/scodoc/sco_utils.py @@ -32,13 +32,14 @@ import base64 import bisect import collections import datetime -from enum import IntEnum +from enum import IntEnum, Enum import io import json from hashlib import md5 import numbers import os import re +from shutil import get_terminal_size import _thread import time import unicodedata @@ -50,6 +51,10 @@ from PIL import Image as PILImage import pydot import requests +from pytz import timezone + +import dateutil.parser as dtparser + import flask from flask import g, request, Response from flask import flash, url_for, make_response @@ -91,6 +96,172 @@ ETATS_INSCRIPTION = { } +def print_progress_bar( + iteration, + total, + prefix="", + suffix="", + finish_msg="", + decimals=1, + length=100, + fill="█", + autosize=False, +): + """ + Affiche une progress bar à un point donné (mettre dans une boucle pour rendre dynamique) + @params: + iteration - Required : index du point donné (Int) + total - Required : nombre total avant complétion (eg: len(List)) + prefix - Optional : Préfix -> écrit à gauche de la barre (Str) + suffix - Optional : Suffix -> écrit à droite de la barre (Str) + decimals - Optional : nombres de chiffres après la virgule (Int) + length - Optional : taille de la barre en nombre de caractères (Int) + fill - Optional : charactère de remplissange de la barre (Str) + autosize - Optional : Choisir automatiquement la taille de la barre en fonction du terminal (Bool) + """ + percent = ("{0:." + str(decimals) + "f}").format(100 * (iteration / float(total))) + color = TerminalColor.RED + if 50 >= float(percent) > 25: + color = TerminalColor.MAGENTA + if 75 >= float(percent) > 50: + color = TerminalColor.BLUE + if 90 >= float(percent) > 75: + color = TerminalColor.CYAN + if 100 >= float(percent) > 90: + color = TerminalColor.GREEN + styling = f"{prefix} |{fill}| {percent}% {suffix}" + if autosize: + cols, _ = get_terminal_size(fallback=(length, 1)) + length = cols - len(styling) + filled_length = int(length * iteration // total) + pg_bar = fill * filled_length + "-" * (length - filled_length) + print(f"\r{color}{styling.replace(fill, pg_bar)}{TerminalColor.RESET}", end="\r") + # Affiche une nouvelle ligne vide + if iteration == total: + print(f"\n{finish_msg}") + + +class TerminalColor: + """Ensemble de couleur pour terminaux""" + + BLUE = "\033[94m" + CYAN = "\033[96m" + GREEN = "\033[92m" + MAGENTA = "\033[95m" + RED = "\033[91m" + RESET = "\033[0m" + + +class BiDirectionalEnum(Enum): + """Permet la recherche inverse d'un enum + Condition : les clés et les valeurs doivent être uniques + les clés doivent être en MAJUSCULES + """ + + @classmethod + def contains(cls, attr: str): + """Vérifie sur un attribut existe dans l'enum""" + return attr.upper() in cls._member_names_ + + @classmethod + def get(cls, attr: str, default: any = None): + """Récupère une valeur à partir de son attribut""" + val = None + try: + val = cls[attr.upper()] + except (KeyError, AttributeError): + val = default + return val + + @classmethod + def inverse(cls): + """Retourne un dictionnaire représentant la map inverse de l'Enum""" + return cls._value2member_map_ + + +class EtatAssiduite(int, BiDirectionalEnum): + """Code des états d'assiduité""" + + # Stockés en BD ne pas modifier + + PRESENT = 0 + RETARD = 1 + ABSENT = 2 + + +class EtatJustificatif(int, BiDirectionalEnum): + """Code des états des justificatifs""" + + # Stockés en BD ne pas modifier + + VALIDE = 0 + NON_VALIDE = 1 + ATTENTE = 2 + MODIFIE = 3 + + +def is_iso_formated(date: str, convert=False) -> bool or datetime.datetime or None: + """ + Vérifie si une date est au format iso + + Retourne un booléen Vrai (ou un objet Datetime si convert = True) + si l'objet est au format iso + + Retourne Faux si l'objet n'est pas au format et convert = False + + Retourne None sinon + """ + + try: + date: datetime.datetime = dtparser.isoparse(date) + return date if convert else True + except (dtparser.ParserError, ValueError, TypeError): + return None if convert else False + + +def localize_datetime(date: datetime.datetime or str) -> datetime.datetime: + """Ajoute un timecode UTC à la date donnée.""" + if isinstance(date, str): + date = is_iso_formated(date, convert=True) + + new_date: datetime.datetime = date + if new_date.tzinfo is None: + try: + new_date = timezone("Europe/Paris").localize(date) + except OverflowError: + new_date = timezone("UTC").localize(date) + return new_date + + +def is_period_overlapping( + periode: tuple[datetime.datetime, datetime.datetime], + interval: tuple[datetime.datetime, datetime.datetime], + bornes: bool = True, +) -> bool: + """ + Vérifie si la période et l'interval s'intersectent + si strict == True : les extrémitées ne comptes pas + Retourne Vrai si c'est le cas, faux sinon + """ + p_deb, p_fin = periode + i_deb, i_fin = interval + + if bornes: + return p_deb <= i_fin and p_fin >= i_deb + return p_deb < i_fin and p_fin > i_deb + + +def translate_assiduites_metric(hr_metric) -> str: + if hr_metric == "1/2 J.": + return "demi" + if hr_metric == "J.": + return "journee" + if hr_metric == "N.": + return "compte" + if hr_metric == "H.": + return "heure" + + # Types de modules class ModuleType(IntEnum): """Code des types de module.""" @@ -448,6 +619,13 @@ def AbsencesURL(): ] +def AssiduitesURL(): + """URL of Assiduités""" + return url_for("assiduites.index_html", scodoc_dept=g.scodoc_dept)[ + : -len("/index_html") + ] + + def UsersURL(): """URL of Users e.g. https://scodoc.xxx.fr/ScoDoc/DEPT/Scolarite/Users diff --git a/app/static/css/assiduites.css b/app/static/css/assiduites.css new file mode 100644 index 00000000..10031d7d --- /dev/null +++ b/app/static/css/assiduites.css @@ -0,0 +1,583 @@ +* { + box-sizing: border-box; +} + +.selectors>* { + margin: 10px 0; +} + +.selectors:disabled { + opacity: 0.5; +} + +#validate_selectors { + margin: 15px 0; +} + +.no-display { + display: none !important; +} + +/* === Gestion de la timeline === */ + +#tl_date { + visibility: hidden; + width: 0px; + height: 0px; + position: absolute; + left: 15%; +} + + +.infos { + position: relative; + width: fit-content; + display: flex; + justify-content: space-evenly; + align-content: center; +} + +#datestr { + cursor: pointer; + background-color: white; + border: 1px #444 solid; + border-radius: 5px; + padding: 5px; + min-width: 100px; + display: inline-block; + min-height: 20px; +} + +#tl_slider { + width: 90%; + cursor: grab; + + /* visibility: hidden; */ +} + +#datestr, +#time { + width: fit-content; +} + +.ui-slider-handle.tl_handle { + background: none; + width: 25px; + height: 25px; + visibility: visible; + background-position: top; + background-size: cover; + border: none; + top: -180%; + cursor: grab; + +} + +#l_handle { + background-image: url(../icons/l_handle.svg); +} + +#r_handle { + background-image: url(../icons/r_handle.svg); +} + +.ui-slider-range.ui-widget-header.ui-corner-all { + background-color: #F9C768; + background-image: none; + opacity: 0.50; + visibility: visible; +} + + +/* === Gestion des etuds row === */ + + +.etud_row { + display: grid; + grid-template-columns: 2% 20% 55% auto; + gap: 16px; + background-color: white; + border-radius: 15px; + padding: 4px 16px; + margin: 0.5% 0; + box-shadow: -1px 12px 5px -8px rgba(68, 68, 68, 0.61); + -webkit-box-shadow: -1px 12px 5px -8px rgba(68, 68, 68, 0.61); + -moz-box-shadow: -1px 12px 5px -8px rgba(68, 68, 68, 0.61); + max-width: 800px; +} + +.etud_row * { + display: flex; + justify-content: center; + align-items: center; + + height: 50px; + +} + +.etud_row.def, +.etud_row.dem { + background-color: #c8c8c8; +} + +/* --- Index --- */ +.etud_row .index_field { + grid-column: 1; +} + +/* --- Nom étud --- */ +.etud_row .name_field { + grid-column: 2; + height: 100%; + justify-content: start; +} + +.etud_row .name_field .name_set { + flex-direction: column; + align-items: flex-start; + margin: 0 5%; +} + +.etud_row.def .nom::after, +.tr.def .td.sticky span::after { + display: block; + content: " (Déf.)"; + color: #d61616; + margin-left: 2px; +} + +.etud_row.dem .nom::after, +.tr.dem .td.sticky span::after { + display: block; + content: " (Dém.)"; + color: #d61616; + margin-left: 2px; +} + +.etud_row .name_field .name_set * { + padding: 0; + margin: 0; +} + +.etud_row .name_field .name_set h4 { + font-size: small; + font-weight: 600; +} + +.etud_row .name_field .name_set h5 { + font-size: x-small; +} + +.etud_row .pdp { + border-radius: 15px; +} + +/* --- Barre assiduités --- */ +.etud_row .assiduites_bar { + display: grid; + grid-template-columns: 7px 1fr; + gap: 13px; + grid-column: 3; + position: relative; +} + + + +.etud_row .assiduites_bar .filler { + height: 5px; + width: 90%; + + background-color: white; + border: 1px solid #444; +} + +.etud_row .assiduites_bar #prevDateAssi { + height: 7px; + width: 7px; + + background-color: white; + border: 1px solid #444; + margin: 0px 8px; +} + +.etud_row .assiduites_bar #prevDateAssi.single { + height: 9px; + width: 9px; +} + +.etud_row.conflit { + background-color: #ff0000c2; +} + +.etud_row .assiduites_bar .absent, +.demo.absent { + background-color: #F1A69C !important; +} + +.etud_row .assiduites_bar .present, +.demo.present { + background-color: #9CF1AF !important; +} + +.etud_row .assiduites_bar .retard, +.demo.retard { + background-color: #F1D99C !important; +} + +.etud_row .assiduites_bar .justified, +.demo.justified { + background-image: repeating-linear-gradient(135deg, transparent, transparent 4px, #7059FF 4px, #7059FF 8px); +} + +.etud_row .assiduites_bar .invalid_justified, +.demo.invalid_justified { + background-image: repeating-linear-gradient(225deg, transparent, transparent 4px, #d61616 4px, #d61616 8px); +} + + +/* --- Boutons assiduités --- */ +.etud_row .btns_field { + grid-column: 4; +} + +.btns_field:disabled { + opacity: 0.7; +} + +.etud_row .btns_field * { + margin: 0 5%; + cursor: pointer; + width: 35px; + height: 35px; +} + +.rbtn { + -webkit-appearance: none; + appearance: none; + + cursor: pointer; + +} + +.rbtn::before { + content: ""; + display: inline-block; + width: 35px; + height: 35px; + background-position: center; + background-size: cover; +} + +.rbtn.present::before { + background-image: url(../icons/present.svg); +} + +.rbtn.absent::before { + background-image: url(../icons/absent.svg); +} + +.rbtn.aucun::before { + background-image: url(../icons/aucun.svg); +} + +.rbtn.retard::before { + background-image: url(../icons/retard.svg); +} + +.rbtn:checked:before { + outline: 3px solid #7059FF; + border-radius: 5px; +} + +.rbtn:focus { + outline: none !important; +} + +/*<== Modal conflit ==>*/ +.modal { + display: block; + position: fixed; + z-index: 500; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: auto; + background-color: rgba(0, 0, 0, 0.4); +} + +.modal-content { + background-color: #fefefe; + margin: 5% auto; + padding: 20px; + border: 1px solid #888; + width: 80%; + height: 320px; + position: relative; + border-radius: 10px; + +} + + +.close { + color: #111; + position: absolute; + right: 5px; + top: 0px; + font-size: 28px; + font-weight: bold; + cursor: pointer; +} + +/* Ajout de styles pour la frise chronologique */ +.modal-timeline { + display: flex; + flex-direction: column; + align-items: stretch; + margin-bottom: 20px; +} + +.time-labels, +.assiduites-container { + display: flex; + justify-content: space-between; + position: relative; +} + +.time-label { + font-size: 14px; + margin-bottom: 4px; +} + +.assiduite { + position: absolute; + top: 20px; + cursor: pointer; + border-radius: 4px; + z-index: 10; + height: 100px; + padding: 4px; +} + + +.assiduite-info { + display: flex; + flex-direction: column; + height: 100%; + justify-content: space-between; +} + +.assiduite-id, +.assiduite-period, +.assiduite-state, +.assiduite-user_id { + font-size: 12px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + text-align: center; +} + +.assiduites-container { + min-height: 20px; + height: calc(50% - 60px); + /* Augmentation de la hauteur du conteneur des assiduités */ + position: relative; + margin-bottom: 10px; +} + + +.action-buttons { + position: absolute; + text-align: center; + display: flex; + justify-content: space-evenly; + align-items: center; + height: 60px; + width: 100%; + bottom: 5%; +} + + +/* Ajout de la classe CSS pour la bordure en pointillés */ +.assiduite.selected { + border: 2px dashed black; +} + +.assiduite-special { + height: 120px; + position: absolute; + z-index: 5; + border: 2px solid #000; + background-color: rgba(36, 36, 36, 0.25); + background-image: repeating-linear-gradient(135deg, transparent, transparent 5px, rgba(81, 81, 81, 0.61) 5px, rgba(81, 81, 81, 0.61) 10px); + border-radius: 5px; +} + + +/*<== Info sur l'assiduité sélectionnée ==>*/ +.modal-assiduite-content { + background-color: #fefefe; + margin: 5% auto; + padding: 20px; + border: 1px solid #888; + width: max-content; + position: relative; + border-radius: 10px; + display: none; +} + + +.modal-assiduite-content.show { + display: block; +} + +.modal-assiduite-content .infos { + display: flex; + flex-direction: column; + justify-content: space-evenly; + align-items: flex-start; +} + + +/*<=== Mass Action ==>*/ + +.mass-selection { + display: flex; + justify-content: flex-start; + align-items: center; + width: 100%; + margin: 2% 0; +} + +.mass-selection span { + margin: 0 1%; +} + +.mass-selection .rbtn { + background-color: transparent; + cursor: pointer; +} + +/*<== Loader ==> */ + +.loader-container { + display: none; + /* Cacher le loader par défaut */ + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: rgba(0, 0, 0, 0.5); + /* Fond semi-transparent pour bloquer les clics */ + z-index: 9999; + /* Placer le loader au-dessus de tout le contenu */ +} + +.loader { + border: 6px solid #f3f3f3; + border-radius: 50%; + border-top: 6px solid #3498db; + width: 60px; + height: 60px; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + animation: spin 2s linear infinite; +} + +@keyframes spin { + 0% { + transform: translate(-50%, -50%) rotate(0deg); + } + + 100% { + transform: translate(-50%, -50%) rotate(360deg); + } +} + +.fieldsplit { + display: flex; + justify-content: flex-start; + align-items: center; + flex-direction: column; +} + +.fieldsplit legend { + margin: 0; +} + + + + +#page-assiduite-content { + display: flex; + flex-wrap: wrap; + gap: 5%; + flex-direction: column; +} + +#page-assiduite-content>* { + margin: 1.5% 0; +} + +.rouge { + color: crimson; +} + +.legende { + border: 1px dashed #333; + width: 75%; + padding: 20px; +} + +.order { + background-image: url(../icons/sort.svg); +} + +.filter { + background-image: url(../icons/filter.svg); +} + +[name='destroyFile'] { + -webkit-appearance: none; + appearance: none; + cursor: pointer; + background-image: url(../icons/trash.svg); +} + +[name='destroyFile']:checked { + background-image: url(../icons/remove_circle.svg); +} + +.icon { + display: block; + width: 24px; + height: 24px; + outline: none !important; + border: none !important; + cursor: pointer; + margin: 0 2px !important; +} + +.icon:focus { + outline: none; + border: none; +} + +#forcemodule { + border-radius: 8px; + background: crimson; + max-width: fit-content; + padding: 5px; + color: white; +} + +.demo { + width: 23px; + height: 13px; + display: inline-block; + border: solid 1px #333; +} \ No newline at end of file diff --git a/app/static/css/bulletin_court.css b/app/static/css/bulletin_court.css new file mode 100644 index 00000000..7fb7e591 --- /dev/null +++ b/app/static/css/bulletin_court.css @@ -0,0 +1,124 @@ +@media print{ + body{ + width: 21cm; + height: 29.7cm; + } +} + +div.but_bul_court { + width: 17cm; + display: grid; + grid-template-columns: 6cm 11cm; + font-size: 11pt; +} + +#infos_etudiant { + grid-column: 1; + grid-row: 1; + border-radius: 3mm; + border: 1px solid black; + background-color: white; + padding: 5mm; +} +.nom { + font-weight: bold; + font-size: 14pt; +} + + +#logo { + grid-column: 2; + grid-row: 1; + justify-self: end; +} + +#logo img { + text-align: right; + height: 3cm; +} + +div.but_bul_court table { + border-collapse: collapse; + border: 2px solid black; +} + +div.but_bul_court table th, +div.but_bul_court table td { + background-color: white; + border: 1px solid black; /* Thin black border between cells */ + padding: 2px 4px 2px 4px; /* Padding inside the cells */ +} + +table td.col_ue { + width: 18mm; +} + +#ues { + grid-row: 2; + grid-column: 1/3; + justify-self: end; + margin-top: 5mm; + margin-bottom: 5mm; +} + +#ues tr.titre_table th { + background-color: rgb(183,235,255); + padding: 2mm; +} + +tr.titres_ues td, tr.jury td { + font-weight: bold; +} + +table.resultats_modules { + width: 100%; +} + +#ressources { + grid-row: 3; + grid-column: 1/3; + margin-bottom: 5mm; + width: 100%; +} +#ressources tr.titres_ues td:first-child { + background-color: rgb(255, 192, 0); +} +#saes { + grid-row: 4; + grid-column: 1/3; + margin-bottom: 5mm; + width: 100%; +} +#saes tr.titres_ues td:first-child { + background-color: rgb(176, 255, 99); +} + +#row_situation { + grid-row: 5; + grid-column: 1/3; + display: grid; + grid-template-columns: auto auto; +} +#cursus_etud, #situation { + grid-row: 1; +} +#situation { + background-color: white; + justify-self: end; + margin-left: 1cm; + border-radius: 3mm; + border: 1px solid black; + padding: 5mm; +} + +#footer { + grid-row: 6; + grid-column: 1/3; + margin-top: 5mm; + font-size: 9pt; + font-style: italic; +} + +.but_bul_court .cursus_but { + margin-left: 0px; +} \ No newline at end of file diff --git a/app/static/css/jury_delete_manual.css b/app/static/css/jury_delete_manual.css index eda3bc63..b685384a 100644 --- a/app/static/css/jury_delete_manual.css +++ b/app/static/css/jury_delete_manual.css @@ -1,11 +1,10 @@ - div.jury_decisions_list div { font-size: 120%; font-weight: bold; } span.parcours { - color:blueviolet; + color: blueviolet; } div.ue_list_etud_validations ul.liste_validations li { diff --git a/app/static/css/partition_editor.css b/app/static/css/partition_editor.css index 777b37e4..09f042fe 100644 --- a/app/static/css/partition_editor.css +++ b/app/static/css/partition_editor.css @@ -394,6 +394,7 @@ body.editionActivated .filtres .nonEditable .move { padding: 4px 8px; margin-bottom: 16px; border-radius: 4px; + position: relative; } #zoneChoix .autoAffectation>select { @@ -415,6 +416,23 @@ body.editionActivated .filtres .nonEditable .move { margin-bottom: 4px; width: fit-content; } +#zoneChoix .autoAffectation .progress { + position: absolute; + top: 100%; + left: 0; + right: 0; + height: 4px; + background: #717171; +} + +#zoneChoix .autoAffectation .progress>div { + position: absolute; + top: 0; + left: 0; + width: calc(100% * var(--nombre) / var(--reference)); + bottom: 0; + background: #0c9; +} #zoneChoix .etudiants>div { background: #FFF; diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 5307eac4..0a64032f 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -1328,6 +1328,13 @@ tr.etuddem td { color: rgb(100, 100, 100); font-style: italic; } +table.gt_table tr.etuddem td a { + color: red; +} +table.gt_table tr.etuddem td.etudinfo:first-child::after { + color: red; + content: " (dém.)"; +} td.etudabs, td.etudabs a.discretelink, diff --git a/app/static/icons/absent.svg b/app/static/icons/absent.svg new file mode 100755 index 00000000..697635cd --- /dev/null +++ b/app/static/icons/absent.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/app/static/icons/aucun.svg b/app/static/icons/aucun.svg new file mode 100755 index 00000000..eaff2004 --- /dev/null +++ b/app/static/icons/aucun.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/app/static/icons/filter.svg b/app/static/icons/filter.svg new file mode 100644 index 00000000..8259c640 --- /dev/null +++ b/app/static/icons/filter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/static/icons/present.svg b/app/static/icons/present.svg new file mode 100755 index 00000000..e1628c83 --- /dev/null +++ b/app/static/icons/present.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/app/static/icons/remove_circle.svg b/app/static/icons/remove_circle.svg new file mode 100644 index 00000000..e0c6e0d7 --- /dev/null +++ b/app/static/icons/remove_circle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/static/icons/retard.svg b/app/static/icons/retard.svg new file mode 100755 index 00000000..b8a7f3d2 --- /dev/null +++ b/app/static/icons/retard.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/app/static/icons/sort.svg b/app/static/icons/sort.svg new file mode 100644 index 00000000..9a5aef00 --- /dev/null +++ b/app/static/icons/sort.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/static/icons/trash.svg b/app/static/icons/trash.svg new file mode 100644 index 00000000..f8aa7856 --- /dev/null +++ b/app/static/icons/trash.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/static/js/assiduites.js b/app/static/js/assiduites.js new file mode 100644 index 00000000..5fe6bba8 --- /dev/null +++ b/app/static/js/assiduites.js @@ -0,0 +1,1728 @@ +// <=== CONSTANTS and GLOBALS ===> + +const TIMEZONE = "Europe/Paris"; +let url; + +function getUrl() { + if (!url) { + url = SCO_URL.substring(0, SCO_URL.lastIndexOf("/")); + } + return url; +} + +//Les valeurs par défaut de la timeline (8h -> 18h) +let currentValues = [8.0, 10.0]; + +//Objet stockant les étudiants et les assiduités +let etuds = {}; +let assiduites = {}; +let justificatifs = {}; + +// Variable qui définit si le processus d'action de masse est lancé +let currentMassAction = false; +let currentMassActionEtat = undefined; + +/** + * Ajout d'une fonction `capitalize` sur tous les strings + * alice.capitalize() -> Alice + */ +Object.defineProperty(String.prototype, "capitalize", { + value: function () { + return this.charAt(0).toUpperCase() + this.slice(1).toLowerCase(); + }, + enumerable: false, +}); +// <<== Outils ==>> +Object.defineProperty(Array.prototype, "reversed", { + value: function () { + return [...this].map(this.pop, this); + }, + enumerable: false, +}); + +/** + * Ajout des évents sur les boutons d'assiduité + * @param {Document | HTMLFieldSetElement} parent par défaut le document, un field sinon + */ +function setupCheckBox(parent = document) { + const checkboxes = Array.from(parent.querySelectorAll(".rbtn")); + checkboxes.forEach((box) => { + box.addEventListener("click", (event) => { + if (!uniqueCheckBox(box)) { + event.preventDefault(); + } + if (!box.parentElement.classList.contains("mass")) { + assiduiteAction(box); + } + }); + }); +} + +/** + * Validation préalable puis désactivation des chammps : + * - Groupe + * - Module impl + * - Date + */ +function validateSelectors(btn) { + const action = () => { + const group_ids = getGroupIds(); + + etuds = {}; + group_ids.forEach((group_id) => { + sync_get( + getUrl() + `/api/group/${group_id}/etudiants`, + (data, status) => { + if (status === "success") { + data.forEach((etud) => { + if (!(etud.id in etuds)) { + etuds[etud.id] = etud; + } + }); + } + } + ); + }); + + // if (getModuleImplId() == null && window.forceModule) { + // const HTML = ` + //

Attention, le module doit obligatoirement être renseigné.

+ //

Cela vient de la configuration du semestre ou plus largement du département.

+ //

Si c'est une erreur, veuillez voir avec le ou les responsables de votre scodoc.

+ // `; + + // const content = document.createElement("div"); + // content.innerHTML = HTML; + + // openAlertModal("Sélection du module", content); + // return; + // } + + getAssiduitesFromEtuds(true); + + document.querySelector(".selectors").disabled = true; + generateMassAssiduites(); + generateAllEtudRow(); + btn.remove(); + onlyAbs(); + }; + + if (!verifyDateInSemester()) { + const HTML = ` +

Attention, la date sélectionnée n'est pas comprise dans le semestre.

+

Cette page permet l'affichage et la modification des assiduités uniquement pour le semestre sélectionné.

+

Vous n'aurez donc pas accès aux assiduités.

+

Appuyer sur "Valider" uniquement si vous souhaitez poursuivre sans modifier la date.

+ `; + + const content = document.createElement("div"); + content.innerHTML = HTML; + + openPromptModal("Vérification de la date", content, action); + return; + } + + action(); +} + +function onlyAbs() { + if (getDate() > moment()) { + document + .querySelectorAll(".rbtn.present, .rbtn.retard") + .forEach((el) => el.remove()); + } +} + +/** + * Limite le nombre de checkbox marquée + * Vérifie aussi si le cliqué est fait sur des assiduités conflictuelles + * @param {HTMLInputElement} box la checkbox utilisée + * @returns {boolean} Faux si il y a un conflit d'assiduité, Vrai sinon + */ +function uniqueCheckBox(box) { + const type = box.parentElement.getAttribute("type") === "conflit"; + if (!type) { + const checkboxs = Array.from(box.parentElement.children); + + checkboxs.forEach((chbox) => { + if (chbox.checked && chbox.value !== box.value) { + chbox.checked = false; + } + }); + return true; + } + + return false; +} + +/** + * Fait une requête GET de façon synchrone + * @param {String} path adresse distante + * @param {CallableFunction} success fonction à effectuer en cas de succès + * @param {CallableFunction} errors fonction à effectuer en cas d'échec + */ +function sync_get(path, success, errors) { + $.ajax({ + async: false, + type: "GET", + url: path, + success: success, + error: errors, + }); +} +/** + * Fait une requête GET de façon asynchrone + * @param {String} path adresse distante + * @param {CallableFunction} success fonction à effectuer en cas de succès + * @param {CallableFunction} errors fonction à effectuer en cas d'échec + */ +function async_get(path, success, errors) { + $.ajax({ + async: true, + type: "GET", + url: path, + success: success, + error: errors, + }); +} +/** + * Fait une requête POST de façon synchrone + * @param {String} path adresse distante + * @param {object} data données à envoyer (objet js) + * @param {CallableFunction} success fonction à effectuer en cas de succès + * @param {CallableFunction} errors fonction à effectuer en cas d'échec + */ +function sync_post(path, data, success, errors) { + $.ajax({ + async: false, + type: "POST", + url: path, + data: JSON.stringify(data), + success: success, + error: errors, + }); +} +/** + * Fait une requête POST de façon asynchrone + * @param {String} path adresse distante + * @param {object} data données à envoyer (objet js) + * @param {CallableFunction} success fonction à effectuer en cas de succès + * @param {CallableFunction} errors fonction à effectuer en cas d'échec + */ +function async_post(path, data, success, errors) { + return $.ajax({ + async: true, + type: "POST", + url: path, + data: JSON.stringify(data), + success: success, + error: errors, + }); +} +// <<== Gestion des actions de masse ==>> +const massActionQueue = new Map(); + +/** + * Cette fonction remet à zero la gestion des actions de masse + */ +function resetMassActionQueue() { + massActionQueue.set("supprimer", []); + massActionQueue.set("editer", []); + massActionQueue.set("creer", []); +} + +/** + * Fonction pour alimenter la queue des actions de masse + * @param {String} type Le type de queue ("creer", "supprimer", "editer") + * @param {*} obj L'objet qui sera utilisé par les API + */ +function addToMassActionQueue(type, obj) { + massActionQueue.get(type)?.push(obj); +} + +/** + * Fonction pour exécuter les actions de masse + */ +function executeMassActionQueue() { + if (!currentMassAction) return; + + //Récupération des queues + const toCreate = massActionQueue.get("creer"); + const toEdit = massActionQueue.get("editer"); + const toDelete = massActionQueue.get("supprimer"); + + //Fonction qui créé les assidutiés de la queue "creer" + const create = () => { + /** + * Création du template de l'assiduité + * + * { + * date_debut: #debut_timeline, + * date_fin: #fin_timeline, + * moduleimpl_id ?: <> + * } + */ + const tlTimes = getTimeLineTimes(); + let assiduite = { + date_debut: tlTimes.deb.format(), + date_fin: tlTimes.fin.format(), + }; + + assiduite = setModuleImplId(assiduite); + if (!hasModuleImpl(assiduite) && window.forceModule) { + const html = ` +

Aucun module n'a été spécifié

+ `; + const div = document.createElement("div"); + div.innerHTML = html; + openAlertModal("Erreur Module", div); + return 0; + } + + const createQueue = []; //liste des assiduités qui seront créées. + + /** + * Pour chaque état de la queue 'creer' on génère une + * assiduitée précise depuis le template + */ + toCreate.forEach((obj) => { + const curAssiduite = structuredClone(assiduite); + curAssiduite.etudid = obj.etudid; + curAssiduite.etat = obj.etat; + + createQueue.push(curAssiduite); + }); + + /** + * On envoie les données à l'API + */ + const path = getUrl() + `/api/assiduites/create`; + sync_post( + path, + createQueue, + (data, status) => { + //success + }, + (data, status) => { + //error + console.error(data, status); + errorAlert(); + } + ); + return createQueue.length; + }; + + //Fonction qui modifie les assiduités de la queue 'edition' + const edit = () => { + //On ajoute le moduleimpl (s'il existe) aux assiduités à modifier + const editQueue = toEdit.map((assiduite) => { + assiduite = setModuleImplId(assiduite); + return assiduite; + }); + + if (getModuleImplId() == null && window.forceModule) { + const html = ` +

Aucun module n'a été spécifié

+ `; + const div = document.createElement("div"); + div.innerHTML = html; + openAlertModal("Erreur Module", div); + return 0; + } + + const path = getUrl() + `/api/assiduites/edit`; + sync_post( + path, + editQueue, + (data, status) => { + //success + }, + (data, status) => { + //error + console.error(data, status); + errorAlert(); + } + ); + return editQueue.length; + }; + + //Fonction qui supprime les assiduités de la queue 'supprimer' + const supprimer = () => { + const path = getUrl() + `/api/assiduite/delete`; + sync_post( + path, + toDelete, + (data, status) => { + //success + }, + (data, status) => { + //error + console.error(data, status); + errorAlert(); + } + ); + return toDelete.length; + }; + + //On exécute les fonctions de queue + let count = 0; + if (currentMassActionEtat == "remove") { + count += supprimer(); + const span = document.createElement("span"); + if (count > 0) { + span.innerHTML = `${count} assiduités ont été supprimées.`; + } else { + span.innerHTML = `Aucune assiduité n'a été supprimée.`; + } + pushToast( + generateToast( + span, + getToastColorFromEtat(currentMassActionEtat.toUpperCase()), + 5 + ) + ); + } else { + count += create(); + count += edit(); + const etat = + currentMassActionEtat.toUpperCase() == "RETARD" + ? "En retard" + : currentMassActionEtat; + const span = document.createElement("span"); + if (count > 0) { + span.innerHTML = `${count} étudiants ont été mis ${etat + .capitalize() + .trim()}`; + } else { + span.innerHTML = `Aucun étudiant n'a été mis ${etat + .capitalize() + .trim()}`; + } + pushToast( + generateToast( + span, + getToastColorFromEtat(currentMassActionEtat.toUpperCase()), + 5 + ) + ); + } + //On récupère les assiduités puis on regénère les lignes d'étudiants + getAssiduitesFromEtuds(true); + generateAllEtudRow(); +} +/** + * Processus de peuplement des queues + * puis d'exécution + */ +function massAction() { + //On récupère tous les boutons d'assiduités + const fields = Array.from(document.querySelectorAll(".btns_field.single")); + //On récupère l'état de l'action de masse + currentMassActionEtat = getAssiduiteValue( + document.querySelector(".btns_field.mass") + ); + + //On remet à 0 les queues + resetMassActionQueue(); + + //on met à vrai la variable pour la suite + currentMassAction = true; + + //On affiche le "loader" le temps du processus + showLoader(); + + //On timeout 0 pour le mettre à la fin de l'event queue de JS + setTimeout(() => { + const conflicts = []; + /** + * Pour chaque étudiant : + * On vérifie s'il y a un conflit -> on place l'étudiant dans l'array conflicts + * Sinon -> on fait comme si l'utilisateur cliquait sur le bouton d'assiduité + */ + fields.forEach((field) => { + if (field.getAttribute("type") != "conflit") { + if (currentMassActionEtat != "remove") { + field.querySelector(`.rbtn.${currentMassActionEtat}`).click(); + } else { + field.querySelector(".rbtn.absent").click(); + } + } else { + const etudid = field.getAttribute("etudid"); + conflicts.push(etuds[parseInt(etudid)]); + } + }); + + //on exécute les queues puis on cache le loader + executeMassActionQueue(); + hideLoader(); + + //Fin du processus, on remet à false + currentMassAction = false; + currentMassActionEtat = undefined; + + //On remet à zero les boutons d'assiduité de masse + const boxes = Array.from( + document.querySelector(".btns_field.mass").querySelectorAll(".rbtn") + ); + boxes.forEach((box) => { + box.checked = false; + }); + + //Si il y a des conflits d'assiduité, on affiche la liste dans une alert + if (conflicts.length > 0) { + const div = document.createElement("div"); + const sub = document.createElement("p"); + sub.textContent = + "L'assiduité des étudiants suivant n'a pas pu être modifiée"; + div.appendChild(sub); + const ul = document.createElement("ul"); + conflicts.forEach((etu) => { + const li = document.createElement("li"); + li.textContent = `${etu.nom} ${etu.prenom.capitalize()}`; + ul.appendChild(li); + }); + div.appendChild(ul); + openAlertModal("Conflits d'assiduités", div, ""); + } + }, 0); +} + +/** + * On génère les boutons d'assiduités de masse + * puis on ajoute les événements associés + */ +function generateMassAssiduites() { + const content = document.getElementById("content"); + + const mass = document.createElement("div"); + mass.className = "mass-selection"; + mass.innerHTML = ` + Mettre tout le monde : +
+ + + + +
`; + + content.insertBefore(mass, content.querySelector(".etud_holder")); + + const mass_btn = Array.from(mass.querySelectorAll(".rbtn")); + mass_btn.forEach((btn) => { + btn.addEventListener("click", () => { + massAction(); + }); + }); + + if (!verifyDateInSemester() || readOnly) { + content.querySelector(".btns_field.mass").setAttribute("disabled", "true"); + } +} + +/** + * Affichage du loader + */ +function showLoader() { + document.getElementById("loaderContainer").style.display = "block"; +} +/** + * Dissimulation du loader + */ +function hideLoader() { + document.getElementById("loaderContainer").style.display = "none"; +} + +// <<== Gestion du temps ==>> + +/** + * Transforme un temps numérique en string + * 8.75 -> 08h45 + * @param {number} time Le temps (float) + * @returns {string} le temps (string) + */ +function toTime(time) { + let heure = Math.floor(time); + let minutes = Math.round((time - heure) * 60); + if (minutes < 10) { + minutes = `0${minutes}`; + } + if (heure < 10) { + heure = `0${heure}`; + } + return `${heure}h${minutes}`; +} +/** + * Transforme une date iso en une date lisible: + * new Date('2023-03-03') -> "vendredi 3 mars 2023" + * @param {Date} date + * @param {object} styles + * @returns + */ +function formatDate(date, styles = { dateStyle: "full" }) { + return new Intl.DateTimeFormat("fr-FR", styles).format(date); +} + +/** + * Met à jour la date visible sur la page en la formatant + */ +function updateDate() { + const dateInput = document.querySelector("#tl_date"); + + const date = dateInput.valueAsDate; + + if (!verifyNonWorkDays(date.getDay(), nonWorkDays)) { + $("#datestr").text(formatDate(date).capitalize()); + dateInput.setAttribute("value", date.toISOString().split("T")[0]); + return true; + } else { + const att = document.createTextNode( + "Le jour sélectionné n'est pas un jour travaillé." + ); + openAlertModal("Erreur", att, "", "crimson"); + dateInput.value = dateInput.getAttribute("value"); + return false; + } +} + +function verifyDateInSemester() { + const date = new moment.tz( + document.querySelector("#tl_date").value, + TIMEZONE + ); + + const periodSemester = getFormSemestreDates(); + + return date.isBetween( + periodSemester.deb, + periodSemester.fin, + undefined, + "[]" + ); +} + +/** + * Ajoute la possibilité d'ouvrir le calendrier + * lorsqu'on clique sur la date + */ +function setupDate(onchange = null) { + const datestr = document.querySelector("#datestr"); + const input = document.querySelector("#tl_date"); + + datestr.addEventListener("click", () => { + if (!input.disabled) { + input.showPicker(); + } + }); + + if (onchange != null) { + input.addEventListener("change", onchange); + } +} + +/** + * GetAssiduitesOnDateChange + * (Utilisé uniquement avec étudiant unique) + */ + +function getAssiduitesOnDateChange() { + if (!isSingleEtud()) return; + actualizeEtud(etudid); +} +/** + * Transforme une date iso en date intelligible + * @param {String} str date iso + * @param {String} separator le séparateur de la date intelligible (01/01/2000 {separtor} 10:00) + * @returns {String} la date intelligible + */ +function formatDateModal(str, separator = "·") { + return new moment.tz(str, TIMEZONE).format(`DD/MM/Y ${separator} HH:mm`); +} + +/** + * Vérifie si la date sélectionnée n'est pas un jour non travaillé + * Renvoie Vrai si le jour est non travaillé + */ +function verifyNonWorkDays(day, nonWorkdays) { + let d = ""; + switch (day) { + case 0: + d = "dim"; + break; + case 1: + d = "lun"; + break; + case 2: + d = "mar"; + break; + case 3: + d = "mer"; + break; + case 4: + d = "jeu"; + break; + case 5: + d = "ven"; + break; + case 6: + d = "sam"; + break; + } + + return nonWorkdays.indexOf(d) != -1; +} + +/** + * Fonction qui vérifie si une période est dans un interval + * Objet période / interval + * { + * deb: moment.tz(), + * fin: moment.tz(), + * } + * @param {object} period + * @param {object} interval + * @returns {boolean} Vrai si la période est dans l'interval + */ +function hasTimeConflict(period, interval) { + return period.deb.isBefore(interval.fin) && period.fin.isAfter(interval.deb); +} + +/** + * On récupère la période de la timeline + * @returns {deb : moment.tz(), fin: moment.tz()} + */ +function getTimeLineTimes() { + //getPeriodValues() -> retourne la position de la timeline [a,b] avec a et b des number + let values = getPeriodValues(); + //On récupère la date + const dateiso = document.querySelector("#tl_date").value; + + //On génère des objets temps (moment.tz) + values = values.map((el) => { + el = toTime(el).replace("h", ":"); + el = `${dateiso}T${el}`; + return moment.tz(el, TIMEZONE); + }); + + return { deb: values[0], fin: values[1] }; +} + +/** + * Vérification de l'égalité entre un conflit et la période de la timeline + * @param {object} conflict + * @returns {boolean} Renvoie Vrai si la période de la timeline est égal au conflit + */ +function isConflictSameAsPeriod(conflict, period = undefined) { + const tlTimes = period == undefined ? getTimeLineTimes() : period; + const clTimes = { + deb: moment.tz(conflict.date_debut, TIMEZONE), + fin: moment.tz(conflict.date_fin, TIMEZONE), + }; + return tlTimes.deb.isSame(clTimes.deb) && tlTimes.fin.isSame(clTimes.fin); +} + +/** + * Retourne un objet Date de la date sélectionnée + * @returns {Date} la date sélectionnée + */ +function getDate() { + const date = new Date( + document.querySelector("#tl_date").getAttribute("value") + ); + date.setHours(0, 0, 0, 0); + return date; +} + +/** + * Retourne un objet date représentant le jour suivant + * @returns {Date} le jour suivant + */ +function getNextDate() { + const date = getDate(); + const next = new Date(date.valueOf()); + next.setDate(date.getDate() + 1); + next.setHours(0, 0, 0, 0); + return next; +} +/** + * Retourne un objet date représentant le jour précédent + * @returns {Date} le jour précédent + */ +function getPrevDate() { + const date = getDate(); + const next = new Date(date.valueOf()); + next.setDate(date.getDate() - 1); + next.setHours(0, 0, 0, 0); + return next; +} + +/** + * Transformation d'un objet Date en chaîne ISO + * @param {Date} date + * @returns {string} la date iso avec le timezone + */ +function toIsoString(date) { + var tzo = -date.getTimezoneOffset(), + dif = tzo >= 0 ? "+" : "-", + pad = function (num) { + return (num < 10 ? "0" : "") + num; + }; + + return ( + date.getFullYear() + + "-" + + pad(date.getMonth() + 1) + + "-" + + pad(date.getDate()) + + "T" + + pad(date.getHours()) + + ":" + + pad(date.getMinutes()) + + ":" + + pad(date.getSeconds()) + + dif + + pad(Math.floor(Math.abs(tzo) / 60)) + + ":" + + pad(Math.abs(tzo) % 60) + ); +} + +/** + * Transforme un temps numérique en une date moment.tz + * @param {number} nb + * @returns {moment.tz} Une date formée du temps donné et de la date courante + */ +function numberTimeToDate(nb) { + time = toTime(nb).replace("h", ":"); + date = document.querySelector("#tl_date").value; + + datetime = `${date}T${time}`; + + return moment.tz(datetime, TIMEZONE); +} + +// <<== Gestion des assiduités ==>> + +/** + * Récupère les assiduités des étudiants + * en fonction de : + * - du semestre + * - de la date courant et du jour précédent. + * @param {boolean} clear vidage de l'objet "assiduites" ou non + * @returns {object} l'objets Assiduités { : [,]} + */ +function getAssiduitesFromEtuds(clear, has_formsemestre = true, deb, fin) { + const etudIds = Object.keys(etuds).join(","); + const formsemestre_id = has_formsemestre + ? `formsemestre_id=${getFormSemestreId()}&` + : ""; + + const date_debut = deb ? deb : toIsoString(getPrevDate()); + const date_fin = fin ? fin : toIsoString(getNextDate()); + + if (clear) { + assiduites = {}; + } + + const url_api = + getUrl() + + `/api/assiduites/group/query?date_debut=${date_debut}&${formsemestre_id}&date_fin=${date_fin}&etudids=${etudIds}`; + sync_get(url_api, (data, status) => { + if (status === "success") { + const dataKeys = Object.keys(data); + dataKeys.forEach((key) => { + if (clear || !(key in assiduites)) { + assiduites[key] = data[key]; + } else { + assiduites[key] = assiduites[key].concat(data[key]); + } + let assi_ids = []; + assiduites[key] = assiduites[key].reversed().filter((value) => { + if (assi_ids.indexOf(value.assiduite_id) == -1) { + assi_ids.push(value.assiduite_id); + return true; + } + + return false; + }); + }); + } + }); + return assiduites; +} + +/** + * Création d'une assiduité pour un étudiant + * @param {String} etat l'état de l'étudiant + * @param {Number | String} etudid l'identifiant de l'étudiant + * + * TODO : Rendre asynchrone + */ +function createAssiduite(etat, etudid) { + const tlTimes = getTimeLineTimes(); + let assiduite = { + date_debut: tlTimes.deb.format(), + date_fin: tlTimes.fin.format(), + etat: etat, + }; + + assiduite = setModuleImplId(assiduite); + + if (!hasModuleImpl(assiduite) && window.forceModule) { + const html = ` +

Aucun module n'a été spécifié

+ `; + const div = document.createElement("div"); + div.innerHTML = html; + openAlertModal("Erreur Module", div); + return false; + } + + const path = getUrl() + `/api/assiduite/${etudid}/create`; + sync_post( + path, + [assiduite], + (data, status) => { + //success + if (data.success.length > 0) { + let obj = data.success["0"].assiduite_id; + } + }, + (data, status) => { + //error + console.error(data, status); + errorAlert(); + } + ); + return true; +} + +/** + * Suppression d'une assiduité + * @param {String | Number} assiduite_id l'identifiant de l'assiduité + * TODO : Rendre asynchrone + */ +function deleteAssiduite(assiduite_id) { + const path = getUrl() + `/api/assiduite/delete`; + sync_post( + path, + [assiduite_id], + (data, status) => { + //success + if (data.success.length > 0) { + let obj = data.success["0"].assiduite_id; + } + }, + (data, status) => { + //error + console.error(data, status); + errorAlert(); + } + ); + return true; +} + +function hasModuleImpl(assiduite) { + if (assiduite.moduleimpl_id != null) return true; + if ( + "external_data" in assiduite && + assiduite.external_data instanceof Object && + "module" in assiduite.external_data + ) + return true; + + return false; +} + +/** + * + * @param {String | Number} assiduite_id l'identifiant d'une assiduité + * @param {String} etat l'état à modifier + * @returns {boolean} si l'édition a fonctionné + * TODO : Rendre asynchrone + */ +function editAssiduite(assiduite_id, etat, assi) { + let assiduite = { + etat: etat, + external_data: assi ? assi.external_data : null, + }; + + assiduite = setModuleImplId(assiduite); + if (!hasModuleImpl(assiduite) && window.forceModule) { + const html = ` +

Aucun module n'a été spécifié

+ `; + const div = document.createElement("div"); + div.innerHTML = html; + openAlertModal("Erreur Module", div); + return; + } + const path = getUrl() + `/api/assiduite/${assiduite_id}/edit`; + let bool = false; + sync_post( + path, + assiduite, + (data, status) => { + bool = true; + }, + (data, status) => { + //error + console.error(data, status); + errorAlert(); + } + ); + + return bool; +} + +/** + * Récupération des assiduités conflictuelles avec la période de la time line + * @param {String | Number} etudid identifiant de l'étudiant + * @returns {Array[Assiduité]} un tableau d'assiduité + */ +function getAssiduitesConflict(etudid, periode) { + const etudAssiduites = assiduites[etudid]; + if (!etudAssiduites) { + return []; + } + if (!periode) { + periode = getTimeLineTimes(); + } + + return etudAssiduites.filter((assi) => { + const interval = { + deb: moment.tz(assi.date_debut, TIMEZONE), + fin: moment.tz(assi.date_fin, TIMEZONE), + }; + return hasTimeConflict(periode, interval); + }); +} + +/** + * Récupération de la dernière assiduité du jour précédent + * @param {String | Number} etudid l'identifiant de l'étudiant + * @returns {Assiduité} la dernière assiduité du jour précédent + */ +function getLastAssiduiteOfPrevDate(etudid) { + const etudAssiduites = assiduites[etudid]; + if (!etudAssiduites) { + return ""; + } + const period = { + deb: moment.tz(getPrevDate(), TIMEZONE), + fin: moment.tz(getDate(), TIMEZONE), + }; + const prevAssiduites = etudAssiduites + .filter((assi) => { + const interval = { + deb: moment.tz(assi.date_debut, TIMEZONE), + fin: moment.tz(assi.date_fin, TIMEZONE), + }; + + return hasTimeConflict(period, interval); + }) + .sort((a, b) => { + const a_fin = moment.tz(a.date_fin, TIMEZONE); + const b_fin = moment.tz(b.date_fin, TIMEZONE); + return b_fin < a_fin; + }); + + if (prevAssiduites.length < 1) { + return null; + } + + return prevAssiduites.pop(); +} + +/** + * Récupération de l'état appointé + * @param {HTMLFieldSetElement} field le conteneur des boutons d'assiduité d'une ligne étudiant + * @returns {String} l'état appointé : ('present','absent','retard', 'remove') + * + * état = 'remove' si le clic désélectionne une assiduité appointée + */ +function getAssiduiteValue(field) { + const checkboxs = Array.from(field.children); + let value = "remove"; + checkboxs.forEach((chbox) => { + if (chbox.checked) { + value = chbox.value; + } + }); + + return value; +} + +/** + * Mise à jour des assiduités d'un étudiant + * @param {String | Number} etudid identifiant de l'étudiant + */ +function actualizeEtudAssiduite(etudid, has_formsemestre = true) { + const formsemestre_id = has_formsemestre + ? `formsemestre_id=${getFormSemestreId()}&` + : ""; + const date_debut = toIsoString(getPrevDate()); + const date_fin = toIsoString(getNextDate()); + + const url_api = + getUrl() + + `/api/assiduites/${etudid}/query?${formsemestre_id}date_debut=${date_debut}&date_fin=${date_fin}`; + sync_get(url_api, (data, status) => { + if (status === "success") { + assiduites[etudid] = data; + } + }); +} + +function getAllAssiduitesFromEtud(etudid, action) { + const url_api = getUrl() + `/api/assiduites/${etudid}`; + + $.ajax({ + async: true, + type: "GET", + url: url_api, + success: (data, status) => { + if (status === "success") { + assiduites[etudid] = data; + action(data); + } + }, + error: () => {}, + }); +} + +/** + * Déclenchement d'une action après appuie sur un bouton d'assiduité + * @param {HTMLInputElement} element Bouton d'assiduité appuyé + */ +function assiduiteAction(element) { + const field = element.parentElement; + + const type = field.getAttribute("type"); + const etudid = parseInt(field.getAttribute("etudid")); + const assiduite_id = parseInt(field.getAttribute("assiduite_id")); + const etat = getAssiduiteValue(field); + + // Cas de l'action de masse -> peuplement des queues + if (currentMassAction) { + if (currentMassActionEtat != "remove") { + switch (type) { + case "création": + addToMassActionQueue("creer", { etat: etat, etudid: etudid }); + break; + case "édition": + if (etat != "remove") { + addToMassActionQueue("editer", { + etat: etat, + assiduite_id: assiduite_id, + }); + } + break; + } + } else if (type == "édition") { + addToMassActionQueue("supprimer", assiduite_id); + } + } else { + // Cas normal -> mise à jour en base + let done = false; + switch (type) { + case "création": + done = createAssiduite(etat, etudid); + break; + case "édition": + if (etat === "remove") { + done = deleteAssiduite(assiduite_id); + } else { + done = editAssiduite( + assiduite_id, + etat, + assiduites[etudid].reduce((a) => { + if (a.assiduite_id == assiduite_id) return a; + }) + ); + } + break; + case "conflit": + const conflitResolver = new ConflitResolver( + assiduites[etudid], + getTimeLineTimes(), + { + deb: new moment.tz(getDate(), TIMEZONE), + fin: new moment.tz(getNextDate(), TIMEZONE), + } + ); + const update = (assi) => { + actualizeEtud(assi.etudid); + }; + conflitResolver.callbacks = { + delete: update, + edit: update, + split: update, + }; + + conflitResolver.open(); + return; + } + + if (type != "conflit" && done) { + let etatAffiche; + + switch (etat.toUpperCase()) { + case "PRESENT": + etatAffiche = + "%etud% a été noté(e) présent(e)"; + break; + case "RETARD": + etatAffiche = + "%etud% a été noté(e) en retard"; + break; + case "ABSENT": + etatAffiche = + "%etud% a été noté(e) absent(e)"; + break; + case "REMOVE": + etatAffiche = "L'assiduité de %etud% a été retirée."; + } + + const nom_prenom = `${etuds[etudid].nom.toUpperCase()} ${etuds[ + etudid + ].prenom.capitalize()}`; + const span = document.createElement("span"); + span.innerHTML = etatAffiche.replace("%etud%", nom_prenom); + + pushToast( + generateToast(span, getToastColorFromEtat(etat.toUpperCase()), 5) + ); + } + + actualizeEtud(etudid, !isSingleEtud); + } +} + +// <<== Gestion de l'affichage des barres étudiant ==>> + +/** + * Génère l'HTML lié à la barre d'un étudiant + * @param {Etudiant} etud représentation objet d'un étudiant + * @param {Number} index l'index de l'étudiant dans la liste + * @param {AssiduitéMod} assiduite Objet représentant l'état de l'étudiant pour la période de la timeline + * @returns {String} l'HTML généré + */ +function generateEtudRow( + etud, + index, + assiduite = { + etatAssiduite: "", + type: "création", + id: -1, + date_debut: null, + date_fin: null, + prevAssiduites: "", + } +) { + // Génération des boutons du choix de l'assiduité + let assi = ""; + ["present", "retard", "absent"].forEach((abs) => { + if (abs.toLowerCase() === assiduite.etatAssiduite.toLowerCase()) { + assi += ``; + } else { + assi += ``; + } + }); + const conflit = assiduite.type == "conflit" ? "conflit" : ""; + const pdp_url = `${getUrl()}/api/etudiant/etudid/${etud.id}/photo?size=small`; + + let defdem = ""; + + try { + if (etud.id in etudsDefDem) { + defdem = etudsDefDem[etud.id] == "D" ? "dem" : "def"; + } + } catch (_) {} + + const HTML = `
+ +
${index}
+
+ + + +
+ +

${etud.nom}

+
${etud.prenom}
+ +
+ +
+
+
+
+
+
+ + ${assi} + +
+ + +
`; + + return HTML; +} + +/** + * Insertion de la ligne étudiant + * @param {Etudiant} etud l'objet représentant un étudiant + * @param {Number} index le n° de l'étudiant dans la liste des étudiants + * @param {boolean} output ajout automatique dans la page ou non (default : Non) + * @returns {String} HTML si output sinon rien + */ +function insertEtudRow(etud, index, output = false) { + const etudHolder = document.querySelector(".etud_holder"); + const conflict = getAssiduitesConflict(etud.id); + const prevAssiduite = getLastAssiduiteOfPrevDate(etud.id); + let assiduite = { + etatAssiduite: "", + type: "création", + id: -1, + date_debut: null, + date_fin: null, + prevAssiduites: prevAssiduite, + }; + + if (conflict.length > 0) { + assiduite.etatAssiduite = conflict[0].etat; + + assiduite.id = conflict[0].assiduite_id; + assiduite.date_debut = conflict[0].date_debut; + assiduite.date_fin = conflict[0].date_fin; + if (isConflictSameAsPeriod(conflict[0])) { + assiduite.type = "édition"; + } else { + assiduite.type = "conflit"; + } + } + let row = generateEtudRow(etud, index, assiduite); + + if (output) { + return row; + } + etudHolder.insertAdjacentHTML("beforeend", row); + + row = document.getElementById(`etud_row_${etud.id}`); + const prev = row.querySelector("#prevDateAssi"); + setupAssiduiteBuble(prev, prevAssiduite); + const bar = row.querySelector(".assiduites_bar"); + + bar.appendChild(createMiniTimeline(assiduites[etud.id])); + + if (!verifyDateInSemester() || readOnly) { + row.querySelector(".btns_field.single").setAttribute("disabled", "true"); + } +} + +/** + * Mise à jour d'une ligne étudiant + * @param {String | Number} etudid l'identifiant de l'étudiant + */ +function actualizeEtud(etudid) { + actualizeEtudAssiduite(etudid, !isSingleEtud()); + //Actualize row + const etudHolder = document.querySelector(".etud_holder"); + const ancient_row = document.getElementById(`etud_row_${etudid}`); + + let new_row = document.createElement("div"); + new_row.innerHTML = insertEtudRow( + etuds[etudid], + ancient_row.querySelector(".index").textContent, + true + ); + setupCheckBox(new_row.firstElementChild); + const bar = new_row.firstElementChild.querySelector(".assiduites_bar"); + bar.appendChild(createMiniTimeline(assiduites[etudid])); + const prev = new_row.firstElementChild.querySelector("#prevDateAssi"); + if (isSingleEtud()) { + prev.classList.add("single"); + } + setupAssiduiteBuble(prev, getLastAssiduiteOfPrevDate(etudid)); + etudHolder.replaceChild(new_row.firstElementChild, ancient_row); +} + +/** + * Génération de toutes les lignes étudiant + */ +function generateAllEtudRow() { + if (isSingleEtud()) { + try { + actualizeEtud(etudid); + } catch (ignored) {} + return; + } + + if (!document.querySelector(".selectors")?.disabled) { + return; + } + + document.querySelector(".etud_holder").innerHTML = ""; + etuds_ids = Object.keys(etuds).sort((a, b) => + etuds[a].nom > etuds[b].nom ? 1 : etuds[b].nom > etuds[a].nom ? -1 : 0 + ); + + for (let i = 0; i < etuds_ids.length; i++) { + const etud = etuds[etuds_ids[i]]; + insertEtudRow(etud, i + 1); + } + + setupCheckBox(); +} + +// <== Gestion du modal de conflit ==> + +// <<== Gestion de la récupération d'informations ==>> + +/** + * Récupération des ids des groupes + * @returns la liste des ids des groupes + */ +function getGroupIds() { + const btns = document.querySelector(".multiselect-container.dropdown-menu"); + + const groups = Array.from(btns.querySelectorAll(".active")).map((el) => { + return el.querySelector("input").value; + }); + + return groups; +} + +/** + * Récupération du moduleimpl_id + * @returns {String} l'identifiant ou null si inéxistant + */ +function getModuleImplId() { + const val = document.querySelector("#moduleimpl_select")?.value; + return ["", undefined, null].includes(val) ? null : val; +} + +function setModuleImplId(assiduite, module = null) { + const moduleimpl = module == null ? getModuleImplId() : module; + if (moduleimpl === "autre") { + if ("external_data" in assiduite && assiduite.external_data != undefined) { + if ("module" in assiduite.external_data) { + assiduite.external_data.module = "Autre"; + } else { + assiduite["external_data"] = { module: "Autre" }; + } + } else { + assiduite["external_data"] = { module: "Autre" }; + } + assiduite.moduleimpl_id = null; + } else { + assiduite["moduleimpl_id"] = moduleimpl; + if ("external_data" in assiduite && assiduite.external_data != undefined) { + if ("module" in assiduite.external_data) { + delete assiduite.external_data.module; + } + } + } + return assiduite; +} + +/** + * Récupération de l'id du formsemestre + * @returns {String} l'identifiant du formsemestre + */ +function getFormSemestreId() { + return document.querySelector(".formsemestre_id").textContent; +} + +/** + * Récupère la période du semestre + * @returns {object} période {deb,fin} + */ +function getFormSemestreDates() { + const dateDeb = document.getElementById( + "formsemestre_date_debut" + ).textContent; + const dateFin = document.getElementById("formsemestre_date_fin").textContent; + + return { + deb: dateDeb, + fin: dateFin, + }; +} + +/** + * Récupère un objet étudiant à partir de son id + * @param {Number} etudid + */ +function getSingleEtud(etudid) { + sync_get(getUrl() + `/api/etudiant/etudid/${etudid}`, (data) => { + etuds[etudid] = data; + }); +} + +function isSingleEtud() { + return location.href.includes("SignaleAssiduiteEtud"); +} + +function getCurrentAssiduiteModuleImplId() { + const currentAssiduites = getAssiduitesConflict(etudid); + if (currentAssiduites.length > 0) { + let mod = currentAssiduites[0].moduleimpl_id; + if ( + mod == null && + "external_data" in currentAssiduites[0] && + currentAssiduites[0].external_data instanceof Object && + "module" in currentAssiduites[0].external_data + ) { + mod = currentAssiduites[0].external_data.module; + } + return mod == null ? "" : mod; + } + return ""; +} + +function getCurrentAssiduite(etudid) { + const field = document.querySelector( + `fieldset.btns_field.single[etudid='${etudid}']` + ); + + if (!field) return null; + + const assiduite_id = parseInt(field.getAttribute("assiduite_id")); + const type = field.getAttribute("type"); + + if (type == "édition") { + let assi = null; + assiduites[etudid].forEach((a) => { + if (a.assiduite_id === assiduite_id) { + assi = a; + } + }); + return assi; + } else { + return null; + } +} + +// <<== Gestion de la justification ==>> + +function getJustificatifFromPeriod(date, etudid, update) { + $.ajax({ + async: true, + type: "GET", + url: + getUrl() + + `/api/justificatifs/${etudid}/query?date_debut=${date.deb + .add(1, "s") + .format()}&date_fin=${date.fin.subtract(1, "s").format()}`, + success: (data) => { + update(data); + }, + error: () => {}, + }); +} + +function updateJustifyBtn() { + if (isSingleEtud()) { + const assi = getCurrentAssiduite(etudid); + + const just = assi ? !assi.est_just : false; + const btn = document.getElementById("justif-rapide"); + if (!just) { + btn.setAttribute("disabled", "true"); + } else { + btn.removeAttribute("disabled"); + } + } +} + +function fastJustify(assiduite) { + const period = { + deb: new moment.tz(assiduite.date_debut, TIMEZONE), + fin: new moment.tz(assiduite.date_fin, TIMEZONE), + }; + const action = (justifs) => { + if (justifs.length > 0) { + justifyAssiduite(assiduite.assiduite_id, !assiduite.est_just); + } else { + //créer un nouveau justificatif + // Afficher prompt -> demander raison et état + + const success = () => { + const raison = document.getElementById("promptText").value; + const etat = document.getElementById("promptSelect").value; + + //créer justificatif + + const justif = { + date_debut: new moment.tz(assiduite.date_debut, TIMEZONE) + .add(1, "s") + .format(), + date_fin: new moment.tz(assiduite.date_fin, TIMEZONE) + .subtract(1, "s") + .format(), + raison: raison, + etat: etat, + }; + + createJustificatif(justif); + + // justifyAssiduite(assiduite.assiduite_id, true); + generateAllEtudRow(); + }; + + const content = document.createElement("fieldset"); + + const htmlPrompt = `Entrez l'état du justificatif : + + Raison: + + `; + + content.innerHTML = htmlPrompt; + + openPromptModal( + "Nouveau justificatif (Rapide)", + content, + success, + () => {}, + "#7059FF" + ); + } + }; + if (assiduite.etudid) { + getJustificatifFromPeriod(period, assiduite.etudid, action); + } +} + +function justifyAssiduite(assiduite_id, justified) { + const assiduite = { + est_just: justified, + }; + const path = getUrl() + `/api/assiduite/${assiduite_id}/edit`; + let bool = false; + sync_post( + path, + assiduite, + (data, status) => { + bool = true; + }, + (data, status) => { + //error + console.error(data, status); + errorAlert(); + } + ); + + return bool; +} + +function createJustificatif(justif, success = () => {}) { + const path = getUrl() + `/api/justificatif/${etudid}/create`; + sync_post(path, [justif], success, (data, status) => { + //error + console.error(data, status); + errorAlert(); + }); +} + +function getAllJustificatifsFromEtud(etudid, action) { + const url_api = getUrl() + `/api/justificatifs/${etudid}`; + $.ajax({ + async: true, + type: "GET", + url: url_api, + success: (data, status) => { + if (status === "success") { + action(data); + } + }, + error: () => {}, + }); +} + +function deleteJustificatif(justif_id) { + const path = getUrl() + `/api/justificatif/delete`; + sync_post( + path, + [justif_id], + (data, status) => { + //success + if (data.success.length > 0) { + } + }, + (data, status) => { + //error + console.error(data, status); + errorAlert(); + } + ); +} + +function errorAlert() { + const html = ` +

Avez vous les droits suffisant pour cette action ?

+

Si c'est bien le cas : demandez de l'aide sur le canal Assistance de ScoDoc

+
+

pour les développeurs : l'erreur est affichée dans la console JS

+ + `; + const div = document.createElement("div"); + div.innerHTML = html; + openAlertModal("Une erreur s'est produite", div); +} + +const moduleimpls = {}; + +function getModuleImpl(assiduite) { + const id = assiduite.moduleimpl_id; + + if (id == null || id == undefined) { + if ( + "external_data" in assiduite && + assiduite.external_data instanceof Object && + "module" in assiduite.external_data + ) { + return assiduite.external_data.module; + } else { + return "Pas de module"; + } + } + + if (id in moduleimpls) { + return moduleimpls[id]; + } + const url_api = getUrl() + `/api/moduleimpl/${id}`; + sync_get( + url_api, + (data) => { + moduleimpls[id] = `${data.module.code} ${data.module.abbrev}`; + }, + (data) => { + moduleimpls[id] = "Pas de module"; + } + ); + + return moduleimpls[id]; +} + +function getUser(obj) { + if ("external_data" in obj && obj.external_data != null) { + if ("enseignant" in obj.external_data) { + return obj.external_data.enseignant; + } + } + + return obj.user_id; +} diff --git a/app/static/js/etud_info.js b/app/static/js/etud_info.js index f1ab66c5..ef04d0c1 100644 --- a/app/static/js/etud_info.js +++ b/app/static/js/etud_info.js @@ -3,59 +3,64 @@ // utilise jQuery / qTip function get_etudid_from_elem(e) { - // renvoie l'etudid, obtenu a partir de l'id de l'element - // qui est soit de la forme xxxx-etudid, soit tout simplement etudid - var etudid = e.id.split("-")[1]; - if (etudid == undefined) { - return e.id; - } else { - return etudid; - } + // renvoie l'etudid, obtenu a partir de l'id de l'element + // qui est soit de la forme xxxx-etudid, soit tout simplement etudid + var etudid = e.id.split("-")[1]; + if (etudid == undefined) { + return e.id; + } else { + return etudid; + } } $().ready(function () { + var elems = $(".etudinfo:not(th)"); - var elems = $(".etudinfo"); - - var q_args = get_query_args(); - var args_to_pass = new Set( - ["formsemestre_id", "group_ids", "group_id", "partition_id", - "moduleimpl_id", "evaluation_id" - ]); - var qs = ""; - for (var k in q_args) { - if (args_to_pass.has(k)) { - qs += '&' + k + '=' + q_args[k]; - } - } - for (var i = 0; i < elems.length; i++) { - $(elems[i]).qtip({ - content: { - ajax: { - url: SCO_URL + "/etud_info_html?etudid=" + get_etudid_from_elem(elems[i]) + qs, - type: "GET" - //success: function(data, status) { - // this.set('content.text', data); - // xxx called twice on each success ??? - // console.log(status); - } - }, - text: "Loading...", - position: { - at: "right bottom", - my: "left top" - }, - style: { - classes: 'qtip-etud' - }, - hide: { - fixed: true, - delay: 300 - } - // utile pour debugguer le css: - // hide: { event: 'unfocus' } - }); + var q_args = get_query_args(); + var args_to_pass = new Set([ + "formsemestre_id", + "group_ids", + "group_id", + "partition_id", + "moduleimpl_id", + "evaluation_id", + ]); + var qs = ""; + for (var k in q_args) { + if (args_to_pass.has(k)) { + qs += "&" + k + "=" + q_args[k]; } + } + for (var i = 0; i < elems.length; i++) { + $(elems[i]).qtip({ + content: { + ajax: { + url: + SCO_URL + + "/etud_info_html?etudid=" + + get_etudid_from_elem(elems[i]) + + qs, + type: "GET", + //success: function(data, status) { + // this.set('content.text', data); + // xxx called twice on each success ??? + // console.log(status); + }, + }, + text: "Loading...", + position: { + at: "right bottom", + my: "left top", + }, + style: { + classes: "qtip-etud", + }, + hide: { + fixed: true, + delay: 300, + }, + // utile pour debugguer le css: + // hide: { event: 'unfocus' } + }); + } }); - - diff --git a/app/static/js/releve-but.js b/app/static/js/releve-but.js index c1fac211..e011d395 100644 --- a/app/static/js/releve-but.js +++ b/app/static/js/releve-but.js @@ -1,70 +1,79 @@ /* Module par Seb. L. */ class releveBUT extends HTMLElement { - constructor() { - super(); - this.shadow = this.attachShadow({ mode: 'open' }); + constructor() { + super(); + this.shadow = this.attachShadow({ mode: "open" }); - /* Config par defaut */ - this.config = { - showURL: true - }; + /* Config par defaut */ + this.config = { + showURL: true, + }; - /* Template du module */ - this.shadow.innerHTML = this.template(); + /* Template du module */ + this.shadow.innerHTML = this.template(); - /* Style du module */ - const styles = document.createElement('link'); - styles.setAttribute('rel', 'stylesheet'); - if (location.href.includes("ScoDoc")) { - styles.setAttribute('href', removeLastTwoComponents(getCurrentScriptPath()) + '/css/releve-but.css'); // Scodoc - } else { - styles.setAttribute('href', '/assets/styles/releve-but.css'); // Passerelle - } - this.shadow.appendChild(styles); - } - listeOnOff() { - this.parentElement.parentElement.classList.toggle("listeOff"); - this.parentElement.parentElement.querySelectorAll(".moduleOnOff").forEach(e => { - e.classList.remove("moduleOnOff") - }) - } - moduleOnOff() { - this.parentElement.classList.toggle("moduleOnOff"); - } - goTo() { - let module = this.dataset.module; - this.parentElement.parentElement.parentElement.parentElement.querySelector("#Module_" + module).scrollIntoView(); - } + /* Style du module */ + const styles = document.createElement("link"); + styles.setAttribute("rel", "stylesheet"); + if (location.href.includes("ScoDoc")) { + styles.setAttribute( + "href", + removeLastTwoComponents(getCurrentScriptPath()) + "/css/releve-but.css" + ); // Scodoc + } else { + styles.setAttribute("href", "/assets/styles/releve-but.css"); // Passerelle + } + this.shadow.appendChild(styles); + } + listeOnOff() { + this.parentElement.parentElement.classList.toggle("listeOff"); + this.parentElement.parentElement + .querySelectorAll(".moduleOnOff") + .forEach((e) => { + e.classList.remove("moduleOnOff"); + }); + } + moduleOnOff() { + this.parentElement.classList.toggle("moduleOnOff"); + } + goTo() { + let module = this.dataset.module; + this.parentElement.parentElement.parentElement.parentElement + .querySelector("#Module_" + module) + .scrollIntoView(); + } - set setConfig(config) { - this.config.showURL = config.showURL ?? this.config.showURL; - } + set setConfig(config) { + this.config.showURL = config.showURL ?? this.config.showURL; + } - set showData(data) { - // this.showInformations(data); - this.showSemestre(data); - this.showSynthese(data); - this.showEvaluations(data); + set showData(data) { + // this.showInformations(data); + this.showSemestre(data); + this.showSynthese(data); + this.showEvaluations(data); - this.showCustom(data); + this.showCustom(data); - this.setOptions(data.options); + this.setOptions(data.options); - this.shadow.querySelectorAll(".CTA_Liste").forEach(e => { - e.addEventListener("click", this.listeOnOff) - }) - this.shadow.querySelectorAll(".ue, .module").forEach(e => { - e.addEventListener("click", this.moduleOnOff) - }) - this.shadow.querySelectorAll(":not(.ueBonus)+.syntheseModule").forEach(e => { - e.addEventListener("click", this.goTo) - }) + this.shadow.querySelectorAll(".CTA_Liste").forEach((e) => { + e.addEventListener("click", this.listeOnOff); + }); + this.shadow.querySelectorAll(".ue, .module").forEach((e) => { + e.addEventListener("click", this.moduleOnOff); + }); + this.shadow + .querySelectorAll(":not(.ueBonus)+.syntheseModule") + .forEach((e) => { + e.addEventListener("click", this.goTo); + }); - this.shadow.children[0].classList.add("ready"); - } + this.shadow.children[0].classList.add("ready"); + } - template() { - return ` + template() { + return `
@@ -140,33 +149,36 @@ class releveBUT extends HTMLElement {
`; - } + } - /********************************/ - /* Informations sur l'étudiant */ - /********************************/ - showInformations(data) { - this.shadow.querySelector(".studentPic").src = data.etudiant.photo_url || "default_Student.svg"; + /********************************/ + /* Informations sur l'étudiant */ + /********************************/ + showInformations(data) { + this.shadow.querySelector(".studentPic").src = + data.etudiant.photo_url || "default_Student.svg"; - let output = ''; + let output = ""; - if (this.config.showURL) { - output += ``; - } else { - output += `
`; - } + if (this.config.showURL) { + output += ``; + } else { + output += `
`; + } - output += ` + output += `
${this.civilite(data.etudiant.civilite)} ${data.etudiant.nom} ${data.etudiant.prenom}`; - if (data.etudiant.date_naissance) { - output += `
né${(data.etudiant.civilite == "F") ? "e" : ""} le ${this.ISOToDate(data.etudiant.date_naissance)}
`; - } + if (data.etudiant.date_naissance) { + output += `
né${ + data.etudiant.civilite == "F" ? "e" : "" + } le ${this.ISOToDate(data.etudiant.date_naissance)}
`; + } - output += ` + output += `
Numéro étudiant : ${data.etudiant.code_nip || "~"} - @@ -174,46 +186,51 @@ class releveBUT extends HTMLElement {
${data.formation.titre}
`; - if (this.config.showURL) { - output += ``; - } else { - output += `
`; - } + if (this.config.showURL) { + output += ``; + } else { + output += `
`; + } - this.shadow.querySelector(".infoEtudiant").innerHTML = output; - } + this.shadow.querySelector(".infoEtudiant").innerHTML = output; + } - /*******************************/ - /* Affichage local */ - /*******************************/ - showCustom(data) { - this.shadow.querySelector(".custom").innerHTML = data.custom || ""; - } + /*******************************/ + /* Affichage local */ + /*******************************/ + showCustom(data) { + this.shadow.querySelector(".custom").innerHTML = data.custom || ""; + } - /*******************************/ - /* Information sur le semestre */ - /*******************************/ - showSemestre(data) { - let correspondanceCodes = { - "ADM": "Admis", - "AJD": "Admis par décision de jury", - "PASD": "Passage de droit : tout n'est pas validé, mais d'après les règles du BUT, vous passez", - "PAS1NCI": "Vous passez par décision de jury mais attention, vous n'avez pas partout le niveau suffisant", - "RED": "Ajourné mais autorisé à redoubler", - "NAR": "Non admis et non autorisé à redoubler : réorientation", - "DEM": "Démission", - "ABAN": "Abandon constaté sans lettre de démission", - "RAT": "En attente d'un rattrapage", - "EXCLU": "Exclusion dans le cadre d'une décision disciplinaire", - "DEF": "Défaillance : non évalué par manque d'assiduité", - "ABL": "Année blanche" - } + /*******************************/ + /* Information sur le semestre */ + /*******************************/ + showSemestre(data) { + let correspondanceCodes = { + ADM: "Admis", + AJD: "Admis par décision de jury", + PASD: "Passage de droit : tout n'est pas validé, mais d'après les règles du BUT, vous passez", + PAS1NCI: + "Vous passez par décision de jury mais attention, vous n'avez pas partout le niveau suffisant", + RED: "Ajourné mais autorisé à redoubler", + NAR: "Non admis et non autorisé à redoubler : réorientation", + DEM: "Démission", + ABAN: "Abandon constaté sans lettre de démission", + RAT: "En attente d'un rattrapage", + EXCLU: "Exclusion dans le cadre d'une décision disciplinaire", + DEF: "Défaillance : non évalué par manque d'assiduité", + ABL: "Année blanche", + }; - this.shadow.querySelector("#identite_etudiant").innerHTML = ` ${data.etudiant.nomprenom} `; - this.shadow.querySelector(".dateInscription").innerHTML += this.ISOToDate(data.semestre.inscription); - let output = ''; - if (!data.options.block_moyenne_generale) { - output += ` + this.shadow.querySelector( + "#identite_etudiant" + ).innerHTML = ` ${data.etudiant.nomprenom} `; + this.shadow.querySelector(".dateInscription").innerHTML += this.ISOToDate( + data.semestre.inscription + ); + let output = ""; + if (!data.options.block_moyenne_generale) { + output += `
Moyenne
${data.semestre.notes.value}
Rang :
${data.semestre.rang.value} / ${data.semestre.rang.total}
@@ -222,64 +239,72 @@ class releveBUT extends HTMLElement {
Min. promo. :
${data.semestre.notes.min}
`; - } - output += ` + } + output += ` ${(() => { - if ((!data.semestre.rang.groupes) || - (Object.keys(data.semestre.rang.groupes).length == 0)) { - return ""; - } - let output = ""; - let [idGroupe, dataGroupe] = Object.entries(data.semestre.rang.groupes)[0]; - output += `
+ if ( + !data.semestre.rang.groupes || + Object.keys(data.semestre.rang.groupes).length == 0 + ) { + return ""; + } + let output = ""; + let [idGroupe, dataGroupe] = Object.entries( + data.semestre.rang.groupes + )[0]; + output += `
${data.semestre.groupes[0]?.group_name}
Rang :
${dataGroupe.value} / ${dataGroupe.total}
`; - //
Max. promo. :
${dataGroupe.max || "-"}
- //
Moy. promo. :
${dataGroupe.moy || "-"}
- //
Min. promo. :
${dataGroupe.min || "-"}
- return output; - })()} + //
Max. promo. :
${dataGroupe.max || "-"}
+ //
Moy. promo. :
${dataGroupe.moy || "-"}
+ //
Min. promo. :
${dataGroupe.min || "-"}
+ return output; + })()}
-
Absences
1/2 jour.
+
Absences
${ + data.semestre.absences?.metrique ?? "1/2 jour." + }
Non justifiées
${data.semestre.absences?.injustifie ?? "-"}
Total
${data.semestre.absences?.total ?? "-"}
`; - if (data.semestre.decision_rcue?.length) { - output += ` + if (data.semestre.decision_rcue?.length) { + output += `
RCUE
${(() => { - let output = ""; - data.semestre.decision_rcue.forEach(competence => { - output += `
${competence.niveau.competence.titre}
${competence.code}
`; - }) - return output; - })()} + let output = ""; + data.semestre.decision_rcue.forEach((competence) => { + output += `
${competence.niveau.competence.titre}
${competence.code}
`; + }); + return output; + })()}
-
` - } - if (data.semestre.decision_ue?.length) { - output += ` +
`; + } + if (data.semestre.decision_ue?.length) { + output += `
UE
${(() => { - let output = ""; - data.semestre.decision_ue.forEach(ue => { - output += `
${ue.acronyme}
${ue.code}
`; - }) - return output; - })()} + let output = ""; + data.semestre.decision_ue.forEach((ue) => { + output += `
${ue.acronyme}
${ue.code}
`; + }); + return output; + })()}
- ` - } + `; + } - output += ` + output += ` - photo de l'étudiant + photo de l'étudiant `; - /*${data.semestre.groupes.map(groupe => { + /*${data.semestre.groupes.map(groupe => { return `
Groupe
${groupe.nom}
@@ -291,37 +316,42 @@ class releveBUT extends HTMLElement { `; }).join("") }*/ - this.shadow.querySelector(".infoSemestre").innerHTML = output; + this.shadow.querySelector(".infoSemestre").innerHTML = output; - - /*if(data.semestre.decision_annee?.code){ + /*if(data.semestre.decision_annee?.code){ this.shadow.querySelector(".decision_annee").innerHTML = "Décision année : " + data.semestre.decision_annee.code + " - " + correspondanceCodes[data.semestre.decision_annee.code]; }*/ - this.shadow.querySelector(".decision").innerHTML = data.semestre.situation || ""; - /*if (data.semestre.decision?.code) { + this.shadow.querySelector(".decision").innerHTML = + data.semestre.situation || ""; + /*if (data.semestre.decision?.code) { this.shadow.querySelector(".decision").innerHTML = "Décision jury: " + (data.semestre.decision?.code || ""); }*/ - this.shadow.querySelector("#ects_tot").innerHTML = "ECTS : " + (data.semestre.ECTS?.acquis ?? "-") + " / " + (data.semestre.ECTS?.total ?? "-"); - } + this.shadow.querySelector("#ects_tot").innerHTML = + "ECTS : " + + (data.semestre.ECTS?.acquis ?? "-") + + " / " + + (data.semestre.ECTS?.total ?? "-"); + } - /*******************************/ - /* Synthèse */ - /*******************************/ - showSynthese(data) { - let output = ``; - /* Fusion et tri des UE et UE capitalisées */ - let fusionUE = [ - ...Object.entries(data.ues), - ...Object.entries(data.ues_capitalisees) - ].sort((a, b) => { - return a[1].numero - b[1].numero - }); + /*******************************/ + /* Synthèse */ + /*******************************/ + showSynthese(data) { + let output = ``; + /* Fusion et tri des UE et UE capitalisées */ + let fusionUE = [ + ...Object.entries(data.ues), + ...Object.entries(data.ues_capitalisees), + ].sort((a, b) => { + return a[1].numero - b[1].numero; + }); - /* Affichage */ - fusionUE.forEach(([ue, dataUE]) => { - if (dataUE.type == 1) { // UE Sport / Bonus - output += ` + /* Affichage */ + fusionUE.forEach(([ue, dataUE]) => { + if (dataUE.type == 1) { + // UE Sport / Bonus + output += `

Bonus

@@ -330,52 +360,64 @@ class releveBUT extends HTMLElement { ${this.ueSport(dataUE.modules)}
`; - } else { - output += ` + } else { + output += `

- ${ue}${(dataUE.titre) ? " - " + dataUE.titre : ""} + ${ue}${dataUE.titre ? " - " + dataUE.titre : ""}

-
Moyenne : ${dataUE.moyenne?.value || dataUE.moyenne || "-"}
-
Rang : ${dataUE.moyenne?.rang} / ${dataUE.moyenne?.total}
+
Moyenne : ${ + dataUE.moyenne?.value || dataUE.moyenne || "-" + }
+
Rang : ${dataUE.moyenne?.rang} / ${ + dataUE.moyenne?.total + }
`; - if (!dataUE.date_capitalisation) { - output += ` Bonus : ${dataUE.bonus || 0} - - Malus : ${dataUE.malus || 0}`; - } else { - output += ` le ${this.ISOToDate(dataUE.date_capitalisation.split("T")[0])} dans ce semestre`; - } + if (!dataUE.date_capitalisation) { + output += ` Bonus : ${dataUE.bonus || 0} - `; + if(dataUE.malus >= 0) { + output += `Malus : ${dataUE.malus || 0}`; + } else { + output += `Bonus complémentaire : ${-dataUE.malus || 0}`; + } + } else { + output += ` le ${this.ISOToDate( + dataUE.date_capitalisation.split("T")[0] + )} dans ce semestre`; + } - output += `  - - ECTS : ${dataUE.ECTS?.acquis ?? "-"} / ${dataUE.ECTS?.total ?? "-"} + output += `  - + ECTS : ${dataUE.ECTS?.acquis ?? "-"} / ${ + dataUE.ECTS?.total ?? "-" + }
`; - /*
+ /*
Abs N.J.
${dataUE.absences?.injustifie || 0}
Total
${dataUE.absences?.total || 0}
*/ - output += "
"; + output += "
"; - if (!dataUE.date_capitalisation) { - output += - this.synthese(data, dataUE.ressources) + - this.synthese(data, dataUE.saes); - } + if (!dataUE.date_capitalisation) { + output += + this.synthese(data, dataUE.ressources) + + this.synthese(data, dataUE.saes); + } - output += "
"; - } - }); - this.shadow.querySelector(".synthese").innerHTML = output; - } - synthese(data, modules) { - let output = ""; - Object.entries(modules).forEach(([module, dataModule]) => { - let titre = data.ressources[module]?.titre || data.saes[module]?.titre; - //let url = data.ressources[module]?.url || data.saes[module]?.url; - output += ` + output += "
"; + } + }); + this.shadow.querySelector(".synthese").innerHTML = output; + } + synthese(data, modules) { + let output = ""; + Object.entries(modules).forEach(([module, dataModule]) => { + let titre = data.ressources[module]?.titre || data.saes[module]?.titre; + //let url = data.ressources[module]?.url || data.saes[module]?.url; + output += `
${module} - ${titre}
@@ -384,14 +426,14 @@ class releveBUT extends HTMLElement {
`; - }) - return output; - } - ueSport(modules) { - let output = ""; - Object.values(modules).forEach((module) => { - Object.values(module.evaluations).forEach((evaluation) => { - output += ` + }); + return output; + } + ueSport(modules) { + let output = ""; + Object.values(modules).forEach((module) => { + Object.values(module.evaluations).forEach((evaluation) => { + output += `
${module.titre} - ${evaluation.description || "Note"}
@@ -400,27 +442,31 @@ class releveBUT extends HTMLElement {
`; - }) - }) - return output; - } + }); + }); + return output; + } - /*******************************/ - /* Evaluations */ - /*******************************/ - showEvaluations(data) { - this.shadow.querySelector(".evaluations").innerHTML = this.module(data.ressources); - this.shadow.querySelector(".sae").innerHTML += this.module(data.saes); - } - module(module) { - let output = ""; - Object.entries(module).forEach(([numero, content]) => { - output += ` + /*******************************/ + /* Evaluations */ + /*******************************/ + showEvaluations(data) { + this.shadow.querySelector(".evaluations").innerHTML = this.module( + data.ressources + ); + this.shadow.querySelector(".sae").innerHTML += this.module(data.saes); + } + module(module) { + let output = ""; + Object.entries(module).forEach(([numero, content]) => { + output += `

${this.URL(content.url, `${numero} - ${content.titre}`)}

-
Moyenne indicative : ${content.moyenne.value}
+
Moyenne indicative : ${ + content.moyenne.value + }
Classe : ${content.moyenne.moy} - Max : ${content.moyenne.max} - @@ -435,14 +481,14 @@ class releveBUT extends HTMLElement { ${this.evaluation(content.evaluations)}
`; - }) - return output; - } + }); + return output; + } - evaluation(evaluations) { - let output = ""; - evaluations.forEach((evaluation) => { - output += ` + evaluation(evaluations) { + let output = ""; + evaluations.forEach((evaluation) => { + output += `
${this.URL(evaluation.url, evaluation.description || "Évaluation")}
@@ -454,52 +500,55 @@ class releveBUT extends HTMLElement {
Max. promo.
${evaluation.note.max}
Moy. promo.
${evaluation.note.moy}
Min. promo.
${evaluation.note.min}
- ${Object.entries(evaluation.poids).map(([UE, poids]) => { - return ` + ${Object.entries(evaluation.poids) + .map(([UE, poids]) => { + return `
Poids ${UE}
${poids}
`; - }).join("")} + }) + .join("")}
`; - }) - return output; - } + }); + return output; + } - /********************/ - /* Options */ - /********************/ - setOptions(options) { - Object.entries(options).forEach(([option, value]) => { - if (value === false) { - this.shadow.children[0].classList.add(option.replace("show", "hide")); - } - }); - } + /********************/ + /* Options */ + /********************/ + setOptions(options) { + Object.entries(options).forEach(([option, value]) => { + if (value === false) { + this.shadow.children[0].classList.add(option.replace("show", "hide")); + } + }); + } + /********************/ + /* Fonctions d'aide */ + /********************/ + URL(href, content) { + if (this.config.showURL) { + return `${content}`; + } else { + return content; + } + } + civilite(txt) { + switch (txt) { + case "M": + return "M."; + case "F": + return "Mme"; + default: + return ""; + } + } - /********************/ - /* Fonctions d'aide */ - /********************/ - URL(href, content) { - if (this.config.showURL) { - return `${content}`; - } else { - return content; - } - } - civilite(txt) { - switch (txt) { - case "M": return "M."; - case "F": return "Mme"; - default: return ""; - } - } - - ISOToDate(ISO) { - return ISO.split("-").reverse().join("/"); - } - + ISOToDate(ISO) { + return ISO.split("-").reverse().join("/"); + } } -customElements.define('releve-but', releveBUT); +customElements.define("releve-but", releveBUT); diff --git a/app/static/libjs/moment-timezone.js b/app/static/libjs/moment-timezone.js new file mode 100644 index 00000000..56fc2799 --- /dev/null +++ b/app/static/libjs/moment-timezone.js @@ -0,0 +1,1597 @@ +//! moment-timezone.js +//! version : 0.5.40 +//! Copyright (c) JS Foundation and other contributors +//! license : MIT +//! github.com/moment/moment-timezone + +(function (root, factory) { + "use strict"; + + /*global define*/ + if (typeof module === "object" && module.exports) { + module.exports = factory(require("moment")); // Node + } else if (typeof define === "function" && define.amd) { + define(["moment"], factory); // AMD + } else { + factory(root.moment); // Browser + } +})(this, function (moment) { + "use strict"; + + // Resolves es6 module loading issue + if (moment.version === undefined && moment.default) { + moment = moment.default; + } + + // Do not load moment-timezone a second time. + // if (moment.tz !== undefined) { + // logError('Moment Timezone ' + moment.tz.version + ' was already loaded ' + (moment.tz.dataVersion ? 'with data from ' : 'without any data') + moment.tz.dataVersion); + // return moment; + // } + + var VERSION = "0.5.40", + zones = {}, + links = {}, + countries = {}, + names = {}, + guesses = {}, + cachedGuess; + + if (!moment || typeof moment.version !== "string") { + logError( + "Moment Timezone requires Moment.js. See https://momentjs.com/timezone/docs/#/use-it/browser/" + ); + } + + var momentVersion = moment.version.split("."), + major = +momentVersion[0], + minor = +momentVersion[1]; + + // Moment.js version check + if (major < 2 || (major === 2 && minor < 6)) { + logError( + "Moment Timezone requires Moment.js >= 2.6.0. You are using Moment.js " + + moment.version + + ". See momentjs.com" + ); + } + + /************************************ + Unpacking + ************************************/ + + function charCodeToInt(charCode) { + if (charCode > 96) { + return charCode - 87; + } else if (charCode > 64) { + return charCode - 29; + } + return charCode - 48; + } + + function unpackBase60(string) { + var i = 0, + parts = string.split("."), + whole = parts[0], + fractional = parts[1] || "", + multiplier = 1, + num, + out = 0, + sign = 1; + + // handle negative numbers + if (string.charCodeAt(0) === 45) { + i = 1; + sign = -1; + } + + // handle digits before the decimal + for (i; i < whole.length; i++) { + num = charCodeToInt(whole.charCodeAt(i)); + out = 60 * out + num; + } + + // handle digits after the decimal + for (i = 0; i < fractional.length; i++) { + multiplier = multiplier / 60; + num = charCodeToInt(fractional.charCodeAt(i)); + out += num * multiplier; + } + + return out * sign; + } + + function arrayToInt(array) { + for (var i = 0; i < array.length; i++) { + array[i] = unpackBase60(array[i]); + } + } + + function intToUntil(array, length) { + for (var i = 0; i < length; i++) { + array[i] = Math.round((array[i - 1] || 0) + array[i] * 60000); // minutes to milliseconds + } + + array[length - 1] = Infinity; + } + + function mapIndices(source, indices) { + var out = [], + i; + + for (i = 0; i < indices.length; i++) { + out[i] = source[indices[i]]; + } + + return out; + } + + function unpack(string) { + var data = string.split("|"), + offsets = data[2].split(" "), + indices = data[3].split(""), + untils = data[4].split(" "); + + arrayToInt(offsets); + arrayToInt(indices); + arrayToInt(untils); + + intToUntil(untils, indices.length); + + return { + name: data[0], + abbrs: mapIndices(data[1].split(" "), indices), + offsets: mapIndices(offsets, indices), + untils: untils, + population: data[5] | 0, + }; + } + + /************************************ + Zone object + ************************************/ + + function Zone(packedString) { + if (packedString) { + this._set(unpack(packedString)); + } + } + + Zone.prototype = { + _set: function (unpacked) { + this.name = unpacked.name; + this.abbrs = unpacked.abbrs; + this.untils = unpacked.untils; + this.offsets = unpacked.offsets; + this.population = unpacked.population; + }, + + _index: function (timestamp) { + var target = +timestamp, + untils = this.untils, + i; + + for (i = 0; i < untils.length; i++) { + if (target < untils[i]) { + return i; + } + } + }, + + countries: function () { + var zone_name = this.name; + return Object.keys(countries).filter(function (country_code) { + return countries[country_code].zones.indexOf(zone_name) !== -1; + }); + }, + + parse: function (timestamp) { + var target = +timestamp, + offsets = this.offsets, + untils = this.untils, + max = untils.length - 1, + offset, + offsetNext, + offsetPrev, + i; + + for (i = 0; i < max; i++) { + offset = offsets[i]; + offsetNext = offsets[i + 1]; + offsetPrev = offsets[i ? i - 1 : i]; + + if (offset < offsetNext && tz.moveAmbiguousForward) { + offset = offsetNext; + } else if (offset > offsetPrev && tz.moveInvalidForward) { + offset = offsetPrev; + } + + if (target < untils[i] - offset * 60000) { + return offsets[i]; + } + } + + return offsets[max]; + }, + + abbr: function (mom) { + return this.abbrs[this._index(mom)]; + }, + + offset: function (mom) { + logError("zone.offset has been deprecated in favor of zone.utcOffset"); + return this.offsets[this._index(mom)]; + }, + + utcOffset: function (mom) { + return this.offsets[this._index(mom)]; + }, + }; + + /************************************ + Country object + ************************************/ + + function Country(country_name, zone_names) { + this.name = country_name; + this.zones = zone_names; + } + + /************************************ + Current Timezone + ************************************/ + + function OffsetAt(at) { + var timeString = at.toTimeString(); + var abbr = timeString.match(/\([a-z ]+\)/i); + if (abbr && abbr[0]) { + // 17:56:31 GMT-0600 (CST) + // 17:56:31 GMT-0600 (Central Standard Time) + abbr = abbr[0].match(/[A-Z]/g); + abbr = abbr ? abbr.join("") : undefined; + } else { + // 17:56:31 CST + // 17:56:31 GMT+0800 (台北標準時間) + abbr = timeString.match(/[A-Z]{3,5}/g); + abbr = abbr ? abbr[0] : undefined; + } + + if (abbr === "GMT") { + abbr = undefined; + } + + this.at = +at; + this.abbr = abbr; + this.offset = at.getTimezoneOffset(); + } + + function ZoneScore(zone) { + this.zone = zone; + this.offsetScore = 0; + this.abbrScore = 0; + } + + ZoneScore.prototype.scoreOffsetAt = function (offsetAt) { + this.offsetScore += Math.abs( + this.zone.utcOffset(offsetAt.at) - offsetAt.offset + ); + if (this.zone.abbr(offsetAt.at).replace(/[^A-Z]/g, "") !== offsetAt.abbr) { + this.abbrScore++; + } + }; + + function findChange(low, high) { + var mid, diff; + + while ((diff = (((high.at - low.at) / 12e4) | 0) * 6e4)) { + mid = new OffsetAt(new Date(low.at + diff)); + if (mid.offset === low.offset) { + low = mid; + } else { + high = mid; + } + } + + return low; + } + + function userOffsets() { + var startYear = new Date().getFullYear() - 2, + last = new OffsetAt(new Date(startYear, 0, 1)), + offsets = [last], + change, + next, + i; + + for (i = 1; i < 48; i++) { + next = new OffsetAt(new Date(startYear, i, 1)); + if (next.offset !== last.offset) { + change = findChange(last, next); + offsets.push(change); + offsets.push(new OffsetAt(new Date(change.at + 6e4))); + } + last = next; + } + + for (i = 0; i < 4; i++) { + offsets.push(new OffsetAt(new Date(startYear + i, 0, 1))); + offsets.push(new OffsetAt(new Date(startYear + i, 6, 1))); + } + + return offsets; + } + + function sortZoneScores(a, b) { + if (a.offsetScore !== b.offsetScore) { + return a.offsetScore - b.offsetScore; + } + if (a.abbrScore !== b.abbrScore) { + return a.abbrScore - b.abbrScore; + } + if (a.zone.population !== b.zone.population) { + return b.zone.population - a.zone.population; + } + return b.zone.name.localeCompare(a.zone.name); + } + + function addToGuesses(name, offsets) { + var i, offset; + arrayToInt(offsets); + for (i = 0; i < offsets.length; i++) { + offset = offsets[i]; + guesses[offset] = guesses[offset] || {}; + guesses[offset][name] = true; + } + } + + function guessesForUserOffsets(offsets) { + var offsetsLength = offsets.length, + filteredGuesses = {}, + out = [], + i, + j, + guessesOffset; + + for (i = 0; i < offsetsLength; i++) { + guessesOffset = guesses[offsets[i].offset] || {}; + for (j in guessesOffset) { + if (guessesOffset.hasOwnProperty(j)) { + filteredGuesses[j] = true; + } + } + } + + for (i in filteredGuesses) { + if (filteredGuesses.hasOwnProperty(i)) { + out.push(names[i]); + } + } + + return out; + } + + function rebuildGuess() { + // use Intl API when available and returning valid time zone + try { + var intlName = Intl.DateTimeFormat().resolvedOptions().timeZone; + if (intlName && intlName.length > 3) { + var name = names[normalizeName(intlName)]; + if (name) { + return name; + } + logError( + "Moment Timezone found " + + intlName + + " from the Intl api, but did not have that data loaded." + ); + } + } catch (e) { + // Intl unavailable, fall back to manual guessing. + } + + var offsets = userOffsets(), + offsetsLength = offsets.length, + guesses = guessesForUserOffsets(offsets), + zoneScores = [], + zoneScore, + i, + j; + + for (i = 0; i < guesses.length; i++) { + zoneScore = new ZoneScore(getZone(guesses[i]), offsetsLength); + for (j = 0; j < offsetsLength; j++) { + zoneScore.scoreOffsetAt(offsets[j]); + } + zoneScores.push(zoneScore); + } + + zoneScores.sort(sortZoneScores); + + return zoneScores.length > 0 ? zoneScores[0].zone.name : undefined; + } + + function guess(ignoreCache) { + if (!cachedGuess || ignoreCache) { + cachedGuess = rebuildGuess(); + } + return cachedGuess; + } + + /************************************ + Global Methods + ************************************/ + + function normalizeName(name) { + return (name || "").toLowerCase().replace(/\//g, "_"); + } + + function addZone(packed) { + var i, name, split, normalized; + + if (typeof packed === "string") { + packed = [packed]; + } + + for (i = 0; i < packed.length; i++) { + split = packed[i].split("|"); + name = split[0]; + normalized = normalizeName(name); + zones[normalized] = packed[i]; + names[normalized] = name; + addToGuesses(normalized, split[2].split(" ")); + } + } + + function getZone(name, caller) { + name = normalizeName(name); + + var zone = zones[name]; + var link; + + if (zone instanceof Zone) { + return zone; + } + + if (typeof zone === "string") { + zone = new Zone(zone); + zones[name] = zone; + return zone; + } + + // Pass getZone to prevent recursion more than 1 level deep + if ( + links[name] && + caller !== getZone && + (link = getZone(links[name], getZone)) + ) { + zone = zones[name] = new Zone(); + zone._set(link); + zone.name = names[name]; + return zone; + } + + return null; + } + + function getNames() { + var i, + out = []; + + for (i in names) { + if ( + names.hasOwnProperty(i) && + (zones[i] || zones[links[i]]) && + names[i] + ) { + out.push(names[i]); + } + } + + return out.sort(); + } + + function getCountryNames() { + return Object.keys(countries); + } + + function addLink(aliases) { + var i, alias, normal0, normal1; + + if (typeof aliases === "string") { + aliases = [aliases]; + } + + for (i = 0; i < aliases.length; i++) { + alias = aliases[i].split("|"); + + normal0 = normalizeName(alias[0]); + normal1 = normalizeName(alias[1]); + + links[normal0] = normal1; + names[normal0] = alias[0]; + + links[normal1] = normal0; + names[normal1] = alias[1]; + } + } + + function addCountries(data) { + var i, country_code, country_zones, split; + if (!data || !data.length) return; + for (i = 0; i < data.length; i++) { + split = data[i].split("|"); + country_code = split[0].toUpperCase(); + country_zones = split[1].split(" "); + countries[country_code] = new Country(country_code, country_zones); + } + } + + function getCountry(name) { + name = name.toUpperCase(); + return countries[name] || null; + } + + function zonesForCountry(country, with_offset) { + country = getCountry(country); + + if (!country) return null; + + var zones = country.zones.sort(); + + if (with_offset) { + return zones.map(function (zone_name) { + var zone = getZone(zone_name); + return { + name: zone_name, + offset: zone.utcOffset(new Date()), + }; + }); + } + + return zones; + } + + function loadData(data) { + addZone(data.zones); + addLink(data.links); + addCountries(data.countries); + tz.dataVersion = data.version; + } + + function zoneExists(name) { + if (!zoneExists.didShowError) { + zoneExists.didShowError = true; + logError( + "moment.tz.zoneExists('" + + name + + "') has been deprecated in favor of !moment.tz.zone('" + + name + + "')" + ); + } + return !!getZone(name); + } + + function needsOffset(m) { + var isUnixTimestamp = m._f === "X" || m._f === "x"; + return !!(m._a && m._tzm === undefined && !isUnixTimestamp); + } + + function logError(message) { + if (typeof console !== "undefined" && typeof console.error === "function") { + console.error(message); + } + } + + /************************************ + moment.tz namespace + ************************************/ + + function tz(input) { + var args = Array.prototype.slice.call(arguments, 0, -1), + name = arguments[arguments.length - 1], + zone = getZone(name), + out = moment.utc.apply(null, args); + + if (zone && !moment.isMoment(input) && needsOffset(out)) { + out.add(zone.parse(out), "minutes"); + } + + out.tz(name); + + return out; + } + + tz.version = VERSION; + tz.dataVersion = ""; + tz._zones = zones; + tz._links = links; + tz._names = names; + tz._countries = countries; + tz.add = addZone; + tz.link = addLink; + tz.load = loadData; + tz.zone = getZone; + tz.zoneExists = zoneExists; // deprecated in 0.1.0 + tz.guess = guess; + tz.names = getNames; + tz.Zone = Zone; + tz.unpack = unpack; + tz.unpackBase60 = unpackBase60; + tz.needsOffset = needsOffset; + tz.moveInvalidForward = true; + tz.moveAmbiguousForward = false; + tz.countries = getCountryNames; + tz.zonesForCountry = zonesForCountry; + + /************************************ + Interface with Moment.js + ************************************/ + + var fn = moment.fn; + + moment.tz = tz; + + moment.defaultZone = null; + + moment.updateOffset = function (mom, keepTime) { + var zone = moment.defaultZone, + offset; + + if (mom._z === undefined) { + if (zone && needsOffset(mom) && !mom._isUTC) { + mom._d = moment.utc(mom._a)._d; + mom.utc().add(zone.parse(mom), "minutes"); + } + mom._z = zone; + } + if (mom._z) { + offset = mom._z.utcOffset(mom); + if (Math.abs(offset) < 16) { + offset = offset / 60; + } + if (mom.utcOffset !== undefined) { + var z = mom._z; + mom.utcOffset(-offset, keepTime); + mom._z = z; + } else { + mom.zone(offset, keepTime); + } + } + }; + + fn.tz = function (name, keepTime) { + if (name) { + if (typeof name !== "string") { + throw new Error( + "Time zone name must be a string, got " + + name + + " [" + + typeof name + + "]" + ); + } + this._z = getZone(name); + if (this._z) { + moment.updateOffset(this, keepTime); + } else { + logError( + "Moment Timezone has no data for " + + name + + ". See http://momentjs.com/timezone/docs/#/data-loading/." + ); + } + return this; + } + if (this._z) { + return this._z.name; + } + }; + + function abbrWrap(old) { + return function () { + if (this._z) { + return this._z.abbr(this); + } + return old.call(this); + }; + } + + function resetZoneWrap(old) { + return function () { + this._z = null; + return old.apply(this, arguments); + }; + } + + function resetZoneWrap2(old) { + return function () { + if (arguments.length > 0) this._z = null; + return old.apply(this, arguments); + }; + } + + fn.zoneName = abbrWrap(fn.zoneName); + fn.zoneAbbr = abbrWrap(fn.zoneAbbr); + fn.utc = resetZoneWrap(fn.utc); + fn.local = resetZoneWrap(fn.local); + fn.utcOffset = resetZoneWrap2(fn.utcOffset); + + moment.tz.setDefault = function (name) { + if (major < 2 || (major === 2 && minor < 9)) { + logError( + "Moment Timezone setDefault() requires Moment.js >= 2.9.0. You are using Moment.js " + + moment.version + + "." + ); + } + moment.defaultZone = name ? getZone(name) : null; + return moment; + }; + + // Cloning a moment should include the _z property. + var momentProperties = moment.momentProperties; + if (Object.prototype.toString.call(momentProperties) === "[object Array]") { + // moment 2.8.1+ + momentProperties.push("_z"); + momentProperties.push("_a"); + } else if (momentProperties) { + // moment 2.7.0 + momentProperties._z = null; + } + + loadData({ + version: "2022g", + zones: [ + "Africa/Abidjan|GMT|0|0||48e5", + "Africa/Nairobi|EAT|-30|0||47e5", + "Africa/Algiers|CET|-10|0||26e5", + "Africa/Lagos|WAT|-10|0||17e6", + "Africa/Maputo|CAT|-20|0||26e5", + "Africa/Cairo|EET|-20|0||15e6", + "Africa/Casablanca|+00 +01|0 -10|01010101010101010101010101|1T0q0 mo0 gM0 LA0 WM0 jA0 e00 28M0 e00 2600 gM0 2600 e00 2600 gM0 2600 gM0 2600 e00 2600 gM0 2600 e00 28M0 e00|32e5", + "Europe/Paris|CET CEST|-10 -20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|11e6", + "Africa/Johannesburg|SAST|-20|0||84e5", + "Africa/Juba|EAT CAT|-30 -20|01|24nx0|", + "Africa/Khartoum|EAT CAT|-30 -20|01|1Usl0|51e5", + "Africa/Sao_Tome|GMT WAT|0 -10|010|1UQN0 2q00|", + "Africa/Windhoek|CAT WAT|-20 -10|010|1T3c0 11B0|32e4", + "America/Adak|HST HDT|a0 90|01010101010101010101010|1ST00 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|326", + "America/Anchorage|AKST AKDT|90 80|01010101010101010101010|1SSX0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|30e4", + "America/Santo_Domingo|AST|40|0||29e5", + "America/Fortaleza|-03|30|0||34e5", + "America/Asuncion|-03 -04|30 40|01010101010101010101010|1T0r0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0|28e5", + "America/Panama|EST|50|0||15e5", + "America/Mexico_City|CST CDT|60 50|0101010101010|1T3k0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|20e6", + "America/Managua|CST|60|0||22e5", + "America/Caracas|-04|40|0||29e5", + "America/Lima|-05|50|0||11e6", + "America/Denver|MST MDT|70 60|01010101010101010101010|1SSV0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|26e5", + "America/Campo_Grande|-03 -04|30 40|010101|1SKr0 1zd0 On0 1HB0 FX0|77e4", + "America/Chicago|CST CDT|60 50|01010101010101010101010|1SSU0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|92e5", + "America/Chihuahua|MST MDT CST|70 60 60|0101010101012|1T3l0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|81e4", + "America/Ciudad_Juarez|MST MDT CST|70 60 60|010101010101201010101010|1SSV0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0 cm0 EP0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|", + "America/Phoenix|MST|70|0||42e5", + "America/Whitehorse|PST PDT MST|80 70 70|010101012|1SSW0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1z90|23e3", + "America/New_York|EST EDT|50 40|01010101010101010101010|1SST0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|21e6", + "America/Los_Angeles|PST PDT|80 70|01010101010101010101010|1SSW0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|15e6", + "America/Halifax|AST ADT|40 30|01010101010101010101010|1SSS0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|39e4", + "America/Godthab|-03 -02|30 20|01010101010101|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0|17e3", + "America/Grand_Turk|AST EDT EST|40 40 50|012121212121212121212|1Vkv0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|37e2", + "America/Havana|CST CDT|50 40|01010101010101010101010|1SSR0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0|21e5", + "America/Mazatlan|MST MDT|70 60|0101010101010|1T3l0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|44e4", + "America/Metlakatla|AKST AKDT PST|90 80 80|010120101010101010101010|1SSX0 1zb0 Op0 1zb0 uM0 jB0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|14e2", + "America/Miquelon|-03 -02|30 20|01010101010101010101010|1SSR0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|61e2", + "America/Noronha|-02|20|0||30e2", + "America/Ojinaga|MST MDT CST CDT|70 60 60 50|01010101010123232323232|1SSV0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0 Rc0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|23e3", + "America/Santiago|-03 -04|30 40|01010101010101010101010|1Tk30 Ap0 1Nb0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|62e5", + "America/Sao_Paulo|-02 -03|20 30|010101|1SKq0 1zd0 On0 1HB0 FX0|20e6", + "Atlantic/Azores|-01 +00|10 0|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|25e4", + "America/St_Johns|NST NDT|3u 2u|01010101010101010101010|1SSRu 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|11e4", + "Antarctica/Casey|+11 +08|-b0 -80|0101010|1Vkh0 1o30 14k0 1kr0 12l0 1o01|10", + "Asia/Bangkok|+07|-70|0||15e6", + "Asia/Vladivostok|+10|-a0|0||60e4", + "Australia/Sydney|AEDT AEST|-b0 -a0|01010101010101010101010|1T340 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|40e5", + "Asia/Tashkent|+05|-50|0||23e5", + "Pacific/Auckland|NZDT NZST|-d0 -c0|01010101010101010101010|1T320 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00|14e5", + "Europe/Istanbul|+03|-30|0||13e6", + "Antarctica/Troll|+00 +02|0 -20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|40", + "Asia/Dhaka|+06|-60|0||16e6", + "Asia/Amman|EET EEST +03|-20 -30 -30|0101010101012|1T2m0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 LA0 1C00|25e5", + "Asia/Kamchatka|+12|-c0|0||18e4", + "Asia/Dubai|+04|-40|0||39e5", + "Asia/Beirut|EET EEST|-20 -30|01010101010101010101010|1T0m0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0|22e5", + "Asia/Kuala_Lumpur|+08|-80|0||71e5", + "Asia/Kolkata|IST|-5u|0||15e6", + "Asia/Chita|+09|-90|0||33e4", + "Asia/Shanghai|CST|-80|0||23e6", + "Asia/Colombo|+0530|-5u|0||22e5", + "Asia/Damascus|EET EEST +03|-20 -30 -30|0101010101012|1T2m0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0|26e5", + "Asia/Famagusta|+03 EET EEST|-30 -20 -30|0121212121212121212121|1Urd0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|", + "Asia/Gaza|EET EEST|-20 -30|01010101010101010101010|1SXX0 1qL0 WN0 1qL0 11c0 1on0 11B0 1o00 11A0 1qo0 XA0 1qp0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0|18e5", + "Asia/Hong_Kong|HKT|-80|0||73e5", + "Asia/Jakarta|WIB|-70|0||31e6", + "Asia/Jayapura|WIT|-90|0||26e4", + "Asia/Jerusalem|IST IDT|-20 -30|01010101010101010101010|1SXA0 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1oL0 10N0 1rz0|81e4", + "Asia/Kabul|+0430|-4u|0||46e5", + "Asia/Karachi|PKT|-50|0||24e6", + "Asia/Kathmandu|+0545|-5J|0||12e5", + "Asia/Sakhalin|+11|-b0|0||58e4", + "Asia/Makassar|WITA|-80|0||15e5", + "Asia/Manila|PST|-80|0||24e6", + "Europe/Athens|EET EEST|-20 -30|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|35e5", + "Asia/Pyongyang|KST KST|-8u -90|01|1VGf0|29e5", + "Asia/Qyzylorda|+06 +05|-60 -50|01|1Xei0|73e4", + "Asia/Rangoon|+0630|-6u|0||48e5", + "Asia/Seoul|KST|-90|0||23e6", + "Asia/Tehran|+0330 +0430|-3u -4u|0101010101010|1SWIu 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0|14e6", + "Asia/Tokyo|JST|-90|0||38e6", + "Europe/Lisbon|WET WEST|0 -10|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|27e5", + "Atlantic/Cape_Verde|-01|10|0||50e4", + "Australia/Adelaide|ACDT ACST|-au -9u|01010101010101010101010|1T34u 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|11e5", + "Australia/Brisbane|AEST|-a0|0||20e5", + "Australia/Darwin|ACST|-9u|0||12e4", + "Australia/Eucla|+0845|-8J|0||368", + "Australia/Lord_Howe|+11 +1030|-b0 -au|01010101010101010101010|1T330 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1fzu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu|347", + "Australia/Perth|AWST|-80|0||18e5", + "Pacific/Easter|-05 -06|50 60|01010101010101010101010|1Tk30 Ap0 1Nb0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|30e2", + "Europe/Dublin|GMT IST|0 -10|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|12e5", + "Etc/GMT-1|+01|-10|0||", + "Pacific/Fakaofo|+13|-d0|0||483", + "Pacific/Kiritimati|+14|-e0|0||51e2", + "Etc/GMT-2|+02|-20|0||", + "Pacific/Tahiti|-10|a0|0||18e4", + "Pacific/Niue|-11|b0|0||12e2", + "Etc/GMT+12|-12|c0|0||", + "Pacific/Galapagos|-06|60|0||25e3", + "Etc/GMT+7|-07|70|0||", + "Pacific/Pitcairn|-08|80|0||56", + "Pacific/Gambier|-09|90|0||125", + "Etc/UTC|UTC|0|0||", + "Europe/London|GMT BST|0 -10|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|10e6", + "Europe/Chisinau|EET EEST|-20 -30|01010101010101010101010|1T0o0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|67e4", + "Europe/Moscow|MSK|-30|0||16e6", + "Europe/Volgograd|+03 +04|-30 -40|010|1WQL0 5gn0|10e5", + "Pacific/Honolulu|HST|a0|0||37e4", + "MET|MET MEST|-10 -20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|", + "Pacific/Chatham|+1345 +1245|-dJ -cJ|01010101010101010101010|1T320 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00|600", + "Pacific/Apia|+14 +13|-e0 -d0|0101010101|1T320 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0|37e3", + "Pacific/Fiji|+13 +12|-d0 -c0|0101010101|1Swe0 1VA0 s00 1VA0 s00 20o0 pc0 2hc0 bc0|88e4", + "Pacific/Guam|ChST|-a0|0||17e4", + "Pacific/Marquesas|-0930|9u|0||86e2", + "Pacific/Pago_Pago|SST|b0|0||37e2", + "Pacific/Norfolk|+11 +12|-b0 -c0|010101010101010101|219P0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|25e4", + "Pacific/Tongatapu|+14 +13|-e0 -d0|01|1Swd0|75e3", + ], + links: [ + "Africa/Abidjan|Africa/Accra", + "Africa/Abidjan|Africa/Bamako", + "Africa/Abidjan|Africa/Banjul", + "Africa/Abidjan|Africa/Bissau", + "Africa/Abidjan|Africa/Conakry", + "Africa/Abidjan|Africa/Dakar", + "Africa/Abidjan|Africa/Freetown", + "Africa/Abidjan|Africa/Lome", + "Africa/Abidjan|Africa/Monrovia", + "Africa/Abidjan|Africa/Nouakchott", + "Africa/Abidjan|Africa/Ouagadougou", + "Africa/Abidjan|Africa/Timbuktu", + "Africa/Abidjan|America/Danmarkshavn", + "Africa/Abidjan|Atlantic/Reykjavik", + "Africa/Abidjan|Atlantic/St_Helena", + "Africa/Abidjan|Etc/GMT", + "Africa/Abidjan|Etc/GMT+0", + "Africa/Abidjan|Etc/GMT-0", + "Africa/Abidjan|Etc/GMT0", + "Africa/Abidjan|Etc/Greenwich", + "Africa/Abidjan|GMT", + "Africa/Abidjan|GMT+0", + "Africa/Abidjan|GMT-0", + "Africa/Abidjan|GMT0", + "Africa/Abidjan|Greenwich", + "Africa/Abidjan|Iceland", + "Africa/Algiers|Africa/Tunis", + "Africa/Cairo|Africa/Tripoli", + "Africa/Cairo|Egypt", + "Africa/Cairo|Europe/Kaliningrad", + "Africa/Cairo|Libya", + "Africa/Casablanca|Africa/El_Aaiun", + "Africa/Johannesburg|Africa/Maseru", + "Africa/Johannesburg|Africa/Mbabane", + "Africa/Lagos|Africa/Bangui", + "Africa/Lagos|Africa/Brazzaville", + "Africa/Lagos|Africa/Douala", + "Africa/Lagos|Africa/Kinshasa", + "Africa/Lagos|Africa/Libreville", + "Africa/Lagos|Africa/Luanda", + "Africa/Lagos|Africa/Malabo", + "Africa/Lagos|Africa/Ndjamena", + "Africa/Lagos|Africa/Niamey", + "Africa/Lagos|Africa/Porto-Novo", + "Africa/Maputo|Africa/Blantyre", + "Africa/Maputo|Africa/Bujumbura", + "Africa/Maputo|Africa/Gaborone", + "Africa/Maputo|Africa/Harare", + "Africa/Maputo|Africa/Kigali", + "Africa/Maputo|Africa/Lubumbashi", + "Africa/Maputo|Africa/Lusaka", + "Africa/Nairobi|Africa/Addis_Ababa", + "Africa/Nairobi|Africa/Asmara", + "Africa/Nairobi|Africa/Asmera", + "Africa/Nairobi|Africa/Dar_es_Salaam", + "Africa/Nairobi|Africa/Djibouti", + "Africa/Nairobi|Africa/Kampala", + "Africa/Nairobi|Africa/Mogadishu", + "Africa/Nairobi|Indian/Antananarivo", + "Africa/Nairobi|Indian/Comoro", + "Africa/Nairobi|Indian/Mayotte", + "America/Adak|America/Atka", + "America/Adak|US/Aleutian", + "America/Anchorage|America/Juneau", + "America/Anchorage|America/Nome", + "America/Anchorage|America/Sitka", + "America/Anchorage|America/Yakutat", + "America/Anchorage|US/Alaska", + "America/Campo_Grande|America/Cuiaba", + "America/Caracas|America/Boa_Vista", + "America/Caracas|America/Guyana", + "America/Caracas|America/La_Paz", + "America/Caracas|America/Manaus", + "America/Caracas|America/Porto_Velho", + "America/Caracas|Brazil/West", + "America/Caracas|Etc/GMT+4", + "America/Chicago|America/Indiana/Knox", + "America/Chicago|America/Indiana/Tell_City", + "America/Chicago|America/Knox_IN", + "America/Chicago|America/Matamoros", + "America/Chicago|America/Menominee", + "America/Chicago|America/North_Dakota/Beulah", + "America/Chicago|America/North_Dakota/Center", + "America/Chicago|America/North_Dakota/New_Salem", + "America/Chicago|America/Rainy_River", + "America/Chicago|America/Rankin_Inlet", + "America/Chicago|America/Resolute", + "America/Chicago|America/Winnipeg", + "America/Chicago|CST6CDT", + "America/Chicago|Canada/Central", + "America/Chicago|US/Central", + "America/Chicago|US/Indiana-Starke", + "America/Denver|America/Boise", + "America/Denver|America/Cambridge_Bay", + "America/Denver|America/Edmonton", + "America/Denver|America/Inuvik", + "America/Denver|America/Shiprock", + "America/Denver|America/Yellowknife", + "America/Denver|Canada/Mountain", + "America/Denver|MST7MDT", + "America/Denver|Navajo", + "America/Denver|US/Mountain", + "America/Fortaleza|America/Araguaina", + "America/Fortaleza|America/Argentina/Buenos_Aires", + "America/Fortaleza|America/Argentina/Catamarca", + "America/Fortaleza|America/Argentina/ComodRivadavia", + "America/Fortaleza|America/Argentina/Cordoba", + "America/Fortaleza|America/Argentina/Jujuy", + "America/Fortaleza|America/Argentina/La_Rioja", + "America/Fortaleza|America/Argentina/Mendoza", + "America/Fortaleza|America/Argentina/Rio_Gallegos", + "America/Fortaleza|America/Argentina/Salta", + "America/Fortaleza|America/Argentina/San_Juan", + "America/Fortaleza|America/Argentina/San_Luis", + "America/Fortaleza|America/Argentina/Tucuman", + "America/Fortaleza|America/Argentina/Ushuaia", + "America/Fortaleza|America/Bahia", + "America/Fortaleza|America/Belem", + "America/Fortaleza|America/Buenos_Aires", + "America/Fortaleza|America/Catamarca", + "America/Fortaleza|America/Cayenne", + "America/Fortaleza|America/Cordoba", + "America/Fortaleza|America/Jujuy", + "America/Fortaleza|America/Maceio", + "America/Fortaleza|America/Mendoza", + "America/Fortaleza|America/Montevideo", + "America/Fortaleza|America/Paramaribo", + "America/Fortaleza|America/Punta_Arenas", + "America/Fortaleza|America/Recife", + "America/Fortaleza|America/Rosario", + "America/Fortaleza|America/Santarem", + "America/Fortaleza|Antarctica/Palmer", + "America/Fortaleza|Antarctica/Rothera", + "America/Fortaleza|Atlantic/Stanley", + "America/Fortaleza|Etc/GMT+3", + "America/Godthab|America/Nuuk", + "America/Halifax|America/Glace_Bay", + "America/Halifax|America/Goose_Bay", + "America/Halifax|America/Moncton", + "America/Halifax|America/Thule", + "America/Halifax|Atlantic/Bermuda", + "America/Halifax|Canada/Atlantic", + "America/Havana|Cuba", + "America/Lima|America/Bogota", + "America/Lima|America/Eirunepe", + "America/Lima|America/Guayaquil", + "America/Lima|America/Porto_Acre", + "America/Lima|America/Rio_Branco", + "America/Lima|Brazil/Acre", + "America/Lima|Etc/GMT+5", + "America/Los_Angeles|America/Ensenada", + "America/Los_Angeles|America/Santa_Isabel", + "America/Los_Angeles|America/Tijuana", + "America/Los_Angeles|America/Vancouver", + "America/Los_Angeles|Canada/Pacific", + "America/Los_Angeles|Mexico/BajaNorte", + "America/Los_Angeles|PST8PDT", + "America/Los_Angeles|US/Pacific", + "America/Managua|America/Belize", + "America/Managua|America/Costa_Rica", + "America/Managua|America/El_Salvador", + "America/Managua|America/Guatemala", + "America/Managua|America/Regina", + "America/Managua|America/Swift_Current", + "America/Managua|America/Tegucigalpa", + "America/Managua|Canada/Saskatchewan", + "America/Mazatlan|Mexico/BajaSur", + "America/Mexico_City|America/Bahia_Banderas", + "America/Mexico_City|America/Merida", + "America/Mexico_City|America/Monterrey", + "America/Mexico_City|Mexico/General", + "America/New_York|America/Detroit", + "America/New_York|America/Fort_Wayne", + "America/New_York|America/Indiana/Indianapolis", + "America/New_York|America/Indiana/Marengo", + "America/New_York|America/Indiana/Petersburg", + "America/New_York|America/Indiana/Vevay", + "America/New_York|America/Indiana/Vincennes", + "America/New_York|America/Indiana/Winamac", + "America/New_York|America/Indianapolis", + "America/New_York|America/Iqaluit", + "America/New_York|America/Kentucky/Louisville", + "America/New_York|America/Kentucky/Monticello", + "America/New_York|America/Louisville", + "America/New_York|America/Montreal", + "America/New_York|America/Nassau", + "America/New_York|America/Nipigon", + "America/New_York|America/Pangnirtung", + "America/New_York|America/Port-au-Prince", + "America/New_York|America/Thunder_Bay", + "America/New_York|America/Toronto", + "America/New_York|Canada/Eastern", + "America/New_York|EST5EDT", + "America/New_York|US/East-Indiana", + "America/New_York|US/Eastern", + "America/New_York|US/Michigan", + "America/Noronha|Atlantic/South_Georgia", + "America/Noronha|Brazil/DeNoronha", + "America/Noronha|Etc/GMT+2", + "America/Panama|America/Atikokan", + "America/Panama|America/Cancun", + "America/Panama|America/Cayman", + "America/Panama|America/Coral_Harbour", + "America/Panama|America/Jamaica", + "America/Panama|EST", + "America/Panama|Jamaica", + "America/Phoenix|America/Creston", + "America/Phoenix|America/Dawson_Creek", + "America/Phoenix|America/Fort_Nelson", + "America/Phoenix|America/Hermosillo", + "America/Phoenix|MST", + "America/Phoenix|US/Arizona", + "America/Santiago|Chile/Continental", + "America/Santo_Domingo|America/Anguilla", + "America/Santo_Domingo|America/Antigua", + "America/Santo_Domingo|America/Aruba", + "America/Santo_Domingo|America/Barbados", + "America/Santo_Domingo|America/Blanc-Sablon", + "America/Santo_Domingo|America/Curacao", + "America/Santo_Domingo|America/Dominica", + "America/Santo_Domingo|America/Grenada", + "America/Santo_Domingo|America/Guadeloupe", + "America/Santo_Domingo|America/Kralendijk", + "America/Santo_Domingo|America/Lower_Princes", + "America/Santo_Domingo|America/Marigot", + "America/Santo_Domingo|America/Martinique", + "America/Santo_Domingo|America/Montserrat", + "America/Santo_Domingo|America/Port_of_Spain", + "America/Santo_Domingo|America/Puerto_Rico", + "America/Santo_Domingo|America/St_Barthelemy", + "America/Santo_Domingo|America/St_Kitts", + "America/Santo_Domingo|America/St_Lucia", + "America/Santo_Domingo|America/St_Thomas", + "America/Santo_Domingo|America/St_Vincent", + "America/Santo_Domingo|America/Tortola", + "America/Santo_Domingo|America/Virgin", + "America/Sao_Paulo|Brazil/East", + "America/St_Johns|Canada/Newfoundland", + "America/Whitehorse|America/Dawson", + "America/Whitehorse|Canada/Yukon", + "Asia/Bangkok|Antarctica/Davis", + "Asia/Bangkok|Asia/Barnaul", + "Asia/Bangkok|Asia/Ho_Chi_Minh", + "Asia/Bangkok|Asia/Hovd", + "Asia/Bangkok|Asia/Krasnoyarsk", + "Asia/Bangkok|Asia/Novokuznetsk", + "Asia/Bangkok|Asia/Novosibirsk", + "Asia/Bangkok|Asia/Phnom_Penh", + "Asia/Bangkok|Asia/Saigon", + "Asia/Bangkok|Asia/Tomsk", + "Asia/Bangkok|Asia/Vientiane", + "Asia/Bangkok|Etc/GMT-7", + "Asia/Bangkok|Indian/Christmas", + "Asia/Chita|Asia/Dili", + "Asia/Chita|Asia/Khandyga", + "Asia/Chita|Asia/Yakutsk", + "Asia/Chita|Etc/GMT-9", + "Asia/Chita|Pacific/Palau", + "Asia/Dhaka|Antarctica/Vostok", + "Asia/Dhaka|Asia/Almaty", + "Asia/Dhaka|Asia/Bishkek", + "Asia/Dhaka|Asia/Dacca", + "Asia/Dhaka|Asia/Kashgar", + "Asia/Dhaka|Asia/Omsk", + "Asia/Dhaka|Asia/Qostanay", + "Asia/Dhaka|Asia/Thimbu", + "Asia/Dhaka|Asia/Thimphu", + "Asia/Dhaka|Asia/Urumqi", + "Asia/Dhaka|Etc/GMT-6", + "Asia/Dhaka|Indian/Chagos", + "Asia/Dubai|Asia/Baku", + "Asia/Dubai|Asia/Muscat", + "Asia/Dubai|Asia/Tbilisi", + "Asia/Dubai|Asia/Yerevan", + "Asia/Dubai|Etc/GMT-4", + "Asia/Dubai|Europe/Astrakhan", + "Asia/Dubai|Europe/Samara", + "Asia/Dubai|Europe/Saratov", + "Asia/Dubai|Europe/Ulyanovsk", + "Asia/Dubai|Indian/Mahe", + "Asia/Dubai|Indian/Mauritius", + "Asia/Dubai|Indian/Reunion", + "Asia/Gaza|Asia/Hebron", + "Asia/Hong_Kong|Hongkong", + "Asia/Jakarta|Asia/Pontianak", + "Asia/Jerusalem|Asia/Tel_Aviv", + "Asia/Jerusalem|Israel", + "Asia/Kamchatka|Asia/Anadyr", + "Asia/Kamchatka|Etc/GMT-12", + "Asia/Kamchatka|Kwajalein", + "Asia/Kamchatka|Pacific/Funafuti", + "Asia/Kamchatka|Pacific/Kwajalein", + "Asia/Kamchatka|Pacific/Majuro", + "Asia/Kamchatka|Pacific/Nauru", + "Asia/Kamchatka|Pacific/Tarawa", + "Asia/Kamchatka|Pacific/Wake", + "Asia/Kamchatka|Pacific/Wallis", + "Asia/Kathmandu|Asia/Katmandu", + "Asia/Kolkata|Asia/Calcutta", + "Asia/Kuala_Lumpur|Asia/Brunei", + "Asia/Kuala_Lumpur|Asia/Choibalsan", + "Asia/Kuala_Lumpur|Asia/Irkutsk", + "Asia/Kuala_Lumpur|Asia/Kuching", + "Asia/Kuala_Lumpur|Asia/Singapore", + "Asia/Kuala_Lumpur|Asia/Ulaanbaatar", + "Asia/Kuala_Lumpur|Asia/Ulan_Bator", + "Asia/Kuala_Lumpur|Etc/GMT-8", + "Asia/Kuala_Lumpur|Singapore", + "Asia/Makassar|Asia/Ujung_Pandang", + "Asia/Rangoon|Asia/Yangon", + "Asia/Rangoon|Indian/Cocos", + "Asia/Sakhalin|Asia/Magadan", + "Asia/Sakhalin|Asia/Srednekolymsk", + "Asia/Sakhalin|Etc/GMT-11", + "Asia/Sakhalin|Pacific/Bougainville", + "Asia/Sakhalin|Pacific/Efate", + "Asia/Sakhalin|Pacific/Guadalcanal", + "Asia/Sakhalin|Pacific/Kosrae", + "Asia/Sakhalin|Pacific/Noumea", + "Asia/Sakhalin|Pacific/Pohnpei", + "Asia/Sakhalin|Pacific/Ponape", + "Asia/Seoul|ROK", + "Asia/Shanghai|Asia/Chongqing", + "Asia/Shanghai|Asia/Chungking", + "Asia/Shanghai|Asia/Harbin", + "Asia/Shanghai|Asia/Macao", + "Asia/Shanghai|Asia/Macau", + "Asia/Shanghai|Asia/Taipei", + "Asia/Shanghai|PRC", + "Asia/Shanghai|ROC", + "Asia/Tashkent|Antarctica/Mawson", + "Asia/Tashkent|Asia/Aqtau", + "Asia/Tashkent|Asia/Aqtobe", + "Asia/Tashkent|Asia/Ashgabat", + "Asia/Tashkent|Asia/Ashkhabad", + "Asia/Tashkent|Asia/Atyrau", + "Asia/Tashkent|Asia/Dushanbe", + "Asia/Tashkent|Asia/Oral", + "Asia/Tashkent|Asia/Samarkand", + "Asia/Tashkent|Asia/Yekaterinburg", + "Asia/Tashkent|Etc/GMT-5", + "Asia/Tashkent|Indian/Kerguelen", + "Asia/Tashkent|Indian/Maldives", + "Asia/Tehran|Iran", + "Asia/Tokyo|Japan", + "Asia/Vladivostok|Antarctica/DumontDUrville", + "Asia/Vladivostok|Asia/Ust-Nera", + "Asia/Vladivostok|Etc/GMT-10", + "Asia/Vladivostok|Pacific/Chuuk", + "Asia/Vladivostok|Pacific/Port_Moresby", + "Asia/Vladivostok|Pacific/Truk", + "Asia/Vladivostok|Pacific/Yap", + "Atlantic/Azores|America/Scoresbysund", + "Atlantic/Cape_Verde|Etc/GMT+1", + "Australia/Adelaide|Australia/Broken_Hill", + "Australia/Adelaide|Australia/South", + "Australia/Adelaide|Australia/Yancowinna", + "Australia/Brisbane|Australia/Lindeman", + "Australia/Brisbane|Australia/Queensland", + "Australia/Darwin|Australia/North", + "Australia/Lord_Howe|Australia/LHI", + "Australia/Perth|Australia/West", + "Australia/Sydney|Antarctica/Macquarie", + "Australia/Sydney|Australia/ACT", + "Australia/Sydney|Australia/Canberra", + "Australia/Sydney|Australia/Currie", + "Australia/Sydney|Australia/Hobart", + "Australia/Sydney|Australia/Melbourne", + "Australia/Sydney|Australia/NSW", + "Australia/Sydney|Australia/Tasmania", + "Australia/Sydney|Australia/Victoria", + "Etc/UTC|Etc/UCT", + "Etc/UTC|Etc/Universal", + "Etc/UTC|Etc/Zulu", + "Etc/UTC|UCT", + "Etc/UTC|UTC", + "Etc/UTC|Universal", + "Etc/UTC|Zulu", + "Europe/Athens|Asia/Nicosia", + "Europe/Athens|EET", + "Europe/Athens|Europe/Bucharest", + "Europe/Athens|Europe/Helsinki", + "Europe/Athens|Europe/Kiev", + "Europe/Athens|Europe/Kyiv", + "Europe/Athens|Europe/Mariehamn", + "Europe/Athens|Europe/Nicosia", + "Europe/Athens|Europe/Riga", + "Europe/Athens|Europe/Sofia", + "Europe/Athens|Europe/Tallinn", + "Europe/Athens|Europe/Uzhgorod", + "Europe/Athens|Europe/Vilnius", + "Europe/Athens|Europe/Zaporozhye", + "Europe/Chisinau|Europe/Tiraspol", + "Europe/Dublin|Eire", + "Europe/Istanbul|Antarctica/Syowa", + "Europe/Istanbul|Asia/Aden", + "Europe/Istanbul|Asia/Baghdad", + "Europe/Istanbul|Asia/Bahrain", + "Europe/Istanbul|Asia/Istanbul", + "Europe/Istanbul|Asia/Kuwait", + "Europe/Istanbul|Asia/Qatar", + "Europe/Istanbul|Asia/Riyadh", + "Europe/Istanbul|Etc/GMT-3", + "Europe/Istanbul|Europe/Kirov", + "Europe/Istanbul|Europe/Minsk", + "Europe/Istanbul|Turkey", + "Europe/Lisbon|Atlantic/Canary", + "Europe/Lisbon|Atlantic/Faeroe", + "Europe/Lisbon|Atlantic/Faroe", + "Europe/Lisbon|Atlantic/Madeira", + "Europe/Lisbon|Portugal", + "Europe/Lisbon|WET", + "Europe/London|Europe/Belfast", + "Europe/London|Europe/Guernsey", + "Europe/London|Europe/Isle_of_Man", + "Europe/London|Europe/Jersey", + "Europe/London|GB", + "Europe/London|GB-Eire", + "Europe/Moscow|Europe/Simferopol", + "Europe/Moscow|W-SU", + "Europe/Paris|Africa/Ceuta", + "Europe/Paris|Arctic/Longyearbyen", + "Europe/Paris|Atlantic/Jan_Mayen", + "Europe/Paris|CET", + "Europe/Paris|Europe/Amsterdam", + "Europe/Paris|Europe/Andorra", + "Europe/Paris|Europe/Belgrade", + "Europe/Paris|Europe/Berlin", + "Europe/Paris|Europe/Bratislava", + "Europe/Paris|Europe/Brussels", + "Europe/Paris|Europe/Budapest", + "Europe/Paris|Europe/Busingen", + "Europe/Paris|Europe/Copenhagen", + "Europe/Paris|Europe/Gibraltar", + "Europe/Paris|Europe/Ljubljana", + "Europe/Paris|Europe/Luxembourg", + "Europe/Paris|Europe/Madrid", + "Europe/Paris|Europe/Malta", + "Europe/Paris|Europe/Monaco", + "Europe/Paris|Europe/Oslo", + "Europe/Paris|Europe/Podgorica", + "Europe/Paris|Europe/Prague", + "Europe/Paris|Europe/Rome", + "Europe/Paris|Europe/San_Marino", + "Europe/Paris|Europe/Sarajevo", + "Europe/Paris|Europe/Skopje", + "Europe/Paris|Europe/Stockholm", + "Europe/Paris|Europe/Tirane", + "Europe/Paris|Europe/Vaduz", + "Europe/Paris|Europe/Vatican", + "Europe/Paris|Europe/Vienna", + "Europe/Paris|Europe/Warsaw", + "Europe/Paris|Europe/Zagreb", + "Europe/Paris|Europe/Zurich", + "Europe/Paris|Poland", + "Pacific/Auckland|Antarctica/McMurdo", + "Pacific/Auckland|Antarctica/South_Pole", + "Pacific/Auckland|NZ", + "Pacific/Chatham|NZ-CHAT", + "Pacific/Easter|Chile/EasterIsland", + "Pacific/Fakaofo|Etc/GMT-13", + "Pacific/Fakaofo|Pacific/Enderbury", + "Pacific/Fakaofo|Pacific/Kanton", + "Pacific/Galapagos|Etc/GMT+6", + "Pacific/Gambier|Etc/GMT+9", + "Pacific/Guam|Pacific/Saipan", + "Pacific/Honolulu|HST", + "Pacific/Honolulu|Pacific/Johnston", + "Pacific/Honolulu|US/Hawaii", + "Pacific/Kiritimati|Etc/GMT-14", + "Pacific/Niue|Etc/GMT+11", + "Pacific/Pago_Pago|Pacific/Midway", + "Pacific/Pago_Pago|Pacific/Samoa", + "Pacific/Pago_Pago|US/Samoa", + "Pacific/Pitcairn|Etc/GMT+8", + "Pacific/Tahiti|Etc/GMT+10", + "Pacific/Tahiti|Pacific/Rarotonga", + ], + countries: [ + "AD|Europe/Andorra", + "AE|Asia/Dubai", + "AF|Asia/Kabul", + "AG|America/Puerto_Rico America/Antigua", + "AI|America/Puerto_Rico America/Anguilla", + "AL|Europe/Tirane", + "AM|Asia/Yerevan", + "AO|Africa/Lagos Africa/Luanda", + "AQ|Antarctica/Casey Antarctica/Davis Antarctica/Mawson Antarctica/Palmer Antarctica/Rothera Antarctica/Troll Asia/Urumqi Pacific/Auckland Pacific/Port_Moresby Asia/Riyadh Antarctica/McMurdo Antarctica/DumontDUrville Antarctica/Syowa Antarctica/Vostok", + "AR|America/Argentina/Buenos_Aires America/Argentina/Cordoba America/Argentina/Salta America/Argentina/Jujuy America/Argentina/Tucuman America/Argentina/Catamarca America/Argentina/La_Rioja America/Argentina/San_Juan America/Argentina/Mendoza America/Argentina/San_Luis America/Argentina/Rio_Gallegos America/Argentina/Ushuaia", + "AS|Pacific/Pago_Pago", + "AT|Europe/Vienna", + "AU|Australia/Lord_Howe Antarctica/Macquarie Australia/Hobart Australia/Melbourne Australia/Sydney Australia/Broken_Hill Australia/Brisbane Australia/Lindeman Australia/Adelaide Australia/Darwin Australia/Perth Australia/Eucla", + "AW|America/Puerto_Rico America/Aruba", + "AX|Europe/Helsinki Europe/Mariehamn", + "AZ|Asia/Baku", + "BA|Europe/Belgrade Europe/Sarajevo", + "BB|America/Barbados", + "BD|Asia/Dhaka", + "BE|Europe/Brussels", + "BF|Africa/Abidjan Africa/Ouagadougou", + "BG|Europe/Sofia", + "BH|Asia/Qatar Asia/Bahrain", + "BI|Africa/Maputo Africa/Bujumbura", + "BJ|Africa/Lagos Africa/Porto-Novo", + "BL|America/Puerto_Rico America/St_Barthelemy", + "BM|Atlantic/Bermuda", + "BN|Asia/Kuching Asia/Brunei", + "BO|America/La_Paz", + "BQ|America/Puerto_Rico America/Kralendijk", + "BR|America/Noronha America/Belem America/Fortaleza America/Recife America/Araguaina America/Maceio America/Bahia America/Sao_Paulo America/Campo_Grande America/Cuiaba America/Santarem America/Porto_Velho America/Boa_Vista America/Manaus America/Eirunepe America/Rio_Branco", + "BS|America/Toronto America/Nassau", + "BT|Asia/Thimphu", + "BW|Africa/Maputo Africa/Gaborone", + "BY|Europe/Minsk", + "BZ|America/Belize", + "CA|America/St_Johns America/Halifax America/Glace_Bay America/Moncton America/Goose_Bay America/Toronto America/Iqaluit America/Winnipeg America/Resolute America/Rankin_Inlet America/Regina America/Swift_Current America/Edmonton America/Cambridge_Bay America/Yellowknife America/Inuvik America/Dawson_Creek America/Fort_Nelson America/Whitehorse America/Dawson America/Vancouver America/Panama America/Puerto_Rico America/Phoenix America/Blanc-Sablon America/Atikokan America/Creston", + "CC|Asia/Yangon Indian/Cocos", + "CD|Africa/Maputo Africa/Lagos Africa/Kinshasa Africa/Lubumbashi", + "CF|Africa/Lagos Africa/Bangui", + "CG|Africa/Lagos Africa/Brazzaville", + "CH|Europe/Zurich", + "CI|Africa/Abidjan", + "CK|Pacific/Rarotonga", + "CL|America/Santiago America/Punta_Arenas Pacific/Easter", + "CM|Africa/Lagos Africa/Douala", + "CN|Asia/Shanghai Asia/Urumqi", + "CO|America/Bogota", + "CR|America/Costa_Rica", + "CU|America/Havana", + "CV|Atlantic/Cape_Verde", + "CW|America/Puerto_Rico America/Curacao", + "CX|Asia/Bangkok Indian/Christmas", + "CY|Asia/Nicosia Asia/Famagusta", + "CZ|Europe/Prague", + "DE|Europe/Zurich Europe/Berlin Europe/Busingen", + "DJ|Africa/Nairobi Africa/Djibouti", + "DK|Europe/Berlin Europe/Copenhagen", + "DM|America/Puerto_Rico America/Dominica", + "DO|America/Santo_Domingo", + "DZ|Africa/Algiers", + "EC|America/Guayaquil Pacific/Galapagos", + "EE|Europe/Tallinn", + "EG|Africa/Cairo", + "EH|Africa/El_Aaiun", + "ER|Africa/Nairobi Africa/Asmara", + "ES|Europe/Madrid Africa/Ceuta Atlantic/Canary", + "ET|Africa/Nairobi Africa/Addis_Ababa", + "FI|Europe/Helsinki", + "FJ|Pacific/Fiji", + "FK|Atlantic/Stanley", + "FM|Pacific/Kosrae Pacific/Port_Moresby Pacific/Guadalcanal Pacific/Chuuk Pacific/Pohnpei", + "FO|Atlantic/Faroe", + "FR|Europe/Paris", + "GA|Africa/Lagos Africa/Libreville", + "GB|Europe/London", + "GD|America/Puerto_Rico America/Grenada", + "GE|Asia/Tbilisi", + "GF|America/Cayenne", + "GG|Europe/London Europe/Guernsey", + "GH|Africa/Abidjan Africa/Accra", + "GI|Europe/Gibraltar", + "GL|America/Nuuk America/Danmarkshavn America/Scoresbysund America/Thule", + "GM|Africa/Abidjan Africa/Banjul", + "GN|Africa/Abidjan Africa/Conakry", + "GP|America/Puerto_Rico America/Guadeloupe", + "GQ|Africa/Lagos Africa/Malabo", + "GR|Europe/Athens", + "GS|Atlantic/South_Georgia", + "GT|America/Guatemala", + "GU|Pacific/Guam", + "GW|Africa/Bissau", + "GY|America/Guyana", + "HK|Asia/Hong_Kong", + "HN|America/Tegucigalpa", + "HR|Europe/Belgrade Europe/Zagreb", + "HT|America/Port-au-Prince", + "HU|Europe/Budapest", + "ID|Asia/Jakarta Asia/Pontianak Asia/Makassar Asia/Jayapura", + "IE|Europe/Dublin", + "IL|Asia/Jerusalem", + "IM|Europe/London Europe/Isle_of_Man", + "IN|Asia/Kolkata", + "IO|Indian/Chagos", + "IQ|Asia/Baghdad", + "IR|Asia/Tehran", + "IS|Africa/Abidjan Atlantic/Reykjavik", + "IT|Europe/Rome", + "JE|Europe/London Europe/Jersey", + "JM|America/Jamaica", + "JO|Asia/Amman", + "JP|Asia/Tokyo", + "KE|Africa/Nairobi", + "KG|Asia/Bishkek", + "KH|Asia/Bangkok Asia/Phnom_Penh", + "KI|Pacific/Tarawa Pacific/Kanton Pacific/Kiritimati", + "KM|Africa/Nairobi Indian/Comoro", + "KN|America/Puerto_Rico America/St_Kitts", + "KP|Asia/Pyongyang", + "KR|Asia/Seoul", + "KW|Asia/Riyadh Asia/Kuwait", + "KY|America/Panama America/Cayman", + "KZ|Asia/Almaty Asia/Qyzylorda Asia/Qostanay Asia/Aqtobe Asia/Aqtau Asia/Atyrau Asia/Oral", + "LA|Asia/Bangkok Asia/Vientiane", + "LB|Asia/Beirut", + "LC|America/Puerto_Rico America/St_Lucia", + "LI|Europe/Zurich Europe/Vaduz", + "LK|Asia/Colombo", + "LR|Africa/Monrovia", + "LS|Africa/Johannesburg Africa/Maseru", + "LT|Europe/Vilnius", + "LU|Europe/Brussels Europe/Luxembourg", + "LV|Europe/Riga", + "LY|Africa/Tripoli", + "MA|Africa/Casablanca", + "MC|Europe/Paris Europe/Monaco", + "MD|Europe/Chisinau", + "ME|Europe/Belgrade Europe/Podgorica", + "MF|America/Puerto_Rico America/Marigot", + "MG|Africa/Nairobi Indian/Antananarivo", + "MH|Pacific/Tarawa Pacific/Kwajalein Pacific/Majuro", + "MK|Europe/Belgrade Europe/Skopje", + "ML|Africa/Abidjan Africa/Bamako", + "MM|Asia/Yangon", + "MN|Asia/Ulaanbaatar Asia/Hovd Asia/Choibalsan", + "MO|Asia/Macau", + "MP|Pacific/Guam Pacific/Saipan", + "MQ|America/Martinique", + "MR|Africa/Abidjan Africa/Nouakchott", + "MS|America/Puerto_Rico America/Montserrat", + "MT|Europe/Malta", + "MU|Indian/Mauritius", + "MV|Indian/Maldives", + "MW|Africa/Maputo Africa/Blantyre", + "MX|America/Mexico_City America/Cancun America/Merida America/Monterrey America/Matamoros America/Chihuahua America/Ciudad_Juarez America/Ojinaga America/Mazatlan America/Bahia_Banderas America/Hermosillo America/Tijuana", + "MY|Asia/Kuching Asia/Singapore Asia/Kuala_Lumpur", + "MZ|Africa/Maputo", + "NA|Africa/Windhoek", + "NC|Pacific/Noumea", + "NE|Africa/Lagos Africa/Niamey", + "NF|Pacific/Norfolk", + "NG|Africa/Lagos", + "NI|America/Managua", + "NL|Europe/Brussels Europe/Amsterdam", + "NO|Europe/Berlin Europe/Oslo", + "NP|Asia/Kathmandu", + "NR|Pacific/Nauru", + "NU|Pacific/Niue", + "NZ|Pacific/Auckland Pacific/Chatham", + "OM|Asia/Dubai Asia/Muscat", + "PA|America/Panama", + "PE|America/Lima", + "PF|Pacific/Tahiti Pacific/Marquesas Pacific/Gambier", + "PG|Pacific/Port_Moresby Pacific/Bougainville", + "PH|Asia/Manila", + "PK|Asia/Karachi", + "PL|Europe/Warsaw", + "PM|America/Miquelon", + "PN|Pacific/Pitcairn", + "PR|America/Puerto_Rico", + "PS|Asia/Gaza Asia/Hebron", + "PT|Europe/Lisbon Atlantic/Madeira Atlantic/Azores", + "PW|Pacific/Palau", + "PY|America/Asuncion", + "QA|Asia/Qatar", + "RE|Asia/Dubai Indian/Reunion", + "RO|Europe/Bucharest", + "RS|Europe/Belgrade", + "RU|Europe/Kaliningrad Europe/Moscow Europe/Simferopol Europe/Kirov Europe/Volgograd Europe/Astrakhan Europe/Saratov Europe/Ulyanovsk Europe/Samara Asia/Yekaterinburg Asia/Omsk Asia/Novosibirsk Asia/Barnaul Asia/Tomsk Asia/Novokuznetsk Asia/Krasnoyarsk Asia/Irkutsk Asia/Chita Asia/Yakutsk Asia/Khandyga Asia/Vladivostok Asia/Ust-Nera Asia/Magadan Asia/Sakhalin Asia/Srednekolymsk Asia/Kamchatka Asia/Anadyr", + "RW|Africa/Maputo Africa/Kigali", + "SA|Asia/Riyadh", + "SB|Pacific/Guadalcanal", + "SC|Asia/Dubai Indian/Mahe", + "SD|Africa/Khartoum", + "SE|Europe/Berlin Europe/Stockholm", + "SG|Asia/Singapore", + "SH|Africa/Abidjan Atlantic/St_Helena", + "SI|Europe/Belgrade Europe/Ljubljana", + "SJ|Europe/Berlin Arctic/Longyearbyen", + "SK|Europe/Prague Europe/Bratislava", + "SL|Africa/Abidjan Africa/Freetown", + "SM|Europe/Rome Europe/San_Marino", + "SN|Africa/Abidjan Africa/Dakar", + "SO|Africa/Nairobi Africa/Mogadishu", + "SR|America/Paramaribo", + "SS|Africa/Juba", + "ST|Africa/Sao_Tome", + "SV|America/El_Salvador", + "SX|America/Puerto_Rico America/Lower_Princes", + "SY|Asia/Damascus", + "SZ|Africa/Johannesburg Africa/Mbabane", + "TC|America/Grand_Turk", + "TD|Africa/Ndjamena", + "TF|Asia/Dubai Indian/Maldives Indian/Kerguelen", + "TG|Africa/Abidjan Africa/Lome", + "TH|Asia/Bangkok", + "TJ|Asia/Dushanbe", + "TK|Pacific/Fakaofo", + "TL|Asia/Dili", + "TM|Asia/Ashgabat", + "TN|Africa/Tunis", + "TO|Pacific/Tongatapu", + "TR|Europe/Istanbul", + "TT|America/Puerto_Rico America/Port_of_Spain", + "TV|Pacific/Tarawa Pacific/Funafuti", + "TW|Asia/Taipei", + "TZ|Africa/Nairobi Africa/Dar_es_Salaam", + "UA|Europe/Simferopol Europe/Kyiv", + "UG|Africa/Nairobi Africa/Kampala", + "UM|Pacific/Pago_Pago Pacific/Tarawa Pacific/Honolulu Pacific/Midway Pacific/Wake", + "US|America/New_York America/Detroit America/Kentucky/Louisville America/Kentucky/Monticello America/Indiana/Indianapolis America/Indiana/Vincennes America/Indiana/Winamac America/Indiana/Marengo America/Indiana/Petersburg America/Indiana/Vevay America/Chicago America/Indiana/Tell_City America/Indiana/Knox America/Menominee America/North_Dakota/Center America/North_Dakota/New_Salem America/North_Dakota/Beulah America/Denver America/Boise America/Phoenix America/Los_Angeles America/Anchorage America/Juneau America/Sitka America/Metlakatla America/Yakutat America/Nome America/Adak Pacific/Honolulu", + "UY|America/Montevideo", + "UZ|Asia/Samarkand Asia/Tashkent", + "VA|Europe/Rome Europe/Vatican", + "VC|America/Puerto_Rico America/St_Vincent", + "VE|America/Caracas", + "VG|America/Puerto_Rico America/Tortola", + "VI|America/Puerto_Rico America/St_Thomas", + "VN|Asia/Bangkok Asia/Ho_Chi_Minh", + "VU|Pacific/Efate", + "WF|Pacific/Tarawa Pacific/Wallis", + "WS|Pacific/Apia", + "YE|Asia/Riyadh Asia/Aden", + "YT|Africa/Nairobi Indian/Mayotte", + "ZA|Africa/Johannesburg", + "ZM|Africa/Maputo Africa/Lusaka", + "ZW|Africa/Maputo Africa/Harare", + ], + }); + + return moment; +}); diff --git a/app/static/libjs/moment.new.min.js b/app/static/libjs/moment.new.min.js new file mode 100644 index 00000000..d63167a8 --- /dev/null +++ b/app/static/libjs/moment.new.min.js @@ -0,0 +1,3309 @@ +!(function (e, t) { + "object" == typeof exports && "undefined" != typeof module + ? (module.exports = t()) + : "function" == typeof define && define.amd + ? define(t) + : (e.moment = t()); +})(this, function () { + "use strict"; + var H; + function f() { + return H.apply(null, arguments); + } + function a(e) { + return ( + e instanceof Array || + "[object Array]" === Object.prototype.toString.call(e) + ); + } + function F(e) { + return null != e && "[object Object]" === Object.prototype.toString.call(e); + } + function c(e, t) { + return Object.prototype.hasOwnProperty.call(e, t); + } + function L(e) { + if (Object.getOwnPropertyNames) + return 0 === Object.getOwnPropertyNames(e).length; + for (var t in e) if (c(e, t)) return; + return 1; + } + function o(e) { + return void 0 === e; + } + function u(e) { + return ( + "number" == typeof e || + "[object Number]" === Object.prototype.toString.call(e) + ); + } + function V(e) { + return ( + e instanceof Date || "[object Date]" === Object.prototype.toString.call(e) + ); + } + function G(e, t) { + for (var n = [], s = e.length, i = 0; i < s; ++i) n.push(t(e[i], i)); + return n; + } + function E(e, t) { + for (var n in t) c(t, n) && (e[n] = t[n]); + return ( + c(t, "toString") && (e.toString = t.toString), + c(t, "valueOf") && (e.valueOf = t.valueOf), + e + ); + } + function l(e, t, n, s) { + return Pt(e, t, n, s, !0).utc(); + } + function m(e) { + return ( + null == e._pf && + (e._pf = { + empty: !1, + unusedTokens: [], + unusedInput: [], + overflow: -2, + charsLeftOver: 0, + nullInput: !1, + invalidEra: null, + invalidMonth: null, + invalidFormat: !1, + userInvalidated: !1, + iso: !1, + parsedDateParts: [], + era: null, + meridiem: null, + rfc2822: !1, + weekdayMismatch: !1, + }), + e._pf + ); + } + function A(e) { + if (null == e._isValid) { + var t = m(e), + n = j.call(t.parsedDateParts, function (e) { + return null != e; + }), + n = + !isNaN(e._d.getTime()) && + t.overflow < 0 && + !t.empty && + !t.invalidEra && + !t.invalidMonth && + !t.invalidWeekday && + !t.weekdayMismatch && + !t.nullInput && + !t.invalidFormat && + !t.userInvalidated && + (!t.meridiem || (t.meridiem && n)); + if ( + (e._strict && + (n = + n && + 0 === t.charsLeftOver && + 0 === t.unusedTokens.length && + void 0 === t.bigHour), + null != Object.isFrozen && Object.isFrozen(e)) + ) + return n; + e._isValid = n; + } + return e._isValid; + } + function I(e) { + var t = l(NaN); + return null != e ? E(m(t), e) : (m(t).userInvalidated = !0), t; + } + var j = + Array.prototype.some || + function (e) { + for (var t = Object(this), n = t.length >>> 0, s = 0; s < n; s++) + if (s in t && e.call(this, t[s], s, t)) return !0; + return !1; + }, + Z = (f.momentProperties = []), + z = !1; + function $(e, t) { + var n, + s, + i, + r = Z.length; + if ( + (o(t._isAMomentObject) || (e._isAMomentObject = t._isAMomentObject), + o(t._i) || (e._i = t._i), + o(t._f) || (e._f = t._f), + o(t._l) || (e._l = t._l), + o(t._strict) || (e._strict = t._strict), + o(t._tzm) || (e._tzm = t._tzm), + o(t._isUTC) || (e._isUTC = t._isUTC), + o(t._offset) || (e._offset = t._offset), + o(t._pf) || (e._pf = m(t)), + o(t._locale) || (e._locale = t._locale), + 0 < r) + ) + for (n = 0; n < r; n++) o((i = t[(s = Z[n])])) || (e[s] = i); + return e; + } + function q(e) { + $(this, e), + (this._d = new Date(null != e._d ? e._d.getTime() : NaN)), + this.isValid() || (this._d = new Date(NaN)), + !1 === z && ((z = !0), f.updateOffset(this), (z = !1)); + } + function h(e) { + return e instanceof q || (null != e && null != e._isAMomentObject); + } + function B(e) { + !1 === f.suppressDeprecationWarnings && + "undefined" != typeof console && + console.warn && + console.warn("Deprecation warning: " + e); + } + function e(r, a) { + var o = !0; + return E(function () { + if ((null != f.deprecationHandler && f.deprecationHandler(null, r), o)) { + for (var e, t, n = [], s = arguments.length, i = 0; i < s; i++) { + if (((e = ""), "object" == typeof arguments[i])) { + for (t in ((e += "\n[" + i + "] "), arguments[0])) + c(arguments[0], t) && (e += t + ": " + arguments[0][t] + ", "); + e = e.slice(0, -2); + } else e = arguments[i]; + n.push(e); + } + B( + r + + "\nArguments: " + + Array.prototype.slice.call(n).join("") + + "\n" + + new Error().stack + ), + (o = !1); + } + return a.apply(this, arguments); + }, a); + } + var J = {}; + function Q(e, t) { + null != f.deprecationHandler && f.deprecationHandler(e, t), + J[e] || (B(t), (J[e] = !0)); + } + function d(e) { + return ( + ("undefined" != typeof Function && e instanceof Function) || + "[object Function]" === Object.prototype.toString.call(e) + ); + } + function X(e, t) { + var n, + s = E({}, e); + for (n in t) + c(t, n) && + (F(e[n]) && F(t[n]) + ? ((s[n] = {}), E(s[n], e[n]), E(s[n], t[n])) + : null != t[n] + ? (s[n] = t[n]) + : delete s[n]); + for (n in e) c(e, n) && !c(t, n) && F(e[n]) && (s[n] = E({}, s[n])); + return s; + } + function K(e) { + null != e && this.set(e); + } + (f.suppressDeprecationWarnings = !1), (f.deprecationHandler = null); + var ee = + Object.keys || + function (e) { + var t, + n = []; + for (t in e) c(e, t) && n.push(t); + return n; + }; + function r(e, t, n) { + var s = "" + Math.abs(e); + return ( + (0 <= e ? (n ? "+" : "") : "-") + + Math.pow(10, Math.max(0, t - s.length)) + .toString() + .substr(1) + + s + ); + } + var te = + /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|N{1,5}|YYYYYY|YYYYY|YYYY|YY|y{2,4}|yo?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g, + ne = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g, + se = {}, + ie = {}; + function s(e, t, n, s) { + var i = + "string" == typeof s + ? function () { + return this[s](); + } + : s; + e && (ie[e] = i), + t && + (ie[t[0]] = function () { + return r(i.apply(this, arguments), t[1], t[2]); + }), + n && + (ie[n] = function () { + return this.localeData().ordinal(i.apply(this, arguments), e); + }); + } + function re(e, t) { + return e.isValid() + ? ((t = ae(t, e.localeData())), + (se[t] = + se[t] || + (function (s) { + for (var e, i = s.match(te), t = 0, r = i.length; t < r; t++) + ie[i[t]] + ? (i[t] = ie[i[t]]) + : (i[t] = (e = i[t]).match(/\[[\s\S]/) + ? e.replace(/^\[|\]$/g, "") + : e.replace(/\\/g, "")); + return function (e) { + for (var t = "", n = 0; n < r; n++) + t += d(i[n]) ? i[n].call(e, s) : i[n]; + return t; + }; + })(t)), + se[t](e)) + : e.localeData().invalidDate(); + } + function ae(e, t) { + var n = 5; + function s(e) { + return t.longDateFormat(e) || e; + } + for (ne.lastIndex = 0; 0 <= n && ne.test(e); ) + (e = e.replace(ne, s)), (ne.lastIndex = 0), --n; + return e; + } + var oe = {}; + function t(e, t) { + var n = e.toLowerCase(); + oe[n] = oe[n + "s"] = oe[t] = e; + } + function _(e) { + return "string" == typeof e ? oe[e] || oe[e.toLowerCase()] : void 0; + } + function ue(e) { + var t, + n, + s = {}; + for (n in e) c(e, n) && (t = _(n)) && (s[t] = e[n]); + return s; + } + var le = {}; + function n(e, t) { + le[e] = t; + } + function he(e) { + return (e % 4 == 0 && e % 100 != 0) || e % 400 == 0; + } + function y(e) { + return e < 0 ? Math.ceil(e) || 0 : Math.floor(e); + } + function g(e) { + var e = +e, + t = 0; + return (t = 0 != e && isFinite(e) ? y(e) : t); + } + function de(t, n) { + return function (e) { + return null != e + ? (fe(this, t, e), f.updateOffset(this, n), this) + : ce(this, t); + }; + } + function ce(e, t) { + return e.isValid() ? e._d["get" + (e._isUTC ? "UTC" : "") + t]() : NaN; + } + function fe(e, t, n) { + e.isValid() && + !isNaN(n) && + ("FullYear" === t && he(e.year()) && 1 === e.month() && 29 === e.date() + ? ((n = g(n)), + e._d["set" + (e._isUTC ? "UTC" : "") + t]( + n, + e.month(), + We(n, e.month()) + )) + : e._d["set" + (e._isUTC ? "UTC" : "") + t](n)); + } + var i = /\d/, + w = /\d\d/, + me = /\d{3}/, + _e = /\d{4}/, + ye = /[+-]?\d{6}/, + p = /\d\d?/, + ge = /\d\d\d\d?/, + we = /\d\d\d\d\d\d?/, + pe = /\d{1,3}/, + ve = /\d{1,4}/, + ke = /[+-]?\d{1,6}/, + Me = /\d+/, + De = /[+-]?\d+/, + Se = /Z|[+-]\d\d:?\d\d/gi, + Ye = /Z|[+-]\d\d(?::?\d\d)?/gi, + v = + /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i; + function k(e, n, s) { + be[e] = d(n) + ? n + : function (e, t) { + return e && s ? s : n; + }; + } + function Oe(e, t) { + return c(be, e) + ? be[e](t._strict, t._locale) + : new RegExp( + M( + e + .replace("\\", "") + .replace( + /\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, + function (e, t, n, s, i) { + return t || n || s || i; + } + ) + ) + ); + } + function M(e) { + return e.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&"); + } + var be = {}, + xe = {}; + function D(e, n) { + var t, + s, + i = n; + for ( + "string" == typeof e && (e = [e]), + u(n) && + (i = function (e, t) { + t[n] = g(e); + }), + s = e.length, + t = 0; + t < s; + t++ + ) + xe[e[t]] = i; + } + function Te(e, i) { + D(e, function (e, t, n, s) { + (n._w = n._w || {}), i(e, n._w, n, s); + }); + } + var S, + Y = 0, + O = 1, + b = 2, + x = 3, + T = 4, + N = 5, + Ne = 6, + Pe = 7, + Re = 8; + function We(e, t) { + if (isNaN(e) || isNaN(t)) return NaN; + var n = ((t % (n = 12)) + n) % n; + return (e += (t - n) / 12), 1 == n ? (he(e) ? 29 : 28) : 31 - ((n % 7) % 2); + } + (S = + Array.prototype.indexOf || + function (e) { + for (var t = 0; t < this.length; ++t) if (this[t] === e) return t; + return -1; + }), + s("M", ["MM", 2], "Mo", function () { + return this.month() + 1; + }), + s("MMM", 0, 0, function (e) { + return this.localeData().monthsShort(this, e); + }), + s("MMMM", 0, 0, function (e) { + return this.localeData().months(this, e); + }), + t("month", "M"), + n("month", 8), + k("M", p), + k("MM", p, w), + k("MMM", function (e, t) { + return t.monthsShortRegex(e); + }), + k("MMMM", function (e, t) { + return t.monthsRegex(e); + }), + D(["M", "MM"], function (e, t) { + t[O] = g(e) - 1; + }), + D(["MMM", "MMMM"], function (e, t, n, s) { + s = n._locale.monthsParse(e, s, n._strict); + null != s ? (t[O] = s) : (m(n).invalidMonth = e); + }); + var Ce = + "January_February_March_April_May_June_July_August_September_October_November_December".split( + "_" + ), + Ue = "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"), + He = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/, + Fe = v, + Le = v; + function Ve(e, t) { + var n; + if (e.isValid()) { + if ("string" == typeof t) + if (/^\d+$/.test(t)) t = g(t); + else if (!u((t = e.localeData().monthsParse(t)))) return; + (n = Math.min(e.date(), We(e.year(), t))), + e._d["set" + (e._isUTC ? "UTC" : "") + "Month"](t, n); + } + } + function Ge(e) { + return null != e + ? (Ve(this, e), f.updateOffset(this, !0), this) + : ce(this, "Month"); + } + function Ee() { + function e(e, t) { + return t.length - e.length; + } + for (var t, n = [], s = [], i = [], r = 0; r < 12; r++) + (t = l([2e3, r])), + n.push(this.monthsShort(t, "")), + s.push(this.months(t, "")), + i.push(this.months(t, "")), + i.push(this.monthsShort(t, "")); + for (n.sort(e), s.sort(e), i.sort(e), r = 0; r < 12; r++) + (n[r] = M(n[r])), (s[r] = M(s[r])); + for (r = 0; r < 24; r++) i[r] = M(i[r]); + (this._monthsRegex = new RegExp("^(" + i.join("|") + ")", "i")), + (this._monthsShortRegex = this._monthsRegex), + (this._monthsStrictRegex = new RegExp("^(" + s.join("|") + ")", "i")), + (this._monthsShortStrictRegex = new RegExp( + "^(" + n.join("|") + ")", + "i" + )); + } + function Ae(e) { + return he(e) ? 366 : 365; + } + s("Y", 0, 0, function () { + var e = this.year(); + return e <= 9999 ? r(e, 4) : "+" + e; + }), + s(0, ["YY", 2], 0, function () { + return this.year() % 100; + }), + s(0, ["YYYY", 4], 0, "year"), + s(0, ["YYYYY", 5], 0, "year"), + s(0, ["YYYYYY", 6, !0], 0, "year"), + t("year", "y"), + n("year", 1), + k("Y", De), + k("YY", p, w), + k("YYYY", ve, _e), + k("YYYYY", ke, ye), + k("YYYYYY", ke, ye), + D(["YYYYY", "YYYYYY"], Y), + D("YYYY", function (e, t) { + t[Y] = 2 === e.length ? f.parseTwoDigitYear(e) : g(e); + }), + D("YY", function (e, t) { + t[Y] = f.parseTwoDigitYear(e); + }), + D("Y", function (e, t) { + t[Y] = parseInt(e, 10); + }), + (f.parseTwoDigitYear = function (e) { + return g(e) + (68 < g(e) ? 1900 : 2e3); + }); + var Ie = de("FullYear", !0); + function je(e, t, n, s, i, r, a) { + var o; + return ( + e < 100 && 0 <= e + ? ((o = new Date(e + 400, t, n, s, i, r, a)), + isFinite(o.getFullYear()) && o.setFullYear(e)) + : (o = new Date(e, t, n, s, i, r, a)), + o + ); + } + function Ze(e) { + var t; + return ( + e < 100 && 0 <= e + ? (((t = Array.prototype.slice.call(arguments))[0] = e + 400), + (t = new Date(Date.UTC.apply(null, t))), + isFinite(t.getUTCFullYear()) && t.setUTCFullYear(e)) + : (t = new Date(Date.UTC.apply(null, arguments))), + t + ); + } + function ze(e, t, n) { + n = 7 + t - n; + return n - ((7 + Ze(e, 0, n).getUTCDay() - t) % 7) - 1; + } + function $e(e, t, n, s, i) { + var r, + t = 1 + 7 * (t - 1) + ((7 + n - s) % 7) + ze(e, s, i), + n = + t <= 0 + ? Ae((r = e - 1)) + t + : t > Ae(e) + ? ((r = e + 1), t - Ae(e)) + : ((r = e), t); + return { year: r, dayOfYear: n }; + } + function qe(e, t, n) { + var s, + i, + r = ze(e.year(), t, n), + r = Math.floor((e.dayOfYear() - r - 1) / 7) + 1; + return ( + r < 1 + ? (s = r + P((i = e.year() - 1), t, n)) + : r > P(e.year(), t, n) + ? ((s = r - P(e.year(), t, n)), (i = e.year() + 1)) + : ((i = e.year()), (s = r)), + { week: s, year: i } + ); + } + function P(e, t, n) { + var s = ze(e, t, n), + t = ze(e + 1, t, n); + return (Ae(e) - s + t) / 7; + } + s("w", ["ww", 2], "wo", "week"), + s("W", ["WW", 2], "Wo", "isoWeek"), + t("week", "w"), + t("isoWeek", "W"), + n("week", 5), + n("isoWeek", 5), + k("w", p), + k("ww", p, w), + k("W", p), + k("WW", p, w), + Te(["w", "ww", "W", "WW"], function (e, t, n, s) { + t[s.substr(0, 1)] = g(e); + }); + function Be(e, t) { + return e.slice(t, 7).concat(e.slice(0, t)); + } + s("d", 0, "do", "day"), + s("dd", 0, 0, function (e) { + return this.localeData().weekdaysMin(this, e); + }), + s("ddd", 0, 0, function (e) { + return this.localeData().weekdaysShort(this, e); + }), + s("dddd", 0, 0, function (e) { + return this.localeData().weekdays(this, e); + }), + s("e", 0, 0, "weekday"), + s("E", 0, 0, "isoWeekday"), + t("day", "d"), + t("weekday", "e"), + t("isoWeekday", "E"), + n("day", 11), + n("weekday", 11), + n("isoWeekday", 11), + k("d", p), + k("e", p), + k("E", p), + k("dd", function (e, t) { + return t.weekdaysMinRegex(e); + }), + k("ddd", function (e, t) { + return t.weekdaysShortRegex(e); + }), + k("dddd", function (e, t) { + return t.weekdaysRegex(e); + }), + Te(["dd", "ddd", "dddd"], function (e, t, n, s) { + s = n._locale.weekdaysParse(e, s, n._strict); + null != s ? (t.d = s) : (m(n).invalidWeekday = e); + }), + Te(["d", "e", "E"], function (e, t, n, s) { + t[s] = g(e); + }); + var Je = "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split( + "_" + ), + Qe = "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), + Xe = "Su_Mo_Tu_We_Th_Fr_Sa".split("_"), + Ke = v, + et = v, + tt = v; + function nt() { + function e(e, t) { + return t.length - e.length; + } + for (var t, n, s, i = [], r = [], a = [], o = [], u = 0; u < 7; u++) + (s = l([2e3, 1]).day(u)), + (t = M(this.weekdaysMin(s, ""))), + (n = M(this.weekdaysShort(s, ""))), + (s = M(this.weekdays(s, ""))), + i.push(t), + r.push(n), + a.push(s), + o.push(t), + o.push(n), + o.push(s); + i.sort(e), + r.sort(e), + a.sort(e), + o.sort(e), + (this._weekdaysRegex = new RegExp("^(" + o.join("|") + ")", "i")), + (this._weekdaysShortRegex = this._weekdaysRegex), + (this._weekdaysMinRegex = this._weekdaysRegex), + (this._weekdaysStrictRegex = new RegExp("^(" + a.join("|") + ")", "i")), + (this._weekdaysShortStrictRegex = new RegExp( + "^(" + r.join("|") + ")", + "i" + )), + (this._weekdaysMinStrictRegex = new RegExp( + "^(" + i.join("|") + ")", + "i" + )); + } + function st() { + return this.hours() % 12 || 12; + } + function it(e, t) { + s(e, 0, 0, function () { + return this.localeData().meridiem(this.hours(), this.minutes(), t); + }); + } + function rt(e, t) { + return t._meridiemParse; + } + s("H", ["HH", 2], 0, "hour"), + s("h", ["hh", 2], 0, st), + s("k", ["kk", 2], 0, function () { + return this.hours() || 24; + }), + s("hmm", 0, 0, function () { + return "" + st.apply(this) + r(this.minutes(), 2); + }), + s("hmmss", 0, 0, function () { + return "" + st.apply(this) + r(this.minutes(), 2) + r(this.seconds(), 2); + }), + s("Hmm", 0, 0, function () { + return "" + this.hours() + r(this.minutes(), 2); + }), + s("Hmmss", 0, 0, function () { + return "" + this.hours() + r(this.minutes(), 2) + r(this.seconds(), 2); + }), + it("a", !0), + it("A", !1), + t("hour", "h"), + n("hour", 13), + k("a", rt), + k("A", rt), + k("H", p), + k("h", p), + k("k", p), + k("HH", p, w), + k("hh", p, w), + k("kk", p, w), + k("hmm", ge), + k("hmmss", we), + k("Hmm", ge), + k("Hmmss", we), + D(["H", "HH"], x), + D(["k", "kk"], function (e, t, n) { + e = g(e); + t[x] = 24 === e ? 0 : e; + }), + D(["a", "A"], function (e, t, n) { + (n._isPm = n._locale.isPM(e)), (n._meridiem = e); + }), + D(["h", "hh"], function (e, t, n) { + (t[x] = g(e)), (m(n).bigHour = !0); + }), + D("hmm", function (e, t, n) { + var s = e.length - 2; + (t[x] = g(e.substr(0, s))), (t[T] = g(e.substr(s))), (m(n).bigHour = !0); + }), + D("hmmss", function (e, t, n) { + var s = e.length - 4, + i = e.length - 2; + (t[x] = g(e.substr(0, s))), + (t[T] = g(e.substr(s, 2))), + (t[N] = g(e.substr(i))), + (m(n).bigHour = !0); + }), + D("Hmm", function (e, t, n) { + var s = e.length - 2; + (t[x] = g(e.substr(0, s))), (t[T] = g(e.substr(s))); + }), + D("Hmmss", function (e, t, n) { + var s = e.length - 4, + i = e.length - 2; + (t[x] = g(e.substr(0, s))), + (t[T] = g(e.substr(s, 2))), + (t[N] = g(e.substr(i))); + }); + v = de("Hours", !0); + var at, + ot = { + calendar: { + sameDay: "[Today at] LT", + nextDay: "[Tomorrow at] LT", + nextWeek: "dddd [at] LT", + lastDay: "[Yesterday at] LT", + lastWeek: "[Last] dddd [at] LT", + sameElse: "L", + }, + longDateFormat: { + LTS: "h:mm:ss A", + LT: "h:mm A", + L: "MM/DD/YYYY", + LL: "MMMM D, YYYY", + LLL: "MMMM D, YYYY h:mm A", + LLLL: "dddd, MMMM D, YYYY h:mm A", + }, + invalidDate: "Invalid date", + ordinal: "%d", + dayOfMonthOrdinalParse: /\d{1,2}/, + relativeTime: { + future: "in %s", + past: "%s ago", + s: "a few seconds", + ss: "%d seconds", + m: "a minute", + mm: "%d minutes", + h: "an hour", + hh: "%d hours", + d: "a day", + dd: "%d days", + w: "a week", + ww: "%d weeks", + M: "a month", + MM: "%d months", + y: "a year", + yy: "%d years", + }, + months: Ce, + monthsShort: Ue, + week: { dow: 0, doy: 6 }, + weekdays: Je, + weekdaysMin: Xe, + weekdaysShort: Qe, + meridiemParse: /[ap]\.?m?\.?/i, + }, + R = {}, + ut = {}; + function lt(e) { + return e && e.toLowerCase().replace("_", "-"); + } + function ht(e) { + for (var t, n, s, i, r = 0; r < e.length; ) { + for ( + t = (i = lt(e[r]).split("-")).length, + n = (n = lt(e[r + 1])) ? n.split("-") : null; + 0 < t; + + ) { + if ((s = dt(i.slice(0, t).join("-")))) return s; + if ( + n && + n.length >= t && + (function (e, t) { + for (var n = Math.min(e.length, t.length), s = 0; s < n; s += 1) + if (e[s] !== t[s]) return s; + return n; + })(i, n) >= + t - 1 + ) + break; + t--; + } + r++; + } + return at; + } + function dt(t) { + var e; + if ( + void 0 === R[t] && + "undefined" != typeof module && + module && + module.exports && + null != t.match("^[^/\\\\]*$") + ) + try { + (e = at._abbr), require("./locale/" + t), ct(e); + } catch (e) { + R[t] = null; + } + return R[t]; + } + function ct(e, t) { + return ( + e && + ((t = o(t) ? mt(e) : ft(e, t)) + ? (at = t) + : "undefined" != typeof console && + console.warn && + console.warn( + "Locale " + e + " not found. Did you forget to load it?" + )), + at._abbr + ); + } + function ft(e, t) { + if (null === t) return delete R[e], null; + var n, + s = ot; + if (((t.abbr = e), null != R[e])) + Q( + "defineLocaleOverride", + "use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info." + ), + (s = R[e]._config); + else if (null != t.parentLocale) + if (null != R[t.parentLocale]) s = R[t.parentLocale]._config; + else { + if (null == (n = dt(t.parentLocale))) + return ( + ut[t.parentLocale] || (ut[t.parentLocale] = []), + ut[t.parentLocale].push({ name: e, config: t }), + null + ); + s = n._config; + } + return ( + (R[e] = new K(X(s, t))), + ut[e] && + ut[e].forEach(function (e) { + ft(e.name, e.config); + }), + ct(e), + R[e] + ); + } + function mt(e) { + var t; + if (!(e = e && e._locale && e._locale._abbr ? e._locale._abbr : e)) + return at; + if (!a(e)) { + if ((t = dt(e))) return t; + e = [e]; + } + return ht(e); + } + function _t(e) { + var t = e._a; + return ( + t && + -2 === m(e).overflow && + ((t = + t[O] < 0 || 11 < t[O] + ? O + : t[b] < 1 || t[b] > We(t[Y], t[O]) + ? b + : t[x] < 0 || + 24 < t[x] || + (24 === t[x] && (0 !== t[T] || 0 !== t[N] || 0 !== t[Ne])) + ? x + : t[T] < 0 || 59 < t[T] + ? T + : t[N] < 0 || 59 < t[N] + ? N + : t[Ne] < 0 || 999 < t[Ne] + ? Ne + : -1), + m(e)._overflowDayOfYear && (t < Y || b < t) && (t = b), + m(e)._overflowWeeks && -1 === t && (t = Pe), + m(e)._overflowWeekday && -1 === t && (t = Re), + (m(e).overflow = t)), + e + ); + } + var yt = + /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/, + gt = + /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d|))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/, + wt = /Z|[+-]\d\d(?::?\d\d)?/, + pt = [ + ["YYYYYY-MM-DD", /[+-]\d{6}-\d\d-\d\d/], + ["YYYY-MM-DD", /\d{4}-\d\d-\d\d/], + ["GGGG-[W]WW-E", /\d{4}-W\d\d-\d/], + ["GGGG-[W]WW", /\d{4}-W\d\d/, !1], + ["YYYY-DDD", /\d{4}-\d{3}/], + ["YYYY-MM", /\d{4}-\d\d/, !1], + ["YYYYYYMMDD", /[+-]\d{10}/], + ["YYYYMMDD", /\d{8}/], + ["GGGG[W]WWE", /\d{4}W\d{3}/], + ["GGGG[W]WW", /\d{4}W\d{2}/, !1], + ["YYYYDDD", /\d{7}/], + ["YYYYMM", /\d{6}/, !1], + ["YYYY", /\d{4}/, !1], + ], + vt = [ + ["HH:mm:ss.SSSS", /\d\d:\d\d:\d\d\.\d+/], + ["HH:mm:ss,SSSS", /\d\d:\d\d:\d\d,\d+/], + ["HH:mm:ss", /\d\d:\d\d:\d\d/], + ["HH:mm", /\d\d:\d\d/], + ["HHmmss.SSSS", /\d\d\d\d\d\d\.\d+/], + ["HHmmss,SSSS", /\d\d\d\d\d\d,\d+/], + ["HHmmss", /\d\d\d\d\d\d/], + ["HHmm", /\d\d\d\d/], + ["HH", /\d\d/], + ], + kt = /^\/?Date\((-?\d+)/i, + Mt = + /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/, + Dt = { + UT: 0, + GMT: 0, + EDT: -240, + EST: -300, + CDT: -300, + CST: -360, + MDT: -360, + MST: -420, + PDT: -420, + PST: -480, + }; + function St(e) { + var t, + n, + s, + i, + r, + a, + o = e._i, + u = yt.exec(o) || gt.exec(o), + o = pt.length, + l = vt.length; + if (u) { + for (m(e).iso = !0, t = 0, n = o; t < n; t++) + if (pt[t][1].exec(u[1])) { + (i = pt[t][0]), (s = !1 !== pt[t][2]); + break; + } + if (null == i) e._isValid = !1; + else { + if (u[3]) { + for (t = 0, n = l; t < n; t++) + if (vt[t][1].exec(u[3])) { + r = (u[2] || " ") + vt[t][0]; + break; + } + if (null == r) return void (e._isValid = !1); + } + if (s || null == r) { + if (u[4]) { + if (!wt.exec(u[4])) return void (e._isValid = !1); + a = "Z"; + } + (e._f = i + (r || "") + (a || "")), Tt(e); + } else e._isValid = !1; + } + } else e._isValid = !1; + } + function Yt(e, t, n, s, i, r) { + e = [ + (function (e) { + e = parseInt(e, 10); + { + if (e <= 49) return 2e3 + e; + if (e <= 999) return 1900 + e; + } + return e; + })(e), + Ue.indexOf(t), + parseInt(n, 10), + parseInt(s, 10), + parseInt(i, 10), + ]; + return r && e.push(parseInt(r, 10)), e; + } + function Ot(e) { + var t, + n, + s, + i, + r = Mt.exec( + e._i + .replace(/\([^()]*\)|[\n\t]/g, " ") + .replace(/(\s\s+)/g, " ") + .replace(/^\s\s*/, "") + .replace(/\s\s*$/, "") + ); + r + ? ((t = Yt(r[4], r[3], r[2], r[5], r[6], r[7])), + (n = r[1]), + (s = t), + (i = e), + n && Qe.indexOf(n) !== new Date(s[0], s[1], s[2]).getDay() + ? ((m(i).weekdayMismatch = !0), (i._isValid = !1)) + : ((e._a = t), + (e._tzm = + ((n = r[8]), + (s = r[9]), + (i = r[10]), + n + ? Dt[n] + : s + ? 0 + : 60 * (((n = parseInt(i, 10)) - (s = n % 100)) / 100) + s)), + (e._d = Ze.apply(null, e._a)), + e._d.setUTCMinutes(e._d.getUTCMinutes() - e._tzm), + (m(e).rfc2822 = !0))) + : (e._isValid = !1); + } + function bt(e, t, n) { + return null != e ? e : null != t ? t : n; + } + function xt(e) { + var t, + n, + s, + i, + r, + a, + o, + u, + l, + h, + d, + c = []; + if (!e._d) { + for ( + s = e, + i = new Date(f.now()), + n = s._useUTC + ? [i.getUTCFullYear(), i.getUTCMonth(), i.getUTCDate()] + : [i.getFullYear(), i.getMonth(), i.getDate()], + e._w && + null == e._a[b] && + null == e._a[O] && + (null != (i = (s = e)._w).GG || null != i.W || null != i.E + ? ((u = 1), + (l = 4), + (r = bt(i.GG, s._a[Y], qe(W(), 1, 4).year)), + (a = bt(i.W, 1)), + ((o = bt(i.E, 1)) < 1 || 7 < o) && (h = !0)) + : ((u = s._locale._week.dow), + (l = s._locale._week.doy), + (d = qe(W(), u, l)), + (r = bt(i.gg, s._a[Y], d.year)), + (a = bt(i.w, d.week)), + null != i.d + ? ((o = i.d) < 0 || 6 < o) && (h = !0) + : null != i.e + ? ((o = i.e + u), (i.e < 0 || 6 < i.e) && (h = !0)) + : (o = u)), + a < 1 || a > P(r, u, l) + ? (m(s)._overflowWeeks = !0) + : null != h + ? (m(s)._overflowWeekday = !0) + : ((d = $e(r, a, o, u, l)), + (s._a[Y] = d.year), + (s._dayOfYear = d.dayOfYear))), + null != e._dayOfYear && + ((i = bt(e._a[Y], n[Y])), + (e._dayOfYear > Ae(i) || 0 === e._dayOfYear) && + (m(e)._overflowDayOfYear = !0), + (h = Ze(i, 0, e._dayOfYear)), + (e._a[O] = h.getUTCMonth()), + (e._a[b] = h.getUTCDate())), + t = 0; + t < 3 && null == e._a[t]; + ++t + ) + e._a[t] = c[t] = n[t]; + for (; t < 7; t++) + e._a[t] = c[t] = null == e._a[t] ? (2 === t ? 1 : 0) : e._a[t]; + 24 === e._a[x] && + 0 === e._a[T] && + 0 === e._a[N] && + 0 === e._a[Ne] && + ((e._nextDay = !0), (e._a[x] = 0)), + (e._d = (e._useUTC ? Ze : je).apply(null, c)), + (r = e._useUTC ? e._d.getUTCDay() : e._d.getDay()), + null != e._tzm && e._d.setUTCMinutes(e._d.getUTCMinutes() - e._tzm), + e._nextDay && (e._a[x] = 24), + e._w && + void 0 !== e._w.d && + e._w.d !== r && + (m(e).weekdayMismatch = !0); + } + } + function Tt(e) { + if (e._f === f.ISO_8601) St(e); + else if (e._f === f.RFC_2822) Ot(e); + else { + (e._a = []), (m(e).empty = !0); + for ( + var t, + n, + s, + i, + r, + a = "" + e._i, + o = a.length, + u = 0, + l = ae(e._f, e._locale).match(te) || [], + h = l.length, + d = 0; + d < h; + d++ + ) + (n = l[d]), + (t = (a.match(Oe(n, e)) || [])[0]) && + (0 < (s = a.substr(0, a.indexOf(t))).length && + m(e).unusedInput.push(s), + (a = a.slice(a.indexOf(t) + t.length)), + (u += t.length)), + ie[n] + ? (t ? (m(e).empty = !1) : m(e).unusedTokens.push(n), + (s = n), + (r = e), + null != (i = t) && c(xe, s) && xe[s](i, r._a, r, s)) + : e._strict && !t && m(e).unusedTokens.push(n); + (m(e).charsLeftOver = o - u), + 0 < a.length && m(e).unusedInput.push(a), + e._a[x] <= 12 && + !0 === m(e).bigHour && + 0 < e._a[x] && + (m(e).bigHour = void 0), + (m(e).parsedDateParts = e._a.slice(0)), + (m(e).meridiem = e._meridiem), + (e._a[x] = (function (e, t, n) { + if (null == n) return t; + return null != e.meridiemHour + ? e.meridiemHour(t, n) + : null != e.isPM + ? ((e = e.isPM(n)) && t < 12 && (t += 12), + (t = e || 12 !== t ? t : 0)) + : t; + })(e._locale, e._a[x], e._meridiem)), + null !== (o = m(e).era) && + (e._a[Y] = e._locale.erasConvertYear(o, e._a[Y])), + xt(e), + _t(e); + } + } + function Nt(e) { + var t, + n, + s, + i = e._i, + r = e._f; + if ( + ((e._locale = e._locale || mt(e._l)), + null === i || (void 0 === r && "" === i)) + ) + return I({ nullInput: !0 }); + if (("string" == typeof i && (e._i = i = e._locale.preparse(i)), h(i))) + return new q(_t(i)); + if (V(i)) e._d = i; + else if (a(r)) + !(function (e) { + var t, + n, + s, + i, + r, + a, + o = !1, + u = e._f.length; + if (0 === u) return (m(e).invalidFormat = !0), (e._d = new Date(NaN)); + for (i = 0; i < u; i++) + (r = 0), + (a = !1), + (t = $({}, e)), + null != e._useUTC && (t._useUTC = e._useUTC), + (t._f = e._f[i]), + Tt(t), + A(t) && (a = !0), + (r = (r += m(t).charsLeftOver) + 10 * m(t).unusedTokens.length), + (m(t).score = r), + o + ? r < s && ((s = r), (n = t)) + : (null == s || r < s || a) && ((s = r), (n = t), a && (o = !0)); + E(e, n || t); + })(e); + else if (r) Tt(e); + else if (o((r = (i = e)._i))) i._d = new Date(f.now()); + else + V(r) + ? (i._d = new Date(r.valueOf())) + : "string" == typeof r + ? ((n = i), + null !== (t = kt.exec(n._i)) + ? (n._d = new Date(+t[1])) + : (St(n), + !1 === n._isValid && + (delete n._isValid, + Ot(n), + !1 === n._isValid && + (delete n._isValid, + n._strict + ? (n._isValid = !1) + : f.createFromInputFallback(n))))) + : a(r) + ? ((i._a = G(r.slice(0), function (e) { + return parseInt(e, 10); + })), + xt(i)) + : F(r) + ? (t = i)._d || + ((s = void 0 === (n = ue(t._i)).day ? n.date : n.day), + (t._a = G( + [n.year, n.month, s, n.hour, n.minute, n.second, n.millisecond], + function (e) { + return e && parseInt(e, 10); + } + )), + xt(t)) + : u(r) + ? (i._d = new Date(r)) + : f.createFromInputFallback(i); + return A(e) || (e._d = null), e; + } + function Pt(e, t, n, s, i) { + var r = {}; + return ( + (!0 !== t && !1 !== t) || ((s = t), (t = void 0)), + (!0 !== n && !1 !== n) || ((s = n), (n = void 0)), + ((F(e) && L(e)) || (a(e) && 0 === e.length)) && (e = void 0), + (r._isAMomentObject = !0), + (r._useUTC = r._isUTC = i), + (r._l = n), + (r._i = e), + (r._f = t), + (r._strict = s), + (i = new q(_t(Nt((i = r)))))._nextDay && + (i.add(1, "d"), (i._nextDay = void 0)), + i + ); + } + function W(e, t, n, s) { + return Pt(e, t, n, s, !1); + } + (f.createFromInputFallback = e( + "value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.", + function (e) { + e._d = new Date(e._i + (e._useUTC ? " UTC" : "")); + } + )), + (f.ISO_8601 = function () {}), + (f.RFC_2822 = function () {}); + (ge = e( + "moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/", + function () { + var e = W.apply(null, arguments); + return this.isValid() && e.isValid() ? (e < this ? this : e) : I(); + } + )), + (we = e( + "moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/", + function () { + var e = W.apply(null, arguments); + return this.isValid() && e.isValid() ? (this < e ? this : e) : I(); + } + )); + function Rt(e, t) { + var n, s; + if (!(t = 1 === t.length && a(t[0]) ? t[0] : t).length) return W(); + for (n = t[0], s = 1; s < t.length; ++s) + (t[s].isValid() && !t[s][e](n)) || (n = t[s]); + return n; + } + var Wt = [ + "year", + "quarter", + "month", + "week", + "day", + "hour", + "minute", + "second", + "millisecond", + ]; + function Ct(e) { + var e = ue(e), + t = e.year || 0, + n = e.quarter || 0, + s = e.month || 0, + i = e.week || e.isoWeek || 0, + r = e.day || 0, + a = e.hour || 0, + o = e.minute || 0, + u = e.second || 0, + l = e.millisecond || 0; + (this._isValid = (function (e) { + var t, + n, + s = !1, + i = Wt.length; + for (t in e) + if (c(e, t) && (-1 === S.call(Wt, t) || (null != e[t] && isNaN(e[t])))) + return !1; + for (n = 0; n < i; ++n) + if (e[Wt[n]]) { + if (s) return !1; + parseFloat(e[Wt[n]]) !== g(e[Wt[n]]) && (s = !0); + } + return !0; + })(e)), + (this._milliseconds = +l + 1e3 * u + 6e4 * o + 1e3 * a * 60 * 60), + (this._days = +r + 7 * i), + (this._months = +s + 3 * n + 12 * t), + (this._data = {}), + (this._locale = mt()), + this._bubble(); + } + function Ut(e) { + return e instanceof Ct; + } + function Ht(e) { + return e < 0 ? -1 * Math.round(-1 * e) : Math.round(e); + } + function Ft(e, n) { + s(e, 0, 0, function () { + var e = this.utcOffset(), + t = "+"; + return ( + e < 0 && ((e = -e), (t = "-")), + t + r(~~(e / 60), 2) + n + r(~~e % 60, 2) + ); + }); + } + Ft("Z", ":"), + Ft("ZZ", ""), + k("Z", Ye), + k("ZZ", Ye), + D(["Z", "ZZ"], function (e, t, n) { + (n._useUTC = !0), (n._tzm = Vt(Ye, e)); + }); + var Lt = /([\+\-]|\d\d)/gi; + function Vt(e, t) { + var t = (t || "").match(e); + return null === t + ? null + : 0 === + (t = + 60 * + (e = ((t[t.length - 1] || []) + "").match(Lt) || ["-", 0, 0])[1] + + g(e[2])) + ? 0 + : "+" === e[0] + ? t + : -t; + } + function Gt(e, t) { + var n; + return t._isUTC + ? ((t = t.clone()), + (n = (h(e) || V(e) ? e : W(e)).valueOf() - t.valueOf()), + t._d.setTime(t._d.valueOf() + n), + f.updateOffset(t, !1), + t) + : W(e).local(); + } + function Et(e) { + return -Math.round(e._d.getTimezoneOffset()); + } + function At() { + return !!this.isValid() && this._isUTC && 0 === this._offset; + } + f.updateOffset = function () {}; + var It = /^(-|\+)?(?:(\d*)[. ])?(\d+):(\d+)(?::(\d+)(\.\d*)?)?$/, + jt = + /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/; + function C(e, t) { + var n, + s = e, + i = null; + return ( + Ut(e) + ? (s = { ms: e._milliseconds, d: e._days, M: e._months }) + : u(e) || !isNaN(+e) + ? ((s = {}), t ? (s[t] = +e) : (s.milliseconds = +e)) + : (i = It.exec(e)) + ? ((n = "-" === i[1] ? -1 : 1), + (s = { + y: 0, + d: g(i[b]) * n, + h: g(i[x]) * n, + m: g(i[T]) * n, + s: g(i[N]) * n, + ms: g(Ht(1e3 * i[Ne])) * n, + })) + : (i = jt.exec(e)) + ? ((n = "-" === i[1] ? -1 : 1), + (s = { + y: Zt(i[2], n), + M: Zt(i[3], n), + w: Zt(i[4], n), + d: Zt(i[5], n), + h: Zt(i[6], n), + m: Zt(i[7], n), + s: Zt(i[8], n), + })) + : null == s + ? (s = {}) + : "object" == typeof s && + ("from" in s || "to" in s) && + ((t = (function (e, t) { + var n; + if (!e.isValid() || !t.isValid()) + return { milliseconds: 0, months: 0 }; + (t = Gt(t, e)), + e.isBefore(t) + ? (n = zt(e, t)) + : (((n = zt(t, e)).milliseconds = -n.milliseconds), + (n.months = -n.months)); + return n; + })(W(s.from), W(s.to))), + ((s = {}).ms = t.milliseconds), + (s.M = t.months)), + (i = new Ct(s)), + Ut(e) && c(e, "_locale") && (i._locale = e._locale), + Ut(e) && c(e, "_isValid") && (i._isValid = e._isValid), + i + ); + } + function Zt(e, t) { + e = e && parseFloat(e.replace(",", ".")); + return (isNaN(e) ? 0 : e) * t; + } + function zt(e, t) { + var n = {}; + return ( + (n.months = t.month() - e.month() + 12 * (t.year() - e.year())), + e.clone().add(n.months, "M").isAfter(t) && --n.months, + (n.milliseconds = +t - +e.clone().add(n.months, "M")), + n + ); + } + function $t(s, i) { + return function (e, t) { + var n; + return ( + null === t || + isNaN(+t) || + (Q( + i, + "moment()." + + i + + "(period, number) is deprecated. Please use moment()." + + i + + "(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info." + ), + (n = e), + (e = t), + (t = n)), + qt(this, C(e, t), s), + this + ); + }; + } + function qt(e, t, n, s) { + var i = t._milliseconds, + r = Ht(t._days), + t = Ht(t._months); + e.isValid() && + ((s = null == s || s), + t && Ve(e, ce(e, "Month") + t * n), + r && fe(e, "Date", ce(e, "Date") + r * n), + i && e._d.setTime(e._d.valueOf() + i * n), + s && f.updateOffset(e, r || t)); + } + (C.fn = Ct.prototype), + (C.invalid = function () { + return C(NaN); + }); + (Ce = $t(1, "add")), (Je = $t(-1, "subtract")); + function Bt(e) { + return "string" == typeof e || e instanceof String; + } + function Jt(e) { + return ( + h(e) || + V(e) || + Bt(e) || + u(e) || + (function (t) { + var e = a(t), + n = !1; + e && + (n = + 0 === + t.filter(function (e) { + return !u(e) && Bt(t); + }).length); + return e && n; + })(e) || + (function (e) { + var t, + n, + s = F(e) && !L(e), + i = !1, + r = [ + "years", + "year", + "y", + "months", + "month", + "M", + "days", + "day", + "d", + "dates", + "date", + "D", + "hours", + "hour", + "h", + "minutes", + "minute", + "m", + "seconds", + "second", + "s", + "milliseconds", + "millisecond", + "ms", + ], + a = r.length; + for (t = 0; t < a; t += 1) (n = r[t]), (i = i || c(e, n)); + return s && i; + })(e) || + null == e + ); + } + function Qt(e, t) { + if (e.date() < t.date()) return -Qt(t, e); + var n = 12 * (t.year() - e.year()) + (t.month() - e.month()), + s = e.clone().add(n, "months"), + t = + t - s < 0 + ? (t - s) / (s - e.clone().add(n - 1, "months")) + : (t - s) / (e.clone().add(1 + n, "months") - s); + return -(n + t) || 0; + } + function Xt(e) { + return void 0 === e + ? this._locale._abbr + : (null != (e = mt(e)) && (this._locale = e), this); + } + (f.defaultFormat = "YYYY-MM-DDTHH:mm:ssZ"), + (f.defaultFormatUtc = "YYYY-MM-DDTHH:mm:ss[Z]"); + Xe = e( + "moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.", + function (e) { + return void 0 === e ? this.localeData() : this.locale(e); + } + ); + function Kt() { + return this._locale; + } + var en = 126227808e5; + function tn(e, t) { + return ((e % t) + t) % t; + } + function nn(e, t, n) { + return e < 100 && 0 <= e + ? new Date(e + 400, t, n) - en + : new Date(e, t, n).valueOf(); + } + function sn(e, t, n) { + return e < 100 && 0 <= e ? Date.UTC(e + 400, t, n) - en : Date.UTC(e, t, n); + } + function rn(e, t) { + return t.erasAbbrRegex(e); + } + function an() { + for ( + var e = [], t = [], n = [], s = [], i = this.eras(), r = 0, a = i.length; + r < a; + ++r + ) + t.push(M(i[r].name)), + e.push(M(i[r].abbr)), + n.push(M(i[r].narrow)), + s.push(M(i[r].name)), + s.push(M(i[r].abbr)), + s.push(M(i[r].narrow)); + (this._erasRegex = new RegExp("^(" + s.join("|") + ")", "i")), + (this._erasNameRegex = new RegExp("^(" + t.join("|") + ")", "i")), + (this._erasAbbrRegex = new RegExp("^(" + e.join("|") + ")", "i")), + (this._erasNarrowRegex = new RegExp("^(" + n.join("|") + ")", "i")); + } + function on(e, t) { + s(0, [e, e.length], 0, t); + } + function un(e, t, n, s, i) { + var r; + return null == e + ? qe(this, s, i).year + : ((r = P(e, s, i)), + function (e, t, n, s, i) { + (e = $e(e, t, n, s, i)), (t = Ze(e.year, 0, e.dayOfYear)); + return ( + this.year(t.getUTCFullYear()), + this.month(t.getUTCMonth()), + this.date(t.getUTCDate()), + this + ); + }.call(this, e, (t = r < t ? r : t), n, s, i)); + } + s("N", 0, 0, "eraAbbr"), + s("NN", 0, 0, "eraAbbr"), + s("NNN", 0, 0, "eraAbbr"), + s("NNNN", 0, 0, "eraName"), + s("NNNNN", 0, 0, "eraNarrow"), + s("y", ["y", 1], "yo", "eraYear"), + s("y", ["yy", 2], 0, "eraYear"), + s("y", ["yyy", 3], 0, "eraYear"), + s("y", ["yyyy", 4], 0, "eraYear"), + k("N", rn), + k("NN", rn), + k("NNN", rn), + k("NNNN", function (e, t) { + return t.erasNameRegex(e); + }), + k("NNNNN", function (e, t) { + return t.erasNarrowRegex(e); + }), + D(["N", "NN", "NNN", "NNNN", "NNNNN"], function (e, t, n, s) { + s = n._locale.erasParse(e, s, n._strict); + s ? (m(n).era = s) : (m(n).invalidEra = e); + }), + k("y", Me), + k("yy", Me), + k("yyy", Me), + k("yyyy", Me), + k("yo", function (e, t) { + return t._eraYearOrdinalRegex || Me; + }), + D(["y", "yy", "yyy", "yyyy"], Y), + D(["yo"], function (e, t, n, s) { + var i; + n._locale._eraYearOrdinalRegex && + (i = e.match(n._locale._eraYearOrdinalRegex)), + n._locale.eraYearOrdinalParse + ? (t[Y] = n._locale.eraYearOrdinalParse(e, i)) + : (t[Y] = parseInt(e, 10)); + }), + s(0, ["gg", 2], 0, function () { + return this.weekYear() % 100; + }), + s(0, ["GG", 2], 0, function () { + return this.isoWeekYear() % 100; + }), + on("gggg", "weekYear"), + on("ggggg", "weekYear"), + on("GGGG", "isoWeekYear"), + on("GGGGG", "isoWeekYear"), + t("weekYear", "gg"), + t("isoWeekYear", "GG"), + n("weekYear", 1), + n("isoWeekYear", 1), + k("G", De), + k("g", De), + k("GG", p, w), + k("gg", p, w), + k("GGGG", ve, _e), + k("gggg", ve, _e), + k("GGGGG", ke, ye), + k("ggggg", ke, ye), + Te(["gggg", "ggggg", "GGGG", "GGGGG"], function (e, t, n, s) { + t[s.substr(0, 2)] = g(e); + }), + Te(["gg", "GG"], function (e, t, n, s) { + t[s] = f.parseTwoDigitYear(e); + }), + s("Q", 0, "Qo", "quarter"), + t("quarter", "Q"), + n("quarter", 7), + k("Q", i), + D("Q", function (e, t) { + t[O] = 3 * (g(e) - 1); + }), + s("D", ["DD", 2], "Do", "date"), + t("date", "D"), + n("date", 9), + k("D", p), + k("DD", p, w), + k("Do", function (e, t) { + return e + ? t._dayOfMonthOrdinalParse || t._ordinalParse + : t._dayOfMonthOrdinalParseLenient; + }), + D(["D", "DD"], b), + D("Do", function (e, t) { + t[b] = g(e.match(p)[0]); + }); + ve = de("Date", !0); + s("DDD", ["DDDD", 3], "DDDo", "dayOfYear"), + t("dayOfYear", "DDD"), + n("dayOfYear", 4), + k("DDD", pe), + k("DDDD", me), + D(["DDD", "DDDD"], function (e, t, n) { + n._dayOfYear = g(e); + }), + s("m", ["mm", 2], 0, "minute"), + t("minute", "m"), + n("minute", 14), + k("m", p), + k("mm", p, w), + D(["m", "mm"], T); + var ln, + _e = de("Minutes", !1), + ke = + (s("s", ["ss", 2], 0, "second"), + t("second", "s"), + n("second", 15), + k("s", p), + k("ss", p, w), + D(["s", "ss"], N), + de("Seconds", !1)); + for ( + s("S", 0, 0, function () { + return ~~(this.millisecond() / 100); + }), + s(0, ["SS", 2], 0, function () { + return ~~(this.millisecond() / 10); + }), + s(0, ["SSS", 3], 0, "millisecond"), + s(0, ["SSSS", 4], 0, function () { + return 10 * this.millisecond(); + }), + s(0, ["SSSSS", 5], 0, function () { + return 100 * this.millisecond(); + }), + s(0, ["SSSSSS", 6], 0, function () { + return 1e3 * this.millisecond(); + }), + s(0, ["SSSSSSS", 7], 0, function () { + return 1e4 * this.millisecond(); + }), + s(0, ["SSSSSSSS", 8], 0, function () { + return 1e5 * this.millisecond(); + }), + s(0, ["SSSSSSSSS", 9], 0, function () { + return 1e6 * this.millisecond(); + }), + t("millisecond", "ms"), + n("millisecond", 16), + k("S", pe, i), + k("SS", pe, w), + k("SSS", pe, me), + ln = "SSSS"; + ln.length <= 9; + ln += "S" + ) + k(ln, Me); + function hn(e, t) { + t[Ne] = g(1e3 * ("0." + e)); + } + for (ln = "S"; ln.length <= 9; ln += "S") D(ln, hn); + (ye = de("Milliseconds", !1)), + s("z", 0, 0, "zoneAbbr"), + s("zz", 0, 0, "zoneName"); + i = q.prototype; + function dn(e) { + return e; + } + (i.add = Ce), + (i.calendar = function (e, t) { + 1 === arguments.length && + (arguments[0] + ? Jt(arguments[0]) + ? ((e = arguments[0]), (t = void 0)) + : (function (e) { + for ( + var t = F(e) && !L(e), + n = !1, + s = [ + "sameDay", + "nextDay", + "lastDay", + "nextWeek", + "lastWeek", + "sameElse", + ], + i = 0; + i < s.length; + i += 1 + ) + n = n || c(e, s[i]); + return t && n; + })(arguments[0]) && ((t = arguments[0]), (e = void 0)) + : (t = e = void 0)); + var e = e || W(), + n = Gt(e, this).startOf("day"), + n = f.calendarFormat(this, n) || "sameElse", + t = t && (d(t[n]) ? t[n].call(this, e) : t[n]); + return this.format(t || this.localeData().calendar(n, this, W(e))); + }), + (i.clone = function () { + return new q(this); + }), + (i.diff = function (e, t, n) { + var s, i, r; + if (!this.isValid()) return NaN; + if (!(s = Gt(e, this)).isValid()) return NaN; + switch (((i = 6e4 * (s.utcOffset() - this.utcOffset())), (t = _(t)))) { + case "year": + r = Qt(this, s) / 12; + break; + case "month": + r = Qt(this, s); + break; + case "quarter": + r = Qt(this, s) / 3; + break; + case "second": + r = (this - s) / 1e3; + break; + case "minute": + r = (this - s) / 6e4; + break; + case "hour": + r = (this - s) / 36e5; + break; + case "day": + r = (this - s - i) / 864e5; + break; + case "week": + r = (this - s - i) / 6048e5; + break; + default: + r = this - s; + } + return n ? r : y(r); + }), + (i.endOf = function (e) { + var t, n; + if (void 0 === (e = _(e)) || "millisecond" === e || !this.isValid()) + return this; + switch (((n = this._isUTC ? sn : nn), e)) { + case "year": + t = n(this.year() + 1, 0, 1) - 1; + break; + case "quarter": + t = n(this.year(), this.month() - (this.month() % 3) + 3, 1) - 1; + break; + case "month": + t = n(this.year(), this.month() + 1, 1) - 1; + break; + case "week": + t = + n(this.year(), this.month(), this.date() - this.weekday() + 7) - 1; + break; + case "isoWeek": + t = + n( + this.year(), + this.month(), + this.date() - (this.isoWeekday() - 1) + 7 + ) - 1; + break; + case "day": + case "date": + t = n(this.year(), this.month(), this.date() + 1) - 1; + break; + case "hour": + (t = this._d.valueOf()), + (t += + 36e5 - + tn(t + (this._isUTC ? 0 : 6e4 * this.utcOffset()), 36e5) - + 1); + break; + case "minute": + (t = this._d.valueOf()), (t += 6e4 - tn(t, 6e4) - 1); + break; + case "second": + (t = this._d.valueOf()), (t += 1e3 - tn(t, 1e3) - 1); + } + return this._d.setTime(t), f.updateOffset(this, !0), this; + }), + (i.format = function (e) { + return ( + (e = e || (this.isUtc() ? f.defaultFormatUtc : f.defaultFormat)), + (e = re(this, e)), + this.localeData().postformat(e) + ); + }), + (i.from = function (e, t) { + return this.isValid() && ((h(e) && e.isValid()) || W(e).isValid()) + ? C({ to: this, from: e }).locale(this.locale()).humanize(!t) + : this.localeData().invalidDate(); + }), + (i.fromNow = function (e) { + return this.from(W(), e); + }), + (i.to = function (e, t) { + return this.isValid() && ((h(e) && e.isValid()) || W(e).isValid()) + ? C({ from: this, to: e }).locale(this.locale()).humanize(!t) + : this.localeData().invalidDate(); + }), + (i.toNow = function (e) { + return this.to(W(), e); + }), + (i.get = function (e) { + return d(this[(e = _(e))]) ? this[e]() : this; + }), + (i.invalidAt = function () { + return m(this).overflow; + }), + (i.isAfter = function (e, t) { + return ( + (e = h(e) ? e : W(e)), + !(!this.isValid() || !e.isValid()) && + ("millisecond" === (t = _(t) || "millisecond") + ? this.valueOf() > e.valueOf() + : e.valueOf() < this.clone().startOf(t).valueOf()) + ); + }), + (i.isBefore = function (e, t) { + return ( + (e = h(e) ? e : W(e)), + !(!this.isValid() || !e.isValid()) && + ("millisecond" === (t = _(t) || "millisecond") + ? this.valueOf() < e.valueOf() + : this.clone().endOf(t).valueOf() < e.valueOf()) + ); + }), + (i.isBetween = function (e, t, n, s) { + return ( + (e = h(e) ? e : W(e)), + (t = h(t) ? t : W(t)), + !!(this.isValid() && e.isValid() && t.isValid()) && + ("(" === (s = s || "()")[0] + ? this.isAfter(e, n) + : !this.isBefore(e, n)) && + (")" === s[1] ? this.isBefore(t, n) : !this.isAfter(t, n)) + ); + }), + (i.isSame = function (e, t) { + var e = h(e) ? e : W(e); + return ( + !(!this.isValid() || !e.isValid()) && + ("millisecond" === (t = _(t) || "millisecond") + ? this.valueOf() === e.valueOf() + : ((e = e.valueOf()), + this.clone().startOf(t).valueOf() <= e && + e <= this.clone().endOf(t).valueOf())) + ); + }), + (i.isSameOrAfter = function (e, t) { + return this.isSame(e, t) || this.isAfter(e, t); + }), + (i.isSameOrBefore = function (e, t) { + return this.isSame(e, t) || this.isBefore(e, t); + }), + (i.isValid = function () { + return A(this); + }), + (i.lang = Xe), + (i.locale = Xt), + (i.localeData = Kt), + (i.max = we), + (i.min = ge), + (i.parsingFlags = function () { + return E({}, m(this)); + }), + (i.set = function (e, t) { + if ("object" == typeof e) + for ( + var n = (function (e) { + var t, + n = []; + for (t in e) c(e, t) && n.push({ unit: t, priority: le[t] }); + return ( + n.sort(function (e, t) { + return e.priority - t.priority; + }), + n + ); + })((e = ue(e))), + s = n.length, + i = 0; + i < s; + i++ + ) + this[n[i].unit](e[n[i].unit]); + else if (d(this[(e = _(e))])) return this[e](t); + return this; + }), + (i.startOf = function (e) { + var t, n; + if (void 0 === (e = _(e)) || "millisecond" === e || !this.isValid()) + return this; + switch (((n = this._isUTC ? sn : nn), e)) { + case "year": + t = n(this.year(), 0, 1); + break; + case "quarter": + t = n(this.year(), this.month() - (this.month() % 3), 1); + break; + case "month": + t = n(this.year(), this.month(), 1); + break; + case "week": + t = n(this.year(), this.month(), this.date() - this.weekday()); + break; + case "isoWeek": + t = n( + this.year(), + this.month(), + this.date() - (this.isoWeekday() - 1) + ); + break; + case "day": + case "date": + t = n(this.year(), this.month(), this.date()); + break; + case "hour": + (t = this._d.valueOf()), + (t -= tn(t + (this._isUTC ? 0 : 6e4 * this.utcOffset()), 36e5)); + break; + case "minute": + (t = this._d.valueOf()), (t -= tn(t, 6e4)); + break; + case "second": + (t = this._d.valueOf()), (t -= tn(t, 1e3)); + } + return this._d.setTime(t), f.updateOffset(this, !0), this; + }), + (i.subtract = Je), + (i.toArray = function () { + var e = this; + return [ + e.year(), + e.month(), + e.date(), + e.hour(), + e.minute(), + e.second(), + e.millisecond(), + ]; + }), + (i.toObject = function () { + var e = this; + return { + years: e.year(), + months: e.month(), + date: e.date(), + hours: e.hours(), + minutes: e.minutes(), + seconds: e.seconds(), + milliseconds: e.milliseconds(), + }; + }), + (i.toDate = function () { + return new Date(this.valueOf()); + }), + (i.toISOString = function (e) { + if (!this.isValid()) return null; + var t = (e = !0 !== e) ? this.clone().utc() : this; + return t.year() < 0 || 9999 < t.year() + ? re( + t, + e + ? "YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]" + : "YYYYYY-MM-DD[T]HH:mm:ss.SSSZ" + ) + : d(Date.prototype.toISOString) + ? e + ? this.toDate().toISOString() + : new Date(this.valueOf() + 60 * this.utcOffset() * 1e3) + .toISOString() + .replace("Z", re(t, "Z")) + : re( + t, + e ? "YYYY-MM-DD[T]HH:mm:ss.SSS[Z]" : "YYYY-MM-DD[T]HH:mm:ss.SSSZ" + ); + }), + (i.inspect = function () { + if (!this.isValid()) return "moment.invalid(/* " + this._i + " */)"; + var e, + t = "moment", + n = ""; + return ( + this.isLocal() || + ((t = 0 === this.utcOffset() ? "moment.utc" : "moment.parseZone"), + (n = "Z")), + (t = "[" + t + '("]'), + (e = 0 <= this.year() && this.year() <= 9999 ? "YYYY" : "YYYYYY"), + this.format(t + e + "-MM-DD[T]HH:mm:ss.SSS" + (n + '[")]')) + ); + }), + "undefined" != typeof Symbol && + null != Symbol.for && + (i[Symbol.for("nodejs.util.inspect.custom")] = function () { + return "Moment<" + this.format() + ">"; + }), + (i.toJSON = function () { + return this.isValid() ? this.toISOString() : null; + }), + (i.toString = function () { + return this.clone() + .locale("en") + .format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ"); + }), + (i.unix = function () { + return Math.floor(this.valueOf() / 1e3); + }), + (i.valueOf = function () { + return this._d.valueOf() - 6e4 * (this._offset || 0); + }), + (i.creationData = function () { + return { + input: this._i, + format: this._f, + locale: this._locale, + isUTC: this._isUTC, + strict: this._strict, + }; + }), + (i.eraName = function () { + for ( + var e, t = this.localeData().eras(), n = 0, s = t.length; + n < s; + ++n + ) { + if ( + ((e = this.clone().startOf("day").valueOf()), + t[n].since <= e && e <= t[n].until) + ) + return t[n].name; + if (t[n].until <= e && e <= t[n].since) return t[n].name; + } + return ""; + }), + (i.eraNarrow = function () { + for ( + var e, t = this.localeData().eras(), n = 0, s = t.length; + n < s; + ++n + ) { + if ( + ((e = this.clone().startOf("day").valueOf()), + t[n].since <= e && e <= t[n].until) + ) + return t[n].narrow; + if (t[n].until <= e && e <= t[n].since) return t[n].narrow; + } + return ""; + }), + (i.eraAbbr = function () { + for ( + var e, t = this.localeData().eras(), n = 0, s = t.length; + n < s; + ++n + ) { + if ( + ((e = this.clone().startOf("day").valueOf()), + t[n].since <= e && e <= t[n].until) + ) + return t[n].abbr; + if (t[n].until <= e && e <= t[n].since) return t[n].abbr; + } + return ""; + }), + (i.eraYear = function () { + for ( + var e, t, n = this.localeData().eras(), s = 0, i = n.length; + s < i; + ++s + ) + if ( + ((e = n[s].since <= n[s].until ? 1 : -1), + (t = this.clone().startOf("day").valueOf()), + (n[s].since <= t && t <= n[s].until) || + (n[s].until <= t && t <= n[s].since)) + ) + return (this.year() - f(n[s].since).year()) * e + n[s].offset; + return this.year(); + }), + (i.year = Ie), + (i.isLeapYear = function () { + return he(this.year()); + }), + (i.weekYear = function (e) { + return un.call( + this, + e, + this.week(), + this.weekday(), + this.localeData()._week.dow, + this.localeData()._week.doy + ); + }), + (i.isoWeekYear = function (e) { + return un.call(this, e, this.isoWeek(), this.isoWeekday(), 1, 4); + }), + (i.quarter = i.quarters = + function (e) { + return null == e + ? Math.ceil((this.month() + 1) / 3) + : this.month(3 * (e - 1) + (this.month() % 3)); + }), + (i.month = Ge), + (i.daysInMonth = function () { + return We(this.year(), this.month()); + }), + (i.week = i.weeks = + function (e) { + var t = this.localeData().week(this); + return null == e ? t : this.add(7 * (e - t), "d"); + }), + (i.isoWeek = i.isoWeeks = + function (e) { + var t = qe(this, 1, 4).week; + return null == e ? t : this.add(7 * (e - t), "d"); + }), + (i.weeksInYear = function () { + var e = this.localeData()._week; + return P(this.year(), e.dow, e.doy); + }), + (i.weeksInWeekYear = function () { + var e = this.localeData()._week; + return P(this.weekYear(), e.dow, e.doy); + }), + (i.isoWeeksInYear = function () { + return P(this.year(), 1, 4); + }), + (i.isoWeeksInISOWeekYear = function () { + return P(this.isoWeekYear(), 1, 4); + }), + (i.date = ve), + (i.day = i.days = + function (e) { + if (!this.isValid()) return null != e ? this : NaN; + var t, + n, + s = this._isUTC ? this._d.getUTCDay() : this._d.getDay(); + return null != e + ? ((t = e), + (n = this.localeData()), + (e = + "string" != typeof t + ? t + : isNaN(t) + ? "number" == typeof (t = n.weekdaysParse(t)) + ? t + : null + : parseInt(t, 10)), + this.add(e - s, "d")) + : s; + }), + (i.weekday = function (e) { + if (!this.isValid()) return null != e ? this : NaN; + var t = (this.day() + 7 - this.localeData()._week.dow) % 7; + return null == e ? t : this.add(e - t, "d"); + }), + (i.isoWeekday = function (e) { + return this.isValid() + ? null != e + ? ((t = e), + (n = this.localeData()), + (n = + "string" == typeof t + ? n.weekdaysParse(t) % 7 || 7 + : isNaN(t) + ? null + : t), + this.day(this.day() % 7 ? n : n - 7)) + : this.day() || 7 + : null != e + ? this + : NaN; + var t, n; + }), + (i.dayOfYear = function (e) { + var t = + Math.round( + (this.clone().startOf("day") - this.clone().startOf("year")) / 864e5 + ) + 1; + return null == e ? t : this.add(e - t, "d"); + }), + (i.hour = i.hours = v), + (i.minute = i.minutes = _e), + (i.second = i.seconds = ke), + (i.millisecond = i.milliseconds = ye), + (i.utcOffset = function (e, t, n) { + var s, + i = this._offset || 0; + if (!this.isValid()) return null != e ? this : NaN; + if (null == e) return this._isUTC ? i : Et(this); + if ("string" == typeof e) { + if (null === (e = Vt(Ye, e))) return this; + } else Math.abs(e) < 16 && !n && (e *= 60); + return ( + !this._isUTC && t && (s = Et(this)), + (this._offset = e), + (this._isUTC = !0), + null != s && this.add(s, "m"), + i !== e && + (!t || this._changeInProgress + ? qt(this, C(e - i, "m"), 1, !1) + : this._changeInProgress || + ((this._changeInProgress = !0), + f.updateOffset(this, !0), + (this._changeInProgress = null))), + this + ); + }), + (i.utc = function (e) { + return this.utcOffset(0, e); + }), + (i.local = function (e) { + return ( + this._isUTC && + (this.utcOffset(0, e), + (this._isUTC = !1), + e && this.subtract(Et(this), "m")), + this + ); + }), + (i.parseZone = function () { + var e; + return ( + null != this._tzm + ? this.utcOffset(this._tzm, !1, !0) + : "string" == typeof this._i && + (null != (e = Vt(Se, this._i)) + ? this.utcOffset(e) + : this.utcOffset(0, !0)), + this + ); + }), + (i.hasAlignedHourOffset = function (e) { + return ( + !!this.isValid() && + ((e = e ? W(e).utcOffset() : 0), (this.utcOffset() - e) % 60 == 0) + ); + }), + (i.isDST = function () { + return ( + this.utcOffset() > this.clone().month(0).utcOffset() || + this.utcOffset() > this.clone().month(5).utcOffset() + ); + }), + (i.isLocal = function () { + return !!this.isValid() && !this._isUTC; + }), + (i.isUtcOffset = function () { + return !!this.isValid() && this._isUTC; + }), + (i.isUtc = At), + (i.isUTC = At), + (i.zoneAbbr = function () { + return this._isUTC ? "UTC" : ""; + }), + (i.zoneName = function () { + return this._isUTC ? "Coordinated Universal Time" : ""; + }), + (i.dates = e("dates accessor is deprecated. Use date instead.", ve)), + (i.months = e("months accessor is deprecated. Use month instead", Ge)), + (i.years = e("years accessor is deprecated. Use year instead", Ie)), + (i.zone = e( + "moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/", + function (e, t) { + return null != e + ? (this.utcOffset((e = "string" != typeof e ? -e : e), t), this) + : -this.utcOffset(); + } + )), + (i.isDSTShifted = e( + "isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information", + function () { + if (!o(this._isDSTShifted)) return this._isDSTShifted; + var e, + t = {}; + return ( + $(t, this), + (t = Nt(t))._a + ? ((e = (t._isUTC ? l : W)(t._a)), + (this._isDSTShifted = + this.isValid() && + 0 < + (function (e, t, n) { + for ( + var s = Math.min(e.length, t.length), + i = Math.abs(e.length - t.length), + r = 0, + a = 0; + a < s; + a++ + ) + ((n && e[a] !== t[a]) || (!n && g(e[a]) !== g(t[a]))) && + r++; + return r + i; + })(t._a, e.toArray()))) + : (this._isDSTShifted = !1), + this._isDSTShifted + ); + } + )); + w = K.prototype; + function cn(e, t, n, s) { + var i = mt(), + s = l().set(s, t); + return i[n](s, e); + } + function fn(e, t, n) { + if ((u(e) && ((t = e), (e = void 0)), (e = e || ""), null != t)) + return cn(e, t, n, "month"); + for (var s = [], i = 0; i < 12; i++) s[i] = cn(e, i, n, "month"); + return s; + } + function mn(e, t, n, s) { + t = + ("boolean" == typeof e + ? u(t) && ((n = t), (t = void 0)) + : ((t = e), (e = !1), u((n = t)) && ((n = t), (t = void 0))), + t || ""); + var i, + r = mt(), + a = e ? r._week.dow : 0, + o = []; + if (null != n) return cn(t, (n + a) % 7, s, "day"); + for (i = 0; i < 7; i++) o[i] = cn(t, (i + a) % 7, s, "day"); + return o; + } + (w.calendar = function (e, t, n) { + return d((e = this._calendar[e] || this._calendar.sameElse)) + ? e.call(t, n) + : e; + }), + (w.longDateFormat = function (e) { + var t = this._longDateFormat[e], + n = this._longDateFormat[e.toUpperCase()]; + return t || !n + ? t + : ((this._longDateFormat[e] = n + .match(te) + .map(function (e) { + return "MMMM" === e || "MM" === e || "DD" === e || "dddd" === e + ? e.slice(1) + : e; + }) + .join("")), + this._longDateFormat[e]); + }), + (w.invalidDate = function () { + return this._invalidDate; + }), + (w.ordinal = function (e) { + return this._ordinal.replace("%d", e); + }), + (w.preparse = dn), + (w.postformat = dn), + (w.relativeTime = function (e, t, n, s) { + var i = this._relativeTime[n]; + return d(i) ? i(e, t, n, s) : i.replace(/%d/i, e); + }), + (w.pastFuture = function (e, t) { + return d((e = this._relativeTime[0 < e ? "future" : "past"])) + ? e(t) + : e.replace(/%s/i, t); + }), + (w.set = function (e) { + var t, n; + for (n in e) + c(e, n) && (d((t = e[n])) ? (this[n] = t) : (this["_" + n] = t)); + (this._config = e), + (this._dayOfMonthOrdinalParseLenient = new RegExp( + (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) + + "|" + + /\d{1,2}/.source + )); + }), + (w.eras = function (e, t) { + for ( + var n, s = this._eras || mt("en")._eras, i = 0, r = s.length; + i < r; + ++i + ) + switch ( + ("string" == typeof s[i].since && + ((n = f(s[i].since).startOf("day")), (s[i].since = n.valueOf())), + typeof s[i].until) + ) { + case "undefined": + s[i].until = 1 / 0; + break; + case "string": + (n = f(s[i].until).startOf("day").valueOf()), + (s[i].until = n.valueOf()); + } + return s; + }), + (w.erasParse = function (e, t, n) { + var s, + i, + r, + a, + o, + u = this.eras(); + for (e = e.toUpperCase(), s = 0, i = u.length; s < i; ++s) + if ( + ((r = u[s].name.toUpperCase()), + (a = u[s].abbr.toUpperCase()), + (o = u[s].narrow.toUpperCase()), + n) + ) + switch (t) { + case "N": + case "NN": + case "NNN": + if (a === e) return u[s]; + break; + case "NNNN": + if (r === e) return u[s]; + break; + case "NNNNN": + if (o === e) return u[s]; + } + else if (0 <= [r, a, o].indexOf(e)) return u[s]; + }), + (w.erasConvertYear = function (e, t) { + var n = e.since <= e.until ? 1 : -1; + return void 0 === t + ? f(e.since).year() + : f(e.since).year() + (t - e.offset) * n; + }), + (w.erasAbbrRegex = function (e) { + return ( + c(this, "_erasAbbrRegex") || an.call(this), + e ? this._erasAbbrRegex : this._erasRegex + ); + }), + (w.erasNameRegex = function (e) { + return ( + c(this, "_erasNameRegex") || an.call(this), + e ? this._erasNameRegex : this._erasRegex + ); + }), + (w.erasNarrowRegex = function (e) { + return ( + c(this, "_erasNarrowRegex") || an.call(this), + e ? this._erasNarrowRegex : this._erasRegex + ); + }), + (w.months = function (e, t) { + return e + ? (a(this._months) + ? this._months + : this._months[ + (this._months.isFormat || He).test(t) ? "format" : "standalone" + ])[e.month()] + : a(this._months) + ? this._months + : this._months.standalone; + }), + (w.monthsShort = function (e, t) { + return e + ? (a(this._monthsShort) + ? this._monthsShort + : this._monthsShort[He.test(t) ? "format" : "standalone"])[ + e.month() + ] + : a(this._monthsShort) + ? this._monthsShort + : this._monthsShort.standalone; + }), + (w.monthsParse = function (e, t, n) { + var s, i; + if (this._monthsParseExact) + return function (e, t, n) { + var s, + i, + r, + e = e.toLocaleLowerCase(); + if (!this._monthsParse) + for ( + this._monthsParse = [], + this._longMonthsParse = [], + this._shortMonthsParse = [], + s = 0; + s < 12; + ++s + ) + (r = l([2e3, s])), + (this._shortMonthsParse[s] = this.monthsShort( + r, + "" + ).toLocaleLowerCase()), + (this._longMonthsParse[s] = this.months( + r, + "" + ).toLocaleLowerCase()); + return n + ? "MMM" === t + ? -1 !== (i = S.call(this._shortMonthsParse, e)) + ? i + : null + : -1 !== (i = S.call(this._longMonthsParse, e)) + ? i + : null + : "MMM" === t + ? -1 !== (i = S.call(this._shortMonthsParse, e)) || + -1 !== (i = S.call(this._longMonthsParse, e)) + ? i + : null + : -1 !== (i = S.call(this._longMonthsParse, e)) || + -1 !== (i = S.call(this._shortMonthsParse, e)) + ? i + : null; + }.call(this, e, t, n); + for ( + this._monthsParse || + ((this._monthsParse = []), + (this._longMonthsParse = []), + (this._shortMonthsParse = [])), + s = 0; + s < 12; + s++ + ) { + if ( + ((i = l([2e3, s])), + n && + !this._longMonthsParse[s] && + ((this._longMonthsParse[s] = new RegExp( + "^" + this.months(i, "").replace(".", "") + "$", + "i" + )), + (this._shortMonthsParse[s] = new RegExp( + "^" + this.monthsShort(i, "").replace(".", "") + "$", + "i" + ))), + n || + this._monthsParse[s] || + ((i = "^" + this.months(i, "") + "|^" + this.monthsShort(i, "")), + (this._monthsParse[s] = new RegExp(i.replace(".", ""), "i"))), + n && "MMMM" === t && this._longMonthsParse[s].test(e)) + ) + return s; + if (n && "MMM" === t && this._shortMonthsParse[s].test(e)) return s; + if (!n && this._monthsParse[s].test(e)) return s; + } + }), + (w.monthsRegex = function (e) { + return this._monthsParseExact + ? (c(this, "_monthsRegex") || Ee.call(this), + e ? this._monthsStrictRegex : this._monthsRegex) + : (c(this, "_monthsRegex") || (this._monthsRegex = Le), + this._monthsStrictRegex && e + ? this._monthsStrictRegex + : this._monthsRegex); + }), + (w.monthsShortRegex = function (e) { + return this._monthsParseExact + ? (c(this, "_monthsRegex") || Ee.call(this), + e ? this._monthsShortStrictRegex : this._monthsShortRegex) + : (c(this, "_monthsShortRegex") || (this._monthsShortRegex = Fe), + this._monthsShortStrictRegex && e + ? this._monthsShortStrictRegex + : this._monthsShortRegex); + }), + (w.week = function (e) { + return qe(e, this._week.dow, this._week.doy).week; + }), + (w.firstDayOfYear = function () { + return this._week.doy; + }), + (w.firstDayOfWeek = function () { + return this._week.dow; + }), + (w.weekdays = function (e, t) { + return ( + (t = a(this._weekdays) + ? this._weekdays + : this._weekdays[ + e && !0 !== e && this._weekdays.isFormat.test(t) + ? "format" + : "standalone" + ]), + !0 === e ? Be(t, this._week.dow) : e ? t[e.day()] : t + ); + }), + (w.weekdaysMin = function (e) { + return !0 === e + ? Be(this._weekdaysMin, this._week.dow) + : e + ? this._weekdaysMin[e.day()] + : this._weekdaysMin; + }), + (w.weekdaysShort = function (e) { + return !0 === e + ? Be(this._weekdaysShort, this._week.dow) + : e + ? this._weekdaysShort[e.day()] + : this._weekdaysShort; + }), + (w.weekdaysParse = function (e, t, n) { + var s, i; + if (this._weekdaysParseExact) + return function (e, t, n) { + var s, + i, + r, + e = e.toLocaleLowerCase(); + if (!this._weekdaysParse) + for ( + this._weekdaysParse = [], + this._shortWeekdaysParse = [], + this._minWeekdaysParse = [], + s = 0; + s < 7; + ++s + ) + (r = l([2e3, 1]).day(s)), + (this._minWeekdaysParse[s] = this.weekdaysMin( + r, + "" + ).toLocaleLowerCase()), + (this._shortWeekdaysParse[s] = this.weekdaysShort( + r, + "" + ).toLocaleLowerCase()), + (this._weekdaysParse[s] = this.weekdays( + r, + "" + ).toLocaleLowerCase()); + return n + ? "dddd" === t + ? -1 !== (i = S.call(this._weekdaysParse, e)) + ? i + : null + : "ddd" === t + ? -1 !== (i = S.call(this._shortWeekdaysParse, e)) + ? i + : null + : -1 !== (i = S.call(this._minWeekdaysParse, e)) + ? i + : null + : "dddd" === t + ? -1 !== (i = S.call(this._weekdaysParse, e)) || + -1 !== (i = S.call(this._shortWeekdaysParse, e)) || + -1 !== (i = S.call(this._minWeekdaysParse, e)) + ? i + : null + : "ddd" === t + ? -1 !== (i = S.call(this._shortWeekdaysParse, e)) || + -1 !== (i = S.call(this._weekdaysParse, e)) || + -1 !== (i = S.call(this._minWeekdaysParse, e)) + ? i + : null + : -1 !== (i = S.call(this._minWeekdaysParse, e)) || + -1 !== (i = S.call(this._weekdaysParse, e)) || + -1 !== (i = S.call(this._shortWeekdaysParse, e)) + ? i + : null; + }.call(this, e, t, n); + for ( + this._weekdaysParse || + ((this._weekdaysParse = []), + (this._minWeekdaysParse = []), + (this._shortWeekdaysParse = []), + (this._fullWeekdaysParse = [])), + s = 0; + s < 7; + s++ + ) { + if ( + ((i = l([2e3, 1]).day(s)), + n && + !this._fullWeekdaysParse[s] && + ((this._fullWeekdaysParse[s] = new RegExp( + "^" + this.weekdays(i, "").replace(".", "\\.?") + "$", + "i" + )), + (this._shortWeekdaysParse[s] = new RegExp( + "^" + this.weekdaysShort(i, "").replace(".", "\\.?") + "$", + "i" + )), + (this._minWeekdaysParse[s] = new RegExp( + "^" + this.weekdaysMin(i, "").replace(".", "\\.?") + "$", + "i" + ))), + this._weekdaysParse[s] || + ((i = + "^" + + this.weekdays(i, "") + + "|^" + + this.weekdaysShort(i, "") + + "|^" + + this.weekdaysMin(i, "")), + (this._weekdaysParse[s] = new RegExp(i.replace(".", ""), "i"))), + n && "dddd" === t && this._fullWeekdaysParse[s].test(e)) + ) + return s; + if (n && "ddd" === t && this._shortWeekdaysParse[s].test(e)) return s; + if (n && "dd" === t && this._minWeekdaysParse[s].test(e)) return s; + if (!n && this._weekdaysParse[s].test(e)) return s; + } + }), + (w.weekdaysRegex = function (e) { + return this._weekdaysParseExact + ? (c(this, "_weekdaysRegex") || nt.call(this), + e ? this._weekdaysStrictRegex : this._weekdaysRegex) + : (c(this, "_weekdaysRegex") || (this._weekdaysRegex = Ke), + this._weekdaysStrictRegex && e + ? this._weekdaysStrictRegex + : this._weekdaysRegex); + }), + (w.weekdaysShortRegex = function (e) { + return this._weekdaysParseExact + ? (c(this, "_weekdaysRegex") || nt.call(this), + e ? this._weekdaysShortStrictRegex : this._weekdaysShortRegex) + : (c(this, "_weekdaysShortRegex") || (this._weekdaysShortRegex = et), + this._weekdaysShortStrictRegex && e + ? this._weekdaysShortStrictRegex + : this._weekdaysShortRegex); + }), + (w.weekdaysMinRegex = function (e) { + return this._weekdaysParseExact + ? (c(this, "_weekdaysRegex") || nt.call(this), + e ? this._weekdaysMinStrictRegex : this._weekdaysMinRegex) + : (c(this, "_weekdaysMinRegex") || (this._weekdaysMinRegex = tt), + this._weekdaysMinStrictRegex && e + ? this._weekdaysMinStrictRegex + : this._weekdaysMinRegex); + }), + (w.isPM = function (e) { + return "p" === (e + "").toLowerCase().charAt(0); + }), + (w.meridiem = function (e, t, n) { + return 11 < e ? (n ? "pm" : "PM") : n ? "am" : "AM"; + }), + ct("en", { + eras: [ + { + since: "0001-01-01", + until: 1 / 0, + offset: 1, + name: "Anno Domini", + narrow: "AD", + abbr: "AD", + }, + { + since: "0000-12-31", + until: -1 / 0, + offset: 1, + name: "Before Christ", + narrow: "BC", + abbr: "BC", + }, + ], + dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/, + ordinal: function (e) { + var t = e % 10; + return ( + e + + (1 === g((e % 100) / 10) + ? "th" + : 1 == t + ? "st" + : 2 == t + ? "nd" + : 3 == t + ? "rd" + : "th") + ); + }, + }), + (f.lang = e("moment.lang is deprecated. Use moment.locale instead.", ct)), + (f.langData = e( + "moment.langData is deprecated. Use moment.localeData instead.", + mt + )); + var _n = Math.abs; + function yn(e, t, n, s) { + t = C(t, n); + return ( + (e._milliseconds += s * t._milliseconds), + (e._days += s * t._days), + (e._months += s * t._months), + e._bubble() + ); + } + function gn(e) { + return e < 0 ? Math.floor(e) : Math.ceil(e); + } + function wn(e) { + return (4800 * e) / 146097; + } + function pn(e) { + return (146097 * e) / 4800; + } + function vn(e) { + return function () { + return this.as(e); + }; + } + (pe = vn("ms")), + (me = vn("s")), + (Ce = vn("m")), + (we = vn("h")), + (ge = vn("d")), + (Je = vn("w")), + (v = vn("M")), + (_e = vn("Q")), + (ke = vn("y")); + function kn(e) { + return function () { + return this.isValid() ? this._data[e] : NaN; + }; + } + var ye = kn("milliseconds"), + ve = kn("seconds"), + Ie = kn("minutes"), + w = kn("hours"), + Mn = kn("days"), + Dn = kn("months"), + Sn = kn("years"); + var Yn = Math.round, + On = { ss: 44, s: 45, m: 45, h: 22, d: 26, w: null, M: 11 }; + function bn(e, t, n, s) { + var i = C(e).abs(), + r = Yn(i.as("s")), + a = Yn(i.as("m")), + o = Yn(i.as("h")), + u = Yn(i.as("d")), + l = Yn(i.as("M")), + h = Yn(i.as("w")), + i = Yn(i.as("y")), + r = + (r <= n.ss ? ["s", r] : r < n.s && ["ss", r]) || + (a <= 1 && ["m"]) || + (a < n.m && ["mm", a]) || + (o <= 1 && ["h"]) || + (o < n.h && ["hh", o]) || + (u <= 1 && ["d"]) || + (u < n.d && ["dd", u]); + return ( + ((r = (r = + null != n.w ? r || (h <= 1 && ["w"]) || (h < n.w && ["ww", h]) : r) || + (l <= 1 && ["M"]) || + (l < n.M && ["MM", l]) || + (i <= 1 && ["y"]) || ["yy", i])[2] = t), + (r[3] = 0 < +e), + (r[4] = s), + function (e, t, n, s, i) { + return i.relativeTime(t || 1, !!n, e, s); + }.apply(null, r) + ); + } + var xn = Math.abs; + function Tn(e) { + return (0 < e) - (e < 0) || +e; + } + function Nn() { + if (!this.isValid()) return this.localeData().invalidDate(); + var e, + t, + n, + s, + i, + r, + a, + o = xn(this._milliseconds) / 1e3, + u = xn(this._days), + l = xn(this._months), + h = this.asSeconds(); + return h + ? ((e = y(o / 60)), + (t = y(e / 60)), + (o %= 60), + (e %= 60), + (n = y(l / 12)), + (l %= 12), + (s = o ? o.toFixed(3).replace(/\.?0+$/, "") : ""), + (i = Tn(this._months) !== Tn(h) ? "-" : ""), + (r = Tn(this._days) !== Tn(h) ? "-" : ""), + (a = Tn(this._milliseconds) !== Tn(h) ? "-" : ""), + (h < 0 ? "-" : "") + + "P" + + (n ? i + n + "Y" : "") + + (l ? i + l + "M" : "") + + (u ? r + u + "D" : "") + + (t || e || o ? "T" : "") + + (t ? a + t + "H" : "") + + (e ? a + e + "M" : "") + + (o ? a + s + "S" : "")) + : "P0D"; + } + var U = Ct.prototype; + return ( + (U.isValid = function () { + return this._isValid; + }), + (U.abs = function () { + var e = this._data; + return ( + (this._milliseconds = _n(this._milliseconds)), + (this._days = _n(this._days)), + (this._months = _n(this._months)), + (e.milliseconds = _n(e.milliseconds)), + (e.seconds = _n(e.seconds)), + (e.minutes = _n(e.minutes)), + (e.hours = _n(e.hours)), + (e.months = _n(e.months)), + (e.years = _n(e.years)), + this + ); + }), + (U.add = function (e, t) { + return yn(this, e, t, 1); + }), + (U.subtract = function (e, t) { + return yn(this, e, t, -1); + }), + (U.as = function (e) { + if (!this.isValid()) return NaN; + var t, + n, + s = this._milliseconds; + if ("month" === (e = _(e)) || "quarter" === e || "year" === e) + switch (((t = this._days + s / 864e5), (n = this._months + wn(t)), e)) { + case "month": + return n; + case "quarter": + return n / 3; + case "year": + return n / 12; + } + else + switch (((t = this._days + Math.round(pn(this._months))), e)) { + case "week": + return t / 7 + s / 6048e5; + case "day": + return t + s / 864e5; + case "hour": + return 24 * t + s / 36e5; + case "minute": + return 1440 * t + s / 6e4; + case "second": + return 86400 * t + s / 1e3; + case "millisecond": + return Math.floor(864e5 * t) + s; + default: + throw new Error("Unknown unit " + e); + } + }), + (U.asMilliseconds = pe), + (U.asSeconds = me), + (U.asMinutes = Ce), + (U.asHours = we), + (U.asDays = ge), + (U.asWeeks = Je), + (U.asMonths = v), + (U.asQuarters = _e), + (U.asYears = ke), + (U.valueOf = function () { + return this.isValid() + ? this._milliseconds + + 864e5 * this._days + + (this._months % 12) * 2592e6 + + 31536e6 * g(this._months / 12) + : NaN; + }), + (U._bubble = function () { + var e = this._milliseconds, + t = this._days, + n = this._months, + s = this._data; + return ( + (0 <= e && 0 <= t && 0 <= n) || + (e <= 0 && t <= 0 && n <= 0) || + ((e += 864e5 * gn(pn(n) + t)), (n = t = 0)), + (s.milliseconds = e % 1e3), + (e = y(e / 1e3)), + (s.seconds = e % 60), + (e = y(e / 60)), + (s.minutes = e % 60), + (e = y(e / 60)), + (s.hours = e % 24), + (t += y(e / 24)), + (n += e = y(wn(t))), + (t -= gn(pn(e))), + (e = y(n / 12)), + (n %= 12), + (s.days = t), + (s.months = n), + (s.years = e), + this + ); + }), + (U.clone = function () { + return C(this); + }), + (U.get = function (e) { + return (e = _(e)), this.isValid() ? this[e + "s"]() : NaN; + }), + (U.milliseconds = ye), + (U.seconds = ve), + (U.minutes = Ie), + (U.hours = w), + (U.days = Mn), + (U.weeks = function () { + return y(this.days() / 7); + }), + (U.months = Dn), + (U.years = Sn), + (U.humanize = function (e, t) { + if (!this.isValid()) return this.localeData().invalidDate(); + var n = !1, + s = On; + return ( + "object" == typeof e && ((t = e), (e = !1)), + "boolean" == typeof e && (n = e), + "object" == typeof t && + ((s = Object.assign({}, On, t)), + null != t.s && null == t.ss && (s.ss = t.s - 1)), + (e = this.localeData()), + (t = bn(this, !n, s, e)), + n && (t = e.pastFuture(+this, t)), + e.postformat(t) + ); + }), + (U.toISOString = Nn), + (U.toString = Nn), + (U.toJSON = Nn), + (U.locale = Xt), + (U.localeData = Kt), + (U.toIsoString = e( + "toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)", + Nn + )), + (U.lang = Xe), + s("X", 0, 0, "unix"), + s("x", 0, 0, "valueOf"), + k("x", De), + k("X", /[+-]?\d+(\.\d{1,3})?/), + D("X", function (e, t, n) { + n._d = new Date(1e3 * parseFloat(e)); + }), + D("x", function (e, t, n) { + n._d = new Date(g(e)); + }), + (f.version = "2.29.4"), + (H = W), + (f.fn = i), + (f.min = function () { + return Rt("isBefore", [].slice.call(arguments, 0)); + }), + (f.max = function () { + return Rt("isAfter", [].slice.call(arguments, 0)); + }), + (f.now = function () { + return Date.now ? Date.now() : +new Date(); + }), + (f.utc = l), + (f.unix = function (e) { + return W(1e3 * e); + }), + (f.months = function (e, t) { + return fn(e, t, "months"); + }), + (f.isDate = V), + (f.locale = ct), + (f.invalid = I), + (f.duration = C), + (f.isMoment = h), + (f.weekdays = function (e, t, n) { + return mn(e, t, n, "weekdays"); + }), + (f.parseZone = function () { + return W.apply(null, arguments).parseZone(); + }), + (f.localeData = mt), + (f.isDuration = Ut), + (f.monthsShort = function (e, t) { + return fn(e, t, "monthsShort"); + }), + (f.weekdaysMin = function (e, t, n) { + return mn(e, t, n, "weekdaysMin"); + }), + (f.defineLocale = ft), + (f.updateLocale = function (e, t) { + var n, s; + return ( + null != t + ? ((s = ot), + null != R[e] && null != R[e].parentLocale + ? R[e].set(X(R[e]._config, t)) + : ((t = X((s = null != (n = dt(e)) ? n._config : s), t)), + null == n && (t.abbr = e), + ((s = new K(t)).parentLocale = R[e]), + (R[e] = s)), + ct(e)) + : null != R[e] && + (null != R[e].parentLocale + ? ((R[e] = R[e].parentLocale), e === ct() && ct(e)) + : null != R[e] && delete R[e]), + R[e] + ); + }), + (f.locales = function () { + return ee(R); + }), + (f.weekdaysShort = function (e, t, n) { + return mn(e, t, n, "weekdaysShort"); + }), + (f.normalizeUnits = _), + (f.relativeTimeRounding = function (e) { + return void 0 === e ? Yn : "function" == typeof e && ((Yn = e), !0); + }), + (f.relativeTimeThreshold = function (e, t) { + return ( + void 0 !== On[e] && + (void 0 === t ? On[e] : ((On[e] = t), "s" === e && (On.ss = t - 1), !0)) + ); + }), + (f.calendarFormat = function (e, t) { + return (e = e.diff(t, "days", !0)) < -6 + ? "sameElse" + : e < -1 + ? "lastWeek" + : e < 0 + ? "lastDay" + : e < 1 + ? "sameDay" + : e < 2 + ? "nextDay" + : e < 7 + ? "nextWeek" + : "sameElse"; + }), + (f.prototype = i), + (f.HTML5_FMT = { + DATETIME_LOCAL: "YYYY-MM-DDTHH:mm", + DATETIME_LOCAL_SECONDS: "YYYY-MM-DDTHH:mm:ss", + DATETIME_LOCAL_MS: "YYYY-MM-DDTHH:mm:ss.SSS", + DATE: "YYYY-MM-DD", + TIME: "HH:mm", + TIME_SECONDS: "HH:mm:ss", + TIME_MS: "HH:mm:ss.SSS", + WEEK: "GGGG-[W]WW", + MONTH: "YYYY-MM", + }), + f + ); +}); diff --git a/app/tables/visu_assiduites.py b/app/tables/visu_assiduites.py new file mode 100644 index 00000000..304e827f --- /dev/null +++ b/app/tables/visu_assiduites.py @@ -0,0 +1,164 @@ +############################################################################## +# ScoDoc +# Copyright (c) 1999 - 2023 Emmanuel Viennet. All rights reserved. +# See LICENSE +############################################################################## + +"""Liste simple d'étudiants +""" + +from flask import g, url_for +from app import log +from app.models import FormSemestre, Identite, Justificatif +from app.tables import table_builder as tb +import app.scodoc.sco_assiduites as scass +from app.scodoc import sco_preferences +from app.scodoc import sco_utils as scu + + +class TableAssi(tb.Table): + """Table listant l'assiduité des étudiants + L'id de la ligne est etuid, et le row stocke etud. + """ + + def __init__( + self, + etuds: list[Identite] = None, + dates: tuple[str, str] = None, + formsemestre: FormSemestre = None, + **kwargs, + ): + self.rows: list["RowEtud"] = [] # juste pour que VSCode nous aide sur .rows + classes = ["gt_table", "gt_left"] + self.dates = [str(dates[0]) + "T00:00", str(dates[1]) + "T23:59"] + self.formsemestre = formsemestre + super().__init__( + row_class=RowAssi, + classes=classes, + **kwargs, + with_foot_titles=False, + ) + self.add_etuds(etuds) + + def add_etuds(self, etuds: list[Identite]): + "Ajoute des étudiants à la table" + for etud in etuds: + row = self.row_class(self, etud) + row.add_etud_cols() + self.add_row(row) + + +class RowAssi(tb.Row): + "Ligne de la table assiduité" + + # pour le moment très simple, extensible (codes, liens bulletins, ...) + def __init__(self, table: TableAssi, etud: Identite, *args, **kwargs): + # Etat de l'inscription au formsemestre + if "classes" not in kwargs: + kwargs["classes"] = [] + try: + inscription = table.formsemestre.etuds_inscriptions[etud.id] + if inscription.etat == scu.DEMISSION: + kwargs["classes"].append("etuddem") + except KeyError: + log(f"RowAssi: etudid {etud.id} non inscrit à {table.formsemestre.id}") + kwargs["classes"].append("non_inscrit") # ne devrait pas arriver ! + + super().__init__(table, etud.id, *args, **kwargs) + self.etud = etud + self.dates = table.dates + + def add_etud_cols(self): + """Ajoute les colonnes""" + etud = self.etud + self.table.group_titles.update( + { + "etud_codes": "Codes", + "identite_detail": "", + "identite_court": "", + } + ) + + bilan_etud = url_for( + "assiduites.bilan_etud", scodoc_dept=g.scodoc_dept, etudid=etud.id + ) + self.add_cell( + "nom_disp", + "Nom", + etud.nom_disp(), + "etudinfo", + attrs={"id": str(etud.id)}, + data={"order": etud.sort_key}, + target=bilan_etud, + target_attrs={"class": "discretelink"}, + ) + self.add_cell( + "prenom", + "Prénom", + etud.prenom_str, + "etudinfo", + attrs={"id": str(etud.id)}, + data={"order": etud.sort_key}, + target=bilan_etud, + target_attrs={"class": "discretelink"}, + ) + stats = self._get_etud_stats(etud) + for key, value in stats.items(): + self.add_cell(key, value[0], f"{value[1] - value[2]}", "assi_stats") + self.add_cell( + key + "_justi", + value[0] + " Justifiées", + f"{value[2]}", + "assi_stats", + ) + + compte_justificatifs = scass.filter_by_date( + etud.justificatifs, Justificatif, self.dates[0], self.dates[1] + ).count() + + self.add_cell("justificatifs", "Justificatifs", f"{compte_justificatifs}") + + def _get_etud_stats(self, etud: Identite) -> dict[str, list[str, float, float]]: + retour: dict[str, tuple[str, float, float]] = { + "present": ["Présences", 0.0, 0.0], + "retard": ["Retards", 0.0, 0.0], + "absent": ["Absences", 0.0, 0.0], + } + + assi_metric = { + "H.": "heure", + "J.": "journee", + "1/2 J.": "demi", + }.get(sco_preferences.get_preference("assi_metrique", dept_id=g.scodoc_dept_id)) + + for etat, valeur in retour.items(): + compte_etat = scass.get_assiduites_stats( + assiduites=etud.assiduites, + metric=assi_metric, + filtered={ + "date_debut": self.dates[0], + "date_fin": self.dates[1], + "etat": etat, + }, + ) + + compte_etat_just = scass.get_assiduites_stats( + assiduites=etud.assiduites, + metric=assi_metric, + filtered={ + "date_debut": self.dates[0], + "date_fin": self.dates[1], + "etat": etat, + "est_just": True, + }, + ) + + valeur[1] = compte_etat[assi_metric] + valeur[2] = compte_etat_just[assi_metric] + return retour + + +def etuds_sorted_from_ids(etudids) -> list[Identite]: + "Liste triée d'etuds à partir d'une collections d'etudids" + etuds = [Identite.get_etud(etudid) for etudid in etudids] + return sorted(etuds, key=lambda etud: etud.sort_key) diff --git a/app/templates/assiduites/pages/ajout_justificatif.j2 b/app/templates/assiduites/pages/ajout_justificatif.j2 new file mode 100644 index 00000000..0d2891c1 --- /dev/null +++ b/app/templates/assiduites/pages/ajout_justificatif.j2 @@ -0,0 +1,221 @@ +{% block pageContent %} + +
+

Justifier des assiduités

+ {% include "assiduites/widgets/tableau_base.j2" %} +
+ + {% include "assiduites/widgets/tableau_justi.j2" %} +
+ +
+ +
+
+ + +
+
+
+ Date de début + +
+
+ Date de fin + +
+
+ +
+
+ Etat du justificatif + +
+
+ +
+
+ Raison + +
+
+
+
+ +
+
+ Importer un fichier + +
+
+ + + +
+ +
+ +
+ +

Gestion des justificatifs

+

+ Faites + clic droit sur une ligne du tableau pour afficher le menu + contextuel : +

    +
  • Détails : Affiche les détails du justificatif sélectionné
    • +
  • Editer : Permet de modifier le justificatif (dates, etat, ajouter/supprimer fichier etc)
    • +
  • Supprimer : Permet de supprimer le justificatif (Action Irréversible)
    • +
+

+ +

Cliquer sur l'icone d'entonoir afin de filtrer le tableau des justificatifs

+ +
+ +
+ + + +{% endblock pageContent %} \ No newline at end of file diff --git a/app/templates/assiduites/pages/bilan_dept.j2 b/app/templates/assiduites/pages/bilan_dept.j2 new file mode 100644 index 00000000..aea0bb8b --- /dev/null +++ b/app/templates/assiduites/pages/bilan_dept.j2 @@ -0,0 +1,170 @@ +{% include "assiduites/widgets/tableau_base.j2" %} + + +
+ +

Justificatifs en attente (ou modifiés)

+ {% include "assiduites/widgets/tableau_justi.j2" %} +
+ +
+ Année scolaire 2022-2023 Changer année: + +
+ +
+

Gestion des justificatifs

+

+ Faites + clic droit sur une ligne du tableau pour afficher le menu contextuel : +

    +
  • Détails : Affiche les détails du justificatif sélectionné
    • +
  • Editer : Permet de modifier le justificatif (dates, etat, ajouter/supprimer fichier etc)
    • +
  • Supprimer : Permet de supprimer le justificatif (Action Irréversible)
    • +
+

+
+ + \ No newline at end of file diff --git a/app/templates/assiduites/pages/bilan_etud.j2 b/app/templates/assiduites/pages/bilan_etud.j2 new file mode 100644 index 00000000..825844c9 --- /dev/null +++ b/app/templates/assiduites/pages/bilan_etud.j2 @@ -0,0 +1,371 @@ +{% block app_content %} +{% include "assiduites/widgets/tableau_base.j2" %} +
+ +

Bilan de l'assiduité de {{sco.etud.nomprenom}}

+ + + +
+ +

Statistiques d'assiduité

+
+ + + +
+ +
+ +
+
+ +
+ +

Assiduités non justifiées (Uniquement les retards et les absences)

+ {% include "assiduites/widgets/tableau_assi.j2" %} + +

Justificatifs en attente (ou modifiés)

+ {% include "assiduites/widgets/tableau_justi.j2" %} + +
+ +
+

Boutons de suppresions (toute suppression est définitive)

+ + +
+ +
+

Statistiques

+

Un message d'alerte apparait si le nombre d'absence dépasse le seuil (indiqué dans les préférences du + département)

+

Les statistiques sont effectuées entre les deux dates séléctionnées. Si vous modifier les dates il faudra + appuyer sur le bouton "Actualiser"

+

Gestion des justificatifs

+

+ Faites + clic droit sur une ligne du tableau pour afficher le menu + contextuel : +

+
    +
  • Détails : Affiche les détails du justificatif sélectionné
    • +
  • Editer : Permet de modifier le justificatif (dates, etat, ajouter/supprimer fichier etc)
    • +
  • Supprimer : Permet de supprimer le justificatif (Action Irréversible)
    • +
+ +

Gestion des Assiduités

+

+ Faites + clic droit sur une ligne du tableau pour afficher le menu + contextuel : +

+
    +
  • Détails : Affiche les détails de l'assiduité sélectionnée
    • +
  • Editer : Permet de modifier l'assiduité (moduleimpl, etat)
    • +
  • Supprimer : Permet de supprimer l'assiduité (Action Irréversible)
    • +
+
+ +
+{% endblock app_content %} + + + \ No newline at end of file diff --git a/app/templates/assiduites/pages/calendrier.j2 b/app/templates/assiduites/pages/calendrier.j2 new file mode 100644 index 00000000..76ab5eb3 --- /dev/null +++ b/app/templates/assiduites/pages/calendrier.j2 @@ -0,0 +1,356 @@ +{% block pageContent %} +{% include "assiduites/widgets/alert.j2" %} + +
+ {{minitimeline | safe }} +

Assiduités de {{sco.etud.nomprenom}}

+
+ +
+
+ Année scolaire 2022-2023 Changer année: + +
+ +
+

Calendrier

+

Les jours non travaillés sont affiché en violet

+

Les jours possèdant une bordure "bleu" sont des jours où des assiduités ont été justifiées par un + justificatif valide

+

Les jours possèdant une bordure "rouge" sont des jours où des assiduités ont été justifiées par un + justificatif non valide

+

Le jour sera affiché en :

+
    +
  • Rouge : S'il y a une assiduité "Absent"
    • +
  • Orange : S'il y a une assiduité "Retard" et pas d'assiduité "Absent"
    • +
  • Vert : S'il y a une assiduité "Present" et pas d'assiduité "Absent" ni "Retard"
    • +
  • Blanc : S'il n'y a pas d'assiduité
    • +
+ +

Vous pouvez passer votre curseur sur les jours colorés afin de voir les assiduités de cette journée.

+ +
+
+ + + + + +{% endblock pageContent %} \ No newline at end of file diff --git a/app/templates/assiduites/pages/config_assiduites.j2 b/app/templates/assiduites/pages/config_assiduites.j2 new file mode 100644 index 00000000..417d0275 --- /dev/null +++ b/app/templates/assiduites/pages/config_assiduites.j2 @@ -0,0 +1,29 @@ +{% extends "base.j2" %} +{% import 'bootstrap/wtf.html' as wtf %} + +{% block app_content %} +

Configuration du Module d'assiduité

+ +
+
+ +
+ {{ form.hidden_tag() }} + {{ wtf.form_errors(form, hiddens="only") }} + + {{ wtf.form_field(form.morning_time) }} + {{ wtf.form_field(form.lunch_time) }} + {{ wtf.form_field(form.afternoon_time) }} + {{ wtf.form_field(form.tick_time) }} +
+ {{ wtf.form_field(form.submit) }} + {{ wtf.form_field(form.cancel) }} +
+
+
+
+ + + + +{% endblock %} \ No newline at end of file diff --git a/app/templates/assiduites/pages/etat_absence_date.j2 b/app/templates/assiduites/pages/etat_absence_date.j2 new file mode 100644 index 00000000..41c99fe3 --- /dev/null +++ b/app/templates/assiduites/pages/etat_absence_date.j2 @@ -0,0 +1,36 @@ +

Présence lors de l'évaluation {{eval.title}}

+

Réalisé le {{eval.jour}} de {{eval.heure_debut}} à {{eval.heure_fin}}

+ + + + + + + + + + {% for etud in etudiants %} + + + + + {% endfor %} + + +
+ Nom + + Assiduité +
+ {{etud.nom | safe}} + + {{etud.etat}} +
+ + \ No newline at end of file diff --git a/app/templates/assiduites/pages/liste_assiduites.j2 b/app/templates/assiduites/pages/liste_assiduites.j2 new file mode 100644 index 00000000..d1802180 --- /dev/null +++ b/app/templates/assiduites/pages/liste_assiduites.j2 @@ -0,0 +1,55 @@ +{% block app_content %} +
+ +

Liste de l'assiduité et des justificatifs de {{sco.etud.nomprenom}}

+ {% include "assiduites/widgets/tableau_base.j2" %} +

Assiduités :

+ + {% include "assiduites/widgets/tableau_assi.j2" %} +

Justificatifs :

+ + {% include "assiduites/widgets/tableau_justi.j2" %} +
    +
  • Detail
    • +
  • Editer
    • +
  • Supprimer
    • +
+
+

Gestion des justificatifs

+

+ Faites + clic droit sur une ligne du tableau pour afficher le menu + contextuel : +

+
    +
  • Détails : Affiche les détails du justificatif sélectionné
    • +
  • Editer : Permet de modifier le justificatif (dates, etat, ajouter/supprimer fichier etc)
    • +
  • Supprimer : Permet de supprimer le justificatif (Action Irréversible)
    • +
+ +

Vous pouvez filtrer le tableau en cliquant sur l'icone d'entonoir sous le titre du tableau.

+ +

Gestion des Assiduités

+

+ Faites + clic droit sur une ligne du tableau pour afficher le menu + contextuel : +

+
    +
  • Détails : Affiche les détails de l'assiduité sélectionnée
    • +
  • Editer : Permet de modifier l'assiduité (moduleimpl, etat)
    • +
  • Supprimer : Permet de supprimer l'assiduité (Action Irréversible)
    • +
+

Vous pouvez filtrer le tableau en cliquant sur l'icone d'entonoir sous le titre du tableau.

+ +
+
+{% endblock app_content %} + + \ No newline at end of file diff --git a/app/templates/assiduites/pages/signal_assiduites_diff.j2 b/app/templates/assiduites/pages/signal_assiduites_diff.j2 new file mode 100644 index 00000000..ea11796e --- /dev/null +++ b/app/templates/assiduites/pages/signal_assiduites_diff.j2 @@ -0,0 +1,40 @@ +

Signalement différé des assiduités {{gr |safe}}

+
+

Explication de la saisie différée

+

Si la colonne n'est pas valide elle sera affichée en rouge, passez votre curseur sur la colonne pour afficher + le message d'erreur

+

Sélectionner la date de début de la colonne mettra automatiquement la date de fin à la durée d'une séance + (préférence de département)

+

Modifier le moduleimpl alors que des assiduités sont déjà enregistrées pour la période changera leur + moduleimpl.

+

Il y a 4 boutons d'assiduités sur la colonne permettant de mettre l'assiduités à tous les étudiants

+

Le dernier des boutons retire l'assiduité.

+

Vous pouvez ajouter des colonnes en appuyant sur le bouton +

+

Vous pouvez supprimer une colonne en appuyant sur la croix qui se situe dans le coin haut droit de la colonne +

+
+

{{sem | safe }}

+ +{{diff | safe}} + + + + + +{% include "assiduites/widgets/alert.j2" %} +{% include "assiduites/widgets/prompt.j2" %} +{% include "assiduites/widgets/conflict.j2" %} +{% include "assiduites/widgets/toast.j2" %} \ No newline at end of file diff --git a/app/templates/assiduites/pages/signal_assiduites_etud.j2 b/app/templates/assiduites/pages/signal_assiduites_etud.j2 new file mode 100644 index 00000000..44a37f24 --- /dev/null +++ b/app/templates/assiduites/pages/signal_assiduites_etud.j2 @@ -0,0 +1,138 @@ +{# -*- mode: jinja-html -*- #} +{% include "assiduites/widgets/toast.j2" %} +{% include "assiduites/widgets/alert.j2" %} +{% include "assiduites/widgets/prompt.j2" %} +{% include "assiduites/widgets/conflict.j2" %} +
+ {% block content %} +

Signalement de l'assiduité de {{sco.etud.nomprenom}}

+ +
+ Date: + +
+ + {{timeline|safe}} + + +
+ {{moduleimpl_select | safe }} + +
+ +
+ + + +
+ +
+
+
+
+
+
+ {{diff | safe}} + +
+

Explication de la timeline

+

+ Si la période indiquée par la timeline provoque un conflit d'assiduité pour un étudiant sa ligne deviendra + rouge. +
+ Dans ce cas il faut résoudre manuellement le conflit : cliquez sur un des boutons d'assiduités pour ouvrir + le + résolveur de conflit. +
+ Correspondance des couleurs : +

+
    +
  • → présence de l'étudiant lors de la période +
    • +
  • → retard de l'étudiant lors de la période +
    • +
  • → absence de l'étudiant lors de la période +
    • +
  • → l'assiduité est justifiée par un + justificatif valide
    • +
  • → l'assiduité est + justifiée par un justificatif non valide / en attente de validation +
    • +
+

Vous pouvez justifier rapidement une assiduité en saisisant l'assiduité puis en appuyant sur "Justifier"

+ +

Explication de la saisie différée

+

Si la colonne n'est pas valide elle sera affichée en rouge, passez votre curseur sur la colonne pour afficher + le message d'erreur

+

Sélectionner la date de début de la colonne mettra automatiquement la date de fin à la durée d'une séance + (préférence de département)

+

Modifier le moduleimpl alors que des assiduités sont déjà enregistrées pour la période changera leur + moduleimpl.

+

Il y a 4 boutons d'assiduités sur la colonne permettant de mettre l'assiduités à tous les étudiants

+

Le dernier des boutons retire l'assiduité.

+

Vous pouvez ajouter des colonnes en appuyant sur le bouton +

+

Vous pouvez supprimer une colonne en appuyant sur la croix qui se situe dans le coin haut droit de la colonne +

+
+ + + +
+
+
+ + + + + + + + + {% endblock %} + +
\ No newline at end of file diff --git a/app/templates/assiduites/pages/signal_assiduites_group.j2 b/app/templates/assiduites/pages/signal_assiduites_group.j2 new file mode 100644 index 00000000..d0c1a8a1 --- /dev/null +++ b/app/templates/assiduites/pages/signal_assiduites_group.j2 @@ -0,0 +1,125 @@ +{% include "assiduites/widgets/toast.j2" %} +
+ +
+ {{formsemestre_id}} + {{formsemestre_date_debut}} + {{formsemestre_date_fin}} +
+ +

+ Saisie des assiduités {{gr_tit|safe}} {{sem}} +

+ + {% if readonly == "true" %} +

La page est en lecture seule.

+ {% endif %} + +
+
Groupes : {{grp|safe}}
+ + +
+ Date: + +
+
+ {% if readonly == "true" %} + + {% else %} + + {% endif %} + + {{timeline|safe}} + + + + {% if readonly == "false" %} +
+ +
Module :{{moduleimpl_select|safe}}
+
+ {% else %} + {% endif %} +
+

+ Veillez à choisir le groupe concerné par la saisie ainsi que la date de la saisie. + Après validation, il faudra recharger la page pour changer les informations de la saisie. +

+
+
+

Explication diverses

+

+ Si la période indiquée par la timeline provoque un conflit d'assiduité pour un étudiant sa ligne deviendra + rouge. +
+ Dans ce cas il faut résoudre manuellement le conflit : cliquez sur un des boutons d'assiduités pour ouvrir + le + résolveur de conflit. +
+ Correspondance des couleurs : +

+
    +
  • → présence de l'étudiant lors de la période +
    • +
  • → retard de l'étudiant lors de la période +
    • +
  • → absence de l'étudiant lors de la période +
    • +
  • → l'assiduité est justifiée par un + justificatif valide
    • +
  • → l'assiduité est + justifiée par un justificatif non valide / en attente de validation +
    • +
+
+ +
+
+
+ + {% include "assiduites/widgets/alert.j2" %} + {% include "assiduites/widgets/prompt.j2" %} + {% include "assiduites/widgets/conflict.j2" %} + + +
\ No newline at end of file diff --git a/app/templates/assiduites/pages/visu_assi.j2 b/app/templates/assiduites/pages/visu_assi.j2 new file mode 100644 index 00000000..33aa13c7 --- /dev/null +++ b/app/templates/assiduites/pages/visu_assi.j2 @@ -0,0 +1,42 @@ +{% extends "sco_page.j2" %} + +{% block scripts %} + {{ super() }} + +{% endblock %} + +{% block app_content %} + +

Visualisation de l'assiduité {{gr_tit|safe}}

+ +
+ + + + + {{scu.ICON_XLS|safe}} +
+ +{{tableau | safe}} + + + +{% endblock %} diff --git a/app/templates/assiduites/widgets/alert.j2 b/app/templates/assiduites/widgets/alert.j2 new file mode 100644 index 00000000..4da10c9e --- /dev/null +++ b/app/templates/assiduites/widgets/alert.j2 @@ -0,0 +1,160 @@ +{% block alertmodal %} +
+ + +
+
+ × +

alertModal Header

+
+
+

Some text in the alertModal Body

+

Some other text...

+
+
+

alertModal Footer

+
+
+ +
+ + + +{% endblock alertmodal %} \ No newline at end of file diff --git a/app/templates/assiduites/widgets/conflict.j2 b/app/templates/assiduites/widgets/conflict.j2 new file mode 100644 index 00000000..c87c3fbc --- /dev/null +++ b/app/templates/assiduites/widgets/conflict.j2 @@ -0,0 +1,462 @@ + \ No newline at end of file diff --git a/app/templates/assiduites/widgets/differee.j2 b/app/templates/assiduites/widgets/differee.j2 new file mode 100644 index 00000000..fcb2c5ff --- /dev/null +++ b/app/templates/assiduites/widgets/differee.j2 @@ -0,0 +1,1020 @@ +
+
+
+
Noms
+ +
+
+
+ + {% for etud in etudiants %} +
+
+ {{etud.nomprenom}} + No Img +
+
+ {% endfor %} +
+
+ + + \ No newline at end of file diff --git a/app/templates/assiduites/widgets/minitimeline.j2 b/app/templates/assiduites/widgets/minitimeline.j2 new file mode 100644 index 00000000..811fd193 --- /dev/null +++ b/app/templates/assiduites/widgets/minitimeline.j2 @@ -0,0 +1,312 @@ +
+ +
+ + + + \ No newline at end of file diff --git a/app/templates/assiduites/widgets/moduleimpl_dynamic_selector.j2 b/app/templates/assiduites/widgets/moduleimpl_dynamic_selector.j2 new file mode 100644 index 00000000..bb3806ab --- /dev/null +++ b/app/templates/assiduites/widgets/moduleimpl_dynamic_selector.j2 @@ -0,0 +1,135 @@ + + + + + + \ No newline at end of file diff --git a/app/templates/assiduites/widgets/moduleimpl_selector.j2 b/app/templates/assiduites/widgets/moduleimpl_selector.j2 new file mode 100644 index 00000000..ad010e2c --- /dev/null +++ b/app/templates/assiduites/widgets/moduleimpl_selector.j2 @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/app/templates/assiduites/widgets/prompt.j2 b/app/templates/assiduites/widgets/prompt.j2 new file mode 100644 index 00000000..7be61d4c --- /dev/null +++ b/app/templates/assiduites/widgets/prompt.j2 @@ -0,0 +1,217 @@ +{% block promptModal %} +
+ + +
+
+ × +

promptModal Header

+
+
+

Some text in the promptModal Body

+

Some other text...

+
+
+

promptModal Footer

+
+
+ +
+ + + +{% endblock promptModal %} \ No newline at end of file diff --git a/app/templates/assiduites/widgets/tableau_assi.j2 b/app/templates/assiduites/widgets/tableau_assi.j2 new file mode 100644 index 00000000..c40d211b --- /dev/null +++ b/app/templates/assiduites/widgets/tableau_assi.j2 @@ -0,0 +1,261 @@ + + + + + + + + + + + + +
+
+ Début + +
+ 		+
+ Fin + +
+ 		+
+ État + +
+ 		+
+ Module + +
+ 		+
+ Justifiée + +
+
+
+
+ + + + \ No newline at end of file diff --git a/app/templates/assiduites/widgets/tableau_base.j2 b/app/templates/assiduites/widgets/tableau_base.j2 new file mode 100644 index 00000000..5a795af1 --- /dev/null +++ b/app/templates/assiduites/widgets/tableau_base.j2 @@ -0,0 +1,824 @@ +
    +
  • Détails
    • +
  • Éditer
    • +
  • Supprimer
    • +
+ +{% include "assiduites/widgets/alert.j2" %} +{% include "assiduites/widgets/prompt.j2" %} + + + + \ No newline at end of file diff --git a/app/templates/assiduites/widgets/tableau_justi.j2 b/app/templates/assiduites/widgets/tableau_justi.j2 new file mode 100644 index 00000000..c4b67773 --- /dev/null +++ b/app/templates/assiduites/widgets/tableau_justi.j2 @@ -0,0 +1,486 @@ + + + + + + + + + + + + +
+
+ Début + +
+ 		+
+ Fin + +
+ 		+
+ État + +
+ 		+
+ Raison + +
+ 		+
+ Fichier + +
+
+
+
+ + + \ No newline at end of file diff --git a/app/templates/assiduites/widgets/timeline.j2 b/app/templates/assiduites/widgets/timeline.j2 new file mode 100644 index 00000000..706c5f50 --- /dev/null +++ b/app/templates/assiduites/widgets/timeline.j2 @@ -0,0 +1,313 @@ +
+
+
+
+
Time
+
+
+ + \ No newline at end of file diff --git a/app/templates/assiduites/widgets/toast.j2 b/app/templates/assiduites/widgets/toast.j2 new file mode 100644 index 00000000..e1599452 --- /dev/null +++ b/app/templates/assiduites/widgets/toast.j2 @@ -0,0 +1,116 @@ +
+
+ + + + \ No newline at end of file diff --git a/app/templates/but/bulletin_court_page.j2 b/app/templates/but/bulletin_court_page.j2 new file mode 100644 index 00000000..cedef09e --- /dev/null +++ b/app/templates/but/bulletin_court_page.j2 @@ -0,0 +1,162 @@ +{% extends "sco_page.j2" %} + +{% block styles %} + {{super()}} + + + +{% endblock %} + +{% macro table_modules(mod_type, title) -%} + + + + + + + + + {% for ue in bul.ues %} + + {% endfor %} + + + + {% for mod in bul[mod_type] %} + + + + {% for ue in bul.ues %} + + {% endfor %} + + {% endfor %} + +
Unités d'enseignement
{{title}}{{ue}}
{{mod}}{{bul[mod_type][mod].titre}}{{ + bul.ues[ue][mod_type][mod].moyenne + if mod in bul.ues[ue][mod_type] else "" + }}
+{%- endmacro %} + +{% block app_content %} + +
+
+
{{etud.nomprenom}}
+
BUT {{formsemestre.formation.referentiel_competence.specialite}}
+ {% if formsemestre.etuds_inscriptions[etud.id].parcour %} +
Parcours {{formsemestre.etuds_inscriptions[etud.id].parcour.code}}
+ {% endif %} +
Année {{formsemestre.annee_scolaire_str()}}
+
Semestre {{formsemestre.semestre_id}}
+
+ + + +
+ + + + + + + + {% for ue in bul.ues %} + + {% endfor %} + + + + + + {% for ue in bul.ues %} + + {% endfor %} + + + + {% for ue in bul.ues %} + + {% endfor %} + + + + {% for ue in bul.ues %} + + {% endfor %} + + + + {% for ue in bul.ues %} + + {% endfor %} + + + + {% for ue in bul.ues %} + + {% endfor %} + + + + {% for ue in bul.ues %} + + {% endfor %} + + + + {% for ue in bul.ues %} + + {% endfor %} + + +
Unités d'enseignement du semestre {{formsemestre.semestre_id}}
{{ue}}
Moyenne{{bul.ues[ue].moyenne.value}}
Bonus{{bul.ues[ue].bonus if bul.ues[ue].bonus != "00.00" else ""}}
Malus{{bul.ues[ue].malus if bul.ues[ue].malus != "00.00" else ""}}
Rang{{bul.ues[ue].moyenne.rang}}
Effectif{{bul.ues[ue].moyenne.total}}
ECTS{{bul.ues[ue].moyenne.ects}}
Jury{{decision_ues[ue].code}}
+
+ +
+ {{ table_modules("ressources", "Ressources") }} +
+ +
+ {{ table_modules("saes", "Situations d'Apprentissage et d'Évaluation (SAÉ)") }} +
+ +
+
+ {% include "but/cursus_etud.j2" %} +
+ +
+
ECTS acquis : {{ects_total}}
+
+ {% if bul.semestre.decision_annee %} + Jury tenu le {{ + datetime.datetime.fromisoformat(bul.semestre.decision_annee.date).strftime("%d/%m/%Y à %H:%M") + }}, + année BUT {{bul.semestre.decision_annee.code}}. + {% endif %} + {% set virg = joiner(", ") %} + {% for aut in bul.semestre.autorisation_inscription -%} + {% if loop.first %} + Autorisé à s'inscrire en + {% endif %} + {{- virg() }}S{{aut.semestre_id -}} + {%- if loop.last -%} + . + {%- endif -%} + {%- endfor %} +
+
+
+ + +
+ +{% endblock %} diff --git a/app/templates/but/formsemestre_validation_auto_but.j2 b/app/templates/but/formsemestre_validation_auto_but.j2 index 0d97e115..0f8e827b 100644 --- a/app/templates/but/formsemestre_validation_auto_but.j2 +++ b/app/templates/but/formsemestre_validation_auto_but.j2 @@ -9,41 +9,41 @@ {% block app_content %}
-

Calcul automatique des décisions de jury du BUT

-
    -
  • N'enregistre jamais de décisions de l'année scolaire précédente, même - si on a des RCUE "à cheval" sur deux années. -
    • - -
  • Attention: peut modifier des décisions déjà enregistrées, si la - validation de droit est calculée. - Ce calcul n'utilise que les notes, et pas les décisions manuelles déjà saisies. -
    - Par exemple, vous aviez saisi ATJ ou RAT - pour un étudiant dont les moyennes d'UE dépassent 10 mais qui pour une - raison particulière ne valide pas son année. Le calcul automatique peut - remplacer ce RAT par un ADM, ScoDoc considérant que les - conditions sont satisfaites. On peut éviter cela en laissant une note de - l'étudiant en ATTente. -
    • - -
  • N'enregistre que les décisions validantes de droit: ADM ou CMP. -
    • -
  • N'enregistre pas de décision si l'étudiant a une ou plusieurs notes en ATTente. -
    • -
  • L'assiduité n'est pas prise en compte.
    • -
-

- En conséquence, saisir ensuite manuellement les décisions manquantes, - notamment sur les UEs en dessous de 10. -

-
+

Calcul automatique des décisions de jury du BUT

    -
  • Ne jamais lancer ce calcul avant que toutes les notes ne soient saisies ! - (verrouiller le semestre ensuite) -
    • -
  • Il est nécessaire de relire soigneusement les décisions à l'issue de cette procédure !
    • -
+
  • N'enregistre jamais de décisions de l'année scolaire précédente, même + si on a des RCUE "à cheval" sur deux années. +
    • + +
  • Attention: peut modifier des décisions déjà enregistrées, si la + validation de droit est calculée. + Ce calcul n'utilise que les notes, et pas les décisions manuelles déjà saisies. +
    + Par exemple, vous aviez saisi ATJ ou RAT + pour un étudiant dont les moyennes d'UE dépassent 10 mais qui pour une + raison particulière ne valide pas son année. Le calcul automatique peut + remplacer ce RAT par un ADM, ScoDoc considérant que les + conditions sont satisfaites. On peut éviter cela en laissant une note de + l'étudiant en ATTente. +
    • + +
  • N'enregistre que les décisions validantes de droit: ADM ou CMP. +
    • +
  • N'enregistre pas de décision si l'étudiant a une ou plusieurs notes en ATTente. +
    • +
  • L'assiduité n'est pas prise en compte.
    • + +

    + En conséquence, saisir ensuite manuellement les décisions manquantes, + notamment sur les UEs en dessous de 10. +

    +
    +
      +
    • Ne jamais lancer ce calcul avant que toutes les notes ne soient saisies ! + (verrouiller le semestre ensuite) +
      • +
    • Il est nécessaire de relire soigneusement les décisions à l'issue de cette procédure !
      • +
    diff --git a/app/templates/config_personalized_links.j2 b/app/templates/config_personalized_links.j2 new file mode 100644 index 00000000..ff3a7f61 --- /dev/null +++ b/app/templates/config_personalized_links.j2 @@ -0,0 +1,84 @@ +{% extends "base.j2" %} +{% import 'bootstrap/wtf.html' as wtf %} + +{% block styles %} +{{super()}} + + +{% endblock %} + + +{% block app_content %} +

    {{title}}

    + +
    + +

    Les liens définis ici seront affichés dans le menu Liens de tous + les semestres de tous les départements.

    + +

    Si on coche "ajouter arguments", une query string est ajoutée par ScoDoc + à la fin du lien, pour passer des informations sur le contexte:

    + +
      +
    • dept : acronyme du département +
    • formsemestre_id : id du formsemestre affiché +
    • moduleimpl_id : id du moduleimpl affiché (si page module) +
    • evaluation_id : id de l'évaluation affichée (si page d'évaluation) +
    • etudid : id de l'étudiant (si un étudiant est sélectionné) +
    • user_name : login scodoc de l'utilisateur +
    • cas_id : login CAS de l'utilisateur +
        +
    + +
    +
    + +
    + {{ form.hidden_tag() }} + {{ wtf.form_errors(form, hiddens="only") }} + + {% for idx, link in form.links_by_id.items() %} +
    +
    Lien personnalisé {{idx}}
    + {{ wtf.form_field( form["link_"+idx|string] ) }} +
    {{ wtf.form_field( form["link_url_"+idx|string] ) }}
    + {{ wtf.form_field( form["link_with_args_"+idx|string] ) }} +
    + {% endfor %} +
    +
    Nouveau lien personnalisé
    + {{ wtf.form_field( form["link_new"] ) }} +
    {{ wtf.form_field( form["link_url_new"] ) }}
    + {{ wtf.form_field( form["link_with_args_new"] ) }} +
    +
    + {{ wtf.form_field(form.submit) }} + {{ wtf.form_field(form.cancel) }} +
    + +
    +
    +
    + +{% endblock %} \ No newline at end of file diff --git a/app/templates/configuration.j2 b/app/templates/configuration.j2 index e9ec4d46..43fef06c 100644 --- a/app/templates/configuration.j2 +++ b/app/templates/configuration.j2 @@ -24,6 +24,20 @@

    Configuration générale

    Les paramètres donnés ici s'appliquent à tout ScoDoc (tous les départements).
    +

    ScoDoc

    +
    + {{ form_scodoc.hidden_tag() }} +
    +
    + {{ wtf.quick_form(form_scodoc) }} +
    +
    + + +
    +

    Calcul des "bonus" définis par l'établissement

    @@ -52,32 +66,28 @@

    configuration des codes de décision

    +
    +

    Assiduités

    +

    configuration du module d'assiduités +

    +

    Utilisateurs et CAS

    - 🛟 Remettre - les permissions des rôles standards à leurs valeurs par défaut - (efface les modifications apportées aux rôles) + 🛟 Remettre + les permissions des rôles standards à leurs valeurs par défaut + (efface les modifications apportées aux rôles)
    -

    ScoDoc

    - - {{ form_scodoc.hidden_tag() }} -
    -
    - {{ wtf.quick_form(form_scodoc) }} -
    -
    - {% endblock %} {% block scripts %} diff --git a/app/templates/formsemestre_header.j2 b/app/templates/formsemestre_header.j2 index 20822079..b86a85e1 100644 --- a/app/templates/formsemestre_header.j2 +++ b/app/templates/formsemestre_header.j2 @@ -1,7 +1,7 @@ {# -*- mode: jinja-html -*- #} {# Description un semestre (barre de menu et infos) #} -
    +
    +
    {{formsemestre.titre}} diff --git a/app/templates/jury/erase_decisions_annee_formation.j2 b/app/templates/jury/erase_decisions_annee_formation.j2 index 5f81e69c..4549688b 100644 --- a/app/templates/jury/erase_decisions_annee_formation.j2 +++ b/app/templates/jury/erase_decisions_annee_formation.j2 @@ -4,8 +4,8 @@ {% if not validations %}

    Aucune validation de jury enregistrée pour {{etud.html_link_fiche()|safe}} -sur l'année {{annee}} -de la formation {{ formation.html() }} + sur l'année {{annee}} + de la formation {{ formation.html() }}

    @@ -16,7 +16,7 @@ de la formation {{ formation.html() }}

    Effacer les décisions de jury pour l'année {{annee}} de {{etud.html_link_fiche()|safe}} ?

    Affectera toutes les décisions concernant l'année {{annee}} de la formation, -quelle que soit leur origine.

    + quelle que soit leur origine.

    Les décisions concernées sont:

    diff --git a/app/templates/scolar/partition_editor.j2 b/app/templates/scolar/partition_editor.j2 index 79ca2f62..bdd900d9 100644 --- a/app/templates/scolar/partition_editor.j2 +++ b/app/templates/scolar/partition_editor.j2 @@ -23,7 +23,7 @@

    Étudiants

    - Outils d'affections + Outils d'affectation
    Valider
    -
    + +
    +
    +
    +
    - +
    @@ -430,6 +434,8 @@ /****************************/ /* Affectation à un groupe */ /****************************/ + var progressNb = 0; + var progressRef = 0; function affectationGo() { let from = document.querySelector("#affectationFrom").value; let to = document.querySelector("#affectationTo").value; @@ -450,7 +456,13 @@ }) } - console.log(elements); + let progress = document.querySelector("#zoneChoix .autoAffectation .progress"); + if (elements.length > 1) { + progress.style.setProperty('--reference', elements.length); + progress.style.setProperty('--nombre', 0); + progressRef = elements.length; + progressNb = 0; + } elements.forEach(groupeSelected => { if (to[0] != "n") { @@ -502,6 +514,13 @@ this.classList.remove("saving"); this.classList.add("saved"); setTimeout(() => { this.classList.remove("saved") }, 800); + + let progress = document.querySelector("#zoneChoix .autoAffectation .progress"); + progress.style.setProperty('--nombre', ++progressNb); + + if (progressNb == progressRef) { + sco_message("Tous les étudiants sont affectés"); + } return; } throw 'Les données retournées ne sont pas valides'; diff --git a/app/templates/scolar/students_groups_auto_assignment.j2 b/app/templates/scolar/students_groups_auto_assignment.j2 index 1bd78cf6..72363898 100644 --- a/app/templates/scolar/students_groups_auto_assignment.j2 +++ b/app/templates/scolar/students_groups_auto_assignment.j2 @@ -829,7 +829,7 @@ sheet.column("K").width(20); sheet.column("L").width(20); - saveFile("Données groupes - " + formsemestre, workbook); + saveFile("Donnees groupes - " + formsemestre, workbook); }); } @@ -853,7 +853,7 @@ colonne += 3; }) - saveFile("Résultats groupes - " + formsemestre, workbook); + saveFile("Resultats groupes - " + formsemestre, workbook); }); } diff --git a/app/templates/sidebar.j2 b/app/templates/sidebar.j2 old mode 100644 new mode 100755 index ba851377..5fe279d9 --- a/app/templates/sidebar.j2 +++ b/app/templates/sidebar.j2 @@ -24,8 +24,10 @@

    Scolarité

    Semestres
    Programmes
    - Absences
    + {% if current_user.has_permission(sco.Permission.ScoAbsChange)%} + Assiduités
    + {% endif %} {% if current_user.has_permission(sco.Permission.ScoUsersAdmin) or current_user.has_permission(sco.Permission.ScoUsersView) %} @@ -55,26 +57,26 @@ Absences {% if sco.etud_cur_sem %} (1/2 j.) + au {{ sco.etud_cur_sem['date_fin'] }}">({{sco.prefs["assi_metrique"]}})
    {{sco.nbabsjust}} J., {{sco.nbabsnj}} N.J.     {% endif %} {% endif %}
    {# /etud-insidebar #} diff --git a/app/views/__init__.py b/app/views/__init__.py index 26a24160..fdad9b5f 100644 --- a/app/views/__init__.py +++ b/app/views/__init__.py @@ -11,7 +11,7 @@ from app import db from app.models import Identite from app.models.formsemestre import FormSemestre from app.scodoc import notesdb as ndb -from app.scodoc import sco_abs +from app.scodoc import sco_assiduites from app.scodoc import sco_formsemestre_status from app.scodoc import sco_preferences from app.scodoc.sco_permissions import Permission @@ -23,6 +23,7 @@ scolar_bp = Blueprint("scolar", __name__) notes_bp = Blueprint("notes", __name__) users_bp = Blueprint("users", __name__) absences_bp = Blueprint("absences", __name__) +assiduites_bp = Blueprint("assiduites", __name__) # Cette fonction est bien appelée avant toutes les requêtes @@ -71,10 +72,16 @@ class ScoData: ins = self.etud.inscription_courante() if ins: self.etud_cur_sem = ins.formsemestre - self.nbabs, self.nbabsjust = sco_abs.get_abs_count_in_interval( + ( + self.nbabs, + self.nbabsjust, + ) = sco_assiduites.get_assiduites_count_in_interval( etud.id, self.etud_cur_sem.date_debut.isoformat(), self.etud_cur_sem.date_fin.isoformat(), + scu.translate_assiduites_metric( + sco_preferences.get_preference("assi_metrique") + ), ) self.nbabsnj = self.nbabs - self.nbabsjust else: @@ -108,6 +115,7 @@ class ScoData: from app.views import ( absences, + assiduites, but_formation, notes_formsemestre, notes, diff --git a/app/views/assiduites.py b/app/views/assiduites.py new file mode 100644 index 00000000..8c1b7cc7 --- /dev/null +++ b/app/views/assiduites.py @@ -0,0 +1,1089 @@ +import datetime + +from flask import g, request, render_template + +from flask import abort, url_for + +from app import db +from app.comp import res_sem +from app.comp.res_compat import NotesTableCompat +from app.decorators import ( + scodoc, + permission_required, +) +from app.models import ( + FormSemestre, + Identite, + ScoDocSiteConfig, + Assiduite, + Departement, + FormSemestreInscription, +) +from app.views import assiduites_bp as bp +from app.views import ScoData + +# --------------- +from app.scodoc.sco_permissions import Permission +from app.scodoc import html_sco_header +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_preferences +from app.scodoc import sco_groups_view +from app.scodoc import sco_etud +from app.scodoc import sco_find_etud +from flask_login import current_user +from app.scodoc import sco_utils as scu +from app.scodoc import sco_assiduites as scass + +from app.tables.visu_assiduites import TableAssi, etuds_sorted_from_ids + + +CSSSTYLES = html_sco_header.BOOTSTRAP_MULTISELECT_CSS + +# --- UTILS --- + + +class HTMLElement: + """""" + + +class HTMLElement: + """Représentation d'un HTMLElement version Python""" + + def __init__(self, tag: str, *attr, **kattr) -> None: + self.tag: str = tag + self.children: list[HTMLElement] = [] + self.self_close: bool = kattr.get("self_close", False) + self.text_content: str = kattr.get("text_content", "") + self.key_attributes: dict[str, any] = kattr + self.attributes: list[str] = list(attr) + + def add(self, *child: HTMLElement) -> None: + """add child element to self""" + for kid in child: + self.children.append(kid) + + def remove(self, child: HTMLElement) -> None: + """Remove child element from self""" + if child in self.children: + self.children.remove(child) + + def __str__(self) -> str: + attr: list[str] = self.attributes + + for att, val in self.key_attributes.items(): + if att in ("self_close", "text_content"): + continue + + if att != "cls": + attr.append(f'{att}="{val}"') + else: + attr.append(f'class="{val}"') + + if not self.self_close: + head: str = f"<{self.tag} {' '.join(attr)}>{self.text_content}" + body: str = "\n".join(map(str, self.children)) + foot: str = f"" + return head + body + foot + return f"<{self.tag} {' '.join(attr)}/>" + + def __add__(self, other: str): + return str(self) + other + + def __radd__(self, other: str): + return other + str(self) + + +class HTMLStringElement(HTMLElement): + """Utilisation d'une chaine de caracètres pour représenter un element""" + + def __init__(self, text: str) -> None: + self.text: str = text + HTMLElement.__init__(self, "textnode") + + def __str__(self) -> str: + return self.text + + +class HTMLBuilder: + def __init__(self, *content: HTMLElement or str) -> None: + self.content: list[HTMLElement or str] = list(content) + + def add(self, *element: HTMLElement or str): + self.content.extend(element) + + def remove(self, element: HTMLElement or str): + if element in self.content: + self.content.remove(element) + + def __str__(self) -> str: + return "\n".join(map(str, self.content)) + + def build(self) -> str: + return self.__str__() + + +# -------------------------------------------------------------------- +# +# Assiduités (/ScoDoc//Scolarite/Assiduites/...) +# +# -------------------------------------------------------------------- + + +@bp.route("/") +@bp.route("/index_html") +@scodoc +@permission_required(Permission.ScoAbsChange) +def index_html(): + """Gestionnaire assiduités, page principale""" + H = [ + html_sco_header.sco_header( + page_title="Saisie des assiduités", + javascripts=[ + "js/assiduites.js", + "libjs/moment.new.min.js", + "libjs/moment-timezone.js", + ], + cssstyles=[ + "css/assiduites.css", + ], + ), + """

    Traitement des assiduités

    +

    + Pour saisir des assiduités ou consulter les états, il est recommandé par passer par + le semestre concerné (saisie par jour ou saisie différée). +

    + """, + ] + H.append( + """

    Pour signaler, annuler ou justifier une assiduité pour un seul étudiant, + choisissez d'abord le concerné:

    """ + ) + H.append(sco_find_etud.form_search_etud()) + # if current_user.has_permission( + # Permission.ScoAbsChange + # ) and sco_preferences.get_preference("handle_billets_abs"): + # H.append( + # f""" + #

    Billets d'absence

    + # + # """ + # ) + + H.append( + render_template( + "assiduites/pages/bilan_dept.j2", + dept_id=g.scodoc_dept_id, + annee=scu.annee_scolaire(), + ), + ) + H.append(html_sco_header.sco_footer()) + return "\n".join(H) + + +@bp.route("/SignaleAssiduiteEtud") +@scodoc +@permission_required(Permission.ScoAbsChange) +def signal_assiduites_etud(): + """ + signal_assiduites_etud Saisie de l'assiduité d'un étudiant + + Args: + etudid (int): l'identifiant de l'étudiant + + Returns: + str: l'html généré + """ + + etudid = request.args.get("etudid", -1) + etud: Identite = Identite.query.get_or_404(etudid) + if etud.dept_id != g.scodoc_dept_id: + abort(404, "étudiant inexistant dans ce département") + + header: str = html_sco_header.sco_header( + page_title="Saisie Assiduités", + init_qtip=True, + javascripts=[ + "js/assiduites.js", + "libjs/moment.new.min.js", + "libjs/moment-timezone.js", + ], + cssstyles=[ + "css/assiduites.css", + ], + ) + + # Gestion des horaires (journée, matin, soir) + + morning = get_time("assi_morning_time", "08:00:00") + lunch = get_time("assi_lunch_time", "13:00:00") + afternoon = get_time("assi_afternoon_time", "18:00:00") + + select = """ + + """ + + return HTMLBuilder( + header, + _mini_timeline(), + render_template( + "assiduites/pages/signal_assiduites_etud.j2", + sco=ScoData(etud), + date=datetime.date.today().isoformat(), + morning=morning, + lunch=lunch, + timeline=_timeline(), + afternoon=afternoon, + nonworkdays=_non_work_days(), + forcer_module=sco_preferences.get_preference( + "forcer_module", dept_id=g.scodoc_dept_id + ), + moduleimpl_select=_dynamic_module_selector(), + diff=_differee( + etudiants=[sco_etud.get_etud_info(etudid=etud.etudid, filled=True)[0]], + moduleimpl_select=select, + ), + ), + ).build() + + +@bp.route("/ListeAssiduitesEtud") +@scodoc +@permission_required(Permission.ScoView) +def liste_assiduites_etud(): + """ + liste_assiduites_etud Affichage de toutes les assiduites et justificatifs d'un etudiant + Args: + etudid (int): l'identifiant de l'étudiant + + Returns: + str: l'html généré + """ + + etudid = request.args.get("etudid", -1) + etud: Identite = Identite.query.get_or_404(etudid) + if etud.dept_id != g.scodoc_dept_id: + abort(404, "étudiant inexistant dans ce département") + + header: str = html_sco_header.sco_header( + page_title="Liste des assiduités", + init_qtip=True, + javascripts=[ + "js/assiduites.js", + "libjs/moment.new.min.js", + "libjs/moment-timezone.js", + ], + cssstyles=CSSSTYLES + + [ + "css/assiduites.css", + ], + ) + + return HTMLBuilder( + header, + render_template( + "assiduites/pages/liste_assiduites.j2", + sco=ScoData(etud), + date=datetime.date.today().isoformat(), + ), + ).build() + + +@bp.route("/BilanEtud") +@scodoc +@permission_required(Permission.ScoView) +def bilan_etud(): + """ + bilan_etud Affichage de toutes les assiduites et justificatifs d'un etudiant + Args: + etudid (int): l'identifiant de l'étudiant + + Returns: + str: l'html généré + """ + + etudid = request.args.get("etudid", -1) + etud: Identite = Identite.query.get_or_404(etudid) + if etud.dept_id != g.scodoc_dept_id: + abort(404, "étudiant inexistant dans ce département") + + header: str = html_sco_header.sco_header( + page_title="Bilan de l'assiduité étudiante", + init_qtip=True, + javascripts=[ + "js/assiduites.js", + "libjs/moment.new.min.js", + "libjs/moment-timezone.js", + ], + cssstyles=CSSSTYLES + + [ + "css/assiduites.css", + ], + ) + + date_debut: str = f"{scu.annee_scolaire()}-09-01" + date_fin: str = f"{scu.annee_scolaire()+1}-06-30" + + assi_metric = { + "H.": "heure", + "J.": "journee", + "1/2 J.": "demi", + }.get(sco_preferences.get_preference("assi_metrique", dept_id=g.scodoc_dept_id)) + + return HTMLBuilder( + header, + render_template( + "assiduites/pages/bilan_etud.j2", + sco=ScoData(etud), + date_debut=date_debut, + date_fin=date_fin, + assi_metric=assi_metric, + assi_seuil=_get_seuil(), + ), + ).build() + + +@bp.route("/AjoutJustificatifEtud") +@scodoc +@permission_required(Permission.ScoAbsChange) +def ajout_justificatif_etud(): + """ + ajout_justificatif_etud : Affichage et création/modification des justificatifs de l'étudiant + Args: + etudid (int): l'identifiant de l'étudiant + + Returns: + str: l'html généré + """ + + etudid = request.args.get("etudid", -1) + etud: Identite = Identite.query.get_or_404(etudid) + if etud.dept_id != g.scodoc_dept_id: + abort(404, "étudiant inexistant dans ce département") + + header: str = html_sco_header.sco_header( + page_title="Justificatifs", + init_qtip=True, + javascripts=[ + "js/assiduites.js", + "libjs/moment.new.min.js", + "libjs/moment-timezone.js", + ], + cssstyles=CSSSTYLES + + [ + "css/assiduites.css", + ], + ) + + return HTMLBuilder( + header, + render_template( + "assiduites/pages/ajout_justificatif.j2", + sco=ScoData(etud), + ), + ).build() + + +@bp.route("/CalendrierAssiduitesEtud") +@scodoc +@permission_required(Permission.ScoView) +def calendrier_etud(): + """ + calendrier_etud : Affichage d'un calendrier des assiduités de l'étudiant + Args: + etudid (int): l'identifiant de l'étudiant + + Returns: + str: l'html généré + """ + + etudid = request.args.get("etudid", -1) + etud: Identite = Identite.query.get_or_404(etudid) + if etud.dept_id != g.scodoc_dept_id: + abort(404, "étudiant inexistant dans ce département") + + header: str = html_sco_header.sco_header( + page_title="Calendrier des Assiduités", + init_qtip=True, + javascripts=[ + "js/assiduites.js", + "libjs/moment.new.min.js", + "libjs/moment-timezone.js", + ], + cssstyles=CSSSTYLES + + [ + "css/assiduites.css", + ], + ) + + return HTMLBuilder( + header, + render_template( + "assiduites/pages/calendrier.j2", + sco=ScoData(etud), + annee=scu.annee_scolaire(), + nonworkdays=_non_work_days(), + minitimeline=_mini_timeline(), + ), + ).build() + + +@bp.route("/SignalAssiduiteGr") +@scodoc +@permission_required(Permission.ScoAbsChange) +def signal_assiduites_group(): + """ + signal_assiduites_group Saisie des assiduités des groupes pour le jour donnée + + Returns: + str: l'html généré + """ + formsemestre_id: int = request.args.get("formsemestre_id", -1) + moduleimpl_id: int = request.args.get("moduleimpl_id") + date: str = request.args.get("jour", datetime.date.today().isoformat()) + group_ids: list[int] = request.args.get("group_ids", None) + + if group_ids is None: + group_ids = [] + else: + group_ids = group_ids.split(",") + map(str, group_ids) + + # Vérification du moduleimpl_id + try: + moduleimpl_id = int(moduleimpl_id) + except (TypeError, ValueError): + moduleimpl_id = None + # Vérification du formsemestre_id + try: + formsemestre_id = int(formsemestre_id) + except (TypeError, ValueError): + formsemestre_id = None + + groups_infos = sco_groups_view.DisplayedGroupsInfos( + group_ids, moduleimpl_id=moduleimpl_id, formsemestre_id=formsemestre_id + ) + if not groups_infos.members: + return ( + html_sco_header.sco_header(page_title="Saisie journalière des Assiduités") + + "

    Aucun étudiant !

    " + + html_sco_header.sco_footer() + ) + + # --- URL DEFAULT --- + + base_url: str = f"SignalAssiduiteGr?date={date}&{groups_infos.groups_query_args}" + + # --- Filtrage par formsemestre --- + formsemestre_id = groups_infos.formsemestre_id + + formsemestre: FormSemestre = FormSemestre.query.get_or_404(formsemestre_id) + if formsemestre.dept_id != g.scodoc_dept_id: + abort(404, "groupes inexistants dans ce département") + + require_module = sco_preferences.get_preference( + "abs_require_module", formsemestre_id + ) + + etuds = [ + sco_etud.get_etud_info(etudid=m["etudid"], filled=True)[0] + for m in groups_infos.members + ] + + # --- Vérification de la date --- + + real_date = scu.is_iso_formated(date, True).date() + + if real_date < formsemestre.date_debut: + date = formsemestre.date_debut.isoformat() + elif real_date > formsemestre.date_fin: + date = formsemestre.date_fin.isoformat() + + # --- Restriction en fonction du moduleimpl_id --- + if moduleimpl_id: + mod_inscrits = { + x["etudid"] + for x in sco_moduleimpl.do_moduleimpl_inscription_list( + moduleimpl_id=moduleimpl_id + ) + } + etuds_inscrits_module = [e for e in etuds if e["etudid"] in mod_inscrits] + if etuds_inscrits_module: + etuds = etuds_inscrits_module + else: + # Si aucun etudiant n'est inscrit au module choisi... + moduleimpl_id = None + + # --- Génération de l'HTML --- + sem = formsemestre.to_dict() + + if groups_infos.tous_les_etuds_du_sem: + gr_tit = "en" + else: + if len(groups_infos.group_ids) > 1: + grp = "des groupes" + else: + grp = "du groupe" + gr_tit = ( + grp + ' ' + groups_infos.groups_titles + "" + ) + + header: str = html_sco_header.sco_header( + page_title="Saisie journalière des assiduités", + init_qtip=True, + javascripts=html_sco_header.BOOTSTRAP_MULTISELECT_JS + + [ + # Voir fonctionnement JS + "js/etud_info.js", + "js/abs_ajax.js", + "js/groups_view.js", + "js/assiduites.js", + "libjs/moment.new.min.js", + "libjs/moment-timezone.js", + ], + cssstyles=CSSSTYLES + + [ + "css/assiduites.css", + ], + ) + + return HTMLBuilder( + header, + _mini_timeline(), + render_template( + "assiduites/pages/signal_assiduites_group.j2", + gr_tit=gr_tit, + sem=sem["titre_num"], + date=date, + formsemestre_id=formsemestre_id, + grp=sco_groups_view.menu_groups_choice(groups_infos), + moduleimpl_select=_module_selector(formsemestre, moduleimpl_id), + timeline=_timeline(), + nonworkdays=_non_work_days(), + formsemestre_date_debut=str(formsemestre.date_debut), + formsemestre_date_fin=str(formsemestre.date_fin), + forcer_module=sco_preferences.get_preference( + "forcer_module", + formsemestre_id=formsemestre_id, + dept_id=g.scodoc_dept_id, + ), + defdem=_get_etuds_dem_def(formsemestre), + readonly="false", + ), + html_sco_header.sco_footer(), + ).build() + + +@bp.route("/VisuAssiduiteGr") +@scodoc +@permission_required(Permission.ScoView) +def visu_assiduites_group(): + """ + signal_assiduites_group Saisie des assiduités des groupes pour le jour donnée + + Returns: + str: l'html généré + """ + formsemestre_id: int = request.args.get("formsemestre_id", -1) + moduleimpl_id: int = request.args.get("moduleimpl_id") + date: str = request.args.get("jour", datetime.date.today().isoformat()) + group_ids: list[int] = request.args.get("group_ids", None) + + if group_ids is None: + group_ids = [] + else: + group_ids = group_ids.split(",") + map(str, group_ids) + + # Vérification du moduleimpl_id + try: + moduleimpl_id = int(moduleimpl_id) + except (TypeError, ValueError): + moduleimpl_id = None + # Vérification du formsemestre_id + try: + formsemestre_id = int(formsemestre_id) + except (TypeError, ValueError): + formsemestre_id = None + + groups_infos = sco_groups_view.DisplayedGroupsInfos( + group_ids, moduleimpl_id=moduleimpl_id, formsemestre_id=formsemestre_id + ) + if not groups_infos.members: + return ( + html_sco_header.sco_header(page_title="Saisie journalière des Assiduités") + + "

    Aucun étudiant !

    " + + html_sco_header.sco_footer() + ) + + # --- URL DEFAULT --- + + base_url: str = f"SignalAssiduiteGr?date={date}&{groups_infos.groups_query_args}" + + # --- Filtrage par formsemestre --- + formsemestre_id = groups_infos.formsemestre_id + + formsemestre: FormSemestre = FormSemestre.query.get_or_404(formsemestre_id) + if formsemestre.dept_id != g.scodoc_dept_id: + abort(404, "groupes inexistants dans ce département") + + require_module = sco_preferences.get_preference( + "abs_require_module", formsemestre_id + ) + + etuds = [ + sco_etud.get_etud_info(etudid=m["etudid"], filled=True)[0] + for m in groups_infos.members + ] + + # --- Vérification de la date --- + + real_date = scu.is_iso_formated(date, True).date() + + if real_date < formsemestre.date_debut: + date = formsemestre.date_debut.isoformat() + elif real_date > formsemestre.date_fin: + date = formsemestre.date_fin.isoformat() + + # --- Restriction en fonction du moduleimpl_id --- + if moduleimpl_id: + mod_inscrits = { + x["etudid"] + for x in sco_moduleimpl.do_moduleimpl_inscription_list( + moduleimpl_id=moduleimpl_id + ) + } + etuds_inscrits_module = [e for e in etuds if e["etudid"] in mod_inscrits] + if etuds_inscrits_module: + etuds = etuds_inscrits_module + else: + # Si aucun etudiant n'est inscrit au module choisi... + moduleimpl_id = None + + # --- Génération de l'HTML --- + sem = formsemestre.to_dict() + + if groups_infos.tous_les_etuds_du_sem: + gr_tit = "en" + else: + if len(groups_infos.group_ids) > 1: + grp = "des groupes" + else: + grp = "du groupe" + gr_tit = ( + grp + ' ' + groups_infos.groups_titles + "" + ) + + header: str = html_sco_header.sco_header( + page_title="Saisie journalière des assiduités", + init_qtip=True, + javascripts=html_sco_header.BOOTSTRAP_MULTISELECT_JS + + [ + # Voir fonctionnement JS + "js/etud_info.js", + "js/abs_ajax.js", + "js/groups_view.js", + "js/assiduites.js", + "libjs/moment.new.min.js", + "libjs/moment-timezone.js", + ], + cssstyles=CSSSTYLES + + [ + "css/assiduites.css", + ], + ) + + return HTMLBuilder( + header, + _mini_timeline(), + render_template( + "assiduites/pages/signal_assiduites_group.j2", + gr_tit=gr_tit, + sem=sem["titre_num"], + date=date, + formsemestre_id=formsemestre_id, + grp=sco_groups_view.menu_groups_choice(groups_infos), + moduleimpl_select=_module_selector(formsemestre, moduleimpl_id), + timeline=_timeline(), + nonworkdays=_non_work_days(), + formsemestre_date_debut=str(formsemestre.date_debut), + formsemestre_date_fin=str(formsemestre.date_fin), + forcer_module=sco_preferences.get_preference( + "forcer_module", + formsemestre_id=formsemestre_id, + dept_id=g.scodoc_dept_id, + ), + defdem=_get_etuds_dem_def(formsemestre), + readonly="true", + ), + html_sco_header.sco_footer(), + ).build() + + +@bp.route("/EtatAbsencesDate") +@scodoc +@permission_required(Permission.ScoView) +def get_etat_abs_date(): + evaluation = { + "jour": request.args.get("jour"), + "heure_debut": request.args.get("heure_debut"), + "heure_fin": request.args.get("heure_fin"), + "title": request.args.get("desc"), + } + date: str = evaluation["jour"] + group_ids: list[int] = request.args.get("group_ids", None) + etudiants: list[dict] = [] + + if group_ids is None: + group_ids = [] + else: + group_ids = group_ids.split(",") + map(str, group_ids) + + groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids) + + etuds = [ + sco_etud.get_etud_info(etudid=m["etudid"], filled=True)[0] + for m in groups_infos.members + ] + + date_debut = scu.is_iso_formated( + f"{evaluation['jour']}T{evaluation['heure_debut'].replace('h',':')}", True + ) + date_fin = scu.is_iso_formated( + f"{evaluation['jour']}T{evaluation['heure_fin'].replace('h',':')}", True + ) + + assiduites: Assiduite = Assiduite.query.filter( + Assiduite.etudid.in_([e["etudid"] for e in etuds]) + ) + assiduites = scass.filter_by_date( + assiduites, Assiduite, date_debut, date_fin, False + ) + + for etud in etuds: + assi = assiduites.filter_by(etudid=etud["etudid"]).first() + + etat = "" + if assi != None and assi.etat != 0: + etat = scu.EtatAssiduite.inverse().get(assi.etat).name + + etudiant = { + "nom": f'{etud["nomprenom"]}', + "etat": etat, + } + + etudiants.append(etudiant) + + etudiants = list(sorted(etudiants, key=lambda x: x["nom"])) + + header: str = html_sco_header.sco_header( + page_title=evaluation["title"], + init_qtip=True, + ) + + return HTMLBuilder( + header, + render_template( + "assiduites/pages/etat_absence_date.j2", + etudiants=etudiants, + eval=evaluation, + ), + html_sco_header.sco_footer(), + ).build() + + +@bp.route("/VisualisationAssiduitesGroupe") +@scodoc +@permission_required(Permission.ScoView) +def visu_assi_group(): + dates = { + "debut": request.args.get("date_debut"), + "fin": request.args.get("date_fin"), + } + fmt = request.args.get("format", "html") + + group_ids: list[int] = request.args.get("group_ids", None) + etudiants: list[dict] = [] + + if group_ids is None: + group_ids = [] + else: + group_ids = group_ids.split(",") + map(str, group_ids) + + groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids) + formsemestre = db.session.get(FormSemestre, groups_infos.formsemestre_id) + etuds = etuds_sorted_from_ids([m["etudid"] for m in groups_infos.members]) + table: TableAssi = TableAssi( + etuds=etuds, dates=list(dates.values()), formsemestre=formsemestre + ) + + if fmt.startswith("xls"): + return scu.send_file( + table.excel(), + filename=f"assiduite-{groups_infos.groups_filename}", + mime=scu.XLSX_MIMETYPE, + suffix=scu.XLSX_SUFFIX, + ) + + if groups_infos.tous_les_etuds_du_sem: + gr_tit = "" + grp = "" + else: + if len(groups_infos.group_ids) > 1: + grp = "des groupes" + else: + grp = "du groupe" + gr_tit = ( + grp + ' ' + groups_infos.groups_titles + "" + ) + + print() + + return render_template( + "assiduites/pages/visu_assi.j2", + tableau=table.html(), + gr_tit=gr_tit, + date_debut=dates["debut"], + date_fin=dates["fin"], + group_ids=request.args.get("group_ids", None), + sco=ScoData(formsemestre=groups_infos.get_formsemestre()), + title=f"Assiduité {grp} {groups_infos.groups_titles}", + ) + + +@bp.route("/SignalAssiduiteDifferee") +@scodoc +@permission_required(Permission.ScoAbsChange) +def signal_assiduites_diff(): + group_ids: list[int] = request.args.get("group_ids", None) + formsemestre_id: int = request.args.get("formsemestre_id", -1) + date: str = request.args.get("jour", datetime.date.today().isoformat()) + etudiants: list[dict] = [] + + titre = None + + # Vérification du formsemestre_id + try: + formsemestre_id = int(formsemestre_id) + except (TypeError, ValueError): + formsemestre_id = None + + formsemestre: FormSemestre = FormSemestre.query.get_or_404(formsemestre_id) + + # --- Vérification de la date --- + + real_date = scu.is_iso_formated(date, True).date() + + if real_date < formsemestre.date_debut: + date = formsemestre.date_debut.isoformat() + elif real_date > formsemestre.date_fin: + date = formsemestre.date_fin.isoformat() + + if group_ids is None: + group_ids = [] + else: + group_ids = group_ids.split(",") + map(str, group_ids) + + groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids) + + if not groups_infos.members: + return ( + html_sco_header.sco_header(page_title="Assiduités Différées") + + "

    Aucun étudiant !

    " + + html_sco_header.sco_footer() + ) + + etudiants.extend( + [ + sco_etud.get_etud_info(etudid=m["etudid"], filled=True)[0] + for m in groups_infos.members + ] + ) + + etudiants = list(sorted(etudiants, key=lambda x: x["nom"])) + + header: str = html_sco_header.sco_header( + page_title="Assiduités Différées", + init_qtip=True, + cssstyles=[ + "css/assiduites.css", + ], + javascripts=html_sco_header.BOOTSTRAP_MULTISELECT_JS + + [ + "js/assiduites.js", + "libjs/moment.new.min.js", + "libjs/moment-timezone.js", + ], + ) + + sem = formsemestre.to_dict() + + if groups_infos.tous_les_etuds_du_sem: + gr_tit = "en" + else: + if len(groups_infos.group_ids) > 1: + grp = "des groupes" + else: + grp = "du groupe" + gr_tit = ( + grp + ' ' + groups_infos.groups_titles + "" + ) + + return HTMLBuilder( + header, + render_template( + "assiduites/pages/signal_assiduites_diff.j2", + diff=_differee( + etudiants=etudiants, + moduleimpl_select=_module_selector(formsemestre), + date=date, + periode={ + "deb": formsemestre.date_debut.isoformat(), + "fin": formsemestre.date_fin.isoformat(), + }, + ), + gr=gr_tit, + sem=sem["titre_num"], + defdem=_get_etuds_dem_def(formsemestre), + ), + html_sco_header.sco_footer(), + ).build() + + +def _differee( + etudiants, moduleimpl_select, date=None, periode=None, formsemestre_id=None +): + if date is None: + date = datetime.date.today().isoformat() + + forcer_module = sco_preferences.get_preference( + "forcer_module", + formsemestre_id=formsemestre_id, + dept_id=g.scodoc_dept_id, + ) + + etat_def = sco_preferences.get_preference( + "assi_etat_defaut", + formsemestre_id=formsemestre_id, + dept_id=g.scodoc_dept_id, + ) + + return render_template( + "assiduites/widgets/differee.j2", + etudiants=etudiants, + etat_def=etat_def, + forcer_module=forcer_module, + moduleimpl_select=moduleimpl_select, + date=date, + periode=periode, + ) + + +def _module_selector( + formsemestre: FormSemestre, moduleimpl_id: int = None +) -> HTMLElement: + """ + _module_selector Génère un HTMLSelectElement à partir des moduleimpl du formsemestre + + Args: + formsemestre (FormSemestre): Le formsemestre d'où les moduleimpls seront pris. + + Returns: + str: La représentation str d'un HTMLSelectElement + """ + + ntc: NotesTableCompat = res_sem.load_formsemestre_results(formsemestre) + + modimpls_list: list[dict] = [] + ues = ntc.get_ues_stat_dict() + for ue in ues: + modimpls_list += ntc.get_modimpls_dict(ue_id=ue["ue_id"]) + + selected = moduleimpl_id is not None + + modules = [] + + for modimpl in modimpls_list: + modname: str = ( + (modimpl["module"]["code"] or "") + + " " + + (modimpl["module"]["abbrev"] or modimpl["module"]["titre"] or "") + ) + modules.append({"moduleimpl_id": modimpl["moduleimpl_id"], "name": modname}) + + return render_template( + "assiduites/widgets/moduleimpl_selector.j2", selected=selected, modules=modules + ) + + +def _dynamic_module_selector(): + return render_template("assiduites/widgets/moduleimpl_dynamic_selector.j2") + + +def _timeline(formsemestre_id=None) -> HTMLElement: + return render_template( + "assiduites/widgets/timeline.j2", + t_start=get_time("assi_morning_time", "08:00:00"), + t_end=get_time("assi_afternoon_time", "18:00:00"), + tick_time=ScoDocSiteConfig.get("assi_tick_time", 15), + periode_defaut=sco_preferences.get_preference( + "periode_defaut", formsemestre_id + ), + ) + + +def _mini_timeline() -> HTMLElement: + return render_template( + "assiduites/widgets/minitimeline.j2", + t_start=get_time("assi_morning_time", "08:00:00"), + t_end=get_time("assi_afternoon_time", "18:00:00"), + ) + + +def _non_work_days(): + non_travail = sco_preferences.get_preference("non_travail", None) + non_travail = non_travail.replace(" ", "").split(",") + return ",".join([f"'{i.lower()}'" for i in non_travail]) + + +def _str_to_num(string: str): + parts = [*map(float, string.split(":"))] + hour = parts[0] + minutes = round(parts[1] / 60 * 4) / 4 + return hour + minutes + + +def get_time(label: str, default: str): + return _str_to_num(ScoDocSiteConfig.get(label, default)) + + +def _get_seuil(): + return sco_preferences.get_preference("assi_seuil", dept_id=g.scodoc_dept_id) + + +def _get_etuds_dem_def(formsemestre): + etuds_dem_def = [ + (f.etudid, f.etat) + for f in FormSemestreInscription.query.filter( + FormSemestreInscription.formsemestre_id == formsemestre.id, + FormSemestreInscription.etat != "I", + ).all() + ] + + template: str = '"£" : "$",' + + json_str: str = "{" + + for etud in etuds_dem_def: + json_str += template.replace("£", str(etud[0])).replace("$", etud[1]) + + if json_str != "{": + json_str = json_str[:-1] + + return json_str + "}" diff --git a/app/views/notes.py b/app/views/notes.py index da80388a..7e0ad26e 100644 --- a/app/views/notes.py +++ b/app/views/notes.py @@ -35,7 +35,7 @@ from operator import itemgetter import time import flask -from flask import abort, flash, redirect, render_template, url_for +from flask import flash, redirect, render_template, url_for from flask import g, request from flask_login import current_user @@ -44,6 +44,7 @@ from app import models from app.auth.models import User from app.but import ( apc_edit_ue, + bulletin_but_court, cursus_but, jury_edit_manual, jury_but, @@ -58,7 +59,6 @@ from app.comp import jury, res_sem from app.comp.res_compat import NotesTableCompat from app.models import ( Formation, - ScolarFormSemestreValidation, ScolarAutorisationInscription, ScolarNews, Scolog, diff --git a/app/views/scodoc.py b/app/views/scodoc.py index c4c12475..41af54d6 100644 --- a/app/views/scodoc.py +++ b/app/views/scodoc.py @@ -61,15 +61,23 @@ from app.decorators import ( scodoc, ) from app.forms.main import config_logos, config_main -from app.forms.main.create_dept import CreateDeptForm +from app.forms.main.config_assiduites import ConfigAssiduitesForm from app.forms.main.config_apo import CodesDecisionsForm from app.forms.main.config_cas import ConfigCASForm +from app.forms.main.config_personalized_links import PersonalizedLinksForm +from app.forms.main.create_dept import CreateDeptForm from app import models -from app.models import Departement, Identite +from app.models import ( + Departement, + FormSemestre, + FormSemestreInscription, + Identite, + ScoDocSiteConfig, + UniteEns, +) from app.models import departements -from app.models import FormSemestre, FormSemestreInscription -from app.models import ScoDocSiteConfig -from app.models import UniteEns +from app.models.config import PersonalizedLink + from app.scodoc import sco_find_etud from app.scodoc import sco_logos @@ -188,6 +196,54 @@ def config_cas(): ) +@bp.route("/ScoDoc/config_assiduites", methods=["GET", "POST"]) +@admin_required +def config_assiduites(): + """Form config Assiduites""" + form = ConfigAssiduitesForm() + if request.method == "POST" and form.cancel.data: # cancel button + return redirect(url_for("scodoc.index")) + if form.validate_on_submit(): + if ScoDocSiteConfig.set("assi_morning_time", form.data["morning_time"]): + flash("Heure du début de la journée enregistrée") + if ScoDocSiteConfig.set("assi_lunch_time", form.data["lunch_time"]): + flash("Heure de midi enregistrée") + if ScoDocSiteConfig.set("assi_afternoon_time", form.data["afternoon_time"]): + flash("Heure de fin de la journée enregistrée") + if ( + form.data["tick_time"] > 0 + and form.data["tick_time"] < 60 + and ScoDocSiteConfig.set("assi_tick_time", float(form.data["tick_time"])) + ): + flash("Granularité de la timeline enregistrée") + else: + flash("Erreur : Granularité invalide ou identique") + + return redirect(url_for("scodoc.configuration")) + + elif request.method == "GET": + form.morning_time.data = ScoDocSiteConfig.get( + "assi_morning_time", datetime.time(8, 0, 0) + ) + form.lunch_time.data = ScoDocSiteConfig.get( + "assi_lunch_time", datetime.time(13, 0, 0) + ) + form.afternoon_time.data = ScoDocSiteConfig.get( + "assi_afternoon_time", datetime.time(18, 0, 0) + ) + try: + form.tick_time.data = float(ScoDocSiteConfig.get("assi_tick_time", 15.0)) + except ValueError: + form.tick_time.data = 15.0 + ScoDocSiteConfig.set("assi_tick_time", 15.0) + + return render_template( + "assiduites/pages/config_assiduites.j2", + form=form, + title="Configuration du module Assiduités", + ) + + @bp.route("/ScoDoc/config_codes_decisions", methods=["GET", "POST"]) @admin_required def config_codes_decisions(): @@ -211,6 +267,38 @@ def config_codes_decisions(): ) +@bp.route("/ScoDoc/config_personalized_links", methods=["GET", "POST"]) +@admin_required +def config_personalized_links(): + """Form config liens perso""" + form = PersonalizedLinksForm() + if request.method == "POST" and form.cancel.data: # cancel button + return redirect(url_for("scodoc.index")) + if form.validate_on_submit(): + links = [] + for idx in list(form.links_by_id) + ["new"]: + title = form.data.get(f"link_{idx}") + url = form.data.get(f"link_url_{idx}") + with_args = form.data.get(f"link_with_args_{idx}") + if title and url: + links.append( + PersonalizedLink(title=title, url=url, with_args=with_args) + ) + ScoDocSiteConfig.set_perso_links(links) + flash("Liens enregistrés") + return redirect(url_for("scodoc.configuration")) + + for idx, link in form.links_by_id.items(): + getattr(form, f"link_{idx}").data = link.title + getattr(form, f"link_url_{idx}").data = link.url + getattr(form, f"link_with_args_{idx}").data = link.with_args + return render_template( + "config_personalized_links.j2", + form=form, + title="Configuration des liens personnalisés", + ) + + @bp.route("/ScoDoc/table_etud_in_accessible_depts", methods=["POST"]) @login_required def table_etud_in_accessible_depts(): diff --git a/config.py b/config.py index 8ad045d8..d98e9513 100755 --- a/config.py +++ b/config.py @@ -41,6 +41,7 @@ class Config: # flask_json: JSON_ADD_STATUS = False JSON_USE_ENCODE_METHODS = True + JSON_DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S%z" # "%Y-%m-%dT%H:%M:%S" class ProdConfig(Config): diff --git a/migrations/versions/45e0a855b8eb_assiduites_external_data.py b/migrations/versions/45e0a855b8eb_assiduites_external_data.py new file mode 100644 index 00000000..4b26e102 --- /dev/null +++ b/migrations/versions/45e0a855b8eb_assiduites_external_data.py @@ -0,0 +1,33 @@ +"""assiduites_external_data + +Revision ID: 45e0a855b8eb +Revises: 50f7e0b6229f +Create Date: 2023-07-31 07:32:18.674345 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = "45e0a855b8eb" +down_revision = "50f7e0b6229f" +branch_labels = None +depends_on = None + + +def upgrade(): + with op.batch_alter_table("assiduites", schema=None) as batch_op: + batch_op.add_column(sa.Column("external_data", sa.JSON(), nullable=True)) + + with op.batch_alter_table("justificatifs", schema=None) as batch_op: + batch_op.add_column(sa.Column("external_data", sa.JSON(), nullable=True)) + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table("justificatifs", schema=None) as batch_op: + batch_op.drop_column("external_data") + + with op.batch_alter_table("assiduites", schema=None) as batch_op: + batch_op.drop_column("external_data") diff --git a/migrations/versions/50f7e0b6229f_assiduites_champ_desc_description.py b/migrations/versions/50f7e0b6229f_assiduites_champ_desc_description.py new file mode 100644 index 00000000..f37b1ce6 --- /dev/null +++ b/migrations/versions/50f7e0b6229f_assiduites_champ_desc_description.py @@ -0,0 +1,28 @@ +"""assiduites_champ_desc_description + +Revision ID: 50f7e0b6229f +Revises: b555390780b2 +Create Date: 2023-07-20 12:52:27.882303 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = "50f7e0b6229f" +down_revision = "b555390780b2" +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column("assiduites", "desc", new_column_name="description") + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column("assiduites", "description", new_column_name="desc") + # ### end Alembic commands ### diff --git a/migrations/versions/b555390780b2_assiduites_ajout_user_id_est_just.py b/migrations/versions/b555390780b2_assiduites_ajout_user_id_est_just.py new file mode 100755 index 00000000..2a577fcb --- /dev/null +++ b/migrations/versions/b555390780b2_assiduites_ajout_user_id_est_just.py @@ -0,0 +1,71 @@ +"""assiduites ajout user_id,est_just + +Revision ID: b555390780b2 +Revises: dbcf2175e87f +Create Date: 2023-02-22 18:44:22.643275 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = "b555390780b2" +down_revision = "dbcf2175e87f" +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column( + "assiduites", + sa.Column( + "user_id", + sa.Integer(), + nullable=True, + ), + ) + op.add_column( + "assiduites", + sa.Column("est_just", sa.Boolean(), server_default="false", nullable=False), + ) + op.create_index( + op.f("ix_assiduites_user_id"), "assiduites", ["user_id"], unique=False + ) + op.create_foreign_key( + "fk_assiduites_user_id", + "assiduites", + "user", + ["user_id"], + ["id"], + ondelete="SET NULL", + ) + op.add_column( + "justificatifs", + sa.Column("user_id", sa.Integer(), nullable=True), + ) + op.create_index( + op.f("ix_justificatifs_user_id"), "justificatifs", ["user_id"], unique=False + ) + op.create_foreign_key( + "fk_justificatifs_user_id", + "justificatifs", + "user", + ["user_id"], + ["id"], + ondelete="SET NULL", + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint("fk_justificatifs_user_id", "justificatifs", type_="foreignkey") + op.drop_index(op.f("ix_justificatifs_user_id"), table_name="justificatifs") + op.drop_column("justificatifs", "user_id") + op.drop_constraint("fk_assiduites_user_id", "assiduites", type_="foreignkey") + op.drop_index(op.f("ix_assiduites_user_id"), table_name="assiduites") + op.drop_column("assiduites", "est_just") + op.drop_column("assiduites", "user_id") + # ### end Alembic commands ### diff --git a/migrations/versions/c701224fa255_validation_niveaux_inferieurs.py b/migrations/versions/c701224fa255_validation_niveaux_inferieurs.py index 08f27509..0fb23dea 100644 --- a/migrations/versions/c701224fa255_validation_niveaux_inferieurs.py +++ b/migrations/versions/c701224fa255_validation_niveaux_inferieurs.py @@ -11,7 +11,7 @@ from sqlalchemy.orm import sessionmaker # added by ev # revision identifiers, used by Alembic. revision = "c701224fa255" -down_revision = "d84bc592584e" +down_revision = "d84bc592584e" # "b555390780b2" branch_labels = None depends_on = None diff --git a/migrations/versions/dbcf2175e87f_modeles_assiduites_justificatifs.py b/migrations/versions/dbcf2175e87f_modeles_assiduites_justificatifs.py new file mode 100755 index 00000000..51f0eeaf --- /dev/null +++ b/migrations/versions/dbcf2175e87f_modeles_assiduites_justificatifs.py @@ -0,0 +1,95 @@ +"""modèles assiduites justificatifs + +Revision ID: dbcf2175e87f +Revises: c701224fa255 +Create Date: 2023-02-01 14:21:06.989190 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = "dbcf2175e87f" +down_revision = "829683efddc4" +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table( + "justificatifs", + sa.Column("id", sa.Integer(), nullable=False), + sa.Column( + "date_debut", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "date_fin", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("etudid", sa.Integer(), nullable=False), + sa.Column("etat", sa.Integer(), nullable=False), + sa.Column( + "entry_date", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=True, + ), + sa.Column("raison", sa.Text(), nullable=True), + sa.Column("fichier", sa.Text(), nullable=True), + sa.ForeignKeyConstraint(["etudid"], ["identite.id"], ondelete="CASCADE"), + sa.PrimaryKeyConstraint("id"), + ) + op.create_index( + op.f("ix_justificatifs_etudid"), "justificatifs", ["etudid"], unique=False + ) + op.create_table( + "assiduites", + sa.Column("id", sa.Integer(), nullable=False), + sa.Column( + "date_debut", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "date_fin", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("moduleimpl_id", sa.Integer(), nullable=True), + sa.Column("etudid", sa.Integer(), nullable=False), + sa.Column("etat", sa.Integer(), nullable=False), + sa.Column("desc", sa.Text(), nullable=True), + sa.Column( + "entry_date", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=True, + ), + sa.ForeignKeyConstraint(["etudid"], ["identite.id"], ondelete="CASCADE"), + sa.ForeignKeyConstraint( + ["moduleimpl_id"], ["notes_moduleimpl.id"], ondelete="SET NULL" + ), + sa.PrimaryKeyConstraint("id"), + ) + op.create_index( + op.f("ix_assiduites_etudid"), "assiduites", ["etudid"], unique=False + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_index(op.f("ix_assiduites_etudid"), table_name="assiduites") + op.drop_table("assiduites") + op.drop_index(op.f("ix_justificatifs_etudid"), table_name="justificatifs") + op.drop_table("justificatifs") + # ### end Alembic commands ### diff --git a/requirements-3.11.txt b/requirements-3.11.txt new file mode 100644 index 00000000..75b898bf --- /dev/null +++ b/requirements-3.11.txt @@ -0,0 +1,101 @@ +alembic==1.11.1 +astroid==2.15.6 +async-timeout==4.0.2 +attrs==23.1.0 +Babel==2.12.1 +black==23.7.0 +blinker==1.6.2 +cachelib==0.9.0 +certifi==2023.7.22 +cffi==1.15.1 +chardet==5.1.0 +charset-normalizer==3.2.0 +click==8.1.6 +cracklib==2.9.6 +cryptography==41.0.2 +Deprecated==1.2.14 +dill==0.3.7 +dnspython==2.4.1 +dominate==2.8.0 +email-validator==2.0.0.post2 +ERAlchemy==1.2.10 +et-xmlfile==1.1.0 +exceptiongroup==1.1.2 +Flask==2.3.2 +flask-babel==3.1.0 +Flask-Bootstrap==3.3.7.1 +Flask-Caching==2.0.2 +Flask-HTTPAuth==4.8.0 +Flask-JSON==0.4.0 +Flask-Login==0.6.2 +Flask-Mail==0.9.1 +Flask-Migrate==4.0.4 +Flask-Moment==1.0.5 +Flask-SQLAlchemy==3.0.5 +Flask-WTF==1.1.1 +gprof2dot==2022.7.29 +greenlet==2.0.2 +gunicorn==21.2.0 +icalendar==5.0.7 +idna==3.4 +importlib-metadata==6.8.0 +iniconfig==2.0.0 +isort==5.12.0 +itsdangerous==2.1.2 +Jinja2==3.1.2 +lazy-object-proxy==1.9.0 +lxml==4.9.3 +Mako==1.2.4 +MarkupSafe==2.1.3 +mccabe==0.7.0 +mypy==1.4.1 +mypy-extensions==1.0.0 +numpy==1.25.1 +openpyxl==3.1.2 +packaging==23.1 +pandas==2.0.3 +pathspec==0.11.2 +Pillow==10.0.0 +platformdirs==3.10.0 +pluggy==1.2.0 +psycopg2==2.9.6 +puremagic==1.15 +py==1.11.0 +pycparser==2.21 +pydot==1.4.2 +pygraphviz==1.11 +PyJWT==2.8.0 +pylint==2.17.5 +pylint-flask==0.6 +pylint-flask-sqlalchemy==0.2.0 +pylint-plugin-utils==0.8.2 +pyOpenSSL==23.2.0 +pyparsing==3.1.1 +pytest==7.4.0 +python-dateutil==2.8.2 +python-docx==0.8.11 +python-dotenv==1.0.0 +python-editor==1.0.4 +pytz==2023.3 +PyYAML==6.0.1 +redis==4.6.0 +reportlab==4.0.4 +requests==2.31.0 +rq==1.15.1 +six==1.16.0 +snakeviz==2.2.0 +SQLAlchemy==2.0.19 +toml==0.10.2 +tomli==2.0.1 +tomlkit==0.12.1 +tornado==6.3.2 +tuna==0.5.11 +typing_extensions==4.7.1 +tzdata==2023.3 +urllib3==2.0.4 +visitor==0.1.3 +Werkzeug==2.3.6 +wrapt==1.15.0 +WTForms==3.0.1 +xmltodict==0.13.0 +zipp==3.16.2 diff --git a/sco_version.py b/sco_version.py index 48d153a1..697be935 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.5.7" +SCOVERSION = "9.6.7" SCONAME = "ScoDoc" @@ -12,6 +12,7 @@ SCONEWS = """
  • ScoDoc 9.6 (juillet 2023)
    • Nouvelle gestion des absences et assiduité
      • +
    • Mise à jour logiciels: Debian 12, Python 3.11, ...
  • ScoDoc 9.5 (juillet 2023)
    • diff --git a/scodoc.py b/scodoc.py index f541cce6..c1603f70 100755 --- a/scodoc.py +++ b/scodoc.py @@ -412,6 +412,7 @@ def delete_dept(dept, force=False): # delete-dept from app.scodoc import notesdb as ndb from app.scodoc import sco_dept + msg = "" db.reflect() ndb.open_db_connection() d = models.Departement.query.filter_by(acronym=dept).first() @@ -642,3 +643,64 @@ def profile(host, port, length, profile_dir): run_simple( host, port, app, use_debugger=False ) # use run_simple instead of app.run() + + +# <== Gestion de l'assiduité ==> + + +@app.cli.command() +@click.option( + "-d", "--dept", help="Restreint la migration au dept sélectionné (ACRONYME)" +) +@click.option( + "-m", + "--morning", + help="Spécifie l'heure de début des cours format `hh:mm`", +) +@click.option( + "-n", + "--noon", + help="Spécifie l'heure de fin du matin (et donc début de l'après-midi) format `hh:mm`", +) +@click.option( + "-e", + "--evening", + help="Spécifie l'heure de fin des cours format `hh:mm`", +) +@with_appcontext +def migrate_abs_to_assiduites( + dept: str = None, morning: str = None, noon: str = None, evening: str = None +): # migrate-abs-to-assiduites + """Permet de migrer les absences vers le nouveau module d'assiduités""" + tools.migrate_abs_to_assiduites(dept, morning, noon, evening) + # import cProfile + # cProfile.runctx( + # f"tools.migrate_abs_to_assiduites({dept})", + # {"tools": tools}, + # {}, + # "migration-nimes", + # ) + + +@app.cli.command() +@click.option( + "-d", "--dept", help="Restreint la suppression au dept sélectionné (ACRONYME)" +) +@click.option( + "-a", + "--assiduites", + is_flag=True, + help="Supprime les assiduités de scodoc", +) +@click.option( + "-j", + "--justificatifs", + is_flag=True, + help="Supprime les justificatifs de scodoc", +) +@with_appcontext +def downgrade_assiduites_module( + dept: str = None, assiduites: bool = False, justificatifs: bool = False +): + """Supprime les assiduites et/ou les justificatifs de tous les départements ou du département sélectionné""" + tools.downgrade_module(dept, assiduites, justificatifs) diff --git a/tests/api/make_samples.py b/tests/api/make_samples.py index fd61346f..08701ca1 100644 --- a/tests/api/make_samples.py +++ b/tests/api/make_samples.py @@ -7,6 +7,7 @@ Usage: cd /opt/scodoc/tests/api python make_samples.py [entry_names] + python make_samples.py -i [entrynames] si entry_names est spécifié, la génération est restreints aux exemples cités. expl: `python make_samples departements departement-formsemestres` doit être exécutée immédiatement apres une initialisation de la base pour test API! (car dépendant des identifiants générés lors de la création des objets) @@ -37,7 +38,6 @@ Quand la structure est complète, on génére tous les fichiers textes - le résultat Le tout mis en forme au format markdown et rangé dans le répertoire DATA_DIR (/tmp/samples) qui est créé ou écrasé si déjà existant -TODO: ajouter un argument au script permettant de ne générer qu'un seul fichier (exemple: `python make_samples.py nom_exemple`) """ import os @@ -65,7 +65,7 @@ from setup_test_api import ( ) DATA_DIR = "/tmp/samples/" -SAMPLES_FILENAME = "tests/ressources/samples.csv" +SAMPLES_FILENAME = "tests/ressources/samples/samples.csv" class Sample: @@ -180,11 +180,13 @@ class Samples: file.close() -def make_samples(): +def make_samples(samples_filename): if len(sys.argv) == 1: entry_names = None - else: - entry_names = sys.argv[1:] + elif len(sys.argv) >= 3 and sys.argv[1] == "-i": + samples_filename = sys.argv[2] + entry_names = sys.argv[3:] if len(sys.argv) > 3 else None + if os.path.exists(DATA_DIR): if not os.path.isdir(DATA_DIR): raise f"{DATA_DIR} existe déjà et n'est pas un répertoire" @@ -197,7 +199,7 @@ def make_samples(): samples = Samples(entry_names) df = read_csv( - SAMPLES_FILENAME, + samples_filename, sep=";", quotechar='"', dtype={ @@ -217,4 +219,4 @@ def make_samples(): if not CHECK_CERTIFICATE: urllib3.disable_warnings() -make_samples() +make_samples(SAMPLES_FILENAME) diff --git a/tests/api/test_api_assiduites.py b/tests/api/test_api_assiduites.py new file mode 100644 index 00000000..c8581d74 --- /dev/null +++ b/tests/api/test_api_assiduites.py @@ -0,0 +1,406 @@ +""" +Test de l'api Assiduité + +Ecrit par HARTMANN Matthias + +""" + +from random import randint + +from tests.api.setup_test_api import ( + GET, + POST_JSON, + APIError, + api_headers, + api_admin_headers, +) + +ETUDID = 1 +FAUX = 42069 +FORMSEMESTREID = 1 +MODULE = 1 + + +ASSIDUITES_FIELDS = { + "assiduite_id": int, + "etudid": int, + "code_nip": str, + "moduleimpl_id": int, + "date_debut": str, + "date_fin": str, + "etat": str, + "desc": str, + "entry_date": str, + "user_id": str, + "est_just": bool, + "external_data": dict, +} + +CREATE_FIELD = {"assiduite_id": int} +BATCH_FIELD = {"errors": list, "success": list} + +COUNT_FIELDS = {"compte": int, "journee": int, "demi": int, "heure": float} + +TO_REMOVE = [] + + +def check_fields(data: dict, fields: dict = None): + """ + Cette fonction permet de vérifier que le dictionnaire data + contient les bonnes clés et les bons types de valeurs. + + Args: + data (dict): un dictionnaire (json de retour de l'api) + fields (dict, optional): Un dictionnaire représentant les clés et les types d'une réponse. + """ + if fields is None: + fields = ASSIDUITES_FIELDS + assert set(data.keys()) == set(fields.keys()) + for key in data: + if key in ("moduleimpl_id", "desc", "user_id", "external_data"): + assert ( + isinstance(data[key], fields[key]) or data[key] is None + ), f"error [{key}:{type(data[key])}, {data[key]}, {fields[key]}]" + else: + assert isinstance( + data[key], fields[key] + ), f"error [{key}:{type(data[key])}, {data[key]}, {fields[key]}]" + + +def check_failure_get(path: str, headers: dict, err: str = None): + """ + Cette fonction vérifiée que la requête GET renvoie bien un 404 + + Args: + path (str): la route de l'api + headers (dict): le token d'auth de l'api + err (str, optional): L'erreur qui est sensée être fournie par l'api. + + Raises: + APIError: Une erreur car la requête a fonctionné (mauvais comportement) + """ + + try: + GET(path=path, headers=headers) + # ^ Renvoi un 404 + except APIError as api_err: + if err is not None: + assert api_err.payload["message"] == err + else: + raise APIError("Le GET n'aurait pas du fonctionner") + + +def check_failure_post(path: str, headers: dict, data: dict, err: str = None): + """ + Cette fonction vérifiée que la requête POST renvoie bien un 404 + + Args: + path (str): la route de l'api + headers (dict): le token d'auth + data (dict): un dictionnaire (json) à envoyer + err (str, optional): L'erreur qui est sensée être fournie par l'api. + + Raises: + APIError: Une erreur car la requête a fonctionné (mauvais comportement) + """ + + try: + data = POST_JSON(path=path, headers=headers, data=data) + # ^ Renvoi un 404 + except APIError as api_err: + if err is not None: + assert api_err.payload["message"] == err + else: + raise APIError("Le GET n'aurait pas du fonctionner") + + +def create_data(etat: str, day: str, module: int = None, desc: str = None): + """ + Permet de créer un dictionnaire assiduité + + Args: + etat (str): l'état de l'assiduité (PRESENT,ABSENT,RETARD) + day (str): Le jour de l'assiduité + module (int, optional): Le moduleimpl_id associé + desc (str, optional): Une description de l'assiduité (eg: motif retard ) + + Returns: + dict: la représentation d'une assiduité + """ + data = { + "date_debut": f"2022-01-{day}T08:00", + "date_fin": f"2022-01-{day}T10:00", + "etat": etat, + } + + if module is not None: + data["moduleimpl_id"] = module + if desc is not None: + data["desc"] = desc + + return data + + +def test_route_assiduite(api_headers): + """test de la route /assiduite/""" + + # Bon fonctionnement == id connu + data = GET(path="/assiduite/1", headers=api_headers) + check_fields(data) + + # Mauvais Fonctionnement == id inconnu + + check_failure_get( + f"/assiduite/{FAUX}", + api_headers, + ) + + +def test_route_count_assiduites(api_headers): + """test de la route /assiduites//count""" + + # Bon fonctionnement + + data = GET(path=f"/assiduites/{ETUDID}/count", headers=api_headers) + check_fields(data, COUNT_FIELDS) + + metrics = {"heure", "compte"} + data = GET( + path=f"/assiduites/{ETUDID}/count/query?metric={','.join(metrics)}", + headers=api_headers, + ) + + assert set(data.keys()) == metrics + + # Mauvais fonctionnement + + check_failure_get(f"/assiduites/{FAUX}/count", api_headers) + + +def test_route_assiduites(api_headers): + """test de la route /assiduites/""" + + # Bon fonctionnement + + data = GET(path=f"/assiduites/{ETUDID}", headers=api_headers) + assert isinstance(data, list) + for ass in data: + check_fields(ass, ASSIDUITES_FIELDS) + + data = GET(path=f"/assiduites/{ETUDID}/query?", headers=api_headers) + assert isinstance(data, list) + for ass in data: + check_fields(ass, ASSIDUITES_FIELDS) + + # Mauvais fonctionnement + check_failure_get(f"/assiduites/{FAUX}", api_headers) + check_failure_get(f"/assiduites/{FAUX}/query?", api_headers) + + +def test_route_formsemestre_assiduites(api_headers): + """test de la route /assiduites/formsemestre/""" + + # Bon fonctionnement + + data = GET(path=f"/assiduites/formsemestre/{FORMSEMESTREID}", headers=api_headers) + assert isinstance(data, list) + for ass in data: + check_fields(ass, ASSIDUITES_FIELDS) + + data = GET( + path=f"/assiduites/formsemestre/{FORMSEMESTREID}/query?", headers=api_headers + ) + assert isinstance(data, list) + for ass in data: + check_fields(ass, ASSIDUITES_FIELDS) + + # Mauvais fonctionnement + check_failure_get( + f"/assiduites/formsemestre/{FAUX}", + api_headers, + err="le paramètre 'formsemestre_id' n'existe pas", + ) + check_failure_get( + f"/assiduites/formsemestre/{FAUX}/query?", + api_headers, + err="le paramètre 'formsemestre_id' n'existe pas", + ) + + +def test_route_count_formsemestre_assiduites(api_headers): + """test de la route /assiduites/formsemestre//count""" + + # Bon fonctionnement + + data = GET( + path=f"/assiduites/formsemestre/{FORMSEMESTREID}/count", headers=api_headers + ) + check_fields(data, COUNT_FIELDS) + metrics = {"heure", "compte"} + data = GET( + path=f"/assiduites/formsemestre/{FORMSEMESTREID}/count/query?metric={','.join(metrics)}", + headers=api_headers, + ) + assert set(data.keys()) == metrics + + # Mauvais fonctionnement + check_failure_get( + f"/assiduites/formsemestre/{FAUX}/count", + api_headers, + err="le paramètre 'formsemestre_id' n'existe pas", + ) + check_failure_get( + f"/assiduites/formsemestre/{FAUX}/count/query?", + api_headers, + err="le paramètre 'formsemestre_id' n'existe pas", + ) + + +def test_route_create(api_admin_headers): + """test de la route /assiduite//create""" + + # -== Unique ==- + + # Bon fonctionnement + data = create_data("present", "01") + + res = POST_JSON(f"/assiduite/{ETUDID}/create", [data], api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["success"]) == 1 + + TO_REMOVE.append(res["success"][0]["message"]["assiduite_id"]) + + data2 = create_data("absent", "02", MODULE, "desc") + res = POST_JSON(f"/assiduite/{ETUDID}/create", [data2], api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["success"]) == 1 + + TO_REMOVE.append(res["success"][0]["message"]["assiduite_id"]) + + # Mauvais fonctionnement + check_failure_post(f"/assiduite/{FAUX}/create", api_admin_headers, [data]) + + res = POST_JSON(f"/assiduite/{ETUDID}/create", [data], api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["errors"]) == 1 + assert ( + res["errors"][0]["message"] + == "Duplication des assiduités (la période rentrée rentre en conflit avec une assiduité enregistrée)" + ) + + res = POST_JSON( + f"/assiduite/{ETUDID}/create", + [create_data("absent", "03", FAUX)], + api_admin_headers, + ) + check_fields(res, BATCH_FIELD) + assert len(res["errors"]) == 1 + assert res["errors"][0]["message"] == "param 'moduleimpl_id': invalide" + + # -== Multiple ==- + + # Bon Fonctionnement + + etats = ["present", "absent", "retard"] + data = [ + create_data(etats[d % 3], 10 + d, MODULE if d % 2 else None) + for d in range(randint(3, 5)) + ] + + res = POST_JSON(f"/assiduite/{ETUDID}/create", data, api_admin_headers) + check_fields(res, BATCH_FIELD) + for dat in res["success"]: + check_fields(dat["message"], CREATE_FIELD) + TO_REMOVE.append(dat["message"]["assiduite_id"]) + + # Mauvais Fonctionnement + + data2 = [ + create_data("present", "01"), + create_data("present", "25", FAUX), + create_data("blabla", 26), + create_data("absent", 32), + ] + + res = POST_JSON(f"/assiduite/{ETUDID}/create", data2, api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["errors"]) == 4 + + assert ( + res["errors"][0]["message"] + == "Duplication des assiduités (la période rentrée rentre en conflit avec une assiduité enregistrée)" + ) + assert res["errors"][1]["message"] == "param 'moduleimpl_id': invalide" + assert res["errors"][2]["message"] == "param 'etat': invalide" + assert ( + res["errors"][3]["message"] + == "param 'date_debut': format invalide, param 'date_fin': format invalide" + ) + + +def test_route_edit(api_admin_headers): + """test de la route /assiduite//edit""" + + # Bon fonctionnement + + data = {"etat": "retard", "moduleimpl_id": MODULE} + res = POST_JSON(f"/assiduite/{TO_REMOVE[0]}/edit", data, api_admin_headers) + assert res == {"OK": True} + + data["moduleimpl_id"] = None + res = POST_JSON(f"/assiduite/{TO_REMOVE[1]}/edit", data, api_admin_headers) + assert res == {"OK": True} + + # Mauvais fonctionnement + + check_failure_post(f"/assiduite/{FAUX}/edit", api_admin_headers, data) + data["etat"] = "blabla" + check_failure_post( + f"/assiduite/{TO_REMOVE[2]}/edit", + api_admin_headers, + data, + err="param 'etat': invalide", + ) + + +def test_route_delete(api_admin_headers): + """test de la route /assiduite/delete""" + # -== Unique ==- + + # Bon fonctionnement + data = TO_REMOVE[0] + + res = POST_JSON("/assiduite/delete", [data], api_admin_headers) + check_fields(res, BATCH_FIELD) + for dat in res["success"]: + assert dat["message"] == "OK" + + # Mauvais fonctionnement + res = POST_JSON("/assiduite/delete", [data], api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["errors"]) == 1 + + # -== Multiple ==- + + # Bon Fonctionnement + + data = TO_REMOVE[1:] + + res = POST_JSON("/assiduite/delete", data, api_admin_headers) + check_fields(res, BATCH_FIELD) + for dat in res["success"]: + assert dat["message"] == "OK" + + # Mauvais Fonctionnement + + data2 = [ + FAUX, + FAUX + 1, + FAUX + 2, + ] + + res = POST_JSON("/assiduite/delete", data2, api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["errors"]) == 3 + + assert all(i["message"] == "Assiduite non existante" for i in res["errors"]) diff --git a/tests/api/test_api_etudiants.py b/tests/api/test_api_etudiants.py index 56f3193d..c7d948ef 100644 --- a/tests/api/test_api_etudiants.py +++ b/tests/api/test_api_etudiants.py @@ -17,6 +17,7 @@ Utilisation : pytest tests/api/test_api_etudiants.py """ +import re import requests from app.scodoc import sco_utils as scu @@ -100,6 +101,7 @@ def test_etudiants_courant(api_headers): etud = etudiants[-1] assert verify_fields(etud, ETUD_FIELDS) is True + assert re.match(r"^\d{4}-\d\d-\d\d$", etud["date_naissance"]) def test_etudiant(api_headers): diff --git a/tests/api/test_api_formsemestre.py b/tests/api/test_api_formsemestre.py index 3525f570..3c15a123 100644 --- a/tests/api/test_api_formsemestre.py +++ b/tests/api/test_api_formsemestre.py @@ -36,9 +36,7 @@ from tests.api.tools_test_api import ( SAISIE_NOTES_FIELDS, FORMSEMESTRE_ETUD_FIELDS, FSEM_FIELDS, - FSEM_FIELDS, UE_FIELDS, - MODULE_FIELDS, FORMSEMESTRE_BULLETINS_FIELDS, FORMSEMESTRE_BULLETINS_ETU_FIELDS, FORMSEMESTRE_BULLETINS_FORMATION_FIELDS, @@ -713,6 +711,8 @@ def test_formsemestre_resultat(api_headers): ) as f: json_reference = f.read() ref = json.loads(json_reference) + with open("venv/res.json", "w", encoding="utf8") as f: + json.dump(res, f) _compare_formsemestre_resultat(res, ref) @@ -724,4 +724,7 @@ def _compare_formsemestre_resultat(res: list[dict], ref: list[dict]): for res_d, ref_d in zip(res, ref): assert sorted(res_d.keys()) == sorted(ref_d.keys()) for k in res_d: + # On passe les absences pour le moment (TODO: mise à jour assiduité à faire) + if "nbabs" in k: + continue assert res_d[k] == ref_d[k], f"values for key {k} differ." diff --git a/tests/api/test_api_justificatif.txt b/tests/api/test_api_justificatif.txt new file mode 100644 index 00000000..370b0a4f --- /dev/null +++ b/tests/api/test_api_justificatif.txt @@ -0,0 +1 @@ +test de l'importation des fichiers / archive justificatif \ No newline at end of file diff --git a/tests/api/test_api_justificatif2.txt b/tests/api/test_api_justificatif2.txt new file mode 100644 index 00000000..370b0a4f --- /dev/null +++ b/tests/api/test_api_justificatif2.txt @@ -0,0 +1 @@ +test de l'importation des fichiers / archive justificatif \ No newline at end of file diff --git a/tests/api/test_api_justificatifs.py b/tests/api/test_api_justificatifs.py new file mode 100644 index 00000000..53e1b370 --- /dev/null +++ b/tests/api/test_api_justificatifs.py @@ -0,0 +1,493 @@ +""" +Test de l'api justificatif + +Ecrit par HARTMANN Matthias + +""" + +from random import randint + +import requests +from tests.api.setup_test_api import ( + API_URL, + CHECK_CERTIFICATE, + GET, + POST_JSON, + APIError, + api_headers, + api_admin_headers, +) + +ETUDID = 1 +FAUX = 42069 + + +JUSTIFICATIFS_FIELDS = { + "justif_id": int, + "etudid": int, + "code_nip": str, + "date_debut": str, + "date_fin": str, + "etat": str, + "raison": str, + "entry_date": str, + "fichier": str, + "user_id": int, + "external_data": dict, +} + +CREATE_FIELD = {"justif_id": int, "couverture": list} +BATCH_FIELD = {"errors": list, "success": list} + +TO_REMOVE = [] + + +def check_fields(data, fields: dict = None): + """ + Cette fonction permet de vérifier que le dictionnaire data + contient les bonnes clés et les bons types de valeurs. + + Args: + data (dict): un dictionnaire (json de retour de l'api) + fields (dict, optional): Un dictionnaire représentant les clés et les types d'une réponse. + """ + if fields is None: + fields = JUSTIFICATIFS_FIELDS + assert set(data.keys()) == set(fields.keys()) + for key in data: + if key in ("raison", "fichier", "user_id", "external_data"): + assert ( + isinstance(data[key], fields[key]) or data[key] is None + ), f"error [{key}:{type(data[key])}, {data[key]}, {fields[key]}]" + else: + assert isinstance( + data[key], fields[key] + ), f"error [{key}:{type(data[key])}, {data[key]}, {fields[key]}]" + + +def check_failure_get(path, headers, err=None): + """ + Cette fonction vérifiée que la requête GET renvoie bien un 404 + + Args: + path (str): la route de l'api + headers (dict): le token d'auth de l'api + err (str, optional): L'erreur qui est sensée être fournie par l'api. + + Raises: + APIError: Une erreur car la requête a fonctionné (mauvais comportement) + """ + try: + GET(path=path, headers=headers) + # ^ Renvoi un 404 + except APIError as api_err: + if err is not None: + assert api_err.payload["message"] == err + else: + raise APIError("Le GET n'aurait pas du fonctionner") + + +def check_failure_post(path, headers, data, err=None): + """ + Cette fonction vérifiée que la requête POST renvoie bien un 404 + + Args: + path (str): la route de l'api + headers (dict): le token d'auth + data (dict): un dictionnaire (json) à envoyer + err (str, optional): L'erreur qui est sensée être fournie par l'api. + + Raises: + APIError: Une erreur car la requête a fonctionné (mauvais comportement) + """ + try: + data = POST_JSON(path=path, headers=headers, data=data) + # ^ Renvoi un 404 + except APIError as api_err: + if err is not None: + assert api_err.payload["message"] == err + else: + raise APIError("Le POST n'aurait pas du fonctionner") + + +def create_data(etat: str, day: str, raison: str = None): + """ + Permet de créer un dictionnaire assiduité + + Args: + etat (str): l'état du justificatif (VALIDE,NON_VALIDE,MODIFIE, ATTENTE) + day (str): Le jour du justificatif + raison (str, optional): Une description du justificatif (eg: motif retard ) + + Returns: + dict: la représentation d'une assiduité + """ + data = { + "date_debut": f"2022-01-{day}T08:00", + "date_fin": f"2022-01-{day}T10:00", + "etat": etat, + } + if raison is not None: + data["desc"] = raison + + return data + + +def test_route_justificatif(api_headers): + """test de la route /justificatif/""" + + # Bon fonctionnement == id connu + data = GET(path="/justificatif/1", headers=api_headers) + check_fields(data) + + # Mauvais Fonctionnement == id inconnu + + check_failure_get( + f"/justificatif/{FAUX}", + api_headers, + ) + + +def test_route_justificatifs(api_headers): + """test de la route /justificatifs/""" + # Bon fonctionnement + + data = GET(path=f"/justificatifs/{ETUDID}", headers=api_headers) + assert isinstance(data, list) + for just in data: + check_fields(just, JUSTIFICATIFS_FIELDS) + + data = GET(path=f"/justificatifs/{ETUDID}/query?", headers=api_headers) + assert isinstance(data, list) + for just in data: + check_fields(just, JUSTIFICATIFS_FIELDS) + + # Mauvais fonctionnement + check_failure_get(f"/justificatifs/{FAUX}", api_headers) + check_failure_get(f"/justificatifs/{FAUX}/query?", api_headers) + + +def test_route_create(api_admin_headers): + """test de la route /justificatif//create""" + # -== Unique ==- + + # Bon fonctionnement + data = create_data("valide", "01") + + res = POST_JSON(f"/justificatif/{ETUDID}/create", [data], api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["success"]) == 1 + + TO_REMOVE.append(res["success"][0]["message"]["justif_id"]) + + data2 = create_data("modifie", "02", "raison") + res = POST_JSON(f"/justificatif/{ETUDID}/create", [data2], api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["success"]) == 1 + + TO_REMOVE.append(res["success"][0]["message"]["justif_id"]) + + # Mauvais fonctionnement + check_failure_post(f"/justificatif/{FAUX}/create", api_admin_headers, [data]) + + res = POST_JSON( + f"/justificatif/{ETUDID}/create", + [create_data("absent", "03")], + api_admin_headers, + ) + check_fields(res, BATCH_FIELD) + assert len(res["errors"]) == 1 + assert res["errors"][0]["message"] == "param 'etat': invalide" + + # -== Multiple ==- + + # Bon Fonctionnement + + etats = ["valide", "modifie", "non_valide", "attente"] + data = [ + create_data(etats[d % 4], 10 + d, "raison" if d % 2 else None) + for d in range(randint(3, 5)) + ] + + res = POST_JSON(f"/justificatif/{ETUDID}/create", data, api_admin_headers) + check_fields(res, BATCH_FIELD) + for dat in res["success"]: + check_fields(dat["message"], CREATE_FIELD) + TO_REMOVE.append(dat["message"]["justif_id"]) + + # Mauvais Fonctionnement + + data2 = [ + create_data(None, "25"), + create_data("blabla", 26), + create_data("valide", 32), + ] + + res = POST_JSON(f"/justificatif/{ETUDID}/create", data2, api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["errors"]) == 3 + + assert res["errors"][0]["message"] == "param 'etat': manquant" + assert res["errors"][1]["message"] == "param 'etat': invalide" + assert ( + res["errors"][2]["message"] + == "param 'date_debut': format invalide, param 'date_fin': format invalide" + ) + + +def test_route_edit(api_admin_headers): + """test de la route /justificatif//edit""" + # Bon fonctionnement + + data = {"etat": "modifie", "raison": "test"} + res = POST_JSON(f"/justificatif/{TO_REMOVE[0]}/edit", data, api_admin_headers) + assert isinstance(res, dict) and "couverture" in res.keys() + + data["raison"] = None + res = POST_JSON(f"/justificatif/{TO_REMOVE[1]}/edit", data, api_admin_headers) + assert isinstance(res, dict) and "couverture" in res.keys() + + # Mauvais fonctionnement + + check_failure_post(f"/justificatif/{FAUX}/edit", api_admin_headers, data) + data["etat"] = "blabla" + check_failure_post( + f"/justificatif/{TO_REMOVE[2]}/edit", + api_admin_headers, + data, + err="param 'etat': invalide", + ) + + +def test_route_delete(api_admin_headers): + """test de la route /justificatif/delete""" + # -== Unique ==- + + # Bon fonctionnement + data = TO_REMOVE[0] + + res = POST_JSON("/justificatif/delete", [data], api_admin_headers) + check_fields(res, BATCH_FIELD) + for dat in res["success"]: + assert dat["message"] == "OK" + + # Mauvais fonctionnement + res = POST_JSON("/justificatif/delete", [data], api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["errors"]) == 1 + + # -== Multiple ==- + + # Bon Fonctionnement + + data = TO_REMOVE[1:] + + res = POST_JSON("/justificatif/delete", data, api_admin_headers) + check_fields(res, BATCH_FIELD) + for dat in res["success"]: + assert dat["message"] == "OK" + + # Mauvais Fonctionnement + + data2 = [ + FAUX, + FAUX + 1, + FAUX + 2, + ] + + res = POST_JSON("/justificatif/delete", data2, api_admin_headers) + check_fields(res, BATCH_FIELD) + assert len(res["errors"]) == 3 + + assert all(i["message"] == "Justificatif non existant" for i in res["errors"]) + + +# Gestion de l'archivage + + +def _send_file(justif_id: int, filename: str, headers): + """ + Envoi un fichier vers la route d'importation + """ + with open(filename, "rb") as file: + url: str = API_URL + f"/justificatif/{justif_id}/import" + req = requests.post( + url, + files={filename: file}, + headers=headers, + verify=CHECK_CERTIFICATE, + timeout=30, + ) + + if req.status_code != 200: + raise APIError(f"erreur status={req.status_code} !", req.json()) + + return req.json() + + +def _check_failure_send( + justif_id: int, + headers, + filename: str = "tests/api/test_api_justificatif.txt", + err: str = None, +): + """ + Vérifie si l'envoie d'un fichier renvoie bien un 404 + + Args: + justif_id (int): l'id du justificatif + headers (dict): token d'auth de l'api + filename (str, optional): le chemin vers le fichier. + Defaults to "tests/api/test_api_justificatif.txt". + err (str, optional): l'erreur attendue. + + Raises: + APIError: Si l'envoie fonction (mauvais comportement) + """ + try: + _send_file(justif_id, filename, headers) + # ^ Renvoi un 404 + except APIError as api_err: + if err is not None: + assert api_err.payload["message"] == err + else: + raise APIError("Le POST n'aurait pas du fonctionner") + + +def test_import_justificatif(api_admin_headers): + """test de la route /justificatif//import""" + + # Bon fonctionnement + + filename: str = "tests/api/test_api_justificatif.txt" + + resp: dict = _send_file(1, filename, api_admin_headers) + assert "filename" in resp + assert resp["filename"] == "test_api_justificatif.txt" + + filename: str = "tests/api/test_api_justificatif2.txt" + resp: dict = _send_file(1, filename, api_admin_headers) + assert "filename" in resp + assert resp["filename"] == "test_api_justificatif2.txt" + + # Mauvais fonctionnement + + _check_failure_send(FAUX, api_admin_headers) + + +def test_list_justificatifs(api_admin_headers): + """test de la route /justificatif//list""" + + # Bon fonctionnement + + res: list = GET("/justificatif/1/list", api_admin_headers) + + assert isinstance(res, dict) + assert len(res["filenames"]) == 2 + assert res["total"] == 2 + + res: list = GET("/justificatif/2/list", api_admin_headers) + + assert isinstance(res, dict) + assert len(res["filenames"]) == 0 + assert res["total"] == 0 + + # Mauvais fonctionnement + + check_failure_get(f"/justificatif/{FAUX}/list", api_admin_headers) + + +def _post_export(justif_id: int, fname: str, api_headers): + """ + Envoie une requête poste sans data et la retourne + + Args: + id (int): justif_id + fname (str): nom du fichier (coté serv) + api_headers (dict): token auth de l'api + + Returns: + request: la réponse de l'api + """ + url: str = API_URL + f"/justificatif/{justif_id}/export/{fname}" + res = requests.post(url, headers=api_headers) + return res + + +def test_export(api_admin_headers): + """test de la route /justificatif//export/""" + + # Bon fonctionnement + + assert ( + _post_export(1, "test_api_justificatif.txt", api_admin_headers).status_code + == 200 + ) + + # Mauvais fonctionnement + assert ( + _post_export(FAUX, "test_api_justificatif.txt", api_admin_headers).status_code + == 404 + ) + assert _post_export(1, "blabla.txt", api_admin_headers).status_code == 404 + assert _post_export(2, "blabla.txt", api_admin_headers).status_code == 404 + + +def test_remove_justificatif(api_admin_headers): + """test de la route /justificatif//remove""" + + # Bon fonctionnement + + filename: str = "tests/api/test_api_justificatif.txt" + _send_file(2, filename, api_admin_headers) + filename: str = "tests/api/test_api_justificatif2.txt" + _send_file(2, filename, api_admin_headers) + + res: dict = POST_JSON( + "/justificatif/1/remove", {"remove": "all"}, api_admin_headers + ) + assert res == {"response": "removed"} + l = GET("/justificatif/1/list", api_admin_headers) + assert isinstance(l, dict) + assert l["total"] == 0 + + res: dict = POST_JSON( + "/justificatif/2/remove", + {"remove": "list", "filenames": ["test_api_justificatif2.txt"]}, + api_admin_headers, + ) + assert res == {"response": "removed"} + l = GET("/justificatif/2/list", api_admin_headers) + assert isinstance(l, dict) + assert l["total"] == 1 + + res: dict = POST_JSON( + "/justificatif/2/remove", + {"remove": "list", "filenames": ["test_api_justificatif.txt"]}, + api_admin_headers, + ) + assert res == {"response": "removed"} + l = GET("/justificatif/2/list", api_admin_headers) + assert isinstance(l, dict) + assert l["total"] == 0 + + # Mauvais fonctionnement + + check_failure_post("/justificatif/2/remove", api_admin_headers, {}) + check_failure_post( + f"/justificatif/{FAUX}/remove", api_admin_headers, {"remove": "all"} + ) + check_failure_post("/justificatif/1/remove", api_admin_headers, {"remove": "all"}) + + +def test_justifies(api_admin_headers): + """test la route /justificatif//justifies""" + + # Bon fonctionnement + + res: list = GET("/justificatif/1/justifies", api_admin_headers) + assert isinstance(res, list) + + # Mauvais fonctionnement + + check_failure_get(f"/justificatif/{FAUX}/justifies", api_admin_headers) diff --git a/tests/api/test_api_permissions.py b/tests/api/test_api_permissions.py old mode 100644 new mode 100755 index 9a5ff9ac..8be475cd --- a/tests/api/test_api_permissions.py +++ b/tests/api/test_api_permissions.py @@ -62,12 +62,27 @@ def test_permissions(api_headers): "uid": 1, "validation_id": 1, "version": "long", + "assiduite_id": 1, + "justif_id": 1, + "etudids": "1", } for rule in api_rules: path = rule.build(args)[1] if not "GET" in rule.methods: # skip all POST routes continue + + if any( + path.startswith(p) + for p in [ + "/ScoDoc/api/justificatif/1/list", + "/ScoDoc/api/justificatif/1/justifies", + ] + ): + # On passe la route "api/justificatif/<>/list" car elle nécessite la permission ScoJustifView + # On passe la route "api/justificatif/<>/justifies" car elle nécessite la permission ScoJustifChange + continue + r = requests.get( SCODOC_URL + path, headers=api_headers, diff --git a/tests/ressources/samples/assiduites_samples.csv b/tests/ressources/samples/assiduites_samples.csv new file mode 100644 index 00000000..f251635d --- /dev/null +++ b/tests/ressources/samples/assiduites_samples.csv @@ -0,0 +1,26 @@ +"entry_name";"url";"permission";"method";"content" +"assiduite";"/assiduite/1";"ScoView";"GET"; +"assiduites";"/assiduites/1";"ScoView";"GET"; +"assiduites";"/assiduites/1/query?etat=retard";"ScoView";"GET"; +"assiduites";"/assiduites/1/query?moduleimpl_id=1";"ScoView";"GET"; +"assiduites_count";"/assiduites/1/count";"ScoView";"GET"; +"assiduites_count";"/assiduites/1/count/query?etat=retard";"ScoView";"GET"; +"assiduites_count";"/assiduites/1/count/query?etat=present,retard&metric=compte,heure";"ScoView";"GET"; +"assiduites_formsemestre";"/assiduites/formsemestre/1";"ScoView";"GET"; +"assiduites_formsemestre";"/assiduites/formsemestre/1/query?etat=retard";"ScoView";"GET"; +"assiduites_formsemestre";"/assiduites/formsemestre/1/query?moduleimpl_id=1";"ScoView";"GET"; +"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count";"ScoView";"GET"; +"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count/query?etat=retard";"ScoView";"GET"; +"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count/query?etat=present,retard&metric=compte,heure";"ScoView";"GET"; +"assiduite_create";"/assiduite/1/create";"ScoView";"POST";"[{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""absent""}]" +"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""etat"":""absent""}" +"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""moduleimpl_id"":2}" +"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""etat"": ""retard"",""moduleimpl_id"":3}" +"assiduite_delete";"/assiduite/delete";"ScoView";"POST";"[2,2,3]" +"justificatif";"/justificatif/1";"ScoView";"GET"; +"justificatifs";"/justificatifs/1";"ScoView";"GET"; +"justificatifs";"/justificatifs/1/query?etat=attente";"ScoView";"GET"; +"justificatif_create";"/justificatif/1/create";"ScoView";"POST";"[{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""attente""}]" +"justificatif_edit";"/justificatif/1/edit";"ScoView";"POST";"{""etat"":""valide""}" +"justificatif_edit";"/justificatif/1/edit";"ScoView";"POST";"{""raison"":""MEDIC""}" +"justificatif_delete";"/justificatif/delete";"ScoView";"POST";"[2,2,3]" \ No newline at end of file diff --git a/tests/ressources/samples.csv b/tests/ressources/samples/samples.csv similarity index 79% rename from tests/ressources/samples.csv rename to tests/ressources/samples/samples.csv index 819d39c2..a8d92875 100644 --- a/tests/ressources/samples.csv +++ b/tests/ressources/samples/samples.csv @@ -1,4 +1,24 @@ "entry_name";"url";"permission";"method";"content" +"assiduite";"/assiduite/1";"ScoView";"GET"; +"assiduites";"/assiduites/1";"ScoView";"GET"; +"assiduites";"/assiduites/1/query?etat=retard";"ScoView";"GET"; +"assiduites";"/assiduites/1/query?moduleimpl_id=1";"ScoView";"GET"; +"assiduites_count";"/assiduites/1/count";"ScoView";"GET"; +"assiduites_count";"/assiduites/1/count/query?etat=retard";"ScoView";"GET"; +"assiduites_count";"/assiduites/1/count/query?etat=present,retard&metric=compte,heure";"ScoView";"GET"; +"assiduites_formsemestre";"/assiduites/formsemestre/1";"ScoView";"GET"; +"assiduites_formsemestre";"/assiduites/formsemestre/1/query?etat=retard";"ScoView";"GET"; +"assiduites_formsemestre";"/assiduites/formsemestre/1/query?moduleimpl_id=1";"ScoView";"GET"; +"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count";"ScoView";"GET"; +"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count/query?etat=retard";"ScoView";"GET"; +"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count/query?etat=present,retard&metric=compte,heure";"ScoView";"GET"; +"assiduite_create";"/assiduite/1/create";"ScoView";"POST";"{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""absent""}" +"assiduite_create";"/assiduite/1/create/batch";"ScoView";"POST";"{""batch"":[{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""absent""},{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""retard""},{""date_debut"": ""2022-10-27T11:00"",""date_fin"": ""2022-10-27T13:00"",""etat"": ""present""}]}" +"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""etat"":""absent""}" +"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""moduleimpl_id"":2}" +"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""etat"": ""retard"",""moduleimpl_id"":3}" +"assiduite_delete";"/assiduite/delete";"ScoView";"POST";"{""assiduite_id"": 1}" +"assiduite_delete";"/assiduite/delete/batch";"ScoView";"POST";"{""batch"":[2,2,3]}" "departements";"/departements";"ScoView";"GET"; "departements-ids";"/departements_ids";"ScoView";"GET"; "departement";"/departement/TAPI";"ScoView";"GET"; diff --git a/tests/unit/test_abs_counts.py b/tests/unit/test_abs_counts.py index 5b0a5f04..9f1147bb 100644 --- a/tests/unit/test_abs_counts.py +++ b/tests/unit/test_abs_counts.py @@ -6,14 +6,10 @@ Comptage des absences """ # test écrit par Fares Amer, mai 2021 et porté sur ScoDoc 8 en juillet 2021 -import json - from tests.unit import sco_fake_gen from app.scodoc import sco_abs, sco_formsemestre from app.scodoc import sco_abs_views -from app.scodoc import sco_groups -from app.views import absences def test_abs_counts(test_client): diff --git a/tests/unit/test_assiduites.py b/tests/unit/test_assiduites.py new file mode 100644 index 00000000..a9657278 --- /dev/null +++ b/tests/unit/test_assiduites.py @@ -0,0 +1,992 @@ +# -*- mode: python -*- +# -*- coding: utf-8 -*- + +""" +Tests unitaires vérifiant le bon fonctionnement du modèle Assiduité et de +ses fonctions liées + +Ecrit par HARTMANN Matthias (en s'inspirant de tests.unit.test_abs_count.py par Fares Amer ) +""" + +import app.scodoc.sco_assiduites as scass +import app.scodoc.sco_utils as scu +from app import db +from app.models import Assiduite, FormSemestre, Identite, Justificatif, ModuleImpl +from app.scodoc import sco_abs_views, sco_formsemestre +from app.scodoc.sco_exceptions import ScoValueError +from tests.unit import sco_fake_gen +from tools import downgrade_module, migrate_abs_to_assiduites + + +class BiInt(int, scu.BiDirectionalEnum): + """Classe pour tester la classe BiDirectionalEnum""" + + A = 1 + B = 2 + + +def test_bi_directional_enum(test_client): + """Test le bon fonctionnement de la classe BiDirectionalEnum""" + + assert BiInt.get("A") == BiInt.get("a") == BiInt.A == 1 + assert BiInt.get("B") == BiInt.get("b") == BiInt.B == 2 + assert BiInt.get("blabla") is None + assert BiInt.get("blabla", -1) == -1 + assert isinstance(BiInt.inverse(), dict) + assert BiInt.inverse()[1] == BiInt.A and BiInt.inverse()[2] == BiInt.B + + +def test_general(test_client): + """tests général du modèle assiduite""" + + g_fake = sco_fake_gen.ScoFake(verbose=False) + + # Création d'une formation (1) + + formation_id = g_fake.create_formation() + ue_id = g_fake.create_ue( + formation_id=formation_id, acronyme="T1", titre="UE TEST 1" + ) + matiere_id = g_fake.create_matiere(ue_id=ue_id, titre="test matière") + module_id_1 = g_fake.create_module( + matiere_id=matiere_id, code="Mo1", coefficient=1.0, titre="test module" + ) + module_id_2 = g_fake.create_module( + matiere_id=matiere_id, code="Mo2", coefficient=1.0, titre="test module2" + ) + + # Création semestre (2) + + formsemestre_id_1 = g_fake.create_formsemestre( + formation_id=formation_id, + semestre_id=1, + date_debut="01/09/2022", + date_fin="31/12/2022", + ) + formsemestre_id_2 = g_fake.create_formsemestre( + formation_id=formation_id, + semestre_id=2, + date_debut="01/01/2023", + date_fin="31/07/2023", + ) + formsemestre_id_3 = g_fake.create_formsemestre( + formation_id=formation_id, + semestre_id=3, + date_debut="01/01/2024", + date_fin="31/07/2024", + ) + + formsemestre_1 = sco_formsemestre.get_formsemestre(formsemestre_id_1) + formsemestre_2 = sco_formsemestre.get_formsemestre(formsemestre_id_2) + formsemestre_3 = sco_formsemestre.get_formsemestre(formsemestre_id_3) + + # Création des modulesimpls (4, 2 par semestre) + + moduleimpl_1_1 = g_fake.create_moduleimpl( + module_id=module_id_1, + formsemestre_id=formsemestre_id_1, + ) + moduleimpl_1_2 = g_fake.create_moduleimpl( + module_id=module_id_2, + formsemestre_id=formsemestre_id_1, + ) + + moduleimpl_2_1 = g_fake.create_moduleimpl( + module_id=module_id_1, + formsemestre_id=formsemestre_id_2, + ) + moduleimpl_2_2 = g_fake.create_moduleimpl( + module_id=module_id_2, + formsemestre_id=formsemestre_id_2, + ) + + moduleimpls = [ + moduleimpl_1_1, + moduleimpl_1_2, + moduleimpl_2_1, + moduleimpl_2_2, + ] + + moduleimpls = [ + ModuleImpl.query.filter_by(id=mi_id).first() for mi_id in moduleimpls + ] + + # Création des étudiants (3) + + etuds_dict = [ + g_fake.create_etud(code_nip=None, prenom=f"etud{i}") for i in range(3) + ] + + etuds = [] + for etud in etuds_dict: + g_fake.inscrit_etudiant(formsemestre_id=formsemestre_id_1, etud=etud) + g_fake.inscrit_etudiant(formsemestre_id=formsemestre_id_2, etud=etud) + + etuds.append(Identite.query.filter_by(id=etud["id"]).first()) + + assert None not in etuds, "Problème avec la conversion en Identite" + + # Etudiant faux + + etud_faux_dict = g_fake.create_etud(code_nip=None, prenom="etudfaux") + etud_faux = Identite.query.filter_by(id=etud_faux_dict["id"]).first() + + verif_migration_abs_assiduites() + + ajouter_assiduites(etuds, moduleimpls, etud_faux) + justificatifs: list[Justificatif] = ajouter_justificatifs(etuds[0]) + verifier_comptage_et_filtrage_assiduites( + etuds, moduleimpls, (formsemestre_1, formsemestre_2, formsemestre_3) + ) + verifier_filtrage_justificatifs(etuds[0], justificatifs) + editer_supprimer_assiduites(etuds, moduleimpls) + editer_supprimer_justificatif(etuds[0]) + + +def verif_migration_abs_assiduites(): + """Vérification que le script de migration fonctionne correctement""" + downgrade_module(assiduites=True, justificatifs=True) + + etudid: int = 1 + + for debut, fin, demijournee, justifiee in [ + ( + "02/01/2023", + "02/01/2023", + 1, + False, + ), # 1 assi 02/01/2023 8h > 13h (1dj) + ( + "03/01/2023", + "03/01/2023", + 0, + False, + ), # 1 assi 03/01/2023 13h > 18h (1dj) + ( + "05/01/2023", + "05/01/2023", + 2, + False, + ), # 1 assi 05/01/2023 8h > 18h (2dj) + ( + "09/01/2023", + "09/01/2023", + 1, + False, + ), + ( + "09/01/2023", + "09/01/2023", + 0, + False, + ), # 1 assi 09/01/2023 8h > 18h (2dj) + ( + "10/01/2023", + "10/01/2023", + 0, + False, + ), + ( + "11/01/2023", + "11/01/2023", + 1, + False, + ), # 1 assi 10/01/2023 - 11/01/2023 13h > 13h (2dj) + ( + "12/01/2023", + "12/01/2023", + 1, + False, + ), # 1 assi 12/01/2023 8h > 13h (1dj) + ( + "13/01/2023", + "13/01/2023", + 1, + False, + ), # 1 assi 13/01/2023 8h > 13h (1dj) + ( + "16/01/2023", + "16/01/2023", + 1, + False, + ), + ( + "16/01/2023", + "16/01/2023", + 1, + False, + ), # 1 assi 16/01/2023 8h > 13h (1dj) + ( + "19/01/2023", + "24/01/2023", + 2, + False, + ), # 2 assi 19/01/2023 - 20/01/2023 8h > 18h (4dj) + 23/01/23 - 24/01/2023 8h>18h (4dj) + ( + "01/02/2023", + "01/02/2023", + 1, + True, + ), # 1 assi 01/02/2023 8h > 13h (1dj) JUSTI + ( + "02/02/2023", + "02/02/2023", + 0, + True, + ), # 1 assi 02/02/2023 13h > 18h (1dj) JUSTI + ( + "06/02/2023", + "06/02/2023", + 2, + True, + ), # 1 assi 06/02/2023 8h > 18h (2dj) JUSTI + ( + "07/02/2023", + "07/02/2023", + 0, + True, + ), + ( + "07/02/2023", + "07/02/2023", + 0, + False, + ), # 1 assi 07/02/2023 13h > 18h (1dj) JUSTI + ( + "08/02/2023", + "08/02/2023", + 0, + False, + ), + ( + "08/02/2023", + "08/02/2023", + 0, + True, + ), # 1 assi 08/02/2023 13h > 18h (1dj) JUSTI + ( + "10/02/2023", + "10/02/2023", + 1, + True, + ), + ( + "10/02/2023", + "10/02/2023", + 0, + False, + ), # 1 assi 10/02/2023 08h > 18h (2dj) JUSTI + ( + "13/02/2023", + "13/02/2023", + 1, + False, + ), + ( + "13/02/2023", + "13/02/2023", + 0, + True, + ), # 1 assi 13/02/2023 08h > 18h (2dj) JUSTI + ( + "15/02/2023", + "15/02/2023", + 2, + False, + ), # 1 assi 13/02/2023 08h > 18h (2dj) JUSTI(ext) + ( + "22/02/2023", + "24/02/2023", + 1, + False, + ), # 3 assi 22-23-24/02/2023 08h > 13h (3dj) JUSTI(ext) + ]: + sco_abs_views.doSignaleAbsence( + datedebut=debut, + datefin=fin, + demijournee=demijournee, + etudid=etudid, + estjust=justifiee, + ) + + # --- Justification de certaines absences + + for debut, fin, demijournee in [ + ( + "15/02/2023", + "15/02/2023", + 2, + ), + ( + "21/02/2023", + "24/02/2023", + 2, + ), + ]: + sco_abs_views.doJustifAbsence( + datedebut=debut, + datefin=fin, + demijournee=demijournee, + etudid=etudid, + ) + + migrate_abs_to_assiduites() + + assert Assiduite.query.count() == 21, "Migration : Nb Assiduités FAUX" + assert Justificatif.query.count() == 9, "Migration : Nb Justificatif FAUX" + + # Cas classiques sans justification + + assert ( + _get_assi("2023-01-02T08:00", "2023-01-02T13:00") is not None + ), "Migration : Abs n°1 mal migrée" + assert ( + _get_assi("2023-01-03T13:00", "2023-01-03T18:00") is not None + ), "Migration : Abs n°2 mal migrée" + assert ( + _get_assi("2023-01-05T08:00", "2023-01-05T18:00") is not None + ), "Migration : Abs n°3 mal migrée" + assert ( + _get_assi("2023-01-09T08:00", "2023-01-09T18:00") is not None + ), "Migration : Abs n°4&5 mal migrée" + assert ( + _get_assi("2023-01-10T13:00", "2023-01-11T13:00") is not None + ), "Migration : Abs n°6&7 mal migrée" + assert ( + _get_assi("2023-01-12T08:00", "2023-01-12T13:00") is not None + ), "Migration : Abs n°8 mal migrée" + assert ( + _get_assi("2023-01-13T08:00", "2023-01-13T13:00") is not None + ), "Migration : Abs n°9 mal migrée" + assert ( + _get_assi("2023-01-16T08:00", "2023-01-16T13:00") is not None + ), "Migration : Abs n°10&11 mal migrée" + assert ( + _get_assi("2023-01-19T08:00", "2023-01-20T18:00") is not None + ), "Migration : Abs n°12 mal migrée" + assert ( + _get_assi("2023-01-23T08:00", "2023-01-24T18:00") is not None + ), "Migration : Abs n°12 mal migrée" + + # Cas d'absences justifiées + + assert ( + _get_assi("2023-02-01T08:00", "2023-02-01T13:00", True) is not None + ), "Migration : Abs n°13 mal migrée" + assert ( + _get_assi("2023-02-02T13:00", "2023-02-02T18:00", True) is not None + ), "Migration : Abs n°14 mal migrée" + assert ( + _get_assi("2023-02-06T08:00", "2023-02-06T18:00", True) is not None + ), "Migration : Abs n°15 mal migrée" + assert ( + _get_assi("2023-02-07T13:00", "2023-02-07T18:00", True) is not None + ), "Migration : Abs n°16&17 mal migrée" + assert ( + _get_assi("2023-02-08T13:00", "2023-02-08T18:00", True) is not None + ), "Migration : Abs n°18&19 mal migrée" + assert ( + _get_assi("2023-02-10T08:00", "2023-02-10T18:00", True) is not None + ), "Migration : Abs n°20&21 mal migrée" + assert ( + _get_assi("2023-02-13T08:00", "2023-02-13T18:00", True) is not None + ), "Migration : Abs n°22&23 mal migrée" + + # Cas Justificatifs + + assert ( + _get_justi("2023-02-01T08:00", "2023-02-01T13:00") is not None + ), "Migration : Abs n°13 mal migrée" + assert ( + _get_justi("2023-02-02T13:00", "2023-02-02T18:00") is not None + ), "Migration : Abs n°14 mal migrée" + assert ( + _get_justi("2023-02-06T08:00", "2023-02-06T18:00") is not None + ), "Migration : Abs n°15 mal migrée" + assert ( + _get_justi("2023-02-07T13:00", "2023-02-07T18:00") is not None + ), "Migration : Abs n°16&17 mal migrée" + assert ( + _get_justi("2023-02-08T13:00", "2023-02-08T18:00") is not None + ), "Migration : Abs n°18&19 mal migrée" + assert ( + _get_justi("2023-02-10T08:00", "2023-02-10T18:00") is not None + ), "Migration : Abs n°20&21 mal migrée" + assert ( + _get_justi("2023-02-13T08:00", "2023-02-13T18:00") is not None + ), "Migration : Abs n°22&23 mal migrée" + assert ( + _get_justi("2023-02-15T08:00", "2023-02-15T18:00") is not None + ), "Migration : Justi n°1 mal migré" + assert ( + _get_assi("2023-02-15T08:00", "2023-02-15T18:00", True) is not None + ), "Migration : Abs n°24 mal migrée" + assert ( + _get_justi("2023-02-21T08:00", "2023-02-24T18:00") is not None + ), "Migration : Justi n°2 mal migré" + assert ( + _get_assi("2023-02-22T08:00", "2023-02-22T13:00", True) is not None + ), "Migration : Abs n°25 mal migrée" + assert ( + _get_assi("2023-02-23T08:00", "2023-02-23T13:00", True) is not None + ), "Migration : Abs n°26 mal migrée" + assert ( + _get_assi("2023-02-24T08:00", "2023-02-24T13:00", True) is not None + ), "Migration : Abs n°27 mal migrée" + + essais_cache(etudid) + + downgrade_module(assiduites=True, justificatifs=True) + + +def _get_assi( + deb: str, + fin: str, + est_just: bool = False, +): + deb = scu.localize_datetime(scu.is_iso_formated(deb, True)) + fin = scu.localize_datetime(scu.is_iso_formated(fin, True)) + + return Assiduite.query.filter( + Assiduite.date_debut >= deb, + Assiduite.date_fin <= fin, + Assiduite.est_just == est_just, + ).first() + + +def _get_justi( + deb: str, + fin: str, +): + deb = scu.localize_datetime(scu.is_iso_formated(deb, True)) + fin = scu.localize_datetime(scu.is_iso_formated(fin, True)) + + return Justificatif.query.filter( + Justificatif.date_debut >= deb, + Justificatif.date_fin <= fin, + ).first() + + +def essais_cache(etudid): + """Vérification des fonctionnalités du cache TODO:WIP""" + + date_deb: str = "2023-01-01T07:00" + date_fin: str = "2023-03-31T19:00" + + assiduites_count_no_cache = scass.get_assiduites_count_in_interval( + etudid, date_deb, date_fin + ) + assiduites_count_cache = scass.get_assiduites_count_in_interval( + etudid, date_deb, date_fin + ) + + assert ( + assiduites_count_cache == assiduites_count_no_cache == (34, 15) + ), "Erreur cache" + + +def ajouter_justificatifs(etud): + """test de l'ajout des justificatifs""" + + obj_justificatifs = [ + { + "etat": scu.EtatJustificatif.ATTENTE, + "deb": "2022-09-03T08:00+01:00", + "fin": "2022-09-03T09:59:59+01:00", + "raison": None, + }, + { + "etat": scu.EtatJustificatif.VALIDE, + "deb": "2023-01-03T07:00+01:00", + "fin": "2023-01-03T11:00+01:00", + "raison": None, + }, + { + "etat": scu.EtatJustificatif.VALIDE, + "deb": "2022-09-03T10:00:00+01:00", + "fin": "2022-09-03T12:00+01:00", + "raison": None, + }, + { + "etat": scu.EtatJustificatif.NON_VALIDE, + "deb": "2022-09-03T14:00:00+01:00", + "fin": "2022-09-03T15:00+01:00", + "raison": "Description", + }, + { + "etat": scu.EtatJustificatif.MODIFIE, + "deb": "2023-01-03T11:30+01:00", + "fin": "2023-01-03T12:00+01:00", + "raison": None, + }, + ] + + justificatifs = [] + for just in obj_justificatifs: + just_obj = Justificatif.create_justificatif( + etud, + scu.is_iso_formated(just["deb"], True), + scu.is_iso_formated(just["fin"], True), + just["etat"], + just["raison"], + ) + db.session.add(just_obj) + db.session.commit() + justificatifs.append(just_obj) + + # Vérification de la création des justificatifs + assert [ + justi for justi in justificatifs if not isinstance(justi, Justificatif) + ] == [], "La création des justificatifs de base n'est pas OK" + + # Vérification de la gestion des erreurs + + test_assiduite = { + "etat": scu.EtatJustificatif.ATTENTE, + "deb": "2023-01-03T11:00:01+01:00", + "fin": "2023-01-03T12:00+01:00", + "raison": "Description", + } + return justificatifs + + +def verifier_filtrage_justificatifs(etud: Identite, justificatifs: list[Justificatif]): + """ + - vérifier le filtrage des justificatifs (etat, debut, fin) + """ + + # Vérification du filtrage classique + + # Etat + assert ( + scass.filter_justificatifs_by_etat(etud.justificatifs, "valide").count() == 2 + ), "Filtrage de l'état 'valide' mauvais" + assert ( + scass.filter_justificatifs_by_etat(etud.justificatifs, "attente").count() == 1 + ), "Filtrage de l'état 'attente' mauvais" + assert ( + scass.filter_justificatifs_by_etat(etud.justificatifs, "modifie").count() == 1 + ), "Filtrage de l'état 'modifie' mauvais" + assert ( + scass.filter_justificatifs_by_etat(etud.justificatifs, "non_valide").count() + == 1 + ), "Filtrage de l'état 'non_valide' mauvais" + assert ( + scass.filter_justificatifs_by_etat(etud.justificatifs, "valide,modifie").count() + == 3 + ), "Filtrage de l'état 'valide,modifie' mauvais" + assert ( + scass.filter_justificatifs_by_etat( + etud.justificatifs, "valide,modifie,attente" + ).count() + == 4 + ), "Filtrage de l'état 'valide,modifie,attente' mauvais" + assert ( + scass.filter_justificatifs_by_etat( + etud.justificatifs, "valide,modifie,attente,non_valide" + ).count() + == 5 + ), "Filtrage de l'état 'valide,modifie,attente,_non_valide' mauvais" + + assert ( + scass.filter_justificatifs_by_etat(etud.justificatifs, "autre").count() == 0 + ), "Filtrage de l'état 'autre' mauvais" + + # Dates + + assert ( + scass.filter_by_date(etud.justificatifs, Justificatif).count() == 5 + ), "Filtrage 'Toute Date' mauvais 1" + + date = scu.localize_datetime("2022-09-01T10:00+01:00") + assert ( + scass.filter_by_date(etud.justificatifs, Justificatif, date_deb=date).count() + == 5 + ), "Filtrage 'Toute Date' mauvais 2" + + date = scu.localize_datetime("2022-09-03T08:00+01:00") + assert ( + scass.filter_by_date(etud.justificatifs, Justificatif, date_deb=date).count() + == 5 + ), "Filtrage 'date début' mauvais 3" + + date = scu.localize_datetime("2022-09-03T08:00:01+01:00") + assert ( + scass.filter_by_date(etud.justificatifs, Justificatif, date_deb=date).count() + == 5 + ), "Filtrage 'date début' mauvais 4" + + date = scu.localize_datetime("2022-09-03T10:00+01:00") + assert ( + scass.filter_by_date(etud.justificatifs, Justificatif, date_deb=date).count() + == 4 + ), "Filtrage 'date début' mauvais 5" + + date = scu.localize_datetime("2022-09-01T10:00+01:00") + assert ( + scass.filter_by_date(etud.justificatifs, Justificatif, date_fin=date).count() + == 0 + ), "Filtrage 'Toute Date' mauvais 6" + + date = scu.localize_datetime("2022-09-03T08:00+01:00") + assert ( + scass.filter_by_date(etud.justificatifs, Justificatif, date_fin=date).count() + == 1 + ), "Filtrage 'date début' mauvais 7" + + date = scu.localize_datetime("2022-09-03T10:00:01+01:00") + assert ( + scass.filter_by_date(etud.justificatifs, Justificatif, date_fin=date).count() + == 2 + ), "Filtrage 'date début' mauvais 8" + + date = scu.localize_datetime("2023-01-03T12:00+01:00") + assert ( + scass.filter_by_date(etud.justificatifs, Justificatif, date_fin=date).count() + == 5 + ), "Filtrage 'date début' mauvais 9" + + # Justifications des assiduites + + assert len(scass.justifies(justificatifs[2])) == 1, "Justifications mauvais" + assert len(scass.justifies(justificatifs[0])) == 0, "Justifications mauvais" + + +def editer_supprimer_justificatif(etud: Identite): + """ + Troisième Partie: + - Vérification de l'édition des justificatifs + - Vérification de la suppression des justificatifs + """ + + justi: Justificatif = etud.justificatifs.first() + + # Modification de l'état + justi.etat = scu.EtatJustificatif.MODIFIE + # Modification du moduleimpl + justi.date_debut = scu.localize_datetime("2023-02-03T11:00:01+01:00") + justi.date_fin = scu.localize_datetime("2023-02-03T12:00:01+01:00") + + db.session.add(justi) + db.session.commit() + + # Vérification du changement + assert ( + scass.filter_justificatifs_by_etat(etud.justificatifs, "modifie").count() == 2 + ), "Edition de justificatif mauvais" + + assert ( + scass.filter_by_date( + etud.justificatifs, + Justificatif, + date_deb=scu.localize_datetime("2023-02-01T11:00:00+01:00"), + ).count() + == 1 + ), "Edition de justificatif mauvais 2" + + # Supression d'une assiduité + + db.session.delete(justi) + db.session.commit() + + assert etud.justificatifs.count() == 4, "Supression de justificatif mauvais" + + +def editer_supprimer_assiduites(etuds: list[Identite], moduleimpls: list[int]): + """ + Troisième Partie: + - Vérification de l'édition des assiduitées + - Vérification de la suppression des assiduitées + """ + + ass1: Assiduite = etuds[0].assiduites.first() + ass2: Assiduite = etuds[1].assiduites.first() + ass3: Assiduite = etuds[2].assiduites.first() + + # Modification de l'état + ass1.etat = scu.EtatAssiduite.RETARD + db.session.add(ass1) + # Modification du moduleimpl + ass2.moduleimpl_id = moduleimpls[0].id + db.session.add(ass2) + db.session.commit() + + # Vérification du changement + assert ( + scass.filter_assiduites_by_etat(etuds[0].assiduites, "retard").count() == 4 + ), "Edition d'assiduité mauvais" + assert ( + scass.filter_by_module_impl(etuds[1].assiduites, moduleimpls[0].id).count() == 2 + ), "Edition d'assiduité mauvais" + + # Supression d'une assiduité + + db.session.delete(ass3) + db.session.commit() + + assert etuds[2].assiduites.count() == 6, "Supression d'assiduité mauvais" + + +def ajouter_assiduites( + etuds: list[Identite], moduleimpls: list[ModuleImpl], etud_faux: Identite +): + """ + Première partie: + - Ajoute 6 assiduités à chaque étudiant + - 2 présence (semestre 1 et 2) + - 2 retard (semestre 2) + - 2 absence (semestre 1) + - Vérifie la création des assiduités + """ + + for etud in etuds: + obj_assiduites = [ + { + "etat": scu.EtatAssiduite.PRESENT, + "deb": "2022-09-03T08:00+01:00", + "fin": "2022-09-03T10:00+01:00", + "moduleimpl": None, + "desc": None, + }, + { + "etat": scu.EtatAssiduite.PRESENT, + "deb": "2023-01-03T08:00+01:00", + "fin": "2023-01-03T10:00+01:00", + "moduleimpl": moduleimpls[2], + "desc": None, + }, + { + "etat": scu.EtatAssiduite.ABSENT, + "deb": "2022-09-03T10:00:01+01:00", + "fin": "2022-09-03T11:00+01:00", + "moduleimpl": moduleimpls[0], + "desc": None, + }, + { + "etat": scu.EtatAssiduite.ABSENT, + "deb": "2022-09-03T14:00:00+01:00", + "fin": "2022-09-03T15:00+01:00", + "moduleimpl": moduleimpls[1], + "desc": "Description", + }, + { + "etat": scu.EtatAssiduite.RETARD, + "deb": "2023-01-03T11:00:01+01:00", + "fin": "2023-01-03T12:00+01:00", + "moduleimpl": moduleimpls[3], + "desc": None, + }, + { + "etat": scu.EtatAssiduite.RETARD, + "deb": "2023-01-04T11:00:01+01:00", + "fin": "2023-01-04T12:00+01:00", + "moduleimpl": moduleimpls[3], + "desc": "Description", + }, + { + "etat": scu.EtatAssiduite.RETARD, + "deb": "2022-11-04T11:00:01+01:00", + "fin": "2022-12-05T12:00+01:00", + "moduleimpl": None, + "desc": "Description", + }, + ] + + assiduites = [] + for ass in obj_assiduites: + ass_obj = Assiduite.create_assiduite( + etud, + scu.is_iso_formated(ass["deb"], True), + scu.is_iso_formated(ass["fin"], True), + ass["etat"], + ass["moduleimpl"], + ass["desc"], + ) + assiduites.append(ass_obj) + db.session.add(ass_obj) + db.session.commit() + + # Vérification de la création des assiduités + assert [ + ass for ass in assiduites if not isinstance(ass, Assiduite) + ] == [], "La création des assiduités de base n'est pas OK" + + # Vérification de la gestion des erreurs + + test_assiduite = { + "etat": scu.EtatAssiduite.RETARD, + "deb": "2023-01-04T11:00:01+01:00", + "fin": "2023-01-04T12:00+01:00", + "moduleimpl": moduleimpls[3], + "desc": "Description", + } + + try: + Assiduite.create_assiduite( + etuds[0], + scu.is_iso_formated(test_assiduite["deb"], True), + scu.is_iso_formated(test_assiduite["fin"], True), + test_assiduite["etat"], + test_assiduite["moduleimpl"], + test_assiduite["desc"], + ) + except ScoValueError as excp: + assert ( + excp.args[0] + == "Duplication des assiduités (la période rentrée rentre en conflit avec une assiduité enregistrée)" + ) + try: + Assiduite.create_assiduite( + etud_faux, + scu.is_iso_formated(test_assiduite["deb"], True), + scu.is_iso_formated(test_assiduite["fin"], True), + test_assiduite["etat"], + test_assiduite["moduleimpl"], + test_assiduite["desc"], + ) + except ScoValueError as excp: + assert excp.args[0] == "L'étudiant n'est pas inscrit au moduleimpl" + + +def verifier_comptage_et_filtrage_assiduites( + etuds: list[Identite], moduleimpls: list[int], formsemestres: tuple[int] +): + """ + Deuxième partie: + - vérifier les valeurs du comptage (compte, heure, journée, demi-journée) + - vérifier le filtrage des assiduites (etat, debut, fin, module, formsemestre) + + """ + + etu1, etu2, etu3 = etuds + + mod11, mod12, mod21, mod22 = moduleimpls + + # Vérification du comptage classique + comptage = scass.get_assiduites_stats(etu1.assiduites) + + assert comptage["compte"] == 6 + 1, "la métrique 'Comptage' n'est pas bien calculée" + assert ( + comptage["journee"] == 3 + 22 + ), "la métrique 'Journée' n'est pas bien calculée" + assert ( + comptage["demi"] == 4 + 43 + ), "la métrique 'Demi-Journée' n'est pas bien calculée" + assert comptage["heure"] == float( + 8 + 169 + ), "la métrique 'Heure' n'est pas bien calculée" + + # Vérification du filtrage classique + + # Etat + assert ( + scass.filter_assiduites_by_etat(etu2.assiduites, "present").count() == 2 + ), "Filtrage de l'état 'présent' mauvais" + assert ( + scass.filter_assiduites_by_etat(etu2.assiduites, "retard").count() == 3 + ), "Filtrage de l'état 'retard' mauvais" + assert ( + scass.filter_assiduites_by_etat(etu2.assiduites, "absent").count() == 2 + ), "Filtrage de l'état 'absent' mauvais" + assert ( + scass.filter_assiduites_by_etat(etu2.assiduites, "absent,retard").count() == 5 + ), "Filtrage de l'état 'absent,retard' mauvais" + assert ( + scass.filter_assiduites_by_etat( + etu2.assiduites, "absent,retard,present" + ).count() + == 7 + ), "Filtrage de l'état 'absent,retard,present' mauvais" + assert ( + scass.filter_assiduites_by_etat(etu2.assiduites, "autre").count() == 0 + ), "Filtrage de l'état 'autre' mauvais" + + # Module + assert ( + scass.filter_by_module_impl(etu3.assiduites, mod11.id).count() == 1 + ), "Filtrage par 'Moduleimpl' mauvais" + assert ( + scass.filter_by_module_impl(etu3.assiduites, mod12.id).count() == 1 + ), "Filtrage par 'Moduleimpl' mauvais" + assert ( + scass.filter_by_module_impl(etu3.assiduites, mod21.id).count() == 1 + ), "Filtrage par 'Moduleimpl' mauvais" + assert ( + scass.filter_by_module_impl(etu3.assiduites, mod22.id).count() == 2 + ), "Filtrage par 'Moduleimpl' mauvais" + assert ( + scass.filter_by_module_impl(etu3.assiduites, None).count() == 2 + ), "Filtrage par 'Moduleimpl' mauvais" + assert ( + scass.filter_by_module_impl(etu3.assiduites, 152).count() == 0 + ), "Filtrage par 'Moduleimpl' mauvais" + + # Formsemestre + formsemestres = [ + FormSemestre.query.filter_by(id=fms["id"]).first() for fms in formsemestres + ] + assert ( + scass.filter_by_formsemestre( + etu1.assiduites, Assiduite, formsemestres[0] + ).count() + == 4 + ), "Filtrage 'Formsemestre' mauvais" + assert ( + scass.filter_by_formsemestre( + etu1.assiduites, Assiduite, formsemestres[1] + ).count() + == 3 + ), "Filtrage 'Formsemestre' mauvais" + assert ( + scass.filter_by_formsemestre( + etu1.assiduites, Assiduite, formsemestres[2] + ).count() + == 0 + ), "Filtrage 'Formsemestre' mauvais" + + # Date début + assert ( + scass.filter_by_date(etu2.assiduites, Assiduite).count() == 7 + ), "Filtrage 'Date début' mauvais 1" + + date = scu.localize_datetime("2022-09-01T10:00+01:00") + assert ( + scass.filter_by_date(etu2.assiduites, Assiduite, date_deb=date).count() == 7 + ), "Filtrage 'Date début' mauvais 2" + + date = scu.localize_datetime("2022-09-03T10:00+01:00") + assert ( + scass.filter_by_date(etu2.assiduites, Assiduite, date_deb=date).count() == 7 + ), "Filtrage 'Date début' mauvais 3" + + date = scu.localize_datetime("2022-09-03T16:00+01:00") + assert ( + scass.filter_by_date(etu2.assiduites, Assiduite, date_deb=date).count() == 4 + ), "Filtrage 'Date début' mauvais 4" + + # Date Fin + + date = scu.localize_datetime("2022-09-01T10:00+01:00") + assert ( + scass.filter_by_date(etu2.assiduites, Assiduite, date_fin=date).count() == 0 + ), "Filtrage 'Date fin' mauvais 1" + + date = scu.localize_datetime("2022-09-03T10:00+01:00") + assert ( + scass.filter_by_date(etu2.assiduites, Assiduite, date_fin=date).count() == 1 + ), "Filtrage 'Date fin' mauvais 2" + + date = scu.localize_datetime("2022-09-03T10:00:01+01:00") + assert ( + scass.filter_by_date(etu2.assiduites, Assiduite, date_fin=date).count() == 2 + ), "Filtrage 'Date fin' mauvais 3" + + date = scu.localize_datetime("2022-09-03T16:00+01:00") + assert ( + scass.filter_by_date(etu2.assiduites, Assiduite, date_fin=date).count() == 3 + ), "Filtrage 'Date fin' mauvais 4" + + date = scu.localize_datetime("2023-01-04T16:00+01:00") + assert ( + scass.filter_by_date(etu2.assiduites, Assiduite, date_fin=date).count() == 7 + ), "Filtrage 'Date fin' mauvais 5" diff --git a/tests/unit/test_bulletin_bonus.py b/tests/unit/test_bulletin_bonus.py new file mode 100644 index 00000000..21587f75 --- /dev/null +++ b/tests/unit/test_bulletin_bonus.py @@ -0,0 +1,82 @@ +"""Tests unitaires : bulletins de notes + +Utiliser comme: + pytest tests/unit/test_bulletin_bonus.py + +""" +from app.but.bulletin_but_pdf import BulletinGeneratorStandardBUT + + +def test_nobonus(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus({}) == [] + + +def test_bonus_sport_nul(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus({"bonus": 0}) == [] + + +def test_malus_nul(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus({"malus": 0}) == [] + + +def test_bonus_et_malus_nuls(): + assert ( + BulletinGeneratorStandardBUT.affichage_bonus_malus({"bonus": 0, "malus": 0}) + == [] + ) + + +def test_vrai_malus(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus({"malus": 0.1}) == [ + "Malus: 0.1" + ] + + +def test_bonus_sport_et_vrai_malus(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus( + {"malus": 0.12, "bonus": 0.23} + ) == [ + "Bonus: 0.23", + "Malus: 0.12", + ] + + +def test_bonus_sport_seul(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus({"bonus": 0.5}) == [ + "Bonus: 0.5" + ] + + +def test_bonus_sport_nul_et_vrai_malus(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus( + {"bonus": 0, "malus": 0.5} + ) == ["Malus: 0.5"] + + +def test_bonus_sport_et_malus_nul(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus( + {"bonus": 0.5, "malus": 0} + ) == [ + "Bonus: 0.5", + ] + + +def test_faux_malus(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus({"malus": -0.6}) == [ + "Bonus: 0.6" + ] + + +def test_sport_nul_faux_malus(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus( + {"bonus": 0, "malus": -0.6} + ) == ["Bonus: 0.6"] + + +def test_bonus_sport_et_faux_malus(): + assert BulletinGeneratorStandardBUT.affichage_bonus_malus( + {"bonus": 0.3, "malus": -0.6} + ) == [ + "Bonus sport/culture: 0.3", + "Bonus autres: 0.6", + ] diff --git a/tests/unit/test_site_config.py b/tests/unit/test_site_config.py new file mode 100644 index 00000000..6dd6d199 --- /dev/null +++ b/tests/unit/test_site_config.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- + +"""Test ScoDocSiteConfig (paramétrage général) + + +Utiliser comme: + pytest tests/unit/test_site_config.py + +""" + +from app.models.config import ScoDocSiteConfig, PersonalizedLink +from app.comp.bonus_spo import BonusIUTRennes1 +from app.scodoc import sco_utils as scu + + +def test_scodoc_site_config(test_client): + """Classe pour paramètres généraux""" + cfg = ScoDocSiteConfig.get_dict() + assert cfg == {} # aucune valeur au départ + try: + ScoDocSiteConfig.set_bonus_sport_class("invalid") + assert False # la ligne precédente doit lancer une exception + except NameError: + pass + bonus_sport = "bonus_iut_rennes1" + ScoDocSiteConfig.set_bonus_sport_class(bonus_sport) + cfg = ScoDocSiteConfig.get_dict() + assert tuple(ScoDocSiteConfig.get_dict().values()) == (bonus_sport,) + assert ScoDocSiteConfig.get_bonus_sport_class_name() == bonus_sport + assert ScoDocSiteConfig.get_bonus_sport_class() == BonusIUTRennes1 + bonus_sport_class_names = ScoDocSiteConfig.get_bonus_sport_class_names() + assert isinstance(bonus_sport_class_names, list) + assert "" in bonus_sport_class_names + assert bonus_sport in bonus_sport_class_names + assert len(bonus_sport_class_names) > 5 + assert all([x == "" or x.startswith("bonus_") for x in bonus_sport_class_names]) + apo_dict = ScoDocSiteConfig.get_codes_apo_dict() + assert isinstance(apo_dict, dict) + assert "ABAN" in apo_dict + assert "ADM" in apo_dict + assert len(apo_dict) > 5 + ScoDocSiteConfig.set_code_apo("ADSUP", "AZERTY") + assert ScoDocSiteConfig.get_codes_apo_dict()["ADSUP"] == "AZERTY" + assert ScoDocSiteConfig.get_code_apo("ADSUP") == "AZERTY" + assert ScoDocSiteConfig.get("azerty") == "" # default empty string + assert ScoDocSiteConfig.set("azerty", 99) + assert ScoDocSiteConfig.get("azerty") == "99" # converted to string + assert "azerty" in ScoDocSiteConfig.get_dict() + assert ScoDocSiteConfig.set("always_require_ine", 99) + # Converti en bool car déclaré dans NAMES: + assert ScoDocSiteConfig.get_dict()["always_require_ine"] == True + assert ScoDocSiteConfig.get("always_require_ine") == True + # + assert ( + ScoDocSiteConfig.get_month_debut_annee_scolaire() + == scu.MONTH_DEBUT_ANNEE_SCOLAIRE + ) + # Links: + assert ScoDocSiteConfig.get_perso_links() == [] + ScoDocSiteConfig.set_perso_links( + [ + PersonalizedLink(title="lien 1", url="http://foo.bar/bar", with_args=True), + PersonalizedLink(title="lien 1", url="http://foo.bar?x=1", with_args=True), + ] + ) + links = ScoDocSiteConfig.get_perso_links() + assert links[0].get_url(params={"y": 2}) == "http://foo.bar/bar?y=2" + assert links[1].get_url(params={"y": 2}) == "http://foo.bar?x=1&y=2" diff --git a/tests/unit/yaml_setup_but.py b/tests/unit/yaml_setup_but.py index 8412ed2b..d87ca135 100644 --- a/tests/unit/yaml_setup_but.py +++ b/tests/unit/yaml_setup_but.py @@ -134,8 +134,9 @@ def associe_modules_et_parcours(formation: Formation, formation_infos: dict): for module in formation.modules if re.match(code_module, module.code) ]: - module.parcours.append(parcour) - db.session.add(module) + if not parcour in module.parcours: + module.parcours.append(parcour) + db.session.add(module) db.session.commit() diff --git a/tools/__init__.py b/tools/__init__.py index ac9e681c..da9214bf 100644 --- a/tools/__init__.py +++ b/tools/__init__.py @@ -8,3 +8,5 @@ from tools.import_scodoc7_user_db import import_scodoc7_user_db from tools.import_scodoc7_dept import import_scodoc7_dept from tools.migrate_scodoc7_archives import migrate_scodoc7_dept_archives from tools.migrate_scodoc7_logos import migrate_scodoc7_dept_logos +from tools.migrate_abs_to_assiduites import migrate_abs_to_assiduites +from tools.downgrade_assiduites import downgrade_module diff --git a/tools/build_release.sh b/tools/build_release.sh index 99ab4c89..f7f89828 100755 --- a/tools/build_release.sh +++ b/tools/build_release.sh @@ -59,10 +59,10 @@ SCODOC_USER=scodoc # Tests unitaires lancés dans le répertoire de travail echo "TESTS UNITAIRES" -(cd "$UNIT_TESTS_DIR"; pytest tests/unit) +(cd "$UNIT_TESTS_DIR"; pytest tests/unit) || terminate "Erreur dans tests unitaires" # Tests API -(cd "$UNIT_TESTS_DIR"; tools/test_api.sh) +(cd "$UNIT_TESTS_DIR"; tools/test_api.sh) || terminate "Erreur dans tests unitaires API" # Création répertoire du paquet, et de opt diff --git a/tools/config.sh b/tools/config.sh index 9d726035..2a6c1627 100644 --- a/tools/config.sh +++ b/tools/config.sh @@ -40,10 +40,10 @@ export SCODOC_DB_TEST="SCODOC_TEST" # psql command: if various versions installed, force the one we want: -if [ "${debian_version}" = "11" ] +if [ "${debian_version}" = "12" ] then - PSQL=/usr/lib/postgresql/13/bin/psql - export POSTGRES_SERVICE="postgresql@11-main.service" + PSQL=/usr/lib/postgresql/15/bin/psql + #export POSTGRES_SERVICE="postgresql@11-main.service" else die "unsupported Debian version" fi diff --git a/tools/configure-scodoc9.sh b/tools/configure-scodoc9.sh index 251c2558..c40c8b30 100755 --- a/tools/configure-scodoc9.sh +++ b/tools/configure-scodoc9.sh @@ -22,10 +22,10 @@ then debian_version=$(cat /etc/debian_version) debian_version=${debian_version%%.*} echo "Detected Debian version: ${debian_version}" - if [ "$debian_version" != "11" ] + if [ "$debian_version" != "12" ] then echo "Erreur: version Linux Debian incompatible" - echo "Utiliser un système Debian Bullseye (11)" + echo "Utiliser un système Debian Bookwork (12)" echo exit 1 fi @@ -33,7 +33,7 @@ else echo "can't detect Debian version" exit 1 fi -echo "--- Configuration de ScoDoc pour Debian 11" +echo "--- Configuration de ScoDoc pour Debian 12" # ------------ CONFIG FIREWALL OPTIONNELLE echo @@ -135,7 +135,6 @@ systemctl start scodoc9 echo echo "Service configuré et démarré." echo "Vous pouvez vous connecter en web et vous identifier comme \"admin\"." -echo "ou bien importer vos données et comptes de la version ScoDoc 7." echo diff --git a/tools/debian/control b/tools/debian/control index 4c5c809b..299ce6af 100644 --- a/tools/debian/control +++ b/tools/debian/control @@ -3,5 +3,5 @@ Version: x.y.z Architecture: amd64 Maintainer: Emmanuel Viennet Description: ScoDoc 9 - Un logiciel pour le suivi de la scolarité universitaire. -Depends: adduser, curl, gcc, graphviz, graphviz-dev, libpq-dev, postfix|exim4, cracklib-runtime, libcrack2-dev, python3-dev, python3-venv, python3-pip, python3-wheel, nginx, postgresql, libpq-dev, redis, ufw + Un logiciel pour le suivi de la scolarité universitaire. +Depends: adduser, curl, gcc, graphviz, graphviz-dev, libpq-dev, postfix|exim4, cracklib-runtime, libcrack2-dev, libpango-1.0-0, pango1.0-tools, python3-dev, python3-venv, python3-pip, python3-wheel, nginx, postgresql, libpq-dev, redis, ufw diff --git a/tools/debian/postinst b/tools/debian/postinst index c967a53e..9cae57ff 100755 --- a/tools/debian/postinst +++ b/tools/debian/postinst @@ -75,9 +75,9 @@ fi #echo "Creating python3 virtualenv..." su -c "(cd $SCODOC_DIR && python3 -m venv venv)" "$SCODOC_USER" || die "Error creating Python 3 virtualenv" -# ------------ INSTALL DES PAQUETS PYTHON (3.9) +# ------------ INSTALL DES PAQUETS PYTHON (3.11) # pip in our env, as user "scodoc" -su -c "(cd $SCODOC_DIR && source venv/bin/activate && pip install wheel && pip install -r requirements-3.9.txt)" "$SCODOC_USER" || die "Error installing python packages" +su -c "(cd $SCODOC_DIR && source venv/bin/activate && pip install wheel && pip install -r requirements-3.11.txt)" "$SCODOC_USER" || die "Error installing python packages" # --- NGINX # Evite d'écraser: il faudrait ici présenter un dialogue "fichier local modifié, ..." diff --git a/tools/downgrade_assiduites.py b/tools/downgrade_assiduites.py new file mode 100644 index 00000000..dd87981a --- /dev/null +++ b/tools/downgrade_assiduites.py @@ -0,0 +1,76 @@ +""" +Commande permettant de supprimer les assiduités et les justificatifs + +Ecrit par Matthias HARTMANN +""" +import sqlalchemy as sa + +from app import db +from app.models import Justificatif, Assiduite, Departement +from app.scodoc.sco_archives_justificatifs import JustificatifArchiver +from app.scodoc.sco_utils import TerminalColor + + +def downgrade_module( + dept: str = None, assiduites: bool = False, justificatifs: bool = False +): + """ + Supprime les assiduités et/ou justificatifs du dept sélectionné ou de tous les départements + + Args: + dept (str, optional): l'acronym du département. Par défaut tous les départements. + assiduites (bool, optional): suppression des assiduités. Par défaut : Non + justificatifs (bool, optional): supression des justificatifs. Par défaut : Non + """ + + dept_etudid: list[int] = None + dept_id: int = None + + if dept is not None: + departement: Departement = Departement.query.filter_by(acronym=dept).first() + + assert departement is not None, "Le département n'existe pas." + + dept_etudid = [etud.id for etud in departement.etudiants] + dept_id = departement.id + + if assiduites: + _remove_assiduites(dept_etudid) + + if justificatifs: + _remove_justificatifs(dept_etudid) + _remove_justificatifs_archive(dept_id) + + if dept is None: + if assiduites: + db.session.execute( + sa.text("ALTER SEQUENCE assiduites_id_seq RESTART WITH 1") + ) + if justificatifs: + db.session.execute( + sa.text("ALTER SEQUENCE justificatifs_id_seq RESTART WITH 1") + ) + + db.session.commit() + + print( + f"{TerminalColor.GREEN}Le module assiduité a bien été remis à zero.{TerminalColor.RESET}" + ) + + +def _remove_assiduites(dept_etudid: str = None): + if dept_etudid is None: + Assiduite.query.delete() + else: + Assiduite.query.filter(Assiduite.etudid.in_(dept_etudid)).delete() + + +def _remove_justificatifs(dept_etudid: str = None): + if dept_etudid is None: + Justificatif.query.delete() + else: + Justificatif.query.filter(Justificatif.etudid.in_(dept_etudid)).delete() + + +def _remove_justificatifs_archive(dept_id: int = None): + JustificatifArchiver().remove_dept_archive(dept_id) diff --git a/tools/fakedatabase/create_test_api_database.py b/tools/fakedatabase/create_test_api_database.py index 142f732f..3407afa2 100644 --- a/tools/fakedatabase/create_test_api_database.py +++ b/tools/fakedatabase/create_test_api_database.py @@ -21,11 +21,13 @@ from app import models from app.models import departements from app.models import ( Absence, + Assiduite, Departement, Formation, FormSemestre, FormSemestreEtape, Identite, + Justificatif, ModuleImpl, NotesNotes, ) @@ -37,6 +39,7 @@ from app.scodoc import ( sco_groups, ) from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_utils import localize_datetime from tools.fakeportal.gen_nomprenoms import nomprenom random.seed(12345678) # tests reproductibles @@ -378,6 +381,56 @@ def create_logos(): ) +def ajouter_assiduites_justificatifs(formsemestre: FormSemestre): + """ + Ajoute des assiduités semi-aléatoires à chaque étudiant du semestre + """ + MODS = [moduleimpl for moduleimpl in formsemestre.modimpls] + MODS.append(None) + + for etud in formsemestre.etuds: + base_date = datetime.datetime(2022, 9, random.randint(1, 30), 8, 0, 0) + base_date = localize_datetime(base_date) + + for i in range(random.randint(1, 5)): + etat = random.randint(0, 2) + moduleimpl = random.choice(MODS) + deb_date = base_date + datetime.timedelta(days=i) + fin_date = deb_date + datetime.timedelta(hours=i) + + code = Assiduite.create_assiduite( + etud, deb_date, fin_date, etat, moduleimpl + ) + + assert isinstance( + code, Assiduite + ), "Erreur dans la génération des assiduités" + + db.session.add(code) + + for i in range(random.randint(0, 2)): + etat = random.randint(0, 3) + deb_date = base_date + datetime.timedelta(days=i) + fin_date = deb_date + datetime.timedelta(hours=8) + raison = random.choice(["raison", None]) + + code = Justificatif.create_justificatif( + etud=etud, + date_debut=deb_date, + date_fin=fin_date, + etat=etat, + raison=raison, + ) + + assert isinstance( + code, Justificatif + ), "Erreur dans la génération des justificatifs" + + db.session.add(code) + + db.session.commit() + + def init_test_database(): """Appelé par la commande `flask init-test-database` @@ -398,6 +451,7 @@ def init_test_database(): saisie_notes_evaluations(formsemestre, user_lecteur) add_absences(formsemestre) create_etape_apo(formsemestre) + ajouter_assiduites_justificatifs(formsemestre) create_logos() # à compléter # - groupes diff --git a/tools/migrate_abs_to_assiduites.py b/tools/migrate_abs_to_assiduites.py new file mode 100644 index 00000000..0234a518 --- /dev/null +++ b/tools/migrate_abs_to_assiduites.py @@ -0,0 +1,448 @@ +""" +Script de migration des données de la base "absences" -> "assiduites"/"justificatifs" + +Ecrit par Matthias HARTMANN +""" +from datetime import date, datetime, time, timedelta +from json import dump, dumps +from sqlalchemy import not_ + +from flask import g + +from app import db +from app.models import ( + Absence, + Assiduite, + Departement, + Identite, + Justificatif, + ModuleImplInscription, +) + +from app.models.config import ScoDocSiteConfig + +from app.profiler import Profiler +from app.scodoc.sco_utils import ( + EtatAssiduite, + EtatJustificatif, + TerminalColor, + localize_datetime, + print_progress_bar, +) +from app.scodoc import notesdb as ndb + + +class _glob: + """variables globales du script""" + + DEBUG: bool = False + PROBLEMS: dict[int, list[str]] = {} + DEPT_ETUDIDS: dict[int, Identite] = {} + COMPTE: list[int, int] = [] + ERR_ETU: list[int] = [] + MERGER_ASSI: "_Merger" = None + MERGER_JUST: "_Merger" = None + + JUSTIFS: dict[int, list[tuple[datetime, datetime]]] = {} + + MORNING: time = None + NOON: time = None + EVENING: time = None + + +class _Merger: + def __init__(self, abs_: Absence, est_abs: bool) -> None: + self.deb = (abs_.jour, abs_.matin) + self.fin = (abs_.jour, abs_.matin) + self.moduleimpl = abs_.moduleimpl_id + self.etudid = abs_.etudid + self.est_abs = est_abs + self.raison = abs_.description + self.entry_date = abs_.entry_date + self.est_just = abs_.estjust + + def merge(self, abs_: Absence) -> bool: + """Fusionne les absences. + Return False si pas de fusion. + """ + + if self.etudid != abs_.etudid: + return False + + # Cas d'une même absence enregistrée plusieurs fois + if self.fin == (abs_.jour, abs_.matin): + self.moduleimpl = None + else: + if self.fin[1]: + if abs_.jour != self.fin[0]: + return False + else: + day_after: date = abs_.jour - timedelta(days=1) == self.fin[0] + if not (day_after and abs_.matin and self.est_just == abs_.estjust): + return False + + self.est_just = self.est_just or abs_.estjust + + self.fin = (abs_.jour, abs_.matin) + + return True + + @staticmethod + def _tuple_to_date(couple: tuple[date, bool], end=False): + if couple[1]: + time_ = _glob.NOON if end else _glob.MORNING + date_ = datetime.combine(couple[0], time_) + else: + time_ = _glob.EVENING if end else _glob.NOON + date_ = datetime.combine(couple[0], time_) + d = localize_datetime(date_) + return d + + def _to_justif(self): + date_deb = _Merger._tuple_to_date(self.deb) + date_fin = _Merger._tuple_to_date(self.fin, end=True) + + _glob.JUSTIFS[self.etudid].append((date_deb, date_fin)) + + _glob.cursor.execute( + """INSERT INTO justificatifs + (etudid,date_debut,date_fin,etat,raison,entry_date) + VALUES (%(etudid)s,%(date_debut)s,%(date_fin)s,%(etat)s,%(raison)s,%(entry_date)s) + """, + { + "etudid": self.etudid, + "date_debut": date_deb, + "date_fin": date_fin, + "etat": EtatJustificatif.VALIDE, + "raison": self.raison, + "entry_date": self.entry_date, + }, + ) + + def _to_assi(self): + date_deb = _Merger._tuple_to_date(self.deb) + date_fin = _Merger._tuple_to_date(self.fin, end=True) + + self.est_just = ( + _assi_in_justifs(date_deb, date_fin, self.etudid) or self.est_just + ) + if _glob.MERGER_JUST is not None and not self.est_just: + justi_date_deb = _Merger._tuple_to_date(_glob.MERGER_JUST.deb) + justi_date_fin = _Merger._tuple_to_date(_glob.MERGER_JUST.fin, end=True) + justifiee = date_deb >= justi_date_deb and date_fin <= justi_date_fin + self.est_just = justifiee + + _glob.cursor.execute( + """INSERT INTO assiduites + (etudid,date_debut,date_fin,etat,moduleimpl_id,description,entry_date,est_just) + VALUES (%(etudid)s,%(date_debut)s,%(date_fin)s,%(etat)s,%(moduleimpl_id)s,%(description)s,%(entry_date)s, %(est_just)s) + """, + { + "etudid": self.etudid, + "date_debut": date_deb, + "date_fin": date_fin, + "etat": EtatAssiduite.ABSENT, + "moduleimpl_id": self.moduleimpl, + "description": self.raison, + "entry_date": self.entry_date, + "est_just": self.est_just, + }, + ) + + def export(self): + """Génère un nouvel objet Assiduité ou Justificatif""" + obj: Assiduite or Justificatif = None + if self.est_abs: + _glob.COMPTE[0] += 1 + self._to_assi() + else: + _glob.COMPTE[1] += 1 + self._to_justif() + + +def _assi_in_justifs(deb, fin, etudid): + return any(deb >= j[0] and fin <= j[1] for j in _glob.JUSTIFS[etudid]) + + +class _Statistics: + def __init__(self) -> None: + self.object: dict[str, dict or int] = {"total": 0} + self.year: int = None + + def __set_year(self, year: int): + if year not in self.object: + self.object[year] = { + "etuds_inexistant": [], + "abs_invalide": {}, + } + self.year = year + return self + + def __add_etud(self, etudid: int): + if etudid not in self.object[self.year]["etuds_inexistant"]: + self.object[self.year]["etuds_inexistant"].append(etudid) + return self + + def __add_abs(self, abs_: int, err: str): + if abs_ not in self.object[self.year]["abs_invalide"]: + self.object[self.year]["abs_invalide"][abs_] = [err] + else: + self.object[self.year]["abs_invalide"][abs_].append(err) + + return self + + def add_problem(self, abs_: Absence, err: str): + """Ajoute un nouveau problème dans les statistiques""" + abs_.jour: date + pivot: date = date(abs_.jour.year, 9, 15) + year: int = abs_.jour.year + if pivot < abs_.jour: + year += 1 + self.__set_year(year) + + if err == "Etudiant inexistant": + self.__add_etud(abs_.etudid) + else: + self.__add_abs(abs_.id, err) + + self.object["total"] += 1 + + def compute_stats(self) -> dict: + """Comptage des statistiques""" + stats: dict = {"total": self.object["total"]} + for year, item in self.object.items(): + if year == "total": + continue + + stats[year] = {} + stats[year]["etuds_inexistant"] = len(item["etuds_inexistant"]) + stats[year]["abs_invalide"] = len(item["abs_invalide"]) + + return stats + + def export(self, file): + """Sérialise les statistiques dans un fichier""" + dump(self.object, file, indent=2) + + +def migrate_abs_to_assiduites( + dept: str = None, + morning: str = None, + noon: str = None, + evening: str = None, + debug: bool = False, +): + """ + une absence à 3 états: + + |.estabs|.estjust| + |1|0| -> absence non justifiée + |1|1| -> absence justifiée + |0|1| -> justifié + + dualité des temps : + + .matin: bool (0:00 -> time_pref | time_pref->23:59:59) + .jour : date (jour de l'absence/justificatif) + .moduleimpl_id: relation -> moduleimpl_id + description:str -> motif abs / raison justif + + .entry_date: datetime -> timestamp d'entrée de l'abs + .etudid: relation -> Identite + """ + Profiler.clear() + + _glob.DEBUG = debug + + if morning is None: + morning = ScoDocSiteConfig.get("assi_morning_time", time(8, 0)) + + morning: list[str] = str(morning).split(":") + _glob.MORNING = time(int(morning[0]), int(morning[1])) + + if noon is None: + noon = ScoDocSiteConfig.get("assi_lunch_time", time(13, 0)) + + noon: list[str] = str(noon).split(":") + _glob.NOON = time(int(noon[0]), int(noon[1])) + + if evening is None: + evening = ScoDocSiteConfig.get("assi_afternoon_time", time(18, 0)) + + evening: list[str] = str(evening).split(":") + _glob.EVENING = time(int(evening[0]), int(evening[1])) + + ndb.open_db_connection() + _glob.cnx = g.db_conn + _glob.cursor = _glob.cnx.cursor() + + if dept is None: + prof_total = Profiler("MigrationTotal") + prof_total.start() + depart: Departement + for depart in Departement.query.order_by(Departement.id): + migrate_dept( + depart.acronym, _Statistics(), Profiler(f"Migration_{depart.acronym}") + ) + prof_total.stop() + + print( + TerminalColor.GREEN + + f"Fin de la migration, elle a durée {prof_total.elapsed():.2f}" + + TerminalColor.RESET + ) + + else: + migrate_dept(dept, _Statistics(), Profiler("Migration")) + + +def migrate_dept(dept_name: str, stats: _Statistics, time_elapsed: Profiler): + time_elapsed.start() + + absences_query = Absence.query + dept: Departement = Departement.query.filter_by(acronym=dept_name).first() + + if dept is None: + raise ValueError(f"Département inexistant: {dept_name}") + + etuds_id: list[int] = [etud.id for etud in dept.etudiants] + for etudid in etuds_id: + _glob.JUSTIFS[etudid] = [] + absences_query = absences_query.filter(Absence.etudid.in_(etuds_id)) + absences: Absence = absences_query.order_by( + Absence.etudid, Absence.jour, not_(Absence.matin) + ) + + absences_len: int = absences.count() + + if absences_len == 0: + print( + f"{TerminalColor.BLUE}Le département {dept_name} ne possède aucune absence.{TerminalColor.RESET}" + ) + return + + _glob.DEPT_ETUDIDS = {e.id for e in Identite.query.filter_by(dept_id=dept.id)} + _glob.COMPTE = [0, 0] + _glob.ERR_ETU = [] + _glob.MERGER_ASSI = None + _glob.MERGER_JUST = None + + print( + f"{TerminalColor.BLUE}{absences_len} absences du département {dept_name} vont être migrées{TerminalColor.RESET}" + ) + + print_progress_bar(0, absences_len, "Progression", "effectué", autosize=True) + + etuds_modimpl_ids = {} + for i, abs_ in enumerate(absences): + etud_modimpl_ids = etuds_modimpl_ids.get(abs_.etudid) + if etud_modimpl_ids is None: + etud_modimpl_ids = { + ins.moduleimpl_id + for ins in ModuleImplInscription.query.filter_by(etudid=abs_.etudid) + } + etuds_modimpl_ids[abs_.etudid] = etud_modimpl_ids + try: + _from_abs_to_assiduite_justificatif(abs_, etud_modimpl_ids) + except ValueError as e: + stats.add_problem(abs_, e.args[0]) + + if i % 10 == 0: + print_progress_bar( + i, + absences_len, + "Progression", + "effectué", + autosize=True, + ) + + if i % 1000 == 0: + print_progress_bar( + i, + absences_len, + "Progression", + "effectué", + autosize=True, + ) + _glob.cnx.commit() + + if _glob.MERGER_ASSI is not None: + _glob.MERGER_ASSI.export() + if _glob.MERGER_JUST is not None: + _glob.MERGER_JUST.export() + + _glob.cnx.commit() + + print_progress_bar( + absences_len, + absences_len, + "Progression", + "effectué", + autosize=True, + ) + + # print( + # TerminalColor.RED + # + f"Justification des absences du département {dept_name}, veuillez patienter, ceci peut prendre un certain temps." + # + TerminalColor.RESET + # ) + + # justifs: Justificatif = Justificatif.query.join(Identite).filter_by(dept_id=dept.id) + # compute_assiduites_justified(justifs, reset=True) + + time_elapsed.stop() + + statistiques: dict = stats.compute_stats() + print( + f"{TerminalColor.GREEN}La migration a pris {time_elapsed.elapsed():.2f} secondes {TerminalColor.RESET}" + ) + + filename = f"/opt/scodoc-data/log/{datetime.now().strftime('%Y-%m-%dT%H:%M:%S')}scodoc_migration_abs_{dept_name}.json" + if statistiques["total"] > 0: + print( + f"{TerminalColor.RED}{statistiques['total']} absences qui n'ont pas pu être migrées." + ) + print( + f"Vous retrouverez un fichier json {TerminalColor.GREEN}{filename}{TerminalColor.RED} contenant les problèmes de migrations" + ) + + with open( + filename, + "w", + encoding="utf-8", + ) as file: + stats.export(file) + + print( + f"{TerminalColor.CYAN}{_glob.COMPTE[0]} assiduités et {_glob.COMPTE[1]} justificatifs ont été générés pour le département {dept_name}.{TerminalColor.RESET}" + ) + + if _glob.DEBUG: + print(dumps(statistiques, indent=2)) + + +def _from_abs_to_assiduite_justificatif(_abs: Absence, etud_modimpl_ids: set[int]): + if _abs.etudid not in _glob.DEPT_ETUDIDS: + raise ValueError("Etudiant inexistant") + + if _abs.estabs: + if (_abs.moduleimpl_id is not None) and ( + _abs.moduleimpl_id not in etud_modimpl_ids + ): + raise ValueError("Moduleimpl_id incorrect ou étudiant non inscrit") + + if _glob.MERGER_ASSI is None: + _glob.MERGER_ASSI = _Merger(_abs, True) + elif _glob.MERGER_ASSI.merge(_abs): + pass + else: + _glob.MERGER_ASSI.export() + _glob.MERGER_ASSI = _Merger(_abs, True) + if _abs.estjust: + if _glob.MERGER_JUST is None: + _glob.MERGER_JUST = _Merger(_abs, False) + elif _glob.MERGER_JUST.merge(_abs): + pass + else: + _glob.MERGER_JUST.export() + _glob.MERGER_JUST = _Merger(_abs, False)