jmplace/ScoDoc-Lille
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Améliore tri jury_delete_manual et table recap (rang)

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-06-21 09:51:13 +02:00 committed by iziram
parent 7712de19a2
commit d666483530
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/but/jury_edit_manual.py
View File

@ -9,16 +9,15 @@
Non spécifique au BUT. 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 from flask import g, request
import sqlalchemy as sa
from app import db from app import db
from app.models import ( from app.models import (
ApcValidationAnnee, ApcValidationAnnee,
ApcValidationRCUE, ApcValidationRCUE,
FormSemestre,
Identite, Identite,
UniteEns, UniteEns,
ScolarAutorisationInscription, ScolarAutorisationInscription,
@ -38,7 +37,12 @@ def jury_delete_manual(etud: Identite):
ue_vals = ( ue_vals = (
ScolarFormSemestreValidation.query.filter_by(etudid=etud.id) ScolarFormSemestreValidation.query.filter_by(etudid=etud.id)
.join(UniteEns) .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( autorisations = ScolarAutorisationInscription.query.filter_by(
etudid=etud.id etudid=etud.id

1
app/tables/recap.py
View File

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

2
sco_version.py
View File

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