lehmann
/
ScoDoc-Front
forked from ScoDoc/ScoDoc
1
0
Fork 0
Code Pull Requests Activity

Améliore affichage UE capitalisées BUT en PDF

This commit is contained in:
Emmanuel Viennet 2023-03-19 11:06:46 +01:00
parent 32c321bcd1
commit 3f26af4ed6
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/but/bulletin_but_pdf.py
View File

@ -159,13 +159,17 @@ class BulletinGeneratorStandardBUT(BulletinGeneratorStandard):
blue, blue,
), ),
] ]
ues = self.infos["ues"]
ues_capitalisees = self.infos.get("ues_capitalisees", {}) ues_capitalisees = self.infos.get("ues_capitalisees", {})
for ue_acronym, ue in self.infos["ues"].items(): ues_tup = sorted(
self._ue_rows(rows, ue_acronym, ue, title_bg) list(ues.items()) + list(ues_capitalisees.items()),
if ue_acronym in ues_capitalisees: key=lambda x: x[1]["numero"],
self._ue_rows( )
rows, ue_acronym, ues_capitalisees[ue_acronym], title_ue_cap_bg for ue_acronym, ue in ues_tup:
) is_capitalized = "date_capitalisation" in ue
self._ue_rows(
rows, ue_acronym, ue, title_ue_cap_bg if is_capitalized else title_bg
)
# Global pdf style commands: # Global pdf style commands:
pdf_style = [ pdf_style = [

4
app/scodoc/sco_preferences.py
View File

@ -1363,7 +1363,8 @@ class BasePreferences(object):
"bul_show_ue_cap_details", "bul_show_ue_cap_details",
{ {
"initvalue": 0, "initvalue": 0,
"title": "Afficher détail des notes des UE capitalisées sur les bulletins", "title": "Afficher détail des notes des UE capitalisées sur les bulletins ",
"explanation": "ne concerne pas les bulletins BUT",
"input_type": "boolcheckbox", "input_type": "boolcheckbox",
"category": "bul", "category": "bul",
"labels": ["non", "oui"], "labels": ["non", "oui"],
@ -1374,6 +1375,7 @@ class BasePreferences(object):
{ {
"initvalue": 1, "initvalue": 1,
"title": "Afficher les UE en cours mais capitalisées sur les bulletins", "title": "Afficher les UE en cours mais capitalisées sur les bulletins",
"explanation": "ne concerne pas les bulletins BUT",
"input_type": "boolcheckbox", "input_type": "boolcheckbox",
"category": "bul", "category": "bul",
"labels": ["non", "oui"], "labels": ["non", "oui"],