app/but/jury_edit_manual.py

@@ -9,16 +9,15 @@
 Non spécifique au BUT.
 """
 
-import flask
+from flask import flash, render_template
-from flask import flash, render_template, url_for
 from flask import g, request
+import sqlalchemy as sa
 
 from app import db
 
 from app.models import (
     ApcValidationAnnee,
     ApcValidationRCUE,
-    FormSemestre,
     Identite,
     UniteEns,
     ScolarAutorisationInscription,
@@ -38,7 +37,12 @@ def jury_delete_manual(etud: Identite):
     ue_vals = (
         ScolarFormSemestreValidation.query.filter_by(etudid=etud.id)
         .join(UniteEns)
-        .order_by(ScolarFormSemestreValidation.event_date, UniteEns.numero)
+        .order_by(
+            sa.extract("year", ScolarFormSemestreValidation.event_date),
+            UniteEns.semestre_idx,
+            UniteEns.numero,
+            UniteEns.acronyme,
+        )
     )
     autorisations = ScolarAutorisationInscription.query.filter_by(
         etudid=etud.id

app/tables/recap.py

@@ -551,6 +551,7 @@ class RowRecap(tb.Row):
                 "etud_codes": "Codes",
                 "identite_detail": "",
                 "identite_court": "",
+                "rang": "",
             }
         )
         # --- Codes (seront cachés, mais exportés en excel)

sco_version.py

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