remove CR from sources app/scodoc/sco_excel.pya and app/scodoc/sco_prepajury.py

This commit is contained in:
Jean-Marie Place 2021-08-13 07:18:10 +02:00
parent a9a6b0a809
commit 35d2e0b432
2 changed files with 1097 additions and 1097 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,322 +1,322 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Gestion scolarite IUT # Gestion scolarite IUT
# #
# Copyright (c) 1999 - 2021 Emmanuel Viennet. All rights reserved. # Copyright (c) 1999 - 2021 Emmanuel Viennet. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# Emmanuel Viennet emmanuel.viennet@viennet.net # Emmanuel Viennet emmanuel.viennet@viennet.net
# #
############################################################################## ##############################################################################
"""Feuille excel pour preparation des jurys """Feuille excel pour preparation des jurys
""" """
import time import time
import app.scodoc.sco_utils as scu import app.scodoc.sco_utils as scu
from app.scodoc import sco_abs from app.scodoc import sco_abs
from app.scodoc import sco_groups from app.scodoc import sco_groups
from app.scodoc import sco_cache from app.scodoc import sco_cache
from app.scodoc import sco_excel from app.scodoc import sco_excel
from app.scodoc import sco_formsemestre from app.scodoc import sco_formsemestre
from app.scodoc import sco_parcours_dut from app.scodoc import sco_parcours_dut
from app.scodoc import sco_codes_parcours from app.scodoc import sco_codes_parcours
from app.scodoc import VERSION from app.scodoc import VERSION
from app.scodoc import sco_etud from app.scodoc import sco_etud
from app.scodoc import sco_preferences from app.scodoc import sco_preferences
from app.scodoc.sco_excel import ScoExcelSheet from app.scodoc.sco_excel import ScoExcelSheet
def feuille_preparation_jury(context, formsemestre_id, REQUEST): def feuille_preparation_jury(context, formsemestre_id, REQUEST):
"Feuille excel pour preparation des jurys" "Feuille excel pour preparation des jurys"
nt = sco_cache.NotesTableCache.get( nt = sco_cache.NotesTableCache.get(
formsemestre_id formsemestre_id
) # > get_etudids, get_etud_moy_gen, get_ues, get_etud_ue_status, get_etud_decision_sem, identdict, ) # > get_etudids, get_etud_moy_gen, get_ues, get_etud_ue_status, get_etud_decision_sem, identdict,
etudids = nt.get_etudids(sorted=True) # tri par moy gen etudids = nt.get_etudids(sorted=True) # tri par moy gen
sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) sem = sco_formsemestre.get_formsemestre(context, formsemestre_id)
etud_groups = sco_groups.formsemestre_get_etud_groupnames(context, formsemestre_id) etud_groups = sco_groups.formsemestre_get_etud_groupnames(context, formsemestre_id)
main_partition_id = sco_groups.formsemestre_get_main_partition( main_partition_id = sco_groups.formsemestre_get_main_partition(
context, formsemestre_id context, formsemestre_id
)["partition_id"] )["partition_id"]
prev_moy_ue = scu.DictDefault(defaultvalue={}) # ue_code_s : { etudid : moy ue } prev_moy_ue = scu.DictDefault(defaultvalue={}) # ue_code_s : { etudid : moy ue }
prev_ue_acro = {} # ue_code_s : acronyme (à afficher) prev_ue_acro = {} # ue_code_s : acronyme (à afficher)
prev_moy = {} # moyennes gen sem prec prev_moy = {} # moyennes gen sem prec
moy_ue = scu.DictDefault(defaultvalue={}) # ue_acro : moyennes { etudid : moy ue } moy_ue = scu.DictDefault(defaultvalue={}) # ue_acro : moyennes { etudid : moy ue }
ue_acro = {} # ue_code_s : acronyme (à afficher) ue_acro = {} # ue_code_s : acronyme (à afficher)
moy = {} # moyennes gen moy = {} # moyennes gen
moy_inter = {} # moyenne gen. sur les 2 derniers semestres moy_inter = {} # moyenne gen. sur les 2 derniers semestres
code = {} # decision existantes s'il y en a code = {} # decision existantes s'il y en a
autorisations = {} autorisations = {}
prev_code = {} # decisions sem prec prev_code = {} # decisions sem prec
assidu = {} assidu = {}
parcours = {} # etudid : parcours, sous la forme S1, S2, S2, S3 parcours = {} # etudid : parcours, sous la forme S1, S2, S2, S3
groupestd = {} # etudid : nom groupe principal groupestd = {} # etudid : nom groupe principal
nbabs = {} nbabs = {}
nbabsjust = {} nbabsjust = {}
for etudid in etudids: for etudid in etudids:
info = sco_etud.get_etud_info(etudid=etudid, filled=True) info = sco_etud.get_etud_info(etudid=etudid, filled=True)
if not info: if not info:
continue # should not occur... continue # should not occur...
etud = info[0] etud = info[0]
Se = sco_parcours_dut.SituationEtudParcours(context, etud, formsemestre_id) Se = sco_parcours_dut.SituationEtudParcours(context, etud, formsemestre_id)
if Se.prev: if Se.prev:
ntp = sco_cache.NotesTableCache.get( ntp = sco_cache.NotesTableCache.get(
Se.prev["formsemestre_id"] Se.prev["formsemestre_id"]
) # > get_ues, get_etud_ue_status, get_etud_moy_gen, get_etud_decision_sem ) # > get_ues, get_etud_ue_status, get_etud_moy_gen, get_etud_decision_sem
for ue in ntp.get_ues(filter_sport=True): for ue in ntp.get_ues(filter_sport=True):
ue_status = ntp.get_etud_ue_status(etudid, ue["ue_id"]) ue_status = ntp.get_etud_ue_status(etudid, ue["ue_id"])
ue_code_s = ( ue_code_s = (
ue["ue_code"] + "_%s" % ntp.sem["semestre_id"] ue["ue_code"] + "_%s" % ntp.sem["semestre_id"]
) # code indentifiant l'UE ) # code indentifiant l'UE
prev_moy_ue[ue_code_s][etudid] = ue_status["moy"] prev_moy_ue[ue_code_s][etudid] = ue_status["moy"]
# prev_ue_acro[ue_code_s] = (ue['numero'], ue['acronyme']) # prev_ue_acro[ue_code_s] = (ue['numero'], ue['acronyme'])
prev_ue_acro[ue_code_s] = (ue["numero"], ue["acronyme"], ue["titre"]) prev_ue_acro[ue_code_s] = (ue["numero"], ue["acronyme"], ue["titre"])
prev_moy[etudid] = ntp.get_etud_moy_gen(etudid) prev_moy[etudid] = ntp.get_etud_moy_gen(etudid)
prev_decision = ntp.get_etud_decision_sem(etudid) prev_decision = ntp.get_etud_decision_sem(etudid)
if prev_decision: if prev_decision:
prev_code[etudid] = prev_decision["code"] prev_code[etudid] = prev_decision["code"]
if prev_decision["compense_formsemestre_id"]: if prev_decision["compense_formsemestre_id"]:
prev_code[etudid] += "+" # indique qu'il a servi a compenser prev_code[etudid] += "+" # indique qu'il a servi a compenser
moy[etudid] = nt.get_etud_moy_gen(etudid) moy[etudid] = nt.get_etud_moy_gen(etudid)
for ue in nt.get_ues(filter_sport=True): for ue in nt.get_ues(filter_sport=True):
ue_status = nt.get_etud_ue_status(etudid, ue["ue_id"]) ue_status = nt.get_etud_ue_status(etudid, ue["ue_id"])
ue_code_s = ue["ue_code"] + "_%s" % nt.sem["semestre_id"] ue_code_s = ue["ue_code"] + "_%s" % nt.sem["semestre_id"]
moy_ue[ue_code_s][etudid] = ue_status["moy"] moy_ue[ue_code_s][etudid] = ue_status["moy"]
# ue_acro[ue_code_s] = (ue['numero'], ue['acronyme']) # ue_acro[ue_code_s] = (ue['numero'], ue['acronyme'])
ue_acro[ue_code_s] = (ue["numero"], ue["acronyme"], ue["titre"]) ue_acro[ue_code_s] = (ue["numero"], ue["acronyme"], ue["titre"])
if Se.prev: if Se.prev:
try: try:
moy_inter[etudid] = (moy[etudid] + prev_moy[etudid]) / 2.0 moy_inter[etudid] = (moy[etudid] + prev_moy[etudid]) / 2.0
except: except:
pass pass
decision = nt.get_etud_decision_sem(etudid) decision = nt.get_etud_decision_sem(etudid)
if decision: if decision:
code[etudid] = decision["code"] code[etudid] = decision["code"]
if decision["compense_formsemestre_id"]: if decision["compense_formsemestre_id"]:
code[etudid] += "+" # indique qu'il a servi a compenser code[etudid] += "+" # indique qu'il a servi a compenser
assidu[etudid] = {0: "Non", 1: "Oui"}.get(decision["assidu"], "") assidu[etudid] = {0: "Non", 1: "Oui"}.get(decision["assidu"], "")
aut_list = sco_parcours_dut.formsemestre_get_autorisation_inscription( aut_list = sco_parcours_dut.formsemestre_get_autorisation_inscription(
context, etudid, formsemestre_id context, etudid, formsemestre_id
) )
autorisations[etudid] = ", ".join(["S%s" % x["semestre_id"] for x in aut_list]) autorisations[etudid] = ", ".join(["S%s" % x["semestre_id"] for x in aut_list])
# parcours: # parcours:
parcours[etudid] = Se.get_parcours_descr() parcours[etudid] = Se.get_parcours_descr()
# groupe principal (td) # groupe principal (td)
groupestd[etudid] = "" groupestd[etudid] = ""
for s in etud["sems"]: for s in etud["sems"]:
if s["formsemestre_id"] == formsemestre_id: if s["formsemestre_id"] == formsemestre_id:
groupestd[etudid] = etud_groups.get(etudid, {}).get( groupestd[etudid] = etud_groups.get(etudid, {}).get(
main_partition_id, "" main_partition_id, ""
) )
# absences: # absences:
e_nbabs, e_nbabsjust = sco_abs.get_abs_count(etudid, sem) e_nbabs, e_nbabsjust = sco_abs.get_abs_count(etudid, sem)
nbabs[etudid] = e_nbabs nbabs[etudid] = e_nbabs
nbabsjust[etudid] = e_nbabs - e_nbabsjust nbabsjust[etudid] = e_nbabs - e_nbabsjust
# Codes des UE "semestre précédent": # Codes des UE "semestre précédent":
ue_prev_codes = list(prev_moy_ue.keys()) ue_prev_codes = list(prev_moy_ue.keys())
ue_prev_codes.sort( ue_prev_codes.sort(
key=lambda x, prev_ue_acro=prev_ue_acro: prev_ue_acro[ # pylint: disable=undefined-variable key=lambda x, prev_ue_acro=prev_ue_acro: prev_ue_acro[ # pylint: disable=undefined-variable
x x
] ]
) )
# Codes des UE "semestre courant": # Codes des UE "semestre courant":
ue_codes = list(moy_ue.keys()) ue_codes = list(moy_ue.keys())
ue_codes.sort( ue_codes.sort(
key=lambda x, ue_acro=ue_acro: ue_acro[x] # pylint: disable=undefined-variable key=lambda x, ue_acro=ue_acro: ue_acro[x] # pylint: disable=undefined-variable
) )
sid = sem["semestre_id"] sid = sem["semestre_id"]
sn = sp = "" sn = sp = ""
if sid >= 0: if sid >= 0:
sn = "S%s" % sid sn = "S%s" % sid
if prev_moy: # si qq chose dans precedent if prev_moy: # si qq chose dans precedent
sp = "S%s" % (sid - 1) sp = "S%s" % (sid - 1)
ws = sco_excel.ScoExcelSheet(sheet_name="Prepa Jury %s" % sn) ws = sco_excel.ScoExcelSheet(sheet_name="Prepa Jury %s" % sn)
# génération des styles # génération des styles
style_bold = sco_excel.excel_make_style(size=10, bold=True) style_bold = sco_excel.excel_make_style(size=10, bold=True)
style_center = sco_excel.excel_make_style(halign="center") style_center = sco_excel.excel_make_style(halign="center")
style_boldcenter = sco_excel.excel_make_style(bold=True, halign="center") style_boldcenter = sco_excel.excel_make_style(bold=True, halign="center")
style_moy = sco_excel.excel_make_style( style_moy = sco_excel.excel_make_style(
bold=True, halign="center", bgcolor=sco_excel.COLORS.LIGHT_YELLOW bold=True, halign="center", bgcolor=sco_excel.COLORS.LIGHT_YELLOW
) )
style_note = sco_excel.excel_make_style(halign="right") style_note = sco_excel.excel_make_style(halign="right")
style_note_bold = sco_excel.excel_make_style(halign="right", bold=True) style_note_bold = sco_excel.excel_make_style(halign="right", bold=True)
# Première ligne # Première ligne
ws.append_single_cell_row( ws.append_single_cell_row(
"Feuille préparation Jury %s" % scu.unescape_html(sem["titreannee"]), style_bold "Feuille préparation Jury %s" % scu.unescape_html(sem["titreannee"]), style_bold
) )
ws.append_blank_row() ws.append_blank_row()
# Ligne de titre # Ligne de titre
titles = ["Rang"] titles = ["Rang"]
if sco_preferences.get_preference("prepa_jury_nip"): if sco_preferences.get_preference("prepa_jury_nip"):
titles.append("NIP") titles.append("NIP")
if sco_preferences.get_preference("prepa_jury_ine"): if sco_preferences.get_preference("prepa_jury_ine"):
titles.append("INE") titles.append("INE")
titles += [ titles += [
"etudid", "etudid",
"Civ.", "Civ.",
"Nom", "Nom",
"Prénom", "Prénom",
"Naissance", "Naissance",
"Bac", "Bac",
"Spe", "Spe",
"Rg Adm", "Rg Adm",
"Parcours", "Parcours",
"Groupe", "Groupe",
] ]
if prev_moy: # si qq chose dans precedent if prev_moy: # si qq chose dans precedent
titles += [prev_ue_acro[x][1] for x in ue_prev_codes] + [ titles += [prev_ue_acro[x][1] for x in ue_prev_codes] + [
"Moy %s" % sp, "Moy %s" % sp,
"Décision %s" % sp, "Décision %s" % sp,
] ]
titles += [ue_acro[x][1] for x in ue_codes] + ["Moy %s" % sn] titles += [ue_acro[x][1] for x in ue_codes] + ["Moy %s" % sn]
if moy_inter: if moy_inter:
titles += ["Moy %s-%s" % (sp, sn)] titles += ["Moy %s-%s" % (sp, sn)]
titles += ["Abs", "Abs Injust."] titles += ["Abs", "Abs Injust."]
if code: if code:
titles.append("Proposit. %s" % sn) titles.append("Proposit. %s" % sn)
if autorisations: if autorisations:
titles.append("Autorisations") titles.append("Autorisations")
# titles.append('Assidu') # titles.append('Assidu')
ws.append_row(ws.make_row(titles, style_boldcenter)) ws.append_row(ws.make_row(titles, style_boldcenter))
if prev_moy: if prev_moy:
tit_prev_moy = "Moy " + sp tit_prev_moy = "Moy " + sp
col_prev_moy = titles.index(tit_prev_moy) col_prev_moy = titles.index(tit_prev_moy)
tit_moy = "Moy " + sn tit_moy = "Moy " + sn
col_moy = titles.index(tit_moy) col_moy = titles.index(tit_moy)
col_abs = titles.index("Abs") col_abs = titles.index("Abs")
def fmt(x): def fmt(x):
"reduit les notes a deux chiffres" "reduit les notes a deux chiffres"
x = scu.fmt_note(x, keep_numeric=False) x = scu.fmt_note(x, keep_numeric=False)
try: try:
return float(x) return float(x)
except: except:
return x return x
i = 1 # numero etudiant i = 1 # numero etudiant
for etudid in etudids: for etudid in etudids:
cells = [] cells = []
etud = nt.identdict[etudid] etud = nt.identdict[etudid]
cells.append(ws.make_cell(str(i))) cells.append(ws.make_cell(str(i)))
if sco_preferences.get_preference("prepa_jury_nip"): if sco_preferences.get_preference("prepa_jury_nip"):
cells.append(ws.make_cell(etud["code_nip"])) cells.append(ws.make_cell(etud["code_nip"]))
if sco_preferences.get_preference("prepa_jury_ine"): if sco_preferences.get_preference("prepa_jury_ine"):
cells.append(ws.make_cell(["code_ine"])) cells.append(ws.make_cell(["code_ine"]))
cells += ws.make_row( cells += ws.make_row(
[ [
etudid, etudid,
etud["civilite_str"], etud["civilite_str"],
sco_etud.format_nom(etud["nom"]), sco_etud.format_nom(etud["nom"]),
sco_etud.format_prenom(etud["prenom"]), sco_etud.format_prenom(etud["prenom"]),
etud["date_naissance"], etud["date_naissance"],
etud["bac"], etud["bac"],
etud["specialite"], etud["specialite"],
etud["classement"], etud["classement"],
parcours[etudid], parcours[etudid],
groupestd[etudid], groupestd[etudid],
] ]
) )
co = len(cells) co = len(cells)
if prev_moy: if prev_moy:
for ue_acro in ue_prev_codes: for ue_acro in ue_prev_codes:
cells.append( cells.append(
ws.make_cell( ws.make_cell(
prev_moy_ue.get(ue_acro, {}).get(etudid, ""), style_note prev_moy_ue.get(ue_acro, {}).get(etudid, ""), style_note
) )
) )
co += 1 co += 1
cells.append( cells.append(
ws.make_cell(fmt(prev_moy.get(etudid, "")), style_bold) ws.make_cell(fmt(prev_moy.get(etudid, "")), style_bold)
) # moy gen prev ) # moy gen prev
cells.append( cells.append(
ws.make_cell(prev_code.get(etudid, ""), style_moy) ws.make_cell(prev_code.get(etudid, ""), style_moy)
) # decision prev ) # decision prev
co += 2 co += 2
for ue_acro in ue_codes: for ue_acro in ue_codes:
cells.append( cells.append(
ws.make_cell(moy_ue.get(ue_acro, {}).get(etudid, ""), style_note) ws.make_cell(moy_ue.get(ue_acro, {}).get(etudid, ""), style_note)
) )
co += 1 co += 1
cells.append(ws.make_cell(moy.get(etudid, ""), style_note_bold)) # moy gen cells.append(ws.make_cell(moy.get(etudid, ""), style_note_bold)) # moy gen
co += 1 co += 1
if moy_inter: if moy_inter:
cells.append(ws.make_cell(moy_inter.get(etudid, ""), style_note)) cells.append(ws.make_cell(moy_inter.get(etudid, ""), style_note))
cells.append(ws.make_cell(str(nbabs.get(etudid, "")), style_center)) cells.append(ws.make_cell(str(nbabs.get(etudid, "")), style_center))
cells.append(ws.make_cell(str(nbabsjust.get(etudid, "")), style_center)) cells.append(ws.make_cell(str(nbabsjust.get(etudid, "")), style_center))
if code: if code:
cells.append(ws.make_cell(code.get(etudid, ""), style_moy)) cells.append(ws.make_cell(code.get(etudid, ""), style_moy))
if autorisations.get(etudid, ""): if autorisations.get(etudid, ""):
cells.append(ws.make_row(autorisations.get(etudid, ""), style_center)) cells.append(ws.make_row(autorisations.get(etudid, ""), style_center))
# l.append(assidu.get(etudid, '')) # l.append(assidu.get(etudid, ''))
ws.append_row(cells) ws.append_row(cells)
i += 1 i += 1
# #
ws.append_blank_row() ws.append_blank_row()
# Explications des codes # Explications des codes
codes = list(sco_codes_parcours.CODES_EXPL.keys()) codes = list(sco_codes_parcours.CODES_EXPL.keys())
codes.sort() codes.sort()
ws.append_single_cell_row("Explication des codes") ws.append_single_cell_row("Explication des codes")
for code in codes: for code in codes:
ws.append_row( ws.append_row(
ws.make_row(["", "", "", code, sco_codes_parcours.CODES_EXPL[code]]) ws.make_row(["", "", "", code, sco_codes_parcours.CODES_EXPL[code]])
) )
ws.append_row( ws.append_row(
ws.make_row( ws.make_row(
[ [
"", "",
"", "",
"", "",
"ADM+", "ADM+",
"indique que le semestre a déjà servi à en compenser un autre", "indique que le semestre a déjà servi à en compenser un autre",
] ]
) )
) )
# UE : Correspondances acronyme et titre complet # UE : Correspondances acronyme et titre complet
ws.append_blank_row() ws.append_blank_row()
ws.append_single_cell_row("Titre des UE") ws.append_single_cell_row("Titre des UE")
if prev_moy: if prev_moy:
for ue in ntp.get_ues(filter_sport=True): for ue in ntp.get_ues(filter_sport=True):
ws.append_row(ws.make_row(["", "", "", ue["acronyme"], ue["titre"]])) ws.append_row(ws.make_row(["", "", "", ue["acronyme"], ue["titre"]]))
for ue in nt.get_ues(filter_sport=True): for ue in nt.get_ues(filter_sport=True):
ws.append_row(ws.make_row(["", "", "", ue["acronyme"], ue["titre"]])) ws.append_row(ws.make_row(["", "", "", ue["acronyme"], ue["titre"]]))
# #
ws.append_blank_row() ws.append_blank_row()
ws.append_single_cell_row( ws.append_single_cell_row(
"Préparé par %s le %s sur %s pour %s" "Préparé par %s le %s sur %s pour %s"
% ( % (
VERSION.SCONAME, VERSION.SCONAME,
time.strftime("%d/%m/%Y"), time.strftime("%d/%m/%Y"),
REQUEST.BASE0, REQUEST.BASE0,
REQUEST.AUTHENTICATED_USER, REQUEST.AUTHENTICATED_USER,
) )
) )
xls = ws.generate_standalone() xls = ws.generate_standalone()
return sco_excel.send_excel_file(REQUEST, xls, "PrepaJury%s.xlsx" % sn) return sco_excel.send_excel_file(REQUEST, xls, "PrepaJury%s.xlsx" % sn)