Skip to content
Snippets Groups Projects
Commit 07acadd5 authored by Emmanuel Viennet's avatar Emmanuel Viennet Committed by iziram
Browse files

Modifie contrainte sur ApcValidationAnnee (une modif plus sérieuse est nécessaire)

parent d519760c
No related branches found
No related tags found
No related merge requests found
...@@ -695,7 +695,7 @@ class DecisionsProposeesAnnee(DecisionsProposees): ...@@ -695,7 +695,7 @@ class DecisionsProposeesAnnee(DecisionsProposees):
code=code, code=code,
) )
else: # Update validation année BUT else: # Update validation année BUT
self.validation.etud = self.etud assert self.validation.etudid == self.etud.id
self.validation.formsemestre = self.formsemestre_impair self.validation.formsemestre = self.formsemestre_impair
self.validation.formation_id = self.formsemestre.formation_id self.validation.formation_id = self.formsemestre.formation_id
self.validation.ordre = self.annee_but self.validation.ordre = self.annee_but
......
...@@ -170,7 +170,9 @@ class ApcValidationAnnee(db.Model): ...@@ -170,7 +170,9 @@ class ApcValidationAnnee(db.Model):
__tablename__ = "apc_validation_annee" __tablename__ = "apc_validation_annee"
# Assure unicité de la décision: # Assure unicité de la décision:
__table_args__ = (db.UniqueConstraint("etudid", "annee_scolaire", "ordre"),) __table_args__ = (
db.UniqueConstraint("etudid", "ordre", "formation_id"),
) # il aurait été plus intelligent de mettre ici le refcomp
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
etudid = db.Column( etudid = db.Column(
db.Integer, db.Integer,
...@@ -183,8 +185,8 @@ class ApcValidationAnnee(db.Model): ...@@ -183,8 +185,8 @@ class ApcValidationAnnee(db.Model):
formsemestre_id = db.Column( formsemestre_id = db.Column(
db.Integer, db.ForeignKey("notes_formsemestre.id"), nullable=True db.Integer, db.ForeignKey("notes_formsemestre.id"), nullable=True
) )
"le semestre origine, normalement l'IMPAIR (le 1er) de l'année" "le semestre IMPAIR (le 1er) de l'année"
formation_id = db.Column( formation_id = db.Column( # il aurait été plus intelligent de mettre ici le refcomp
db.Integer, db.Integer,
db.ForeignKey("notes_formations.id"), db.ForeignKey("notes_formations.id"),
nullable=False, nullable=False,
......
"""Change ApcValidationAnnee
Revision ID: 829683efddc4
Revises: c701224fa255
Create Date: 2023-06-28 09:47:16.591028
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = "829683efddc4"
down_revision = "c701224fa255"
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table("apc_validation_annee", schema=None) as batch_op:
batch_op.drop_constraint(
"apc_validation_annee_etudid_annee_scolaire_ordre_key", type_="unique"
)
# batch_op.create_unique_constraint(
# "apc_validation_annee_etudid_formation_ordre_key",
# ["etudid", "ordre", "formation_id"],
# )
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table("apc_validation_annee", schema=None) as batch_op:
# batch_op.drop_constraint(
# "apc_validation_annee_etudid_formation_ordre_key", type_="unique"
# )
batch_op.create_unique_constraint(
"apc_validation_annee_etudid_annee_scolaire_ordre_key",
["etudid", "annee_scolaire", "ordre"],
)
# ### end Alembic commands ###
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment