corrections post-merge

This commit is contained in:
Emmanuel Viennet 2022-01-25 22:18:49 +01:00
parent 2c549b3d2d
commit 417cb53603
3 changed files with 7 additions and 2 deletions

View File

@ -12,7 +12,6 @@ GROUPNAME_STR_LEN = 64
from app.models.raw_sql_init import create_database_functions from app.models.raw_sql_init import create_database_functions
from app.models.absences import Absence, AbsenceNotification, BilletAbsence from app.models.absences import Absence, AbsenceNotification, BilletAbsence
from app.models.config import ScoDocSiteConfig
from app.models.departements import Departement from app.models.departements import Departement
from app.models.etudiants import ( from app.models.etudiants import (
Identite, Identite,
@ -65,3 +64,4 @@ from app.models.but_refcomp import (
ApcSituationPro, ApcSituationPro,
ApcAppCritique, ApcAppCritique,
) )
from app.models.config import ScoDocSiteConfig

View File

@ -110,6 +110,11 @@ class ScoDocSiteConfig(db.Model):
else: else:
return klass.name return klass.name
@classmethod
def get_bonus_sport_class(cls):
"""Get configured bonus function, or None if None."""
return cls.get_bonus_sport_class_from_name()
@classmethod @classmethod
def get_bonus_sport_class_from_name(cls, class_name=None): def get_bonus_sport_class_from_name(cls, class_name=None):
"""returns bonus class with specified name. """returns bonus class with specified name.

View File

@ -49,7 +49,7 @@ class FormSemestre(db.Model):
gestion_compensation = db.Column( gestion_compensation = db.Column(
db.Boolean(), nullable=False, default=False, server_default="false" db.Boolean(), nullable=False, default=False, server_default="false"
) )
# ne publie pas le bulletin XML: # ne publie pas le bulletin XML ou JSON:
bul_hide_xml = db.Column( bul_hide_xml = db.Column(
db.Boolean(), nullable=False, default=False, server_default="false" db.Boolean(), nullable=False, default=False, server_default="false"
) )