jmplace/ScoDoc-Lille
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

nettoyage

Browse Source
This commit is contained in:
Jean-Marie PLACE 2022-04-10 11:01:28 +02:00
parent 17611cad03
commit ba3832bf29
4 changed files with 6 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
app/forms/main/config_main.py
View File

@ -68,75 +68,12 @@ class ScoDocConfigurationForm(FlaskForm):
capitalize_all_ues = BooleanField(label="Capitalise toutes les UE des semestres validés (règles DUT)") capitalize_all_ues = BooleanField(label="Capitalise toutes les UE des semestres validés (règles DUT)")
allow_null_prenom = BooleanField(label="Autorise les étudiants sans prénom (UCAC)") allow_null_prenom = BooleanField(label="Autorise les étudiants sans prénom (UCAC)")
publish_portal_photo_url = BooleanField(label="Si pas de photo et portail, publie l'url (était vrai jusqu'en oct 2016)") publish_portal_photo_url = BooleanField(label="Si pas de photo et portail, publie l'url (était vrai jusqu'en oct 2016)")
default_pdf_footer_template = StringField(
label="Pied de page par défaut des documents PDF",
)
logo_header_height = IntegerField(
label="hauteur en mm du logo d'entête",
)
logo_footer_height = IntegerField(
label="hauteur en mm du logo de pied de page",
)
custom_html_header = StringField(
label="Fichier d'entete html",
)
custom_html_footer = StringField(
label="fichier pied de page html",
)
custom_html_header_cnx = StringField(
label="Fichier d'entete html (connexion)",
)
custom_html_footer_cnx = StringField(
label="fichier pied de page html (connexion)",
)
capitalize_all_ues = BooleanField(
label="Capitalise toutes les UE des semestres validés (règles DUT)",
)
allow_null_prenom = BooleanField(
label="Autorise les étudiants sans prénom (UCAC)",
)
publish_portal_photo_url = BooleanField(
label="Si pas de photo et portail, publie l'url (était vrai jusqu'en oct 2016)",
)
alwways_require_ine = BooleanField(label="Rendre l'INE obligatoire")
etud_max_filesize = IntegerField(label="Taille maximale des fichiers archives étudiants en octets")
logo_header_height = IntegerField(label="hauteur en mm du logo d'entête") logo_header_height = IntegerField(label="hauteur en mm du logo d'entête")
logo_footer_height = IntegerField(label="hauteur en mm du logo de pied de page") logo_footer_height = IntegerField(label="hauteur en mm du logo de pied de page")
alwways_require_ine = BooleanField(label="Rendre l'INE obligatoire")
etud_max_filesize = IntegerField(label="Taille maximale des fichiers archives étudiants en octets")
etud_max_filesize = IntegerField(
label="Taille maximale des fichiers archives étudiants en octets",
)
default_pdf_footer_template = StringField(
label="Pied de page par défaut des documents PDF",
)
custom_html_header = StringField(
label="Fichier d'entete html",
)
custom_html_footer = StringField(
label="fichier pied de page html",
)
custom_html_header_cnx = StringField(
label="Fichier d'entete html (connexion)",
)
custom_html_footer_cnx = StringField(
label="fichier pied de page html (connexion)",
)
capitalize_all_ues = BooleanField(
label="Capitalise toutes les UE des semestres validés (règles DUT)",
)
allow_null_prenom = BooleanField(
label="Autorise les étudiants sans prénom (UCAC)",
)
publish_portal_photo_url = BooleanField(
label="Si pas de photo et portail, publie l'url (était vrai jusqu'en oct 2016)",
)
alwways_require_ine = BooleanField(
label="Rendre l'INE obligatoire"
)
etud_max_filesize = IntegerField(
label="Taille maximale des fichiers archives étudiants en octets",
)
submit = SubmitField("Valider") submit = SubmitField("Valider")
cancel = SubmitField("Annuler", render_kw={"formnovalidate": True}) cancel = SubmitField("Annuler", render_kw={"formnovalidate": True})

26
app/models/config.py
View File

@ -5,10 +5,9 @@
from enum import Enum from enum import Enum
from flask import flash from flask import flash
from app import db, log, ScoValueError from app import db, log
from app.comp import bonus_spo from app.comp import bonus_spo
from flask_wtf import FlaskForm from app.scodoc.sco_exceptions import ScoValueError
from wtforms import SelectField, SubmitField, StringField, BooleanField, IntegerField
from app.scodoc.sco_codes_parcours import ( from app.scodoc.sco_codes_parcours import (
ADC, ADC,
@ -332,19 +331,6 @@ class ScoDocSiteConfig(db.Model):
"DEFAULT_PDF_FOOTER_TEMPLATE": str, "DEFAULT_PDF_FOOTER_TEMPLATE": str,
"enable_entreprises": bool, "enable_entreprises": bool,
} }
# 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): def __init__(self, name, value):
self.name = name self.name = name
@ -368,9 +354,7 @@ class ScoDocSiteConfig(db.Model):
""" """
if class_name not in cls.get_bonus_sport_class_names(): if class_name not in cls.get_bonus_sport_class_names():
raise NameError("invalid class name for bonus_sport") raise NameError("invalid class name for bonus_sport")
c = ScoDocSiteConfig.query.filter_by( c = ScoDocSiteConfig.query.filter_by(name=SiteConfig.BONUS_SPORT.db_name()).first()
name=SiteConfig.BONUS_SPORT.db_name()
).first()
if c: if c:
log("setting to " + class_name) log("setting to " + class_name)
c.value = class_name c.value = class_name
@ -402,9 +386,7 @@ class ScoDocSiteConfig(db.Model):
and flash a warning. and flash a warning.
""" """
if not class_name: # None or "" if not class_name: # None or ""
c = ScoDocSiteConfig.query.filter_by( c = ScoDocSiteConfig.query.filter_by(name=SiteConfig.BONUS_SPORT.db_name()).first()
name=SiteConfig.BONUS_SPORT.db_name()
).first()
if c is None: if c is None:
return None return None
class_name = c.value class_name = c.value

1
app/scodoc/sco_etud.py
View File

@ -38,7 +38,6 @@ from flask import url_for, g
from app import email from app import email
from app import log from app import log
from app.models.config import SiteConfig from app.models.config import SiteConfig
from app.models.config import SiteConfig
from app.models import Admission from app.models import Admission
from app.models.etudiants import make_etud_args from app.models.etudiants import make_etud_args
import app.scodoc.sco_utils as scu import app.scodoc.sco_utils as scu

1
app/scodoc/sco_utils.py
View File

@ -76,7 +76,6 @@ INSCRIT = "I"
DEMISSION = "D" DEMISSION = "D"
DEF = "DEF" DEF = "DEF"
# Types de modules # Types de modules
class ModuleType(IntEnum): class ModuleType(IntEnum):
"""Code des types de module.""" """Code des types de module."""