Merge branch 'entreprises' of https://scodoc.org/git/viennet/ScoDoc

Reviewed-on: ScoDoc/ScoDoc#436

app/static/js/releve-but.js

@@ -225,7 +225,7 @@ class releveBUT extends HTMLElement {
 				<div>${data.semestre.absences?.injustifie ?? "-"}</div>
 				<div class=abs>Total</div><div>${data.semestre.absences?.total ?? "-"}</div>
 			</div>`;
-		if(data.semestre.decision_rcue.length){
+		if(data.semestre.decision_rcue?.length){
 			output += `
 			<div>
 				<div class=enteteSemestre>RCUE</div><div></div>

app/views/notes.py

@@ -2143,6 +2143,16 @@ def formsemestre_validation_etud_form(
 ):
     "Formulaire choix jury pour un étudiant"
     readonly = not sco_permissions_check.can_validate_sem(formsemestre_id)
+    formsemestre = FormSemestre.query.get_or_404(formsemestre_id)
+    if formsemestre.formation.is_apc():
+        return redirect(
+            url_for(
+                "notes.formsemestre_validation_but",
+                scodoc_dept=g.scodoc_dept,
+                formsemestre_id=formsemestre_id,
+                etudid=etudid,
+            )
+        )
     return sco_formsemestre_validation.formsemestre_validation_etud_form(
         formsemestre_id,
         etudid=etudid,

migrations/versions/0b337376e9f7_ajout_taxe_apprentissage_association_.py

@@ -10,49 +10,67 @@ import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
-revision = '0b337376e9f7'
-down_revision = 'ee21c76c8183'
+revision = "0b337376e9f7"
+down_revision = "ee21c76c8183"
 branch_labels = None
 depends_on = None
 
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('are_historique',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('date', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.Column('authenticated_user', sa.Text(), nullable=True),
-    sa.Column('entreprise_id', sa.Integer(), nullable=True),
-    sa.Column('object', sa.Text(), nullable=True),
-    sa.Column('object_id', sa.Integer(), nullable=True),
-    sa.Column('text', sa.Text(), nullable=True),
-    sa.PrimaryKeyConstraint('id')
+    op.create_table(
+        "are_historique",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column(
+            "date",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=True,
+        ),
+        sa.Column("authenticated_user", sa.Text(), nullable=True),
+        sa.Column("entreprise_id", sa.Integer(), nullable=True),
+        sa.Column("object", sa.Text(), nullable=True),
+        sa.Column("object_id", sa.Integer(), nullable=True),
+        sa.Column("text", sa.Text(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
     )
-    op.create_table('are_taxe_apprentissage',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('entreprise_id', sa.Integer(), nullable=True),
-    sa.Column('annee', sa.Integer(), nullable=True),
-    sa.Column('montant', sa.Integer(), nullable=True),
-    sa.Column('notes', sa.Text(), nullable=True),
-    sa.ForeignKeyConstraint(['entreprise_id'], ['are_entreprises.id'], ondelete='cascade'),
-    sa.PrimaryKeyConstraint('id')
+    op.create_table(
+        "are_taxe_apprentissage",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("entreprise_id", sa.Integer(), nullable=True),
+        sa.Column("annee", sa.Integer(), nullable=True),
+        sa.Column("montant", sa.Integer(), nullable=True),
+        sa.Column("notes", sa.Text(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["entreprise_id"], ["are_entreprises.id"], ondelete="cascade"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.drop_table("are_logs")
+    op.add_column(
+        "are_entreprises", sa.Column("association", sa.Boolean(), nullable=True)
     )
-    op.drop_table('are_logs')
-    op.add_column('are_entreprises', sa.Column('association', sa.Boolean(), nullable=True))
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('are_entreprises', 'association')
-    op.create_table('are_logs',
-    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
-    sa.Column('date', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
-    sa.Column('authenticated_user', sa.TEXT(), autoincrement=False, nullable=True),
-    sa.Column('object', sa.INTEGER(), autoincrement=False, nullable=True),
-    sa.Column('text', sa.TEXT(), autoincrement=False, nullable=True),
-    sa.PrimaryKeyConstraint('id', name='are_logs_pkey')
+    op.drop_column("are_entreprises", "association")
+    op.create_table(
+        "are_logs",
+        sa.Column("id", sa.INTEGER(), autoincrement=True, nullable=False),
+        sa.Column(
+            "date",
+            postgresql.TIMESTAMP(timezone=True),
+            server_default=sa.text("now()"),
+            autoincrement=False,
+            nullable=True,
+        ),
+        sa.Column("authenticated_user", sa.TEXT(), autoincrement=False, nullable=True),
+        sa.Column("object", sa.INTEGER(), autoincrement=False, nullable=True),
+        sa.Column("text", sa.TEXT(), autoincrement=False, nullable=True),
+        sa.PrimaryKeyConstraint("id", name="are_logs_pkey"),
     )
-    op.drop_table('are_taxe_apprentissage')
-    op.drop_table('are_historique')
+    op.drop_table("are_taxe_apprentissage")
+    op.drop_table("are_historique")
     # ### end Alembic commands ###

sco_version.py

@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.3.15"
+SCOVERSION = "9.3.16"
 
 SCONAME = "ScoDoc"