From 4e2fab29d5faf9bee558030dc411c7b9371aa734 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sun, 5 Sep 2021 18:14:16 +0200 Subject: [PATCH 01/25] fix typo role RespPe --- tools/import_scodoc7_user_db.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/import_scodoc7_user_db.py b/tools/import_scodoc7_user_db.py index 1cd7774f..199f23e2 100644 --- a/tools/import_scodoc7_user_db.py +++ b/tools/import_scodoc7_user_db.py @@ -59,7 +59,7 @@ def import_scodoc7_user_db(scodoc7_db="dbname=SCOUSERS"): roles7 = [] for role_dept in roles7: # Migre les rôles RespPeX, EnsX, AdminX, SecrX et ignore les autres - m = re.match(r"^(-?Ens|-?Secr|-?ResPe|-?Admin)(.*)$", role_dept) + m = re.match(r"^(-?Ens|-?Secr|-?RespPe|-?Admin)(.*)$", role_dept) if not m: msg = f"User {user_name}: role inconnu '{role_dept}' (ignoré)" current_app.logger.warning(msg) @@ -75,7 +75,7 @@ def import_scodoc7_user_db(scodoc7_db="dbname=SCOUSERS"): dept = m.group(2) role = Role.query.filter_by(name=role_name).first() if not role: - msg = f"User {user_name}: ignoring role '{role_dept}'" + msg = f"Role '{role_name}' introuvable. User {user_name}: ignoring role '{role_dept}'" current_app.logger.warning(msg) messages.append(msg) else: From 0bc8138c72d0e7ca1ac3b0e33c7ecd1865214e96 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Mon, 6 Sep 2021 08:25:06 +0200 Subject: [PATCH 02/25] version bump --- sco_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sco_version.py b/sco_version.py index 5fa98d28..d2735ed1 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.0.8" +SCOVERSION = "9.0.9" SCONAME = "ScoDoc" From ee0961d247c2d8a061ca2f92e74ac0dd0a272503 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Mon, 6 Sep 2021 21:32:56 +0200 Subject: [PATCH 03/25] Debian desinstall (purge) script --- tools/debian/postrm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 tools/debian/postrm diff --git a/tools/debian/postrm b/tools/debian/postrm new file mode 100755 index 00000000..a01b1a38 --- /dev/null +++ b/tools/debian/postrm @@ -0,0 +1,19 @@ +#!/bin/bash + +# Déinstallation de scodoc +# Ne touche pas aux données (/opt/scodoc-data) +# N'enlève complètement /opt/scodoc qui si --purge + +systemctl stop scodoc9 +systemctl disable scodoc9 + +if [ "$#" == 1 ] && [ "$1" == "purge" ] +then + /bin/rm -rf /opt/scodoc + /bin/rm -f scodoc9.service + /bin/rm -f /etc/systemd/system/scodoc-updater.service + /bin/rm -f /etc/systemd/system/scodoc-updater.timer + /bin/rm -f /etc/nginx/sites-enabled/scodoc9.nginx +fi + +systemctl reload nginx From 04d5dd2ad72202e468719e10387707eaa9808c72 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Mon, 6 Sep 2021 21:35:17 +0200 Subject: [PATCH 04/25] better help messages --- tools/configure-scodoc9.sh | 9 +++++---- tools/debian/postinst | 2 +- tools/debian/preinst | 0 3 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 tools/debian/postinst mode change 100644 => 100755 tools/debian/preinst diff --git a/tools/configure-scodoc9.sh b/tools/configure-scodoc9.sh index 1c914830..b1c18ec5 100755 --- a/tools/configure-scodoc9.sh +++ b/tools/configure-scodoc9.sh @@ -108,8 +108,7 @@ change_scodoc_file_ownership # ------------ CREATION BASE DE DONNEES echo echo "Voulez-vous créer la base SQL SCODOC ?" -echo "répondre oui sauf si vous avez déjà une base existante" -echo "que vous souhaitez conserver (mais pour les migrations, répondre oui)." +echo "(répondre oui sauf si vous savez vraiment ce que vous faites)" echo -n 'Créer la base de données SCODOC ? (y/n) [y] ' read -r ans if [ "$(norm_ans "$ans")" != 'N' ] @@ -121,9 +120,10 @@ then echo echo "Création des tables et du compte admin" echo - su -c "(cd /opt/scodoc; source venv/bin/activate; flask db upgrade; flask sco-db-init; flask user-password admin)" "$SCODOC_USER" || die "Erreur: sco-db-init" + msg="Saisir le mot de passe de l\'administrateur \(admin\):" + su -c "(cd /opt/scodoc; source venv/bin/activate; flask db upgrade; flask sco-db-init; echo; echo $msg; flask user-password admin)" "$SCODOC_USER" || die "Erreur: sco-db-init" echo - echo "base initialisée et admin créé." + echo "Base initialisée et admin créé." echo fi @@ -134,6 +134,7 @@ systemctl start scodoc9 echo echo "Service configuré et démarré." +echo "Vous pouvez vous connecter en web et vous identifier comme \"admin\"." echo diff --git a/tools/debian/postinst b/tools/debian/postinst old mode 100644 new mode 100755 index 73167c38..412c298a --- a/tools/debian/postinst +++ b/tools/debian/postinst @@ -29,7 +29,7 @@ do /usr/sbin/locale-gen --keep-existing fi done -echo "debian postinst: scodoc9 is $(systemctl is-active scodoc9)" +echo "debian postinst: scodoc9 systemd service is $(systemctl is-active scodoc9)" # On a besoin d'un postgresql lancé pour la mise à jour systemctl restart postgresql diff --git a/tools/debian/preinst b/tools/debian/preinst old mode 100644 new mode 100755 From af77a2a389e3d459489ada56cbbc597cc39c9b7d Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Mon, 6 Sep 2021 21:38:40 +0200 Subject: [PATCH 05/25] removed obsolete test-interactive command --- scodoc.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/scodoc.py b/scodoc.py index fcefe749..3a085227 100755 --- a/scodoc.py +++ b/scodoc.py @@ -188,24 +188,6 @@ def create_dept(dept): # create-dept return 0 -@app.cli.command() -@click.argument("filename") -@with_appcontext -def test_interactive(filename=None): - "Run interactive test" - import flask_login - from app import decorators - - click.echo("Executing {}".format(filename)) - with app.test_request_context(""): - u = User.query.first() - flask_login.login_user(u) - REQUEST = decorators.ZRequest() - exec(open(filename).read()) - - click.echo("Done.") - - @app.cli.command() @with_appcontext def import_scodoc7_users(): # import-scodoc7-users From 998f28d4a4771f26749255d8766a2cded2058277 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Tue, 7 Sep 2021 22:03:33 +0200 Subject: [PATCH 06/25] =?UTF-8?q?Modifie=20l'impl=C3=A9mentation=20des=20p?= =?UTF-8?q?r=C3=A9f=C3=A9rences=20pour=20ScoDoc=209?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_preferences.py | 444 +++++++++++++++++--------------- tests/unit/sco_fake_gen.py | 10 +- tests/unit/test_departements.py | 3 + 3 files changed, 243 insertions(+), 214 deletions(-) diff --git a/app/scodoc/sco_preferences.py b/app/scodoc/sco_preferences.py index b8c4eafa..f4615313 100644 --- a/app/scodoc/sco_preferences.py +++ b/app/scodoc/sco_preferences.py @@ -147,6 +147,52 @@ def get_preference(name, formsemestre_id=None): return get_base_preferences().get(formsemestre_id, name) +def _convert_pref_type(p, pref_spec): + """p est une ligne de la bd + {'id': , 'dept_id': , 'name': '', 'value': '', 'formsemestre_id': } + converti la valeur chane en le type désiré spécifié par pref_spec + """ + if "type" in pref_spec: + typ = pref_spec["type"] + if typ == "float": + # special case for float values (where NULL means 0) + if p["value"]: + p["value"] = float(p["value"]) + else: + p["value"] = 0.0 + else: + func = eval(typ) + p["value"] = func(p["value"]) + if pref_spec.get("input_type", None) == "boolcheckbox": + # boolcheckbox: la valeur stockée en base est une chaine "0" ou "1" + # que l'on ressort en True|False + if p["value"]: + try: + p["value"] = bool(int(p["value"])) + except ValueError: + log( + f"""Warning: invalid value for boolean pref in db: '{p["value"]}'""" + ) + p["value"] = False + else: + p["value"] = False # NULL (backward compat) + + +def _get_pref_default_value_from_config(name, pref_spec): + """get default value store in application level config. + If not found, use defalut value hardcoded in pref_spec. + """ + # XXX va changer avec la nouvelle base + # search in scu.CONFIG + if hasattr(scu.CONFIG, name): + value = getattr(scu.CONFIG, name) + log("sco_preferences: found default value in config for %s=%s" % (name, value)) + else: + # uses hardcoded default + value = pref_spec["initvalue"] + return value + + PREF_CATEGORIES = ( # sur page "Paramètres" ("general", {}), @@ -469,21 +515,27 @@ class BasePreferences(object): "abs_notification_mail_tmpl", { "initvalue": """ - --- Ceci est un message de notification automatique issu de ScoDoc --- + --- Ceci est un message de notification automatique issu de ScoDoc --- + L'étudiant %(nomprenom)s L'étudiant %(nomprenom)s + L'étudiant %(nomprenom)s + inscrit en %(inscription)s) inscrit en %(inscription)s) + inscrit en %(inscription)s) + a cumulé %(nbabsjust)s absences justifiées a cumulé %(nbabsjust)s absences justifiées - et %(nbabsnonjust)s absences NON justifiées. + a cumulé %(nbabsjust)s absences justifiées + et %(nbabsnonjust)s absences NON justifiées. - Le compte a pu changer depuis cet envoi, voir la fiche sur %(url_ficheetud)s. + Le compte a pu changer depuis cet envoi, voir la fiche sur %(url_ficheetud)s. - Votre dévoué serveur ScoDoc. + Votre dévoué serveur ScoDoc. - PS: Au dela de %(abs_notify_abs_threshold)s, un email automatique est adressé toutes les %(abs_notify_abs_increment)s absences. Ces valeurs sont modifiables dans les préférences de ScoDoc. - """, + PS: Au dela de %(abs_notify_abs_threshold)s, un email automatique est adressé toutes les %(abs_notify_abs_increment)s absences. Ces valeurs sont modifiables dans les préférences de ScoDoc. + """, "title": """Message notification e-mail""", "explanation": """Balises remplacées, voir la documentation""", "input_type": "textarea", @@ -826,14 +878,18 @@ class BasePreferences(object): "PV_INTRO", { "initvalue": """- - Vu l'arrêté du 3 août 2005 relatif au diplôme universitaire de technologie et notamment son article 4 et 6; - + Vu l'arrêté du 3 août 2005 relatif au diplôme universitaire de technologie et notamment son article 4 et 6; + + - - - vu l'arrêté n° %(Decnum)s du Président de l'%(UnivName)s; - + - + vu l'arrêté n° %(Decnum)s du Président de l'%(UnivName)s; + + - - - vu la délibération de la commission %(Type)s en date du %(Date)s présidée par le Chef du département; - """, + - + vu la délibération de la commission %(Type)s en date du %(Date)s présidée par le Chef du département; + """, "title": """Paragraphe d'introduction sur le PV""", "explanation": """Balises remplacées: %(Univname)s = nom de l'université, %(DecNum)s = numéro de l'arrêté, %(Date)s = date de la commission, %(Type)s = type de commission (passage ou délivrance), %(VDICode)s = code diplôme""", "input_type": "textarea", @@ -940,8 +996,8 @@ class BasePreferences(object): "PV_LETTER_PASSAGE_SIGNATURE", { "initvalue": """Pour le Directeur de l'IUT
- et par délégation
- Le Chef du département""", + et par délégation
+ Le Chef du département""", "title": """Signature des lettres individuelles de passage d'un semestre à l'autre""", "explanation": """%(DirectorName)s et %(DirectorTitle)s remplacés""", "input_type": "textarea", @@ -965,43 +1021,45 @@ class BasePreferences(object): "PV_LETTER_TEMPLATE", { "initvalue": """  - %(INSTITUTION_CITY)s, le %(date_jury)s - + %(INSTITUTION_CITY)s, le %(date_jury)s + - - à %(nomprenom)s - - %(domicile)s - %(codepostaldomicile)s %(villedomicile)s + + à %(nomprenom)s + + %(domicile)s + %(codepostaldomicile)s %(villedomicile)s - - Jury de %(type_jury)s
%(titre_formation)s - + + Jury de %(type_jury)s
%(titre_formation)s + - - Le jury de %(type_jury_abbrv)s du département %(DeptName)s + + Le jury de %(type_jury_abbrv)s du département %(DeptName)s + s'est réuni le %(date_jury)s. s'est réuni le %(date_jury)s. - - Les décisions vous concernant sont : - + s'est réuni le %(date_jury)s. + + Les décisions vous concernant sont : + - %(prev_decision_sem_txt)s - - Décision %(decision_orig)s : %(decision_sem_descr)s - + %(prev_decision_sem_txt)s + + Décision %(decision_orig)s : %(decision_sem_descr)s + - - %(decision_ue_txt)s - + + %(decision_ue_txt)s + - - %(observation_txt)s - + + %(observation_txt)s + - %(autorisations_txt)s + %(autorisations_txt)s - %(diplome_txt)s - """, + %(diplome_txt)s + """, "title": """Lettre individuelle""", "explanation": """Balises remplacées et balisage XML, voir la documentation""", "input_type": "textarea", @@ -1362,24 +1420,24 @@ class BasePreferences(object): "bul_pdf_title", { "initvalue": """ - %(UnivName)s - - - %(InstituteName)s - - - RELEVÉ DE NOTES - + %(UnivName)s + + + %(InstituteName)s + + + RELEVÉ DE NOTES + - - %(nomprenom)s %(demission)s - + + %(nomprenom)s %(demission)s + - - Formation: %(titre_num)s - - Année scolaire: %(anneescolaire)s - """, + + Formation: %(titre_num)s + + Année scolaire: %(anneescolaire)s + """, "title": "Bulletins PDF: paragraphe de titre", "explanation": "(balises interprétées, voir documentation)", "input_type": "textarea", @@ -1404,10 +1462,10 @@ class BasePreferences(object): "bul_pdf_sig_left", { "initvalue": """La direction des études -
- %(responsable)s - - """, +
+ %(responsable)s + + """, "title": "Bulletins PDF: signature gauche", "explanation": "(balises interprétées, voir documentation)", "input_type": "textarea", @@ -1420,10 +1478,10 @@ class BasePreferences(object): "bul_pdf_sig_right", { "initvalue": """Le chef de département -
- %(ChiefDeptName)s - - """, +
+ %(ChiefDeptName)s + + """, "title": "Bulletins PDF: signature droite", "explanation": "(balises interprétées, voir documentation)", "input_type": "textarea", @@ -1799,88 +1857,57 @@ class BasePreferences(object): def load(self): """Load all preferences from db""" log(f"loading preferences for dept_id={self.dept_id}") - try: - scu.GSL.acquire() - cnx = ndb.GetDBConnexion() - preflist = self._editor.list(cnx, {"dept_id": self.dept_id}) - self.prefs = {None: {}} # { formsemestre_id (or None) : { name : value } } - self.default = {} # { name : default_value } - for p in preflist: - if not p["formsemestre_id"] in self.prefs: - self.prefs[p["formsemestre_id"]] = {} - # Ignore les noms de préférences non utilisés dans le code: - if p["name"] not in self.prefs_dict: - continue - # Convert types: - if ( - p["name"] in self.prefs_dict - and "type" in self.prefs_dict[p["name"]] - ): - typ = self.prefs_dict[p["name"]]["type"] - if typ == "float": - # special case for float values (where NULL means 0) - if p["value"]: - p["value"] = float(p["value"]) - else: - p["value"] = 0.0 - else: - func = eval(typ) - p["value"] = func(p["value"]) - if ( - p["name"] in self.prefs_dict - and self.prefs_dict[p["name"]].get("input_type", None) - == "boolcheckbox" - ): - # boolcheckbox: la valeur stockée en base est une chaine "0" ou "1" - # que l'on ressort en True|False - if p["value"]: - try: - p["value"] = bool(int(p["value"])) - except ValueError: - log( - f"""Warning: invalid value for boolean pref in db: '{p["value"]}'""" - ) - p["value"] = False - else: - p["value"] = False # NULL (backward compat) - self.prefs[p["formsemestre_id"]][p["name"]] = p["value"] - # add defaults for missing prefs - for pref in self.prefs_definition: - name = pref[0] - # search preferences in configuration file - if name and name[0] != "_" and name not in self.prefs[None]: - # search in scu.CONFIG - if hasattr(scu.CONFIG, name): - value = getattr(scu.CONFIG, name) - log( - "sco_preferences: found default value in config for %s=%s" - % (name, value) - ) - else: - # uses hardcoded default - value = pref[1]["initvalue"] + cnx = ndb.GetDBConnexion() + preflist = self._editor.list(cnx, {"dept_id": self.dept_id}) + self.prefs = {None: {}} # { formsemestre_id (or None) : { name : value } } + self.default = {} # { name : default_value } + for p in preflist: + if not p["formsemestre_id"] in self.prefs: + self.prefs[p["formsemestre_id"]] = {} + # Ignore les noms de préférences non utilisés dans le code: + if p["name"] not in self.prefs_dict: + continue - self.default[name] = value - self.prefs[None][name] = value - log("creating missing preference for %s=%s" % (name, value)) - # add to db table - self._editor.create( - cnx, {"dept_id": self.dept_id, "name": name, "value": value} - ) - finally: - scu.GSL.release() + # Convert types: + if p["name"] in self.prefs_dict: + _convert_pref_type(p, self.prefs_dict[p["name"]]) + + self.prefs[p["formsemestre_id"]][p["name"]] = p["value"] + + # add defaults for missing prefs + for pref in self.prefs_definition: + name = pref[0] + # search preferences in configuration file + if name and name[0] != "_" and name not in self.prefs[None]: + value = _get_pref_default_value_from_config(name, pref[1]) + self.default[name] = value + self.prefs[None][name] = value + log("creating missing preference for %s=%s" % (name, value)) + # add to db table + self._editor.create( + cnx, {"dept_id": self.dept_id, "name": name, "value": value} + ) def get(self, formsemestre_id, name): """Returns preference value. - If no value defined for this semestre, returns global value. + If global_lookup, when no value defined for this semestre, returns global value. """ - if formsemestre_id in self.prefs and name in self.prefs[formsemestre_id]: - return self.prefs[formsemestre_id][name] - elif name in self.prefs[None]: - return self.prefs[None][name] - else: - return self.default[name] + params = { + "dept_id": self.dept_id, + "name": name, + "formsemestre_id": formsemestre_id, + } + cnx = ndb.GetDBConnexion() + plist = self._editor.list(cnx, params) + if not plist: + del params["formsemestre_id"] + plist = self._editor.list(cnx, params) + if not plist: + return self.default[name] + p = plist[0] + _convert_pref_type(p, self.prefs_dict[name]) + return p["value"] def __contains__(self, item): return item in self.prefs[None] @@ -1890,74 +1917,75 @@ class BasePreferences(object): def is_global(self, formsemestre_id, name): "True if name if not defined for semestre" - if ( - not (formsemestre_id in self.prefs) - or not name in self.prefs[formsemestre_id] - ): - return True - else: - return False + params = { + "dept_id": self.dept_id, + "name": name, + "formsemestre_id": formsemestre_id, + } + cnx = ndb.GetDBConnexion() + plist = self._editor.list(cnx, params) + return len(plist) == 0 def save(self, formsemestre_id=None, name=None): """Write one or all (if name is None) values to db""" - try: - scu.GSL.acquire() - modif = False - cnx = ndb.GetDBConnexion() - if name is None: - names = list(self.prefs[formsemestre_id].keys()) - else: - names = [name] - for name in names: - value = self.get(formsemestre_id, name) - if self.prefs_dict[name].get("input_type", None) == "boolcheckbox": - # repasse les booleens en chaines "0":"1" - value = "1" if value else "0" - # existe deja ? - pdb = self._editor.list( + modif = False + cnx = ndb.GetDBConnexion() + if name is None: + names = list(self.prefs[formsemestre_id].keys()) + else: + names = [name] + for name in names: + value = self.prefs[formsemestre_id][name] + if self.prefs_dict[name].get("input_type", None) == "boolcheckbox": + # repasse les booleens en chaines "0":"1" + value = "1" if value else "0" + # existe deja ? + pdb = self._editor.list( + cnx, + args={ + "dept_id": self.dept_id, + "formsemestre_id": formsemestre_id, + "name": name, + }, + ) + if not pdb: + # crée préférence + log("create pref sem=%s %s=%s" % (formsemestre_id, name, value)) + self._editor.create( cnx, - args={ + { "dept_id": self.dept_id, - "formsemestre_id": formsemestre_id, "name": name, + "value": value, + "formsemestre_id": formsemestre_id, }, ) - if not pdb: - # crée préférence - log("create pref sem=%s %s=%s" % (formsemestre_id, name, value)) - self._editor.create( + modif = True + log("create pref sem=%s %s=%s" % (formsemestre_id, name, value)) + else: + # edit existing value + + existing_value = pdb[0]["value"] # old stored value + if ( + (existing_value != value) + and (existing_value != str(value)) + and (existing_value or str(value)) + ): + self._editor.edit( cnx, { - "dept_id": self.dept_id, + "pref_id": pdb[0]["pref_id"], + "formsemestre_id": formsemestre_id, "name": name, "value": value, - "formsemestre_id": formsemestre_id, }, ) modif = True - log("create pref sem=%s %s=%s" % (formsemestre_id, name, value)) - else: - # edit existing value - if pdb[0]["value"] != str(value) and ( - pdb[0]["value"] or str(value) - ): - self._editor.edit( - cnx, - { - "pref_id": pdb[0]["pref_id"], - "formsemestre_id": formsemestre_id, - "name": name, - "value": value, - }, - ) - modif = True - log("save pref sem=%s %s=%s" % (formsemestre_id, name, value)) + log("save pref sem=%s %s=%s" % (formsemestre_id, name, value)) - # les preferences peuvent affecter les PDF cachés et les notes calculées: - if modif: - sco_cache.invalidate_formsemestre() - finally: - scu.GSL.release() + # les preferences peuvent affecter les PDF cachés et les notes calculées: + if modif: + sco_cache.invalidate_formsemestre() def set(self, formsemestre_id, name, value): if not name or name[0] == "_" or name not in self.prefs_name: @@ -1972,26 +2000,24 @@ class BasePreferences(object): def delete(self, formsemestre_id, name): if not formsemestre_id: raise ScoException() - try: - scu.GSL.acquire() - if formsemestre_id in self.prefs and name in self.prefs[formsemestre_id]: - del self.prefs[formsemestre_id][name] - cnx = ndb.GetDBConnexion() - pdb = self._editor.list( - cnx, args={"formsemestre_id": formsemestre_id, "name": name} - ) - if pdb: - log("deleting pref sem=%s %s" % (formsemestre_id, name)) - assert pdb[0]["dept_id"] == self.dept_id - self._editor.delete(cnx, pdb[0]["pref_id"]) - sco_cache.invalidate_formsemestre() # > modif preferences - finally: - scu.GSL.release() + + if formsemestre_id in self.prefs and name in self.prefs[formsemestre_id]: + del self.prefs[formsemestre_id][name] + cnx = ndb.GetDBConnexion() + pdb = self._editor.list( + cnx, args={"formsemestre_id": formsemestre_id, "name": name} + ) + if pdb: + log("deleting pref sem=%s %s" % (formsemestre_id, name)) + assert pdb[0]["dept_id"] == self.dept_id + self._editor.delete(cnx, pdb[0]["pref_id"]) + sco_cache.invalidate_formsemestre() # > modif preferences def edit(self, REQUEST): """HTML dialog: edit global preferences""" from app.scodoc import html_sco_header + self.load() H = [ html_sco_header.sco_header(page_title="Préférences"), "

Préférences globales pour %s

" % scu.ScoURL(), diff --git a/tests/unit/sco_fake_gen.py b/tests/unit/sco_fake_gen.py index cd5bddde..c2df6738 100644 --- a/tests/unit/sco_fake_gen.py +++ b/tests/unit/sco_fake_gen.py @@ -40,11 +40,11 @@ from app.scodoc.sco_exceptions import ScoValueError random.seed(12345) # tests reproductibles -DEMO_DIR = Config.SCODOC_DIR + "/tools/demo/" -NOMS = [x.strip() for x in open(DEMO_DIR + "/noms.txt").readlines()] -PRENOMS_H = [x.strip() for x in open(DEMO_DIR + "/prenoms-h.txt").readlines()] -PRENOMS_F = [x.strip() for x in open(DEMO_DIR + "/prenoms-f.txt").readlines()] -PRENOMS_X = [x.strip() for x in open(DEMO_DIR + "/prenoms-x.txt").readlines()] +NOMS_DIR = Config.SCODOC_DIR + "/tools/fakeportal/nomsprenoms" +NOMS = [x.strip() for x in open(NOMS_DIR + "/noms.txt").readlines()] +PRENOMS_H = [x.strip() for x in open(NOMS_DIR + "/prenoms-h.txt").readlines()] +PRENOMS_F = [x.strip() for x in open(NOMS_DIR + "/prenoms-f.txt").readlines()] +PRENOMS_X = [x.strip() for x in open(NOMS_DIR + "/prenoms-x.txt").readlines()] def id_generator(size=6, chars=string.ascii_uppercase + string.digits): diff --git a/tests/unit/test_departements.py b/tests/unit/test_departements.py index 83a6650b..e8ca47f6 100644 --- a/tests/unit/test_departements.py +++ b/tests/unit/test_departements.py @@ -73,6 +73,8 @@ def test_preferences(test_client): assert len(prefs2) == len(prefs) prefs2.set(None, "abs_notification_mail_tmpl", "toto") assert prefs2.get(None, "abs_notification_mail_tmpl") == "toto" + # Vérifie que les prefs sont bien sur un seul département: + app.set_sco_dept(current_dept.acronym) assert prefs.get(None, "abs_notification_mail_tmpl") != "toto" orm_val = ( ScoPreference.query.filter_by(dept_id=d.id, name="abs_notification_mail_tmpl") @@ -82,6 +84,7 @@ def test_preferences(test_client): assert orm_val == "toto" # --- Preferences d'un semestre # rejoue ce test pour avoir un semestre créé + app.set_sco_dept("D2") test_sco_basic.run_sco_basic() sem = sco_formsemestre.do_formsemestre_list()[0] formsemestre_id = sem["formsemestre_id"] From 97fe4cc73f5d912db92fea3bb7eee33ea9718f03 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Tue, 7 Sep 2021 23:54:33 +0200 Subject: [PATCH 07/25] =?UTF-8?q?Ne=20quote=20plus=20par=20d=C3=A9faut=20l?= =?UTF-8?q?e=20HTML=20des=20chaines=20entrants=20en=20base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/notesdb.py | 8 +++++--- app/scodoc/sco_moduleimpl.py | 1 - app/scodoc/sco_pdf.py | 7 ++++++- tools/fakeportal/fakeportal.py | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/scodoc/notesdb.py b/app/scodoc/notesdb.py index 135675cc..99c4ca9c 100644 --- a/app/scodoc/notesdb.py +++ b/app/scodoc/notesdb.py @@ -287,7 +287,7 @@ class EditableTable(object): input_formators={}, aux_tables=[], convert_null_outputs_to_empty=True, - html_quote=True, + html_quote=False, # changed in 9.0.10 fields_creators={}, # { field : [ sql_command_to_create_it ] } filter_nulls=True, # dont allow to set fields to null filter_dept=False, # ajoute selection sur g.scodoc_dept_id @@ -321,8 +321,10 @@ class EditableTable(object): del vals["id"] if self.filter_dept: vals["dept_id"] = g.scodoc_dept_id - if self.html_quote: - quote_dict(vals) # quote all HTML markup + if ( + self.html_quote + ): # quote all HTML markup (une bien mauvaise idée venue des ages obscurs) + quote_dict(vals) # format value for title in vals: if title in self.input_formators: diff --git a/app/scodoc/sco_moduleimpl.py b/app/scodoc/sco_moduleimpl.py index fbb4b350..a5db24a2 100644 --- a/app/scodoc/sco_moduleimpl.py +++ b/app/scodoc/sco_moduleimpl.py @@ -221,7 +221,6 @@ _moduleimpl_inscriptionEditor = ndb.EditableTable( def do_moduleimpl_inscription_create(args, formsemestre_id=None): "create a moduleimpl_inscription" cnx = ndb.GetDBConnexion() - log("do_moduleimpl_inscription_create: " + str(args)) r = _moduleimpl_inscriptionEditor.create(cnx, args) sco_cache.invalidate_formsemestre( formsemestre_id=formsemestre_id diff --git a/app/scodoc/sco_pdf.py b/app/scodoc/sco_pdf.py index 1f496463..2a97e716 100755 --- a/app/scodoc/sco_pdf.py +++ b/app/scodoc/sco_pdf.py @@ -33,6 +33,7 @@ En ScoDoc 9, ce n'est pas nécessaire car on est multiptocessus / monothread. """ +import html import io import os import queue @@ -85,7 +86,11 @@ def SU(s): # car les "combining accents" ne sont pas traités par ReportLab mais peuvent # nous être envoyés par certains navigateurs ou imports # (on en a dans les bases de données) - return unicodedata.normalize("NFC", s) + s = unicodedata.normalize("NFC", s) + # Remplace les entité XML/HTML + # reportlab ne les supporte pas non plus. + s = html.unescape(s) + return s def _splitPara(txt): diff --git a/tools/fakeportal/fakeportal.py b/tools/fakeportal/fakeportal.py index 9fdbcd01..a732d3d7 100755 --- a/tools/fakeportal/fakeportal.py +++ b/tools/fakeportal/fakeportal.py @@ -100,7 +100,7 @@ class MyHttpRequestHandler(http.server.SimpleHTTPRequestHandler): if "etapes" in self.path.lower(): self.path = str(Path(script_dir / "etapes.xml").relative_to(Path.cwd())) - elif "scodocEtudiant" in self.path: + elif "scodocEtudiant" in self.path: # API v2 # 2 forms: nip=xxx or etape=eee&annee=aaa if "nip" in query_components: nip = query_components["nip"][0] From 2f78f7f6fc81e260ed75607b981a5e2c8bfc0847 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 8 Sep 2021 00:10:36 +0200 Subject: [PATCH 08/25] Message erreur si import Excel d'une date invalide --- app/scodoc/sco_excel.py | 47 +++------------------------------- app/scodoc/sco_import_etuds.py | 8 ++++-- 2 files changed, 9 insertions(+), 46 deletions(-) diff --git a/app/scodoc/sco_excel.py b/app/scodoc/sco_excel.py index 32cf27c0..c9551b69 100644 --- a/app/scodoc/sco_excel.py +++ b/app/scodoc/sco_excel.py @@ -79,52 +79,11 @@ def send_excel_file(request, data, filename, mime=scu.XLSX_MIMETYPE): # font, border, number_format, fill, .. (cf https://openpyxl.readthedocs.io/en/stable/styles.html#working-with-styles) -# (stolen from xlrd) -# Convert an Excel number (presumed to represent a date, a datetime or a time) into -# a Python datetime.datetime -# @param xldate The Excel number -# @param datemode 0: 1900-based, 1: 1904-based. -# @return a datetime.datetime object, to the nearest_second. -#
Special case: if 0.0 <= xldate < 1.0, it is assumed to represent a time; -# a datetime.time object will be returned. -#
Note: 1904-01-01 is not regarded as a valid date in the datemode 1 system; its "serial number" -# is zero. -# -# _XLDAYS_TOO_LARGE = (2958466, 2958466 - 1462) # This is equivalent to 10000-01-01 -# - - def xldate_as_datetime(xldate, datemode=0): + """Conversion d'une date Excel en date + Peut lever une ValueError + """ return openpyxl.utils.datetime.from_ISO8601(xldate) - # if datemode not in (0, 1): - # raise ValueError("invalid mode %s" % datemode) - # if xldate == 0.00: - # return datetime.time(0, 0, 0) - # if xldate < 0.00: - # raise ValueError("invalid date code %s" % xldate) - # xldays = int(xldate) - # frac = xldate - xldays - # seconds = int(round(frac * 86400.0)) - # assert 0 <= seconds <= 86400 - # if seconds == 86400: - # seconds = 0 - # xldays += 1 - # if xldays >= _XLDAYS_TOO_LARGE[datemode]: - # raise ValueError("date too large %s" % xldate) - # - # if xldays == 0: - # # second = seconds % 60; minutes = seconds // 60 - # minutes, second = divmod(seconds, 60) - # # minute = minutes % 60; hour = minutes // 60 - # hour, minute = divmod(minutes, 60) - # return datetime.time(hour, minute, second) - # - # if xldays < 61 and datemode == 0: - # raise ValueError("ambiguous date %s" % xldate) - # - # return datetime.datetime.fromordinal( - # xldays + 693594 + 1462 * datemode - # ) + datetime.timedelta(seconds=seconds) class ScoExcelBook: diff --git a/app/scodoc/sco_import_etuds.py b/app/scodoc/sco_import_etuds.py index 5e5016bc..b9b8b5de 100644 --- a/app/scodoc/sco_import_etuds.py +++ b/app/scodoc/sco_import_etuds.py @@ -378,8 +378,12 @@ def scolars_import_excel_file( # Excel date conversion: if titleslist[i].lower() == "date_naissance": if val: - # if re.match(r"^[0-9]*\.?[0-9]*$", str(val)): - val = sco_excel.xldate_as_datetime(val) + try: + val = sco_excel.xldate_as_datetime(val) + except ValueError: + raise ScoValueError( + f"date invalide ({val}) sur ligne {linenum}, colonne {titleslist[i]}" + ) # INE if ( titleslist[i].lower() == "code_ine" From 19f6053dda39b08ea1113fe7c05e1360ca8418fe Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 8 Sep 2021 00:11:11 +0200 Subject: [PATCH 09/25] =?UTF-8?q?Fix:=20tri=20de=20liste=20h=C3=A9t=C3=A9r?= =?UTF-8?q?og=C3=A8ne?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/pe_tagtable.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/scodoc/pe_tagtable.py b/app/scodoc/pe_tagtable.py index dbc6bf03..e32a1173 100644 --- a/app/scodoc/pe_tagtable.py +++ b/app/scodoc/pe_tagtable.py @@ -163,7 +163,7 @@ class TableTag(object): # ***************************************************************************************************************** # ----------------------------------------------------------------------------------------------------------- - def add_moyennesTag(self, tag, listMoyEtCoeff): + def add_moyennesTag(self, tag, listMoyEtCoeff) -> bool: """ Mémorise les moyennes, les coeffs de pondération et les etudid dans resultats avec calcul du rang @@ -181,7 +181,9 @@ class TableTag(object): lesMoyennesTriees = sorted( listMoyEtCoeff, reverse=True, - key=lambda col: col[0] or 0, # remplace les None par des zéros + key=lambda col: col[0] + if isinstance(col[0], float) + else 0, # remplace les None et autres chaines par des zéros ) # triées self.rangs[tag] = notes_table.comp_ranks(lesMoyennesTriees) # les rangs From 5ab0dec6af0a509d01b670f39ea1dc879b1c7894 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 8 Sep 2021 00:13:41 +0200 Subject: [PATCH 10/25] =?UTF-8?q?Timeout=20gunicorn=20pass=C3=A9=20=C3=A0?= =?UTF-8?q?=20600s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/etc/scodoc9.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/etc/scodoc9.service b/tools/etc/scodoc9.service index 6d0f223e..8028442c 100644 --- a/tools/etc/scodoc9.service +++ b/tools/etc/scodoc9.service @@ -20,7 +20,7 @@ User=scodoc Group=scodoc WorkingDirectory=/opt/scodoc #Environment=FLASK_ENV=production -ExecStart=/opt/scodoc/venv/bin/gunicorn -b localhost:8000 -w 4 scodoc:app +ExecStart=/opt/scodoc/venv/bin/gunicorn -b localhost:8000 -w 4 --timeout 600 scodoc:app Restart=always [Install] From 7f92a21b53c4daf17e4a19570714a3504feae0a4 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 8 Sep 2021 00:34:45 +0200 Subject: [PATCH 11/25] =?UTF-8?q?Fixes:=20trombino=5Fcopy=5Fphotos,=20impo?= =?UTF-8?q?rt=20fichiers=20associ=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_archives.py | 4 ++-- app/scodoc/sco_groups_view.py | 10 ++++------ app/scodoc/sco_import_etuds.py | 3 +-- app/scodoc/sco_pvjury.py | 4 ++-- app/scodoc/sco_saisie_notes.py | 3 --- app/scodoc/sco_trombino.py | 9 ++++----- app/scodoc/sco_trombino_tours.py | 4 ++-- app/views/absences.py | 12 +++++------- app/views/scolar.py | 5 ++++- 9 files changed, 24 insertions(+), 30 deletions(-) diff --git a/app/scodoc/sco_archives.py b/app/scodoc/sco_archives.py index 108bb055..9266724f 100644 --- a/app/scodoc/sco_archives.py +++ b/app/scodoc/sco_archives.py @@ -313,7 +313,7 @@ def do_formsemestre_archive( # tous les inscrits du semestre group_ids = [sco_groups.get_default_group(formsemestre_id)] groups_infos = sco_groups_view.DisplayedGroupsInfos( - group_ids, formsemestre_id=formsemestre_id, REQUEST=REQUEST + group_ids, formsemestre_id=formsemestre_id ) groups_filename = "-" + groups_infos.groups_filename etudids = [m["etudid"] for m in groups_infos.members] @@ -403,7 +403,7 @@ def formsemestre_archive(REQUEST, formsemestre_id, group_ids=[]): # tous les inscrits du semestre group_ids = [sco_groups.get_default_group(formsemestre_id)] groups_infos = sco_groups_view.DisplayedGroupsInfos( - group_ids, formsemestre_id=formsemestre_id, REQUEST=REQUEST + group_ids, formsemestre_id=formsemestre_id ) H = [ diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py index 9852899c..7ca1788f 100644 --- a/app/scodoc/sco_groups_view.py +++ b/app/scodoc/sco_groups_view.py @@ -34,12 +34,12 @@ import collections import datetime import operator -import six.moves.urllib.request, six.moves.urllib.parse, six.moves.urllib.error +import urllib from urllib.parse import parse_qs import time -from flask import url_for, g +from flask import url_for, g, request import app.scodoc.sco_utils as scu from app.scodoc import html_sco_header @@ -86,7 +86,6 @@ def groups_view( group_ids, formsemestre_id=formsemestre_id, etat=etat, - REQUEST=REQUEST, select_all_when_unspecified=True, ) # Formats spéciaux: download direct @@ -301,7 +300,6 @@ class DisplayedGroupsInfos(object): etat=None, select_all_when_unspecified=False, moduleimpl_id=None, # used to find formsemestre when unspecified - REQUEST=None, ): if isinstance(group_ids, int): if group_ids: @@ -334,7 +332,7 @@ class DisplayedGroupsInfos(object): for group_id in group_ids: gq.append("group_ids=" + str(group_id)) self.groups_query_args = "&".join(gq) - self.base_url = REQUEST.URL0 + "?" + self.groups_query_args + self.base_url = request.base_url + "?" + self.groups_query_args self.group_ids = group_ids self.groups = [] groups_titles = [] @@ -918,7 +916,7 @@ def form_choix_saisie_semaine(groups_infos, REQUEST=None): del query_args["head_message"] destination = "%s?%s" % ( REQUEST.URL, - six.moves.urllib.parse.urlencode(query_args, True), + urllib.parse.urlencode(query_args, True), ) destination = destination.replace( "%", "%%" diff --git a/app/scodoc/sco_import_etuds.py b/app/scodoc/sco_import_etuds.py index b9b8b5de..5b4d0cad 100644 --- a/app/scodoc/sco_import_etuds.py +++ b/app/scodoc/sco_import_etuds.py @@ -157,7 +157,6 @@ def sco_import_generate_excel_sample( exclude_cols=[], extra_cols=[], group_ids=[], - REQUEST=None, ): """Generates an excel document based on format fmt (format is the result of sco_import_format()) @@ -188,7 +187,7 @@ def sco_import_generate_excel_sample( titles += extra_cols titlesStyles += [style] * len(extra_cols) if group_ids: - groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids, REQUEST=REQUEST) + groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids) members = groups_infos.members log( "sco_import_generate_excel_sample: group_ids=%s %d members" diff --git a/app/scodoc/sco_pvjury.py b/app/scodoc/sco_pvjury.py index 3fa5196a..f06180f4 100644 --- a/app/scodoc/sco_pvjury.py +++ b/app/scodoc/sco_pvjury.py @@ -622,7 +622,7 @@ def formsemestre_pvjury_pdf(formsemestre_id, group_ids=[], etudid=None, REQUEST= group_ids = [sco_groups.get_default_group(formsemestre_id)] groups_infos = sco_groups_view.DisplayedGroupsInfos( - group_ids, formsemestre_id=formsemestre_id, REQUEST=REQUEST + group_ids, formsemestre_id=formsemestre_id ) etudids = [m["etudid"] for m in groups_infos.members] @@ -800,7 +800,7 @@ def formsemestre_lettres_individuelles(formsemestre_id, group_ids=[], REQUEST=No # tous les inscrits du semestre group_ids = [sco_groups.get_default_group(formsemestre_id)] groups_infos = sco_groups_view.DisplayedGroupsInfos( - group_ids, formsemestre_id=formsemestre_id, REQUEST=REQUEST + group_ids, formsemestre_id=formsemestre_id ) etudids = [m["etudid"] for m in groups_infos.members] diff --git a/app/scodoc/sco_saisie_notes.py b/app/scodoc/sco_saisie_notes.py index da452b3a..faba5e2c 100644 --- a/app/scodoc/sco_saisie_notes.py +++ b/app/scodoc/sco_saisie_notes.py @@ -620,7 +620,6 @@ def saisie_notes_tableur(evaluation_id, group_ids=[], REQUEST=None): formsemestre_id=formsemestre_id, select_all_when_unspecified=True, etat=None, - REQUEST=REQUEST, ) H = [ @@ -793,7 +792,6 @@ def feuille_saisie_notes(evaluation_id, group_ids=[], REQUEST=None): formsemestre_id=formsemestre_id, select_all_when_unspecified=True, etat=None, - REQUEST=REQUEST, ) groups = sco_groups.listgroups(groups_infos.group_ids) gr_title_filename = sco_groups.listgroups_filename(groups) @@ -891,7 +889,6 @@ def saisie_notes(evaluation_id, group_ids=[], REQUEST=None): formsemestre_id=formsemestre_id, select_all_when_unspecified=True, etat=None, - REQUEST=REQUEST, ) if E["description"]: diff --git a/app/scodoc/sco_trombino.py b/app/scodoc/sco_trombino.py index 47769baf..a0f858b0 100644 --- a/app/scodoc/sco_trombino.py +++ b/app/scodoc/sco_trombino.py @@ -78,7 +78,7 @@ def trombino( etat = None # may be passed as '' # Informations sur les groupes à afficher: groups_infos = sco_groups_view.DisplayedGroupsInfos( - group_ids, formsemestre_id=formsemestre_id, etat=etat, REQUEST=REQUEST + group_ids, formsemestre_id=formsemestre_id, etat=etat ) # @@ -247,7 +247,7 @@ def _trombino_zip(groups_infos): # Copy photos from portal to ScoDoc def trombino_copy_photos(group_ids=[], REQUEST=None, dialog_confirmed=False): "Copy photos from portal to ScoDoc (overwriting local copy)" - groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids, REQUEST=REQUEST) + groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids) back_url = "groups_view?%s&curtab=tab-photos" % groups_infos.groups_query_args portal_url = sco_portal_apogee.get_portal_url() @@ -485,14 +485,13 @@ def photos_generate_excel_sample(group_ids=[], REQUEST=None): "photo_filename", ], extra_cols=["fichier_photo"], - REQUEST=REQUEST, ) return sco_excel.send_excel_file(REQUEST, data, "ImportPhotos" + scu.XLSX_SUFFIX) def photos_import_files_form(group_ids=[], REQUEST=None): """Formulaire pour importation photos""" - groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids, REQUEST=REQUEST) + groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids) back_url = "groups_view?%s&curtab=tab-photos" % groups_infos.groups_query_args H = [ @@ -541,7 +540,7 @@ def photos_import_files_form(group_ids=[], REQUEST=None): def photos_import_files(group_ids=[], xlsfile=None, zipfile=None, REQUEST=None): """Importation des photos""" - groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids, REQUEST=REQUEST) + groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids) back_url = "groups_view?%s&curtab=tab-photos" % groups_infos.groups_query_args filename_title = "fichier_photo" page_title = "Téléchargement des photos des étudiants" diff --git a/app/scodoc/sco_trombino_tours.py b/app/scodoc/sco_trombino_tours.py index b77bf61d..7a2ec1f0 100644 --- a/app/scodoc/sco_trombino_tours.py +++ b/app/scodoc/sco_trombino_tours.py @@ -61,7 +61,7 @@ def pdf_trombino_tours( """Generation du trombinoscope en fichier PDF""" # Informations sur les groupes à afficher: groups_infos = sco_groups_view.DisplayedGroupsInfos( - group_ids, formsemestre_id=formsemestre_id, REQUEST=REQUEST + group_ids, formsemestre_id=formsemestre_id ) DeptName = sco_preferences.get_preference("DeptName") @@ -296,7 +296,7 @@ def pdf_feuille_releve_absences( # Informations sur les groupes à afficher: groups_infos = sco_groups_view.DisplayedGroupsInfos( - group_ids, formsemestre_id=formsemestre_id, REQUEST=REQUEST + group_ids, formsemestre_id=formsemestre_id ) DeptName = sco_preferences.get_preference("DeptName") diff --git a/app/views/absences.py b/app/views/absences.py index f0dee786..6216dc7e 100644 --- a/app/views/absences.py +++ b/app/views/absences.py @@ -312,7 +312,7 @@ def SignaleAbsenceGrHebdo( moduleimpl_id = None groups_infos = sco_groups_view.DisplayedGroupsInfos( - group_ids, moduleimpl_id=moduleimpl_id, REQUEST=REQUEST + group_ids, moduleimpl_id=moduleimpl_id ) if not groups_infos.members: return ( @@ -474,7 +474,7 @@ def SignaleAbsenceGrSemestre( REQUEST=None, ): """Saisie des absences sur une journée sur un semestre (ou intervalle de dates) entier""" - groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids, REQUEST=REQUEST) + groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids) if not groups_infos.members: return ( html_sco_header.sco_header(page_title="Saisie des absences") @@ -847,7 +847,7 @@ def EtatAbsencesGr( datedebut = ndb.DateDMYtoISO(debut) datefin = ndb.DateDMYtoISO(fin) # Informations sur les groupes à afficher: - groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids, REQUEST=REQUEST) + groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids) formsemestre_id = groups_infos.formsemestre_id sem = groups_infos.formsemestre @@ -971,13 +971,11 @@ ou entrez une date pour visualiser les absents un jour donné : @scodoc @permission_required(Permission.ScoView) @scodoc7func -def EtatAbsencesDate( - group_ids=[], date=None, REQUEST=None # list of groups to display -): +def EtatAbsencesDate(group_ids=[], date=None): # list of groups to display # ported from dtml """Etat des absences pour un groupe à une date donnée""" # Informations sur les groupes à afficher: - groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids, REQUEST=REQUEST) + groups_infos = sco_groups_view.DisplayedGroupsInfos(group_ids) H = [html_sco_header.sco_header(page_title="Etat des absences")] if date: dateiso = ndb.DateDMYtoISO(date) diff --git a/app/views/scolar.py b/app/views/scolar.py index 54640bea..41632ff7 100644 --- a/app/views/scolar.py +++ b/app/views/scolar.py @@ -283,7 +283,10 @@ sco_publish( ) sco_publish( - "/trombino_copy_photos", sco_trombino.trombino_copy_photos, Permission.ScoView + "/trombino_copy_photos", + sco_trombino.trombino_copy_photos, + Permission.ScoView, + methods=["GET", "POST"], ) sco_publish("/groups_view", sco_groups_view.groups_view, Permission.ScoView) From 381e0818446245a46ec870db115f7684ce2928a3 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 8 Sep 2021 00:35:40 +0200 Subject: [PATCH 12/25] version bump --- sco_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sco_version.py b/sco_version.py index d2735ed1..7669307f 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.0.9" +SCOVERSION = "9.0.10" SCONAME = "ScoDoc" From 72dfc4f49b22be563d192beab2e1f7fbf4c42601 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 8 Sep 2021 23:00:01 +0200 Subject: [PATCH 13/25] Configuration des logos via formulaires --- app/models/preferences.py | 18 ++++ app/scodoc/sco_logos.py | 95 ++++++++++++++++++++ app/scodoc/sco_preferences.py | 4 +- app/scodoc/sco_utils.py | 4 +- app/static/css/scodoc.css | 11 +++ app/templates/configuration.html | 52 +++++++---- app/views/scodoc.py | 145 +++++++++++++++++++++++++++++-- app/views/scolar.py | 70 ++++++++++++++- config.py | 6 +- tools/scodoc_config.py | 7 +- 10 files changed, 374 insertions(+), 38 deletions(-) create mode 100644 app/scodoc/sco_logos.py diff --git a/app/models/preferences.py b/app/models/preferences.py index 65b88508..b04ad0da 100644 --- a/app/models/preferences.py +++ b/app/models/preferences.py @@ -33,6 +33,17 @@ class ScoDocSiteConfig(db.Model): value = db.Column(db.Text()) BONUS_SPORT = "bonus_sport_func_name" + NAMES = { + BONUS_SPORT: str, + "always_require_ine": bool, + "SCOLAR_FONT": str, + "SCOLAR_FONT_SIZE": str, + "SCOLAR_FONT_SIZE_FOOT": str, + "INSTITUTION_NAME": str, + "INSTITUTION_ADDRESS": str, + "INSTITUTION_CITY": str, + "DEFAULT_PDF_FOOTER_TEMPLATE": str, + } def __init__(self, name, value): self.name = name @@ -41,6 +52,13 @@ class ScoDocSiteConfig(db.Model): def __repr__(self): return f"<{self.__class__.__name__}('{self.name}', '{self.value}')>" + def get_dict(self) -> dict: + "Returns all data as a dict name = value" + return { + c.name: self.NAMES.get(c.name, lambda x: x)(c.value) + for c in ScoDocSiteConfig.query.all() + } + @classmethod def set_bonus_sport_func(cls, func_name): """Record bonus_sport config. diff --git a/app/scodoc/sco_logos.py b/app/scodoc/sco_logos.py new file mode 100644 index 00000000..e29b5183 --- /dev/null +++ b/app/scodoc/sco_logos.py @@ -0,0 +1,95 @@ +# -*- mode: python -*- +# -*- coding: utf-8 -*- + +############################################################################## +# +# Gestion scolarite IUT +# +# Copyright (c) 1999 - 2021 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 +# +############################################################################## + +"""Gestion des images logos (nouveau ScoDoc 9) + +Les logos sont `logo_header.` et `logo_footer.` +avec `ext` membre de LOGOS_IMAGES_ALLOWED_TYPES (= jpg, png) + +SCODOC_LOGOS_DIR /opt/scodoc-data/config/logos +""" +import imghdr +import os + +from flask import abort, current_app + +from app.scodoc import sco_utils as scu + + +def get_logo_filename(logo_type: str, scodoc_dept: str) -> str: + """return full filename for this logo, or "" if not found + an existing file with extension. + logo_type: "header" or "footer" + scodoc-dept: acronym + """ + # Search logos in dept specific dir (/opt/scodoc-data/config/logos/logos_), + # then in config dir /opt/scodoc-data/config/logos/ + for image_dir in ( + scu.SCODOC_LOGOS_DIR + "/logos_" + scodoc_dept, + scu.SCODOC_LOGOS_DIR, # global logos + ): + for suffix in scu.LOGOS_IMAGES_ALLOWED_TYPES: + filename = os.path.join(image_dir, f"logo_{logo_type}.{suffix}") + if os.path.isfile(filename) and os.access(filename, os.R_OK): + return filename + + return "" + + +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: + return None + return fmt if fmt != "jpeg" else "jpg" + + +def _ensure_directory_exists(filename): + "create enclosing directory if necessary" + directory = os.path.split(filename)[0] + if not os.path.exists(directory): + current_app.logger.info(f"sco_logos creating directory %s", directory) + os.mkdir(directory) + + +def store_image(stream, basename): + img_type = guess_image_type(stream) + if img_type not in scu.LOGOS_IMAGES_ALLOWED_TYPES: + abort(400, "type d'image invalide") + filename = basename + "." + img_type + _ensure_directory_exists(filename) + with open(filename, "wb") as f: + f.write(stream.read()) + current_app.logger.info(f"sco_logos.store_image %s", filename) + # erase other formats if they exists + for extension in set(scu.LOGOS_IMAGES_ALLOWED_TYPES) - set([img_type]): + try: + os.unlink(basename + "." + extension) + except IOError: + pass diff --git a/app/scodoc/sco_preferences.py b/app/scodoc/sco_preferences.py index f4615313..26ff4ec2 100644 --- a/app/scodoc/sco_preferences.py +++ b/app/scodoc/sco_preferences.py @@ -111,7 +111,7 @@ get_base_preferences(formsemestre_id) """ import flask -from flask import g +from flask import g, url_for from app.models import Departement from app.scodoc import sco_cache @@ -2021,6 +2021,8 @@ class BasePreferences(object): H = [ html_sco_header.sco_header(page_title="Préférences"), "

Préférences globales pour %s

" % scu.ScoURL(), + f"""

modification des logos du département (pour documents pdf)

""", """

Ces paramètres s'appliquent par défaut à tous les semestres, sauf si ceux-ci définissent des valeurs spécifiques.

Attention: cliquez sur "Enregistrer les modifications" en bas de page pour appliquer vos changements !

""", diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py index bf6a332a..2447c4e8 100644 --- a/app/scodoc/sco_utils.py +++ b/app/scodoc/sco_utils.py @@ -232,6 +232,8 @@ if not os.path.exists(SCO_TMP_DIR): os.mkdir(SCO_TMP_DIR, 0o755) # ----- Les logos: /opt/scodoc-data/config/logos SCODOC_LOGOS_DIR = os.path.join(SCODOC_CFG_DIR, "logos") +LOGOS_IMAGES_ALLOWED_TYPES = ("jpg", "jpeg", "png") # remind that PIL does not read pdf + # ----- Les outils distribués SCO_TOOLS_DIR = os.path.join(Config.SCODOC_DIR, "tools") @@ -305,8 +307,6 @@ PDF_MIMETYPE = "application/pdf" XML_MIMETYPE = "text/xml" JSON_MIMETYPE = "application/json" -LOGOS_IMAGES_ALLOWED_TYPES = ("jpg", "png") # remind that PIL does not read pdf - # Admissions des étudiants # Différents types de voies d'admission: # (stocké en texte libre dans la base, mais saisie par menus pour harmoniser) diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 01213d54..95b332bd 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -816,11 +816,22 @@ a.discretelink:hover { div.sco_help { margin-top: 12px; + margin-bottom: 3px; font-style: italic; color: navy; background-color: rgb(200,200,220); } +span.wtf-field ul.errors li { + color: red; +} +.configuration_logo div.img-container { + width: 256px; +} +.configuration_logo div.img-container img { + max-width: 100%; +} + p.indent { padding-left: 2em; } diff --git a/app/templates/configuration.html b/app/templates/configuration.html index 1580979c..6dcf1c51 100644 --- a/app/templates/configuration.html +++ b/app/templates/configuration.html @@ -2,32 +2,52 @@ {% import 'bootstrap/wtf.html' as wtf %} {% macro render_field(field) %} -
- {{ field.label }} : - {{ field()|safe }} +
+ {{ field.label }} : + {{ field()|safe }} {% if field.errors %} -
    +
      {% for error in field.errors %} -
    • {{ error }}
      • +
    • {{ error }}
      • {% endfor %} -
    +
{% endif %} - -
+ +
{% endmacro %} {% block app_content %} -

Configuration générale

-

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

+{% if scodoc_dept %} +

Logos du département {{ scodoc_dept }}

+{% else %} +

Configuration générale {{ scodoc_dept }}

+{% endif %} -
+ {{ form.hidden_tag() }} + + {% if not scodoc_dept %} +
Les paramètres donnés ici s'appliquent à tout ScoDoc (tous les départements):
+ {{ render_field(form.bonus_sport_func_name)}} - {#

- {{ form.bonus_sport_func_name.label }}
- {{ form.bonus_sport_func_name() }} -

#} + {% endif %} + + +
{{ form.submit() }}
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/app/views/scodoc.py b/app/views/scodoc.py index 1d4b7799..d2fd9f9d 100644 --- a/app/views/scodoc.py +++ b/app/views/scodoc.py @@ -30,19 +30,29 @@ Module main: page d'accueil, avec liste des départements Emmanuel Viennet, 2021 """ +import os + import flask -from flask import flash, url_for, redirect, render_template +from flask import abort, flash, url_for, redirect, render_template, send_file from flask import request from flask.app import Flask from flask_login.utils import login_required from flask_wtf import FlaskForm +from flask_wtf.file import FileField, FileAllowed +from werkzeug.exceptions import BadRequest, NotFound from wtforms import SelectField, SubmitField +from wtforms.fields import IntegerField +from wtforms.fields.simple import BooleanField, StringField, TextAreaField +from wtforms.validators import ValidationError, DataRequired, Email, EqualTo -# from wtforms.validators import DataRequired - -from app.models import Departement, ScoDocSiteConfig +import app +from app.models import Departement, Identite +from app.models import FormSemestre, NotesFormsemestreInscription +from app.models import ScoDocSiteConfig import sco_version +from app.scodoc import sco_logos from app.scodoc import sco_find_etud +from app.scodoc import sco_utils as scu from app.decorators import admin_required from app.scodoc.sco_permissions import Permission from app.views import scodoc_bp as bp @@ -72,13 +82,56 @@ def table_etud_in_accessible_depts(): return sco_find_etud.table_etud_in_accessible_depts(expnom=request.form["expnom"]) +@bp.route("/ScoDoc/get_etud_dept") +@login_required +def get_etud_dept(): + """Returns the dept acronym (eg "GEII") of an etud (identified by etudid, + code_nip ou code_ine in the request). + API: ramène la chaine brute, sans JSON ou XML. + """ + if "etudid" in request.args: + # zero ou une réponse: + etuds = [Identite.query.get(request.args["etudid"])] + elif "code_nip" in request.args: + # il peut y avoir plusieurs réponses si l'étudiant est passé par plusieurs départements + etuds = Identite.query.filter_by(code_nip=request.args["code_nip"]).all() + elif "code_ine" in request.args: + etuds = Identite.query.filter_by(code_nip=request.args["code_ine"]).all() + else: + raise BadRequest( + "missing argument (expected one among: etudid, code_nip or code_ine)" + ) + if not etuds: + raise NotFound("student not found") + elif len(etuds) == 1: + last_etud = etuds[0] + else: + # inscriptions dans plusieurs departements: cherche la plus recente + last_etud = None + last_date = None + for etud in etuds: + inscriptions = NotesFormsemestreInscription.query.filter_by( + etudid=etud.id + ).all() + for ins in inscriptions: + date_fin = FormSemestre.query.get(ins.formsemestre_id).date_fin + if (last_date is None) or date_fin > last_date: + last_date = date_fin + last_etud = etud + if not last_etud: + # est présent dans plusieurs semestres mais inscrit dans aucun ! + # le choix a peu d'importance... + last_etud = etuds[-1] + + return Departement.query.get(last_etud.dept_id).acronym + + # ---- CONFIGURATION class ScoDocConfigurationForm(FlaskForm): "Panneau de configuration général" - # très préliminaire ;-) - # On veut y mettre la fonction bonus et ensuite les logos + bonus_sport_func_name = SelectField( label="Fonction de calcul des bonus sport&culture", choices=[ @@ -86,28 +139,104 @@ class ScoDocConfigurationForm(FlaskForm): for x in ScoDocSiteConfig.get_bonus_sport_func_names() ], ) + + logo_header = FileField( + label="Modifier l'image:", + description="logo placé en haut des documents PDF", + validators=[ + FileAllowed( + scu.LOGOS_IMAGES_ALLOWED_TYPES, + f"n'accepte que les fichiers image {','.join([e for e in scu.LOGOS_IMAGES_ALLOWED_TYPES])}", + ) + ], + ) + + logo_footer = FileField( + label="Modifier l'image:", + description="logo placé en pied des documents PDF", + validators=[ + FileAllowed( + scu.LOGOS_IMAGES_ALLOWED_TYPES, + f"n'accepte que les fichiers image {','.join([e for e in scu.LOGOS_IMAGES_ALLOWED_TYPES])}", + ) + ], + ) + submit = SubmitField("Enregistrer") +# Notes pour variables config: (valeurs par défaut des paramètres de département) +# Chaines simples +# SCOLAR_FONT = "Helvetica" +# SCOLAR_FONT_SIZE = 10 +# SCOLAR_FONT_SIZE_FOOT = 6 +# INSTITUTION_NAME = "Institut Universitaire de Technologie - Université Georges Perec" +# INSTITUTION_ADDRESS = "Web www.sor.bonne.top - 11, rue Simon Crubelier - 75017 Paris" +# INSTITUTION_CITY = "Paris" +# Textareas: +# DEFAULT_PDF_FOOTER_TEMPLATE = "Edité par %(scodoc_name)s le %(day)s/%(month)s/%(year)s à %(hour)sh%(minute)s sur %(server_url)s" + +# Booléens +# always_require_ine + +# Logos: +# LOGO_FOOTER*, LOGO_HEADER* + + @bp.route("/ScoDoc/configuration", methods=["GET", "POST"]) @admin_required def configuration(): "Panneau de configuration général" form = ScoDocConfigurationForm( - bonus_sport_func_name=ScoDocSiteConfig.get_bonus_sport_func_name() + bonus_sport_func_name=ScoDocSiteConfig.get_bonus_sport_func_name(), ) if form.validate_on_submit(): ScoDocSiteConfig.set_bonus_sport_func(form.bonus_sport_func_name.data) + if form.logo_header.data: + sco_logos.store_image( + form.logo_header.data, os.path.join(scu.SCODOC_LOGOS_DIR, "logo_header") + ) + if form.logo_footer.data: + sco_logos.store_image( + form.logo_footer.data, os.path.join(scu.SCODOC_LOGOS_DIR, "logo_footer") + ) + app.clear_scodoc_cache() flash(f"Configuration enregistrée") return redirect(url_for("scodoc.index")) + return render_template( "configuration.html", title="Configuration ScoDoc", form=form, - # bonus_sport_func_name=ScoDocSiteConfig.get_bonus_sport_func(), + scodoc_dept=None, ) +def _return_logo(logo_type="header", scodoc_dept=""): + # stockée dans /opt/scodoc-data/config/logos donc servie manuellement ici + filename = sco_logos.get_logo_filename(logo_type, scodoc_dept) + if filename: + extension = os.path.splitext(filename)[1] + return send_file(filename, mimetype=f"image/{extension}") + else: + return "" + + +@bp.route("/ScoDoc/logo_header") +@bp.route("/ScoDoc//logo_header") +def logo_header(scodoc_dept=""): + "Image logo header" + # "/opt/scodoc-data/config/logos/logo_header") + return _return_logo(logo_type="header", scodoc_dept=scodoc_dept) + + +@bp.route("/ScoDoc/logo_footer") +@bp.route("/ScoDoc//logo_footer") +def logo_footer(scodoc_dept=""): + "Image logo footer" + return _return_logo(logo_type="footer", scodoc_dept=scodoc_dept) + + # essais # @bp.route("/testlog") # def testlog(): diff --git a/app/views/scolar.py b/app/views/scolar.py index 41632ff7..73371619 100644 --- a/app/views/scolar.py +++ b/app/views/scolar.py @@ -30,7 +30,7 @@ issu de ScoDoc7 / ZScolar.py Emmanuel Viennet, 2021 """ - +import os import sys import time @@ -40,9 +40,12 @@ from zipfile import ZipFile import psycopg2 import flask -from flask import jsonify, url_for +from flask import jsonify, url_for, flash, redirect, render_template from flask import current_app, g, request from flask_login import current_user +from flask_wtf import FlaskForm +from flask_wtf.file import FileField, FileAllowed +from wtforms import SubmitField from config import Config from app.decorators import ( @@ -71,8 +74,8 @@ from app.scodoc.sco_exceptions import ( ) from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message import sco_version +import app from app.scodoc.gen_tables import GenTable - from app.scodoc import html_sco_header from app.scodoc import html_sidebar from app.scodoc import imageresize @@ -94,6 +97,7 @@ from app.scodoc import sco_formsemestre_inscriptions from app.scodoc import sco_groups from app.scodoc import sco_groups_edit from app.scodoc import sco_groups_view +from app.scodoc import sco_logos from app.scodoc import sco_news from app.scodoc import sco_page_etud from app.scodoc import sco_parcours_dut @@ -201,6 +205,66 @@ def doc_preferences(REQUEST): return sco_preferences.doc_preferences() +class DeptLogosConfigurationForm(FlaskForm): + "Panneau de configuration logos dept" + + logo_header = FileField( + label="Modifier l'image:", + description="logo placé en haut des documents PDF", + validators=[ + FileAllowed( + scu.LOGOS_IMAGES_ALLOWED_TYPES, + f"n'accepte que les fichiers image {','.join([e for e in scu.LOGOS_IMAGES_ALLOWED_TYPES])}", + ) + ], + ) + + logo_footer = FileField( + label="Modifier l'image:", + description="logo placé en pied des documents PDF", + validators=[ + FileAllowed( + scu.LOGOS_IMAGES_ALLOWED_TYPES, + f"n'accepte que les fichiers image {','.join([e for e in scu.LOGOS_IMAGES_ALLOWED_TYPES])}", + ) + ], + ) + + submit = SubmitField("Enregistrer") + + +@bp.route("/config_logos", methods=["GET", "POST"]) +@permission_required(Permission.ScoChangePreferences) +def config_logos(scodoc_dept): + "Panneau de configuration général" + form = DeptLogosConfigurationForm() + if form.validate_on_submit(): + if form.logo_header.data: + sco_logos.store_image( + form.logo_header.data, + os.path.join( + scu.SCODOC_LOGOS_DIR, "logos_" + scodoc_dept, "logo_header" + ), + ) + if form.logo_footer.data: + sco_logos.store_image( + form.logo_footer.data, + os.path.join( + scu.SCODOC_LOGOS_DIR, "logos_" + scodoc_dept, "logo_footer" + ), + ) + app.clear_scodoc_cache() + flash(f"Logos enregistrés") + return redirect(url_for("scolar.index_html", scodoc_dept=scodoc_dept)) + + return render_template( + "configuration.html", + title="Configuration Logos du département", + form=form, + scodoc_dept=scodoc_dept, + ) + + # -------------------------------------------------------------------- # # ETUDIANTS diff --git a/config.py b/config.py index aed798d6..2e424a58 100755 --- a/config.py +++ b/config.py @@ -30,9 +30,9 @@ class Config: SCODOC_DIR = os.environ.get("SCODOC_DIR", "/opt/scodoc") SCODOC_VAR_DIR = os.environ.get("SCODOC_VAR_DIR", "/opt/scodoc-data") SCODOC_LOG_FILE = os.path.join(SCODOC_VAR_DIR, "log", "scodoc.log") - # For legacy ScoDoc7 installs: postgresql user - SCODOC7_SQL_USER = os.environ.get("SCODOC7_SQL_USER", "www-data") - DEFAULT_SQL_PORT = os.environ.get("DEFAULT_SQL_PORT", "5432") + # + MAX_CONTENT_LENGTH = 10 * 1024 * 1024 # Flask uploads + # STATIC_URL_PATH = "/ScoDoc/static" # static_folder = "stat" # SERVER_NAME = os.environ.get("SERVER_NAME") diff --git a/tools/scodoc_config.py b/tools/scodoc_config.py index 9c33c9f0..2937dfd4 100644 --- a/tools/scodoc_config.py +++ b/tools/scodoc_config.py @@ -23,10 +23,6 @@ CONFIG = CFG() CONFIG.always_require_ine = 0 # set to 1 if you want to require INE -# The base URL, use only if you are behind a proxy -# eg "https://scodoc.example.net/ScoDoc" -CONFIG.ABSOLUTE_URL = "" - # # ------------- Documents PDF ------------- # @@ -78,6 +74,7 @@ CONFIG.DEFAULT_PDF_FOOTER_TEMPLATE = "Edité par %(scodoc_name)s le %(day)s/%(mo # # - règle "LMD": capitalisation uniquement des UE avec moy. > 10 +# XXX à revoir pour le BUT: variable à intégrer aux parcours CONFIG.CAPITALIZE_ALL_UES = ( True # si vrai, capitalise toutes les UE des semestres validés (règle "LMD"). ) @@ -86,7 +83,7 @@ CONFIG.CAPITALIZE_ALL_UES = ( # # ----------------------------------------------------- # -# -------------- Personnalisation des pages +# -------------- Personnalisation des pages (DEPRECATED) # # ----------------------------------------------------- # Nom (chemin complet) d'un fichier .html à inclure juste après le From 829d5d8b2e590cb01e27f07c91028aeab1efaaf5 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 8 Sep 2021 23:10:28 +0200 Subject: [PATCH 14/25] =?UTF-8?q?fix:=20ajout=20semestre=20=C3=A0=20semset?= =?UTF-8?q?=20(exports=20apog=C3=A9e)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_semset.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/scodoc/sco_semset.py b/app/scodoc/sco_semset.py index b6d3abc2..1f35afae 100644 --- a/app/scodoc/sco_semset.py +++ b/app/scodoc/sco_semset.py @@ -158,11 +158,10 @@ class SemSet(dict): ndb.SimpleQuery( """INSERT INTO notes_semset_formsemestre - (dept_id, id, semset_id) - VALUES (%(dept_id)s, %(formsemestre_id)s, %(semset_id)s) + (id, semset_id) + VALUES (%(formsemestre_id)s, %(semset_id)s) """, { - "dept_id": g.scodoc_dept_id, "formsemestre_id": formsemestre_id, "semset_id": self.semset_id, }, From c6f6f45e0d12f4a75e1cf80654c9481ec7260dd7 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Thu, 9 Sep 2021 07:59:28 +0200 Subject: [PATCH 15/25] removed up_to_date checking --- app/scodoc/sco_up_to_date.py | 93 ++---------------------------------- sco_version.py | 2 +- 2 files changed, 5 insertions(+), 90 deletions(-) diff --git a/app/scodoc/sco_up_to_date.py b/app/scodoc/sco_up_to_date.py index cab38a63..cd473f97 100644 --- a/app/scodoc/sco_up_to_date.py +++ b/app/scodoc/sco_up_to_date.py @@ -28,104 +28,19 @@ """ Verification version logiciel vs version "stable" sur serveur N'effectue pas la mise à jour automatiquement, mais permet un affichage d'avertissement. + + Désactivé temporairement pour ScoDoc 9. """ -import datetime -import app.scodoc.sco_utils as scu -from app import log - -# Appel renvoyant la subversion "stable" -# La notion de "stable" est juste là pour éviter d'afficher trop frequemment -# des avertissements de mise à jour: on veut pouvoir inciter à mettre à jour lors de -# correctifs majeurs. - -GET_VER_URL = "http://scodoc.iutv.univ-paris13.fr/scodoc-installmgr/last_stable_version" - - -def get_last_stable_version(): - """request last stable version number from server - (returns string as given by server, empty if failure) - (do not wait server answer more than 3 seconds) - """ - global _LAST_UP_TO_DATE_REQUEST - ans = scu.query_portal( - GET_VER_URL, msg="ScoDoc version server", timeout=3 - ) # sco_utils - if ans: - ans = ans.strip() - _LAST_UP_TO_DATE_REQUEST = datetime.datetime.now() - log( - 'get_last_stable_version: updated at %s, answer="%s"' - % (_LAST_UP_TO_DATE_REQUEST, ans) - ) - return ans - - -_LAST_UP_TO_DATE_REQUEST = None # datetime of last request to server -_UP_TO_DATE = True # cached result (limit requests to 1 per day) -_UP_TO_DATE_MSG = "" +from flask import current_app def is_up_to_date(): """True if up_to_date Returns status, message """ - log("Warning: is_up_to_date not implemented for ScoDoc8") + current_app.logger.debug("Warning: is_up_to_date not implemented for ScoDoc9") return True, "unimplemented" - # global _LAST_UP_TO_DATE_REQUEST, _UP_TO_DATE, _UP_TO_DATE_MSG - # if _LAST_UP_TO_DATE_REQUEST and ( - # datetime.datetime.now() - _LAST_UP_TO_DATE_REQUEST - # ) < datetime.timedelta(1): - # # requete deja effectuee aujourd'hui: - # return _UP_TO_DATE, _UP_TO_DATE_MSG - - # last_stable_ver = get_last_stable_version() - # cur_ver = scu.get_svn_version(scu.SCO_SRC_DIR) # in sco_utils - # cur_ver2 = cur_ver - # cur_ver_num = -1 - # # Convert versions to integers: - # try: - # # cur_ver can be "1234" or "1234M' or '1234:1245M'... - # fs = cur_ver.split(":", 1) - # if len(fs) > 1: - # cur_ver2 = fs[-1] - # m = re.match(r"([0-9]*)", cur_ver2) - # if not m: - # raise ValueError( - # "invalid svn version" - # ) # should never occur, regexp always (maybe empty) match - # cur_ver_num = int(m.group(1)) - # except: - # log('Warning: no numeric subversion ! (cur_ver="%s")' % cur_ver) - # return _UP_TO_DATE, _UP_TO_DATE_MSG # silently ignore misconfiguration ? - # try: - # last_stable_ver_num = int(last_stable_ver) - # except: - # log("Warning: last_stable_version returned by server is invalid !") - # return ( - # _UP_TO_DATE, - # _UP_TO_DATE_MSG, - # ) # should ignore this error (maybe server is unreachable) - # # - # if cur_ver_num < last_stable_ver_num: - # _UP_TO_DATE = False - # _UP_TO_DATE_MSG = "Version %s disponible (version %s installée)" % ( - # last_stable_ver, - # cur_ver_num, - # ) - # log( - # "Warning: ScoDoc installation is not up-to-date, should upgrade\n%s" - # % _UP_TO_DATE_MSG - # ) - # else: - # _UP_TO_DATE = True - # _UP_TO_DATE_MSG = "" - # log( - # "ScoDoc is up-to-date (cur_ver: %s, using %s=%s)" - # % (cur_ver, cur_ver2, cur_ver_num) - # ) - - # return _UP_TO_DATE, _UP_TO_DATE_MSG def html_up_to_date_box(): diff --git a/sco_version.py b/sco_version.py index 7669307f..2e77dbe6 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.0.10" +SCOVERSION = "9.0.11" SCONAME = "ScoDoc" From 4ac076ec6c2efc15aa42936c62057f7d8079c1fb Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Thu, 9 Sep 2021 08:03:43 +0200 Subject: [PATCH 16/25] =?UTF-8?q?Fix:=20recherche=20=C3=A9tudiant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/__init__.py | 4 +--- app/scodoc/sco_find_etud.py | 23 ++++++++++++++--------- app/templates/scodoc.html | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 9d450cd7..c0cbdad5 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -190,9 +190,7 @@ def create_app(config_class=DevConfig): sco_bulletins_generator.register_bulletin_class(BulletinGeneratorLegacy) sco_bulletins_generator.register_bulletin_class(BulletinGeneratorStandard) sco_bulletins_generator.register_bulletin_class(BulletinGeneratorUCAC) - app.logger.info( - f"registered bulletin classes {[ k for k in sco_bulletins_generator.BULLETIN_CLASSES ]}" - ) + return app diff --git a/app/scodoc/sco_find_etud.py b/app/scodoc/sco_find_etud.py index 2d828ee6..13426bea 100644 --- a/app/scodoc/sco_find_etud.py +++ b/app/scodoc/sco_find_etud.py @@ -120,10 +120,11 @@ def search_etud_in_dept(expnom=""): if etudid is not None: etuds = sco_etud.get_etud_info(filled=True, etudid=expnom) if (etudid is None) or len(etuds) != 1: - if scu.is_valid_code_nip(expnom): - etuds = search_etuds_infos(code_nip=expnom) + expnom_str = str(expnom) + if scu.is_valid_code_nip(expnom_str): + etuds = search_etuds_infos(code_nip=expnom_str) else: - etuds = search_etuds_infos(expnom=expnom) + etuds = search_etuds_infos(expnom=expnom_str) else: etuds = [] # si expnom est trop court, n'affiche rien @@ -151,7 +152,7 @@ def search_etud_in_dept(expnom=""): H = [ html_sco_header.sco_header( page_title="Recherche d'un étudiant", - no_side_bar=True, + no_side_bar=False, init_qtip=True, javascripts=["js/etud_info.js"], ) @@ -250,10 +251,12 @@ def search_etud_by_name(term: str) -> list: r = ndb.SimpleDictFetch( """SELECT nom, prenom, code_nip FROM identite - WHERE code_nip - LIKE %(beginning)s ORDER BY nom + WHERE + dept_id = %(dept_id)s + AND code_nip LIKE %(beginning)s + ORDER BY nom """, - {"beginning": term + "%"}, + {"beginning": term + "%", "dept_id": g.scodoc_dept_id}, ) data = [ { @@ -267,10 +270,12 @@ def search_etud_by_name(term: str) -> list: r = ndb.SimpleDictFetch( """SELECT id AS etudid, nom, prenom FROM identite - WHERE nom LIKE %(beginning)s + WHERE + dept_id = %(dept_id)s + AND nom LIKE %(beginning)s ORDER BY nom """, - {"beginning": term + "%"}, + {"beginning": term + "%", "dept_id": g.scodoc_dept_id}, ) data = [ diff --git a/app/templates/scodoc.html b/app/templates/scodoc.html index 240389bb..23826e3c 100644 --- a/app/templates/scodoc.html +++ b/app/templates/scodoc.html @@ -30,7 +30,7 @@

{% if current_user.is_authenticated %} -
+ Chercher étudiant: From be224b957668f70cf46ae3e8d1a70efb0fe697de Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Thu, 9 Sep 2021 12:49:23 +0200 Subject: [PATCH 17/25] =?UTF-8?q?API=20v9:=20premi=C3=A8re=20esquisse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/__init__.py | 2 ++ app/api/__init__.py | 8 ++++++ app/api/auth.py | 53 ++++++++++++++++++++++++++++++++++++++ app/api/errors.py | 37 ++++++++++++++++++++++++++ app/api/sco_api.py | 46 +++++++++++++++++++++++++++++++++ app/api/tokens.py | 20 ++++++++++++++ app/auth/routes.py | 2 ++ app/models/departements.py | 10 +++++++ misc/example-api-1.py | 4 +++ requirements-3.9.txt | 1 + sco_version.py | 2 +- 11 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 app/api/__init__.py create mode 100644 app/api/auth.py create mode 100644 app/api/errors.py create mode 100644 app/api/sco_api.py create mode 100644 app/api/tokens.py diff --git a/app/__init__.py b/app/__init__.py index c0cbdad5..a913f57e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -117,6 +117,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.api import bp as api_bp # https://scodoc.fr/ScoDoc app.register_blueprint(scodoc_bp) @@ -130,6 +131,7 @@ def create_app(config_class=DevConfig): app.register_blueprint( absences_bp, url_prefix="/ScoDoc//Scolarite/Absences" ) + app.register_blueprint(api_bp, url_prefix="/ScoDoc/api") scodoc_exc_formatter = RequestFormatter( "[%(asctime)s] %(remote_addr)s requested %(url)s\n" "%(levelname)s in %(module)s: %(message)s" diff --git a/app/api/__init__.py b/app/api/__init__.py new file mode 100644 index 00000000..34ebbc77 --- /dev/null +++ b/app/api/__init__.py @@ -0,0 +1,8 @@ +"""api.__init__ +""" + +from flask import Blueprint + +bp = Blueprint("api", __name__) + +from app.api import sco_api diff --git a/app/api/auth.py b/app/api/auth.py new file mode 100644 index 00000000..0226976c --- /dev/null +++ b/app/api/auth.py @@ -0,0 +1,53 @@ +# -*- coding: UTF-8 -* +# Authentication code borrowed from Miguel Grinberg's Mega Tutorial +# (see https://github.com/miguelgrinberg/microblog) + +# Under The MIT License (MIT) + +# Copyright (c) 2017 Miguel Grinberg + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +from flask_httpauth import HTTPBasicAuth, HTTPTokenAuth +from app.auth.models import User +from app.api.errors import error_response + +basic_auth = HTTPBasicAuth() +token_auth = HTTPTokenAuth() + + +@basic_auth.verify_password +def verify_password(username, password): + user = User.query.filter_by(username=username).first() + if user and user.check_password(password): + return user + + +@basic_auth.error_handler +def basic_auth_error(status): + return error_response(status) + + +@token_auth.verify_token +def verify_token(token): + return User.check_token(token) if token else None + + +@token_auth.error_handler +def token_auth_error(status): + return error_response(status) diff --git a/app/api/errors.py b/app/api/errors.py new file mode 100644 index 00000000..ed8d0f3f --- /dev/null +++ b/app/api/errors.py @@ -0,0 +1,37 @@ +# Authentication code borrowed from Miguel Grinberg's Mega Tutorial +# (see https://github.com/miguelgrinberg/microblog) + +# Under The MIT License (MIT) + +# Copyright (c) 2017 Miguel Grinberg + +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +# the Software, and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.from flask import jsonify +from werkzeug.http import HTTP_STATUS_CODES + + +def error_response(status_code, message=None): + payload = {"error": HTTP_STATUS_CODES.get(status_code, "Unknown error")} + if message: + payload["message"] = message + response = jsonify(payload) + response.status_code = status_code + return response + + +def bad_request(message): + return error_response(400, message) diff --git a/app/api/sco_api.py b/app/api/sco_api.py new file mode 100644 index 00000000..02b35090 --- /dev/null +++ b/app/api/sco_api.py @@ -0,0 +1,46 @@ +# -*- mode: python -*- +# -*- coding: utf-8 -*- + +############################################################################## +# +# Gestion scolarite IUT +# +# Copyright (c) 1999 - 2021 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 +# +############################################################################## + +"""API ScoDoc 9 +""" +# PAS ENCORE IMPLEMENTEE, juste un essai + +from flask import jsonify, request, url_for, abort +from app import db +from app.api import bp +from app.api.auth import token_auth +from app.api.errors import bad_request + +from app import models + + +@bp.route("/ScoDoc/api/list_depts", methods=["GET"]) +@token_auth.login_required +def list_depts(): + depts = models.Departement.query.filter_by(visible=True).all() + data = {"items": [d.to_dict() for d in depts]} + return jsonify(data) diff --git a/app/api/tokens.py b/app/api/tokens.py new file mode 100644 index 00000000..f36ec7b0 --- /dev/null +++ b/app/api/tokens.py @@ -0,0 +1,20 @@ +from flask import jsonify +from app import db +from app.api import bp +from app.api.auth import basic_auth, token_auth + + +@bp.route("/tokens", methods=["POST"]) +@basic_auth.login_required +def get_token(): + token = basic_auth.current_user().get_token() + db.session.commit() + return jsonify({"token": token}) + + +@bp.route("/tokens", methods=["DELETE"]) +@token_auth.login_required +def revoke_token(): + token_auth.current_user().revoke_token() + db.session.commit() + return "", 204 diff --git a/app/auth/routes.py b/app/auth/routes.py index 42cdc8e6..7b1712f0 100644 --- a/app/auth/routes.py +++ b/app/auth/routes.py @@ -37,9 +37,11 @@ def login(): if form.validate_on_submit(): user = User.query.filter_by(user_name=form.user_name.data).first() if user is None or not user.check_password(form.password.data): + current_app.logger.info("login: invalid (%s)", form.user_name.data) flash(_("Invalid user name or password")) return redirect(url_for("auth.login")) login_user(user, remember=form.remember_me.data) + current_app.logger.info("login: success (%s)", form.user_name.data) next_page = request.args.get("next") if not next_page or url_parse(next_page).netloc != "": next_page = url_for("scodoc.index") diff --git a/app/models/departements.py b/app/models/departements.py index 1dee2ca0..c0a928e3 100644 --- a/app/models/departements.py +++ b/app/models/departements.py @@ -34,3 +34,13 @@ class Departement(db.Model): def __repr__(self): return f"" + + def to_dict(self): + data = { + "id": self.id, + "acronym": self.acronym, + "description": self.description, + "visible": self.visible, + "date_creation": self.date_creation, + } + return data diff --git a/misc/example-api-1.py b/misc/example-api-1.py index d823aac7..171365e5 100644 --- a/misc/example-api-1.py +++ b/misc/example-api-1.py @@ -52,6 +52,10 @@ def POST(s, path, data, errmsg=None): # --- Ouverture session (login) s = requests.Session() +s.post( + "https://deb11.viennet.net/api/auth/login", + data={"user_name": USER, "password": PASSWORD}, +) r = s.get(BASEURL, auth=(USER, PASSWORD), verify=CHECK_CERTIFICATE) if r.status_code != 200: raise ScoError("erreur de connection: vérifier adresse et identifiants") diff --git a/requirements-3.9.txt b/requirements-3.9.txt index 0ba9dcbf..682b0505 100755 --- a/requirements-3.9.txt +++ b/requirements-3.9.txt @@ -18,6 +18,7 @@ Flask==2.0.1 Flask-Babel==2.0.0 Flask-Bootstrap==3.3.7.1 Flask-Caching==1.10.1 +Flask-HTTPAuth==4.4.0 Flask-Login==0.5.0 Flask-Mail==0.9.1 Flask-Migrate==3.1.0 diff --git a/sco_version.py b/sco_version.py index 2e77dbe6..fda1b3c7 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.0.11" +SCOVERSION = "9.0.12" SCONAME = "ScoDoc" From 9fd33cf6587f271358b9d5fe3a9d3e78eaec4898 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Thu, 9 Sep 2021 16:11:05 +0200 Subject: [PATCH 18/25] =?UTF-8?q?Acc=C3=A8s=20compatibles=20aux=20ancienne?= =?UTF-8?q?s=20fonctions=20API=20ScoDoc=207?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/sco_api.py | 10 ++++++++++ app/decorators.py | 44 +++++++++++++++++++++++++++++++++++++++++++ app/views/absences.py | 17 ++++++++++++++--- app/views/notes.py | 36 +++++++++++++++++++++++++++++------ app/views/scodoc.py | 11 ++++++++--- app/views/scolar.py | 3 ++- misc/example-api-1.py | 4 ++-- 7 files changed, 110 insertions(+), 15 deletions(-) diff --git a/app/api/sco_api.py b/app/api/sco_api.py index 02b35090..46be85a7 100644 --- a/app/api/sco_api.py +++ b/app/api/sco_api.py @@ -28,6 +28,16 @@ """API ScoDoc 9 """ # PAS ENCORE IMPLEMENTEE, juste un essai +# Pour P. Bouron, il faudrait en priorité l'équivalent de +# Scolarite/Notes/do_moduleimpl_withmodule_list +# Scolarite/Notes/evaluation_create +# Scolarite/Notes/evaluation_delete +# Scolarite/Notes/formation_list +# Scolarite/Notes/formsemestre_list +# Scolarite/Notes/formsemestre_partition_list +# Scolarite/Notes/groups_view +# Scolarite/Notes/moduleimpl_status +# Scolarite/setGroups from flask import jsonify, request, url_for, abort from app import db diff --git a/app/decorators.py b/app/decorators.py index a1a91f48..3696d56c 100644 --- a/app/decorators.py +++ b/app/decorators.py @@ -16,8 +16,10 @@ from flask import request from flask_login import current_user from flask_login import login_required from flask import current_app +import flask_login import app +from app.auth.models import User class ZUser(object): @@ -141,6 +143,48 @@ def permission_required(permission): return decorator +def permission_required_compat_scodoc7(permission): + """Décorateur pour les fonctions utilisée comme API dans ScoDoc 7 + Comme @permission_required mais autorise de passer directement + les informations d'auth en paramètres: + __ac_name, __ac_password + """ + + def decorator(f): + @wraps(f) + def decorated_function(*args, **kwargs): + # current_app.logger.warning("PERMISSION; kwargs=%s" % str(kwargs)) + # cherche les paramètre d'auth: + auth_ok = False + if request.method == "GET": + user_name = request.args.get("__ac_name") + user_password = request.args.get("__ac_password") + elif request.method == "POST": + user_name = request.form.get("__ac_name") + user_password = request.form.get("__ac_password") + else: + abort(405) # method not allowed + if user_name and user_password: + u = User.query.filter_by(user_name=user_name).first() + if u and u.check_password(user_password): + auth_ok = True + flask_login.login_user(u) + + # reprend le chemin classique: + scodoc_dept = getattr(g, "scodoc_dept", None) + + if not current_user.has_permission(permission, scodoc_dept): + abort(403) + if auth_ok: + return f(*args, **kwargs) + else: + return login_required(f)(*args, **kwargs) + + return decorated_function + + return decorator + + def admin_required(f): from app.auth.models import Permission diff --git a/app/views/absences.py b/app/views/absences.py index 6216dc7e..6c84fec8 100644 --- a/app/views/absences.py +++ b/app/views/absences.py @@ -68,6 +68,7 @@ from app.decorators import ( permission_required, admin_required, login_required, + permission_required_compat_scodoc7, ) from app.views import absences_bp as bp @@ -1236,7 +1237,7 @@ def listeBilletsEtud(etudid=False, REQUEST=None, format="html"): @bp.route("/XMLgetBilletsEtud") @scodoc -@permission_required(Permission.ScoView) +@permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func def XMLgetBilletsEtud(etudid=False, REQUEST=None): """Liste billets pour un etudiant""" @@ -1250,7 +1251,7 @@ def XMLgetBilletsEtud(etudid=False, REQUEST=None): @bp.route("/listeBillets") @scodoc -@permission_required(Permission.ScoView) +@permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func def listeBillets(REQUEST=None): """Page liste des billets non traités et formulaire recherche d'un billet""" @@ -1459,9 +1460,19 @@ def ProcessBilletAbsenceForm(billet_id, REQUEST=None): return "\n".join(H) + html_sco_header.sco_footer() +# @bp.route("/essai_api7") +# @scodoc +# @permission_required_compat_scodoc7(Permission.ScoView) +# @scodoc7func +# def essai_api7(x="xxx"): +# "un essai" +# log("arfffffffffffffffffff") +# return "OK OK x=" + str(x) + + @bp.route("/XMLgetAbsEtud") @scodoc -@permission_required(Permission.ScoView) +@permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func def XMLgetAbsEtud(beg_date="", end_date="", REQUEST=None): """returns list of absences in date interval""" diff --git a/app/views/notes.py b/app/views/notes.py index 7e80550b..7fbc6318 100644 --- a/app/views/notes.py +++ b/app/views/notes.py @@ -50,6 +50,7 @@ from app.decorators import ( scodoc, scodoc7func, permission_required, + permission_required_compat_scodoc7, admin_required, login_required, ) @@ -252,11 +253,34 @@ sco_publish( Permission.ScoChangeFormation, methods=["GET", "POST"], ) -sco_publish( - "/formsemestre_bulletinetud", - sco_bulletins.formsemestre_bulletinetud, - Permission.ScoView, -) + + +@bp.route("formsemestre_bulletinetud") +@scodoc +@permission_required_compat_scodoc7(Permission.ScoView) +@scodoc7func +def formsemestre_bulletinetud( + etudid=None, + formsemestre_id=None, + format="html", + version="long", + xml_with_decisions=False, + force_publishing=False, + prefer_mail_perso=False, + REQUEST=None, +): + return sco_bulletins.formsemestre_bulletinetud( + etudid=etudid, + formsemestre_id=formsemestre_id, + format=format, + version=version, + xml_with_decisions=xml_with_decisions, + force_publishing=force_publishing, + prefer_mail_perso=prefer_mail_perso, + REQUEST=REQUEST, + ) + + sco_publish( "/formsemestre_evaluations_cal", sco_evaluations.formsemestre_evaluations_cal, @@ -601,7 +625,7 @@ def formsemestre_list( @bp.route("/XMLgetFormsemestres") @scodoc -@permission_required(Permission.ScoView) +@permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func def XMLgetFormsemestres(etape_apo=None, formsemestre_id=None, REQUEST=None): """List all formsemestres matching etape, XML format diff --git a/app/views/scodoc.py b/app/views/scodoc.py index d2fd9f9d..88aa7a1e 100644 --- a/app/views/scodoc.py +++ b/app/views/scodoc.py @@ -30,6 +30,7 @@ Module main: page d'accueil, avec liste des départements Emmanuel Viennet, 2021 """ +from app.auth.models import User import os import flask @@ -53,7 +54,11 @@ import sco_version from app.scodoc import sco_logos from app.scodoc import sco_find_etud from app.scodoc import sco_utils as scu -from app.decorators import admin_required +from app.decorators import ( + admin_required, + scodoc7func, + permission_required_compat_scodoc7, +) from app.scodoc.sco_permissions import Permission from app.views import scodoc_bp as bp @@ -82,12 +87,12 @@ def table_etud_in_accessible_depts(): return sco_find_etud.table_etud_in_accessible_depts(expnom=request.form["expnom"]) +# Fonction d'API accessible sans aucun authentification @bp.route("/ScoDoc/get_etud_dept") -@login_required def get_etud_dept(): """Returns the dept acronym (eg "GEII") of an etud (identified by etudid, code_nip ou code_ine in the request). - API: ramène la chaine brute, sans JSON ou XML. + Ancienne API: ramène la chaine brute, texte sans JSON ou XML. """ if "etudid" in request.args: # zero ou une réponse: diff --git a/app/views/scolar.py b/app/views/scolar.py index 73371619..8f026782 100644 --- a/app/views/scolar.py +++ b/app/views/scolar.py @@ -52,6 +52,7 @@ from app.decorators import ( scodoc, scodoc7func, permission_required, + permission_required_compat_scodoc7, admin_required, login_required, ) @@ -402,7 +403,7 @@ def search_etud_by_name(): @bp.route("/etud_info") @bp.route("/XMLgetEtudInfos") @scodoc -@permission_required(Permission.ScoView) +@permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func def etud_info(etudid=None, format="xml", REQUEST=None): "Donne les informations sur un etudiant" diff --git a/misc/example-api-1.py b/misc/example-api-1.py index 171365e5..e79b329a 100644 --- a/misc/example-api-1.py +++ b/misc/example-api-1.py @@ -36,7 +36,7 @@ class ScoError(Exception): def GET(s, path, errmsg=None): """Get and returns as JSON""" - r = s.get(BASEURL + "/" + path) + r = s.get(BASEURL + "/" + path, verify=CHECK_CERTIFICATE) if r.status_code != 200: raise ScoError(errmsg or "erreur !") return r.json() # decode la reponse JSON @@ -44,7 +44,7 @@ def GET(s, path, errmsg=None): def POST(s, path, data, errmsg=None): """Post""" - r = s.post(BASEURL + "/" + path, data=data) + r = s.post(BASEURL + "/" + path, data=data, verify=CHECK_CERTIFICATE) if r.status_code != 200: raise ScoError(errmsg or "erreur !") return r.text From e8208efb5c89d252288dc1db29dd8cebf3aca100 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Thu, 9 Sep 2021 16:23:53 +0200 Subject: [PATCH 19/25] Fix typo: export Apo (bis) --- app/scodoc/sco_semset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scodoc/sco_semset.py b/app/scodoc/sco_semset.py index 1f35afae..e8be6bd6 100644 --- a/app/scodoc/sco_semset.py +++ b/app/scodoc/sco_semset.py @@ -158,7 +158,7 @@ class SemSet(dict): ndb.SimpleQuery( """INSERT INTO notes_semset_formsemestre - (id, semset_id) + (formsemestre_id, semset_id) VALUES (%(formsemestre_id)s, %(semset_id)s) """, { From 51884bf28f08b8b6b8789c81ab56b2f79e064276 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Thu, 9 Sep 2021 16:33:44 +0200 Subject: [PATCH 20/25] =?UTF-8?q?Edition=20r=C3=B4le=20RespPe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/users.py b/app/views/users.py index 17ed7632..557fbfb6 100644 --- a/app/views/users.py +++ b/app/views/users.py @@ -121,7 +121,9 @@ def create_user_form(REQUEST, user_name=None, edit=0): is_super_admin = True # Les rôles standards créés à l'initialisation de ScoDoc: - standard_roles = [Role.get_named_role(r) for r in ("Ens", "Secr", "Admin")] + standard_roles = [ + Role.get_named_role(r) for r in ("Ens", "Secr", "Admin", "RespPe") + ] # Rôles pouvant etre attribués aux utilisateurs via ce dialogue: # si SuperAdmin, tous les rôles standards dans tous les départements # sinon, les départements dans lesquels l'utilisateur a le droit From 245f954b053e051984c8b2c79f3da329f3338565 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Fri, 10 Sep 2021 21:07:28 +0200 Subject: [PATCH 21/25] add somes routes for scodoc7 compat API --- app/views/notes.py | 2 +- app/views/scolar.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/notes.py b/app/views/notes.py index 7fbc6318..67f58dd8 100644 --- a/app/views/notes.py +++ b/app/views/notes.py @@ -599,7 +599,7 @@ sco_publish("/ue_move", sco_edit_formation.ue_move, Permission.ScoChangeFormatio @bp.route("/formsemestre_list") @scodoc -@permission_required(Permission.ScoView) +@permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func def formsemestre_list( format=None, diff --git a/app/views/scolar.py b/app/views/scolar.py index 8f026782..145208cd 100644 --- a/app/views/scolar.py +++ b/app/views/scolar.py @@ -402,6 +402,8 @@ def search_etud_by_name(): # XMLgetEtudInfos était le nom dans l'ancienne API ScoDoc 6 @bp.route("/etud_info") @bp.route("/XMLgetEtudInfos") +@bp.route("/Absences/XMLgetEtudInfos") # compat with OLD clients +@bp.route("/Notes/XMLgetEtudInfos") @scodoc @permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func From 8589aab6595ef0c42e0d0af3eae4bdb13e4ff29e Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Fri, 10 Sep 2021 21:12:59 +0200 Subject: [PATCH 22/25] enhance sidebar --- app/scodoc/html_sidebar.py | 84 +++++++++++++------------------ app/scodoc/sco_utils.py | 4 +- app/static/css/scodoc.css | 7 +++ app/static/icons/scologo_img.png | Bin 10124 -> 29443 bytes sco_version.py | 2 +- 5 files changed, 46 insertions(+), 51 deletions(-) diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py index 4dabbfe8..5ec2ae26 100644 --- a/app/scodoc/html_sidebar.py +++ b/app/scodoc/html_sidebar.py @@ -83,22 +83,19 @@ def sidebar(): from app.scodoc import sco_abs from app.scodoc import sco_etud - params = { - "ScoURL": scu.ScoURL(), - "SCO_USER_MANUAL": scu.SCO_USER_MANUAL, - } + params = {} - H = ['
', sidebar_common()] - - H.append( - """
Chercher étudiant:
- -
-
-
-""" - % params - ) + H = [ + f"""
+ { sidebar_common() } +
Chercher étudiant:
+
+
+
+
+ """ + ] # ---- Il y-a-t-il un etudiant selectionné ? etudid = None if request.method == "GET": @@ -121,59 +118,50 @@ def sidebar(): % params ) if etud["cursem"]: - params["nbabs"], params["nbabsjust"] = sco_abs.get_abs_count( - etudid, etud["cursem"] - ) - params["nbabsnj"] = params["nbabs"] - params["nbabsjust"] - params["date_debut"] = etud["cursem"]["date_debut"] - params["date_fin"] = etud["cursem"]["date_fin"] + cur_sem = etud["cursem"] + nbabs, nbabsjust = sco_abs.get_abs_count(etudid, cur_sem) + nbabsnj = nbabs - nbabsjust H.append( - """(1/2 j.)
%(nbabsjust)s J., %(nbabsnj)s N.J.""" - % params + f"""(1/2 j.) +
{ nbabsjust } J., { nbabsnj } N.J.""" ) - H.append(" """ -
  • Calendrier
    • -
  • Liste
    • - -""" - % params ) else: pass # H.append("(pas d'étudiant en cours)") # --------- H.append("
    ") # /etud-insidebar # Logo - scologo_img = scu.icontag("scologo_img") H.append( - '
    ' % scologo_img + f"""
    +
    À propos
    + Aide +
    + +
    + + """ ) - H.append( - """
    - -
    -""" - % params - ) # ' - # return "".join(H) diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py index 2447c4e8..b897110f 100644 --- a/app/scodoc/sco_utils.py +++ b/app/scodoc/sco_utils.py @@ -672,14 +672,14 @@ def graph_from_edges(edges, graph_name="mygraph"): ICONSIZES = {} # name : (width, height) cache image sizes -def icontag(name, file_format="png", **attrs): +def icontag(name, file_format="png", no_size=False, **attrs): """tag HTML pour un icone. (dans les versions anterieures on utilisait Zope) Les icones sont des fichiers PNG dans .../static/icons Si la taille (width et height) n'est pas spécifiée, lit l'image pour la mesurer (et cache le résultat). """ - if ("width" not in attrs) or ("height" not in attrs): + if (not no_size) and (("width" not in attrs) or ("height" not in attrs)): if name not in ICONSIZES: img_file = os.path.join( Config.SCODOC_DIR, diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 95b332bd..4c59e331 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -253,6 +253,13 @@ div.logo-insidebar { div.logo-logo { text-align: center ; } +div.logo-logo img { + margin-top: 20px; + width: 100px; +} +div.sidebar-bottom { + margin-top: 10px; +} div.etud_info_div { border: 2px solid gray; diff --git a/app/static/icons/scologo_img.png b/app/static/icons/scologo_img.png index a704785666913d022a078189214b69b281db6cfe..b0871c44b810556e121e0ef4b2a0ffca5dbab65c 100644 GIT binary patch delta 29127 zcmV(w?U}l*bD=Q&NkQf%FF;E=evZDq&z?OaZc$%S#GC><%DXqzLFJAbSpo zoep7d0I`!G>?2?`AwkYS_6;CgBMFI}j>OK*DNTmj3vw|}YF=nCkd6Ri8HQqpAO?2^ zClcLHe-MR+S83G*u40DKTL|7uk@)t2M zSbSw*V4i>wOPa~Ru)URmLE;udOl1KB1Ahwx!?yDUiA9NEAr>HJN=sv4__UmXfj5$Y zLHGg#16MT6Z2%r4N#;fY#}ohn0C;6sNoGw=lT!h435Wmy008_X-~zMF0ek^}KmbWZ zK~#7F?7at+rsq}Xc`N4}y1J@5Cv~^Ftt=}zU}Rf1HqJN=CYWfzvoP$k414Cx%wcBX zoaGE>*+Lmp`mMmGa%zRRHcU67g z`##Uj_kZtm-;$ZxiH&%vzu3WlM#)z*{i&aqxXY)#=d17j-u_ql_rmtp zOC!qQWGP%;gRv#Co(x|tDUDLTE7^d%$>HyX-9EcLd`~dAR1JoaD=@LN0*01UMW*k=jP;d&^?!=iIaU3o z&*0QvG#BPB&&|dE_xryaQL!9zQ!}ySz|HZ-cfBvL)T;PDNfmbMFYOnB)B46b+FKEi zKlWIhc=E0&DXWT2+xEsIcYic4o;ep4mDRDKAO0u!ddV|b#u-6xEHB5C58oTrRrPWH z-ijj+&YpK2Y*cPLoSs3VARdwwUE)s)NSDSe$NDmRH97%t#!6 z{LAsNzxYUWwKT-^)NCv-twdczO_Wqr#RNgu{zKQq%U}K4*sZ=X+DbUjhs+YVJlRI{4f5vM8^ph>g`kTsU(ozWk+6#ND6#L>##ORngMg7&GG| zF)=(GmDM#-QC%I=GYiqx))0%!Yq9V8o8$0xx5SohyJ8i;y}q^{rB`_Sbq3YEg{u^!H-sA4k^))vl0JX8YvYL7F_i7&X-Opf+CyXsAsffz5 z^*Dw(zW+0yiuH=hXzAKYN>m#2QzJ2W=1f!pXcShKqqd=cAq7GITp;+GonMIFJy%Cn zLtWsYm@z}kej=Mke zSJAfpaMU)p#>Dt^44pp{%hLnV(%8UTDx<2lAy!sbV{T$9mX?;HrlFPydL?RWnlRgq z(bBysDlqYX11Fz|=9ad2%a8mFrhQZT+k1w7`T)Mff zH7dB)=+Ia^{NUZuvggLQ?uP5)z`mWaI5|YLy%BGJ`>78{LqkWbV%kd#-5m>4>ruP8 zDYo?X#-81~5QODuXsW{}*T=}^!6>OLM_cjPqm%LJzy3nJiBP0jVufBABpzj!`= z_@8}$Af{#~VpCUdyzPBI7E1=!;@RALBO~_bb&D^`#l8zPSWTt0SBBQ`T1kIM6{x%{ zO4pa-(Fg91Bab~q9@`OxxsiC_%MZuJvx8C5+7frX_BBygTOIe__h9rr@o?OJ>rGKz zQxS6u^HD$$$}q*N%Nu|l7YNeIVwv=4X<<5lZhOrgu>uS~0Fz(wn%iP}Y&c&3*7wGt zn{SW##YGtWv<&J+VaxM((-#?wmbt4@UXGRx4aLb*$6{)7Dhku%(c9Azi%WBH?#%gU zz()>WI2{|aGckDfTaC6qtUolh>b!a22P!h&D%G}-+%PaqrMqyuxk%7du1%G zETP4?2sGJZ1}lC3sQv<8=|yGm1_4xgd36k3JRN`bpME`#J~oK|T#CN?9*L`8wKHzG z;|cqP!%IA3YZ9nDXkH>iEbX{!W4+S6_Q; z>^Xcb8o!FaCygS&OJ=`-jCsCp^`a*Sr7+>XFMJ6f`;j#k_3 zZ;8pF!6;0Q#yk;m-{?qOb>OO)nJdKK{OzY>OGiiCblo-acb~f_Dk~eKp|U>K78XIb zW-#w1u`oLqTYEQ0TgN7Tz814on+l7Qarx|-n3$f6j;_`yCzhHT<@%&j^>vN$_kaGU zarI5FjQ{%Qe*tsV;Bs`=DE_5?`Fim*7>id*guGZ-h);g;o;dz!W$e3U6NUN?7&IGQ zoAJ3s!z1{~3Q(z;*+OjY?u`a;=jx`G82-}3@ms(3A7dK2Q~Hgce$Shuv9Tu356?tZ zV_R%$Z=(2cCKma-4S)R)4-CYXojYP%cV|5L$P+PHSdYV)=PPD#~Oq#QWu+{PEaSvl>-3wJ|?5 z8mnN*&3m>+YiDcBOwL3{XLqa;U9YXJkzs8BYFODt5|MQ1`6y?f_)+{L{&{78p)_g$Io7LqKM`|j zRY_E#`E?Bl1DJGq?NYq|J#}<@EXK?Ee$UR%7#mnS zi<-&`3I>xwg(0ec$!RBHkiJsp*EZmD0X@|0D(b*PgJaR$RT1@#E%;BgcVQ+job8Kk zy?b&aW;dtjiuG-=xvFX&0C4AYq-Z1 zH0`CQ!7oaXl|_1J<=<5h_tx8QjS0RVU9XITH@zadd%Ed=l3b0^(ecb_%PPw8k@ib& zpt((y0~ca;W`dMzJl2+1L8>a^%=v*h#n+i5PXK3rF3ul28CB%ERh6{_RK)_s45oS& zzh0P~ri?gAo=k+jZEI}a+(lZo9?Of%v8W~&B97nliP&-7jnRZ9SuvVsty!kTwY-#G zFSrI<%B`S(jvFv+8FRb7z7i8-gR%Xph^w#L6La$b4ZYnlOU_&0+L6%XGT5@2s31s` zEygN-a)u&)2flb2U}9``ET(6t;^6*0@%MlAu_&eB@OMw1i_Lqs$FY6js+`+g|)FY1-WMWGrG8mRL&-!Z5O2h%cXi=!=rkh+m|RTvd*65o(u%sEMwv zuF$1P?*39S*Dol8)q)B@jmeSAaqnH9Ks!lQI(Ed7M~}t?R=8w&G1lfLV{B@I%1>i7 zlAq#uGq0^O7llPD(^I5R4N+cN5eo}wa$%C5tBTmNsUse`|H1goV<+PMZ+KPIQ3o!q zsfzx8i)YAxn?be~vIwzKQXmL3Xj;Y0ucpt}%ul1`OK5g$OLM&OmV@!&$A{yIhwdTh zJ5LRxChBnqZ5^Fh7tB0NPsw`;1YIu}gEML_D<`U*h(Gwhe~Y%(*=Xzpt(sYio!#wm zYX2+Z-~Pd0#VxH7b#0x|(7qI%U0s;tWq4eFMmn_|qa&kH4+GYSvKL|Q*4k}R4^%1I zbnNu$_}fo>F5dE*TcUxVZSH7`(dl_Kd^H*omI}1Jlqh=`9J-Pwyb7SvDXhTMM6C0$q~RGxL~8j5D8G z!8A(vhPnnI&C_wsp{u!GY0O|^O^>#cH^1Y}uOf2Wh>`xj=mG7jqM+YOAocQ_4n<*U zF;;*qUB@h+*}%*%6P#@j=nWA~mu{4Qlk1kpIBC;AJbp5M`R9K;%Bd=?Vcu)&+oFP| zf`*2sxc{?%6F0p24z#&FT}82!`Q6Lt7mUIBUL}464cd3$^-*2hM!j|(f|GvW6HCk2 z;(Gk#%MR@gm8qKa=iI5YbZtBy%>Ww~3M?Ov5oIqI=A)&fIdj$uIyK7B$ol$!8lqu@ zVse)E*F|-GRqQ>`MrDcIdVYp9i1Z3gU%>}kIvkFXjKW2!mJ4gK0Lo=dFpJs#@Q=PL zcJ;Kx?AQePH`S%mN`gEV#l7a2X5-|EC*qZx@5uLOjYQw^U8>G60D~$2k+)VM$y4-bt**Ou<6 zuB%OuqZ-tz6yh)A&#TRW>sPWQsPA6Ew9e7OQ$e3}M|*or;oD0v_x1J7`27cC6T#dH z(sca3C*yS=cxUX~wSyd+5+u0w#L#8lTY+_`!q?BGiLa=th(kBt78j0xKNdIKa1%Ip zBON1)@HS6C!DTt^m#^;*j(-OkTr2~c+SF86Lfp}~=dRDkB<(e&M5KhzX- z>Ri-RR7Xo^8);M}x$#ooyRos6ZjoB9iHT=Dpa0Y+;`*Czjn3{aR#cu~jJ53V7RD-K zzMcmLyQwQuo7dzImv0r7F#gk7wNFDbJNIQUjZ4>WCt7Qg%+GM&^M(|Zt*Bp=D z`^C7qwJpkP>PT%!Nx-kR?%o$izRYO_`ZMN9XEtr^=5rfy^r1)N?Agv~QJ14L<|=iis(%)xIgF2hPQ=U0bjME78|? zF(dLODpnOl>Sa}b)zQ{gX$;3Q*YqSqLrqBB?3Ze z@m0TkMT@_lK3C}Uo&US+SO4X&{Ojj-8yC+;AX@R|;mx(|q*%wFJ@Dl(#RFgZTvS$7 z;&SRwe=DUQi z1%fzn>w`d^25Y0kWBBE!XliOgYpYTab-ik)k-XP*moi(IQw0Ds+SpwRLB$%f^zleEjN>tl`nXJbw zpC1{E2acbOIX-jb^!eb5u?}$q5JhaOKtw!CYNh#qv=MJ{VL7Je3vnK8UL_W&z%7go z4aZe957ai*$1uIrTAMZ+@hV{ED&d7Z#W@0W8rG|PiYJ#kB zz=`80F2vc(BQZe!`jr=^xQj}ZM4ew)qVt3FXjSuBeBE)w4e{BB9*Y0vC*Di<$XGOR zBBG2ud5U5~Z#MxPrddnUK#HXwUPEYgD>6%e%}?EA{YWX_<7Ti#c4{t=SFf^^DQT*jSU;3}n(%b_x8rdMNF{nWq z#Mmf+9PzgVEX>USI8-LAD2QOysHuelKZSU;rc~@1rp!)FQVX6X=Ot(MI{4-(Oz_MOvn)92`6ZjM^6S6GAvXzB*UE-yvM(5ofxWra$Cm?R~Cvb$1f z)by%>!)NwL%YXvk-+JrIV|?&(^zqfZYbUvL6FKxWYg)`eY+bEHfGYT0Lw#dvZaMe0 znSKe^p`UF;AiZx1LX{1Er7NU*tOxfnSD2@%e5DIUSxdn z&-_*Pg!y}8fntA{zb$@$?yG-4{S(E{J?kK=xCn2c98C+fD;wC@oWQ^|xnyPfI-2R|V6g*XhEYT#7gjQAoF(L>O-ssjyw-Uyb`vrq*C^*!Ak`uf2Ia+DEHuq#C zU4w5e5TTzwdoFqbJnGO^yGzW4OsCdGzK9!E5X@Dr6#rQ+w31bhP_HAb_LE`FSre8- zsns9*KK7>t5c{s;-peq$@67Qyd-@5=oKu7Y99ZZ6?zfD4iIbP}-ZI?~0%N?QrTFTr zsOtu8vb6a1lujpqPyHkR@zsw!^{;2`gP(qb8Wwc_XFd^UpLi&mdJdyOnrloi3vttH ziSHtzY;Xm_n;Szp{x%?`f+LgJbQP-|9)r+Q|KzS~}TpCH3ycEQYXgVwK7iCZ(tp zK`6!D=n~9-R8;q@hM`aj8iap}^+L{Ys*WCE8A+bjxB=v=OdCwginAA@nqVIq~f92w+8HY~Q{GVsSU#H-%}g zZm-G;RVf-ZSBsVtm8XwI`WEQ;kYEk?@G|zPaAJ5^BW9h*zLBN_wRncoWix)5Uu5c4 zx>1S1qV*n;a8G=0mHno@TO*)Ew5qEbW24$G6iT1Cs5u0y@BDd$9*c*iP&i95^_u+# zpiq&2z7_hn8|hMM#nfvhTAC38+(s+iqSZAV+riotVcv7%o>|7pq2A;i>aX{2u)ji zV+K%TRH(W(cd`Z>+Sg(dM$OS#S;~3~6!13|7h(+{r3$xUx>tZPhC?E5B4e6_)f|Wv92w|6TY3lSp;+T*n*K7h*O+1k;VDsRpm{R^XpKHgorD(Ub?Y%cHWr`%_#eh8 z82y?zyfvztNYf~*3L?p7>BPIA;VXH;a?zMCeCjVrf0m-Q9S{Q(tVZfz6@XQJkimmL zQ;NL}-)|Ug62VRaTvQX03Jj=!`9`~oY`BJUUv&me}V9+*wPf2j$e$P z&24G2)hLS$ix5{qDd&uE6(+C*KefjF(=Bj+v2eAf0<)*4=-1S?_O_1f=bE3NVht@( ziiIg~ErT&Fi!h~l^9GkUurp{(bIrPaEy3&+_Fs;WD1Z{v-f7`W_qGauu2#S`%(MAw zaCO~|8ehP_OAjqX1%hOQzCoMxS$3hUO?nt;S-D!`{k2VPv@UUy17D7YKx0fk7x6&6 z^s29@i}Obxi9Z?Wiy!^jU&8tU96@)PESsM(gVjpQaZfyQUtBtQ0(7YtVqsEXxDxNh zG)0<8d!3Tu{7h|HMBDU#rS>V;^SAF_fJ=!Vp}rPlKA8Z=%;Wsb_4>ahe0on=G)aYuU# z(K9KKR*CPMn(?O)+dWC#8Z4BWsy3J7Q%&WniGHU*&6=rf&BF|T!5WJU`s7M9c7gS; z!t9BQ=c5f&YzC_#K5gpcF<3RzCO%!5mQ2t`OENh^6F5YUHKhzJP?)`8-ifApKup4#i>Uym03IG>Tj7`r3t}m2^gfSL za%@kb6T=pRt{^BA!c-ONiCPN?k4#_}FqO}P|v1pkC~;RZ4s@V z0-{{zTIQ&0Xr6*mVSvQq7Z=zhf}lok-`d0VxGz@0YEo?-(KRX35=hfBjMaoyljBy> zm{)}r(C6ykeXlvGt+on7J%LaSKX1TtOw-vniC@)!$LZ6J-pBECn&mnes&*~GY^{pd zQDcQg%?FgANzCpjMF|5%HCM*ZU=0Q?UEti)3~Q{31-eaK-{$TunEmB!=BvRP8CfI4 z_+FY5urA(n8X;LgYxUy=_RNrq?D%~6fxF`1jW=Yc3LQhaE;yS4Wpjis!Kix)t(RtA z*OX3wN&nL4K2!AXD38njmL^)>RRJdSojVy9Pd-Y4n}uVV%9U_7YHfDaC>Y6?U`Ep$ zFfJozBHk4kq9mDLDhw-pW*Kv;aHwS&RPZ?&Byhoxh+2XCh@d^UB#2STzgNhmYl*I> zNKINmgOpmWL0T-fmU%Etn4u1=v@at}1@6&*3gYBco+>nFc4|JG+ztFz$d9-0>SgqU z%>YAOyCEat0u0hB*dk=gqVHbiCi7s`m1^=*S)2qi-AcpY)aY>Lt>u_mee9aOM$lrC zu9e{ngZNLzO0dm=={|&6p%CiCf?;l5kN25G=sdAeU0ol8V>5A@jNpfU_~!`j+A<@5 zNIJPo_@D*Qw;I68Xn&}i8l@_xV3pE+a^}dRK(3Qy53OlkzA1xcF7$;-OL6y?zLZW~ zaKW1z!1#MLxx#=7zp?@mgdnpXie@g_3k8#uR!f1RR8>fR1%%?G2nc_&;R@g|BTR`< zgZW%y11$_vu`YYL?{e(eu>~n!0TgI|0ArrPycVJv(`sb907D&BNQpnAQH8|b|dM0xd$C_$mOKF^V42stVyxny`i`h%XJ6Q4k4#Sk67Q zc*l=^IksPaM|}9*@8wWC_heX11)VUE3?AUW5qd4mG8!-DAlM=vu|T%rA$S}TTD;2C zgW(i@Bq7)QO&OdEs4R<17yFS67QhS)b32)1uu_WV*+@?Cn*PbO!E;0k#XN_x4LCHz z!jMY0KCHm!78gu2N-&|dxw#F0KDU4nWFW))EdDRxn|gbDqQ8G6H=!S2C!J}a;xlON zmMEzL;wgM4{o=(d1ZoOfC0}Yurgc~b*C|t{>5Vp`Rm)eiM=64=Lg+f~J6*7Y_y!-hx$KuZS{xqYV_F=tf!bcnJ_0B3C#8qjGi3LqI$d9d4 zFJKuJATfkmT*@ext(y2_0gJFsEFzzLeNzU@NI`{5XOBlCCkpVIm`cnGL@4^tB3zc~ zhSPC7k>&n2jT(zKa7+Nhoq2s6EA3kZ-oYc1E(yclh((Xb8a!IZ-|llE(` z*&oNAJRYr>Sr2u$15GZ{CpAGoa|ew8b)Y&%&1zch2K868#{f{KSRCjez)F-#i6%{} zgQ-&sfF3=dLMezuy?myg191LrJ)3?%j-WOaiy>&VX`tzvd2M-rby-}#JjB$2=9ndb zn}e`(2*S4Ro@}!n9-E3;g1nLvg$YgMb1WuDOV+V&p75|!Wu5hEdHTL;I9en*%yv^2o{2DA{D{ zLSYi-c@J$;(PvR>#|_Ak1X);g}Ih6OZa|` zV9bM% zX->JHf@1`%f01yGV`$ z49p5sNwfxE&s{UEqL)Qlk?67EL8j33$M$X8Gm!GU54(Ysk`u52(@?@9mhm&=NcA)) z{-6X}O)(!q5X)U5HE>qO6oHmzwK{_be#ydrh3K#-m{uT02yF9OvB_PC5u(DRW$|ZL zYwm0bv5eHHxuub`XEYjnx3UfcKP&^*LdY_aHP$Fo5~zSd=D!AC24)*;`Z9nP1Wsn^ zvrF-@1=5?Ub<-^~g5rFSd9G(WL4p$qRXNt84nW4W)`7lhagJ9%oaSBsTh)mRz-;$_ z;ipMw;~_Nqzx>&s#O<%T4Oh{a4Exu=`S0Sf`|gS_eBzIZ;%|bS3{7S1)68%`T`JVm zSz|o~m(wSXMLSLWD%JTD$FTx5BtWlf+>z;;O4>pX86=92ee^T&&;Ql0##`R{R?<*A z)Zi|!e?)^JyzJwD-*Wyuh)icM-WM}}2$9M$TjrMqcO!jXnXw6{8lOy=w_O{rwYe#f}PaE-y-)e?`YtUw- z+QnwnZ|kkGgJxOnHZ98-1A!A}Ef5Q+47a@M`&da}xz2H|0(o~u9PI6m(Z2Ec-9P=K zc>8#*(4H}%3?#D^t8EQIc8n_S>s`chcre{zXu^p`(h5j9zIqwW zG!mCKRqR`nuO=TlxGx5o`Ju3`Qp_k_JQwf$nGePr-t>c{Jh(OT9hc9{_76nuYqf+k01Nw-^J^H^!>QKg_!BNap0=B`= z?v0X~=6Lmc|3$pK8wFJsF?t(U4qd@yK0vvSln4nRygz-p77g$06_OpnE`_WC4sXl z1A$ApPWoL4YhJ7-Zra=pL8cH8fe(T$Dm|7bCnh-gK$_!hO0nGr%7_MJM%D&@M$vWT z(3aC`8)&L$*XFqnDm5;s#C@RlDUVtaK@wq5nd!c=lY)Qb`6PeBdW9Lio<#^Uf6U}Y zo@f-ctK%LkQ$cTkS}&G_keodzxGKW^pZk0~`q_`f%o=C2R-qRbsE(sFTWP*WTJq@3 z1*Yikzy46vp+x%L(rRJ=nkQxvj!R#@mu#gFcYN?S;@|w?=i-AO`Y=V9?x(7Dkhi#C zSnEIj5fhz5zhI=v>_r;P%R&1Mwo1~Z60P~E3^>#{gB|jJR(@yk+p5qq{&s*$5Hw)D zN)o1>TCQeWyw*#r{kHQMlqhim2`k{WYKf-a=voBHC|CeLhl>Ir^pZ*p61+H{(vyQ~ z*bX4g!TyVUihPvdBBOcCniZg0Oq#7RN+rtxm?vi>X7D}c@2+dp=FRB}oKtCGU)N)m zW|7jR$ea0pr~zL&0$Ivh$`Me_m@PHt+Ec)djx+9}uuxhFouHR_^)Ow$Q^W{j0}{Io z`z&I1-{1TNM{v6Hq@pc78w68hM8!g`t7!QQ0paweiyU6xDZdi~7$pvx`1}LW!Z6jJ z`R(6}fBT>ROZ@nUem3^*+s9|fP^eRj9VBnus4r-L zqf5lYj*N8{ZO@YJHZveIlM~~Z-X+qIM&>{cfjOhqG7jw=9vvsCpD%(M5UhadwGYX1 zn`YE6HBIwcz_&TB6Oq+%?nn;L|tWbaPz1aFNf5 zu-U7Bg~k$jtM&Fn33XcKnkV0G-_)MJQ%Dvuot;<#1<&zJ-ZLlMv0p!vJ!J@@Udi7% zxYSmk0(-v_FXa0WOlNS}`nz-29>zX2#P-8G7~pm+vjAylVdBZhAI4BzAj+lR8m-*O zh@ZTheOD7hXu>bBk7M^f&i*Rm5-#NYg#l83sH*sR=6C)3Kl(GOMej$@cVytYsDdTG z;E)W>FW2gV{}Be~k0F|pI*Sh-=|2OpFhOj<78wy7KU`vJgJziitU*AF*EWz%1Dg#} zwrV5-Tmq3AXS}|nk<35+T*7h?Dv5>f((meShADss2kz zGp&FpJs!L3b7=Us><$&bF6WS2)`QW1vz2ui&1EM!Ui*r--^l?uXo7Z5aCZ4${fFO; zxBSq%qmeSI!ez#R+03=&LcYl#U!%dA=TcUwe-REWtPw;ZWkQVlNectT-7Xqs;_XrPW&IyTy~urSm=1bQ})Uk32!tkJQP=i=dq9wnX_rR3P1 zCUbI3)459TS5x+Ed-`w{Cb~{*-V!C1fjyh5`3yv{-+2hTh_-pA%5q^djR^{dF-R#e zW+^$jMSr$~Nv?>=C(d!We1v^}RmACIPsHNzMWmu8x_Yr9SS1@E47wVv`EvGnoewTk zmD;qWE5}$Y@jIs(boX>~UwW}&E=pdci3EBEudih=#In?;Cmb6@8;DNVMX%Vn8#%1xaqA%frsf8iFeibPvB$=jM{nNz#%5- zFhvhPXd8^ax`+NOt7KXheQaXasE}15HCfG-Sq4VN5`rh`uMq&tj^gMNFV8X~4Mz4F z9+9PTT!|v?VVQXV7A?Vl(MKMl@`S~p>$JJ8i>ewx4SQLp53CxiV@hZa-`TZ^xIxXf zF^|TB$#e1OBafsanV#l?m2$tH!Ru)ZMmt;<7qJ{Q(ofz6I^q*dM03&1SqsNqGe-?Mv15(Gm9BN?U!eA(066+PtIbF8NX=G0TJ>)@R4D5*#t4EHFCmz}|N z*cGZ-7345y&(s12tC6}1O|?vB5$Qr^uuhJ3GD>&s(yZ4aF7SfJ5i5WTiJ_vu8C`dyg%_!GZK9yiN95T_1Kr;JdvZgjHo5>?f9!c)VL#!p?Eo5zbs`9Tj|-Y@>rIn}}Kqpv=tdVhk*B zQ|@x+^y#=|)2-~C)XfV&!x!86>dOE^vv}#;ML+>1)aV(1VtA)C^E)YEl0S3IMKRi zW;sFW>%@r@`FHV;XU^fLX|NwfcaZ!G7ta$|Kz2n|MzGmD0L|is0kLC2Wf0PsHsNd8 zv`;p1EYeTE{`JvMsDFWigZ1DV7~=cvvC`CkrxoC{S$1S2MYn*T*S~W=t${(Drc&>$ zsVu{98^j1KC@c~_qgUKTFJ-?u{Fuf41=?VR9V==Si;V>0C3s$EWgZP@p4OIbgl>Vz zn#15~FTdr^VD-2ovjmCHXBBjX%^-Um|1KtiU}6#|_5lY9YTLTLb{1Ytkwml!_m? zrj(NHX@WVl7x$;oJySLQDub0gv_x~&hs2e_RDx$x5&SI#*Ke5nD%rlr+|@2Y&8h*D zvn-r;bGh#lwc2sUDby!QqlvYDO4FTx=>!)Q;^RUv3s@6vl8~u2Y~G5EL56348}Ub? zMDVvL2rxqvs1V8k@7uw{uqv4PE{ax3-?CO_baX0?KJi4ZUnsGsyO+7q?HPH`PzmbY zvN`*p^q-Xoo^814pjd=4fckNT7WobL^u0#(wYJmpy#l8H&f_C|Z<~>VWcP}HX;B5~ zYsdNcfT5r4fh<5 zk!T}1^E9>KnMs~J#+AD|c;X3vzxN=RpRI&(Muz$<377}JS*xcJG|zde05g_lIqqZc zbI$4@;7}4pmiV9Rfr%p^d?ahB>&*TbH?5lodIY>U&H&QuZoVbn@B??ooo{#@-6Cu8 zz!N9I$ESh$ipN9kepG`EuIz8pN{KQ1k`8bjIu^0;qye@7o|9WdrTqm z_w3P=8x^@9piTlr%Xqptd!H3lLe6ZqAGpvTo$Z}z>BO6bQ7%hWUs8RvOKJ8O?*!46=CBgCemhG++Tz2<)ijJz}`#q-EsYW!!(+-$QKSKnY#U zpWQGG?D&44uh2I<72CTReuhgBI`rVSKCiN}BwqdMHwN=XN#9@w7Qy=|&}y9m=K8X- z#EGBJzitqm{GA=0T)Yu*CO<3gl)E=5Lvu;4oNH4 z&CW`@L(iQ!4idK`HPw6Ckq6YS>pM2%0?A?|W>P(u^)3JS3WNQaVr9wB zQ3v&Ch!W%fYOR5fQg4*$2GUouV5>x?Ax@O@As1VFdoVEsJ&~8kJGMXE+O}A^z{NOVji0Rqo3_z# z6-#vP%sKX|r82sw&#M14=+-ubsaQBk{u(_#gI94ESKf$pOj07OVgbe8Wy~^?Z3CR9 z#b!2ri!&?`;-`MMlC2{iP08~}{LVwynrF2_L`jIVlEp3?9c!AEO34EwbqyOtoZ``H z21Y4=1;)*26}*<3F2U6*11o)`K2Krr<+-BWdv?avySrm^dpiLaCB@V{tPSr~b2uOo zueteU01KFVKF7zO5+Vc*Mu}?8x=mwMl_gVjdqcaNoP&1(VJp@ zSHj2;(}^@~tj2W6MG1AP$@-oA9u2U$og2Z@BEza6zMsvV@ENrwU4w+?I!iFpQXK4m z&L^q}LMVKqObs0Jx`rU7xfacaaQf2mv2jqO5mJ?r#C$j7mshbkiMc~KU5{2tK}mr^ z7&N&CfUe)D*?7YWm;&LKLabG=TT+1&zO}uzjKka6w7~iVLE3>FJqu-{VOl-tXfuFm zoX2J62=-R#rydy?D2`bqYp^}J@8Upz!k)Ge8Gcy3Yro~{*u8fzwD5iq=2^VH!eBq+ zrV^lWUZ%$y0h2mON+%@zgo} zm;R)bFAq9rSxyrT>-~&ooQv~Wa%@bdT9CmC*Ah_hMrx(^aDC#%Hl$U!CIU2n&pX+W z=fgE@zO%zqziTg-<~IAW5mKXIO{{{XhOzwIgNzfK)<+xB3W6y7TAw_FtEBST;%E3d z0jI}dY+g_p?0L3Rquc{@tR>S;elMeqU351_@H3d_S^yIRwMibdX}`9XLO$rajLygV zAC24Zd^>T*rgVL&IIQ!TzKRTgW@iRILU5NZkOR~H>47g_r9^*AY7iSVpVg%D4O##@ z@S%eD9{se7PeK?3X&yZWDdEN_cV#e!nKRln)v-2eNz%?m3)NbOj8?gJ3K_r4`*8m( z`13jQVWU~we>A(=1$(U=fzSl3Cs>bNW1h4p;X6QrvsJ7aF!|3cqHQ-LE zf$38rb{0lJi8P7c`+9voLlTtXVqfiacB=(?$9wF3-dbH{XP15!O`%pWW-L8qB7P z3>iqGdMM0Pq43nHcT*aFwM&y}Cq@<v0DVr^QVua9F*{QRjZ zO0G|B&*PpjTg~sMR7v*SkacLs9If*AiYKrjqFov__(4y`t7+!nrYsf< zQqv%kGeev@``9DLn5lI>Pu|HaPb7K@-*rt-j?uY)IGMvvWv0F~zqp>QziOgCHy!jI zDRfv3iym4P&-!LF92+t&QD{9FXCIeCVQ{|D+ROoQGKrnLcC+*Kc<_r~Mw3C@v>x<9 zm-5WUP2D||RGskG5q%LX z3qS-DfzlNv2Cr07GTk7Lart~#v~KLlGeZ?b?@r5A;7Yg#vdXLsrqzPoOS|&2nz;Vv z>lr@Y6Bp3Xi!>x&04r~Tj&0Cqn&%gvI&(4mpWAr0lZizJbP!_n6x}QP_oc;ohH0*B6umo1Z=507HA^oYSqaz>bZEPi?W{Zv>?C9)@8FJ>jT8QlC)J%w? zqN??BN-)Cn!Rweuqr##uHBeDQB`{GnK06^#7GZi;#U>mC?4%e=3Hc#@=1qqX|sFqdOX;vnNkLm-XoGYRL${x(dZ%U&W+SS5%0GLtA6# ze~uj~Xt}7TcJplhdK!a?lF^tA%!}!V<-&4&T_u~bewuA95J8IsizzSwf}jRf1O%&S zl=-3UukzL?)T!>8ct;`_lvPY~4!4csKLj$c^66zpjrvfv)(z>?yiPhPc5#J(LZd=< z20jLHn)o~byfA(}? z*)FADdzP=K7+eH0JjvJAwH-9&GK=APebsIRI1l^4J_xQzGteSq6zix}n5Ve~d^PHr z%;FaWy7(%XB%_Ir^;hLYr@oA0JyK#Tkmg)FDUjlOWs;hcB}o1u%xN$2jFlH^q+Z|C zcOq<_S4z;G&{ziBfbSsiVNjwve;~iB(3Wx9WSVQ%W9PoT_-#fU_k++iLM-y(DgsIK zO(98{tk1IvUZ^#J4EB?jO6I`K64Pt8z;~=s_fp)iPiZkjC|%V*8=O*U5_W_LCSqn7 z&BQF82r+;5<@_yEq1KKTd^GSRT^sW>+Nm_U4BrMBV&JjW`1#-be%8r>e|QQIx&g@a ztY1laKd9aJ8GiO4&rFWsUm#=&zM`!&rBI*cdo+s<_)yzQa_j-s532v`NVX85;_3Su zxDLDK-}qCQtoDgfud{h8D~S>*7!c8b#>3ZYzJAZtNDYwi)ucZj5QnPSRA9@FDzCP! zKn-Y|n&e>c83Ly)M{>U!f1>K`wY!KD8nOe@)Tb^%5o@}hf}rq@bx~Vgn+@#}SF7O+ zks^bQrePMs=mS3T#U9P!OW8-Je7P?af%h4x8AO_c8(E9br@KQaM6Hw(5kE&PdnkN% z8YGZoD{74UvU}5>@>Ocd+itu%_8;ItxKN6&}@4^vaj!Oh)KqjRFn-Rac{CyF1d~Al><1t|c-3 z%sM{JhCJU}4g@IntEM_sC8_d^sWI4pd!g)L6gywh~SYE6x81f9cgMosu^4`*Wl997&;ng=v;c%`#-DYg8a?fLD-pE&j~I-LA9V zS~2@GJFs>x$RgNbFSS13$Xw_*CnFR!i}xbftgpZ|t)KTj{7BsKo*!X45Z#yDKYdtI z>Dm8LWH2`po)c%@zI$Ix3>}5|MFLwW$kTo-u#%fQBf{Ufe{m&G6H*7^<&XKZjP#{Q zuy6QXEab~%M+>R>-c2b;8mnKd$#zwep%GVFA1ckSU)u|v5!f!f2TQ!GYDL+# zmK`?8U5ij8UIz0fak4E&|E@Vh3q25~xy@7me+mpeO+ z5=>2vj1y#yWO{ZHsB+7mU1$!|=P<(y6d~-q%m+TRjsz|suo~s5$5~J)>$0wGjg-a- z0uAg<25BnQUiX*{?+B2BqP_B%skCqixu$=W3Y&R)#v$xs9cFn3Ng|Kr17I(by&55s@wtCNGe*W=nSX+GWR~RhFub=CI!L2)9jimEbPc<1$QPR9V z0+|d_>jb_Hlw6>5jvaXWW)}cf6G{4M=niIE@rRv(j-q<;TX$l7<>o@`##%S zwesS?;==k?d!?ta06vq+qJj^dHn&bUU>V4DDcG!0q)shVNNrCNn$6$y9y>_fV8+GFhxsezZ*Y8Xv?<;&r`k)t0kqL`|D{8#$=!|O)af)fBkK* zkHJevi8g(_4Ml!Z6OVTqAzQAqnBe`bgR;`pRu|Mu(LuARxiTHnlqvC6ne3j(W^&C| zepawUOiQ8BbjeJ8t+YWfw9U}hU_`V@E1-Z_2rmX=R(F^%!+67E$IrzRM^7>$f&pNg z>hY=VF*d&vpFeUYy1~L{Ck9xDf99MBnDu(jsTwTXb(s5mU45VZ-UddjEQ2SlN{%PC zX%1%Dcjf0Bz~xDfQsZ5VZcHIid;PbOeCEFhfi!Smo)EcGl@jsc?R-WWSeC?Xv9IAL z?};D$(7%h`t=kY{!J}_eZJ#C=UtutE#U0r(f9=}GqgB}y-6J?z8u8Gee}cgk3-SYo z_DS%wjwaT5SN_iZX&#HYE4eXyHJB2Wvd!0hB=Uu@ zYueRz=^-8Tr|HAln=yuFUyWCYlfJxHE9Fap_x)N!r|}M+i@5&fw`3Ydw8uN1JA*S1 z&bvW0wZ@z8-nTDy9(o-`^veL<%!P1MX!kN;xMn;1qxri8&S`FRe;&FbHL|07Gsi|b z430L{3Q!=;=8dKk%aqib*i`18+*IGH33slBFSSGB`L}#ki4D@+rqW&vydXU9FXvJ0 z1?s46j4SeqrI#-CG1aCJ=jbJN%+jk~whw|k;MBqdE&QUIB4Q8|Ja9IaR?3t9 zHPs#vw{w%UjCI&bf26st1ei&zhQQOAAXdGy8G@Wv4b+9Sa9lJk6pVDdqtUx9JhmyN z>)|s50(la0*));sJFr}hFJWlfB0|-BO>gY#?oHu>u&nmEzrIF;wFok}xwSoB`_}g` z4*ygF07{aJG`~~oMRMGfEs zHF4v$9Kx=v0Oo535_MdERnBhodIA|TLLsuNQ4P}{JHpr~*`FJW6t%7xJzs$@CATS# zLaSMqR%)^he{%lk_qrr8dGlaR@>kpql(5($mf-%8?CkI~9V-_!fze%id89mfwCgO@ z{iT>cHzq$#gNqhK!7)m{`q~?#aT7I77F_9!4$KptBkyMa(FPH;+MuLnBMR$3{WJt-)p92f2^sGgj+#?R+xmYi8IBL*%D7v z=J)23-Yx}*Yp4x2)2#zt7Ec@y)R4M43_t}n2S8bwu9H?5t{6Paf8pp>uDOSA1F$qBN{y1eEq9_Acij;%Y|UTlgJwo zk@X_Q5*97gtg~4)QWLLv^N8fOeS4xFm~)WGwt>9RBOemS8->AW-{OMnQ!uP*IX2i{EZ3%WP%D)W z-GI!MM()k|*VeDJT+%pGEpEC2#_m9t-B(>r>9p7x<7tuS8fB_e=VQ!-ZmB3PGe+laYH6qh4TJW#1VFG$awFk z+4lVo_jXdPdyog_wQZYPDWA5pc76aj?w~R&Uc$bfjmpmuJo=P212{WAjI!4d_IcWN zTB#V7H+IM2mtD>0ytcrHlz8s1uVHYJt*nui8|-v)B=ha>{^2-x{60((5(@!Le+?b5 zl4o=9!Itf0tPD2X*C#6@c0YLN`tY?c<4DN`Fj>YGk=T10(TG)z&n7aYULr{x{gdYV8pUR=NF6V3RbOh)kzPg`O(*6tlU zneWU)q5(Pb;UKJKd}I_tdkS$he=`LaE<=m^7bZ15E2esCudc#n)^=GeUZR+wAN_1uLL?&I3kVu>qT4W9gT23#;t|Dt9#1K-_tf5)Avxfxuc z$r8%E(wy23MYUrT;yWD08Cy!Z{#a9D-Bk^;5y2;y>Dx5D^As0+$=Eq6Gl)xKwpTvq zQ4$;CxOBAlZi}-39$Rm@HMZV(Q+)L9$6^3eUC;bYv1}Xtv=$0lHZA0J6w#@8z;~L^JY2GA^71`e_4Yy?T?JNqeOqL$u3}hM9n0` z#PsLZr0o!~>Xc7E^)nd(Wy@p?9O;ZA5Wmdmpgy%uWw-R(=Tht zV>Rj8n{SWGhArHU=#!m0OUoc&hDC}n*_Ix3?|ybqNW+38H8wCi~m6=80YcHV){giV?>W%l?j#-e|;ENJ`R@m7<4g<7vDR} zR5&LJ@Z1J^%RI7DQlOpo?2&l#v3sMD!)UL6!)vfgj8H&mvRcKuv*A63g*_2zJ1NJP z9iA2V=^}`MR`YaJ+i=7L+FE(SX@!DCsg=r9HB$x}Xuxx*YB>!HmDIi!5(S+bJn`=$3%)Zo@>Jnr~mJ4~$SMyl+SNuwimNsZ|GpF|J!LOYKVinHxPxq7~ z8ZphLaE`X{nT(EDcF(%l4Um&gz>y)=^fMp+#VkDN-qIaBUCW*$lfOZOzxH~j2%K@kzvDL z*IZHyP(b@@@lif|z)h}@P8b~d3?)sc_s}Y-iAS z&bP#LDxizA21*r}=x1KU_g5hlV%9!MO;pa*NFgZ(oi;oaL7Xhk@Na#yPiSdt?}$@hzCV8a=YEl1 zwGM zRoj`EWklX%mxnb|@2e(?HygN_`c#vDKm73HdFo<=_b%ZFdwRCVaNh+Q<2dTcmjKK< zk-cA%w~pW}C-14PX=RE9d5i>GriBP0f2{BX1a6|r5D}MbYhB?q=V7nE=xL^n$Jw8QiS1%C4HIhx_hG1Y2l z6WUyc0D8u!t%und++&={wMYgvV2UTK!D5L=RpAs?0--@Di|)iW9-?A2(3H?)q0S)b zplaoj9^I1BxT%rmB_DaiqD2I4f95mG5b;`HaaQMaj%zx9{%pMeM?R2#-oP@Y>pQ^V zZ^_`iC+jxU_t^eH-QYI7=#KE}?)oX}&$tcgNGB#!@fg8J^= z+vD&JFK4r+H$>5xyK1JjI|){^?pYs?U@jF1rhvt`4Q5ZIsU*h_iY<3B>(!FX1-(qxS5-I<9-=JIFD4&H!jo!M0f>IIA)+ zSA@ycRzgT67d1@j&Jr4ob_$$1?e6`1a@5~2qwI$UM^hVRrcYzBhk1qqewOzjnuPPj zyfC2BZV#9=Y~YlFCeZgeu3-+OOS7q8*|MW2ZasVz_27>9;*nD^f64^DIa2k@W7c-d zsX!gb3YliJg+Z0Sev^MN%#B6Awb;q8lB`l0Mv%fbj^fNv($Mnq8k_tmH2QGGl z@@A#1~vmOO|58{L5?j$p5F6$g$eIL!fH||pIX}4yD4_`Fu;>i;Z|To z$RGC~JsqEa;7ELqueOe62B+D3hA9Sq^wG0*jaU$bL*K6;e_7~|M^=CA$@19*E8QEsXTv|Jm5_`X7!T`QT4xmQXAzq-qxx z{@Y^VH~-K#O_RRyqimTKH!`7oi0AgqO)xD65MOC^Ln1x;L+iE@%I6L`tlFQ+7~g1J zc?m$nGe@Rhe~u>ZfATS!;@Xl}zSr3sHsRaQuE{s(QByNjg1DZVw<$nj85uz!NS$O> zBl%}5*EHxF=VYUunopb3xev|08tDux z;|4AX^Na`BEZ=l*>Eic{T0p2g|C_>qFdH#)8Eh9Ce~myEa4n{A=kNb`9D4gdkN^4C z{uQRZ1;Md>_KIotn%_w6=i?{OT!Xorj1)umaXHuBcnc9FP3cN0tJCbQ!OQ|+y~M}~ z?f?(=QJd@LQ4jqSOxJ{(Y7vs*hbT#6)rBsNXl0&0td9b|{luAqKnOAKMvjGOK_Ac~ynnx^U5nqctx48QZFh3&a&?Uhjw`eglo3J0rD zFnk=nz{?5(Ip@IiimmZeKlcmtuJQaS7@y6Ce{xX9O0e(H>se~BtH30)pk~@@&v9C= z02-vJ5s=6RGYF#g3Od*&X%LYRAJMDNJ#64;r#Y*&Q#DPW%VCn}KXxSQ=m#qvLq#JH z48I&1XdW#BCd2cZq*fB!bj4|{GQAa|8?*_OSn9K)BJSZGFWUK ze=D)C`{cQSNB(#p8=9=qo$f&d$ z^Qt#C;&d*Q>669xB__}b#M=@hkZ|JIf2sKNXTHcOMbZlhZgbiY)92cWh>1gpP$`yU zA+j|GpK9=Ai|-84+d#!e#RpTFwb8y{hAvei2d()ZM^cecc9VMllh&5G^Kh0Uf-4m=enSVWA^U5 z@4jfnpJ}@1cyPv*DK^%9jd*?5k9n?B%<);L(Mr+F!$W+Yxt8F{GmO2@ zv4~*Rjv-Rgt@1d7L%i7M+1p-Ye;i;3h3235E4v`hlJ=E>_%dWeQ>uZ{2Y%ze-f_$f6&su}^7ZOrGe`7=VZMT14 z3=a;_GP@1fj&Tj-uQI|0^GbpbXGGgA=~Kass$cQ_x5bf9{UvR={ZT`z(c85d%~*^B zhY!Tb^JAIrINQE)cEscGUNQ-d_y?P3ZJC->O!43V;9_I+l;pZ&LwWA2=hf6+{c?E z{^7F};3sk-P6Ov@8+e4<`+nkmaq-FX(Y>vg4v7w!BNWNF2z;YvUW?Gt-hwG-XgTFd z=YpUni4v9aJ4Y@VB&CKTfTKjx7tWqza@-kyKFb<7swuMoJrq!3P~k`MC#X};DRsqd)XhZP*?)AOz9yq{7hVY^!|9``#!+K zK{|;^jQUmC7lyG{gy-8Z(Z!FtR(+)poKkas{X@STH@y1xJiTX=w=QOmKIR*5x+RJ5 z$v^skH8Yul;M#R14O=aK|@(galJE79tU|E#QM0Oh1koZ1m>r38|1-0($!fdHmz%M7O6YS zbk9t?=6fH!e-JiEmq^%=d)mtOou1|Mn}KE1rn` zSM4Vft>6);7h`FTQ-7O!VpB^;eDdR;qHlRT-uXlCiFq`?00T#1@aFwjWlynBIZong? znx-6IZqXurCv|82uemPoj-$AS{Rj7C4t?!)FUw~s73kKO$4Xe-7$Hp>8lE7Hnu=YW z&Cx)>*hnPZh^dyz`sty*OPOb@<@1_%29VcuY>)r_|N4*AdO4THx?TkS#<#7(%AX51 z>U3O@e`(2||DXSc8C8?9```fr5bCYt6ZpB&1TD5QkMZ&QzK9kr$IiXGnBmMcIvU=l zI1tvsLoU=VgRuz!lo|rGgI8Z2>wq2ieD-cW&xr#VD>F^eY*UqyM$GebOqPQI`NC{u zbqh18d&oX21jEKXrC5e*n%Av*!T5=h!MHTMe-QudgYS#ie&20zH92`3nz^I~6J)g! zBW&vGU_5e9?Ao=Jh`gPBv0t$1mbT6elzZ${&s*ml=_kEGY8g9LOe+nVz1cQJ{%=iwAgi-#^f3 ze^wXWy*-)s4EJBA7l{fF=X1?-HL(l$Q6PfYy=!Oed)eW*@5sZk1Y%W3I+kV@=Gylp zmwuw}>#9+Du@&e=nUni6i!?3g>_s4kr$87pM=i%w8?-V+GA| z%oUjDvwcJHp5OggvtKvKmJHub@iU8#(&!-apK4$(L+aJ5g@T?4ag6IO+oZFe}bxO zuf0A_4UENuC(km}tUhK5ViqyOOE7F6q^JNh7tn64g6FAbu@a-yYsU$U#?bHy7(b5I zkMZT-Bh%!k(E49|_@^1SKoi`>voIfFf$@X54Gp&k!tKBip0suQ$=uUqdQ3 z!`gHMKI_5ZX7-bf;9>|b5CRGse+-EGv0wNw$Q<1(?8P{t_{R&&Wb0bb@g?-Z4tOGH@3Ca*oNf8}-Y&^-^tD_;NonM=0; zNE|zMEDjzzoN0)KeTS0>mJD1x!*hyu#=GA6mN@-8zZWN*g#ImF+d!`Ne|B`>Bb#_U zjpmd`3s8|VFLgkvy;=_0=CBmzbuzWGw$6eE?YN86z?~g2!?99*{{$_%&X=@c;_T`v z=1Y2}$oj6&iKrr7D>O15iQn6Zp!q&^|FQVtU;p(?&pe^A@l@Z~w^;Ufx5dG|+hT&pnO}AFf%uz0{?j;( z8QguL(&`2ei!5+Q}D zVNzTzKHB#iWR-y-3t^g%Te$Ff#Uf0uf9f5>!t7+k)8zC7 z6)QVBS7K&kir+1B5@HM?Zk1uoBysZ-yZ924#Asr2qe*UD{%JI6 zq*Q4g>I=23us@8!e_&-V%4nglHt@{~g~8qq+A#)uF$QB}jBSOjFZN=v(Y;uiL$+?V zWiD#esEN(LYmDaR)7^IHnhp#c#PTnV$@vKt&G(JI*1f>`yRNV3O6y1;(XDKJ>{i;-y*D)h2AHvM{@l5A z__N1ZU<@aK3vu5?+^Q*zpQc8F0%Qnuc9H=Av>1T^e-#3)&i|M)v@02f${+e@f) zaPT0bHU)h9Ui1PwHCt0+-h}R@mkf^+boNkOEnU)pe*f zU?5$bf5E4y`IIikBpOGpW5;**?MtIq=uzCfGv%3BE7je@wffJ87t-E+J*YjxaA3!q zF{pG!wrnEUz+J?n%_Ul*D~zclZXo75q+hGo=#J2%OiVFy&tFxw!FUUn8L)RV<>^g! zA46;xe}4|>QPRQYS`0r(1XjQ;a8yX5D=t&Xe}{|uG{b@aZ{w`riuO}5yH2WV?%j9)8jX}Cq;ojO{{~3vkY9gP$uV#caa+bG!_)B@WS4q00e9N&+v3kcpPrMs+#L8htVzyp z!;H5f30SI8LcYmpvOl(x?$W!j4RXb6d7OLUD_z)dvCyD7ziFDNdLvs3mZpg~ZzS zIW7bt@8ER4B8TKjGUn^#Xj3fPL|8_qQHWjaZ2hAc{qrKVkk2B* z^Z2E;)V)-7dM-ASZ9g?U5pGC5e>k<}{iNu)isIk*<|(lV2~QYOs;yEfYGpiD$(ARz z2(8wMH=Zm$Y|4!cN?9BY_Hr;bj4?&|mCyPJq{pr>ae2T9&&u1>y0ScP zBY}rGP$9dzu(GH+7uJZ7izo*Rf;(rd3`YY7Qg#&(Rk90Zy{(d=Wi?tXJ=``eZ!6o0 zh8eWbWs(qQStS?HHS|JTe+Mk;gZK>C0R}7tEM_pWKBiLro!LCbmAxPcXRfgDSm+;( zk7DuXQXBN#1O0vJspgb^^n)MbBXhPB+vd-0__cl&T^_R1Vvv0nYxm5nFXKuOso@h< z(Uwl$(_#@S4dsV4nyf5;pWSb)Rvxl|f}AE3x1v}n&sF2&PU2^_e^S&%(w(od0f>oR zW=;qXic!m~5Wpx^#0eqicLW}gY)kY|FCZk@VTO^7`Yy7#(u?w(;fN(ZynTr&gu>sj zG$?+FlUSh}0Y!a7v<_Dv1T&!{4dmYj780)3IUPI#q1u1~B^H{OMeJ?_Yn% z+8#jqR|Ed#N!x&Lf9qG#)RP5A&)1ZR|wIz^bKM8RHB4*{wf9AA`a+p&-LXh>BFVzy*7F!4Gj&30B`g$T(JdS-HfWa z=U;dsy-B5ijzutDs60S?n*a;k`Bt2Z1|6s@RjbmNo1%Y^IkTv5UvHeZ03*VC2?^G) zDU@*K(aHg?e_SM?qZxwmhr|Sz3hURiSS(p>C@$;)sXC5qM$&BLD(l9{G^v9MRE_ax zh;MEV#H+?CJLETUA2*pzNK~!$EWA7|wSv!?61rGmJh(u$6m`jF_t1YK!}yocPL!J< zwtNS-%b2j&1EU;_{YhLEU0^3t@>wU)<9ELIll1Z{f3K#mfAM*MdD2KIhWxQ&$)w1; z^5a?zWjhQ=330PClMvl$!NWv`G;)rLBI%;o@>bHhbQ>$A-v)5V=z?ISOH8+jm^ZZk zl?=-jNOo=x&+1rQKo=1)!I6dhH1Hjd?~-9SPC$cksHh)zwK6-IuHJZW5!`w^nH2SG zMDJgZe>-JsI_q2I8IM)*J#tz=>N2F1wllUm_~Y+g9AO+4o#w|4^?yEBu`_t>FDN?U z6BpAje*V++tuxPpV=w z=sn+r5M?&1vTKoYMKpRoARq-6ua-r&cS3ITe;Of53VW6Z)x~#Zsq^STqE`FE8g6XP z5YFr%mfb)VpxTK2+Py{gq-XtEQaj)J<*&(OnuxnRcc2>rJd|5DhuDRDX^$FX*H+6Z zo$th`;bScn?xu;6$;AGNYvjr$vKrgNz;wfH0vX7oyr*soQ1-u~_H(o5fXB|ej> ze_9xpOcHP=Uvxc3niJME_%lC`@U`CSbH|RP{jf^fI@&;&dSO%SOrN1fhY8wSam~zr zkicgZI{nzF-X0o7%@W6USkWFA_C6dQ9!`Hddp5oG<2Taf92)2oTt^P|r>CDimX6Y- z`sB%z)Zy68aU_5G6TG>?FZom!*fB~(e-r$$c7=HJ1)@O4iv>9Z8}bAYEWBd6=L(Y3 z2CJj5w+}y=q9&+81MW>wV(imk`iGU%O;pQ~ih|gNWFx}C!fb7Bj?iE$(WnMoFl$Ad zKxQeWK-e(oFs&HVs)5Hlear^*`AGXzEL{LK5SNl>G%Awi&@5AvlWA&vJje@Hf3{W4 z%#)~IKnrP%b$4_|7_tQhr;Vq#qlq-!MCXD^%v?N)tKth>o}bcO@q-xwo=p*Oz(w(V zjm!pdVxdGP%4m?2X=eTEHdjR}=`KWQHGcMSJQ*{^09;C{J?yo-OFkjGEK!_Rt$M=uw_YxUl1 zzh8S$`u(H-KK#pv?_YkEtM6#a-{LbodV`0?;WjQ^t7C{a#(Vk4?`y9p8ozLZzWo=J W6q)Tq1m$=D0000-|pV- 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 Sb@2BeEO}`asVWJR;Qs-cJU5*H diff --git a/sco_version.py b/sco_version.py index fda1b3c7..412da12c 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.0.12" +SCOVERSION = "9.0.13" SCONAME = "ScoDoc" From 6074cc3892fb9c68e7d9d9f2fedb53f5fd5118f5 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Fri, 10 Sep 2021 21:48:04 +0200 Subject: [PATCH 23/25] Add cascade, fixing excpetion on semset delete --- app/models/formsemestre.py | 9 +++-- ...217bf588f4c_scodoc_9_0_13_essai_cascade.py | 36 +++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 migrations/versions/a217bf588f4c_scodoc_9_0_13_essai_cascade.py diff --git a/app/models/formsemestre.py b/app/models/formsemestre.py index f02a19c7..148d9c87 100644 --- a/app/models/formsemestre.py +++ b/app/models/formsemestre.py @@ -325,10 +325,15 @@ class NotesSemSet(db.Model): sem_id = db.Column(db.Integer, nullable=True, default=None) -# Association: +# Association: many to many notes_semset_formsemestre = db.Table( "notes_semset_formsemestre", db.Column("formsemestre_id", db.Integer, db.ForeignKey("notes_formsemestre.id")), - db.Column("semset_id", db.Integer, db.ForeignKey("notes_semset.id")), + db.Column( + "semset_id", + db.Integer, + db.ForeignKey("notes_semset.id", ondelete="CASCADE"), + nullable=False, + ), db.UniqueConstraint("formsemestre_id", "semset_id"), ) diff --git a/migrations/versions/a217bf588f4c_scodoc_9_0_13_essai_cascade.py b/migrations/versions/a217bf588f4c_scodoc_9_0_13_essai_cascade.py new file mode 100644 index 00000000..3e0c53b5 --- /dev/null +++ b/migrations/versions/a217bf588f4c_scodoc_9_0_13_essai_cascade.py @@ -0,0 +1,36 @@ +"""ScoDoc 9.0.13: essai cascade + +Revision ID: a217bf588f4c +Revises: f73251d1d825 +Create Date: 2021-09-10 21:44:34.947317 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a217bf588f4c' +down_revision = 'f73251d1d825' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('notes_semset_formsemestre', 'semset_id', + existing_type=sa.INTEGER(), + nullable=False) + op.drop_constraint('notes_semset_formsemestre_semset_id_fkey', 'notes_semset_formsemestre', type_='foreignkey') + op.create_foreign_key(None, 'notes_semset_formsemestre', 'notes_semset', ['semset_id'], ['id'], ondelete='CASCADE') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'notes_semset_formsemestre', type_='foreignkey') + op.create_foreign_key('notes_semset_formsemestre_semset_id_fkey', 'notes_semset_formsemestre', 'notes_semset', ['semset_id'], ['id']) + op.alter_column('notes_semset_formsemestre', 'semset_id', + existing_type=sa.INTEGER(), + nullable=True) + # ### end Alembic commands ### From d14ec486020716b4bce995a14beb508b550e4993 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Fri, 10 Sep 2021 22:03:52 +0200 Subject: [PATCH 24/25] support POST request on ScoDoc7-compat API routes --- app/views/absences.py | 8 +++++--- app/views/notes.py | 12 +++++++++--- app/views/scolar.py | 14 ++++++++++---- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/app/views/absences.py b/app/views/absences.py index 6c84fec8..294856bd 100644 --- a/app/views/absences.py +++ b/app/views/absences.py @@ -1235,7 +1235,9 @@ def listeBilletsEtud(etudid=False, REQUEST=None, format="html"): return tab.make_page(REQUEST=REQUEST, format=format) -@bp.route("/XMLgetBilletsEtud") +@bp.route( + "/XMLgetBilletsEtud", methods=["GET", "POST"] +) # pour compat anciens clients PHP @scodoc @permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func @@ -1249,7 +1251,7 @@ def XMLgetBilletsEtud(etudid=False, REQUEST=None): return r -@bp.route("/listeBillets") +@bp.route("/listeBillets", methods=["GET", "POST"]) # pour compat anciens clients PHP @scodoc @permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func @@ -1470,7 +1472,7 @@ def ProcessBilletAbsenceForm(billet_id, REQUEST=None): # return "OK OK x=" + str(x) -@bp.route("/XMLgetAbsEtud") +@bp.route("/XMLgetAbsEtud", methods=["GET", "POST"]) # pour compat anciens clients PHP @scodoc @permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func diff --git a/app/views/notes.py b/app/views/notes.py index 67f58dd8..77eea51e 100644 --- a/app/views/notes.py +++ b/app/views/notes.py @@ -255,7 +255,9 @@ sco_publish( ) -@bp.route("formsemestre_bulletinetud") +@bp.route( + "formsemestre_bulletinetud", methods=["GET", "POST"] +) # pour compat anciens clients PHP @scodoc @permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func @@ -597,7 +599,9 @@ sco_publish("/ue_move", sco_edit_formation.ue_move, Permission.ScoChangeFormatio # --- Semestres de formation -@bp.route("/formsemestre_list") +@bp.route( + "/formsemestre_list", methods=["GET", "POST"] +) # pour compat anciens clients PHP @scodoc @permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func @@ -623,7 +627,9 @@ def formsemestre_list( return scu.sendResult(REQUEST, sems, name="formsemestre", format=format) -@bp.route("/XMLgetFormsemestres") +@bp.route( + "/XMLgetFormsemestres", methods=["GET", "POST"] +) # pour compat anciens clients PHP @scodoc @permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func diff --git a/app/views/scolar.py b/app/views/scolar.py index 145208cd..f05b7748 100644 --- a/app/views/scolar.py +++ b/app/views/scolar.py @@ -400,10 +400,16 @@ def search_etud_by_name(): # XMLgetEtudInfos était le nom dans l'ancienne API ScoDoc 6 -@bp.route("/etud_info") -@bp.route("/XMLgetEtudInfos") -@bp.route("/Absences/XMLgetEtudInfos") # compat with OLD clients -@bp.route("/Notes/XMLgetEtudInfos") +@bp.route("/etud_info", methods=["GET", "POST"]) # pour compat anciens clients PHP) +@bp.route( + "/XMLgetEtudInfos", methods=["GET", "POST"] +) # pour compat anciens clients PHP) +@bp.route( + "/Absences/XMLgetEtudInfos", methods=["GET", "POST"] +) # pour compat anciens clients PHP +@bp.route( + "/Notes/XMLgetEtudInfos", methods=["GET", "POST"] +) # pour compat anciens clients PHP @scodoc @permission_required_compat_scodoc7(Permission.ScoView) @scodoc7func From a6b97e96677d6c38b43232525a5111da4949e720 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Fri, 10 Sep 2021 23:18:27 +0200 Subject: [PATCH 25/25] =?UTF-8?q?Cosm=C3=A9tique:=20barre=20page=20accueil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_dept.py | 4 ++-- app/static/css/scodoc.css | 12 ++++++++++++ app/templates/base.html | 14 ++++++++++---- app/templates/scodoc.html | 3 ++- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/scodoc/sco_dept.py b/app/scodoc/sco_dept.py index a24638d1..349ad009 100644 --- a/app/scodoc/sco_dept.py +++ b/app/scodoc/sco_dept.py @@ -183,7 +183,7 @@ def _sem_table(sems): """Affiche liste des semestres, utilisée pour semestres en cours""" tmpl = """%(tmpcode)s %(lockimg)s %(groupicon)s - %(mois_debut)s- %(mois_fin)s + %(mois_debut)s - %(mois_fin)s %(titre_num)s (%(responsable_name)s) @@ -196,7 +196,7 @@ def _sem_table(sems): H = [''] for modalite in modalites: if len(modalites) > 1: - H.append('' % modalite["titre"]) + H.append('' % modalite["titre"]) if sems_by_mod[modalite["modalite"]]: cur_idx = sems_by_mod[modalite["modalite"]][0]["semestre_id"] diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 4c59e331..47019d94 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -96,6 +96,10 @@ tr.bandeaugtr { text-decoration: underline; } +.navbar-default .navbar-nav>li.logout a { + color: rgb(255,0,0); +} + /* ----- page content ------ */ div.about-logo { @@ -324,6 +328,9 @@ table.listesems th { padding-top: 0.5em; padding-left: 0.5em; } +table.listesems td { + vertical-align: center; +} table.listesems td.semicon { padding-left: 1.5em; @@ -333,6 +340,11 @@ table.listesems tr.firstsem td { padding-top: 0.8em; } +td.datesem { + font-size: 80%; + white-space: nowrap; +} + h2.listesems { padding-top: 10px; padding-bottom: 0px; diff --git a/app/templates/base.html b/app/templates/base.html index 05068400..0be7c6fc 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -25,15 +25,21 @@ diff --git a/app/templates/scodoc.html b/app/templates/scodoc.html index 23826e3c..f48ad0f4 100644 --- a/app/templates/scodoc.html +++ b/app/templates/scodoc.html @@ -38,8 +38,9 @@ {% endif %} + {% endblock %} \ No newline at end of file
    %s
    %s