2020-09-26 16:19:37 +02:00
|
|
|
# -*- mode: python -*-
|
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
|
|
|
##############################################################################
|
|
|
|
#
|
|
|
|
# Gestion scolarite IUT
|
|
|
|
#
|
2023-12-31 23:04:06 +01:00
|
|
|
# Copyright (c) 1999 - 2024 Emmanuel Viennet. All rights reserved.
|
2020-09-26 16:19:37 +02:00
|
|
|
#
|
|
|
|
# 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
|
|
|
|
#
|
|
|
|
##############################################################################
|
|
|
|
|
|
|
|
"""Liaison avec le portail ENT (qui donne accès aux infos Apogée)
|
|
|
|
"""
|
2021-08-21 15:17:14 +02:00
|
|
|
import datetime
|
|
|
|
import os
|
|
|
|
import time
|
|
|
|
import urllib
|
2020-12-02 01:00:23 +01:00
|
|
|
import xml
|
|
|
|
import xml.sax.saxutils
|
|
|
|
import xml.dom.minidom
|
|
|
|
|
2023-11-14 14:20:36 +01:00
|
|
|
from flask import flash
|
|
|
|
|
2021-06-19 23:21:37 +02:00
|
|
|
import app.scodoc.sco_utils as scu
|
2021-08-29 19:57:32 +02:00
|
|
|
from app import log
|
2022-04-22 11:20:06 +02:00
|
|
|
from app.scodoc import sco_cache
|
2021-06-19 23:21:37 +02:00
|
|
|
from app.scodoc.sco_exceptions import ScoValueError
|
|
|
|
from app.scodoc import sco_preferences
|
2020-09-26 16:19:37 +02:00
|
|
|
|
2021-02-13 23:18:32 +01:00
|
|
|
SCO_CACHE_ETAPE_FILENAME = os.path.join(scu.SCO_TMP_DIR, "last_etapes.xml")
|
2020-09-26 16:19:37 +02:00
|
|
|
|
|
|
|
|
2022-04-22 11:20:06 +02:00
|
|
|
class ApoInscritsEtapeCache(sco_cache.ScoDocCache):
|
|
|
|
"""Cache liste des inscrits à une étape Apogée"""
|
|
|
|
|
|
|
|
timeout = 10 * 60 # 10 minutes
|
|
|
|
prefix = "APOINSCRETAP"
|
|
|
|
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def has_portal():
|
2020-09-26 16:19:37 +02:00
|
|
|
"True if we are connected to a portal"
|
2021-08-20 10:51:42 +02:00
|
|
|
return get_portal_url()
|
2020-09-26 16:19:37 +02:00
|
|
|
|
|
|
|
|
2021-07-09 23:31:16 +02:00
|
|
|
class PortalInterface(object):
|
2020-09-26 16:19:37 +02:00
|
|
|
def __init__(self):
|
2021-08-21 15:17:14 +02:00
|
|
|
self.first_time = True
|
2020-09-26 16:19:37 +02:00
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_portal_url(self):
|
2020-09-26 16:19:37 +02:00
|
|
|
"URL of portal"
|
2021-07-28 17:03:54 +02:00
|
|
|
portal_url = sco_preferences.get_preference("portal_url")
|
2021-08-21 15:17:14 +02:00
|
|
|
if portal_url and not portal_url.endswith("/"):
|
|
|
|
portal_url += "/"
|
|
|
|
if self.first_time:
|
2020-09-26 16:19:37 +02:00
|
|
|
if portal_url:
|
2023-11-14 14:20:36 +01:00
|
|
|
log(f"Portal URL={portal_url}")
|
2020-09-26 16:19:37 +02:00
|
|
|
else:
|
|
|
|
log("Portal not configured")
|
2021-08-21 15:17:14 +02:00
|
|
|
self.first_time = False
|
2020-09-26 16:19:37 +02:00
|
|
|
return portal_url
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_etapes_url(self):
|
2020-09-26 16:19:37 +02:00
|
|
|
"Full URL of service giving list of etapes (in XML)"
|
2021-07-28 17:03:54 +02:00
|
|
|
etapes_url = sco_preferences.get_preference("etapes_url")
|
2020-09-26 16:19:37 +02:00
|
|
|
if not etapes_url:
|
|
|
|
# Default:
|
2021-08-20 10:51:42 +02:00
|
|
|
portal_url = self.get_portal_url()
|
2020-09-26 16:19:37 +02:00
|
|
|
if not portal_url:
|
|
|
|
return None
|
2021-08-20 10:51:42 +02:00
|
|
|
api_ver = self.get_portal_api_version()
|
2020-09-26 16:19:37 +02:00
|
|
|
if api_ver > 1:
|
|
|
|
etapes_url = portal_url + "scodocEtapes.php"
|
|
|
|
else:
|
|
|
|
etapes_url = portal_url + "getEtapes.php"
|
|
|
|
return etapes_url
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_etud_url(self):
|
2020-09-26 16:19:37 +02:00
|
|
|
"Full URL of service giving list of students (in XML)"
|
2021-07-28 17:03:54 +02:00
|
|
|
etud_url = sco_preferences.get_preference("etud_url")
|
2020-09-26 16:19:37 +02:00
|
|
|
if not etud_url:
|
|
|
|
# Default:
|
2021-08-20 10:51:42 +02:00
|
|
|
portal_url = self.get_portal_url()
|
2020-09-26 16:19:37 +02:00
|
|
|
if not portal_url:
|
|
|
|
return None
|
2021-08-20 10:51:42 +02:00
|
|
|
api_ver = self.get_portal_api_version()
|
2020-09-26 16:19:37 +02:00
|
|
|
if api_ver > 1:
|
|
|
|
etud_url = portal_url + "scodocEtudiant.php"
|
|
|
|
else:
|
|
|
|
etud_url = portal_url + "getEtud.php"
|
|
|
|
return etud_url
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_photo_url(self):
|
2020-09-26 16:19:37 +02:00
|
|
|
"Full URL of service giving photo of student"
|
2021-07-28 17:03:54 +02:00
|
|
|
photo_url = sco_preferences.get_preference("photo_url")
|
2020-09-26 16:19:37 +02:00
|
|
|
if not photo_url:
|
|
|
|
# Default:
|
2021-08-20 10:51:42 +02:00
|
|
|
portal_url = self.get_portal_url()
|
2020-09-26 16:19:37 +02:00
|
|
|
if not portal_url:
|
|
|
|
return None
|
2021-08-20 10:51:42 +02:00
|
|
|
api_ver = self.get_portal_api_version()
|
2020-09-26 16:19:37 +02:00
|
|
|
if api_ver > 1:
|
|
|
|
photo_url = portal_url + "scodocPhoto.php"
|
|
|
|
else:
|
|
|
|
photo_url = portal_url + "getPhoto.php"
|
|
|
|
return photo_url
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_maquette_url(self):
|
2020-10-14 12:36:18 +02:00
|
|
|
"""Full URL of service giving Apogee maquette pour une étape (fichier "CSV")"""
|
2021-07-28 17:03:54 +02:00
|
|
|
maquette_url = sco_preferences.get_preference("maquette_url")
|
2020-09-26 16:19:37 +02:00
|
|
|
if not maquette_url:
|
|
|
|
# Default:
|
2021-08-20 10:51:42 +02:00
|
|
|
portal_url = self.get_portal_url()
|
2020-09-26 16:19:37 +02:00
|
|
|
if not portal_url:
|
|
|
|
return None
|
|
|
|
maquette_url = portal_url + "scodocMaquette.php"
|
|
|
|
return maquette_url
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_portal_api_version(self):
|
2020-09-26 16:19:37 +02:00
|
|
|
"API version of the portal software"
|
2021-07-28 17:03:54 +02:00
|
|
|
api_ver = sco_preferences.get_preference("portal_api")
|
2020-09-26 16:19:37 +02:00
|
|
|
if not api_ver:
|
|
|
|
# Default:
|
|
|
|
api_ver = 1
|
|
|
|
return api_ver
|
|
|
|
|
|
|
|
|
|
|
|
_PI = PortalInterface()
|
|
|
|
get_portal_url = _PI.get_portal_url
|
|
|
|
get_etapes_url = _PI.get_etapes_url
|
|
|
|
get_etud_url = _PI.get_etud_url
|
|
|
|
get_photo_url = _PI.get_photo_url
|
|
|
|
get_maquette_url = _PI.get_maquette_url
|
|
|
|
get_portal_api_version = _PI.get_portal_api_version
|
|
|
|
|
|
|
|
|
2024-01-15 18:57:52 +01:00
|
|
|
def get_inscrits_etape(
|
|
|
|
code_etape, annee_apogee=None, ntrials=4, use_cache=True
|
|
|
|
) -> list[dict]:
|
2020-09-26 16:19:37 +02:00
|
|
|
"""Liste des inscrits à une étape Apogée
|
|
|
|
Result = list of dicts
|
2020-10-14 12:36:18 +02:00
|
|
|
ntrials: try several time the same request, useful for some bad web services
|
2022-04-22 11:20:06 +02:00
|
|
|
use_cache: use (redis) cache
|
2020-09-26 16:19:37 +02:00
|
|
|
"""
|
2023-10-06 15:33:33 +02:00
|
|
|
log(f"get_inscrits_etape: code={code_etape} annee_apogee={annee_apogee}")
|
|
|
|
if annee_apogee is None:
|
|
|
|
annee_apogee = str(time.localtime()[0])
|
2022-04-22 11:20:06 +02:00
|
|
|
if use_cache:
|
2023-10-06 15:33:33 +02:00
|
|
|
obj = ApoInscritsEtapeCache.get((code_etape, annee_apogee))
|
2022-04-22 11:20:06 +02:00
|
|
|
if obj:
|
|
|
|
log("get_inscrits_etape: using cached data")
|
|
|
|
return obj
|
2020-09-26 16:19:37 +02:00
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
etud_url = get_etud_url()
|
|
|
|
api_ver = get_portal_api_version()
|
2020-09-26 16:19:37 +02:00
|
|
|
if not etud_url:
|
|
|
|
return []
|
2021-07-28 17:03:54 +02:00
|
|
|
portal_timeout = sco_preferences.get_preference("portal_timeout")
|
2020-09-26 16:19:37 +02:00
|
|
|
if api_ver > 1:
|
|
|
|
req = (
|
|
|
|
etud_url
|
|
|
|
+ "?"
|
2023-10-06 15:33:33 +02:00
|
|
|
+ urllib.parse.urlencode((("etape", code_etape), ("annee", annee_apogee)))
|
2020-09-26 16:19:37 +02:00
|
|
|
)
|
|
|
|
else:
|
2021-08-21 15:17:14 +02:00
|
|
|
req = etud_url + "?" + urllib.parse.urlencode((("etape", code_etape),))
|
2020-10-14 12:36:18 +02:00
|
|
|
actual_timeout = float(portal_timeout) / ntrials
|
|
|
|
if portal_timeout > 0:
|
|
|
|
actual_timeout = max(1, actual_timeout)
|
|
|
|
for _ntrial in range(ntrials):
|
2021-02-03 22:00:41 +01:00
|
|
|
doc = scu.query_portal(req, timeout=actual_timeout)
|
2020-10-14 12:36:18 +02:00
|
|
|
if doc:
|
|
|
|
break
|
2020-09-26 16:19:37 +02:00
|
|
|
if not doc:
|
2022-01-21 00:46:45 +01:00
|
|
|
raise ScoValueError(
|
2024-07-19 10:11:02 +02:00
|
|
|
f"pas de réponse du portail ! <br>(timeout={portal_timeout}, requête: <tt>{req}</tt>)",
|
|
|
|
safe=True,
|
2022-01-21 00:46:45 +01:00
|
|
|
)
|
2020-09-26 16:19:37 +02:00
|
|
|
etuds = _normalize_apo_fields(xml_to_list_of_dicts(doc, req=req))
|
|
|
|
|
|
|
|
# Filtre sur annee inscription Apogee:
|
|
|
|
def check_inscription(e):
|
2021-07-09 17:47:06 +02:00
|
|
|
if "inscription" in e:
|
2023-10-06 15:33:33 +02:00
|
|
|
if e["inscription"] == annee_apogee:
|
2020-09-26 16:19:37 +02:00
|
|
|
return True
|
|
|
|
else:
|
|
|
|
return False
|
|
|
|
else:
|
|
|
|
log(
|
|
|
|
"get_inscrits_etape: pas inscription dans code_etape=%s e=%s"
|
|
|
|
% (code_etape, e)
|
|
|
|
)
|
|
|
|
return False # ??? pas d'annee d'inscription dans la réponse
|
|
|
|
|
2020-10-21 00:15:40 +02:00
|
|
|
etuds = [e for e in etuds if check_inscription(e)]
|
2022-04-22 11:20:06 +02:00
|
|
|
if use_cache and etuds:
|
2023-10-06 15:33:33 +02:00
|
|
|
ApoInscritsEtapeCache.set((code_etape, annee_apogee), etuds)
|
2020-09-26 16:19:37 +02:00
|
|
|
return etuds
|
|
|
|
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def query_apogee_portal(**args):
|
2020-09-26 16:19:37 +02:00
|
|
|
"""Recupere les infos sur les etudiants nommés
|
|
|
|
args: nom, prenom, code_nip
|
|
|
|
(nom et prenom matchent des parties de noms)
|
|
|
|
"""
|
2021-08-20 10:51:42 +02:00
|
|
|
etud_url = get_etud_url()
|
|
|
|
api_ver = get_portal_api_version()
|
2020-09-26 16:19:37 +02:00
|
|
|
if not etud_url:
|
|
|
|
return []
|
|
|
|
if api_ver > 1:
|
|
|
|
if args["nom"] or args["prenom"]:
|
|
|
|
# Ne fonctionne pas avec l'API 2 sur nom et prenom
|
|
|
|
# XXX TODO : va poser problème pour la page modif données étudiants : A VOIR
|
|
|
|
return []
|
2021-07-28 17:03:54 +02:00
|
|
|
portal_timeout = sco_preferences.get_preference("portal_timeout")
|
2021-08-21 15:17:14 +02:00
|
|
|
req = etud_url + "?" + urllib.parse.urlencode(list(args.items()))
|
2021-02-03 22:00:41 +01:00
|
|
|
doc = scu.query_portal(req, timeout=portal_timeout) # sco_utils
|
2020-09-26 16:19:37 +02:00
|
|
|
return xml_to_list_of_dicts(doc, req=req)
|
|
|
|
|
|
|
|
|
|
|
|
def xml_to_list_of_dicts(doc, req=None):
|
2020-10-14 12:36:18 +02:00
|
|
|
"""Convert an XML 1.0 str to a list of dicts."""
|
2020-09-26 16:19:37 +02:00
|
|
|
if not doc:
|
|
|
|
return []
|
|
|
|
# Fix for buggy XML returned by some APIs (eg USPN)
|
|
|
|
invalid_entities = {
|
2020-10-14 12:36:18 +02:00
|
|
|
"&CCEDIL;": "Ç",
|
|
|
|
"& ": "& ", # only when followed by a space (avoid affecting entities)
|
2020-09-26 16:19:37 +02:00
|
|
|
# to be completed...
|
|
|
|
}
|
|
|
|
for k in invalid_entities:
|
2020-10-14 12:36:18 +02:00
|
|
|
doc = doc.replace(k, invalid_entities[k])
|
2020-09-26 16:19:37 +02:00
|
|
|
#
|
|
|
|
try:
|
|
|
|
dom = xml.dom.minidom.parseString(doc)
|
|
|
|
except xml.parsers.expat.ExpatError as e:
|
|
|
|
# Find faulty part
|
2020-10-14 12:36:18 +02:00
|
|
|
err_zone = doc.splitlines()[e.lineno - 1][e.offset : e.offset + 20]
|
2020-09-26 16:19:37 +02:00
|
|
|
# catch bug: log and re-raise exception
|
|
|
|
log(
|
|
|
|
"xml_to_list_of_dicts: exception in XML parseString\ndoc:\n%s\n(end xml doc)\n"
|
|
|
|
% doc
|
|
|
|
)
|
2020-10-14 12:36:18 +02:00
|
|
|
raise ScoValueError(
|
|
|
|
'erreur dans la réponse reçue du portail ! (peut être : "%s")' % err_zone
|
|
|
|
)
|
2020-09-26 16:19:37 +02:00
|
|
|
infos = []
|
|
|
|
try:
|
2021-08-21 15:17:14 +02:00
|
|
|
if dom.childNodes[0].nodeName != "etudiants":
|
2020-09-26 16:19:37 +02:00
|
|
|
raise ValueError
|
|
|
|
etudiants = dom.getElementsByTagName("etudiant")
|
|
|
|
for etudiant in etudiants:
|
|
|
|
d = {}
|
|
|
|
# recupere toutes les valeurs <valeur>XXX</valeur>
|
|
|
|
for e in etudiant.childNodes:
|
|
|
|
if e.nodeType == e.ELEMENT_NODE:
|
|
|
|
childs = e.childNodes
|
|
|
|
if len(childs):
|
2021-08-21 15:17:14 +02:00
|
|
|
d[str(e.nodeName)] = childs[0].nodeValue
|
2020-09-26 16:19:37 +02:00
|
|
|
infos.append(d)
|
|
|
|
except:
|
|
|
|
log("*** invalid XML response from Etudiant Web Service")
|
|
|
|
log("req=%s" % req)
|
|
|
|
log("doc=%s" % doc)
|
|
|
|
raise ValueError("invalid XML response from Etudiant Web Service\n%s" % doc)
|
|
|
|
return infos
|
|
|
|
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_infos_apogee_allaccents(nom, prenom):
|
2020-09-26 16:19:37 +02:00
|
|
|
"essai recup infos avec differents codages des accents"
|
|
|
|
if nom:
|
2021-07-26 15:32:55 +02:00
|
|
|
nom_noaccents = scu.suppress_accents(nom)
|
2020-09-26 16:19:37 +02:00
|
|
|
else:
|
|
|
|
nom_noaccents = nom
|
|
|
|
|
|
|
|
if prenom:
|
2021-07-26 15:32:55 +02:00
|
|
|
prenom_noaccents = scu.suppress_accents(prenom)
|
2020-09-26 16:19:37 +02:00
|
|
|
else:
|
|
|
|
prenom_noaccents = prenom
|
|
|
|
|
|
|
|
# avec accents
|
2021-08-20 10:51:42 +02:00
|
|
|
infos = query_apogee_portal(nom=nom, prenom=prenom)
|
2020-09-26 16:19:37 +02:00
|
|
|
# sans accents
|
|
|
|
if nom != nom_noaccents or prenom != prenom_noaccents:
|
2021-08-20 10:51:42 +02:00
|
|
|
infos += query_apogee_portal(nom=nom_noaccents, prenom=prenom_noaccents)
|
2020-09-26 16:19:37 +02:00
|
|
|
return infos
|
|
|
|
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_infos_apogee(nom, prenom):
|
2020-10-14 12:36:18 +02:00
|
|
|
"""recupere les codes Apogee en utilisant le web service CRIT"""
|
2020-09-26 16:19:37 +02:00
|
|
|
if (not nom) and (not prenom):
|
|
|
|
return []
|
|
|
|
# essaie plusieurs codages: tirets, accents
|
2021-08-20 10:51:42 +02:00
|
|
|
infos = get_infos_apogee_allaccents(nom, prenom)
|
2020-09-26 16:19:37 +02:00
|
|
|
nom_st = nom.replace("-", " ")
|
|
|
|
prenom_st = prenom.replace("-", " ")
|
|
|
|
if nom_st != nom or prenom_st != prenom:
|
2021-08-20 10:51:42 +02:00
|
|
|
infos += get_infos_apogee_allaccents(nom_st, prenom_st)
|
2020-09-26 16:19:37 +02:00
|
|
|
# si pas de match et nom ou prenom composé, essaie en coupant
|
|
|
|
if not infos:
|
|
|
|
if nom:
|
|
|
|
nom1 = nom.split()[0]
|
|
|
|
else:
|
|
|
|
nom1 = nom
|
|
|
|
if prenom:
|
|
|
|
prenom1 = prenom.split()[0]
|
|
|
|
else:
|
|
|
|
prenom1 = prenom
|
|
|
|
if nom != nom1 or prenom != prenom1:
|
2021-08-20 10:51:42 +02:00
|
|
|
infos += get_infos_apogee_allaccents(nom1, prenom1)
|
2020-09-26 16:19:37 +02:00
|
|
|
return infos
|
|
|
|
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_etud_apogee(code_nip):
|
2020-09-26 16:19:37 +02:00
|
|
|
"""Informations à partir du code NIP.
|
|
|
|
None si pas d'infos sur cet etudiant.
|
|
|
|
Exception si reponse invalide.
|
|
|
|
"""
|
|
|
|
if not code_nip:
|
|
|
|
return {}
|
2021-08-20 10:51:42 +02:00
|
|
|
etud_url = get_etud_url()
|
2020-09-26 16:19:37 +02:00
|
|
|
if not etud_url:
|
|
|
|
return {}
|
2021-07-28 17:03:54 +02:00
|
|
|
portal_timeout = sco_preferences.get_preference("portal_timeout")
|
2021-08-21 15:17:14 +02:00
|
|
|
req = etud_url + "?" + urllib.parse.urlencode((("nip", code_nip),))
|
2021-02-03 22:00:41 +01:00
|
|
|
doc = scu.query_portal(req, timeout=portal_timeout)
|
2020-09-26 16:19:37 +02:00
|
|
|
d = _normalize_apo_fields(xml_to_list_of_dicts(doc, req=req))
|
|
|
|
if not d:
|
|
|
|
return None
|
|
|
|
if len(d) > 1:
|
2023-11-14 14:20:36 +01:00
|
|
|
log(f"get_etud_apogee({code_nip}): {len(d)} etudiants !\n{doc}")
|
|
|
|
flash("Attention: plusieurs étudiants inscrits avec le NIP {code_nip}")
|
|
|
|
# dans ce cas, renvoie le premier étudiant
|
2020-09-26 16:19:37 +02:00
|
|
|
return d[0]
|
|
|
|
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_default_etapes():
|
2021-06-14 18:08:52 +02:00
|
|
|
"""Liste par défaut, lue du fichier de config"""
|
2021-06-19 23:21:37 +02:00
|
|
|
filename = scu.SCO_TOOLS_DIR + "/default-etapes.txt"
|
2023-11-14 14:20:36 +01:00
|
|
|
log(f"get_default_etapes: reading {filename}")
|
2020-09-26 16:19:37 +02:00
|
|
|
etapes = {}
|
2023-11-14 14:20:36 +01:00
|
|
|
with open(filename, encoding=scu.SCO_ENCODING) as f:
|
|
|
|
for line in f.readlines():
|
|
|
|
line = line.strip()
|
|
|
|
if line and line[0] != "#":
|
|
|
|
dept, code, intitule = [x.strip() for x in line.split(":")]
|
|
|
|
if dept and code:
|
|
|
|
if dept in etapes:
|
|
|
|
etapes[dept][code] = intitule
|
|
|
|
else:
|
|
|
|
etapes[dept] = {code: intitule}
|
2020-09-26 16:19:37 +02:00
|
|
|
return etapes
|
|
|
|
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def _parse_etapes_from_xml(doc):
|
2020-09-26 16:19:37 +02:00
|
|
|
"""
|
|
|
|
may raise exception if invalid xml doc
|
|
|
|
"""
|
2021-07-28 17:03:54 +02:00
|
|
|
xml_etapes_by_dept = sco_preferences.get_preference("xml_etapes_by_dept")
|
2020-09-26 16:19:37 +02:00
|
|
|
# parser XML
|
|
|
|
dom = xml.dom.minidom.parseString(doc)
|
|
|
|
infos = {}
|
2021-08-21 15:17:14 +02:00
|
|
|
if dom.childNodes[0].nodeName != "etapes":
|
2023-11-14 14:20:36 +01:00
|
|
|
raise ValueError("élément 'etapes' attendu")
|
2020-09-26 16:19:37 +02:00
|
|
|
if xml_etapes_by_dept:
|
|
|
|
# Ancien format XML avec des sections par departement:
|
|
|
|
for d in dom.childNodes[0].childNodes:
|
|
|
|
if d.nodeType == d.ELEMENT_NODE:
|
2021-08-21 15:17:14 +02:00
|
|
|
dept = d.nodeName
|
2020-09-26 16:19:37 +02:00
|
|
|
_xml_list_codes(infos, dept, d.childNodes)
|
|
|
|
else:
|
|
|
|
# Toutes les étapes:
|
|
|
|
dept = ""
|
|
|
|
_xml_list_codes(infos, "", dom.childNodes[0].childNodes)
|
|
|
|
return infos
|
|
|
|
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_etapes_apogee():
|
2020-09-26 16:19:37 +02:00
|
|
|
"""Liste des etapes apogee
|
|
|
|
{ departement : { code_etape : intitule } }
|
|
|
|
Demande la liste au portail, ou si échec utilise liste
|
|
|
|
par défaut
|
|
|
|
"""
|
2021-08-20 10:51:42 +02:00
|
|
|
etapes_url = get_etapes_url()
|
2020-10-02 21:34:59 +02:00
|
|
|
infos = {}
|
|
|
|
if etapes_url:
|
2021-07-28 17:03:54 +02:00
|
|
|
portal_timeout = sco_preferences.get_preference("portal_timeout")
|
2020-10-02 21:34:59 +02:00
|
|
|
log(
|
2023-11-14 14:20:36 +01:00
|
|
|
f"""get_etapes_apogee: requesting '{etapes_url}' with timeout={portal_timeout}"""
|
2020-10-02 21:34:59 +02:00
|
|
|
)
|
2021-02-03 22:00:41 +01:00
|
|
|
doc = scu.query_portal(etapes_url, timeout=portal_timeout)
|
2020-09-26 16:19:37 +02:00
|
|
|
try:
|
2021-08-20 10:51:42 +02:00
|
|
|
infos = _parse_etapes_from_xml(doc)
|
2020-10-02 21:34:59 +02:00
|
|
|
# cache le resultat (utile si le portail repond de façon intermitente)
|
|
|
|
if infos:
|
|
|
|
log("get_etapes_apogee: caching result")
|
2023-11-14 14:20:36 +01:00
|
|
|
with open(
|
|
|
|
SCO_CACHE_ETAPE_FILENAME, "w", encoding=scu.SCO_ENCODING
|
|
|
|
) as f:
|
2021-10-11 22:22:42 +02:00
|
|
|
f.write(doc)
|
2020-09-26 16:19:37 +02:00
|
|
|
except:
|
2023-11-14 14:20:36 +01:00
|
|
|
log(f"invalid XML response from getEtapes Web Service\n{etapes_url}")
|
|
|
|
# Avons-nous la copie d'une réponse récente ?
|
2020-10-02 21:34:59 +02:00
|
|
|
try:
|
2023-11-14 14:20:36 +01:00
|
|
|
doc = open(SCO_CACHE_ETAPE_FILENAME, encoding=scu.SCO_ENCODING).read()
|
2021-08-20 10:51:42 +02:00
|
|
|
infos = _parse_etapes_from_xml(doc)
|
2023-11-14 14:20:36 +01:00
|
|
|
log(f"using last saved version from {SCO_CACHE_ETAPE_FILENAME}")
|
2020-10-02 21:34:59 +02:00
|
|
|
except:
|
|
|
|
infos = {}
|
|
|
|
else:
|
|
|
|
# Pas de portail: utilise étapes par défaut livrées avec ScoDoc
|
|
|
|
log("get_etapes_apogee: no configured URL (using default file)")
|
2021-08-20 10:51:42 +02:00
|
|
|
infos = get_default_etapes()
|
2020-09-26 16:19:37 +02:00
|
|
|
return infos
|
|
|
|
|
|
|
|
|
|
|
|
def _xml_list_codes(target_dict, dept, nodes):
|
|
|
|
for e in nodes:
|
|
|
|
if e.nodeType == e.ELEMENT_NODE:
|
2021-08-21 15:17:14 +02:00
|
|
|
intitule = e.childNodes[0].nodeValue
|
|
|
|
code = e.attributes["code"].value
|
2021-07-09 17:47:06 +02:00
|
|
|
if dept in target_dict:
|
2020-09-26 16:19:37 +02:00
|
|
|
target_dict[dept][code] = intitule
|
|
|
|
else:
|
|
|
|
target_dict[dept] = {code: intitule}
|
|
|
|
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def get_etapes_apogee_dept():
|
2020-09-26 16:19:37 +02:00
|
|
|
"""Liste des etapes apogee pour ce departement.
|
|
|
|
Utilise la propriete 'portal_dept_name' pour identifier le departement.
|
|
|
|
|
|
|
|
Si xml_etapes_by_dept est faux (nouveau format XML depuis sept 2014),
|
|
|
|
le departement n'est pas utilisé: toutes les étapes sont présentées.
|
2020-10-14 12:36:18 +02:00
|
|
|
|
2020-09-26 16:19:37 +02:00
|
|
|
Returns [ ( code, intitule) ], ordonnée
|
|
|
|
"""
|
2021-07-28 17:03:54 +02:00
|
|
|
xml_etapes_by_dept = sco_preferences.get_preference("xml_etapes_by_dept")
|
2020-09-26 16:19:37 +02:00
|
|
|
if xml_etapes_by_dept:
|
2021-07-28 17:03:54 +02:00
|
|
|
portal_dept_name = sco_preferences.get_preference("portal_dept_name")
|
2020-09-26 16:19:37 +02:00
|
|
|
log('get_etapes_apogee_dept: portal_dept_name="%s"' % portal_dept_name)
|
|
|
|
else:
|
|
|
|
portal_dept_name = ""
|
|
|
|
log("get_etapes_apogee_dept: pas de sections par departement")
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
infos = get_etapes_apogee()
|
2021-07-09 17:47:06 +02:00
|
|
|
if portal_dept_name and portal_dept_name not in infos:
|
2020-09-26 16:19:37 +02:00
|
|
|
log(
|
|
|
|
"get_etapes_apogee_dept: pas de section '%s' dans la reponse portail"
|
|
|
|
% portal_dept_name
|
|
|
|
)
|
|
|
|
return []
|
|
|
|
if portal_dept_name:
|
2021-07-09 17:47:06 +02:00
|
|
|
etapes = list(infos[portal_dept_name].items())
|
2020-09-26 16:19:37 +02:00
|
|
|
else:
|
|
|
|
# prend toutes les etapes
|
|
|
|
etapes = []
|
|
|
|
for k in infos.keys():
|
2021-07-09 17:47:06 +02:00
|
|
|
etapes += list(infos[k].items())
|
2020-09-26 16:19:37 +02:00
|
|
|
|
|
|
|
etapes.sort() # tri sur le code etape
|
|
|
|
return etapes
|
|
|
|
|
|
|
|
|
2024-10-30 12:18:53 +01:00
|
|
|
def _portal_date_dmy2date(s: str) -> datetime.date | None:
|
|
|
|
"""s est la date inscription fournie par le portail
|
|
|
|
sous la forme dd/mm/yy
|
|
|
|
Renvoie un objet date, ou None
|
|
|
|
Raises ValueError si format invalide.
|
2020-09-26 16:19:37 +02:00
|
|
|
"""
|
|
|
|
s = s.strip()
|
|
|
|
if not s:
|
|
|
|
return None
|
2024-10-30 12:18:53 +01:00
|
|
|
d, m, y = [int(x) for x in s.split("/")] # raises ValueError if bad format
|
|
|
|
if y < 100:
|
|
|
|
y += 2000 # 21ème siècle
|
|
|
|
return datetime.date(y, m, d)
|
2020-09-26 16:19:37 +02:00
|
|
|
|
|
|
|
|
|
|
|
def _normalize_apo_fields(infolist):
|
|
|
|
"""
|
|
|
|
infolist: liste de dict renvoyés par le portail Apogee
|
|
|
|
|
2024-10-30 12:18:53 +01:00
|
|
|
Recode les champs:
|
|
|
|
- paiementinscription (-> booleen)
|
|
|
|
- datefinalisationinscription (date)
|
|
|
|
|
|
|
|
Ajoute le champ
|
|
|
|
- 'paiementinscription_str' : 'ok', 'Non' ou '?'
|
|
|
|
|
|
|
|
S'ils ne sont pas présents, ajoute les champs:
|
|
|
|
- 'etape' (None)
|
|
|
|
- 'prenom' ('')
|
|
|
|
- 'civilite_etat_civil' ('')
|
|
|
|
- 'prenom_etat_civil' ('')
|
2020-09-26 16:19:37 +02:00
|
|
|
"""
|
|
|
|
for infos in infolist:
|
2021-07-09 17:47:06 +02:00
|
|
|
if "paiementinscription" in infos:
|
2020-09-26 16:19:37 +02:00
|
|
|
infos["paiementinscription"] = (
|
2021-08-21 00:24:51 +02:00
|
|
|
infos["paiementinscription"].lower() == "true"
|
2020-09-26 16:19:37 +02:00
|
|
|
)
|
|
|
|
if infos["paiementinscription"]:
|
|
|
|
infos["paiementinscription_str"] = "ok"
|
|
|
|
else:
|
|
|
|
infos["paiementinscription_str"] = "Non"
|
|
|
|
else:
|
|
|
|
infos["paiementinscription"] = None
|
|
|
|
infos["paiementinscription_str"] = "?"
|
|
|
|
|
2021-07-09 17:47:06 +02:00
|
|
|
if "datefinalisationinscription" in infos:
|
2020-09-26 16:19:37 +02:00
|
|
|
infos["datefinalisationinscription"] = _portal_date_dmy2date(
|
|
|
|
infos["datefinalisationinscription"]
|
|
|
|
)
|
2024-10-30 12:18:53 +01:00
|
|
|
infos["datefinalisationinscription_str"] = (
|
|
|
|
infos["datefinalisationinscription"].strftime(scu.DATE_FMT)
|
|
|
|
if infos["datefinalisationinscription"]
|
|
|
|
else ""
|
|
|
|
)
|
2020-09-26 16:19:37 +02:00
|
|
|
else:
|
|
|
|
infos["datefinalisationinscription"] = None
|
|
|
|
infos["datefinalisationinscription_str"] = ""
|
|
|
|
|
2021-07-09 17:47:06 +02:00
|
|
|
if "etape" not in infos:
|
2020-09-26 16:19:37 +02:00
|
|
|
infos["etape"] = None
|
|
|
|
|
2021-07-09 17:47:06 +02:00
|
|
|
if "prenom" not in infos:
|
2020-10-21 00:15:40 +02:00
|
|
|
infos["prenom"] = ""
|
|
|
|
|
2023-05-25 18:48:21 +02:00
|
|
|
if "civilite_etat_civil" not in infos:
|
2023-10-16 22:51:31 +02:00
|
|
|
infos["civilite_etat_civil"] = ""
|
2023-05-25 18:48:21 +02:00
|
|
|
|
2023-06-01 15:59:23 +02:00
|
|
|
if "prenom_etat_civil" not in infos:
|
|
|
|
infos["prenom_etat_civil"] = ""
|
2023-05-25 18:48:21 +02:00
|
|
|
|
2020-09-26 16:19:37 +02:00
|
|
|
return infolist
|
|
|
|
|
|
|
|
|
2021-08-20 10:51:42 +02:00
|
|
|
def check_paiement_etuds(etuds):
|
2020-09-26 16:19:37 +02:00
|
|
|
"""Interroge le portail pour vérifier l'état de "paiement" et l'étape d'inscription.
|
|
|
|
|
|
|
|
Seuls les etudiants avec code NIP sont renseignés.
|
2020-10-14 12:36:18 +02:00
|
|
|
|
2020-12-02 01:00:23 +01:00
|
|
|
Renseigne l'attribut booleen 'paiementinscription' dans chaque etud.
|
2020-09-26 16:19:37 +02:00
|
|
|
|
|
|
|
En sortie: modif les champs de chaque etud
|
|
|
|
'paiementinscription' : True, False ou None
|
|
|
|
'paiementinscription_str' : 'ok', 'Non' ou '?' ou '(pas de code)'
|
|
|
|
'etape' : etape Apogee ou None
|
|
|
|
"""
|
|
|
|
# interrogation séquentielle longue...
|
|
|
|
for etud in etuds:
|
2021-07-09 17:47:06 +02:00
|
|
|
if "code_nip" not in etud:
|
2020-09-26 16:19:37 +02:00
|
|
|
etud["paiementinscription"] = None
|
|
|
|
etud["paiementinscription_str"] = "(pas de code)"
|
|
|
|
etud["datefinalisationinscription"] = None
|
|
|
|
etud["datefinalisationinscription_str"] = "NA"
|
|
|
|
etud["etape"] = None
|
|
|
|
else:
|
|
|
|
# Modifie certains champs de l'étudiant:
|
2021-08-20 10:51:42 +02:00
|
|
|
infos = get_etud_apogee(etud["code_nip"])
|
2020-09-26 16:19:37 +02:00
|
|
|
if infos:
|
|
|
|
for k in (
|
|
|
|
"paiementinscription",
|
|
|
|
"paiementinscription_str",
|
|
|
|
"datefinalisationinscription",
|
|
|
|
"datefinalisationinscription_str",
|
|
|
|
"etape",
|
|
|
|
):
|
|
|
|
etud[k] = infos[k]
|
|
|
|
else:
|
|
|
|
etud["datefinalisationinscription"] = None
|
|
|
|
etud["datefinalisationinscription_str"] = "Erreur"
|
|
|
|
etud["datefinalisationinscription"] = None
|
|
|
|
etud["paiementinscription_str"] = "(pb cnx Apogée)"
|
|
|
|
|
|
|
|
|
2022-01-07 17:58:34 +01:00
|
|
|
def get_maquette_apogee(etape="", annee_scolaire="") -> str:
|
2020-10-14 12:36:18 +02:00
|
|
|
"""Maquette CSV Apogee pour une étape et une annee scolaire"""
|
2021-08-20 10:51:42 +02:00
|
|
|
maquette_url = get_maquette_url()
|
2020-09-26 16:19:37 +02:00
|
|
|
if not maquette_url:
|
|
|
|
return None
|
2021-07-28 17:03:54 +02:00
|
|
|
portal_timeout = sco_preferences.get_preference("portal_timeout")
|
2020-09-26 16:19:37 +02:00
|
|
|
req = (
|
|
|
|
maquette_url
|
|
|
|
+ "?"
|
2021-08-21 15:17:14 +02:00
|
|
|
+ urllib.parse.urlencode((("etape", etape), ("annee", annee_scolaire)))
|
2020-09-26 16:19:37 +02:00
|
|
|
)
|
2021-02-03 22:00:41 +01:00
|
|
|
doc = scu.query_portal(req, timeout=portal_timeout)
|
2020-09-26 16:19:37 +02:00
|
|
|
return doc
|