diff --git a/app/scodoc/gen_tables.py b/app/scodoc/gen_tables.py index fcca48af0..078017e8c 100644 --- a/app/scodoc/gen_tables.py +++ b/app/scodoc/gen_tables.py @@ -639,7 +639,7 @@ class GenTable(object): H.append(html_title) H.append(self.html()) if with_html_headers: - H.append(html_sco_header.sco_footer(context, REQUEST)) + H.append(html_sco_header.sco_footer()) return "\n".join(H) elif format == "pdf": objects = self.pdf() @@ -700,7 +700,7 @@ class SeqGenTable(object): # ----- Exemple d'utilisation minimal. if __name__ == "__main__": - T = gen_tables.GenTable( + T = GenTable( rows=[{"nom": "Hélène", "age": 26}, {"nom": "Titi&çà§", "age": 21}], columns_ids=("nom", "age"), ) @@ -715,7 +715,7 @@ if __name__ == "__main__": from reportlab.platypus import KeepInFrame from app.scodoc import sco_preferences, sco_pdf - preferences = sco_preferences.SemPreferences(None) + preferences = sco_preferences.SemPreferences() T.preferences = preferences objects = T.gen(format="pdf") objects = [KeepInFrame(0, 0, objects, mode="shrink")] diff --git a/app/scodoc/html_sco_header.py b/app/scodoc/html_sco_header.py index 171b694c5..2401ee7cb 100644 --- a/app/scodoc/html_sco_header.py +++ b/app/scodoc/html_sco_header.py @@ -28,7 +28,7 @@ """HTML Header/Footer for ScoDoc pages """ -import cgi +import html from flask_login import current_user @@ -124,9 +124,9 @@ _HTML_BEGIN = """ """ -def scodoc_top_html_header(context, REQUEST, page_title="ScoDoc"): +def scodoc_top_html_header(page_title="ScoDoc: bienvenue"): H = [ - _HTML_BEGIN % {"page_title": "ScoDoc: bienvenue", "encoding": scu.SCO_ENCODING}, + _HTML_BEGIN % {"page_title": page_title, "encoding": scu.SCO_ENCODING}, _TOP_LEVEL_CSS, """""", scu.CUSTOM_HTML_HEADER_CNX, @@ -158,9 +158,8 @@ def sco_header( "Main HTML page header for ScoDoc" from app.scodoc.sco_formsemestre_status import formsemestre_page_title + context = None # XXX TODO à enlever #context # context est une instance de ZScolar. container est une instance qui "acquiert" ZScolar - if container: - context = container # je pense que cela suffit pour ce qu'on veut. # Add a HTTP header (can be used by Apache to log requests) if REQUEST.AUTHENTICATED_USER: @@ -308,7 +307,7 @@ def sco_header( H.append(scu.CUSTOM_HTML_HEADER) # if not no_side_bar: - H.append(html_sidebar.sidebar(context, REQUEST)) + H.append(html_sidebar.sidebar(REQUEST)) H.append("""
""") # # Barre menu semestre: @@ -327,7 +326,7 @@ def sco_header( ) # if head_message: - H.append('
' + cgi.escape(head_message) + "
") + H.append('
' + html.escape(head_message) + "
") # # div pour affichage messages temporaires H.append('
') @@ -335,7 +334,7 @@ def sco_header( return "".join(H) -def sco_footer(context, REQUEST=None): +def sco_footer(): """Main HTMl pages footer""" return ( """
""" + scu.CUSTOM_HTML_FOOTER + """""" diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py index c041c6933..a172df4f0 100644 --- a/app/scodoc/html_sidebar.py +++ b/app/scodoc/html_sidebar.py @@ -35,7 +35,7 @@ from app.scodoc import sco_preferences from app.scodoc.sco_permissions import Permission -def sidebar_common(context, REQUEST=None): +def sidebar_common(REQUEST=None): "partie commune à toutes les sidebar" authuser = REQUEST.AUTHENTICATED_USER params = { @@ -50,7 +50,7 @@ def sidebar_common(context, REQUEST=None): 'ScoDoc 8', '
%(authuser)s
déconnexion
' % params, - sidebar_dept(context, REQUEST), + sidebar_dept(REQUEST), """

Scolarité

