From 6d16927db91a826f4d4da2a3d1499d03c2e17063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9o=20BARAS=20=28IUT1=20Grenoble=29?= Date: Tue, 16 Jan 2024 08:54:20 +0100 Subject: [PATCH] =?UTF-8?q?D=C3=A9sactive=20les=20moyennes=20par=20tag,=20?= =?UTF-8?q?autres=20que=20le=20tag=20but?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/pe/pe_semestretag.py | 6 +++--- app/pe/pe_settag.py | 2 +- app/pe/pe_view.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/pe/pe_semestretag.py b/app/pe/pe_semestretag.py index 440855b27..977bc4774 100644 --- a/app/pe/pe_semestretag.py +++ b/app/pe/pe_semestretag.py @@ -139,9 +139,9 @@ class SemestreTag(pe_tagtable.TableTag): # Calcul des moyennes de chaque étudiant puis ajoute la moyenne au sens "DUT" for tag in self.tagdict: self.add_moyennesTag(tag, self.comp_MoyennesTag(tag, force=True)) - self.add_moyennesTag("dut", self.get_moyennes_DUT()) + self.add_moyennesTag("but", self.get_moyennes_DUT()) self.taglist = sorted( - list(self.tagdict.keys()) + ["dut"] + list(self.tagdict.keys()) + ["but"] ) # actualise la liste des tags # ----------------------------------------------------------------------------- @@ -168,7 +168,7 @@ class SemestreTag(pe_tagtable.TableTag): """ tagdict = {} - for modimpl in self.modimpls: + for modimpl in []: # CB: désactive la recherche des tags -> self.modimpls: modimpl_id = modimpl.id # liste des tags pour le modimpl concerné: tags = sco_tag_module.module_tag_list(modimpl.module.id) diff --git a/app/pe/pe_settag.py b/app/pe/pe_settag.py index a0ded4f52..4431bcb80 100644 --- a/app/pe/pe_settag.py +++ b/app/pe/pe_settag.py @@ -150,7 +150,7 @@ class SetTag(pe_tagtable.TableTag): self.tagdict = {} for semtag in self.SemTagDict.values(): for tag in semtag.get_all_tags(): - if tag != "dut": + if tag != "but": if tag not in self.tagdict: self.tagdict[tag] = {} for mod in semtag.tagdict[tag]: diff --git a/app/pe/pe_view.py b/app/pe/pe_view.py index ded41a911..a538b7df8 100644 --- a/app/pe/pe_view.py +++ b/app/pe/pe_view.py @@ -96,7 +96,7 @@ def pe_view_sem_recap( return _pe_view_sem_recap_form(formsemestre_id) prefs = sco_preferences.SemPreferences(formsemestre_id=formsemestre_id) - semBase = sco_formsemestre.get_formsemestre(formsemestre_id) + semBase = sco_formsemestre.get_formsemestre(formsemestre_id) # FormSemestre.get_formsemestre() jury = pe_jurype.JuryPE(semBase) # Ajout avis LaTeX au même zip: