opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +12 -2
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c1f7518f5c - Show all commits

11
app/scodoc/sco_excel.py
View File

@ -283,6 +283,13 @@ class ScoExcelSheet:
""" """
self.ws.row_dimensions[cle].hidden = value self.ws.row_dimensions[cle].hidden = value
def set_column_dimension_hidden(self, cle, value):
"""Masque ou affiche une ligne.
cle -- identifie la colonne (1...)
value -- boolean (vrai = colonne cachée)
"""
self.ws.column_dimensions[cle].hidden = value
def make_cell(self, value: any = None, style=None, comment=None): def make_cell(self, value: any = None, style=None, comment=None):
"""Construit une cellule. """Construit une cellule.
value -- contenu de la cellule (texte, numérique, booléen ou date) value -- contenu de la cellule (texte, numérique, booléen ou date)
@ -450,6 +457,8 @@ def excel_feuille_saisie(evaluation: "Evaluation", titreannee, description, line
ws.set_column_dimension_width("D", 164.0 / 7) # groupes ws.set_column_dimension_width("D", 164.0 / 7) # groupes
ws.set_column_dimension_width("E", 115.0 / 7) # notes ws.set_column_dimension_width("E", 115.0 / 7) # notes
ws.set_column_dimension_width("F", 355.0 / 7) # remarques ws.set_column_dimension_width("F", 355.0 / 7) # remarques
ws.set_column_dimension_width("G", 11.0 / 7) # colonne NIP
ws.set_column_dimension_hidden("G", True) # colonne NIP cachée
# fontes # fontes
font_base = Font(name="Arial", size=12) font_base = Font(name="Arial", size=12)
@ -526,6 +535,7 @@ def excel_feuille_saisie(evaluation: "Evaluation", titreannee, description, line
ws.make_cell("Groupe", style_titres), ws.make_cell("Groupe", style_titres),
ws.make_cell("Note sur %g" % (evaluation.note_max or 0.0), style_titres), ws.make_cell("Note sur %g" % (evaluation.note_max or 0.0), style_titres),
ws.make_cell("Remarque", style_titres), ws.make_cell("Remarque", style_titres),
ws.make_cell("NIP", style_titres),
] ]
) )
@ -552,6 +562,7 @@ def excel_feuille_saisie(evaluation: "Evaluation", titreannee, description, line
ws.make_cell(s, st), ws.make_cell(s, st),
ws.make_cell(val, style_notes), # note ws.make_cell(val, style_notes), # note
ws.make_cell(line[6], style_comment), # comment ws.make_cell(line[6], style_comment), # comment
ws.make_cell(line[7], style_ro), # NIP
] ]
) )

3
app/scodoc/sco_saisie_notes.py
View File

@ -922,13 +922,11 @@ def feuille_saisie_notes(evaluation_id, group_ids=[]):
# une liste de liste de chaines: lignes de la feuille de calcul # une liste de liste de chaines: lignes de la feuille de calcul
rows = [] rows = []
etuds = _get_sorted_etuds(evaluation, etudids, formsemestre.id) etuds = _get_sorted_etuds(evaluation, etudids, formsemestre.id)
for e in etuds: for e in etuds:
etudid = e["etudid"] etudid = e["etudid"]
groups = sco_groups.get_etud_groups(etudid, formsemestre.id) groups = sco_groups.get_etud_groups(etudid, formsemestre.id)
grc = sco_groups.listgroups_abbrev(groups) grc = sco_groups.listgroups_abbrev(groups)
rows.append( rows.append(
[ [
str(etudid), str(etudid),
@ -938,6 +936,7 @@ def feuille_saisie_notes(evaluation_id, group_ids=[]):
grc, grc,
e["val"], e["val"],
e["explanation"], e["explanation"],
e["code_nip"],
] ]
) )