Semestres
Programmes
@@ -75,7 +75,7 @@ def sidebar_common(context, REQUEST=None): return "".join(H) -def sidebar(context, REQUEST=None): +def sidebar(REQUEST=None): "Main HTML page sidebar" # rewritten from legacy DTML code from app.scodoc import sco_abs @@ -86,7 +86,7 @@ def sidebar(context, REQUEST=None): "SCO_USER_MANUAL": scu.SCO_USER_MANUAL, } - H = ['
', sidebar_common(context, REQUEST)] + H = ['
', sidebar_common(REQUEST)] H.append( """
Chercher étudiant:
@@ -168,7 +168,7 @@ def sidebar(context, REQUEST=None): return "".join(H) -def sidebar_dept(context, REQUEST=None): +def sidebar_dept(REQUEST=None): """Partie supérieure de la marge de gauche""" infos = { "BASE0": REQUEST.BASE0, diff --git a/app/scodoc/notes_table.py b/app/scodoc/notes_table.py index 70d005879..b3b50ae61 100644 --- a/app/scodoc/notes_table.py +++ b/app/scodoc/notes_table.py @@ -1302,7 +1302,7 @@ class NotesTable(object): """[ {...evaluation et son etat...} ]""" if self._evaluations_etats is None: self._evaluations_etats = sco_evaluations.do_evaluation_list_in_sem( - self.context, self.formsemestre_id + self.formsemestre_id ) return self._evaluations_etats diff --git a/app/scodoc/pe_jurype.py b/app/scodoc/pe_jurype.py index 5c0787181..73440bb82 100644 --- a/app/scodoc/pe_jurype.py +++ b/app/scodoc/pe_jurype.py @@ -44,10 +44,7 @@ Created on Fri Sep 9 09:15:05 2016 import os -try: - from io import StringIO ## for Python 3 -except ImportError: - from cStringIO import StringIO ## for Python 2 +from io import StringIO from zipfile import ZipFile, BadZipfile import pprint @@ -498,7 +495,7 @@ class JuryPE(object): lastdate = max(sesdates) # date de fin de l'inscription la plus récente # if PETable.AFFICHAGE_DEBUG_PE == True : pe_tools.pe_print(" derniere inscription = ", lastDateSem) - semestresDeScoDoc = sco_formsemestre.formsemestre_list(self.context) + semestresDeScoDoc = sco_formsemestre.do_formsemestre_list(self.context) semestresSuperieurs = [ sem for sem in semestresDeScoDoc if sem["semestre_id"] > sonDernierSidValide ] # Semestre de rang plus élevé que son dernier sem valide @@ -1243,9 +1240,9 @@ def get_cosemestres_diplomants(context, semBase, avec_meme_formation=False): > dont la formation est la même (optionnel) > ne prenant en compte que les etudiants sans redoublement """ - tousLesSems = sco_formsemestre.formsemestre_list( + tousLesSems = sco_formsemestre.do_formsemestre_list( context - ) # tous les semestres memorises dans scodoc + ) # tous les semestres memorisés dans scodoc diplome = get_annee_diplome_semestre(semBase) if avec_meme_formation: # si une formation est imposee diff --git a/app/scodoc/pe_view.py b/app/scodoc/pe_view.py index efe0e72b2..faf2098a6 100644 --- a/app/scodoc/pe_view.py +++ b/app/scodoc/pe_view.py @@ -73,7 +73,7 @@ def _pe_view_sem_recap_form(context, formsemestre_id, REQUEST=None): formsemestre_id=formsemestre_id ), ] - return "\n".join(H) + html_sco_header.sco_footer(context, REQUEST) + return "\n".join(H) + html_sco_header.sco_footer() def pe_view_sem_recap( diff --git a/app/scodoc/sco_abs_views.py b/app/scodoc/sco_abs_views.py index 7f75aa15e..06f2749fe 100644 --- a/app/scodoc/sco_abs_views.py +++ b/app/scodoc/sco_abs_views.py @@ -157,7 +157,7 @@ def doSignaleAbsence( % etud ) H.append(sco_find_etud.form_search_etud(context, REQUEST)) - H.append(html_sco_header.sco_footer(context, REQUEST)) + H.append(html_sco_header.sco_footer()) return "\n".join(H) @@ -278,7 +278,7 @@ Raison: (optionnel) "menu_module": menu_module, "disabled": "disabled" if disabled else "", }, - html_sco_header.sco_footer(context, REQUEST), + html_sco_header.sco_footer(), ] return "\n".join(H) @@ -367,7 +367,7 @@ def doJustifAbsence( % etud ) H.append(sco_find_etud.form_search_etud(context, REQUEST)) - H.append(html_sco_header.sco_footer(context, REQUEST)) + H.append(html_sco_header.sco_footer()) return "\n".join(H) @@ -424,7 +424,7 @@ Raison: (optionnel) """ % etud, - html_sco_header.sco_footer(context, REQUEST), + html_sco_header.sco_footer(), ] return "\n".join(H) @@ -477,7 +477,7 @@ autre absence pour %(nomprenom)s % etud ) H.append(sco_find_etud.form_search_etud(context, REQUEST)) - H.append(html_sco_header.sco_footer(context, REQUEST)) + H.append(html_sco_header.sco_footer()) return "\n".join(H) @@ -565,7 +565,7 @@ def AnnuleAbsenceEtud(context, REQUEST=None): # etudid implied """ % etud, - html_sco_header.sco_footer(context, REQUEST), + html_sco_header.sco_footer(), ] return "\n".join(H) @@ -618,7 +618,7 @@ autre absence pour %(nomprenom)s % etud ) H.append(sco_find_etud.form_search_etud(context, REQUEST)) - H.append(html_sco_header.sco_footer(context, REQUEST)) + H.append(html_sco_header.sco_footer()) return "\n".join(H) @@ -696,7 +696,7 @@ def EtatAbsences(context, REQUEST=None): """ % (scu.AnneeScolaire(REQUEST), datetime.datetime.now().strftime("%d/%m/%Y")), - html_sco_header.sco_footer(context, REQUEST), + html_sco_header.sco_footer(), ] return "\n".join(H) @@ -799,7 +799,7 @@ def CalAbs(context, REQUEST=None): # etud implied H.append("selected") H.append(""">%s""" % y) H.append("""""") - H.append(html_sco_header.sco_footer(context, REQUEST)) + H.append(html_sco_header.sco_footer()) return "\n".join(H) @@ -884,7 +884,7 @@ def ListeAbsEtud( H.append(tab_absjust.html()) else: H.append("""

Pas d'absences justifiées

""") - return "\n".join(H) + html_sco_header.sco_footer(context, REQUEST) + return "\n".join(H) + html_sco_header.sco_footer() elif format == "text": T = [] diff --git a/app/scodoc/sco_apogee_compare.py b/app/scodoc/sco_apogee_compare.py index fa2df3225..a6401f0e2 100644 --- a/app/scodoc/sco_apogee_compare.py +++ b/app/scodoc/sco_apogee_compare.py @@ -85,7 +85,7 @@ def apo_compare_csv_form(context, REQUEST=None):
""", - html_sco_header.sco_footer(context, REQUEST), + html_sco_header.sco_footer(), ] return "\n".join(H) @@ -105,7 +105,7 @@ def apo_compare_csv(context, A_file, B_file, autodetect=True, REQUEST=None): _apo_compare_csv(context, A, B, REQUEST=None), "
", """

