From c8a974d460818b8705c9a7c71c7216a15edf504f Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 21 Jun 2023 09:51:13 +0200 Subject: [PATCH] =?UTF-8?q?Am=C3=A9liore=20tri=20jury=5Fdelete=5Fmanual=20?= =?UTF-8?q?et=20table=20recap=20(rang)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/but/jury_edit_manual.py | 12 ++++++++---- app/tables/recap.py | 1 + sco_version.py | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/but/jury_edit_manual.py b/app/but/jury_edit_manual.py index 73e21ecf5..89ac43a20 100644 --- a/app/but/jury_edit_manual.py +++ b/app/but/jury_edit_manual.py @@ -9,16 +9,15 @@ Non spécifique au BUT. """ -import flask -from flask import flash, render_template, url_for +from flask import flash, render_template 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 diff --git a/app/tables/recap.py b/app/tables/recap.py index 5fca29127..09aae9188 100644 --- a/app/tables/recap.py +++ b/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) diff --git a/sco_version.py b/sco_version.py index 857492bf1..0ff96a93a 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.4.88" +SCOVERSION = "9.4.89" SCONAME = "ScoDoc"