ScoDoc/ScoDoc
ScoDoc/ScoDoc
9
2
Fork 15
Code Issues 152 Pull Requests Projects 3 Releases 109 Wiki Activity

Petites améliorations du bul BUT court (suggestions de LGS)

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-09-03 21:00:20 +02:00 committed by iziram
parent 08b8fef91c
commit 3fe5595cae
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/but/bulletin_but_court_pdf.py
View File

@ -170,7 +170,7 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
self.width_page_avail = 185 * mm # largeur utilisable self.width_page_avail = 185 * mm # largeur utilisable
# Géométrie tableaux # Géométrie tableaux
self.width_col_ue = 18 * mm self.width_col_ue = 18 * mm
self.width_col_ue_titres = 15 * mm self.width_col_ue_titres = 16.5 * mm
# Modules # Modules
self.width_col_code = self.width_col_ue self.width_col_code = self.width_col_ue
# Niveaux # Niveaux
@ -259,19 +259,21 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
[""] + self.ues_acronyms, [""] + self.ues_acronyms,
["Moyenne"] ["Moyenne"]
+ [bul["ues"][ue]["moyenne"]["value"] for ue in self.ues_acronyms], + [bul["ues"][ue]["moyenne"]["value"] for ue in self.ues_acronyms],
["Bonus"] ["dont bonus"]
+ [ + [
bul["ues"][ue]["bonus"] if bul["ues"][ue]["bonus"] != "00.00" else "" bul["ues"][ue]["bonus"] if bul["ues"][ue]["bonus"] != "00.00" else ""
for ue in self.ues_acronyms for ue in self.ues_acronyms
], ],
["Malus"] ["et malus"]
+ [ + [
bul["ues"][ue]["malus"] if bul["ues"][ue]["malus"] != "00.00" else "" bul["ues"][ue]["malus"] if bul["ues"][ue]["malus"] != "00.00" else ""
for ue in self.ues_acronyms for ue in self.ues_acronyms
], ],
["Rang"] + [bul["ues"][ue]["moyenne"]["rang"] for ue in self.ues_acronyms], ["Rang"]
["Effectif"] + [
+ [bul["ues"][ue]["moyenne"]["total"] for ue in self.ues_acronyms], f'{bul["ues"][ue]["moyenne"]["rang"]} / {bul["ues"][ue]["moyenne"]["total"]}'
for ue in self.ues_acronyms
],
["ECTS"] ["ECTS"]
+ [ + [
f'{self.decision_ues[ue]["ects"]:g}' if ue in self.decision_ues else "" f'{self.decision_ues[ue]["ects"]:g}' if ue in self.decision_ues else ""
@ -496,17 +498,17 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
def boite_decisions_jury(self): def boite_decisions_jury(self):
"""La boite en bas à droite avec jury""" """La boite en bas à droite avec jury"""
txt = f"""ECTS acquis : {self.ects_total:g}<br/>""" txt = f"""ECTS acquis en BUT : <b>{self.ects_total:g}</b><br/>"""
if self.bul["semestre"]["decision_annee"]: if self.bul["semestre"]["decision_annee"]:
txt += f""" txt += f"""
Jury tenu le { Jury tenu le {
datetime.datetime.fromisoformat(self.bul["semestre"]["decision_annee"]["date"]).strftime("%d/%m/%Y à %H:%M") datetime.datetime.fromisoformat(self.bul["semestre"]["decision_annee"]["date"]).strftime("%d/%m/%Y")
}, année BUT <b>{self.bul["semestre"]["decision_annee"]["code"]}</b>. }, année BUT <b>{self.bul["semestre"]["decision_annee"]["code"]}</b>.
<br/> <br/>
""" """
if self.bul["semestre"]["autorisation_inscription"]: if self.bul["semestre"]["autorisation_inscription"]:
txt += ( txt += (
"Autorisé à s'inscrire en <b>" "<br/>Autorisé à s'inscrire en <b>"
+ ", ".join( + ", ".join(
[ [
f"S{aut['semestre_id']}" f"S{aut['semestre_id']}"

20
app/templates/but/bulletin_court_page.j2
View File

@ -100,13 +100,13 @@
{% endfor %} {% endfor %}
</tr> </tr>
<tr> <tr>
<td>Bonus</td> <td>dont bonus</td>
{% for ue in ues_acronyms %} {% for ue in ues_acronyms %}
<td class="col_ue">{{bul.ues[ue].bonus if bul.ues[ue].bonus != "00.00" else ""}}</td> <td class="col_ue">{{bul.ues[ue].bonus if bul.ues[ue].bonus != "00.00" else ""}}</td>
{% endfor %} {% endfor %}
</tr> </tr>
<tr> <tr>
<td>Malus</td> <td>et malus</td>
{% for ue in ues_acronyms %} {% for ue in ues_acronyms %}
<td class="col_ue">{{bul.ues[ue].malus if bul.ues[ue].malus != "00.00" else ""}}</td> <td class="col_ue">{{bul.ues[ue].malus if bul.ues[ue].malus != "00.00" else ""}}</td>
{% endfor %} {% endfor %}
@ -114,13 +114,7 @@
<tr> <tr>
<td>Rang</td> <td>Rang</td>
{% for ue in ues_acronyms %} {% for ue in ues_acronyms %}
<td class="col_ue">{{bul.ues[ue].moyenne.rang}}</td> <td class="col_ue">{{bul.ues[ue].moyenne.rang}} / {{bul.ues[ue].moyenne.total}}</td>
{% endfor %}
</tr>
<tr>
<td>Effectif</td>
{% for ue in ues_acronyms %}
<td class="col_ue">{{bul.ues[ue].moyenne.total}}</td>
{% endfor %} {% endfor %}
</tr> </tr>
<tr> <tr>
@ -157,18 +151,18 @@
</div> </div>
<div id="situation"> <div id="situation">
<div>ECTS acquis : {{ects_total}}</div> <div>ECTS acquis en BUT&nbsp;: <b>{{"%g"|format(ects_total)}}</b></div>
<div class="descr_jury"> <div class="descr_jury">
{% if bul.semestre.decision_annee %} {% if bul.semestre.decision_annee %}
Jury tenu le {{ Jury tenu le {{
datetime.datetime.fromisoformat(bul.semestre.decision_annee.date).strftime("%d/%m/%Y à %H:%M") datetime.datetime.fromisoformat(bul.semestre.decision_annee.date).strftime("%d/%m/%Y")
}}, }},
année BUT {{bul.semestre.decision_annee.code}}. année BUT <b>{{bul.semestre.decision_annee.code}}</b>.
{% endif %} {% endif %}
{% set virg = joiner(", ") %} {% set virg = joiner(", ") %}
{% for aut in bul.semestre.autorisation_inscription -%} {% for aut in bul.semestre.autorisation_inscription -%}
{% if loop.first %} {% if loop.first %}
Autorisé à s'inscrire en <br>Autorisé à s'inscrire en
{% endif %} {% endif %}
{{- virg() }}S{{aut.semestre_id -}} {{- virg() }}S{{aut.semestre_id -}}
{%- if loop.last -%} {%- if loop.last -%}

2
sco_version.py
View File

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