Autre comparaison

""", - html_sco_header.sco_footer(context, REQUEST), + html_sco_header.sco_footer(), ] return "\n".join(H) diff --git a/app/scodoc/sco_archives.py b/app/scodoc/sco_archives.py index 5ab5c548a..b0c4a86d4 100644 --- a/app/scodoc/sco_archives.py +++ b/app/scodoc/sco_archives.py @@ -313,7 +313,7 @@ def do_formsemestre_archive( '

Valeurs archivées le %s

' % date, '', data, - html_sco_header.sco_footer(context, REQUEST), + html_sco_header.sco_footer(), ] ) PVArchive.store(archive_id, "Tableau_moyennes.html", data) @@ -406,7 +406,7 @@ enregistrés et non modifiables, on peut les retrouver ultérieurement. F = [ """

Note: les documents sont aussi affectés par les réglages sur la page "Paramétrage" (accessible à l'administrateur du département).

""", - html_sco_header.sco_footer(context, REQUEST), + html_sco_header.sco_footer(), ] descr = [ @@ -539,7 +539,7 @@ def formsemestre_list_archives(context, REQUEST, formsemestre_id): H.append("") H.append("") - return "\n".join(H) + html_sco_header.sco_footer(context, REQUEST) + return "\n".join(H) + html_sco_header.sco_footer() def formsemestre_get_archived_file( diff --git a/app/scodoc/sco_archives_etud.py b/app/scodoc/sco_archives_etud.py index e8c216e67..df332fe95 100644 --- a/app/scodoc/sco_archives_etud.py +++ b/app/scodoc/sco_archives_etud.py @@ -164,7 +164,7 @@ def etud_upload_file_form(context, REQUEST, etudid): cancelbutton="Annuler", ) if tf[0] == 0: - return "\n".join(H) + tf[1] + html_sco_header.sco_footer(context, REQUEST) + return "\n".join(H) + tf[1] + html_sco_header.sco_footer() elif tf[0] == -1: return REQUEST.RESPONSE.redirect( url_for("scolar.ficheEtud", scodoc_dept=g.scodoc_dept, etudid=etudid) @@ -289,7 +289,7 @@ def etudarchive_import_files_form(context, group_id, REQUEST=None): """ % group_id, ] - F = html_sco_header.sco_footer(context, REQUEST) + F = html_sco_header.sco_footer() tf = TrivialFormulator( REQUEST.URL0, REQUEST.form, @@ -342,4 +342,4 @@ def etudarchive_import_files( r = sco_trombino.zip_excel_import_files( context, xlsfile, zipfile, REQUEST, callback, filename_title, page_title ) - return r + html_sco_header.sco_footer(context, REQUEST) + return r + html_sco_header.sco_footer() diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py index 7755f35d8..89ad2945f 100644 --- a/app/scodoc/sco_bulletins.py +++ b/app/scodoc/sco_bulletins.py @@ -99,7 +99,7 @@ def make_context_dict(context, sem, etud): C.update(etud) # copie preferences # XXX devrait acceder directement à un dict de preferences, à revoir - for name in sco_preferences.get_base_preferences(context).prefs_name: + for name in sco_preferences.get_base_preferences().prefs_name: C[name] = sco_preferences.get_preference(name, sem["formsemestre_id"]) # ajoute groupes et group_0, group_1, ... @@ -564,7 +564,7 @@ def _ue_mod_bulletin(context, etudid, formsemestre_id, ue_id, modimpls, nt, vers if sco_preferences.get_preference("bul_show_all_evals", formsemestre_id): complete_eval_ids = set([e["evaluation_id"] for e in evals]) all_evals = sco_evaluations.do_evaluation_list( - context, args={"moduleimpl_id": modimpl["moduleimpl_id"]} + args={"moduleimpl_id": modimpl["moduleimpl_id"]} ) all_evals.reverse() # plus ancienne d'abord for e in all_evals: @@ -832,7 +832,7 @@ def formsemestre_bulletinetud( H.append('
') # --- Pied de page - H.append(html_sco_header.sco_footer(context, REQUEST)) + H.append(html_sco_header.sco_footer()) return "".join(H) diff --git a/app/scodoc/sco_bulletins_generator.py b/app/scodoc/sco_bulletins_generator.py index fd7780c7d..03c0e8e43 100644 --- a/app/scodoc/sco_bulletins_generator.py +++ b/app/scodoc/sco_bulletins_generator.py @@ -229,9 +229,7 @@ class BulletinGenerator(object): margins=self.margins, server_name=self.server_name, filigranne=self.filigranne, - preferences=sco_preferences.SemPreferences( - self.context, formsemestre_id - ), + preferences=sco_preferences.SemPreferences(formsemestre_id), ) ) document.build(objects) diff --git a/app/scodoc/sco_bulletins_json.py b/app/scodoc/sco_bulletins_json.py index f1626f183..6b1e76fc1 100644 --- a/app/scodoc/sco_bulletins_json.py +++ b/app/scodoc/sco_bulletins_json.py @@ -293,7 +293,7 @@ def formsemestre_bulletinetud_published_dict( "bul_show_all_evals", formsemestre_id ): all_evals = sco_evaluations.do_evaluation_list( - context, args={"moduleimpl_id": modimpl["moduleimpl_id"]} + args={"moduleimpl_id": modimpl["moduleimpl_id"]} ) all_evals.reverse() # plus ancienne d'abord for e in all_evals: diff --git a/app/scodoc/sco_bulletins_standard.py b/app/scodoc/sco_bulletins_standard.py index b30dc4c41..d77b91a95 100644 --- a/app/scodoc/sco_bulletins_standard.py +++ b/app/scodoc/sco_bulletins_standard.py @@ -97,7 +97,7 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator): columns_ids=colkeys, pdf_table_style=pdf_style, pdf_col_widths=[colWidths[k] for k in colkeys], - preferences=sco_preferences.SemPreferences(self.context, formsemestre_id), + preferences=sco_preferences.SemPreferences(formsemestre_id), html_class="notes_bulletin", html_class_ignore_default=True, html_with_td_classes=True, @@ -667,9 +667,7 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator): else: t["_module_colspan"] = 2 if prefs["bul_show_minmax_eval"] or prefs["bul_show_moypromo"]: - etat = sco_evaluations.do_evaluation_etat( - self.context, e["evaluation_id"] - ) + etat = sco_evaluations.do_evaluation_etat(e["evaluation_id"]) if prefs["bul_show_minmax_eval"]: t["min"] = scu.fmt_note(etat["mini"]) t["max"] = scu.fmt_note(etat["maxi"]) diff --git a/app/scodoc/sco_bulletins_xml.py b/app/scodoc/sco_bulletins_xml.py index 0440e287e..bfdcc238f 100644 --- a/app/scodoc/sco_bulletins_xml.py +++ b/app/scodoc/sco_bulletins_xml.py @@ -298,7 +298,7 @@ def make_xml_formsemestre_bulletinetud( "bul_show_all_evals", formsemestre_id ): all_evals = sco_evaluations.do_evaluation_list( - context, args={"moduleimpl_id": modimpl["moduleimpl_id"]} + args={"moduleimpl_id": modimpl["moduleimpl_id"]} ) all_evals.reverse() # plus ancienne d'abord for e in all_evals: diff --git a/app/scodoc/sco_compute_moy.py b/app/scodoc/sco_compute_moy.py index c1e5fb09d..8124671e8 100644 --- a/app/scodoc/sco_compute_moy.py +++ b/app/scodoc/sco_compute_moy.py @@ -228,7 +228,7 @@ def do_moduleimpl_moyennes(context, nt, mod): for e in evals: e["nb_inscrits"] = e["etat"]["nb_inscrits"] NotesDB = sco_evaluations.do_evaluation_get_all_notes( - context, e["evaluation_id"] + e["evaluation_id"] ) # toutes, y compris demissions # restreint aux étudiants encore inscrits à ce module notes = [ diff --git a/app/scodoc/sco_debouche.py b/app/scodoc/sco_debouche.py index 3d1a61c47..9bb6bad90 100644 --- a/app/scodoc/sco_debouche.py +++ b/app/scodoc/sco_debouche.py @@ -200,7 +200,7 @@ def report_debouche_ask_date(context, REQUEST=None): + """
Date de départ de la recherche:
""" - + html_sco_header.sco_footer(context, REQUEST) + + html_sco_header.sco_footer() ) diff --git a/app/scodoc/sco_dept.py b/app/scodoc/sco_dept.py index d2451c01e..edb52dae2 100644 --- a/app/scodoc/sco_dept.py +++ b/app/scodoc/sco_dept.py @@ -181,7 +181,7 @@ Chercher étape courante: ") H.append("") - H.append(html_sco_header.sco_footer(context, REQUEST)) + H.append(html_sco_header.sco_footer()) return "\n".join(H) diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py index 86c9ec142..5b52f2231 100644 --- a/app/scodoc/sco_edit_ue.py +++ b/app/scodoc/sco_edit_ue.py @@ -102,8 +102,6 @@ def do_ue_create(context, args, REQUEST): context, args={"formation_id": args["formation_id"]} )[0] sco_news.add( - context, - REQUEST, typ=sco_news.NEWS_FORM, object=args["formation_id"], text="Modification de la formation %(acronyme)s" % F, @@ -167,8 +165,6 @@ def do_ue_delete(context, ue_id, delete_validations=False, REQUEST=None, force=F context, args={"formation_id": ue["formation_id"]} )[0] sco_news.add( - context, - REQUEST, typ=sco_news.NEWS_FORM, object=ue["formation_id"], text="Modification de la formation %(acronyme)s" % F, @@ -330,7 +326,7 @@ def ue_edit(context, ue_id=None, create=False, formation_id=None, REQUEST=None): if tf[0] == 0: X = """
""" - return "\n".join(H) + tf[1] + X + html_sco_header.sco_footer(context, REQUEST) + return "\n".join(H) + tf[1] + X + html_sco_header.sco_footer() else: if create: if not tf[2]["ue_code"]: @@ -824,7 +820,7 @@ Si vous souhaitez modifier cette formation (par exemple pour y ajouter un module warn, _ = sco_formsemestre_validation.check_formation_ues(context, formation_id) H.append(warn) - H.append(html_sco_header.sco_footer(context, REQUEST)) + H.append(html_sco_header.sco_footer()) return "".join(H) diff --git a/app/scodoc/sco_edt_cal.py b/app/scodoc/sco_edt_cal.py index 28d802f92..b95d0ed9c 100644 --- a/app/scodoc/sco_edt_cal.py +++ b/app/scodoc/sco_edt_cal.py @@ -198,7 +198,7 @@ def experimental_calendar(context, group_id=None, formsemestre_id=None, REQUEST= """
loading...
""", - html_sco_header.sco_footer(context, REQUEST), + html_sco_header.sco_footer(), """