forked from ScoDoc/ScoDoc
load all formsemestres
This commit is contained in:
parent
569c09d66d
commit
3619772879
@ -448,6 +448,11 @@ def formsemestre_status_menubar(formsemestre: FormSemestre | None) -> str:
|
||||
"args": {"formsemestre_id": formsemestre_id},
|
||||
"enabled": not formsemestre.formation.is_apc(),
|
||||
},
|
||||
{
|
||||
"title": "Générer feuille préparation Jury Lille",
|
||||
"endpoint": "notes.feuille_preparation_lille",
|
||||
"args": {"formsemestre_id": formsemestre_id},
|
||||
},
|
||||
{
|
||||
"title": "Éditer les PV et archiver les résultats",
|
||||
"endpoint": "notes.formsemestre_archive",
|
||||
@ -619,9 +624,9 @@ def formsemestre_description_table(
|
||||
if ue.color:
|
||||
for k in list(ue_info.keys()):
|
||||
if not k.startswith("_"):
|
||||
ue_info[f"_{k}_td_attrs"] = (
|
||||
f'style="background-color: {ue.color} !important;"'
|
||||
)
|
||||
ue_info[
|
||||
f"_{k}_td_attrs"
|
||||
] = f'style="background-color: {ue.color} !important;"'
|
||||
if not is_apc:
|
||||
# n'affiche la ligne UE qu'en formation classique
|
||||
# car l'UE de rattachement n'a pas d'intérêt en BUT
|
||||
|
||||
382
app/scodoc/sco_prepajury_lille.py
Normal file
382
app/scodoc/sco_prepajury_lille.py
Normal file
@ -0,0 +1,382 @@
|
||||
# -*- mode: python -*-
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Gestion scolarite IUT
|
||||
#
|
||||
# Copyright (c) 1999 - 2024 Emmanuel Viennet. All rights reserved.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
# Emmanuel Viennet emmanuel.viennet@viennet.net
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
"""Feuille excel pour préparation des jurys classiques (non BUT)
|
||||
"""
|
||||
import collections
|
||||
import time
|
||||
|
||||
from openpyxl.styles.numbers import FORMAT_NUMBER_00
|
||||
|
||||
from flask import flash
|
||||
from flask import request
|
||||
from flask_login import current_user
|
||||
|
||||
from app.comp import res_sem
|
||||
from app.comp.res_compat import NotesTableCompat
|
||||
from app.models import FormSemestre, Identite, ScolarAutorisationInscription
|
||||
from app.scodoc import sco_assiduites
|
||||
from app.scodoc import codes_cursus
|
||||
from app.scodoc import sco_groups
|
||||
from app.scodoc import sco_etud
|
||||
from app.scodoc import sco_excel
|
||||
from app.scodoc import sco_formsemestre
|
||||
from app.scodoc import sco_cursus
|
||||
from app.scodoc import sco_preferences
|
||||
import app.scodoc.sco_utils as scu
|
||||
import sco_version
|
||||
|
||||
|
||||
class Atome:
|
||||
def __init__(self):
|
||||
self.niveau: int = None
|
||||
self.rcue: int = None
|
||||
self.semestre: int = None
|
||||
|
||||
def __init__(self, niveau):
|
||||
self.__init__()
|
||||
self.niveau = niveau
|
||||
|
||||
def __init__(self, niveau, ue):
|
||||
self.__init__(niveau)
|
||||
|
||||
def __init__(self, niveau, ue, semestre):
|
||||
self.__init__(niveau, ue)
|
||||
self.semestre = semestre
|
||||
|
||||
|
||||
class Export:
|
||||
def __init__(self, formsemestre_id):
|
||||
self.formsemestre_id: int = formsemestre_id
|
||||
self.formsemestre: FormSemestre = FormSemestre.get_formsemestre(formsemestre_id)
|
||||
self.nt: NotesTableCompat = res_sem.load_formsemestre_results(self.formsemestre)
|
||||
etud_groups = sco_groups.formsemestre_get_etud_groupnames(formsemestre_id)
|
||||
main_partition_id = sco_groups.formsemestre_get_main_partition(formsemestre_id)
|
||||
self.etuds = self.nt.get_inscrits(order_by="moy")
|
||||
self.data_etud = {}
|
||||
self.data_sems = {}
|
||||
self.load_data()
|
||||
breakpoint()
|
||||
|
||||
def load_formsemestre_data(self, sem: FormSemestre):
|
||||
sem_id = sem["id"]
|
||||
self.data_sems[sem_id]["formsemestre"] = sem
|
||||
self.data_sems[sem_id]["nt"] = res_sem.load_formsemestre_results(sem_id)
|
||||
|
||||
def load_formsemestre(self, etud, session):
|
||||
for sem in session.sems:
|
||||
if sem["formation"].is_apc():
|
||||
sem_id = sem["id"]
|
||||
if sem_id not in self.data_sems:
|
||||
self.data_sems[sem_id] = {}
|
||||
self.load_formsemestre_data(sem)
|
||||
if session.prev_formsemestre:
|
||||
prev_id = session.prev_formsemestre.id
|
||||
prev_session = sco_cursus.get_situation_etud_cursus(etud, prev_id)
|
||||
self.load_formsemestre(etud, prev_session)
|
||||
|
||||
def load_data(self):
|
||||
for etud in self.etuds:
|
||||
self.data_etud[etud.id] = {}
|
||||
self.data_etud[etud.id]["etud"] = etud
|
||||
Se = sco_cursus.get_situation_etud_cursus(etud, self.formsemestre_id)
|
||||
self.load_formsemestre(etud, Se)
|
||||
|
||||
|
||||
def feuille_preparation_lille(formsemestre_id):
|
||||
"""Feuille excel pour préparation des jurys classiques.
|
||||
Non adaptée pour le BUT.
|
||||
"""
|
||||
export = Export(formsemestre_id)
|
||||
prev_moy_ue = collections.defaultdict(dict) # ue_code_s : { etudid : moy ue }
|
||||
prev_ue_acro = {} # ue_code_s : acronyme (à afficher)
|
||||
prev_moy = {} # moyennes gen sem prec
|
||||
moy_ue = collections.defaultdict(dict) # ue_acro : moyennes { etudid : moy ue }
|
||||
ue_acro = {} # ue_code_s : acronyme (à afficher)
|
||||
moy = {} # moyennes gen
|
||||
moy_inter = {} # moyenne gen. sur les 2 derniers semestres
|
||||
code = {} # decision existantes s'il y en a
|
||||
autorisations = {}
|
||||
prev_code = {} # decisions sem prec
|
||||
assidu = {}
|
||||
parcours = {} # etudid : parcours, sous la forme S1, S2, S2, S3
|
||||
groupestd = {} # etudid : nom groupe principal
|
||||
nbabs = {}
|
||||
nbabsjust = {}
|
||||
for etud in etuds:
|
||||
Se = sco_cursus.get_situation_etud_cursus(etud, formsemestre_id)
|
||||
if Se.prev_formsemestre:
|
||||
ntp: NotesTableCompat = res_sem.load_formsemestre_results(
|
||||
Se.prev_formsemestre
|
||||
)
|
||||
for ue in ntp.get_ues_stat_dict(filter_sport=True):
|
||||
ue_status = ntp.get_etud_ue_status(etud.id, ue["ue_id"])
|
||||
ue_code_s = (
|
||||
ue["ue_code"] + "_%s" % ntp.sem["semestre_id"]
|
||||
) # code indentifiant l'UE
|
||||
prev_moy_ue[ue_code_s][etud.id] = ue_status["moy"] if ue_status else ""
|
||||
prev_ue_acro[ue_code_s] = (ue["numero"], ue["acronyme"], ue["titre"])
|
||||
prev_moy[etud.id] = ntp.get_etud_moy_gen(etud.id)
|
||||
prev_decision = ntp.get_etud_decision_sem(etud.id)
|
||||
if prev_decision:
|
||||
prev_code[etud.id] = prev_decision["code"]
|
||||
if prev_decision["compense_formsemestre_id"]:
|
||||
prev_code[etud.id] += "+" # indique qu'il a servi a compenser
|
||||
|
||||
moy[etud.id] = nt.get_etud_moy_gen(etud.id)
|
||||
for ue in nt.get_ues_stat_dict(filter_sport=True):
|
||||
ue_status = nt.get_etud_ue_status(etud.id, ue["ue_id"])
|
||||
ue_code_s = f'{ue["ue_code"]}_{nt.sem["semestre_id"]}'
|
||||
moy_ue[ue_code_s][etud.id] = ue_status["moy"] if ue_status else ""
|
||||
ue_acro[ue_code_s] = (ue["numero"], ue["acronyme"], ue["titre"])
|
||||
|
||||
if Se.prev_formsemestre:
|
||||
try:
|
||||
moy_inter[etud.id] = (moy[etud.id] + prev_moy[etud.id]) / 2.0
|
||||
except (KeyError, TypeError):
|
||||
pass
|
||||
|
||||
decision = nt.get_etud_decision_sem(etud.id)
|
||||
if decision:
|
||||
code[etud.id] = decision["code"]
|
||||
if decision["compense_formsemestre_id"]:
|
||||
code[etud.id] += "+" # indique qu'il a servi a compenser
|
||||
assidu[etud.id] = {False: "Non", True: "Oui"}.get(decision["assidu"], "")
|
||||
|
||||
autorisations_etud = ScolarAutorisationInscription.query.filter_by(
|
||||
etudid=etud.id, origin_formsemestre_id=formsemestre_id
|
||||
).all()
|
||||
autorisations[etud.id] = ", ".join(
|
||||
[f"S{x.semestre_id}" for x in autorisations_etud]
|
||||
)
|
||||
# parcours:
|
||||
parcours[etud.id] = Se.get_cursus_descr()
|
||||
# groupe principal (td)
|
||||
groupestd[etud.id] = etud_groups.get(etud.id, {}).get(main_partition_id, "")
|
||||
# absences:
|
||||
_, nbabsjust[etud.id], nbabs[etud.id] = sco_assiduites.get_assiduites_count(
|
||||
etud.id, sem
|
||||
)
|
||||
|
||||
# Codes des UE "semestre précédent":
|
||||
ue_prev_codes = list(prev_moy_ue.keys())
|
||||
ue_prev_codes.sort(
|
||||
key=lambda x, prev_ue_acro=prev_ue_acro: prev_ue_acro[ # pylint: disable=undefined-variable
|
||||
x
|
||||
]
|
||||
)
|
||||
# Codes des UE "semestre courant":
|
||||
ue_codes = list(moy_ue.keys())
|
||||
ue_codes.sort(
|
||||
key=lambda x, ue_acro=ue_acro: ue_acro[x] # pylint: disable=undefined-variable
|
||||
)
|
||||
|
||||
sid = sem["semestre_id"]
|
||||
sn = sp = ""
|
||||
if sid >= 0:
|
||||
sn = f"S{sid}"
|
||||
if prev_moy: # si qq chose dans precedent
|
||||
sp = f"S{sid - 1}"
|
||||
|
||||
sheet = sco_excel.ScoExcelSheet(sheet_name=f"Prepa Jury {sn}")
|
||||
# génération des styles
|
||||
style_bold = sco_excel.excel_make_style(size=10, bold=True)
|
||||
style_center = sco_excel.excel_make_style(halign="center")
|
||||
style_boldcenter = sco_excel.excel_make_style(bold=True, halign="center")
|
||||
style_moy = sco_excel.excel_make_style(
|
||||
bold=True, halign="center", bgcolor=sco_excel.COLORS.LIGHT_YELLOW
|
||||
)
|
||||
style_note = sco_excel.excel_make_style(
|
||||
halign="right", number_format=FORMAT_NUMBER_00
|
||||
)
|
||||
style_note_bold = sco_excel.excel_make_style(
|
||||
halign="right", bold=True, number_format="General"
|
||||
)
|
||||
|
||||
# Première ligne
|
||||
sheet.append_single_cell_row(
|
||||
"Feuille préparation Jury %s" % scu.unescape_html(sem["titreannee"]), style_bold
|
||||
)
|
||||
sheet.append_blank_row()
|
||||
|
||||
# Ligne de titre
|
||||
titles = ["Rang"]
|
||||
if sco_preferences.get_preference("prepa_jury_nip"):
|
||||
titles.append("NIP")
|
||||
if sco_preferences.get_preference("prepa_jury_ine"):
|
||||
titles.append("INE")
|
||||
titles += [
|
||||
"etudid",
|
||||
"Civ.",
|
||||
"Nom",
|
||||
"Prénom",
|
||||
"Naissance",
|
||||
"Bac",
|
||||
"Spe",
|
||||
"Rg Adm",
|
||||
"Parcours",
|
||||
"Groupe",
|
||||
]
|
||||
if prev_moy: # si qq chose dans precedent
|
||||
titles += [prev_ue_acro[x][1] for x in ue_prev_codes] + [
|
||||
f"Moy {sp}",
|
||||
f"Décision {sp}",
|
||||
]
|
||||
titles += [ue_acro[x][1] for x in ue_codes] + [f"Moy {sn}"]
|
||||
if moy_inter:
|
||||
titles += [f"Moy {sp}-{sn}"]
|
||||
titles += ["Abs", "Abs Injust."]
|
||||
if code:
|
||||
titles.append("Proposit. {sn}")
|
||||
if autorisations:
|
||||
titles.append("Autorisations")
|
||||
# titles.append('Assidu')
|
||||
sheet.append_row(sheet.make_row(titles, style_boldcenter))
|
||||
|
||||
# if prev_moy:
|
||||
# tit_prev_moy = "Moy " + sp
|
||||
# # col_prev_moy = titles.index(tit_prev_moy)
|
||||
# tit_moy = "Moy " + sn
|
||||
# col_moy = titles.index(tit_moy)
|
||||
# col_abs = titles.index("Abs")
|
||||
|
||||
def fmt(x):
|
||||
"reduit les notes a deux chiffres"
|
||||
x = scu.fmt_note(x, keep_numeric=False)
|
||||
try:
|
||||
return float(x)
|
||||
except:
|
||||
return x
|
||||
|
||||
i = 1 # numero etudiant
|
||||
for etud in etuds:
|
||||
cells = []
|
||||
cells.append(sheet.make_cell(str(i)))
|
||||
if sco_preferences.get_preference("prepa_jury_nip"):
|
||||
cells.append(sheet.make_cell(etud.code_nip))
|
||||
if sco_preferences.get_preference("prepa_jury_ine"):
|
||||
cells.append(sheet.make_cell(etud.code_ine))
|
||||
cells += sheet.make_row(
|
||||
[
|
||||
etud.id,
|
||||
etud.civilite_str,
|
||||
scu.format_nom(etud.nom),
|
||||
scu.format_prenom(etud.prenom),
|
||||
etud.date_naissance,
|
||||
etud.admission.bac if etud.admission else "",
|
||||
etud.admission.specialite if etud.admission else "",
|
||||
etud.admission.classement if etud.admission else "",
|
||||
parcours[etud.id],
|
||||
groupestd[etud.id],
|
||||
]
|
||||
)
|
||||
co = len(cells)
|
||||
if prev_moy:
|
||||
for ue_acro in ue_prev_codes:
|
||||
cells.append(
|
||||
sheet.make_cell(
|
||||
fmt(prev_moy_ue.get(ue_acro, {}).get(etud.id, "")), style_note
|
||||
)
|
||||
)
|
||||
co += 1
|
||||
cells.append(
|
||||
sheet.make_cell(fmt(prev_moy.get(etud.id, "")), style_bold)
|
||||
) # moy gen prev
|
||||
cells.append(
|
||||
sheet.make_cell(fmt(prev_code.get(etud.id, "")), style_moy)
|
||||
) # decision prev
|
||||
co += 2
|
||||
|
||||
for ue_acro in ue_codes:
|
||||
cells.append(
|
||||
sheet.make_cell(
|
||||
fmt(moy_ue.get(ue_acro, {}).get(etud.id, "")), style_note
|
||||
)
|
||||
)
|
||||
co += 1
|
||||
cells.append(
|
||||
sheet.make_cell(fmt(moy.get(etud.id, "")), style_note_bold)
|
||||
) # moy gen
|
||||
co += 1
|
||||
if moy_inter:
|
||||
cells.append(sheet.make_cell(fmt(moy_inter.get(etud.id, "")), style_note))
|
||||
cells.append(sheet.make_cell(nbabs.get(etud.id, ""), style_center))
|
||||
cells.append(sheet.make_cell(nbabsjust.get(etud.id, ""), style_center))
|
||||
if code:
|
||||
cells.append(sheet.make_cell(code.get(etud.id, ""), style_moy))
|
||||
cells.append(sheet.make_cell(autorisations.get(etud.id, ""), style_moy))
|
||||
# l.append(assidu.get(etud.id, ''))
|
||||
sheet.append_row(cells)
|
||||
i += 1
|
||||
#
|
||||
sheet.append_blank_row()
|
||||
# Explications des codes
|
||||
codes = list(codes_cursus.CODES_EXPL.keys())
|
||||
codes.sort()
|
||||
sheet.append_single_cell_row("Explication des codes")
|
||||
for code in codes:
|
||||
sheet.append_row(
|
||||
sheet.make_row(["", "", "", code, codes_cursus.CODES_EXPL[code]])
|
||||
)
|
||||
sheet.append_row(
|
||||
sheet.make_row(
|
||||
[
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"ADM+",
|
||||
"indique que le semestre a déjà servi à en compenser un autre",
|
||||
]
|
||||
)
|
||||
)
|
||||
# UE : Correspondances acronyme et titre complet
|
||||
sheet.append_blank_row()
|
||||
sheet.append_single_cell_row("Titre des UE")
|
||||
if prev_moy:
|
||||
for ue in ntp.get_ues_stat_dict(filter_sport=True):
|
||||
sheet.append_row(sheet.make_row(["", "", "", ue["acronyme"], ue["titre"]]))
|
||||
for ue in nt.get_ues_stat_dict(filter_sport=True):
|
||||
sheet.append_row(sheet.make_row(["", "", "", ue["acronyme"], ue["titre"]]))
|
||||
#
|
||||
sheet.append_blank_row()
|
||||
sheet.append_single_cell_row(
|
||||
"Préparé par %s le %s sur %s pour %s"
|
||||
% (
|
||||
sco_version.SCONAME,
|
||||
time.strftime(scu.DATE_FMT),
|
||||
request.url_root,
|
||||
current_user,
|
||||
)
|
||||
)
|
||||
xls = sheet.generate()
|
||||
flash("Feuille préparation jury générée")
|
||||
return scu.send_file(
|
||||
xls,
|
||||
f"PrepaJury{sn}",
|
||||
scu.XLSX_SUFFIX,
|
||||
mime=scu.XLSX_MIMETYPE,
|
||||
)
|
||||
@ -91,7 +91,7 @@ from app.decorators import (
|
||||
|
||||
# ---------------
|
||||
from app.pe import pe_view # ne pas enlever, ajoute des vues
|
||||
from app.scodoc import sco_bulletins_json, sco_utils as scu
|
||||
from app.scodoc import sco_bulletins_json, sco_utils as scu, sco_prepajury_lille
|
||||
from app import log, send_scodoc_alarm
|
||||
|
||||
from app.scodoc.sco_exceptions import (
|
||||
@ -2639,9 +2639,10 @@ def formsemestre_validation_auto_but(formsemestre_id: int = None):
|
||||
form = jury_but_forms.FormSemestreValidationAutoBUTForm()
|
||||
if request.method == "POST":
|
||||
if not form.cancel.data:
|
||||
nb_etud_modif, _ = (
|
||||
jury_but_validation_auto.formsemestre_validation_auto_but(formsemestre)
|
||||
)
|
||||
(
|
||||
nb_etud_modif,
|
||||
_,
|
||||
) = jury_but_validation_auto.formsemestre_validation_auto_but(formsemestre)
|
||||
flash(f"Décisions enregistrées ({nb_etud_modif} étudiants modifiés)")
|
||||
return redirect(
|
||||
url_for(
|
||||
@ -3064,6 +3065,11 @@ sco_publish(
|
||||
sco_prepajury.feuille_preparation_jury,
|
||||
Permission.ScoView,
|
||||
)
|
||||
sco_publish(
|
||||
"/feuille_preparation_lille",
|
||||
sco_prepajury_lille.feuille_preparation_lille,
|
||||
Permission.ScoView,
|
||||
)
|
||||
sco_publish(
|
||||
"/formsemestre_archive",
|
||||
sco_archives_formsemestre.formsemestre_archive,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user