From 14d329fb0f5afebc9ae1f28e1b12d52a03a92fd2 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sat, 19 Jun 2021 23:21:37 +0200 Subject: [PATCH] Massive refactoring/reorganization of imports. Work in progress. --- .pylintrc | 4 + README.md | 12 - app/decorators.py | 21 +- app/scodoc/ImportScolars.py | 54 +- app/scodoc/TrivialFormulator.py | 2 +- app/scodoc/ZAbsences.py | 1981 ----------- app/scodoc/ZScoDoc.py | 25 +- app/scodoc/ZScoUsers.py | 28 +- app/scodoc/__init__.py | 1 - app/scodoc/debug.py | 44 +- app/scodoc/dutrules.py | 2 +- app/scodoc/gen_tables.py | 12 +- app/scodoc/html_sco_header.py | 19 +- app/scodoc/html_sidebar.py | 15 +- app/scodoc/htmlutils.py | 4 +- app/scodoc/mails.py | 4 +- app/scodoc/notes_cache.py | 4 +- app/scodoc/notes_log.py | 12 - app/scodoc/notes_table.py | 62 +- app/scodoc/notesdb.py | 6 +- app/scodoc/pe_avislatex.py | 20 +- app/scodoc/pe_jurype.py | 26 +- app/scodoc/pe_semestretag.py | 12 +- app/scodoc/pe_settag.py | 8 +- app/scodoc/pe_tagtable.py | 4 +- app/scodoc/pe_tools.py | 6 +- app/scodoc/pe_view.py | 24 +- app/scodoc/sco_abs.py | 460 ++- app/scodoc/sco_abs_notification.py | 27 +- app/scodoc/sco_abs_views.py | 302 +- app/scodoc/sco_apogee_compare.py | 15 +- app/scodoc/sco_apogee_csv.py | 47 +- app/scodoc/sco_archives.py | 34 +- app/scodoc/sco_archives_etud.py | 28 +- app/scodoc/sco_bulletins.py | 87 +- app/scodoc/sco_bulletins_example.py | 12 +- app/scodoc/sco_bulletins_generator.py | 40 +- app/scodoc/sco_bulletins_json.py | 28 +- app/scodoc/sco_bulletins_legacy.py | 23 +- app/scodoc/sco_bulletins_pdf.py | 26 +- app/scodoc/sco_bulletins_standard.py | 34 +- app/scodoc/sco_bulletins_ucac.py | 17 +- app/scodoc/sco_bulletins_xml.py | 32 +- app/scodoc/sco_cache.py | 3 +- app/scodoc/sco_compute_moy.py | 36 +- app/scodoc/sco_config.py | 2 +- app/scodoc/sco_config_load.py | 4 +- app/scodoc/sco_core.py | 41 +- app/scodoc/sco_cost_formation.py | 17 +- app/scodoc/sco_debouche.py | 39 +- app/scodoc/sco_dept.py | 21 +- app/scodoc/sco_dump_db.py | 21 +- app/scodoc/sco_edit_formation.py | 29 +- app/scodoc/sco_edit_matiere.py | 43 +- app/scodoc/sco_edit_module.py | 47 +- app/scodoc/sco_edit_ue.py | 55 +- app/scodoc/sco_edt_cal.py | 19 +- app/scodoc/sco_entreprises.py | 4 +- app/scodoc/sco_etape_apogee.py | 51 +- app/scodoc/sco_etape_apogee_view.py | 43 +- app/scodoc/sco_etape_bilan.py | 8 +- app/scodoc/{scolars.py => sco_etud.py} | 110 +- app/scodoc/sco_evaluations.py | 107 +- app/scodoc/sco_excel.py | 15 +- app/scodoc/sco_export_results.py | 38 +- app/scodoc/sco_find_etud.py | 32 +- app/scodoc/sco_formations.py | 26 +- app/scodoc/sco_formsemestre.py | 20 +- app/scodoc/sco_formsemestre_custommenu.py | 16 +- app/scodoc/sco_formsemestre_edit.py | 66 +- app/scodoc/sco_formsemestre_exterieurs.py | 44 +- app/scodoc/sco_formsemestre_inscriptions.py | 61 +- app/scodoc/sco_formsemestre_status.py | 85 +- app/scodoc/sco_formsemestre_validation.py | 78 +- app/scodoc/sco_formulas.py | 6 +- app/scodoc/sco_groups.py | 49 +- app/scodoc/sco_groups_edit.py | 14 +- app/scodoc/sco_groups_view.py | 41 +- app/scodoc/sco_import_users.py | 16 +- app/scodoc/sco_inscr_passage.py | 42 +- app/scodoc/sco_liste_notes.py | 65 +- app/scodoc/sco_lycee.py | 20 +- app/scodoc/sco_modalites.py | 8 +- app/scodoc/sco_moduleimpl.py | 51 +- app/scodoc/sco_moduleimpl_inscriptions.py | 49 +- app/scodoc/sco_moduleimpl_status.py | 84 +- app/scodoc/sco_news.py | 28 +- app/scodoc/sco_page_etud.py | 65 +- app/scodoc/sco_parcours_dut.py | 60 +- app/scodoc/sco_pdf.py | 15 +- app/scodoc/sco_permissions.py | 64 - app/scodoc/sco_permissions_check.py | 139 + app/scodoc/sco_photos.py | 27 +- app/scodoc/sco_placement.py | 45 +- app/scodoc/sco_portal_apogee.py | 25 +- app/scodoc/sco_poursuite_dut.py | 20 +- app/scodoc/sco_preferences.py | 3419 ++++++++++--------- app/scodoc/sco_prepajury.py | 28 +- app/scodoc/sco_pvjury.py | 63 +- app/scodoc/sco_pvpdf.py | 29 +- app/scodoc/sco_recapcomplet.py | 44 +- app/scodoc/sco_report.py | 48 +- app/scodoc/sco_roles_default.py | 4 +- app/scodoc/sco_saisie_notes.py | 141 +- app/scodoc/sco_semset.py | 25 +- app/scodoc/sco_synchro_etuds.py | 70 +- app/scodoc/sco_tag_module.py | 23 +- app/scodoc/sco_trombino.py | 46 +- app/scodoc/sco_trombino_tours.py | 37 +- app/scodoc/sco_ue_external.py | 52 +- app/scodoc/sco_undo_notes.py | 28 +- app/scodoc/sco_up_to_date.py | 5 +- app/scodoc/sco_users.py | 9 +- app/scodoc/sco_utils.py | 79 +- app/scodoc/sco_zope.py | 67 - app/scodoc/scolog.py | 20 +- app/views/__init__.py | 1 - app/views/absences.py | 781 +---- app/views/entreprises.py | 12 +- app/views/notes.py | 167 +- app/views/scolar.py | 189 +- scodoc_manager.py | 32 + 122 files changed, 4670 insertions(+), 6487 deletions(-) delete mode 100644 app/scodoc/ZAbsences.py rename app/scodoc/{scolars.py => sco_etud.py} (94%) create mode 100644 app/scodoc/sco_permissions_check.py delete mode 100644 app/scodoc/sco_zope.py diff --git a/.pylintrc b/.pylintrc index 1bda9b54..a69fc72b 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,2 +1,6 @@ +[[MESSAGES CONTROL] +# pylint and black disagree... +disable=bad-continuation + [TYPECHECK] ignored-classes=Permission diff --git a/README.md b/README.md index 48336d5d..cd6a0134 100644 --- a/README.md +++ b/README.md @@ -56,15 +56,3 @@ Installer le bon vieux `pyExcelerator` dans l'environnement: ### Méthodes qui ne devraient plus être publiées: - - - - - - - - - - - - diff --git a/app/decorators.py b/app/decorators.py index 3d90aa21..5199f85e 100644 --- a/app/decorators.py +++ b/app/decorators.py @@ -48,14 +48,17 @@ class ZRequest(object): self.REQUEST_METHOD = request.method.encode("utf-8") self.AUTHENTICATED_USER = current_user if request.method == "POST": - self.form = request.form + self.form = request.form # xxx encode en utf-8 ! + # Encode en utf-8 pour ScoDoc8 #sco8 + self.form = {k: v.encode("utf-8") for (k, v) in request.form.items()} if request.files: # Add files in form: must copy to get a mutable version # request.form is a werkzeug.datastructures.ImmutableMultiDict - self.form = self.form.copy() + # self.form = self.form.copy() self.form.update(request.files) elif request.method == "GET": - self.form = request.args + # Encode en utf-8 pour ScoDoc8 #sco8 + self.form = {k: v.encode("utf-8") for (k, v) in request.args.items()} self.RESPONSE = ZResponse() def __str__(self): @@ -158,7 +161,11 @@ def scodoc7func(context): elif arg_name == "context": pos_arg_values.append(context) else: - pos_arg_values.append(req_args[arg_name]) + # XXX Convert to regular string for ScoDoc8/Python 2 + if type(req_args[arg_name]) == types.UnicodeType: + pos_arg_values.append(req_args[arg_name].encode("utf-8")) + else: + pos_arg_values.append(req_args[arg_name]) current_app.logger.info("pos_arg_values=%s" % pos_arg_values) # Add keyword arguments if nb_default_args: @@ -167,7 +174,11 @@ def scodoc7func(context): kwargs[arg_name] = REQUEST elif arg_name in req_args: # set argument kw optionnel - kwargs[arg_name] = req_args[arg_name] + # XXX Convert to regular string for ScoDoc8/Python 2 + if type(req_args[arg_name]) == types.UnicodeType: + kwargs[arg_name] = req_args[arg_name].encode("utf-8") + else: + kwargs[arg_name] = req_args[arg_name] current_app.logger.info( "scodoc7func_decorator: top_level=%s, pos_arg_values=%s, kwargs=%s" % (top_level, pos_arg_values, kwargs) diff --git a/app/scodoc/ImportScolars.py b/app/scodoc/ImportScolars.py index 20e0180d..8e4f1d57 100644 --- a/app/scodoc/ImportScolars.py +++ b/app/scodoc/ImportScolars.py @@ -36,12 +36,14 @@ import collections import types import re -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from sco_formsemestre_inscriptions import do_formsemestre_inscription_with_modules -from gen_tables import GenTable -from sco_exceptions import ( +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.sco_formsemestre_inscriptions import ( + do_formsemestre_inscription_with_modules, +) +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_exceptions import ( AccessDenied, FormatError, ScoException, @@ -50,14 +52,14 @@ from sco_exceptions import ( ScoLockedFormError, ScoGenError, ) -import html_sco_header -import scolars -import sco_formsemestre -import sco_groups -import sco_excel -import sco_groups_view -import sco_news -import sco_preferences +from app.scodoc import html_sco_header +from app.scodoc import sco_etud +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_excel +from app.scodoc import sco_groups_view +from app.scodoc import sco_news +from app.scodoc import sco_preferences # format description (relative to Product directory)) FORMAT_FILE = "misc/format_import_etudiants.txt" @@ -199,7 +201,7 @@ def sco_import_generate_excel_sample( # rempli table avec données actuelles lines = [] for i in members: - etud = scolars.get_etud_info(etudid=i["etudid"], filled=True)[0] + etud = sco_etud.get_etud_info(etudid=i["etudid"], filled=True)[0] l = [] for field in titles: if field == "groupes": @@ -371,7 +373,7 @@ def scolars_import_excel_file( # xxx Ad-hoc checks (should be in format description) if scu.strlower(titleslist[i]) == "sexe": try: - val = scolars.input_civilite(val) + val = sco_etud.input_civilite(val) except: raise ScoValueError( "valeur invalide pour 'SEXE' (doit etre 'M', 'F', ou 'MME', 'H', 'X' ou vide, mais pas '%s') ligne %d, colonne %s" @@ -405,7 +407,7 @@ def scolars_import_excel_file( if values["code_ine"] and not is_new_ine: raise ScoValueError("Code INE dupliqué (%s)" % values["code_ine"]) # Check nom/prenom - ok, NbHomonyms = scolars.check_nom_prenom( + ok, NbHomonyms = sco_etud.check_nom_prenom( cnx, nom=values["nom"], prenom=values["prenom"] ) if not ok: @@ -513,16 +515,16 @@ def _import_one_student( ) # Identite args = values.copy() - etudid = scolars.identite_create(cnx, args, context=context, REQUEST=REQUEST) + etudid = sco_etud.identite_create(cnx, args, context=context, REQUEST=REQUEST) created_etudids.append(etudid) # Admissions args["etudid"] = etudid args["annee"] = annee_courante - _ = scolars.admission_create(cnx, args) + _ = sco_etud.admission_create(cnx, args) # Adresse args["typeadresse"] = "domicile" args["description"] = "(infos admission)" - _ = scolars.adresse_create(cnx, args) + _ = sco_etud.adresse_create(cnx, args) # Inscription au semestre args["etat"] = "I" # etat insc. semestre if formsemestre_id: @@ -561,7 +563,7 @@ def _import_one_student( def _is_new_ine(cnx, code_ine): "True if this code is not in DB" - etuds = scolars.identite_list(cnx, {"code_ine": code_ine}) + etuds = sco_etud.identite_list(cnx, {"code_ine": code_ine}) return not etuds @@ -642,7 +644,7 @@ def scolars_import_admission( ) else: etud = etuds_by_nomprenom[(nom, prenom)] - cur_adm = scolars.admission_list(cnx, args={"etudid": etud["etudid"]})[0] + cur_adm = sco_etud.admission_list(cnx, args={"etudid": etud["etudid"]})[0] # peuple les champs presents dans le tableau args = {} for idx in fields: @@ -665,17 +667,17 @@ def scolars_import_admission( # Type admission: traitement particulier if not cur_adm["type_admission"] and not args.get("type_admission"): args["type_admission"] = type_admission - scolars.etudident_edit(cnx, args) - adr = scolars.adresse_list(cnx, args={"etudid": etud["etudid"]}) + sco_etud.etudident_edit(cnx, args) + adr = sco_etud.adresse_list(cnx, args={"etudid": etud["etudid"]}) if adr: args["adresse_id"] = adr[0]["adresse_id"] - scolars.adresse_edit( + sco_etud.adresse_edit( cnx, args ) # ne passe pas le contexte: pas de notification ici else: args["typeadresse"] = "domicile" args["description"] = "(infos admission)" - adresse_id = scolars.adresse_create(cnx, args) + adresse_id = sco_etud.adresse_create(cnx, args) # log('import_adm: %s' % args ) # Change les groupes si nécessaire: if args["groupes"]: diff --git a/app/scodoc/TrivialFormulator.py b/app/scodoc/TrivialFormulator.py index 5cadf929..dd279afa 100644 --- a/app/scodoc/TrivialFormulator.py +++ b/app/scodoc/TrivialFormulator.py @@ -485,7 +485,7 @@ class TF: lem.append("") for i in range(len(labels)): if input_type == "checkbox": - # from notes_log import log # debug only + # from app.scodoc.notes_log import log # debug only # log('checkbox: values[%s] = "%s"' % (field,repr(values[field]) )) # log("descr['allowed_values'][%s] = '%s'" % (i, repr(descr['allowed_values'][i]))) if descr["allowed_values"][i] in values[field]: diff --git a/app/scodoc/ZAbsences.py b/app/scodoc/ZAbsences.py deleted file mode 100644 index 58d8046c..00000000 --- a/app/scodoc/ZAbsences.py +++ /dev/null @@ -1,1981 +0,0 @@ -# -*- mode: python -*- -# -*- coding: utf-8 -*- - -############################################################################## -# -# Gestion scolarite IUT -# -# Copyright (c) 1999 - 2021 Emmanuel Viennet. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Emmanuel Viennet emmanuel.viennet@viennet.net -# -############################################################################## - -""" Gestion des absences (v4) - -C'est la partie la plus ancienne de ScoDoc, et elle est à revoir. - -L'API de plus bas niveau est en gros: - - AnnuleAbsencesDatesNoJust(etudid, dates) - CountAbs(etudid, debut, fin, matin=None, moduleimpl_id=None) - CountAbsJust(etudid, debut, fin, matin=None, moduleimpl_id=None) - ListeAbsJust(etudid, datedebut) [pas de fin ?] - ListeAbsNonJust(etudid, datedebut) [pas de fin ?] - ListeJustifs(etudid, datedebut, datefin=None, only_no_abs=True) - - ListeAbsJour(date, am=True, pm=True, is_abs=None, is_just=None) - ListeAbsNonJustJour(date, am=True, pm=True) - - -""" - -import string -import re -import time -import datetime -import dateutil -import dateutil.parser -import calendar -import urllib -import cgi -import jaxml - -# --------------- -from sco_zope import * # pylint: disable=unused-wildcard-import - -# --------------- -import sco_utils as scu -import notesdb -from notes_log import log -from scolog import logdb -from sco_permissions import ScoAbsAddBillet, ScoAbsChange, ScoView -from sco_exceptions import ScoValueError, ScoInvalidDateError -from TrivialFormulator import TrivialFormulator, TF -from gen_tables import GenTable -import html_sco_header -import scolars -import sco_formsemestre -import sco_moduleimpl -import sco_groups -import sco_groups_view -import sco_excel -import sco_abs_notification, sco_abs_views -import sco_compute_moy -import sco_abs -from sco_abs import ddmmyyyy - -CSSSTYLES = html_sco_header.BOOTSTRAP_MULTISELECT_CSS - - -def _toboolean(x): - "convert a value to boolean (ensure backward compat with OLD intranet code)" - if type(x) == type(""): - x = x.lower() - if x and x != "false": # backward compat... - return True - else: - return False - - -class ZAbsences( - ObjectManager, PropertyManager, RoleManager, Item, Persistent, Implicit -): - - "ZAbsences object" - - meta_type = "ZAbsences" - security = ClassSecurityInfo() - - # This is the list of the methods associated to 'tabs' in the ZMI - # Be aware that The first in the list is the one shown by default, so if - # the 'View' tab is the first, you will never see your tabs by cliquing - # on the object. - manage_options = ( - ({"label": "Contents", "action": "manage_main"},) - + PropertyManager.manage_options # add the 'Properties' tab - + ({"label": "View", "action": "index_html"},) - + Item.manage_options # add the 'Undo' & 'Owner' tab - + RoleManager.manage_options # add the 'Security' tab - ) - - # no permissions, only called from python - def __init__(self, id, title): - "initialise a new instance" - self.id = id - self.title = title - - # The form used to edit this object - # def manage_editZAbsences(self, title, RESPONSE=None): - # "Changes the instance values" - # self.title = title - # self._p_changed = 1 - # RESPONSE.redirect("manage_editForm") - - # -------------------------------------------------------------------- - # - # ABSENCES (top level) - # - # -------------------------------------------------------------------- - # used to view content of the object - security.declareProtected(ScoView, "index_html") - index_html = sco_abs_views.index_html - - security.declareProtected(ScoView, "EtatAbsences") - EtatAbsences = sco_abs_views.EtatAbsences - - security.declareProtected(ScoView, "CalAbs") - CalAbs = sco_abs_views.CalAbs - - security.declareProtected(ScoAbsChange, "SignaleAbsenceEtud") - SignaleAbsenceEtud = sco_abs_views.SignaleAbsenceEtud - security.declareProtected(ScoAbsChange, "doSignaleAbsence") - doSignaleAbsence = sco_abs_views.doSignaleAbsence - - security.declareProtected(ScoAbsChange, "JustifAbsenceEtud") - JustifAbsenceEtud = sco_abs_views.JustifAbsenceEtud - security.declareProtected(ScoAbsChange, "doJustifAbsence") - doJustifAbsence = sco_abs_views.doJustifAbsence - - security.declareProtected(ScoAbsChange, "AnnuleAbsenceEtud") - AnnuleAbsenceEtud = sco_abs_views.AnnuleAbsenceEtud - security.declareProtected(ScoAbsChange, "doAnnuleAbsence") - doAnnuleAbsence = sco_abs_views.doAnnuleAbsence - security.declareProtected(ScoAbsChange, "doAnnuleJustif") - doAnnuleJustif = sco_abs_views.doAnnuleJustif - - security.declareProtected(ScoView, "ListeAbsEtud") - ListeAbsEtud = sco_abs_views.ListeAbsEtud - - # -------------------------------------------------------------------- - # - # SQL METHODS - # - # -------------------------------------------------------------------- - - def _AddAbsence( - self, - etudid, - jour, - matin, - estjust, - REQUEST, - description=None, - moduleimpl_id=None, - ): - "Ajoute une absence dans la bd" - # unpublished - if self._isFarFutur(jour): - raise ScoValueError("date absence trop loin dans le futur !") - estjust = _toboolean(estjust) - matin = _toboolean(matin) - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - cursor.execute( - "insert into absences (etudid,jour,estabs,estjust,matin,description, moduleimpl_id) values (%(etudid)s, %(jour)s, TRUE, %(estjust)s, %(matin)s, %(description)s, %(moduleimpl_id)s )", - vars(), - ) - logdb( - REQUEST, - cnx, - "AddAbsence", - etudid=etudid, - msg="JOUR=%(jour)s,MATIN=%(matin)s,ESTJUST=%(estjust)s,description=%(description)s,moduleimpl_id=%(moduleimpl_id)s" - % vars(), - ) - cnx.commit() - sco_abs.invalidateAbsEtudDate(self, etudid, jour) - sco_abs_notification.abs_notify(self, etudid, jour) - - def _AddJustif(self, etudid, jour, matin, REQUEST, description=None): - "Ajoute un justificatif dans la base" - # unpublished - if self._isFarFutur(jour): - raise ScoValueError("date justificatif trop loin dans le futur !") - matin = _toboolean(matin) - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - cursor.execute( - "insert into absences (etudid,jour,estabs,estjust,matin, description) values (%(etudid)s,%(jour)s, FALSE, TRUE, %(matin)s, %(description)s )", - vars(), - ) - logdb( - REQUEST, - cnx, - "AddJustif", - etudid=etudid, - msg="JOUR=%(jour)s,MATIN=%(matin)s" % vars(), - ) - cnx.commit() - sco_abs.invalidateAbsEtudDate(self, etudid, jour) - - def _AnnuleAbsence(self, etudid, jour, matin, moduleimpl_id=None, REQUEST=None): - """Annule une absence ds base - Si moduleimpl_id, n'annule que pour ce module - """ - # unpublished - matin = _toboolean(matin) - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - req = "delete from absences where jour=%(jour)s and matin=%(matin)s and etudid=%(etudid)s and estabs" - if moduleimpl_id: - req += " and moduleimpl_id=%(moduleimpl_id)s" - cursor.execute(req, vars()) - logdb( - REQUEST, - cnx, - "AnnuleAbsence", - etudid=etudid, - msg="JOUR=%(jour)s,MATIN=%(matin)s,moduleimpl_id=%(moduleimpl_id)s" - % vars(), - ) - cnx.commit() - sco_abs.invalidateAbsEtudDate(self, etudid, jour) - - def _AnnuleJustif(self, etudid, jour, matin, REQUEST=None): - "Annule un justificatif" - # unpublished - matin = _toboolean(matin) - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - cursor.execute( - "delete from absences where jour=%(jour)s and matin=%(matin)s and etudid=%(etudid)s and ESTJUST AND NOT ESTABS", - vars(), - ) - cursor.execute( - "update absences set estjust=false where jour=%(jour)s and matin=%(matin)s and etudid=%(etudid)s", - vars(), - ) - logdb( - REQUEST, - cnx, - "AnnuleJustif", - etudid=etudid, - msg="JOUR=%(jour)s,MATIN=%(matin)s" % vars(), - ) - cnx.commit() - sco_abs.invalidateAbsEtudDate(self, etudid, jour) - - # Fonction inutile à supprimer (gestion moduleimpl_id incorrecte): - # def _AnnuleAbsencesPeriodNoJust(self, etudid, datedebut, datefin, - # moduleimpl_id=None, REQUEST=None): - # """Supprime les absences entre ces dates (incluses). - # mais ne supprime pas les justificatifs. - # """ - # # unpublished - # cnx = self.GetDBConnexion() - # cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - # # supr les absences non justifiees - # cursor.execute("delete from absences where etudid=%(etudid)s and (not estjust) and moduleimpl_id=(moduleimpl_id)s and jour BETWEEN %(datedebut)s AND %(datefin)s", - # vars() ) - # # s'assure que les justificatifs ne sont pas "absents" - # cursor.execute("update absences set estabs=FALSE where etudid=%(etudid)s and jour and moduleimpl_id=(moduleimpl_id)s BETWEEN %(datedebut)s AND %(datefin)s", vars()) - # logdb(REQUEST, cnx, 'AnnuleAbsencesPeriodNoJust', etudid=etudid, - # msg='%(datedebut)s - %(datefin)s - (moduleimpl_id)s'%vars()) - # cnx.commit() - # sco_abs.invalidateAbsEtudDate(self, etudid, datedebut) - # sco_abs.invalidateAbsEtudDate(self, etudid, datefin) # si un semestre commence apres datedebut et termine avant datefin, il ne sera pas invalide. Tant pis ;-) - - security.declareProtected(ScoAbsChange, "AnnuleAbsencesDatesNoJust") - - def AnnuleAbsencesDatesNoJust( - self, etudid, dates, moduleimpl_id=None, REQUEST=None - ): - """Supprime les absences aux dates indiquées - mais ne supprime pas les justificatifs. - """ - # log('AnnuleAbsencesDatesNoJust: moduleimpl_id=%s' % moduleimpl_id) - if not dates: - return - date0 = dates[0] - if len(date0.split(":")) == 2: - # am/pm is present - for date in dates: - jour, ampm = date.split(":") - if ampm == "am": - matin = 1 - elif ampm == "pm": - matin = 0 - else: - raise ValueError("invalid ampm !") - self._AnnuleAbsence(etudid, jour, matin, moduleimpl_id, REQUEST) - return - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - # supr les absences non justifiees - for date in dates: - cursor.execute( - "delete from absences where etudid=%(etudid)s and (not estjust) and jour=%(date)s and moduleimpl_id=%(moduleimpl_id)s", - vars(), - ) - sco_abs.invalidateAbsEtudDate(self, etudid, date) - # s'assure que les justificatifs ne sont pas "absents" - for date in dates: - cursor.execute( - "update absences set estabs=FALSE where etudid=%(etudid)s and jour=%(date)s and moduleimpl_id=%(moduleimpl_id)s", - vars(), - ) - if dates: - date0 = dates[0] - else: - date0 = None - if len(dates) > 1: - date1 = dates[1] - else: - date1 = None - logdb( - REQUEST, - cnx, - "AnnuleAbsencesDatesNoJust", - etudid=etudid, - msg="%s - %s - %s" % (date0, date1, moduleimpl_id), - ) - cnx.commit() - - def ListAbsInRange( - self, etudid, debut, fin, matin=None, moduleimpl_id=None, cursor=None - ): - """Liste des absences entre deux dates. - - Args: - etudid - debut string iso date ("2020-03-12") - end string iso date ("2020-03-12") - matin None, True, False - moduleimpl_id - """ - if matin != None: - matin = _toboolean(matin) - ismatin = " AND A.MATIN = %(matin)s " - else: - ismatin = "" - if moduleimpl_id: - modul = " AND A.MODULEIMPL_ID = %(moduleimpl_id)s " - else: - modul = "" - if not cursor: - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - cursor.execute( - """ - SELECT DISTINCT A.JOUR, A.MATIN - FROM ABSENCES A - WHERE A.ETUDID = %(etudid)s - AND A.ESTABS""" - + ismatin - + modul - + """ - AND A.JOUR BETWEEN %(debut)s AND %(fin)s - """, - vars(), - ) - res = cursor.dictfetchall() - return res - - security.declareProtected(ScoView, "CountAbs") - - def CountAbs(self, etudid, debut, fin, matin=None, moduleimpl_id=None): - """CountAbs - matin= 1 ou 0. - - Returns: - An integer. - """ - return len( - self.ListAbsInRange( - etudid, debut, fin, matin=matin, moduleimpl_id=moduleimpl_id - ) - ) - - security.declareProtected(ScoView, "CountAbsJust") - - def CountAbsJust(self, etudid, debut, fin, matin=None, moduleimpl_id=None): - "Count just. abs" - if matin != None: - matin = _toboolean(matin) - ismatin = " AND A.MATIN = %(matin)s " - else: - ismatin = "" - if moduleimpl_id: - modul = " AND A.MODULEIMPL_ID = %(moduleimpl_id)s " - else: - modul = "" - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - cursor.execute( - """SELECT COUNT(*) AS NbAbsJust FROM ( - SELECT DISTINCT A.JOUR, A.MATIN - FROM ABSENCES A, ABSENCES B - WHERE A.ETUDID = %(etudid)s - AND A.ETUDID = B.ETUDID - AND A.JOUR = B.JOUR AND A.MATIN = B.MATIN - AND A.JOUR BETWEEN %(debut)s AND %(fin)s - AND A.ESTABS AND (A.ESTJUST OR B.ESTJUST)""" - + ismatin - + modul - + """ -) AS tmp - """, - vars(), - ) - res = cursor.fetchone()[0] - return res - - def _ListeAbsDate(self, etudid, beg_date, end_date): - # Liste des absences et justifs entre deux dates - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - cursor.execute( - """SELECT jour, matin, estabs, estjust, description FROM ABSENCES A - WHERE A.ETUDID = %(etudid)s - AND A.jour >= %(beg_date)s - AND A.jour <= %(end_date)s - """, - vars(), - ) - Abs = cursor.dictfetchall() - # remove duplicates - A = {} # { (jour, matin) : abs } - for a in Abs: - jour, matin = a["jour"], a["matin"] - if (jour, matin) in A: - # garde toujours la description - a["description"] = a["description"] or A[(jour, matin)]["description"] - # et la justif: - a["estjust"] = a["estjust"] or A[(jour, matin)]["estjust"] - a["estabs"] = a["estabs"] or A[(jour, matin)]["estabs"] - A[(jour, matin)] = a - else: - A[(jour, matin)] = a - if A[(jour, matin)]["description"] is None: - A[(jour, matin)]["description"] = "" - # add hours: matin = 8:00 - 12:00, apresmidi = 12:00 - 18:00 - dat = "%04d-%02d-%02d" % (a["jour"].year, a["jour"].month, a["jour"].day) - if a["matin"]: - A[(jour, matin)]["begin"] = dat + " 08:00:00" - A[(jour, matin)]["end"] = dat + " 11:59:59" - else: - A[(jour, matin)]["begin"] = dat + " 12:00:00" - A[(jour, matin)]["end"] = dat + " 17:59:59" - # sort - R = A.values() - R.sort(key=lambda x: (x["begin"])) - return R - - security.declareProtected(ScoView, "ListeAbsJust") - - def ListeAbsJust(self, etudid, datedebut): - "Liste des absences justifiees (par ordre chronologique)" - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - cursor.execute( - """SELECT DISTINCT A.ETUDID, A.JOUR, A.MATIN FROM ABSENCES A, ABSENCES B - WHERE A.ETUDID = %(etudid)s - AND A.ETUDID = B.ETUDID - AND A.JOUR = B.JOUR AND A.MATIN = B.MATIN AND A.JOUR >= %(datedebut)s - AND A.ESTABS AND (A.ESTJUST OR B.ESTJUST) - ORDER BY A.JOUR - """, - vars(), - ) - A = cursor.dictfetchall() - for a in A: - a["description"] = self._GetAbsDescription(a, cursor=cursor) - return A - - security.declareProtected(ScoView, "ListeAbsNonJust") - - def ListeAbsNonJust(self, etudid, datedebut): - "Liste des absences NON justifiees (par ordre chronologique)" - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - cursor.execute( - """SELECT ETUDID, JOUR, MATIN FROM ABSENCES A - WHERE A.ETUDID = %(etudid)s - AND A.estabs - AND A.jour >= %(datedebut)s - EXCEPT SELECT ETUDID, JOUR, MATIN FROM ABSENCES B - WHERE B.estjust - AND B.ETUDID = %(etudid)s - ORDER BY JOUR - """, - vars(), - ) - A = cursor.dictfetchall() - for a in A: - a["description"] = self._GetAbsDescription(a, cursor=cursor) - return A - - security.declareProtected(ScoView, "ListeJustifs") - - def ListeJustifs(self, etudid, datedebut, datefin=None, only_no_abs=False): - """Liste des justificatifs (sans absence relevée) à partir d'une date, - ou, si datefin spécifié, entre deux dates. - Si only_no_abs: seulement les justificatifs correspondant aux jours sans absences relevées. - """ - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - req = """SELECT DISTINCT ETUDID, JOUR, MATIN FROM ABSENCES A - WHERE A.ETUDID = %(etudid)s - AND A.ESTJUST - AND A.JOUR >= %(datedebut)s""" - if datefin: - req += """AND A.JOUR <= %(datefin)s""" - if only_no_abs: - req += """ - EXCEPT SELECT ETUDID, JOUR, MATIN FROM ABSENCES B - WHERE B.estabs - AND B.ETUDID = %(etudid)s - """ - cursor.execute(req, vars()) - A = cursor.dictfetchall() - for a in A: - a["description"] = self._GetAbsDescription(a, cursor=cursor) - - return A - - def _GetAbsDescription(self, a, cursor=None): - "Description associee a l'absence" - if not cursor: - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - a = a.copy() - # a['jour'] = a['jour'].date() - if a["matin"]: # devrait etre booleen... :-( - a["matin"] = True - else: - a["matin"] = False - cursor.execute( - """select * from absences where etudid=%(etudid)s and jour=%(jour)s and matin=%(matin)s order by entry_date desc""", - a, - ) - A = cursor.dictfetchall() - desc = None - module = "" - for a in A: - if a["description"]: - desc = a["description"] - if a["moduleimpl_id"] and a["moduleimpl_id"] != "NULL": - # Trouver le nom du module - Mlist = sco_moduleimpl.do_moduleimpl_withmodule_list( - self.Notes, moduleimpl_id=a["moduleimpl_id"] - ) - if Mlist: - M = Mlist[0] - module += "%s " % M["module"]["code"] - - if desc: - return "(%s) %s" % (desc, module) - if module: - return module - return "" - - security.declareProtected(ScoView, "ListeAbsJour") - - def ListeAbsJour(self, date, am=True, pm=True, is_abs=True, is_just=None): - """Liste des absences et/ou justificatifs ce jour. - is_abs: None (peu importe), True, False - is_just: idem - """ - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - req = """SELECT DISTINCT etudid, jour, matin FROM ABSENCES A - WHERE A.jour = %(date)s - """ - if is_abs != None: - req += " AND A.estabs = %(is_abs)s" - if is_just != None: - req += " AND A.estjust = %(is_just)s" - if not am: - req += " AND NOT matin " - if not pm: - req += " AND matin" - - cursor.execute(req, {"date": date, "is_just": is_just, "is_abs": is_abs}) - A = cursor.dictfetchall() - for a in A: - a["description"] = self._GetAbsDescription(a, cursor=cursor) - return A - - security.declareProtected(ScoView, "ListeAbsNonJustJour") - - def ListeAbsNonJustJour(self, date, am=True, pm=True): - "Liste des absences non justifiees ce jour" - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - reqa = "" - if not am: - reqa += " AND NOT matin " - if not pm: - reqa += " AND matin " - req = ( - """SELECT etudid, jour, matin FROM ABSENCES A - WHERE A.estabs - AND A.jour = %(date)s - """ - + reqa - + """EXCEPT SELECT etudid, jour, matin FROM ABSENCES B - WHERE B.estjust AND B.jour = %(date)s""" - + reqa - ) - - cursor.execute(req, {"date": date}) - A = cursor.dictfetchall() - for a in A: - a["description"] = self._GetAbsDescription(a, cursor=cursor) - return A - - security.declareProtected(ScoAbsChange, "doSignaleAbsenceGrSemestre") - - def doSignaleAbsenceGrSemestre( - self, - moduleimpl_id=None, - abslist=[], - dates="", - etudids="", - destination=None, - REQUEST=None, - ): - """Enregistre absences aux dates indiquees (abslist et dates). - dates est une liste de dates ISO (séparées par des ','). - Efface les absences aux dates indiquées par dates, - ou bien ajoute celles de abslist. - """ - if etudids: - etudids = etudids.split(",") - else: - etudids = [] - if dates: - dates = dates.split(",") - else: - dates = [] - - # 1- Efface les absences - if dates: - for etudid in etudids: - self.AnnuleAbsencesDatesNoJust(etudid, dates, moduleimpl_id, REQUEST) - return "Absences effacées" - - # 2- Ajoute les absences - if abslist: - self._add_abslist(abslist, REQUEST, moduleimpl_id) - return "Absences ajoutées" - - return "" - - def _add_abslist(self, abslist, REQUEST, moduleimpl_id=None): - for a in abslist: - etudid, jour, ampm = a.split(":") - if ampm == "am": - matin = 1 - elif ampm == "pm": - matin = 0 - else: - raise ValueError("invalid ampm !") - # ajoute abs si pas deja absent - if self.CountAbs(etudid, jour, jour, matin, moduleimpl_id) == 0: - self._AddAbsence(etudid, jour, matin, 0, REQUEST, "", moduleimpl_id) - - # --- Misc tools.... ------------------ - - def _isFarFutur(self, jour): - # check si jour est dans le futur "lointain" - # pour autoriser les saisies dans le futur mais pas a plus de 6 mois - y, m, d = [int(x) for x in jour.split("-")] - j = datetime.date(y, m, d) - # 6 mois ~ 182 jours: - return j - datetime.date.today() > datetime.timedelta(182) - - # ------------ HTML Interfaces - security.declareProtected(ScoAbsChange, "SignaleAbsenceGrHebdo") - - def SignaleAbsenceGrHebdo( - self, datelundi, group_ids=[], destination="", moduleimpl_id=None, REQUEST=None - ): - "Saisie hebdomadaire des absences" - if not moduleimpl_id: - moduleimpl_id = None - - groups_infos = sco_groups_view.DisplayedGroupsInfos( - self, group_ids, moduleimpl_id=moduleimpl_id, REQUEST=REQUEST - ) - if not groups_infos.members: - return ( - self.sco_header(page_title="Saisie des absences", REQUEST=REQUEST) - + "

Aucun étudiant !

" - + self.sco_footer(REQUEST) - ) - - base_url = "SignaleAbsenceGrHebdo?datelundi=%s&%s&destination=%s" % ( - datelundi, - groups_infos.groups_query_args, - urllib.quote(destination), - ) - - formsemestre_id = groups_infos.formsemestre_id - require_module = self.get_preference("abs_require_module", formsemestre_id) - etuds = [ - self.getEtudInfo(etudid=m["etudid"], filled=True)[0] - for m in groups_infos.members - ] - # Restreint aux inscrits au module sélectionné - if moduleimpl_id: - mod_inscrits = set( - [ - x["etudid"] - for x in sco_moduleimpl.do_moduleimpl_inscription_list( - self.Notes, moduleimpl_id=moduleimpl_id - ) - ] - ) - etuds_inscrits_module = [e for e in etuds if e["etudid"] in mod_inscrits] - if etuds_inscrits_module: - etuds = etuds_inscrits_module - else: - # Si aucun etudiant n'est inscrit au module choisi... - moduleimpl_id = None - nt = self.Notes._getNotesCache().get_NotesTable(self.Notes, formsemestre_id) - sem = sco_formsemestre.do_formsemestre_list( - self, {"formsemestre_id": formsemestre_id} - )[0] - - # calcule dates jours de cette semaine - # liste de dates iso "yyyy-mm-dd" - datessem = [notesdb.DateDMYtoISO(datelundi)] - for _ in sco_abs.day_names(self)[1:]: - datessem.append(sco_abs.next_iso_day(self, datessem[-1])) - # - if groups_infos.tous_les_etuds_du_sem: - gr_tit = "en" - else: - if len(groups_infos.group_ids) > 1: - p = "des groupes" - else: - p = "du groupe" - gr_tit = ( - p + ' ' + groups_infos.groups_titles + "" - ) - - H = [ - self.sco_header( - page_title="Saisie hebdomadaire des absences", - init_qtip=True, - javascripts=html_sco_header.BOOTSTRAP_MULTISELECT_JS - + [ - "js/etud_info.js", - "js/abs_ajax.js", - "js/groups_view.js", - ], - cssstyles=CSSSTYLES, - no_side_bar=1, - REQUEST=REQUEST, - ), - """
-

Saisie des absences %s %s, - semaine du lundi %s

-
-
- - - - - Groupes: %s -
-
- """ - % ( - gr_tit, - sem["titre_num"], - datelundi, - groups_infos.formsemestre_id, - datelundi, - destination, - moduleimpl_id or "", - sco_groups_view.menu_groups_choice( - self, groups_infos, submit_on_change=True - ), - ), - ] - # - modimpls_list = [] - # Initialize with first student - ues = nt.get_ues(etudid=etuds[0]["etudid"]) - for ue in ues: - modimpls_list += nt.get_modimpls(ue_id=ue["ue_id"]) - - # Add modules other students are subscribed to - for etud in etuds[1:]: - modimpls_etud = [] - ues = nt.get_ues(etudid=etud["etudid"]) - for ue in ues: - modimpls_etud += nt.get_modimpls(ue_id=ue["ue_id"]) - modimpls_list += [m for m in modimpls_etud if m not in modimpls_list] - - menu_module = "" - for modimpl in modimpls_list: - if modimpl["moduleimpl_id"] == moduleimpl_id: - sel = "selected" - else: - sel = "" - menu_module += ( - """\n""" - % { - "modimpl_id": modimpl["moduleimpl_id"], - "modname": modimpl["module"]["code"] - + " " - + (modimpl["module"]["abbrev"] or modimpl["module"]["titre"]), - "sel": sel, - } - ) - if moduleimpl_id: - sel = "" - else: - sel = "selected" # aucun module specifie - - H.append( - """Module concerné: - -
""" - % {"menu_module": menu_module, "url": base_url, "sel": sel} - ) - - H += self._gen_form_saisie_groupe( - etuds, datessem, destination, moduleimpl_id, require_module - ) - - H.append(self.sco_footer(REQUEST)) - return "\n".join(H) - - security.declareProtected(ScoAbsChange, "SignaleAbsenceGrSemestre") - - def SignaleAbsenceGrSemestre( - self, - datedebut, - datefin, - destination="", - group_ids=[], # list of groups to display - nbweeks=4, # ne montre que les nbweeks dernieres semaines - moduleimpl_id=None, - REQUEST=None, - ): - """Saisie des absences sur une journée sur un semestre (ou intervalle de dates) entier""" - groups_infos = sco_groups_view.DisplayedGroupsInfos( - self, group_ids, REQUEST=REQUEST - ) - if not groups_infos.members: - return ( - self.sco_header(page_title="Saisie des absences", REQUEST=REQUEST) - + "

Aucun étudiant !

" - + self.sco_footer(REQUEST) - ) - formsemestre_id = groups_infos.formsemestre_id - require_module = self.get_preference("abs_require_module", formsemestre_id) - etuds = [ - self.getEtudInfo(etudid=m["etudid"], filled=True)[0] - for m in groups_infos.members - ] - # Restreint aux inscrits au module sélectionné - if moduleimpl_id: - mod_inscrits = set( - [ - x["etudid"] - for x in sco_moduleimpl.do_moduleimpl_inscription_list( - self.Notes, moduleimpl_id=moduleimpl_id - ) - ] - ) - etuds = [e for e in etuds if e["etudid"] in mod_inscrits] - if not moduleimpl_id: - moduleimpl_id = None - base_url_noweeks = ( - "SignaleAbsenceGrSemestre?datedebut=%s&datefin=%s&%s&destination=%s" - % ( - datedebut, - datefin, - groups_infos.groups_query_args, - urllib.quote(destination), - ) - ) - base_url = base_url_noweeks + "&nbweeks=%s" % nbweeks # sans le moduleimpl_id - - if etuds: - nt = self.Notes._getNotesCache().get_NotesTable(self.Notes, formsemestre_id) - sem = sco_formsemestre.do_formsemestre_list( - self, {"formsemestre_id": formsemestre_id} - )[0] - work_saturday = sco_abs.is_work_saturday(self) - jourdebut = ddmmyyyy(datedebut, work_saturday=work_saturday) - jourfin = ddmmyyyy(datefin, work_saturday=work_saturday) - today = ddmmyyyy( - time.strftime("%d/%m/%Y", time.localtime()), - work_saturday=work_saturday, - ) - today.next() - if jourfin > today: # ne propose jamais les semaines dans le futur - jourfin = today - if jourdebut > today: - raise ScoValueError("date de début dans le futur (%s) !" % jourdebut) - # - if not jourdebut.iswork() or jourdebut > jourfin: - raise ValueError( - "date debut invalide (%s, ouvrable=%d)" - % (str(jourdebut), jourdebut.iswork()) - ) - # calcule dates - dates = [] # ddmmyyyy instances - d = ddmmyyyy(datedebut, work_saturday=work_saturday) - while d <= jourfin: - dates.append(d) - d = d.next(7) # avance d'une semaine - # - msg = "Montrer seulement les 4 dernières semaines" - nwl = 4 - if nbweeks: - nbweeks = int(nbweeks) - if nbweeks > 0: - dates = dates[-nbweeks:] - msg = "Montrer toutes les semaines" - nwl = 0 - url_link_semaines = base_url_noweeks + "&nbweeks=%s" % nwl - if moduleimpl_id: - url_link_semaines += "&moduleimpl_id=" + moduleimpl_id - # - dates = [x.ISO() for x in dates] - dayname = sco_abs.day_names(self)[jourdebut.weekday] - - if groups_infos.tous_les_etuds_du_sem: - gr_tit = "en" - else: - if len(groups_infos.group_ids) > 1: - p = "des groupes " - else: - p = "du groupe " - gr_tit = ( - p + '' + groups_infos.groups_titles + "" - ) - - H = [ - self.sco_header( - page_title="Saisie des absences", - init_qtip=True, - javascripts=["js/etud_info.js", "js/abs_ajax.js"], - no_side_bar=1, - REQUEST=REQUEST, - ), - """
-

Saisie des absences %s %s, - les %s

-

- %s - - """ - % (gr_tit, sem["titre_num"], dayname, url_link_semaines, msg), - ] - # - if etuds: - modimpls_list = [] - # Initialize with first student - ues = nt.get_ues(etudid=etuds[0]["etudid"]) - for ue in ues: - modimpls_list += nt.get_modimpls(ue_id=ue["ue_id"]) - - # Add modules other students are subscribed to - for etud in etuds[1:]: - modimpls_etud = [] - ues = nt.get_ues(etudid=etud["etudid"]) - for ue in ues: - modimpls_etud += nt.get_modimpls(ue_id=ue["ue_id"]) - modimpls_list += [m for m in modimpls_etud if m not in modimpls_list] - - menu_module = "" - for modimpl in modimpls_list: - if modimpl["moduleimpl_id"] == moduleimpl_id: - sel = "selected" - else: - sel = "" - menu_module += ( - """\n""" - % { - "modimpl_id": modimpl["moduleimpl_id"], - "modname": modimpl["module"]["code"] - + " " - + (modimpl["module"]["abbrev"] or modimpl["module"]["titre"]), - "sel": sel, - } - ) - if moduleimpl_id: - sel = "" - else: - sel = "selected" # aucun module specifie - H.append( - """

- Module concerné par ces absences (%(optionel_txt)s): - -

""" - % { - "menu_module": menu_module, - "url": base_url, - "sel": sel, - "optionel_txt": 'requis' - if require_module - else "optionnel", - } - ) - - H += self._gen_form_saisie_groupe( - etuds, dates, destination, moduleimpl_id, require_module - ) - H.append(self.sco_footer(REQUEST)) - return "\n".join(H) - - def _gen_form_saisie_groupe( - self, etuds, dates, destination="", moduleimpl_id=None, require_module=False - ): - """Formulaire saisie absences - - Args: - etuds: liste des étudiants - dates: liste ordonnée de dates iso, par exemple: [ '2020-12-24', ... ] - moduleimpl_id: optionnel, module concerné. - """ - H = [ - """ - -
-
- - - """ - % ( - "true" if (require_module and not moduleimpl_id) else "false", - len(etuds), - ) - ] - # Dates - odates = [datetime.date(*[int(x) for x in d.split("-")]) for d in dates] - begin = dates[0] - end = dates[-1] - # Titres colonnes - noms_jours = [] # eg [ "Lundi", "mardi", "Samedi", ... ] - jn = sco_abs.day_names(self) - for d in odates: - idx_jour = d.weekday() - noms_jours.append(jn[idx_jour]) - for jour in noms_jours: - H.append( - '" - ) - H.append("") - for d in odates: - H.append( - '" - ) - H.append("") - H.append("" * len(dates)) - H.append("") - # - if not etuds: - H.append( - '' - ) - i = 1 - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - for etud in etuds: - i += 1 - etudid = etud["etudid"] - # UE capitalisee dans semestre courant ? - cap = [] - if etud["cursem"]: - nt = self.Notes._getNotesCache().get_NotesTable( - self.Notes, etud["cursem"]["formsemestre_id"] - ) # > get_ues, get_etud_ue_status - for ue in nt.get_ues(): - status = nt.get_etud_ue_status(etudid, ue["ue_id"]) - if status["is_capitalized"]: - cap.append(ue["acronyme"]) - if cap: - capstr = ' (%s cap.)' % ", ".join(cap) - else: - capstr = "" - - tr_class = ("row_1", "row_2", "row_3")[i % 3] - td_matin_class = ("matin_1", "matin_2", "matin_3")[i % 3] - - H.append( - '' - % (tr_class, etudid, etudid, etud["nomprenom"], capstr) - ) - etud_abs = self.ListAbsInRange( - etudid, begin, end, moduleimpl_id=moduleimpl_id, cursor=cursor - ) - for d in odates: - date = d.strftime("%Y-%m-%d") - # matin - is_abs = {"jour": d, "matin": True} in etud_abs - if is_abs: - checked = "checked" - else: - checked = "" - # bulle lors du passage souris - coljour = sco_abs.DAYNAMES[(calendar.weekday(d.year, d.month, d.day))] - datecol = coljour + " " + d.strftime("%d/%m/%Y") - bulle_am = '"' + etud["nomprenom"] + " - " + datecol + ' (matin)"' - bulle_pm = '"' + etud["nomprenom"] + " - " + datecol + ' (ap.midi)"' - - H.append( - '' - % ( - td_matin_class, - bulle_am, - etudid + ":" + date + ":" + "am", - checked, - etudid, - date + ":am", - ) - ) - # après-midi - is_abs = {"jour": d, "matin": False} in etud_abs - if is_abs: - checked = "checked" - else: - checked = "" - H.append( - '' - % ( - bulle_pm, - etudid + ":" + date + ":" + "pm", - checked, - etudid, - date + ":pm", - ) - ) - H.append("") - H.append("
%d étudiants' - + jour - + "
 ' - + d.strftime("%d/%m/%Y") - + "
 AMPM
Aucun étudiant inscrit !
%s%s
") - # place la liste des etudiants et les dates pour pouvoir effacer les absences - H.append( - '' - % ",".join([etud["etudid"] for etud in etuds]) - ) - H.append('' % dates[0]) - H.append('' % dates[-1]) - H.append('' % ",".join(dates)) - H.append( - '' - % urllib.quote(destination) - ) - # - # version pour formulaire avec AJAX (Yann LB) - H.append( - """ -

-

- -

-
-

Les cases cochées correspondent à des absences. - Les absences saisies ne sont pas justifiées (sauf si un justificatif a été entré - par ailleurs). -

Si vous "décochez" une case, l'absence correspondante sera supprimée. - Attention, les modifications sont automatiquement entregistrées au fur et à mesure. -

- """ - % destination - ) - return H - - def _TablesAbsEtud( - self, - etudid, - datedebut, - with_evals=True, - format="html", - absjust_only=0, - REQUEST=None, - ): - """Tables des absences justifiees et non justifiees d'un étudiant sur l'année en cours""" - absjust = self.ListeAbsJust(etudid=etudid, datedebut=datedebut) - absnonjust = self.ListeAbsNonJust(etudid=etudid, datedebut=datedebut) - # examens ces jours là ? - if with_evals: - cnx = self.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=notesdb.ScoDocCursor) - for a in absnonjust + absjust: - cursor.execute( - """select eval.* - from notes_evaluation eval, notes_moduleimpl_inscription mi, notes_moduleimpl m - where eval.jour = %(jour)s and eval.moduleimpl_id = m.moduleimpl_id - and mi.moduleimpl_id = m.moduleimpl_id and mi.etudid = %(etudid)s""", - {"jour": a["jour"].strftime("%Y-%m-%d"), "etudid": etudid}, - ) - a["evals"] = cursor.dictfetchall() - cursor.execute( - """SELECT mi.moduleimpl_id - from absences abs, notes_moduleimpl_inscription mi, notes_moduleimpl m - where abs.matin = %(matin)s and abs.jour = %(jour)s and abs.etudid=%(etudid)s and abs.moduleimpl_id=mi.moduleimpl_id and mi.moduleimpl_id=m.moduleimpl_id - and mi.etudid = %(etudid)s""", - { - "matin": bool(a["matin"]), - "jour": a["jour"].strftime("%Y-%m-%d"), - "etudid": etudid, - }, - ) - a["absent"] = cursor.dictfetchall() - - def matin(x): - if x: - return "matin" - else: - return "après-midi" - - def descr_exams(a): - if not a.has_key("evals"): - return "" - ex = [] - for ev in a["evals"]: - mod = sco_moduleimpl.do_moduleimpl_withmodule_list( - self.Notes, moduleimpl_id=ev["moduleimpl_id"] - )[0] - if format == "html": - ex.append( - '%s' - % (mod["moduleimpl_id"], mod["module"]["code"]) - ) - else: - ex.append(mod["module"]["code"]) - if ex: - return ", ".join(ex) - return "" - - def descr_abs(a): - ex = [] - for ev in a.get("absent", []): - mod = sco_moduleimpl.do_moduleimpl_withmodule_list( - self.Notes, moduleimpl_id=ev["moduleimpl_id"] - )[0] - if format == "html": - ex.append( - '%s' - % (mod["moduleimpl_id"], mod["module"]["code"]) - ) - else: - ex.append(mod["module"]["code"]) - if ex: - return ", ".join(ex) - return "" - - # ajoute date formatée et évaluations - for L in (absnonjust, absjust): - for a in L: - if with_evals: - a["exams"] = descr_exams(a) - a["datedmy"] = a["jour"].strftime("%d/%m/%Y") - a["ampm"] = int(a["matin"]) - a["matin"] = matin(a["matin"]) - index = a["description"].find(")") - if index != -1: - a["motif"] = a["description"][1:index] - else: - a["motif"] = "" - a["description"] = descr_abs(a) or "" - - # ajoute lien pour justifier - if format == "html": - for a in absnonjust: - a["justlink"] = "justifier" - a["_justlink_target"] = ( - "doJustifAbsence?etudid=%s&datedebut=%s&datefin=%s&demijournee=%s" - % (etudid, a["datedmy"], a["datedmy"], a["ampm"]) - ) - # - titles = { - "datedmy": "Date", - "matin": "", - "exams": "Examens ce jour", - "justlink": "", - "description": "Modules", - "motif": "Motif", - } - columns_ids = ["datedmy", "matin"] - if format in ("json", "xml"): - columns_ids += ["jour", "ampm"] - if with_evals: - columns_ids.append("exams") - - columns_ids.append("description") - columns_ids.append("motif") - if format == "html": - columns_ids.append("justlink") - - return titles, columns_ids, absnonjust, absjust - - security.declareProtected(ScoView, "EtatAbsencesGr") # ported from dtml - - def EtatAbsencesGr( - self, - group_ids=[], # list of groups to display - debut="", - fin="", - with_boursier=True, # colonne boursier - format="html", - REQUEST=None, - ): - """Liste les absences de groupes""" - datedebut = notesdb.DateDMYtoISO(debut) - datefin = notesdb.DateDMYtoISO(fin) - # Informations sur les groupes à afficher: - groups_infos = sco_groups_view.DisplayedGroupsInfos( - self, group_ids, REQUEST=REQUEST - ) - formsemestre_id = groups_infos.formsemestre_id - sem = groups_infos.formsemestre - - # Construit tableau (etudid, statut, nomprenom, nbJust, nbNonJust, NbTotal) - T = [] - for m in groups_infos.members: - etud = self.getEtudInfo(etudid=m["etudid"], filled=True)[0] - nbabs = self.CountAbs(etudid=etud["etudid"], debut=datedebut, fin=datefin) - nbabsjust = self.CountAbsJust( - etudid=etud["etudid"], debut=datedebut, fin=datefin - ) - nbjustifs_noabs = len( - self.ListeJustifs( - etudid=etud["etudid"], datedebut=datedebut, only_no_abs=True - ) - ) - # retrouve sem dans etud['sems'] - s = None - for s in etud["sems"]: - if s["formsemestre_id"] == formsemestre_id: - break - if not s or s["formsemestre_id"] != formsemestre_id: - raise ValueError( - "EtatAbsencesGr: can't retreive sem" - ) # bug or malicious arg - T.append( - { - "etudid": etud["etudid"], - "etatincursem": s["ins"]["etat"], - "nomprenom": etud["nomprenom"], - "nbabsjust": nbabsjust, - "nbabsnonjust": nbabs - nbabsjust, - "nbabs": nbabs, - "nbjustifs_noabs": nbjustifs_noabs, - "_nomprenom_target": "CalAbs?etudid=%s" % etud["etudid"], - "_nomprenom_td_attrs": 'id="%s" class="etudinfo"' % etud["etudid"], - "boursier": etud["boursier"], - } - ) - if s["ins"]["etat"] == "D": - T[-1]["_css_row_class"] = "etuddem" - T[-1]["nomprenom"] += " (dem)" - columns_ids = [ - "nomprenom", - "nbjustifs_noabs", - "nbabsjust", - "nbabsnonjust", - "nbabs", - ] - if with_boursier: - columns_ids[1:1] = ["boursier"] - if groups_infos.tous_les_etuds_du_sem: - gr_tit = "" - else: - if len(groups_infos.group_ids) > 1: - p = "des groupes" - else: - p = "du groupe" - if format == "html": - h = ' ' + groups_infos.groups_titles + "" - else: - h = groups_infos.groups_titles - gr_tit = p + h - - title = "Etat des absences %s" % gr_tit - if format == "xls" or format == "xml" or format == "json": - columns_ids = ["etudid"] + columns_ids - tab = GenTable( - columns_ids=columns_ids, - rows=T, - preferences=self.get_preferences(formsemestre_id), - titles={ - "etatincursem": "Etat", - "nomprenom": "Nom", - "nbabsjust": "Justifiées", - "nbabsnonjust": "Non justifiées", - "nbabs": "Total", - "nbjustifs_noabs": "Justifs non utilisés", - "boursier": "Bourse", - }, - html_sortable=True, - html_class="table_leftalign", - html_header=self.sco_header( - REQUEST, - page_title=title, - init_qtip=True, - javascripts=["js/etud_info.js"], - ), - html_title=self.Notes.html_sem_header( - REQUEST, "%s" % title, sem, with_page_header=False - ) - + "

Période du %s au %s (nombre de demi-journées)
" - % (debut, fin), - base_url="%s&formsemestre_id=%s&debut=%s&fin=%s" - % (groups_infos.base_url, formsemestre_id, debut, fin), - filename="etat_abs_" - + scu.make_filename( - "%s de %s" % (groups_infos.groups_filename, sem["titreannee"]) - ), - caption=title, - html_next_section="""

-

-Justifs non utilisés: nombre de demi-journées avec justificatif mais sans absences relevées. -

-

-Cliquez sur un nom pour afficher le calendrier des absences
-ou entrez une date pour visualiser les absents un jour donné : -

-
-
- -%s - - -
- """ - % (REQUEST.URL0, formsemestre_id, groups_infos.get_form_elem()), - ) - return tab.make_page(self, format=format, REQUEST=REQUEST) - - security.declareProtected(ScoView, "EtatAbsencesDate") # ported from dtml - - def EtatAbsencesDate( - self, group_ids=[], date=None, REQUEST=None # list of groups to display - ): - """Etat des absences pour un groupe à une date donnée""" - # Informations sur les groupes à afficher: - groups_infos = sco_groups_view.DisplayedGroupsInfos( - self, group_ids, REQUEST=REQUEST - ) - H = [self.sco_header(page_title="Etat des absences", REQUEST=REQUEST)] - if date: - dateiso = notesdb.DateDMYtoISO(date) - nbetud = 0 - t_nbabsjustam = 0 - t_nbabsam = 0 - t_nbabsjustpm = 0 - t_nbabspm = 0 - H.append("

État des absences le %s

" % date) - H.append( - """ - - - """ - ) - for etud in groups_infos.members: - nbabsam = self.CountAbs( - etudid=etud["etudid"], debut=dateiso, fin=dateiso, matin=1 - ) - nbabspm = self.CountAbs( - etudid=etud["etudid"], debut=dateiso, fin=dateiso, matin=0 - ) - if (nbabsam != 0) or (nbabspm != 0): - nbetud += 1 - nbabsjustam = self.CountAbsJust( - etudid=etud["etudid"], debut=dateiso, fin=dateiso, matin=1 - ) - nbabsjustpm = self.CountAbsJust( - etudid=etud["etudid"], debut=dateiso, fin=dateiso, matin=0 - ) - H.append( - """") - H.append( - """""" - % (t_nbabsam, t_nbabsjustam, t_nbabspm, t_nbabsjustpm) - ) - H.append("
 MatinAprès-midi
- %(nomprenom)s""" - % etud - ) # """ - if nbabsam != 0: - if nbabsjustam: - H.append("Just.") - t_nbabsjustam += 1 - else: - H.append("Abs.") - t_nbabsam += 1 - else: - H.append("") - H.append('') - if nbabspm != 0: - if nbabsjustpm: - H.append("Just.") - t_nbabsjustam += 1 - else: - H.append("Abs.") - t_nbabspm += 1 - else: - H.append("") - H.append("
%d abs, %d just.%d abs, %d just.
") - if nbetud == 0: - H.append("

Aucune absence !

") - else: - H.append( - """

Erreur: vous n'avez pas choisi de date !

- Continuer""" - % REQUEST.HTTP_REFERER - ) - - return "\n".join(H) + self.sco_footer(REQUEST) - - # ----- Gestion des "billets d'absence": signalement par les etudiants eux mêmes (à travers le portail) - security.declareProtected(ScoAbsAddBillet, "AddBilletAbsence") - - def AddBilletAbsence( - self, - begin, - end, - description, - etudid=False, - code_nip=None, - code_ine=None, - justified=True, - REQUEST=None, - xml_reply=True, - ): - """Memorise un "billet" - begin et end sont au format ISO (eg "1999-01-08 04:05:06") - """ - t0 = time.time() - # check etudid - etuds = self.getEtudInfo( - etudid=etudid, code_nip=code_nip, REQUEST=REQUEST, filled=True - ) - if not etuds: - return scu.log_unknown_etud(self, REQUEST=REQUEST) - etud = etuds[0] - # check dates - begin_date = dateutil.parser.isoparse(begin) # may raises ValueError - end_date = dateutil.parser.isoparse(end) - if begin_date > end_date: - raise ValueError("invalid dates") - # - justified = int(justified) - # - cnx = self.GetDBConnexion() - billet_id = sco_abs.billet_absence_create( - cnx, - { - "etudid": etud["etudid"], - "abs_begin": begin, - "abs_end": end, - "description": description, - "etat": 0, - "justified": justified, - }, - ) - if xml_reply: - # Renvoie le nouveau billet en XML - if REQUEST: - REQUEST.RESPONSE.setHeader("content-type", scu.XML_MIMETYPE) - - billets = sco_abs.billet_absence_list(cnx, {"billet_id": billet_id}) - tab = self._tableBillets(billets, etud=etud) - log( - "AddBilletAbsence: new billet_id=%s (%gs)" - % (billet_id, time.time() - t0) - ) - return tab.make_page(self, REQUEST=REQUEST, format="xml") - else: - return billet_id - - security.declareProtected(ScoAbsAddBillet, "AddBilletAbsenceForm") - - def AddBilletAbsenceForm(self, etudid, REQUEST=None): - """Formulaire ajout billet (pour tests seulement, le vrai formulaire accessible aux etudiants - étant sur le portail étudiant). - """ - etud = self.getEtudInfo(etudid=etudid, filled=1, REQUEST=REQUEST)[0] - H = [ - self.sco_header( - REQUEST, page_title="Billet d'absence de %s" % etud["nomprenom"] - ) - ] - tf = TrivialFormulator( - REQUEST.URL0, - REQUEST.form, - ( - ("etudid", {"input_type": "hidden"}), - ("begin", {"input_type": "date"}), - ("end", {"input_type": "date"}), - ( - "justified", - {"input_type": "boolcheckbox", "default": 0, "title": "Justifiée"}, - ), - ("description", {"input_type": "textarea"}), - ), - ) - if tf[0] == 0: - return "\n".join(H) + tf[1] + self.sco_footer(REQUEST) - elif tf[0] == -1: - return REQUEST.RESPONSE.redirect(self.ScoURL()) - else: - e = tf[2]["begin"].split("/") - begin = e[2] + "-" + e[1] + "-" + e[0] + " 00:00:00" - e = tf[2]["end"].split("/") - end = e[2] + "-" + e[1] + "-" + e[0] + " 00:00:00" - log( - self.AddBilletAbsence( - begin, - end, - tf[2]["description"], - etudid=etudid, - xml_reply=True, - justified=tf[2]["justified"], - ) - ) - return REQUEST.RESPONSE.redirect("listeBilletsEtud?etudid=" + etudid) - - def _tableBillets(self, billets, etud=None, title=""): - for b in billets: - if b["abs_begin"].hour < 12: - m = " matin" - else: - m = " après-midi" - b["abs_begin_str"] = b["abs_begin"].strftime("%d/%m/%Y") + m - if b["abs_end"].hour < 12: - m = " matin" - else: - m = " après-midi" - b["abs_end_str"] = b["abs_end"].strftime("%d/%m/%Y") + m - if b["etat"] == 0: - if b["justified"] == 0: - b["etat_str"] = "à traiter" - else: - b["etat_str"] = "à justifier" - b["_etat_str_target"] = ( - "ProcessBilletAbsenceForm?billet_id=%s" % b["billet_id"] - ) - if etud: - b["_etat_str_target"] += "&etudid=%s" % etud["etudid"] - b["_billet_id_target"] = b["_etat_str_target"] - else: - b["etat_str"] = "ok" - if not etud: - # ajoute info etudiant - e = self.getEtudInfo(etudid=b["etudid"], filled=1) - if not e: - b["nomprenom"] = "???" # should not occur - else: - b["nomprenom"] = e[0]["nomprenom"] - b["_nomprenom_target"] = "ficheEtud?etudid=%s" % b["etudid"] - if etud and not title: - title = "Billets d'absence déclarés par %(nomprenom)s" % etud - else: - title = title - columns_ids = ["billet_id"] - if not etud: - columns_ids += ["nomprenom"] - columns_ids += ["abs_begin_str", "abs_end_str", "description", "etat_str"] - - tab = GenTable( - titles={ - "billet_id": "Numéro", - "abs_begin_str": "Début", - "abs_end_str": "Fin", - "description": "Raison de l'absence", - "etat_str": "Etat", - }, - columns_ids=columns_ids, - page_title=title, - html_title="

%s

" % title, - preferences=self.get_preferences(), - rows=billets, - html_sortable=True, - ) - return tab - - security.declareProtected(ScoView, "listeBilletsEtud") - - def listeBilletsEtud(self, etudid=False, REQUEST=None, format="html"): - """Liste billets pour un etudiant""" - etuds = self.getEtudInfo(etudid=etudid, filled=1, REQUEST=REQUEST) - if not etuds: - return scu.log_unknown_etud(self, format=format, REQUEST=REQUEST) - - etud = etuds[0] - cnx = self.GetDBConnexion() - billets = sco_abs.billet_absence_list(cnx, {"etudid": etud["etudid"]}) - tab = self._tableBillets(billets, etud=etud) - return tab.make_page(self, REQUEST=REQUEST, format=format) - - security.declareProtected(ScoView, "XMLgetBilletsEtud") - - def XMLgetBilletsEtud(self, etudid=False, REQUEST=None): - """Liste billets pour un etudiant""" - if not self.get_preference("handle_billets_abs"): - return "" - t0 = time.time() - r = self.listeBilletsEtud(etudid, REQUEST=REQUEST, format="xml") - log("XMLgetBilletsEtud (%gs)" % (time.time() - t0)) - return r - - security.declareProtected(ScoView, "listeBillets") - - def listeBillets(self, REQUEST=None): - """Page liste des billets non traités et formulaire recherche d'un billet""" - cnx = self.GetDBConnexion() - billets = sco_abs.billet_absence_list(cnx, {"etat": 0}) - tab = self._tableBillets(billets) - T = tab.html() - H = [ - self.sco_header(REQUEST, page_title="Billet d'absence non traités"), - "

Billets d'absence en attente de traitement (%d)

" % len(billets), - ] - - tf = TrivialFormulator( - REQUEST.URL0, - REQUEST.form, - (("billet_id", {"input_type": "text", "title": "Numéro du billet"}),), - submitbutton=False, - ) - if tf[0] == 0: - return "\n".join(H) + tf[1] + T + self.sco_footer(REQUEST) - else: - return REQUEST.RESPONSE.redirect( - "ProcessBilletAbsenceForm?billet_id=" + tf[2]["billet_id"] - ) - - security.declareProtected(ScoAbsChange, "deleteBilletAbsence") - - def deleteBilletAbsence(self, billet_id, REQUEST=None, dialog_confirmed=False): - """Supprime un billet.""" - cnx = self.GetDBConnexion() - billets = sco_abs.billet_absence_list(cnx, {"billet_id": billet_id}) - if not billets: - return REQUEST.RESPONSE.redirect( - "listeBillets?head_message=Billet%%20%s%%20inexistant !" % billet_id - ) - if not dialog_confirmed: - tab = self._tableBillets(billets) - return self.confirmDialog( - """

Supprimer ce billet ?

""" + tab.html(), - dest_url="", - REQUEST=REQUEST, - cancel_url="listeBillets", - parameters={"billet_id": billet_id}, - ) - - sco_abs.billet_absence_delete(cnx, billet_id) - - return REQUEST.RESPONSE.redirect("listeBillets?head_message=Billet%20supprimé") - - def _ProcessBilletAbsence(self, billet, estjust, description, REQUEST): - """Traite un billet: ajoute absence(s) et éventuellement justificatifs, - et change l'état du billet à 1. - NB: actuellement, les heures ne sont utilisées que pour déterminer si matin et/ou après-midi. - """ - cnx = self.GetDBConnexion() - if billet["etat"] != 0: - log("billet=%s" % billet) - log("billet deja traité !") - return -1 - n = 0 # nombre de demi-journées d'absence ajoutées - # 1-- ajout des absences (et justifs) - datedebut = billet["abs_begin"].strftime("%d/%m/%Y") - datefin = billet["abs_end"].strftime("%d/%m/%Y") - dates = sco_abs.DateRangeISO(self, datedebut, datefin) - # commence après-midi ? - if dates and billet["abs_begin"].hour > 11: - self._AddAbsence( - billet["etudid"], dates[0], 0, estjust, REQUEST, description=description - ) - n += 1 - dates = dates[1:] - # termine matin ? - if dates and billet["abs_end"].hour < 12: - self._AddAbsence( - billet["etudid"], - dates[-1], - 1, - estjust, - REQUEST, - description=description, - ) - n += 1 - dates = dates[:-1] - - for jour in dates: - self._AddAbsence( - billet["etudid"], jour, 0, estjust, REQUEST, description=description - ) - self._AddAbsence( - billet["etudid"], jour, 1, estjust, REQUEST, description=description - ) - n += 2 - - # 2- change etat du billet - sco_abs.billet_absence_edit(cnx, {"billet_id": billet["billet_id"], "etat": 1}) - - return n - - security.declareProtected(ScoAbsChange, "ProcessBilletAbsenceForm") - - def ProcessBilletAbsenceForm(self, billet_id, REQUEST=None): - """Formulaire traitement d'un billet""" - cnx = self.GetDBConnexion() - billets = sco_abs.billet_absence_list(cnx, {"billet_id": billet_id}) - if not billets: - return REQUEST.RESPONSE.redirect( - "listeBillets?head_message=Billet%%20%s%%20inexistant !" % billet_id - ) - billet = billets[0] - etudid = billet["etudid"] - etud = self.getEtudInfo(etudid=etudid, filled=1, REQUEST=REQUEST)[0] - - H = [ - self.sco_header( - REQUEST, - page_title="Traitement billet d'absence de %s" % etud["nomprenom"], - ), - '

Traitement du billet %s : %s

' - % (billet_id, etudid, etud["nomprenom"]), - ] - - tf = TrivialFormulator( - REQUEST.URL0, - REQUEST.form, - ( - ("billet_id", {"input_type": "hidden"}), - ( - "etudid", - {"input_type": "hidden"}, - ), # pour centrer l'UI sur l'étudiant - ( - "estjust", - {"input_type": "boolcheckbox", "title": "Absences justifiées"}, - ), - ("description", {"input_type": "text", "size": 42, "title": "Raison"}), - ), - initvalues={ - "description": billet["description"], - "estjust": billet["justified"], - "etudid": etudid, - }, - submitlabel="Enregistrer ces absences", - ) - if tf[0] == 0: - tab = self._tableBillets([billet], etud=etud) - H.append(tab.html()) - if billet["justified"] == 1: - H.append( - """

L'étudiant pense pouvoir justifier cette absence.
Vérifiez le justificatif avant d'enregistrer.

""" - ) - F = ( - """

Supprimer ce billet (utiliser en cas d'erreur, par ex. billet en double)

""" - % billet_id - ) - F += '

Liste de tous les billets en attente

' - - return "\n".join(H) + "
" + tf[1] + F + self.sco_footer(REQUEST) - elif tf[0] == -1: - return REQUEST.RESPONSE.redirect(self.ScoURL()) - else: - n = self._ProcessBilletAbsence( - billet, tf[2]["estjust"], tf[2]["description"], REQUEST - ) - if tf[2]["estjust"]: - j = "justifiées" - else: - j = "non justifiées" - H.append('
') - if n > 0: - H.append("%d absences (1/2 journées) %s ajoutées" % (n, j)) - elif n == 0: - H.append("Aucun jour d'absence dans les dates indiquées !") - elif n < 0: - H.append("Ce billet avait déjà été traité !") - H.append( - '

Autre billets en attente

Billets déclarés par %s

' - % (etud["nomprenom"]) - ) - billets = sco_abs.billet_absence_list(cnx, {"etudid": etud["etudid"]}) - tab = self._tableBillets(billets, etud=etud) - H.append(tab.html()) - return "\n".join(H) + self.sco_footer(REQUEST) - - security.declareProtected(ScoView, "XMLgetAbsEtud") - - def XMLgetAbsEtud(self, beg_date="", end_date="", REQUEST=None): - """returns list of absences in date interval""" - t0 = time.time() - etud = self.getEtudInfo(REQUEST=REQUEST)[0] - exp = re.compile(r"^(\d{4})\D?(0[1-9]|1[0-2])\D?([12]\d|0[1-9]|3[01])$") - if not exp.match(beg_date): - raise ScoValueError("invalid date: %s" % beg_date) - if not exp.match(end_date): - raise ScoValueError("invalid date: %s" % end_date) - - Abs = self._ListeAbsDate(etud["etudid"], beg_date, end_date) - - REQUEST.RESPONSE.setHeader("content-type", scu.XML_MIMETYPE) - doc = jaxml.XML_document(encoding=scu.SCO_ENCODING) - doc.absences(etudid=etud["etudid"], beg_date=beg_date, end_date=end_date) - doc._push() - for a in Abs: - if a["estabs"]: # ne donne pas les justifications si pas d'absence - doc._push() - doc.abs( - begin=a["begin"], - end=a["end"], - description=a["description"], - justified=a["estjust"], - ) - doc._pop() - doc._pop() - log("XMLgetAbsEtud (%gs)" % (time.time() - t0)) - return repr(doc) diff --git a/app/scodoc/ZScoDoc.py b/app/scodoc/ZScoDoc.py index 68ffa34d..9fd28741 100644 --- a/app/scodoc/ZScoDoc.py +++ b/app/scodoc/ZScoDoc.py @@ -55,7 +55,7 @@ from email.MIMEBase import MIMEBase # pylint: disable=no-name-in-module,import- from email.Header import Header # pylint: disable=no-name-in-module,import-error from email import Encoders # pylint: disable=no-name-in-module,import-error -from sco_zope import ( +from app.scodoc.sco_zope import ( ObjectManager, PropertyManager, RoleManager, @@ -72,13 +72,13 @@ try: except: import ZPsycopgDA.DA as ZopeDA # interp.py -import sco_utils as scu -import VERSION +import app.scodoc.sco_utils as scu +from app.scodoc import VERSION import mails -from notes_log import log -import sco_find_etud -import sco_users -from sco_permissions import ( +from app.scodoc.notes_log import log +from app.scodoc import sco_find_etud +from app.scodoc import sco_users +from app.scodoc.sco_permissions import ( ScoView, ScoEnsView, ScoImplement, @@ -94,8 +94,13 @@ from sco_permissions import ( ScoEditApo, ScoSuperAdmin, ) -from sco_exceptions import ScoValueError, ScoLockedFormError, ScoGenError, AccessDenied -import html_sco_header +from app.scodoc.sco_exceptions import ( + ScoValueError, + ScoLockedFormError, + ScoGenError, + AccessDenied, +) +from app.scodoc import html_sco_header class ZScoDoc(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Implicit): @@ -803,7 +808,7 @@ ErrorType: %(error_type)s last_dept = None last_date = None for (dept, etuds) in depts_etud: - scolars.fillEtudsInfo(self, etuds) + sco_etud.fill_etuds_info(self, etuds) etud = etuds[0] if etud["sems"]: if (not last_date) or (etud["sems"][0]["date_fin_iso"] > last_date): diff --git a/app/scodoc/ZScoUsers.py b/app/scodoc/ZScoUsers.py index 6f226a94..a8418ed4 100644 --- a/app/scodoc/ZScoUsers.py +++ b/app/scodoc/ZScoUsers.py @@ -34,23 +34,23 @@ import md5 import base64 import jaxml -from sco_zope import * # pylint: disable=unused-wildcard-import +from app.scodoc.sco_zope import * # pylint: disable=unused-wildcard-import # --------------- -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from scolog import logdb +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.scolog import logdb from scolars import format_prenom, format_nom -import sco_import_users -import sco_excel -from TrivialFormulator import TrivialFormulator, TF, tf_error_message -from gen_tables import GenTable -import scolars -import sco_cache -import sco_users +from app.scodoc import sco_import_users +from app.scodoc import sco_excel +from app.scodoc.TrivialFormulator import TrivialFormulator, TF, tf_error_message +from app.scodoc.gen_tables import GenTable +from app.scodoc import sco_etud +from app.scodoc import sco_cache +from app.scodoc import sco_users -from sco_exceptions import ( +from app.scodoc.sco_exceptions import ( AccessDenied, ScoException, ScoValueError, @@ -305,7 +305,7 @@ class ZScoUsers( info["prenomnom"] = (prenom_abbrv + " " + n).strip() # nom_fmt et prenom_fmt: minuscule capitalisé info["nom_fmt"] = n - info["prenom_fmt"] = scolars.format_prenom(p) + info["prenom_fmt"] = sco_etud.format_prenom(p) # nomcomplet est le prenom et le nom complets info["nomcomplet"] = info["prenom_fmt"] + " " + info["nom_fmt"] # nomplogin est le nom en majuscules suivi du prénom et du login diff --git a/app/scodoc/__init__.py b/app/scodoc/__init__.py index 24917c89..0481bb53 100644 --- a/app/scodoc/__init__.py +++ b/app/scodoc/__init__.py @@ -27,4 +27,3 @@ """ScoDoc core package """ -# from app.scodoc import sco_core diff --git a/app/scodoc/debug.py b/app/scodoc/debug.py index 55605211..2f8d9949 100644 --- a/app/scodoc/debug.py +++ b/app/scodoc/debug.py @@ -34,25 +34,37 @@ nt = context.Notes._getNotesCache().get_NotesTable(context.Notes, formsemestre_i import pdb # pylint: disable=unused-import import pprint -import app.scodoc.notesdb as ndb -from app.scodoc.notesdb import * # pylint: disable=unused-wildcard-import +import app.scodoc.notesdb as ndb # pylint: disable=unused-import +from app.scodoc.notesdb import * # pylint: disable=wildcard-import,unused-wildcard-import from app.scodoc.notes_log import log import app.scodoc.sco_utils as scu -from app.scodoc.sco_utils import * # pylint: disable=unused-wildcard-import +from app.scodoc.sco_utils import * # pylint: disable=wildcard-import, unused-wildcard-import -from gen_tables import GenTable -import sco_archives -import sco_groups -import sco_evaluations -import sco_formsemestre -import sco_formsemestre_edit -import sco_compute_moy -import sco_parcours_dut -import sco_codes_parcours -import sco_bulletins -import sco_excel -import sco_formsemestre_status -import sco_bulletins_xml +from app.scodoc.gen_tables import GenTable +from app.scodoc import html_sco_header +from app.scodoc import sco_archives +from app.scodoc import sco_bulletins +from app.scodoc import sco_bulletins_xml +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_compute_moy +from app.scodoc import sco_core +from app.scodoc import sco_edit_matiere +from app.scodoc import sco_edit_module +from app.scodoc import sco_edit_ue +from app.scodoc import sco_excel +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_edit +from app.scodoc import sco_formsemestre_status +from app.scodoc import sco_formsemestre_validation +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_news +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_permissions +from app.scodoc import sco_preferences +from app.scodoc import sco_tag_module +from app.scodoc import sco_etud # Prend le premier departement comme context diff --git a/app/scodoc/dutrules.py b/app/scodoc/dutrules.py index 9e524058..ed281bb9 100644 --- a/app/scodoc/dutrules.py +++ b/app/scodoc/dutrules.py @@ -4,7 +4,7 @@ # # Command: ./csv2rules.py misc/parcoursDUT.csv # -from sco_codes_parcours import ( +from app.scodoc.sco_codes_parcours import ( DUTRule, ADC, ADJ, diff --git a/app/scodoc/gen_tables.py b/app/scodoc/gen_tables.py index 08523794..93586e70 100644 --- a/app/scodoc/gen_tables.py +++ b/app/scodoc/gen_tables.py @@ -54,11 +54,11 @@ from reportlab.lib import styles from reportlab.lib.units import inch, cm, mm from reportlab.rl_config import defaultPageSize # pylint: disable=no-name-in-module -import sco_utils as scu -import sco_excel -import sco_pdf -from sco_pdf import SU -from notes_log import log +import app.scodoc.sco_utils as scu +import app.scodoc.sco_excel +import app.scodoc.sco_pdf +from app.scodoc.sco_pdf import SU +from app.scodoc.notes_log import log def mark_paras(L, tags): @@ -71,6 +71,8 @@ def mark_paras(L, tags): class DEFAULT_TABLE_PREFERENCES: + """Default preferences for tables created without preferences argument""" + values = { "SCOLAR_FONT": "Helvetica", # used for PDF, overriden by preferences argument "SCOLAR_FONT_SIZE": 10, diff --git a/app/scodoc/html_sco_header.py b/app/scodoc/html_sco_header.py index 77a20ec0..a22275a3 100644 --- a/app/scodoc/html_sco_header.py +++ b/app/scodoc/html_sco_header.py @@ -25,16 +25,15 @@ # ############################################################################## +"""HTML Header/Footer for ScoDoc pages +""" + import cgi -import sco_utils as scu -from notes_log import log -import html_sidebar -import VERSION - -""" -HTML Header/Footer for ScoDoc pages -""" +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc import html_sidebar +from app.scodoc import VERSION # Some constants: @@ -155,6 +154,7 @@ def sco_header( user_check=True, # verifie passwords temporaires ): "Main HTML page header for ScoDoc" + from app.scodoc.sco_formsemestre_status import formsemestre_page_title # context est une instance de ZScolar. container est une instance qui "acquiert" ZScolar if container: @@ -364,6 +364,3 @@ def html_sem_header( return h + """

%s

""" % (title) else: return h - - -from sco_formsemestre_status import formsemestre_page_title diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py index 1343d079..4083a75d 100644 --- a/app/scodoc/html_sidebar.py +++ b/app/scodoc/html_sidebar.py @@ -25,16 +25,14 @@ # ############################################################################## -import sco_utils as scu -import sco_preferences -from sco_abs import getAbsSemEtud -from app.scodoc.sco_permissions import Permission -import scolars - """ Génération de la "sidebar" (marge gauche des pages HTML) """ +import app.scodoc.sco_utils as scu +from app.scodoc import sco_preferences +from app.scodoc.sco_permissions import Permission + def sidebar_common(context, REQUEST=None): "partie commune a toutes les sidebar" @@ -78,6 +76,9 @@ def sidebar_common(context, REQUEST=None): def sidebar(context, REQUEST=None): "Main HTML page sidebar" # rewritten from legacy DTML code + from app.scodoc.sco_abs import getAbsSemEtud + from app.scodoc import sco_etud + params = {"ScoURL": scu.ScoURL(), "SCO_USER_MANUAL": scu.SCO_USER_MANUAL} H = ['
', sidebar_common(context, REQUEST)] @@ -94,7 +95,7 @@ def sidebar(context, REQUEST=None): # ---- s'il y a un etudiant selectionné: if REQUEST.form.has_key("etudid"): etudid = REQUEST.form["etudid"] - etud = scolars.get_etud_info(filled=1, etudid=etudid)[0] + etud = sco_etud.get_etud_info(filled=1, etudid=etudid)[0] params.update(etud) # compte les absences du semestre en cours H.append( diff --git a/app/scodoc/htmlutils.py b/app/scodoc/htmlutils.py index 98704af0..0ea71ba0 100644 --- a/app/scodoc/htmlutils.py +++ b/app/scodoc/htmlutils.py @@ -31,6 +31,8 @@ from flask import g, url_for import listhistogram +import app.scodoc.sco_utils as scu + def horizontal_bargraph(value, mark): """html drawing an horizontal bar and a mark @@ -102,7 +104,7 @@ def make_menu(title, items, css_class="", alone=False): args = item.get("args", {}) item["urlq"] = url_for( item["endpoint"], scodoc_dept=g.scodoc_dept, **args - ) + ).encode(scu.SCO_ENCODING) else: item["urlq"] = "#" item["attr"] = item.get("attr", "") diff --git a/app/scodoc/mails.py b/app/scodoc/mails.py index f99a17f9..b13199c5 100644 --- a/app/scodoc/mails.py +++ b/app/scodoc/mails.py @@ -39,8 +39,8 @@ from email.MIMEBase import MIMEBase # pylint: disable=no-name-in-module,import- from email.Header import Header # pylint: disable=no-name-in-module,import-error from email import Encoders # pylint: disable=no-name-in-module,import-error -import sco_utils as scu -from notes_log import log +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log def sendEmail(context, msg): # TODO A REECRIRE ScoDoc8 diff --git a/app/scodoc/notes_cache.py b/app/scodoc/notes_cache.py index ef4c8b30..a8d2b5c5 100644 --- a/app/scodoc/notes_cache.py +++ b/app/scodoc/notes_cache.py @@ -31,10 +31,10 @@ NOTA: inutilisable dans une instance Zope (can't pickle functions) """ -from notes_log import log +from app.scodoc.notes_log import log -class CacheFunc: +class CacheFunc(object): """gestion rudimentaire de cache pour une fonction func doit etre sans effet de bord, et sans arguments nommés """ diff --git a/app/scodoc/notes_log.py b/app/scodoc/notes_log.py index 6bdbc7b6..1fdae938 100644 --- a/app/scodoc/notes_log.py +++ b/app/scodoc/notes_log.py @@ -1,8 +1,6 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -import pdb -import sys import os import re import inspect @@ -10,18 +8,8 @@ import time import traceback from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText -from email.mime.base import MIMEBase from email.header import Header -from email.MIMEMultipart import ( # pylint: disable=no-name-in-module,import-error - MIMEMultipart, -) -from email.MIMEText import MIMEText # pylint: disable=no-name-in-module,import-error -from email.MIMEBase import MIMEBase # pylint: disable=no-name-in-module,import-error -from email.Header import Header # pylint: disable=no-name-in-module,import-error -from email import Encoders # pylint: disable=no-name-in-module,import-error - - # Simple & stupid file logguer, used only to debug # (logging to SQL is done in scolog) diff --git a/app/scodoc/notes_table.py b/app/scodoc/notes_table.py index 162c2f00..b620220d 100644 --- a/app/scodoc/notes_table.py +++ b/app/scodoc/notes_table.py @@ -32,34 +32,42 @@ import time import pdb import inspect -import sco_utils as scu -import notesdb as ndb -from notes_log import log, logCallStack -from sco_formulas import NoteVector -from sco_exceptions import ( +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log, logCallStack +from app.scodoc.sco_formulas import NoteVector +from app.scodoc.sco_exceptions import ( AccessDenied, NoteProcessError, ScoException, ScoValueError, ) -from sco_formsemestre import formsemestre_uecoef_list, formsemestre_uecoef_create -from sco_codes_parcours import DEF, UE_SPORT, UE_is_fondamentale, UE_is_professionnelle -from sco_parcours_dut import formsemestre_get_etud_capitalisation -import sco_codes_parcours -import sco_compute_moy -import sco_core -import sco_edit_matiere -import sco_edit_module -import sco_edit_ue -import sco_evaluations -import sco_formations -import sco_formsemestre -import sco_formsemestre_inscriptions -import sco_groups -import sco_moduleimpl -import sco_parcours_dut -import sco_preferences -import scolars +from app.scodoc.sco_formsemestre import ( + formsemestre_uecoef_list, + formsemestre_uecoef_create, +) +from app.scodoc.sco_codes_parcours import ( + DEF, + UE_SPORT, + UE_is_fondamentale, + UE_is_professionnelle, +) +from app.scodoc.sco_parcours_dut import formsemestre_get_etud_capitalisation +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_compute_moy +from app.scodoc import sco_core +from app.scodoc import sco_edit_matiere +from app.scodoc import sco_edit_module +from app.scodoc import sco_edit_ue +from app.scodoc import sco_evaluations +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_preferences +from app.scodoc import sco_etud # Support for old user-written "bonus" functions with 2 args: @@ -193,7 +201,7 @@ class NotesTable: self.identdict = {} # { etudid : ident } self.inscrdict = {} # { etudid : inscription } for x in self.inscrlist: - i = scolars.etudident_list(cnx, {"etudid": x["etudid"]})[0] + i = sco_etud.etudident_list(cnx, {"etudid": x["etudid"]})[0] self.identdict[x["etudid"]] = i self.inscrdict[x["etudid"]] = x x["nomp"] = (i["nom_usuel"] or i["nom"]) + i["prenom"] # pour tri @@ -405,7 +413,7 @@ class NotesTable: def get_nom_long(self, etudid): "formatte nom d'un etud: M. Pierre DUPONT" etud = self.identdict[etudid] - return scolars.format_nomprenom(etud) + return sco_etud.format_nomprenom(etud) def get_displayed_etud_code(self, etudid): 'code à afficher sur les listings "anonymes"' @@ -1084,7 +1092,7 @@ class NotesTable: "Warning: %s capitalized an UE %s which is not part of current sem %s" % (etudid, ue_id, self.formsemestre_id) ) - ue = self.sco_edit_ue.do_ue_list(context, args={"ue_id": ue_id})[0] + ue = sco_edit_ue.do_ue_list(self.context, args={"ue_id": ue_id})[0] self.uedict[ue_id] = ue # record this UE if ue_id not in self._uecoef: cl = formsemestre_uecoef_list( @@ -1185,7 +1193,7 @@ class NotesTable: "comp_ue_capitalisees: recomputing UE moy (etudid=%s, ue_id=%s formsemestre_id=%s)" % (etudid, ue_cap["ue_id"], ue_cap["formsemestre_id"]) ) - nt_cap = sco_core.get_notes_cache(context).get_NotesTable( + nt_cap = sco_core.get_notes_cache(self.context).get_NotesTable( self.context, ue_cap["formsemestre_id"] ) # > UE capitalisees par un etud moy_ue_cap = nt_cap.get_etud_ue_status(etudid, ue_cap["ue_id"])[ diff --git a/app/scodoc/notesdb.py b/app/scodoc/notesdb.py index 5a4ca9df..9fcd9bfe 100644 --- a/app/scodoc/notesdb.py +++ b/app/scodoc/notesdb.py @@ -8,9 +8,9 @@ import psycopg2.pool import psycopg2.extras import thread -import sco_utils as scu -from notes_log import log -from sco_exceptions import ScoException, ScoValueError, NoteProcessError +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.sco_exceptions import ScoException, ScoValueError, NoteProcessError from types import StringType from cgi import escape import datetime diff --git a/app/scodoc/pe_avislatex.py b/app/scodoc/pe_avislatex.py index 9f4f59ca..fbf356f8 100644 --- a/app/scodoc/pe_avislatex.py +++ b/app/scodoc/pe_avislatex.py @@ -33,17 +33,17 @@ import os import codecs import re -import scolars -import pe_jurype, pe_tagtable, pe_tools +from app.scodoc import pe_jurype +from app.scodoc import pe_tagtable +from app.scodoc import pe_tools -import sco_utils as scu -import notesdb as ndb -from notes_log import log -import scolars -import sco_preferences +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.gen_tables import GenTable, SeqGenTable +from app.scodoc import sco_preferences +from app.scodoc import sco_etud -import pe_jurype, pe_tagtable, pe_tools -from gen_tables import GenTable, SeqGenTable DEBUG = False # Pour debug et repérage des prints à changer en Log @@ -243,7 +243,7 @@ def get_annotation_PE(context, etudid, tag_annotation_pe): """ if tag_annotation_pe: cnx = ndb.GetDBConnexion() - annotations = scolars.etud_annotations_list( + annotations = sco_etud.etud_annotations_list( cnx, args={"etudid": etudid} ) # Les annotations de l'étudiant annotationsPE = [] diff --git a/app/scodoc/pe_jurype.py b/app/scodoc/pe_jurype.py index 08a2b28f..e9c60b16 100644 --- a/app/scodoc/pe_jurype.py +++ b/app/scodoc/pe_jurype.py @@ -54,19 +54,25 @@ except: from zipfile import ZipFile, BadZipfile import pprint -from gen_tables import GenTable, SeqGenTable -import sco_utils as scu -import sco_codes_parcours # sco_codes_parcours.NEXT -> sem suivant -import sco_report +from app.scodoc.gen_tables import GenTable, SeqGenTable +import app.scodoc.sco_utils as scu +from app.scodoc import sco_codes_parcours # sco_codes_parcours.NEXT -> sem suivant -import pe_tagtable, pe_tools, pe_avislatex, pe_semestretag, pe_settag +from app.scodoc import pe_tagtable +from app.scodoc import pe_tools +from app.scodoc import pe_semestretag +from app.scodoc import pe_settag # ---------------------------------------------------------------------------------------- def comp_nom_semestre_dans_parcours(context, sem): """Le nom a afficher pour titrer un semestre par exemple: "semestre 2 FI 2015" """ - F = sco_formations.formation_list(context, args={"formation_id": sem["formation_id"]})[0] + from app.scodoc import sco_formations + + F = sco_formations.formation_list( + context, args={"formation_id": sem["formation_id"]} + )[0] parcours = sco_codes_parcours.get_parcours_from_code(F["type_parcours"]) return "%s %s %s %s" % ( parcours.SESSION_NAME, # eg "semestre" @@ -456,6 +462,8 @@ class JuryPE: # ------------------------------------------------------------------------------------------------------------------ def est_un_etudiant_reoriente_ou_demissionnaire(self, etudid): """Renvoie True si l'étudiant est réorienté (NAR) ou démissionnaire (DEM)""" + from app.scodoc import sco_report + reponse = False etud = self.get_cache_etudInfo_d_un_etudiant(self.context, etudid) (_, parcours) = sco_report.get_codeparcoursetud(self.context.Notes, etud) @@ -518,6 +526,8 @@ class JuryPE: """Renvoie le n° (semestre_id) du dernier semestre validé par un étudiant fourni par son etudid et None si aucun semestre n'a été validé """ + from app.scodoc import sco_report + etud = self.get_cache_etudInfo_d_un_etudiant(self.context, etudid) (code, parcours) = sco_report.get_codeparcoursetud( self.context.Notes, etud @@ -1117,7 +1127,7 @@ class JuryPE: ETUDINFO_DICT si mémorisée soit en les chargeant et en les mémorisant """ if etudid not in self.ETUDINFO_DICT: - self.ETUDINFO_DICT[etudid] = scolars.get_etud_info( + self.ETUDINFO_DICT[etudid] = sco_etud.get_etud_info( etudid=etudid, filled=True )[0] return self.ETUDINFO_DICT[etudid] @@ -1139,7 +1149,7 @@ class JuryPE: def get_semestresDUT_d_un_etudiant(self, etudid, semestre_id=None): """Renvoie la liste des semestres DUT d'un étudiant pour un semestre_id (parmi 1,2,3,4) donné - en fonction de ses infos d'etud (cf. scolars.get_etud_info( etudid=etudid, filled=True)[0]), + en fonction de ses infos d'etud (cf. sco_etud.get_etud_info( etudid=etudid, filled=True)[0]), les semestres étant triés par ordre décroissant. Si semestre_id == None renvoie tous les semestres""" etud = self.get_cache_etudInfo_d_un_etudiant(self.context, etudid) diff --git a/app/scodoc/pe_semestretag.py b/app/scodoc/pe_semestretag.py index 7509ea90..abbde8c5 100644 --- a/app/scodoc/pe_semestretag.py +++ b/app/scodoc/pe_semestretag.py @@ -35,15 +35,11 @@ Created on Fri Sep 9 09:15:05 2016 @author: barasc """ -import datetime -from notes_log import log -import notes_table -import sco_codes_parcours -import sco_tag_module -import sco_utils -import pe_tagtable -import pe_jurype +from app.scodoc.notes_log import log +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_tag_module +from app.scodoc import pe_tagtable class SemestreTag(pe_tagtable.TableTag): diff --git a/app/scodoc/pe_settag.py b/app/scodoc/pe_settag.py index 7d46b7c6..2db2b4a1 100644 --- a/app/scodoc/pe_settag.py +++ b/app/scodoc/pe_settag.py @@ -36,12 +36,8 @@ Created on Fri Sep 9 09:15:05 2016 @author: barasc """ -from pe_tools import pe_print, PE_DEBUG - -import pe_tagtable -import pe_semestretag -import notes_table -import pe_jurype +from app.scodoc.pe_tools import pe_print, PE_DEBUG +from app.scodoc import pe_tagtable class SetTag(pe_tagtable.TableTag): diff --git a/app/scodoc/pe_tagtable.py b/app/scodoc/pe_tagtable.py index 56ea883c..e8df575a 100644 --- a/app/scodoc/pe_tagtable.py +++ b/app/scodoc/pe_tagtable.py @@ -37,9 +37,9 @@ Created on Thu Sep 8 09:36:33 2016 @author: barasc """ -import notes_table import datetime -import codecs + +from app.scodoc import notes_table class TableTag: diff --git a/app/scodoc/pe_tools.py b/app/scodoc/pe_tools.py index 58948982..16b394fe 100644 --- a/app/scodoc/pe_tools.py +++ b/app/scodoc/pe_tools.py @@ -39,13 +39,11 @@ from __future__ import print_function import os import datetime -import operator import re import unicodedata -import sco_utils as scu -from notes_log import log -import notes_table +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log PE_DEBUG = 0 diff --git a/app/scodoc/pe_view.py b/app/scodoc/pe_view.py index 2021acb7..7f989957 100644 --- a/app/scodoc/pe_view.py +++ b/app/scodoc/pe_view.py @@ -35,23 +35,15 @@ """ -import sco_utils as scu -from notes_log import log -import sco_formsemestre -import sco_formsemestre_status -import notes_table -from gen_tables import GenTable -import html_sco_header -import sco_codes_parcours -import sco_preferences +import app.scodoc.sco_utils as scu +from app.scodoc import sco_formsemestre +from app.scodoc import html_sco_header +from app.scodoc import sco_preferences -import pe_tools -from pe_tools import PE_LATEX_ENCODING -import pe_tagtable -import pe_semestretag -import pe_settag -import pe_jurype -import pe_avislatex +from app.scodoc import pe_tools +from app.scodoc.pe_tools import PE_LATEX_ENCODING +from app.scodoc import pe_jurype +from app.scodoc import pe_avislatex def _pe_view_sem_recap_form(context, formsemestre_id, REQUEST=None): diff --git a/app/scodoc/sco_abs.py b/app/scodoc/sco_abs.py index f65f4389..1ab18dd7 100644 --- a/app/scodoc/sco_abs.py +++ b/app/scodoc/sco_abs.py @@ -31,19 +31,35 @@ # Anciennement dans ZAbscences.py, séparé pour migration import string -import datetime -import re import time +import datetime import calendar import cgi -import notesdb from scodoc_manager import sco_mgr -from sco_exceptions import ScoValueError, ScoInvalidDateError -import sco_formsemestre -import sco_compute_moy -import sco_preferences -import scolars +from app.scodoc import notesdb as ndb +from app.scodoc.scolog import logdb +from app.scodoc.sco_exceptions import ScoValueError, ScoInvalidDateError +from app.scodoc import sco_abs_notification +from app.scodoc import sco_formsemestre +from app.scodoc import sco_preferences +from app.scodoc import sco_etud + +# --- Misc tools.... ------------------ + + +def _isFarFutur(jour): + # check si jour est dans le futur "lointain" + # pour autoriser les saisies dans le futur mais pas a plus de 6 mois + y, m, d = [int(x) for x in jour.split("-")] + j = datetime.date(y, m, d) + # 6 mois ~ 182 jours: + return j - datetime.date.today() > datetime.timedelta(182) + + +def _toboolean(x): + "convert a value to boolean" + return x # not necessary anymore ! def is_work_saturday(context): @@ -264,9 +280,419 @@ def YearTable( return string.join(T, "\n") +def list_abs_in_range( + context, etudid, debut, fin, matin=None, moduleimpl_id=None, cursor=None +): + """Liste des absences entre deux dates. + + Args: + etudid + debut string iso date ("2020-03-12") + end string iso date ("2020-03-12") + matin None, True, False + moduleimpl_id + """ + if matin != None: + matin = _toboolean(matin) + ismatin = " AND A.MATIN = %(matin)s " + else: + ismatin = "" + if moduleimpl_id: + modul = " AND A.MODULEIMPL_ID = %(moduleimpl_id)s " + else: + modul = "" + if not cursor: + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + cursor.execute( + """ +SELECT DISTINCT A.JOUR, A.MATIN +FROM ABSENCES A +WHERE A.ETUDID = %(etudid)s + AND A.ESTABS""" + + ismatin + + modul + + """ + AND A.JOUR BETWEEN %(debut)s AND %(fin)s + """, + {"etudid": etudid, "debut": debut, "fin": fin, "moduleimpl_id": moduleimpl_id}, + ) + res = cursor.dictfetchall() + return res + + +def CountAbs(context, etudid, debut, fin, matin=None, moduleimpl_id=None): + """CountAbs + matin= 1 ou 0. + + Returns: + An integer. + """ + return len( + list_abs_in_range( + context, etudid, debut, fin, matin=matin, moduleimpl_id=moduleimpl_id + ) + ) + + +def CountAbsJust(context, etudid, debut, fin, matin=None, moduleimpl_id=None): + "Count just. abs" + if matin != None: + matin = _toboolean(matin) + ismatin = " AND A.MATIN = %(matin)s " + else: + ismatin = "" + if moduleimpl_id: + modul = " AND A.MODULEIMPL_ID = %(moduleimpl_id)s " + else: + modul = "" + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + cursor.execute( + """SELECT COUNT(*) AS NbAbsJust FROM ( +SELECT DISTINCT A.JOUR, A.MATIN +FROM ABSENCES A, ABSENCES B +WHERE A.ETUDID = %(etudid)s + AND A.ETUDID = B.ETUDID + AND A.JOUR = B.JOUR AND A.MATIN = B.MATIN + AND A.JOUR BETWEEN %(debut)s AND %(fin)s + AND A.ESTABS AND (A.ESTJUST OR B.ESTJUST)""" + + ismatin + + modul + + """ +) AS tmp + """, + vars(), + ) + res = cursor.fetchone()[0] + return res + + +def ListeAbsDate(context, etudid, beg_date, end_date): + """Liste des absences et justifs entre deux dates (inclues).""" + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + cursor.execute( + """SELECT jour, matin, estabs, estjust, description FROM ABSENCES A + WHERE A.ETUDID = %(etudid)s + AND A.jour >= %(beg_date)s + AND A.jour <= %(end_date)s + """, + vars(), + ) + Abs = cursor.dictfetchall() + # remove duplicates + A = {} # { (jour, matin) : abs } + for a in Abs: + jour, matin = a["jour"], a["matin"] + if (jour, matin) in A: + # garde toujours la description + a["description"] = a["description"] or A[(jour, matin)]["description"] + # et la justif: + a["estjust"] = a["estjust"] or A[(jour, matin)]["estjust"] + a["estabs"] = a["estabs"] or A[(jour, matin)]["estabs"] + A[(jour, matin)] = a + else: + A[(jour, matin)] = a + if A[(jour, matin)]["description"] is None: + A[(jour, matin)]["description"] = "" + # add hours: matin = 8:00 - 12:00, apresmidi = 12:00 - 18:00 + dat = "%04d-%02d-%02d" % (a["jour"].year, a["jour"].month, a["jour"].day) + if a["matin"]: + A[(jour, matin)]["begin"] = dat + " 08:00:00" + A[(jour, matin)]["end"] = dat + " 11:59:59" + else: + A[(jour, matin)]["begin"] = dat + " 12:00:00" + A[(jour, matin)]["end"] = dat + " 17:59:59" + # sort + R = A.values() + R.sort(key=lambda x: (x["begin"])) + return R + + +def GetAbsDescription(context, a, cursor=None): + "Description associee a l'absence" + from app.scodoc import sco_moduleimpl + + if not cursor: + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + a = a.copy() + # a['jour'] = a['jour'].date() + if a["matin"]: # devrait etre booleen... :-( + a["matin"] = True + else: + a["matin"] = False + cursor.execute( + """select * from absences where etudid=%(etudid)s and jour=%(jour)s and matin=%(matin)s order by entry_date desc""", + a, + ) + A = cursor.dictfetchall() + desc = None + module = "" + for a in A: + if a["description"]: + desc = a["description"] + if a["moduleimpl_id"] and a["moduleimpl_id"] != "NULL": + # Trouver le nom du module + Mlist = sco_moduleimpl.do_moduleimpl_withmodule_list( + context.Notes, moduleimpl_id=a["moduleimpl_id"] + ) + if Mlist: + M = Mlist[0] + module += "%s " % M["module"]["code"] + + if desc: + return "(%s) %s" % (desc, module) + if module: + return module + return "" + + +def ListeAbsJour(context, date, am=True, pm=True, is_abs=True, is_just=None): + """Liste des absences et/ou justificatifs ce jour. + is_abs: None (peu importe), True, False + is_just: idem + """ + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + req = """SELECT DISTINCT etudid, jour, matin FROM ABSENCES A +WHERE A.jour = %(date)s +""" + if is_abs != None: + req += " AND A.estabs = %(is_abs)s" + if is_just != None: + req += " AND A.estjust = %(is_just)s" + if not am: + req += " AND NOT matin " + if not pm: + req += " AND matin" + + cursor.execute(req, {"date": date, "is_just": is_just, "is_abs": is_abs}) + A = cursor.dictfetchall() + for a in A: + a["description"] = GetAbsDescription(context, a, cursor=cursor) + return A + + +def ListeAbsNonJustJour(context, date, am=True, pm=True): + "Liste des absences non justifiees ce jour" + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + reqa = "" + if not am: + reqa += " AND NOT matin " + if not pm: + reqa += " AND matin " + req = ( + """SELECT etudid, jour, matin FROM ABSENCES A +WHERE A.estabs +AND A.jour = %(date)s +""" + + reqa + + """EXCEPT SELECT etudid, jour, matin FROM ABSENCES B +WHERE B.estjust AND B.jour = %(date)s""" + + reqa + ) + + cursor.execute(req, {"date": date}) + A = cursor.dictfetchall() + for a in A: + a["description"] = GetAbsDescription(context, a, cursor=cursor) + return A + + +def ListeAbsNonJust(context, etudid, datedebut): + "Liste des absences NON justifiees (par ordre chronologique)" + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + cursor.execute( + """SELECT ETUDID, JOUR, MATIN FROM ABSENCES A +WHERE A.ETUDID = %(etudid)s +AND A.estabs +AND A.jour >= %(datedebut)s +EXCEPT SELECT ETUDID, JOUR, MATIN FROM ABSENCES B +WHERE B.estjust +AND B.ETUDID = %(etudid)s +ORDER BY JOUR + """, + vars(), + ) + A = cursor.dictfetchall() + for a in A: + a["description"] = GetAbsDescription(context, a, cursor=cursor) + return A + + +def ListeAbsJust(context, etudid, datedebut): + "Liste des absences justifiees (par ordre chronologique)" + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + cursor.execute( + """SELECT DISTINCT A.ETUDID, A.JOUR, A.MATIN FROM ABSENCES A, ABSENCES B +WHERE A.ETUDID = %(etudid)s +AND A.ETUDID = B.ETUDID +AND A.JOUR = B.JOUR AND A.MATIN = B.MATIN AND A.JOUR >= %(datedebut)s +AND A.ESTABS AND (A.ESTJUST OR B.ESTJUST) +ORDER BY A.JOUR + """, + vars(), + ) + A = cursor.dictfetchall() + for a in A: + a["description"] = GetAbsDescription(context, a, cursor=cursor) + return A + + +def ListeJustifs(context, etudid, datedebut, datefin=None, only_no_abs=False): + """Liste des justificatifs (sans absence relevée) à partir d'une date, + ou, si datefin spécifié, entre deux dates. + Si only_no_abs: seulement les justificatifs correspondant aux jours sans absences relevées. + """ + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + req = """SELECT DISTINCT ETUDID, JOUR, MATIN FROM ABSENCES A +WHERE A.ETUDID = %(etudid)s +AND A.ESTJUST +AND A.JOUR >= %(datedebut)s""" + if datefin: + req += """AND A.JOUR <= %(datefin)s""" + if only_no_abs: + req += """ +EXCEPT SELECT ETUDID, JOUR, MATIN FROM ABSENCES B +WHERE B.estabs +AND B.ETUDID = %(etudid)s + """ + cursor.execute(req, vars()) + A = cursor.dictfetchall() + for a in A: + a["description"] = GetAbsDescription(context, a, cursor=cursor) + + return A + + +def add_absence( + context, + etudid, + jour, + matin, + estjust, + REQUEST, + description=None, + moduleimpl_id=None, +): + "Ajoute une absence dans la bd" + if _isFarFutur(jour): + raise ScoValueError("date absence trop loin dans le futur !") + estjust = _toboolean(estjust) + matin = _toboolean(matin) + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + cursor.execute( + "insert into absences (etudid,jour,estabs,estjust,matin,description, moduleimpl_id) values (%(etudid)s, %(jour)s, TRUE, %(estjust)s, %(matin)s, %(description)s, %(moduleimpl_id)s )", + vars(), + ) + logdb( + REQUEST, + cnx, + "AddAbsence", + etudid=etudid, + msg="JOUR=%(jour)s,MATIN=%(matin)s,ESTJUST=%(estjust)s,description=%(description)s,moduleimpl_id=%(moduleimpl_id)s" + % vars(), + ) + cnx.commit() + invalidateAbsEtudDate(context, etudid, jour) + sco_abs_notification.abs_notify(context, etudid, jour) + + +def add_justif(context, etudid, jour, matin, REQUEST, description=None): + "Ajoute un justificatif dans la base" + # unpublished + if _isFarFutur(jour): + raise ScoValueError("date justificatif trop loin dans le futur !") + matin = _toboolean(matin) + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + cursor.execute( + "insert into absences (etudid,jour,estabs,estjust,matin, description) values (%(etudid)s,%(jour)s, FALSE, TRUE, %(matin)s, %(description)s )", + vars(), + ) + logdb( + REQUEST, + cnx, + "AddJustif", + etudid=etudid, + msg="JOUR=%(jour)s,MATIN=%(matin)s" % vars(), + ) + cnx.commit() + invalidateAbsEtudDate(context, etudid, jour) + + +def _add_abslist(context, abslist, REQUEST, moduleimpl_id=None): + for a in abslist: + etudid, jour, ampm = a.split(":") + if ampm == "am": + matin = 1 + elif ampm == "pm": + matin = 0 + else: + raise ValueError("invalid ampm !") + # ajoute abs si pas deja absent + if CountAbs(context, etudid, jour, jour, matin, moduleimpl_id) == 0: + add_absence(context, etudid, jour, matin, 0, REQUEST, "", moduleimpl_id) + + +def annule_absence(context, etudid, jour, matin, moduleimpl_id=None, REQUEST=None): + """Annule une absence ds base + Si moduleimpl_id, n'annule que pour ce module + """ + # unpublished + matin = _toboolean(matin) + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + req = "delete from absences where jour=%(jour)s and matin=%(matin)s and etudid=%(etudid)s and estabs" + if moduleimpl_id: + req += " and moduleimpl_id=%(moduleimpl_id)s" + cursor.execute(req, vars()) + logdb( + REQUEST, + cnx, + "AnnuleAbsence", + etudid=etudid, + msg="JOUR=%(jour)s,MATIN=%(matin)s,moduleimpl_id=%(moduleimpl_id)s" % vars(), + ) + cnx.commit() + invalidateAbsEtudDate(context, etudid, jour) + + +def annule_justif(context, etudid, jour, matin, REQUEST=None): + "Annule un justificatif" + # unpublished + matin = _toboolean(matin) + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + cursor.execute( + "delete from absences where jour=%(jour)s and matin=%(matin)s and etudid=%(etudid)s and ESTJUST AND NOT ESTABS", + vars(), + ) + cursor.execute( + "update absences set estjust=false where jour=%(jour)s and matin=%(matin)s and etudid=%(etudid)s", + vars(), + ) + logdb( + REQUEST, + cnx, + "AnnuleJustif", + etudid=etudid, + msg="JOUR=%(jour)s,MATIN=%(matin)s" % vars(), + ) + cnx.commit() + invalidateAbsEtudDate(context, etudid, jour) + + # ---- BILLETS -_billet_absenceEditor = notesdb.EditableTable( +_billet_absenceEditor = ndb.EditableTable( "billet_absence", "billet_id", ( @@ -563,14 +989,14 @@ class CAbsSemEtud: self.sem = sco_formsemestre.get_formsemestre( self.context, self.sem["formsemestre_id"] ) - debut_sem = notesdb.DateDMYtoISO(self.sem["date_debut"]) - fin_sem = notesdb.DateDMYtoISO(self.sem["date_fin"]) + debut_sem = ndb.DateDMYtoISO(self.sem["date_debut"]) + fin_sem = ndb.DateDMYtoISO(self.sem["date_fin"]) - self._CountAbs = self.context.Absences.CountAbs( - etudid=self.etudid, debut=debut_sem, fin=fin_sem + self._CountAbs = self.sco_abs.CountAbs( + context, etudid=self.etudid, debut=debut_sem, fin=fin_sem ) - self._CountAbsJust = self.context.Absences.CountAbsJust( - etudid=self.etudid, debut=debut_sem, fin=fin_sem + self._CountAbsJust = self.sco_abs.CountAbsJust( + context, etudid=self.etudid, debut=debut_sem, fin=fin_sem ) self._loaded = True @@ -606,8 +1032,10 @@ def invalidateAbsEtudDate(context, etudid, date): Invalide cache absence et PDF bulletins si nécessaire. date: date au format ISO """ + import sco_compute_moy + # Semestres a cette date: - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] sems = [ sem for sem in etud["sems"] diff --git a/app/scodoc/sco_abs_notification.py b/app/scodoc/sco_abs_notification.py index 03a18644..21465a70 100644 --- a/app/scodoc/sco_abs_notification.py +++ b/app/scodoc/sco_abs_notification.py @@ -37,15 +37,14 @@ from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from email.header import Header -import mails -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from scolog import logdb -import sco_bulletins -import sco_formsemestre -import sco_preferences -import scolars +from app.scodoc import mails +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.scolog import logdb +from app.scodoc import sco_formsemestre +from app.scodoc import sco_preferences +from app.scodoc import sco_etud def abs_notify(context, etudid, date): @@ -54,13 +53,15 @@ def abs_notify(context, etudid, date): (s'il n'y a pas de semestre courant, ne fait rien, car l'etudiant n'est pas inscrit au moment de l'absence!). """ + from app.scodoc import sco_abs + sem = retreive_current_formsemestre(context, etudid, date) if not sem: return # non inscrit a la date, pas de notification debut_sem = ndb.DateDMYtoISO(sem["date_debut"]) fin_sem = ndb.DateDMYtoISO(sem["date_fin"]) - nbabs = context.CountAbs(etudid, debut=debut_sem, fin=fin_sem) + nbabs = sco_abs.CountAbs(context, etudid, debut=debut_sem, fin=fin_sem) nbabsjust = context.CountAbsJust(etudid, debut=debut_sem, fin=fin_sem) do_abs_notify(context, sem, etudid, date, nbabs, nbabsjust) @@ -154,7 +155,7 @@ def abs_notify_get_destinations(context, sem, prefs, etudid, date, nbabs, nbabsj if prefs["abs_notify_email"]: destinations.append(prefs["abs_notify_email"]) if prefs["abs_notify_etud"]: - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] if etud["email_default"]: destinations.append(etud["email_default"]) @@ -238,7 +239,9 @@ def abs_notification_message(context, sem, prefs, etudid, nbabs, nbabsjust): """Mime notification message based on template. returns None if sending should be canceled (emplty template). """ - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + from app.scodoc import sco_bulletins + + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] # Variables accessibles dans les balises du template: %(nom_variable)s : values = sco_bulletins.make_context_dict(context, sem, etud) diff --git a/app/scodoc/sco_abs_views.py b/app/scodoc/sco_abs_views.py index d539cf89..8ef32ee9 100644 --- a/app/scodoc/sco_abs_views.py +++ b/app/scodoc/sco_abs_views.py @@ -25,29 +25,30 @@ # ############################################################################## -"""Pages HTML gestion absences +"""Pages HTML gestion absences (la plupart portées du DTML) """ import datetime from stripogram import html2text, html2safehtml -from gen_tables import GenTable -from notesdb import DateISOtoDMY -import sco_utils as scu -from sco_exceptions import ScoValueError -from sco_permissions import Permission -from notes_log import log -import html_sco_header -import sco_abs -import sco_find_etud -import sco_formsemestre -import sco_groups -import sco_moduleimpl -import sco_photos -import sco_preferences -import scolars +import app.scodoc.sco_utils as scu +from app.scodoc import notesdb as ndb +from app.scodoc.scolog import logdb +from app.scodoc.gen_tables import GenTable +from app.scodoc import html_sco_header +from app.scodoc import sco_abs +from app.scodoc import sco_etud +from app.scodoc import sco_find_etud +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_photos +from app.scodoc import sco_preferences +from app.scodoc.notes_log import log +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_permissions import Permission def doSignaleAbsence( @@ -72,7 +73,7 @@ def doSignaleAbsence( description: str etudid: etudiant concerné. Si non spécifié, cherche dans REQUEST.form """ - etud = scolars.get_etud_info(filled=1, etudid=etudid, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, etudid=etudid, REQUEST=REQUEST)[0] etudid = etud["etudid"] description_abs = description @@ -81,15 +82,30 @@ def doSignaleAbsence( demijournee = int(demijournee) for jour in dates: if demijournee == 2: - context._AddAbsence( - etudid, jour, False, estjust, REQUEST, description_abs, moduleimpl_id + sco_abs.add_absence( + context, + etudid, + jour, + False, + estjust, + REQUEST, + description_abs, + moduleimpl_id, ) - context._AddAbsence( - etudid, jour, True, estjust, REQUEST, description_abs, moduleimpl_id + sco_abs.add_absence( + context, + etudid, + jour, + True, + estjust, + REQUEST, + description_abs, + moduleimpl_id, ) nbadded += 2 else: - context._AddAbsence( + sco_abs.add_absence( + context, etudid, jour, demijournee, @@ -151,7 +167,7 @@ def doSignaleAbsence( def SignaleAbsenceEtud(context, REQUEST=None): # etudid implied """Formulaire individuel simple de signalement d'une absence""" # brute-force portage from very old dtml code ... - etud = scolars.get_etud_info(filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] etudid = etud["etudid"] disabled = False if not etud["cursem"]: @@ -290,7 +306,7 @@ def doJustifAbsence( description: str etudid: etudiant concerné. Si non spécifié, cherche dans REQUEST.form """ - etud = scolars.get_etud_info(filled=1, etudid=etudid, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, etudid=etudid, REQUEST=REQUEST)[0] etudid = etud["etudid"] description_abs = description dates = sco_abs.DateRangeISO(context, datedebut, datefin) @@ -298,14 +314,16 @@ def doJustifAbsence( demijournee = int(demijournee) for jour in dates: if demijournee == 2: - context._AddJustif( + sco_abs.add_justif( + context, etudid=etudid, jour=jour, matin=False, REQUEST=REQUEST, description=description_abs, ) - context._AddJustif( + sco_abs.add_justif( + context, etudid=etudid, jour=jour, matin=True, @@ -314,7 +332,8 @@ def doJustifAbsence( ) nbadded += 2 else: - context._AddJustif( + sco_abs.add_justif( + context, etudid=etudid, jour=jour, matin=demijournee, @@ -359,7 +378,7 @@ def doJustifAbsence( def JustifAbsenceEtud(context, REQUEST=None): # etudid implied """Formulaire individuel simple de justification d'une absence""" # brute-force portage from very old dtml code ... - etud = scolars.get_etud_info(filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] etudid = etud["etudid"] H = [ html_sco_header.sco_header( @@ -417,7 +436,7 @@ def doAnnuleAbsence( context, datedebut, datefin, demijournee, etudid=False, REQUEST=None ): # etudid implied """Annulation des absences pour une demi journée""" - etud = scolars.get_etud_info(filled=1, etudid=etudid, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, etudid=etudid, REQUEST=REQUEST)[0] etudid = etud["etudid"] dates = sco_abs.DateRangeISO(context, datedebut, datefin) @@ -425,11 +444,11 @@ def doAnnuleAbsence( demijournee = int(demijournee) for jour in dates: if demijournee == 2: - context._AnnuleAbsence(etudid, jour, False, REQUEST=REQUEST) - context._AnnuleAbsence(etudid, jour, True, REQUEST=REQUEST) + sco_abs.annule_absence(context, etudid, jour, False, REQUEST=REQUEST) + sco_abs.annule_absence(context, etudid, jour, True, REQUEST=REQUEST) nbadded += 2 else: - context._AnnuleAbsence(etudid, jour, demijournee, REQUEST=REQUEST) + sco_abs.annule_absence(context, etudid, jour, demijournee, REQUEST=REQUEST) nbadded += 1 # H = [ @@ -468,7 +487,7 @@ autre absence pour %(nomprenom)s def AnnuleAbsenceEtud(context, REQUEST=None): # etudid implied """Formulaire individuel simple d'annulation d'une absence""" # brute-force portage from very old dtml code ... - etud = scolars.get_etud_info(filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] etudid = etud["etudid"] H = [ @@ -557,7 +576,7 @@ def doAnnuleJustif( context, datedebut0, datefin0, demijournee, REQUEST=None ): # etudid implied """Annulation d'une justification""" - etud = scolars.get_etud_info(filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] etudid = etud["etudid"] dates = sco_abs.DateRangeISO(context, datedebut0, datefin0) nbadded = 0 @@ -565,11 +584,11 @@ def doAnnuleJustif( for jour in dates: # Attention: supprime matin et après-midi if demijournee == 2: - context._AnnuleJustif(etudid, jour, False, REQUEST=REQUEST) - context._AnnuleJustif(etudid, jour, True, REQUEST=REQUEST) + sco_abs.annule_justif(context, etudid, jour, False, REQUEST=REQUEST) + sco_abs.annule_justif(context, etudid, jour, True, REQUEST=REQUEST) nbadded += 2 else: - context._AnnuleJustif(etudid, jour, demijournee, REQUEST=REQUEST) + sco_abs.annule_justif(context, etudid, jour, demijournee, REQUEST=REQUEST) nbadded += 1 # H = [ @@ -605,6 +624,59 @@ autre absence pour %(nomprenom)s return "\n".join(H) +def AnnuleAbsencesDatesNoJust(context, etudid, dates, moduleimpl_id=None, REQUEST=None): + """Supprime les absences aux dates indiquées + mais ne supprime pas les justificatifs. + """ + # log('AnnuleAbsencesDatesNoJust: moduleimpl_id=%s' % moduleimpl_id) + if not dates: + return + date0 = dates[0] + if len(date0.split(":")) == 2: + # am/pm is present + for date in dates: + jour, ampm = date.split(":") + if ampm == "am": + matin = 1 + elif ampm == "pm": + matin = 0 + else: + raise ValueError("invalid ampm !") + sco_abs.annule_absence(context, etudid, jour, matin, moduleimpl_id, REQUEST) + return + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + # supr les absences non justifiees + for date in dates: + cursor.execute( + "delete from absences where etudid=%(etudid)s and (not estjust) and jour=%(date)s and moduleimpl_id=%(moduleimpl_id)s", + vars(), + ) + sco_abs.invalidateAbsEtudDate(context, etudid, date) + # s'assure que les justificatifs ne sont pas "absents" + for date in dates: + cursor.execute( + "update absences set estabs=FALSE where etudid=%(etudid)s and jour=%(date)s and moduleimpl_id=%(moduleimpl_id)s", + vars(), + ) + if dates: + date0 = dates[0] + else: + date0 = None + if len(dates) > 1: + date1 = dates[1] + else: + date1 = None + logdb( + REQUEST, + cnx, + "AnnuleAbsencesDatesNoJust", + etudid=etudid, + msg="%s - %s - %s" % (date0, date1, moduleimpl_id), + ) + cnx.commit() + + def EtatAbsences(context, REQUEST=None): """Etat des absences: choix du groupe""" # crude portage from 1999 DTML @@ -660,26 +732,26 @@ def formChoixSemestreGroupe(context, all=False): def CalAbs(context, REQUEST=None): # etud implied - """Calendrier des absences d un etudiant""" + """Calendrier des absences d'un etudiant""" # crude portage from 1999 DTML - etud = scolars.get_etud_info(filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] etudid = etud["etudid"] anneescolaire = int(scu.AnneeScolaire(REQUEST)) datedebut = str(anneescolaire) + "-08-31" datefin = str(anneescolaire + 1) + "-07-31" - nbabs = context.CountAbs(etudid=etudid, debut=datedebut, fin=datefin) + nbabs = sco_abs.CountAbs(context, etudid=etudid, debut=datedebut, fin=datefin) nbabsjust = context.CountAbsJust(etudid=etudid, debut=datedebut, fin=datefin) events = [] - for a in context.ListeAbsJust(etudid=etudid, datedebut=datedebut): + for a in sco_abs.ListeAbsJust(context, etudid=etudid, datedebut=datedebut): events.append( (str(a["jour"]), "a", "#F8B7B0", "", a["matin"], a["description"]) ) - for a in context.ListeAbsNonJust(etudid=etudid, datedebut=datedebut): + for a in sco_abs.ListeAbsNonJust(context, etudid=etudid, datedebut=datedebut): events.append( (str(a["jour"]), "A", "#EE0000", "", a["matin"], a["description"]) ) - justifs_noabs = context.ListeJustifs( - etudid=etudid, datedebut=datedebut, only_no_abs=True + justifs_noabs = sco_abs.ListeJustifs( + context, etudid=etudid, datedebut=datedebut, only_no_abs=True ) for a in justifs_noabs: events.append( @@ -750,11 +822,11 @@ def ListeAbsEtud( absjust_only = int(absjust_only) # si vrai, table absjust seule (export xls ou pdf) datedebut = "%s-08-31" % scu.AnneeScolaire(REQUEST) - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] # Liste des absences et titres colonnes tables: - titles, columns_ids, absnonjust, absjust = context.Absences._TablesAbsEtud( - etudid, datedebut, with_evals=with_evals, format=format + titles, columns_ids, absnonjust, absjust = _TablesAbsEtud( + context, etudid, datedebut, with_evals=with_evals, format=format ) if REQUEST: base_url_nj = "%s?etudid=%s&absjust_only=0" % (REQUEST.URL0, etudid) @@ -805,7 +877,7 @@ def ListeAbsEtud( ) H.append( """

Absences de %s (à partir du %s)

""" - % (etud["nomprenom"], DateISOtoDMY(datedebut)) + % (etud["nomprenom"], ndb.DateISOtoDMY(datedebut)) ) if len(absnonjust): @@ -826,12 +898,12 @@ def ListeAbsEtud( if not len(absnonjust) and not len(absjust): T.append( """--- Pas d'absences enregistrées depuis le %s""" - % DateISOtoDMY(datedebut) + % ndb.DateISOtoDMY(datedebut) ) else: T.append( """--- Absences enregistrées à partir du %s:""" - % DateISOtoDMY(datedebut) + % ndb.DateISOtoDMY(datedebut) ) T.append("\n") if len(absnonjust): @@ -845,6 +917,136 @@ def ListeAbsEtud( raise ValueError("Invalid format !") +def _TablesAbsEtud( + context, + etudid, + datedebut, + with_evals=True, + format="html", + absjust_only=0, + REQUEST=None, +): + """Tables des absences justifiees et non justifiees d'un étudiant sur l'année en cours""" + absjust = sco_abs.ListeAbsJust(context, etudid=etudid, datedebut=datedebut) + absnonjust = sco_abs.ListeAbsNonJust(context, etudid=etudid, datedebut=datedebut) + # examens ces jours là ? + if with_evals: + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + for a in absnonjust + absjust: + cursor.execute( + """select eval.* + from notes_evaluation eval, notes_moduleimpl_inscription mi, notes_moduleimpl m + where eval.jour = %(jour)s and eval.moduleimpl_id = m.moduleimpl_id + and mi.moduleimpl_id = m.moduleimpl_id and mi.etudid = %(etudid)s""", + {"jour": a["jour"].strftime("%Y-%m-%d"), "etudid": etudid}, + ) + a["evals"] = cursor.dictfetchall() + cursor.execute( + """SELECT mi.moduleimpl_id + from absences abs, notes_moduleimpl_inscription mi, notes_moduleimpl m + where abs.matin = %(matin)s and abs.jour = %(jour)s and abs.etudid=%(etudid)s and abs.moduleimpl_id=mi.moduleimpl_id and mi.moduleimpl_id=m.moduleimpl_id + and mi.etudid = %(etudid)s""", + { + "matin": bool(a["matin"]), + "jour": a["jour"].strftime("%Y-%m-%d"), + "etudid": etudid, + }, + ) + a["absent"] = cursor.dictfetchall() + + def matin(x): + if x: + return "matin" + else: + return "après-midi" + + def descr_exams(a): + if not a.has_key("evals"): + return "" + ex = [] + for ev in a["evals"]: + mod = sco_moduleimpl.do_moduleimpl_withmodule_list( + context.Notes, moduleimpl_id=ev["moduleimpl_id"] + )[0] + if format == "html": + ex.append( + '%s' + % (mod["moduleimpl_id"], mod["module"]["code"]) + ) + else: + ex.append(mod["module"]["code"]) + if ex: + return ", ".join(ex) + return "" + + def descr_abs(a): + ex = [] + for ev in a.get("absent", []): + mod = sco_moduleimpl.do_moduleimpl_withmodule_list( + context.Notes, moduleimpl_id=ev["moduleimpl_id"] + )[0] + if format == "html": + ex.append( + '%s' + % (mod["moduleimpl_id"], mod["module"]["code"]) + ) + else: + ex.append(mod["module"]["code"]) + if ex: + return ", ".join(ex) + return "" + + # ajoute date formatée et évaluations + for L in (absnonjust, absjust): + for a in L: + if with_evals: + a["exams"] = descr_exams(a) + a["datedmy"] = a["jour"].strftime("%d/%m/%Y") + a["ampm"] = int(a["matin"]) + a["matin"] = matin(a["matin"]) + index = a["description"].find(")") + if index != -1: + a["motif"] = a["description"][1:index] + else: + a["motif"] = "" + a["description"] = descr_abs(a) or "" + + # ajoute lien pour justifier + if format == "html": + for a in absnonjust: + a["justlink"] = "justifier" + a[ + "_justlink_target" + ] = "doJustifAbsence?etudid=%s&datedebut=%s&datefin=%s&demijournee=%s" % ( + etudid, + a["datedmy"], + a["datedmy"], + a["ampm"], + ) + # + titles = { + "datedmy": "Date", + "matin": "", + "exams": "Examens ce jour", + "justlink": "", + "description": "Modules", + "motif": "Motif", + } + columns_ids = ["datedmy", "matin"] + if format in ("json", "xml"): + columns_ids += ["jour", "ampm"] + if with_evals: + columns_ids.append("exams") + + columns_ids.append("description") + columns_ids.append("motif") + if format == "html": + columns_ids.append("justlink") + + return titles, columns_ids, absnonjust, absjust + + def index_html(context, REQUEST=None): """Gestionnaire absences, page principale""" # crude portage from 1999 DTML diff --git a/app/scodoc/sco_apogee_compare.py b/app/scodoc/sco_apogee_compare.py index dee459fb..5079ed96 100644 --- a/app/scodoc/sco_apogee_compare.py +++ b/app/scodoc/sco_apogee_compare.py @@ -44,15 +44,12 @@ Pour chaque étudiant commun: """ -from collections import OrderedDict - -import sco_utils as scu -from notes_log import log -import sco_apogee_csv -from gen_tables import GenTable -from sco_exceptions import ScoValueError -import html_sco_header -import sco_preferences +from app.scodoc.notes_log import log +from app.scodoc import sco_apogee_csv +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc import html_sco_header +from app.scodoc import sco_preferences _help_txt = """
diff --git a/app/scodoc/sco_apogee_csv.py b/app/scodoc/sco_apogee_csv.py index c474bdfa..49200e85 100644 --- a/app/scodoc/sco_apogee_csv.py +++ b/app/scodoc/sco_apogee_csv.py @@ -95,19 +95,32 @@ try: except: chardet_detect = None -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from sco_exceptions import ScoValueError, FormatError -from gen_tables import GenTable -from sco_formsemestre import ApoEtapeVDI -from sco_codes_parcours import code_semestre_validant -from sco_codes_parcours import ATT, ATB, ADM, ADC, ADJ, ATJ, ATB, AJ, CMP, NAR, RAT, DEF -import sco_codes_parcours -import sco_formsemestre -import sco_formsemestre_status -import sco_parcours_dut -import scolars +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.sco_exceptions import ScoValueError, FormatError +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_formsemestre import ApoEtapeVDI +from app.scodoc.sco_codes_parcours import code_semestre_validant +from app.scodoc.sco_codes_parcours import ( + ADC, + ADJ, + ADM, + AJ, + ATB, + ATJ, + ATT, + CMP, + DEF, + NAR, + RAT, +) +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_status +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_etud APO_PORTAL_ENCODING = ( "utf8" # encodage du fichier CSV Apogée (était 'ISO-8859-1' avant jul. 2016) @@ -286,7 +299,7 @@ class ApoEtud(dict): return "ApoEtud( nom='%s', nip='%s' )" % (self["nom"], self["nip"]) def lookup_scodoc(self, context, etape_formsemestre_ids): - etuds = scolars.get_etud_info(code_nip=self["nip"], filled=True) + etuds = sco_etud.get_etud_info(code_nip=self["nip"], filled=True) if not etuds: # pas dans ScoDoc self.etud = None @@ -971,9 +984,9 @@ class ApoData: s.add(code) continue # associé à une UE: - nt = self.sco_core.get_notes_cache( - context, - ).get_NotesTable(self.context, sem["formsemestre_id"]) + nt = sco_core.get_notes_cache(self.context).get_NotesTable( + self.context, sem["formsemestre_id"] + ) for ue in nt.get_ues(): if ue["code_apogee"] == code: s.add(code) diff --git a/app/scodoc/sco_archives.py b/app/scodoc/sco_archives.py index b4140967..d9246ff3 100644 --- a/app/scodoc/sco_archives.py +++ b/app/scodoc/sco_archives.py @@ -52,24 +52,22 @@ import re import shutil import glob -import sco_utils as scu +import app.scodoc.sco_utils as scu from config import Config -import notesdb as ndb -from notes_log import log -from sco_recapcomplet import make_formsemestre_recapcomplet -from TrivialFormulator import TrivialFormulator -from sco_exceptions import ( +from app.scodoc.notes_log import log +from app.scodoc.TrivialFormulator import TrivialFormulator +from app.scodoc.sco_exceptions import ( AccessDenied, ) -import html_sco_header -import sco_bulletins_pdf -import sco_excel -import sco_formsemestre -import sco_groups -import sco_groups_view -import sco_permissions -import sco_pvjury -import sco_pvpdf +from app.scodoc import html_sco_header +from app.scodoc import sco_bulletins_pdf +from app.scodoc import sco_excel +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_groups_view +from app.scodoc import sco_permissions_check +from app.scodoc import sco_pvjury +from app.scodoc import sco_pvpdf class BaseArchiver: @@ -276,6 +274,8 @@ def do_formsemestre_archive( Store: - tableau recap (xls), pv jury (xls et pdf), bulletins (xml et pdf), lettres individuelles (pdf) """ + from app.scodoc.sco_recapcomplet import make_formsemestre_recapcomplet + archive_id = PVArchive.create_obj_archive(context, formsemestre_id, description) date = PVArchive.get_archive_date(archive_id).strftime("%d/%m/%Y à %H:%M") @@ -370,7 +370,7 @@ def formsemestre_archive(context, REQUEST, formsemestre_id, group_ids=[]): """Make and store new archive for this formsemestre. (all students or only selected groups) """ - if not sco_permissions.can_edit_pv(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_edit_pv(context, REQUEST, formsemestre_id): raise AccessDenied( "opération non autorisée pour %s" % str(REQUEST.AUTHENTICATED_USER) ) @@ -553,7 +553,7 @@ def formsemestre_delete_archive( context, REQUEST, formsemestre_id, archive_name, dialog_confirmed=False ): """Delete an archive""" - if not sco_permissions.can_edit_pv(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_edit_pv(context, REQUEST, formsemestre_id): raise AccessDenied( "opération non autorisée pour %s" % str(REQUEST.AUTHENTICATED_USER) ) diff --git a/app/scodoc/sco_archives_etud.py b/app/scodoc/sco_archives_etud.py index dd35c24e..ee495d48 100644 --- a/app/scodoc/sco_archives_etud.py +++ b/app/scodoc/sco_archives_etud.py @@ -30,19 +30,17 @@ les dossiers d'admission et autres pièces utiles. """ -import sco_utils as scu -from notes_log import log -import ImportScolars -import sco_formsemestre -import sco_groups -import sco_trombino -import sco_excel -import sco_archives -from sco_permissions import Permission -from sco_exceptions import AccessDenied -from TrivialFormulator import TrivialFormulator -import html_sco_header -import scolars +import app.scodoc.sco_utils as scu +from app.scodoc import ImportScolars +from app.scodoc import sco_groups +from app.scodoc import sco_trombino +from app.scodoc import sco_excel +from app.scodoc import sco_archives +from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_exceptions import AccessDenied +from app.scodoc.TrivialFormulator import TrivialFormulator +from app.scodoc import html_sco_header +from app.scodoc import sco_etud class EtudsArchiver(sco_archives.BaseArchiver): @@ -131,7 +129,7 @@ def etud_upload_file_form(context, REQUEST, etudid): raise AccessDenied( "opération non autorisée pour %s" % str(REQUEST.AUTHENTICATED_USER) ) - etud = scolars.get_etud_info(filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] H = [ html_sco_header.sco_header( context, @@ -196,7 +194,7 @@ def etud_delete_archive(context, REQUEST, etudid, archive_name, dialog_confirmed raise AccessDenied( "opération non autorisée pour %s" % str(REQUEST.AUTHENTICATED_USER) ) - etud = scolars.get_etud_info(filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] archive_id = EtudsArchive.get_id_from_name(context, etudid, archive_name) dest_url = "ficheEtud?etudid=%s" % etudid if not dialog_confirmed: diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py index 84261654..bf6e5f35 100644 --- a/app/scodoc/sco_bulletins.py +++ b/app/scodoc/sco_bulletins.py @@ -32,7 +32,7 @@ import time from types import StringType import pprint import urllib -import htmlutils +from app.scodoc import htmlutils import email from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText @@ -41,27 +41,38 @@ from email.header import Header from reportlab.lib.colors import Color -import mails -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from sco_permissions import Permission -from sco_exceptions import AccessDenied -import sco_abs -import sco_abs_views -import sco_bulletins_generator -import sco_bulletins_json -import sco_bulletins_xml -import sco_codes_parcours -import sco_core -import sco_formations -import sco_formsemestre -import sco_formsemestre_status -import sco_groups -import sco_photos -import sco_preferences -import sco_pvjury -import scolars +from app.scodoc import mails +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_exceptions import AccessDenied +from app.scodoc import html_sco_header +from app.scodoc import sco_abs_views +from app.scodoc import sco_bulletins_generator +from app.scodoc import sco_bulletins_json +from app.scodoc import sco_bulletins_xml +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_evaluations +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_photos +from app.scodoc import sco_permissions_check +from app.scodoc import sco_preferences +from app.scodoc import sco_pvjury +from app.scodoc import sco_etud + + +# ----- CLASSES DE BULLETINS DE NOTES +import sco_bulletins_standard +import sco_bulletins_legacy + +# import sco_bulletins_example # format exemple (à désactiver en production) + +# ... ajouter ici vos modules ... +import sco_bulletins_ucac # format expérimental UCAC Cameroun def make_context_dict(context, sem, etud): @@ -85,7 +96,8 @@ def make_context_dict(context, sem, etud): C["anneesem"] = annee C.update(etud) # copie preferences - for name in sco_preferences.PREFS_NAMES: + # XXX devrait acceder directement à un dict de preferences, à revoir + for name in sco_preferences.get_base_preferences(context).prefs_name: C[name] = sco_preferences.get_preference(context, name, sem["formsemestre_id"]) # ajoute groupes et group_0, group_1, ... @@ -114,6 +126,8 @@ def formsemestre_bulletinetud_dict( Cette fonction est utilisée pour les bulletins HTML et PDF, mais pas ceux en XML. """ + from app.scodoc import sco_abs + if not version in ("short", "long", "selectedevals"): raise ValueError("invalid version code !") @@ -139,7 +153,7 @@ def formsemestre_bulletinetud_dict( I["formation"]["type_parcours"] ) # Infos sur l'etudiant - I["etud"] = scolars.get_etud_info(etudid=etudid, filled=1)[0] + I["etud"] = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] I["descr_situation"] = I["etud"]["inscriptionstr"] if I["etud"]["inscription_formsemestre_id"]: I[ @@ -200,7 +214,7 @@ def formsemestre_bulletinetud_dict( # --- Appreciations cnx = ndb.GetDBConnexion() - apprecs = scolars.appreciations_list( + apprecs = sco_etud.appreciations_list( cnx, args={"etudid": etudid, "formsemestre_id": formsemestre_id} ) I["appreciations_list"] = apprecs @@ -427,13 +441,15 @@ def _ue_mod_bulletin(context, etudid, formsemestre_id, ue_id, modimpls, nt, vers is_malus = mod["module"]["module_type"] == scu.MODULE_MALUS if bul_show_abs_modules: mod_abs = [ - context.Absences.CountAbs( + sco_abs.CountAbs( + context, etudid=etudid, debut=debut_sem, fin=fin_sem, moduleimpl_id=modimpl["moduleimpl_id"], ), - context.Absences.CountAbsJust( + sco_abs.CountAbsJust( + context, etudid=etudid, debut=debut_sem, fin=fin_sem, @@ -662,7 +678,7 @@ def etud_descr_situation_semestre( # --- Situation et décisions jury # demission/inscription ? - events = scolars.scolar_events_list( + events = sco_etud.scolar_events_list( cnx, args={"etudid": etudid, "formsemestre_id": formsemestre_id} ) date_inscr = None @@ -680,7 +696,7 @@ def etud_descr_situation_semestre( "etud_descr_situation_semestre: removing duplicate INSCRIPTION event for etudid=%s !" % etudid ) - scolars.scolar_events_delete(cnx, event["event_id"]) + sco_etud.scolar_events_delete(cnx, event["event_id"]) else: date_inscr = event["event_date"] elif event_type == "DEMISSION": @@ -690,7 +706,7 @@ def etud_descr_situation_semestre( "etud_descr_situation_semestre: removing duplicate DEMISSION event for etudid=%s !" % etudid ) - scolars.scolar_events_delete(cnx, event["event_id"]) + sco_etud.scolar_events_delete(cnx, event["event_id"]) else: date_dem = event["event_date"] elif event_type == "DEFAILLANCE": @@ -699,7 +715,7 @@ def etud_descr_situation_semestre( "etud_descr_situation_semestre: removing duplicate DEFAILLANCE event for etudid=%s !" % etudid ) - scolars.scolar_events_delete(cnx, event["event_id"]) + sco_etud.scolar_events_delete(cnx, event["event_id"]) else: date_def = event["event_date"] if show_date_inscr: @@ -781,7 +797,7 @@ def formsemestre_bulletinetud( ): "page bulletin de notes" try: - etud = scolars.get_etud_info(filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] etudid = etud["etudid"] except: return scu.log_unknown_etud(context, REQUEST, format=format) @@ -1092,6 +1108,7 @@ def _formsemestre_bulletinetud_header_html( H.append("""""") # Menu endpoint = "notes.formsemestre_bulletinetud" + url = REQUEST.URL0 qurl = urllib.quote_plus(url + "?" + REQUEST.QUERY_STRING) menuBul = [ @@ -1182,7 +1199,7 @@ def _formsemestre_bulletinetud_header_html( "formsemestre_id": formsemestre_id, "etudid": etudid, }, - "enabled": sco_permcan_validate_semdate_sem( + "enabled": sco_permissions_check.can_validate_sem( context, REQUEST, formsemestre_id ), }, @@ -1193,7 +1210,7 @@ def _formsemestre_bulletinetud_header_html( "formsemestre_id": formsemestre_id, "etudid": etudid, }, - "enabled": sco_permcan_validate_semdate_sem( + "enabled": sco_permissions_check.can_validate_sem( context, REQUEST, formsemestre_id ), }, @@ -1204,7 +1221,7 @@ def _formsemestre_bulletinetud_header_html( "formsemestre_id": formsemestre_id, "etudid": etudid, }, - "enabled": sco_permcan_validate_semdate_sem( + "enabled": sco_permissions_check.can_validate_sem( context, REQUEST, formsemestre_id ), }, diff --git a/app/scodoc/sco_bulletins_example.py b/app/scodoc/sco_bulletins_example.py index 7fb1e902..8a50a398 100644 --- a/app/scodoc/sco_bulletins_example.py +++ b/app/scodoc/sco_bulletins_example.py @@ -27,16 +27,12 @@ """Generation bulletins de notes: exemple minimal pour les programmeurs """ - -import VERSION -import sco_utils as scu -import sco_pdf -import sco_preferences -from notes_log import log -import sco_bulletins_generator -import sco_bulletins_standard from reportlab.platypus import Paragraph +from app.scodoc import sco_pdf +from app.scodoc import sco_bulletins_generator +from app.scodoc import sco_bulletins_standard + class BulletinGeneratorExample(sco_bulletins_standard.BulletinGeneratorStandard): """Un exemple simple de bulletin de notes en version PDF seulement. diff --git a/app/scodoc/sco_bulletins_generator.py b/app/scodoc/sco_bulletins_generator.py index 51238935..41182296 100644 --- a/app/scodoc/sco_bulletins_generator.py +++ b/app/scodoc/sco_bulletins_generator.py @@ -50,18 +50,16 @@ import reportlab from reportlab.platypus import SimpleDocTemplate, Paragraph, Spacer, Frame, PageBreak from reportlab.platypus import Table, TableStyle, Image, KeepInFrame -import sco_utils -import VERSION -from sco_exceptions import NoteProcessError -import sco_preferences -from notes_log import log -import sco_formsemestre -import sco_pdf -from sco_pdf import PDFLOCK +from app.scodoc import sco_utils +from app.scodoc import VERSION +from app.scodoc.sco_exceptions import NoteProcessError +from app.scodoc.notes_log import log +from app.scodoc import sco_formsemestre +from app.scodoc import sco_pdf +from app.scodoc.sco_pdf import PDFLOCK -BULLETIN_CLASSES = ( - collections.OrderedDict() -) # liste des types des classes de générateurs de bulletins PDF +# Liste des types des classes de générateurs de bulletins PDF: +BULLETIN_CLASSES = collections.OrderedDict() def register_bulletin_class(klass): @@ -87,6 +85,8 @@ def bulletin_get_class(class_name): def bulletin_get_class_name_displayed(context, formsemestre_id): """Le nom du générateur utilisé, en clair""" + from app.scodoc import sco_preferences + bul_class_name = sco_preferences.get_preference( context, "bul_class_name", formsemestre_id ) @@ -113,6 +113,8 @@ class BulletinGenerator: filigranne=None, server_name=None, ): + from app.scodoc import sco_preferences + if not version in ("short", "long", "selectedevals"): raise ValueError("invalid version code !") self.context = context @@ -191,6 +193,8 @@ class BulletinGenerator: Sinon, renvoie juste une liste d'objets PLATYPUS pour intégration dans un autre document. """ + from app.scodoc import sco_preferences + formsemestre_id = self.infos["formsemestre_id"] # partie haute du bulletin @@ -273,6 +277,8 @@ def make_formsemestre_bulletinetud( selon les préférences du semestre. """ + from app.scodoc import sco_preferences + if not version in ("short", "long", "selectedevals"): raise ValueError("invalid version code !") @@ -325,15 +331,3 @@ def make_formsemestre_bulletinetud( filename = bul_generator.get_filename() return data, filename - - -# --------------------------------------------------------------------------- - -# Classes de bulletins: -import sco_bulletins_standard -import sco_bulletins_legacy - -# import sco_bulletins_example # format exemple (à désactiver en production) - -# ... ajouter ici vos modules ... -import sco_bulletins_ucac # format expérimental UCAC Cameroun diff --git a/app/scodoc/sco_bulletins_json.py b/app/scodoc/sco_bulletins_json.py index 2d343398..42293bcc 100644 --- a/app/scodoc/sco_bulletins_json.py +++ b/app/scodoc/sco_bulletins_json.py @@ -31,18 +31,17 @@ import datetime import json -import sco_utils as scu -import notesdb as ndb -import sco_abs -import sco_bulletins -import sco_core -import sco_edit_ue -import sco_evaluations -import sco_formsemestre -import sco_groups -import sco_photos -import sco_preferences -import scolars +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc import sco_abs +from app.scodoc import sco_core +from app.scodoc import sco_edit_ue +from app.scodoc import sco_evaluations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_photos +from app.scodoc import sco_preferences +from app.scodoc import sco_etud # -------- Bulletin en JSON @@ -90,6 +89,7 @@ def formsemestre_bulletinetud_published_dict( """Dictionnaire representant les informations _publiees_ du bulletin de notes Utilisé pour JSON, devrait l'être aussi pour XML. (todo) """ + from app.scodoc import sco_bulletins d = {} @@ -120,7 +120,7 @@ def formsemestre_bulletinetud_published_dict( d.update(**el) # Infos sur l'etudiant - etudinfo = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etudinfo = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] d["etudiant"] = dict( etudid=etudid, @@ -405,7 +405,7 @@ def formsemestre_bulletinetud_published_dict( # --- Appreciations cnx = ndb.GetDBConnexion() - apprecs = scolars.appreciations_list( + apprecs = sco_etud.appreciations_list( cnx, args={"etudid": etudid, "formsemestre_id": formsemestre_id} ) d["appreciation"] = [] diff --git a/app/scodoc/sco_bulletins_legacy.py b/app/scodoc/sco_bulletins_legacy.py index 10b8a51f..ccf9a905 100644 --- a/app/scodoc/sco_bulletins_legacy.py +++ b/app/scodoc/sco_bulletins_legacy.py @@ -35,17 +35,16 @@ """ -import sco_utils as scu -from sco_permissions import Permission -import sco_formsemestre -import sco_pdf -from sco_pdf import Color, Paragraph, Spacer, Table -from sco_pdf import blue, cm, mm -from sco_pdf import SU -import sco_preferences -from notes_log import log -import sco_bulletins_generator -import sco_bulletins_pdf +import app.scodoc.sco_utils as scu +from app.scodoc.sco_permissions import Permission +from app.scodoc import sco_formsemestre +from app.scodoc import sco_pdf +from app.scodoc.sco_pdf import Color, Paragraph, Spacer, Table +from app.scodoc.sco_pdf import blue, cm, mm +from app.scodoc.sco_pdf import SU +from app.scodoc import sco_preferences +from app.scodoc import sco_bulletins_generator +from app.scodoc import sco_bulletins_pdf # Important: Le nom de la classe ne doit pas changer (bien le choisir), car il sera stocké en base de données (dans les préférences) class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator): @@ -320,7 +319,7 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator): # le dir. des etud peut ajouter des appreciations, # mais aussi le chef (perm. ScoEtudInscrit) can_edit_app = (str(authuser) in self.infos["responsables"]) or ( - authuser.has_permission(Permission.ScoEtudInscrit, self.context) + authuser.has_permission(Permission.ScoEtudInscrit) ) H.append('
') if I["appreciations_list"]: diff --git a/app/scodoc/sco_bulletins_pdf.py b/app/scodoc/sco_bulletins_pdf.py index 32145b3b..eca31dea 100644 --- a/app/scodoc/sco_bulletins_pdf.py +++ b/app/scodoc/sco_bulletins_pdf.py @@ -50,24 +50,22 @@ Pour définir un nouveau type de bulletin: Chaque semestre peut si nécessaire utiliser un type de bulletin différent. """ -import htmlutils import time -import pprint import traceback import re import os import cStringIO + from reportlab.platypus.doctemplate import PageTemplate, BaseDocTemplate -import VERSION -import sco_utils as scu -from notes_log import log -import sco_bulletins -import sco_core -import sco_formsemestre -import sco_pdf -import sco_preferences -import scolars +from app.scodoc import VERSION +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc import sco_core +from app.scodoc import sco_formsemestre +from app.scodoc import sco_pdf +from app.scodoc import sco_preferences +from app.scodoc import sco_etud def pdfassemblebulletins( @@ -167,6 +165,8 @@ def get_formsemestre_bulletins_pdf( context, formsemestre_id, REQUEST, version="selectedevals" ): "document pdf et filename" + from app.scodoc import sco_bulletins + cached = sco_core.get_notes_cache( context, ).get_bulletins_pdf(formsemestre_id, version) @@ -229,7 +229,9 @@ def get_formsemestre_bulletins_pdf( def get_etud_bulletins_pdf(context, etudid, REQUEST, version="selectedevals"): "Bulletins pdf de tous les semestres de l'étudiant, et filename" - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + from app.scodoc import sco_bulletins + + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] fragments = [] bookmarks = {} filigrannes = {} diff --git a/app/scodoc/sco_bulletins_standard.py b/app/scodoc/sco_bulletins_standard.py index 4fc0ba0c..4e86c091 100644 --- a/app/scodoc/sco_bulletins_standard.py +++ b/app/scodoc/sco_bulletins_standard.py @@ -46,33 +46,25 @@ de la forme %(XXX)s sont remplacées par la valeur de XXX, pour XXX dans: Balises img: actuellement interdites. """ -import datetime -import traceback -import re -import jaxml -import sco_utils as scu -import sco_formsemestre -import sco_pdf -from sco_pdf import Color, Paragraph, Spacer, Table -from sco_pdf import blue, cm, mm -from sco_pdf import SU -import sco_preferences -from notes_log import log -from sco_permissions import Permission -from sco_codes_parcours import ( +import app.scodoc.sco_utils as scu +from app.scodoc.sco_pdf import Color, Paragraph, Spacer, Table +from app.scodoc.sco_pdf import blue, cm, mm +from app.scodoc.sco_pdf import SU +from app.scodoc import sco_preferences +from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_codes_parcours import ( UE_COLORS, UE_DEFAULT_COLOR, UE_ELECTIVE, UE_SPORT, UE_STANDARD, ) -import sco_bulletins_generator -import sco_bulletins_pdf -import sco_groups -import sco_evaluations -import gen_tables -import sco_codes_parcours +from app.scodoc import sco_bulletins_generator +from app.scodoc import sco_bulletins_pdf +from app.scodoc import sco_groups +from app.scodoc import sco_evaluations +from app.scodoc import gen_tables # Important: Le nom de la classe ne doit pas changer (bien le choisir), car il sera stocké en base de données (dans les préférences) class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator): @@ -153,7 +145,7 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator): # le dir. des etud peut ajouter des appreciations, # mais aussi le chef (perm. ScoEtudInscrit) can_edit_app = (str(self.authuser) in self.infos["responsables"]) or ( - self.authuser.has_permission(Permission.ScoEtudInscrit, self.context) + self.authuser.has_permission(Permission.ScoEtudInscrit) ) H.append('
') for app in self.infos["appreciations_list"]: diff --git a/app/scodoc/sco_bulletins_ucac.py b/app/scodoc/sco_bulletins_ucac.py index 52439997..a474592b 100644 --- a/app/scodoc/sco_bulletins_ucac.py +++ b/app/scodoc/sco_bulletins_ucac.py @@ -33,18 +33,15 @@ On redéfini la table centrale du bulletin de note et hérite de tout le reste d E. Viennet, juillet 2011 """ -import sco_utils as scu -import sco_formsemestre -import sco_pdf -from sco_pdf import blue, cm, mm -from sco_pdf import Color, Paragraph, Spacer, Table +import app.scodoc.sco_utils as scu +from app.scodoc.sco_pdf import blue, cm, mm +from app.scodoc.sco_pdf import Color, Paragraph, Spacer, Table -import sco_preferences +from app.scodoc import sco_preferences -from notes_log import log -import sco_bulletins_generator -import sco_bulletins_standard -import gen_tables +from app.scodoc import sco_bulletins_generator +from app.scodoc import sco_bulletins_standard +from app.scodoc import gen_tables class BulletinGeneratorUCAC(sco_bulletins_standard.BulletinGeneratorStandard): diff --git a/app/scodoc/sco_bulletins_xml.py b/app/scodoc/sco_bulletins_xml.py index 25b65a2a..dc568b92 100644 --- a/app/scodoc/sco_bulletins_xml.py +++ b/app/scodoc/sco_bulletins_xml.py @@ -40,19 +40,19 @@ Je propose de considérer le XMl comme "deprecated" et de ne plus le modifier, s import datetime import jaxml -import sco_utils as scu -import notesdb as ndb -from notes_log import log -import sco_abs -import sco_bulletins -import sco_codes_parcours -import sco_core -import sco_evaluations -import sco_formsemestre -import sco_groups -import sco_photos -import sco_preferences -import scolars +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc import sco_abs +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_edit_ue +from app.scodoc import sco_evaluations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_photos +from app.scodoc import sco_preferences +from app.scodoc import sco_etud # -------- Bulletin en XML # (fonction séparée: n'utilise pas formsemestre_bulletinetud_dict() @@ -70,6 +70,8 @@ def make_xml_formsemestre_bulletinetud( version="long", ): "bulletin au format XML" + from app.scodoc import sco_bulletins + log("xml_bulletin( formsemestre_id=%s, etudid=%s )" % (formsemestre_id, etudid)) if REQUEST: REQUEST.RESPONSE.setHeader("content-type", scu.XML_MIMETYPE) @@ -102,7 +104,7 @@ def make_xml_formsemestre_bulletinetud( doc.bulletinetud(**el) # Infos sur l'etudiant - etudinfo = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etudinfo = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] doc._push() doc.etudiant( etudid=etudid, @@ -416,7 +418,7 @@ def make_xml_formsemestre_bulletinetud( doc._pop() # --- Appreciations cnx = ndb.GetDBConnexion() - apprecs = scolars.appreciations_list( + apprecs = sco_etud.appreciations_list( cnx, args={"etudid": etudid, "formsemestre_id": formsemestre_id} ) for app in apprecs: diff --git a/app/scodoc/sco_cache.py b/app/scodoc/sco_cache.py index b6425c5d..aa114564 100644 --- a/app/scodoc/sco_cache.py +++ b/app/scodoc/sco_cache.py @@ -29,8 +29,7 @@ """ -from notes_log import log -import thread, time +import time # Cache data class simpleCache: diff --git a/app/scodoc/sco_compute_moy.py b/app/scodoc/sco_compute_moy.py index bf396765..42e1b30a 100644 --- a/app/scodoc/sco_compute_moy.py +++ b/app/scodoc/sco_compute_moy.py @@ -32,26 +32,24 @@ import traceback import pprint from types import FloatType -import sco_utils as scu -import notesdb as ndb -from sco_utils import ( +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.sco_utils import ( NOTES_ATTENTE, NOTES_NEUTRALISE, EVALUATION_NORMALE, EVALUATION_RATTRAPAGE, EVALUATION_SESSION2, ) -from sco_exceptions import ScoException -from notesdb import EditableTable, quote_html -from notes_log import log, sendAlarm -import sco_abs -import sco_edit_module -import sco_evaluations -import sco_formsemestre -import sco_formulas -import sco_groups -import sco_moduleimpl -import scolars +from app.scodoc.sco_exceptions import ScoException +from app.scodoc.notes_log import log +from app.scodoc import sco_abs +from app.scodoc import sco_edit_module +from app.scodoc import sco_evaluations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formulas +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_etud def moduleimpl_has_expression(context, mod): @@ -89,7 +87,7 @@ def formsemestre_expressions_use_abscounts(context, formsemestre_id): return False -_formsemestre_ue_computation_exprEditor = EditableTable( +_formsemestre_ue_computation_exprEditor = ndb.EditableTable( "notes_formsemestre_ue_computation_expr", "notes_formsemestre_ue_computation_expr_id", ( @@ -117,7 +115,7 @@ def get_ue_expression(formsemestre_id, ue_id, cnx, html_quote=False): expr = el[0]["computation_expr"].strip() if expr and expr[0] != "#": if html_quote: - expr = quote_html(expr) + expr = ndb.quote_html(expr) return expr else: return None @@ -169,7 +167,7 @@ def compute_user_formula( if user_moy != "NA0" and user_moy != "NA": user_moy = float(user_moy) if (user_moy > 20) or (user_moy < 0): - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] raise ScoException( """valeur moyenne %s hors limite pour %s""" @@ -231,8 +229,8 @@ def do_moduleimpl_moyennes(context, nt, mod): eval_rattr = None for e in evals: e["nb_inscrits"] = e["etat"]["nb_inscrits"] - NotesDB = context._notes_getall( - e["evaluation_id"] + NotesDB = sco_evaluations.do_evaluation_get_all_notes( + context, e["evaluation_id"] ) # toutes, y compris demissions # restreint aux étudiants encore inscrits à ce module notes = [ diff --git a/app/scodoc/sco_config.py b/app/scodoc/sco_config.py index 83f13e35..18ddfb1e 100644 --- a/app/scodoc/sco_config.py +++ b/app/scodoc/sco_config.py @@ -7,7 +7,7 @@ """ from attrdict import AttrDict -import bonus_sport +from app.scodoc import bonus_sport CONFIG = AttrDict() diff --git a/app/scodoc/sco_config_load.py b/app/scodoc/sco_config_load.py index e91e2f20..dceeee65 100644 --- a/app/scodoc/sco_config_load.py +++ b/app/scodoc/sco_config_load.py @@ -6,8 +6,8 @@ import os import sys -from notes_log import log -import sco_config +from app.scodoc.notes_log import log +from app.scodoc import sco_config # scodoc_local defines a CONFIG object # here we check if there is a local config file diff --git a/app/scodoc/sco_core.py b/app/scodoc/sco_core.py index 24f2417f..571283c0 100644 --- a/app/scodoc/sco_core.py +++ b/app/scodoc/sco_core.py @@ -6,35 +6,12 @@ import time import thread -import types -from flask import url_for - -import sco_utils as scu -from notes_log import log from scodoc_manager import sco_mgr -from sco_exceptions import ScoInvalidDept, NoteProcessError -from sco_parcours_dut import list_formsemestre_utilisateurs_uecap -import sco_cache -import sco_core - - -def sco_get_version(context, REQUEST=None): - """Une fonction typique de ScoDoc7""" - return """

%s

""" % scu.SCOVERSION - - -# def test_refactor(context, x=1): -# x = context.toto() -# y = ("context=" + sco_edit_module.module_is_locked(context, "alpha")) + "23" -# z = html_sco_header.sco_header( -# context, -# a_long_argument_hahahahaha=1, -# another_very_long_arggggggggggggg=2, -# z=6, -# u=99, -# kkkkkk=1, -# ) +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.sco_exceptions import NoteProcessError +from app.scodoc import sco_cache # @@ -134,6 +111,8 @@ class CacheNotesTable: def inval_cache(self, context, formsemestre_id=None, pdfonly=False): # > "expire cache pour un semestre (ou tous si pas d'argument)" + from app.scodoc import sco_parcours_dut + log( "inval_cache, formsemestre_id=%s pdfonly=%s (id=%s)" % (formsemestre_id, pdfonly, id(self)) # > @@ -151,14 +130,16 @@ class CacheNotesTable: self.cache = {} self.pdfcache = {} self._call_all_listeners() - sco_core.get_evaluations_cache( + get_evaluations_cache( context, ).inval_cache() else: # formsemestre_id modifié: # on doit virer formsemestre_id et tous les semestres # susceptibles d'utiliser des UE capitalisées de ce semestre. - to_trash = [formsemestre_id] + list_formsemestre_utilisateurs_uecap( + to_trash = [ + formsemestre_id + ] + sco_parcours_dut.list_formsemestre_utilisateurs_uecap( context, formsemestre_id ) if not pdfonly: @@ -170,7 +151,7 @@ class CacheNotesTable: ) del self.cache[formsemestre_id] self._call_listeners(formsemestre_id) - sco_core.get_evaluations_cache( + get_evaluations_cache( context, ).inval_cache() diff --git a/app/scodoc/sco_cost_formation.py b/app/scodoc/sco_cost_formation.py index 81591f67..eef25381 100644 --- a/app/scodoc/sco_cost_formation.py +++ b/app/scodoc/sco_cost_formation.py @@ -30,16 +30,13 @@ (coût théorique en heures équivalent TD) """ -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from gen_tables import GenTable -import sco_excel, sco_pdf -from sco_pdf import SU -import sco_formsemestre -import sco_moduleimpl -import sco_formsemestre_status -import VERSION +import app.scodoc.sco_utils as scu +from app.scodoc.gen_tables import GenTable +from app.scodoc import sco_formsemestre +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_formsemestre_status +from app.scodoc import VERSION +from app.scodoc import sco_preferences def formsemestre_table_estim_cost( diff --git a/app/scodoc/sco_debouche.py b/app/scodoc/sco_debouche.py index 450f2ce7..4e9d52b9 100644 --- a/app/scodoc/sco_debouche.py +++ b/app/scodoc/sco_debouche.py @@ -31,16 +31,19 @@ Rapport (table) avec dernier semestre fréquenté et débouché de chaque étudi from types import StringType import safehtml -import sco_utils as scu -import notesdb as ndb -from notes_log import log -import VERSION -from sco_exceptions import AccessDenied -from scolog import logdb -from gen_tables import GenTable -import sco_formsemestre -import sco_groups -import sco_tag_module +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc import VERSION +from app.scodoc.sco_exceptions import AccessDenied +from app.scodoc.scolog import logdb +from app.scodoc.gen_tables import GenTable +from app.scodoc import html_sco_header +from app.scodoc import sco_core +from app.scodoc import sco_permissions_check +from app.scodoc import sco_preferences +from app.scodoc import sco_tag_module +from app.scodoc import sco_etud def report_debouche_date(context, start_year=None, format="html", REQUEST=None): @@ -104,7 +107,7 @@ def table_debouche_etudids(context, etudids, keep_numeric=True): """Rapport pour ces etudiants""" L = [] for etudid in etudids: - etud = scolars.get_etud_info(filled=1, etudid=etudid)[0] + etud = sco_etud.get_etud_info(filled=1, etudid=etudid)[0] # retrouve le "dernier" semestre (au sens de la date de fin) sems = etud["sems"] es = [(sems[i]["date_fin_iso"], i) for i in range(len(sems))] @@ -211,12 +214,12 @@ def report_debouche_ask_date(context, REQUEST=None): # def debouche_set(context, object, value, REQUEST=None): # """Set debouche (field in admission table, may be deprecated ?) # """ -# if not sco_permissions.can_edit_suivi(context, REQUEST): +# if not sco_permissions_check.can_edit_suivi(context, REQUEST): # raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !") # adm_id = object # debouche = value.strip('-_ \t') # cnx = ndb.GetDBConnexion() -# adms = scolars.admission_list(cnx, {'etudid' : etudid}) +# adms = sco_etud.admission_list(cnx, {'etudid' : etudid}) # if not adms: # raise ValueError('no admission info for %s !' % etudid) # adm = adms[0] @@ -263,7 +266,7 @@ def itemsuivi_get(cnx, itemsuivi_id, ignore_errors=False): def itemsuivi_suppress(context, itemsuivi_id, REQUEST=None): """Suppression d'un item""" - if not sco_permissions.can_edit_suivi(context, REQUEST): + if not sco_permissions_check.can_edit_suivi(context, REQUEST): raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !") cnx = ndb.GetDBConnexion() item = itemsuivi_get(cnx, itemsuivi_id, ignore_errors=True) @@ -277,7 +280,7 @@ def itemsuivi_create( context, etudid, item_date=None, situation="", REQUEST=None, format=None ): """Creation d'un item""" - if not sco_permissions.can_edit_suivi(context, REQUEST): + if not sco_permissions_check.can_edit_suivi(context, REQUEST): raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !") cnx = ndb.GetDBConnexion() itemsuivi_id = _itemsuivi_create( @@ -295,7 +298,7 @@ def itemsuivi_set_date(context, itemsuivi_id, item_date, REQUEST=None): """set item date item_date is a string dd/mm/yyyy """ - if not sco_permissions.can_edit_suivi(context, REQUEST): + if not sco_permissions_check.can_edit_suivi(context, REQUEST): raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !") # log('itemsuivi_set_date %s : %s' % (itemsuivi_id, item_date)) cnx = ndb.GetDBConnexion() @@ -306,7 +309,7 @@ def itemsuivi_set_date(context, itemsuivi_id, item_date, REQUEST=None): def itemsuivi_set_situation(context, object, value, REQUEST=None): """set situation""" - if not sco_permissions.can_edit_suivi(context, REQUEST): + if not sco_permissions_check.can_edit_suivi(context, REQUEST): raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !") itemsuivi_id = object situation = value.strip("-_ \t") @@ -364,7 +367,7 @@ def itemsuivi_tag_set(context, itemsuivi_id="", taglist=[], REQUEST=None): a string with tag names separated by commas ("un;deux") or a list of strings (["un", "deux"]) """ - if not sco_permissions.can_edit_suivi(context, REQUEST): + if not sco_permissions_check.can_edit_suivi(context, REQUEST): raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !") if not taglist: taglist = [] diff --git a/app/scodoc/sco_dept.py b/app/scodoc/sco_dept.py index 6720c96d..8461b890 100644 --- a/app/scodoc/sco_dept.py +++ b/app/scodoc/sco_dept.py @@ -27,17 +27,16 @@ """Page accueil département (liste des semestres, etc) """ -import notesdb as ndb -import sco_utils as scu -from notes_log import log -import sco_modalites -import sco_news -import sco_up_to_date -import sco_formsemestre -from gen_tables import GenTable -from sco_permissions import Permission, ScoEtudInscrit, ScoEditApo -import html_sco_header -import sco_formsemestre_inscriptions +import app.scodoc.sco_utils as scu +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_permissions import Permission +from app.scodoc import html_sco_header +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_modalites +from app.scodoc import sco_news +from app.scodoc import sco_preferences +from app.scodoc import sco_up_to_date def index_html(context, REQUEST=None, showcodes=0, showsemtable=0): diff --git a/app/scodoc/sco_dump_db.py b/app/scodoc/sco_dump_db.py index 41f95596..e682c5e3 100644 --- a/app/scodoc/sco_dump_db.py +++ b/app/scodoc/sco_dump_db.py @@ -51,22 +51,23 @@ import fcntl import subprocess import requests -from email.mime.multipart import MIMEMultipart -from email.mime.text import MIMEText -from email.mime.base import MIMEBase -from email.header import Header -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from sco_exceptions import ScoValueError +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc import html_sco_header +from app.scodoc import sco_preferences +from app.scodoc import VERSION +from app.scodoc.sco_exceptions import ScoValueError SCO_DUMP_LOCK = "/tmp/scodump.lock" def sco_dump_and_send_db(context, REQUEST=None): """Dump base de données du département courant et l'envoie anonymisée pour debug""" - H = [html_sco_header.sco_header(context, REQUEST, page_title="Assistance technique")] + H = [ + html_sco_header.sco_header(context, REQUEST, page_title="Assistance technique") + ] # get currect (dept) DB name: cursor = ndb.SimpleQuery(context, "SELECT current_database()", {}) db_name = cursor.fetchone()[0] @@ -194,7 +195,7 @@ def _send_db(context, REQUEST, ano_db_name): "sent_by": context.Users.user_info(str(REQUEST.AUTHENTICATED_USER))[ "nomcomplet" ], - "sco_version": scu.SCOVERSION, + "sco_version": VERSION.SCOVERSION, "sco_fullversion": scu.get_scodoc_version(), }, ) diff --git a/app/scodoc/sco_edit_formation.py b/app/scodoc/sco_edit_formation.py index 13ae110d..3b43d53e 100644 --- a/app/scodoc/sco_edit_formation.py +++ b/app/scodoc/sco_edit_formation.py @@ -28,16 +28,19 @@ """Ajout/Modification/Supression formations (portage from DTML) """ -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF, tf_error_message -import sco_codes_parcours -import sco_edit_module -import sco_edit_ue -import sco_formsemestre -from sco_exceptions import ScoValueError -import sco_formations +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message +from app.scodoc.sco_exceptions import ScoValueError, ScoLockedFormError +from app.scodoc import html_sco_header +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_edit_module +from app.scodoc import sco_edit_ue +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_news def formation_delete(context, formation_id=None, dialog_confirmed=False, REQUEST=None): @@ -105,7 +108,7 @@ def do_formation_delete(context, oid, REQUEST): # delete all UE in this formation ues = sco_edit_ue.do_ue_list(context, {"formation_id": oid}) for ue in ues: - do_ue_delete(ue["ue_id"], REQUEST=REQUEST, force=True) + sco_edit_ue.do_ue_delete(context, ue["ue_id"], REQUEST=REQUEST, force=True) sco_formations._formationEditor.delete(cnx, oid) @@ -113,7 +116,7 @@ def do_formation_delete(context, oid, REQUEST): sco_news.add( context, REQUEST, - typ=NEWS_FORM, + typ=sco_news.NEWS_FORM, object=oid, text="Suppression de la formation %(acronyme)s" % F, ) @@ -277,7 +280,7 @@ def do_formation_create(context, args, REQUEST): sco_news.add( context, REQUEST, - typ=NEWS_FORM, + typ=sco_news.NEWS_FORM, text="Création de la formation %(titre)s (%(acronyme)s)" % args, ) return r diff --git a/app/scodoc/sco_edit_matiere.py b/app/scodoc/sco_edit_matiere.py index 39e53e9a..d4e2b056 100644 --- a/app/scodoc/sco_edit_matiere.py +++ b/app/scodoc/sco_edit_matiere.py @@ -28,14 +28,13 @@ """Ajout/Modification/Supression matieres (portage from DTML) """ -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF, tf_error_message -import sco_edit_ue -import sco_formsemestre -import sco_news -from sco_exceptions import ScoValueError +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message +from app.scodoc.sco_exceptions import ScoValueError, ScoLockedFormError +from app.scodoc import html_sco_header +from app.scodoc import sco_core _matiereEditor = ndb.EditableTable( "notes_matieres", @@ -56,10 +55,8 @@ def do_matiere_edit(context, *args, **kw): "edit a matiere" cnx = ndb.GetDBConnexion() # check - mat = sco_edit_matiere.do_matiere_list( - context, {"matiere_id": args[0]["matiere_id"]} - )[0] - if sco_edit_matiere.matiere_is_locked(context, mat["matiere_id"]): + mat = do_matiere_list(context, {"matiere_id": args[0]["matiere_id"]})[0] + if matiere_is_locked(context, mat["matiere_id"]): raise ScoLockedFormError() # edit _matiereEditor.edit(cnx, *args, **kw) @@ -68,6 +65,10 @@ def do_matiere_edit(context, *args, **kw): def do_matiere_create(context, args, REQUEST): "create a matiere" + from app.scodoc import sco_edit_ue + from app.scodoc import sco_formations + from app.scodoc import sco_news + cnx = ndb.GetDBConnexion() # check ue = sco_edit_ue.do_ue_list(context, {"ue_id": args["ue_id"]})[0] @@ -81,7 +82,7 @@ def do_matiere_create(context, args, REQUEST): sco_news.add( context, REQUEST, - typ=NEWS_FORM, + typ=sco_news.NEWS_FORM, object=ue["formation_id"], text="Modification de la formation %(acronyme)s" % F, ) @@ -90,6 +91,8 @@ def do_matiere_create(context, args, REQUEST): def matiere_create(context, ue_id=None, REQUEST=None): """Creation d'une matiere""" + from app.scodoc import sco_edit_ue + UE = sco_edit_ue.do_ue_list(context, args={"ue_id": ue_id})[0] H = [ html_sco_header.sco_header( @@ -151,11 +154,16 @@ associé. def do_matiere_delete(context, oid, REQUEST): "delete matiere and attached modules" + from app.scodoc import sco_formations + from app.scodoc import sco_edit_ue + from app.scodoc import sco_edit_module + from app.scodoc import sco_news + cnx = ndb.GetDBConnexion() # check mat = do_matiere_list(context, {"matiere_id": oid})[0] ue = sco_edit_ue.do_ue_list(context, {"ue_id": mat["ue_id"]})[0] - locked = sco_edit_matiere.matiere_is_locked(context, mat["matiere_id"]) + locked = matiere_is_locked(context, mat["matiere_id"]) if locked: log("do_matiere_delete: mat=%s" % mat) log("do_matiere_delete: ue=%s" % ue) @@ -175,7 +183,7 @@ def do_matiere_delete(context, oid, REQUEST): sco_news.add( context, REQUEST, - typ=NEWS_FORM, + typ=sco_news.NEWS_FORM, object=ue["formation_id"], text="Modification de la formation %(acronyme)s" % F, ) @@ -183,6 +191,8 @@ def do_matiere_delete(context, oid, REQUEST): def matiere_delete(context, matiere_id=None, REQUEST=None): """Delete an UE""" + from app.scodoc import sco_edit_ue + M = do_matiere_list(context, args={"matiere_id": matiere_id})[0] UE = sco_edit_ue.do_ue_list(context, args={"ue_id": M["ue_id"]})[0] H = [ @@ -212,6 +222,9 @@ def matiere_delete(context, matiere_id=None, REQUEST=None): def matiere_edit(context, matiere_id=None, REQUEST=None): """Edit matiere""" + from app.scodoc import sco_formations + from app.scodoc import sco_edit_ue + F = do_matiere_list(context, args={"matiere_id": matiere_id}) if not F: raise ScoValueError("Matière inexistante !") diff --git a/app/scodoc/sco_edit_module.py b/app/scodoc/sco_edit_module.py index b3f74afa..e4cc23ae 100644 --- a/app/scodoc/sco_edit_module.py +++ b/app/scodoc/sco_edit_module.py @@ -25,19 +25,22 @@ # ############################################################################## -"""Ajout/Modification/Supression modules +"""Ajout/Modification/Suppression modules (portage from DTML) """ -import notesdb as ndb -import sco_utils as scu -from notes_log import log -import sco_codes_parcours -from TrivialFormulator import TrivialFormulator, TF -import sco_formsemestre -import sco_edit_ue -import sco_tag_module -from sco_permissions import ScoChangeFormation -from sco_exceptions import ScoValueError +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.TrivialFormulator import TrivialFormulator +from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_exceptions import ScoValueError, ScoLockedFormError, ScoGenError +from app.scodoc import html_sco_header +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_edit_matiere +from app.scodoc import sco_formsemestre +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_news _MODULE_HELP = """

Les modules sont décrits dans le programme pédagogique. Un module est pour ce @@ -98,6 +101,8 @@ def do_module_list(context, *args, **kw): def do_module_create(context, args, REQUEST): "create a module" # create + from app.scodoc import sco_formations + cnx = ndb.GetDBConnexion() r = _moduleEditor.create(cnx, args) @@ -108,7 +113,7 @@ def do_module_create(context, args, REQUEST): sco_news.add( context, REQUEST, - typ=NEWS_FORM, + typ=sco_news.NEWS_FORM, object=args["formation_id"], text="Modification de la formation %(acronyme)s" % F, ) @@ -117,6 +122,9 @@ def do_module_create(context, args, REQUEST): def module_create(context, matiere_id=None, REQUEST=None): """Creation d'un module""" + from app.scodoc import sco_formations + from app.scodoc import sco_edit_ue + if not matiere_id: raise ScoValueError("invalid matiere !") M = sco_edit_matiere.do_matiere_list(context, args={"matiere_id": matiere_id})[0] @@ -241,8 +249,10 @@ def module_create(context, matiere_id=None, REQUEST=None): def do_module_delete(context, oid, REQUEST): "delete module" + from app.scodoc import sco_formations + mod = do_module_list(context, {"module_id": oid})[0] - if sco_edit_module.module_is_locked(context, mod["module_id"]): + if module_is_locked(context, mod["module_id"]): raise ScoLockedFormError() # S'il y a des moduleimpls, on ne peut pas detruire le module ! @@ -268,7 +278,7 @@ def do_module_delete(context, oid, REQUEST): sco_news.add( context, REQUEST, - typ=NEWS_FORM, + typ=sco_news.NEWS_FORM, object=mod["formation_id"], text="Modification de la formation %(acronyme)s" % F, ) @@ -341,6 +351,9 @@ def check_module_code_unicity(code, field, formation_id, context, module_id=None def module_edit(context, module_id=None, REQUEST=None): """Edit a module""" + from app.scodoc import sco_formations + from app.scodoc import sco_tag_module + if not module_id: raise ScoValueError("invalid module !") Mod = do_module_list(context, args={"module_id": module_id}) @@ -532,6 +545,8 @@ def module_list(context, formation_id, REQUEST=None): """Liste des modules de la formation (XXX inutile ou a revoir) """ + from app.scodoc import sco_formations + if not formation_id: raise ScoValueError("invalid formation !") F = sco_formations.formation_list(context, args={"formation_id": formation_id})[0] @@ -581,6 +596,8 @@ def module_count_moduleimpls(context, module_id): def formation_add_malus_modules(context, formation_id, titre=None, REQUEST=None): """Création d'un module de "malus" dans chaque UE d'une formation""" + from app.scodoc import sco_edit_ue + ue_list = sco_edit_ue.do_ue_list(context, args={"formation_id": formation_id}) for ue in ue_list: @@ -601,6 +618,8 @@ def formation_add_malus_modules(context, formation_id, titre=None, REQUEST=None) def ue_add_malus_module(context, ue_id, titre=None, code=None, REQUEST=None): """Add a malus module in this ue""" + from app.scodoc import sco_edit_ue + ue = sco_edit_ue.do_ue_list(context, args={"ue_id": ue_id})[0] if titre is None: diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py index 5317759f..74a1fcd1 100644 --- a/app/scodoc/sco_edit_ue.py +++ b/app/scodoc/sco_edit_ue.py @@ -28,18 +28,27 @@ """Ajout/Modification/Suppression UE """ -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF -from gen_tables import GenTable -import sco_groups -import sco_formsemestre -import sco_formsemestre_validation -import sco_codes_parcours -import sco_tag_module -from sco_permissions import ScoChangeFormation, ScoEditFormationTags, ScoImplement -from sco_exceptions import ScoValueError, ScoLockedFormError +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.TrivialFormulator import TrivialFormulator, TF +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_exceptions import ScoValueError, ScoLockedFormError + +from app.scodoc import html_sco_header +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_edit_matiere +from app.scodoc import sco_edit_module +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_news +from app.scodoc import sco_permissions +from app.scodoc import sco_preferences +from app.scodoc import sco_tag_module +from app.scodoc import sco_etud _ueEditor = ndb.EditableTable( "notes_ue", @@ -75,6 +84,8 @@ def do_ue_list(context, *args, **kw): def do_ue_create(context, args, REQUEST): "create an ue" + from app.scodoc import sco_formations + cnx = ndb.GetDBConnexion() # check duplicates ues = do_ue_list( @@ -92,7 +103,7 @@ def do_ue_create(context, args, REQUEST): sco_news.add( context, REQUEST, - typ=NEWS_FORM, + typ=sco_news.NEWS_FORM, object=args["formation_id"], text="Modification de la formation %(acronyme)s" % F, ) @@ -100,7 +111,10 @@ def do_ue_create(context, args, REQUEST): def do_ue_delete(context, ue_id, delete_validations=False, REQUEST=None, force=False): - "delete UE and attached matieres (but not modules (it should ?))" + "delete UE and attached matieres (but not modules)" + from app.scodoc import sco_formations + from app.scodoc import sco_parcours_dut + cnx = ndb.GetDBConnexion() log("do_ue_delete: ue_id=%s, delete_validations=%s" % (ue_id, delete_validations)) # check @@ -108,7 +122,7 @@ def do_ue_delete(context, ue_id, delete_validations=False, REQUEST=None, force=F if not ue: raise ScoValueError("UE inexistante !") ue = ue[0] - if sco_edit_ue.ue_is_locked(context, ue["ue_id"]): + if ue_is_locked(context, ue["ue_id"]): raise ScoLockedFormError() # Il y a-t-il des etudiants ayant validé cette UE ? # si oui, propose de supprimer les validations @@ -158,7 +172,7 @@ def do_ue_delete(context, ue_id, delete_validations=False, REQUEST=None, force=F sco_news.add( context, REQUEST, - typ=NEWS_FORM, + typ=sco_news.NEWS_FORM, object=ue["formation_id"], text="Modification de la formation %(acronyme)s" % F, ) @@ -178,6 +192,8 @@ def ue_create(context, formation_id=None, REQUEST=None): def ue_edit(context, ue_id=None, create=False, formation_id=None, REQUEST=None): """Modification ou creation d'une UE""" + from app.scodoc import sco_formations + create = int(create) if not create: U = do_ue_list(context, args={"ue_id": ue_id}) @@ -419,6 +435,9 @@ def ue_list(context, formation_id=None, msg="", REQUEST=None): """Liste des matières et modules d'une formation, avec liens pour editer (si non verrouillée). """ + from app.scodoc import sco_formations + from app.scodoc import sco_formsemestre_validation + authuser = REQUEST.AUTHENTICATED_USER F = sco_formations.formation_list(context, args={"formation_id": formation_id}) @@ -816,6 +835,8 @@ def ue_sharing_code(context, ue_code=None, ue_id=None, hide_ue_id=None): """HTML list of UE sharing this code Either ue_code or ue_id may be specified. """ + from app.scodoc import sco_formations + if ue_id: ue = do_ue_list(context, args={"ue_id": ue_id})[0] if not ue_code: @@ -946,6 +967,8 @@ def ue_is_locked(context, ue_id): # ---- Table recap formation def formation_table_recap(context, formation_id, format="html", REQUEST=None): """Table recapitulant formation.""" + from app.scodoc import sco_formations + F = sco_formations.formation_list(context, args={"formation_id": formation_id}) if not F: raise ScoValueError("invalid formation_id") diff --git a/app/scodoc/sco_edt_cal.py b/app/scodoc/sco_edt_cal.py index 17cd4487..5902652e 100644 --- a/app/scodoc/sco_edt_cal.py +++ b/app/scodoc/sco_edt_cal.py @@ -38,11 +38,13 @@ import traceback import icalendar import pprint -import sco_utils as scu -from notes_log import log -import sco_formsemestre -import sco_groups -import sco_groups_view +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc import html_sco_header +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_groups_view +from app.scodoc import sco_preferences def formsemestre_get_ics_url(context, sem): @@ -52,7 +54,9 @@ def formsemestre_get_ics_url(context, sem): Par exemple: https://example.fr/agenda/{sem[etapes][0]} """ - ics_url_tmpl = sco_preferences.get_preference(context, "edt_sem_ics_url", sem["formsemestre_id"]) + ics_url_tmpl = sco_preferences.get_preference( + context, "edt_sem_ics_url", sem["formsemestre_id"] + ) if not ics_url_tmpl: return None try: @@ -163,7 +167,8 @@ def experimental_calendar(context, group_id=None, formsemestre_id=None, REQUEST= """experimental page""" return "\n".join( [ - html_sco_header.sco_header(context, + html_sco_header.sco_header( + context, REQUEST, javascripts=[ "libjs/purl.js", diff --git a/app/scodoc/sco_entreprises.py b/app/scodoc/sco_entreprises.py index c5f5fdd9..eae5b31d 100644 --- a/app/scodoc/sco_entreprises.py +++ b/app/scodoc/sco_entreprises.py @@ -30,8 +30,8 @@ # codes anciens déplacés de ZEntreprise import datetime -import sco_utils as scu -import notesdb as ndb +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb from notesdb import ScoDocCursor, EditableTable, DateISOtoDMY, DateDMYtoISO diff --git a/app/scodoc/sco_etape_apogee.py b/app/scodoc/sco_etape_apogee.py index 04b2aa89..a18ba57e 100644 --- a/app/scodoc/sco_etape_apogee.py +++ b/app/scodoc/sco_etape_apogee.py @@ -77,15 +77,10 @@ import re -import sco_utils as scu -from notes_log import log -import sco_formsemestre -import notes_table -import sco_groups -import sco_groups_view -import sco_archives -import sco_apogee_csv -from sco_exceptions import ScoValueError +import app.scodoc.sco_utils as scu +from app.scodoc import sco_archives +from app.scodoc import sco_apogee_csv +from app.scodoc.sco_exceptions import ScoValueError class ApoCSVArchiver(sco_archives.BaseArchiver): @@ -365,12 +360,12 @@ def apo_csv_retreive_etuds_by_nip(context, semset, nips): Tests: from debug import * -import sco_groups -import sco_groups_view -import sco_formsemestre -from sco_etape_apogee import * -from sco_apogee_csv import * -from sco_semset import * +from app.scodoc import sco_groups +from app.scodoc import sco_groups_view +from app.scodoc import sco_formsemestre +from app.scodoc.sco_etape_apogee import * +from app.scodoc.sco_apogee_csv import * +from app.scodoc.sco_semset import * context = go_dept(app, 'RT').Notes csv_data = open('/opt/misc/VDTRT_V1RT.TXT').read() @@ -413,7 +408,7 @@ self=e col_id='apoL_c0129' # -- -import sco_portal_apogee +from app.scodoc import sco_portal_apogee context = go_dept(app, 'GEA').Notes #csv_data = sco_portal_apogee.get_maquette_apogee(context, etape='V1GE', annee_scolaire=2015) csv_data = open('/tmp/V1GE.txt').read() @@ -424,12 +419,12 @@ apo_data = sco_apogee_csv.ApoData(csv_data, periode=1) # les elements inconnus: from debug import * -import sco_groups -import sco_groups_view -import sco_formsemestre -from sco_etape_apogee import * -from sco_apogee_csv import * -from sco_semset import * +from app.scodoc import sco_groups +from app.scodoc import sco_groups_view +from app.scodoc import sco_formsemestre +from app.scodoc.sco_etape_apogee import * +from app.scodoc.sco_apogee_csv import * +from app.scodoc.sco_semset import * context = go_dept(app, 'RT').Notes csv_data = open('/opt/misc/V2RT.csv').read() @@ -447,12 +442,12 @@ for e in apo_data.etuds: # ------ # test export jury intermediaire from debug import * -import sco_groups -import sco_groups_view -import sco_formsemestre -from sco_etape_apogee import * -from sco_apogee_csv import * -from sco_semset import * +from app.scodoc import sco_groups +from app.scodoc import sco_groups_view +from app.scodoc import sco_formsemestre +from app.scodoc.sco_etape_apogee import * +from app.scodoc.sco_apogee_csv import * +from app.scodoc.sco_semset import * context = go_dept(app, 'CJ').Notes csv_data = open('/opt/scodoc/var/scodoc/archives/apo_csv/CJ/2016-1/2017-03-06-21-46-32/V1CJ.csv').read() diff --git a/app/scodoc/sco_etape_apogee_view.py b/app/scodoc/sco_etape_apogee_view.py index 25823ab9..2eeca7c2 100644 --- a/app/scodoc/sco_etape_apogee_view.py +++ b/app/scodoc/sco_etape_apogee_view.py @@ -31,19 +31,23 @@ from cStringIO import StringIO from zipfile import ZipFile -import sco_utils as scu -from notes_log import log -import sco_formsemestre -import sco_formsemestre_status -import notes_table -from gen_tables import GenTable -import sco_semset -import sco_etape_apogee -import sco_apogee_csv -import sco_portal_apogee -from sco_apogee_csv import APO_PORTAL_ENCODING, APO_INPUT_ENCODING -import sco_archives -from sco_exceptions import ScoValueError +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc import html_sco_header +from app.scodoc import notes_table +from app.scodoc import sco_apogee_csv +from app.scodoc import sco_archives +from app.scodoc import sco_etape_apogee +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_status +from app.scodoc import sco_portal_apogee +from app.scodoc import sco_preferences +from app.scodoc import sco_semset +from app.scodoc import sco_etud +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_apogee_csv import APO_PORTAL_ENCODING, APO_INPUT_ENCODING +from app.scodoc.sco_exceptions import ScoValueError def apo_semset_maq_status( @@ -342,7 +346,10 @@ def apo_semset_maq_status( if missing: formation_ids = {sem["formation_id"] for sem in semset.sems} - formations = [sco_formations.formation_list(context, formation_id=i)[0] for i in formation_ids] + formations = [ + sco_formations.formation_list(context, formation_id=i)[0] + for i in formation_ids + ] # log('formations=%s' % formations) H.append( '

Elements Apogée absents dans ScoDoc: %s' @@ -498,7 +505,7 @@ def view_apo_etuds(context, semset_id, title="", nips=[], format="html", REQUEST etuds = sco_etape_apogee.apo_csv_retreive_etuds_by_nip(context, semset, nips) # Ils sont parfois dans ScoDoc même si pas dans le semestre: essaie de les retrouver for etud in etuds.values(): - etud_sco = scolars.get_etud_info(code_nip=etud["nip"], filled=True) + etud_sco = sco_etud.get_etud_info(code_nip=etud["nip"], filled=True) if etud_sco: e = etud_sco[0] etud["inscriptions_scodoc"] = ", ".join( @@ -529,12 +536,12 @@ def view_scodoc_etuds( if type(etudids) != type([]): etudids = [etudids] etuds = [ - scolars.get_etud_info(etudid=etudid, filled=True)[0] for etudid in etudids + sco_etud.get_etud_info(etudid=etudid, filled=True)[0] for etudid in etudids ] elif nips is not None: if type(nips) != type([]): nips = [nips] - etuds = [scolars.get_etud_info(code_nip=nip, filled=True)[0] for nip in nips] + etuds = [sco_etud.get_etud_info(code_nip=nip, filled=True)[0] for nip in nips] else: raise ValueError("etudid or NIP must be specified") @@ -752,7 +759,7 @@ def view_apo_csv(context, etape_apo="", semset_id="", format="html", REQUEST=Non e["in_scodoc_str"] = {True: "oui", False: "non"}[e["in_scodoc"]] if e["in_scodoc"]: e["_in_scodoc_str_target"] = "ficheEtud?code_nip=" + e["nip"] - e.update(scolars.get_etud_info(code_nip=e["nip"], filled=True)[0]) + e.update(sco_etud.get_etud_info(code_nip=e["nip"], filled=True)[0]) e["_nom_td_attrs"] = 'id="%s" class="etudinfo"' % (e["etudid"],) e["_prenom_td_attrs"] = 'id="pre-%s" class="etudinfo"' % (e["etudid"],) else: diff --git a/app/scodoc/sco_etape_bilan.py b/app/scodoc/sco_etape_bilan.py index 7dcdcda8..94ee49b8 100644 --- a/app/scodoc/sco_etape_bilan.py +++ b/app/scodoc/sco_etape_bilan.py @@ -92,10 +92,10 @@ Le filtrage s'effctue sur la date et non plus sur la parité du semestre (1-3/2- import json -from sco_portal_apogee import get_inscrits_etape -from notes_log import log -from sco_utils import annee_scolaire_debut -from gen_tables import GenTable +from app.scodoc.sco_portal_apogee import get_inscrits_etape +from app.scodoc.notes_log import log +from app.scodoc.sco_utils import annee_scolaire_debut +from app.scodoc.gen_tables import GenTable COL_PREFIX = "COL_" diff --git a/app/scodoc/scolars.py b/app/scodoc/sco_etud.py similarity index 94% rename from app/scodoc/scolars.py rename to app/scodoc/sco_etud.py index 3f632cae..e3d051d5 100644 --- a/app/scodoc/scolars.py +++ b/app/scodoc/sco_etud.py @@ -27,54 +27,45 @@ """ Accès donnees etudiants """ + +# Ancien module "scolars" + import time -import mails -import sco_utils as scu -from sco_utils import SCO_ENCODING -import notesdb as ndb -from sco_exceptions import ScoGenError, ScoValueError -from notesdb import ( - EditableTable, - ScoDocCursor, - DateDMYtoISO, - DateISOtoDMY, - int_null_is_null, -) -from notes_log import log -from TrivialFormulator import TrivialFormulator -import safehtml -from scolog import logdb - -# from notes_table import * -import sco_news - -# XXXXXXXXX HACK: zope 2.7.7 bug turaround ? -import locale - -locale.setlocale(locale.LC_ALL, ("en_US", SCO_ENCODING)) - from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from email.header import Header from email.mime.base import MIMEBase -abbrvmonthsnames = [ +from app.scodoc import mails +import app.scodoc.sco_utils as scu +from app.scodoc.sco_utils import SCO_ENCODING +import app.scodoc.notesdb as ndb +from app.scodoc.sco_exceptions import ScoGenError, ScoValueError + +from app.scodoc.notes_log import log +from app.scodoc.TrivialFormulator import TrivialFormulator +from app.scodoc import safehtml +from app.scodoc import sco_formsemestre +from app.scodoc import sco_preferences +from app.scodoc.scolog import logdb + +MONTH_NAMES_ABBREV = [ "Jan ", - "Fev ", + "Fév ", "Mars", "Avr ", "Mai ", "Juin", "Jul ", - "Aout", + "Août", "Sept", "Oct ", "Nov ", - "Dec ", + "Déc ", ] -monthsnames = [ +MONTH_NAMES = [ "janvier", "février", "mars", @@ -82,7 +73,7 @@ monthsnames = [ "mai", "juin", "juillet", - "aout", + "août", "septembre", "octobre", "novembre", @@ -252,7 +243,7 @@ def pivot_year(y): return y -_identiteEditor = EditableTable( +_identiteEditor = ndb.EditableTable( "identite", "etudid", ( @@ -277,9 +268,9 @@ _identiteEditor = EditableTable( "nom": force_uppercase, "prenom": force_uppercase, "civilite": input_civilite, - "date_naissance": DateDMYtoISO, + "date_naissance": ndb.DateDMYtoISO, }, - output_formators={"date_naissance": DateISOtoDMY}, + output_formators={"date_naissance": ndb.DateISOtoDMY}, convert_null_outputs_to_empty=True, allow_set_id=True, # car on specifie le code Apogee a la creation ) @@ -320,7 +311,7 @@ def check_nom_prenom(cnx, nom="", prenom="", etudid=None): if scu.FORBIDDEN_CHARS_EXP.search(nom) or scu.FORBIDDEN_CHARS_EXP.search(prenom): return False, 0 # Now count homonyms: - cursor = cnx.cursor(cursor_factory=ScoDocCursor) + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) req = "select etudid from identite where lower(nom) ~ %(nom)s and lower(prenom) ~ %(prenom)s" if etudid: req += " and etudid <> %(etudid)s" @@ -400,7 +391,7 @@ def identite_edit(cnx, args, context=None, REQUEST=None): # Notification du changement par e-mail: if notify_to: - etud = getEtudInfo(context, etudid=args["etudid"], filled=True)[0] + etud = get_etud_info(etudid=args["etudid"], filled=True)[0] after = identite_list(cnx, {"etudid": args["etudid"]})[0] notify_etud_change( context, @@ -467,7 +458,7 @@ def notify_etud_change(context, email_addr, etud, before, after, subject): # Note: la table adresse n'est pas dans dans la table "identite" # car on prevoit plusieurs adresses par etudiant (ie domicile, entreprise) -_adresseEditor = EditableTable( +_adresseEditor = ndb.EditableTable( "adresse", "adresse_id", ( @@ -514,7 +505,7 @@ def adresse_edit(cnx, args, context=None): # Notification du changement par e-mail: if notify_to: - etud = getEtudInfo(context, etudid=args["etudid"], filled=True)[0] + etud = get_etud_info(etudid=args["etudid"], filled=True)[0] after = adresse_list(cnx, {"etudid": args["etudid"]})[0] notify_etud_change( context, @@ -536,7 +527,7 @@ def getEmail(cnx, etudid): # --------- -_admissionEditor = EditableTable( +_admissionEditor = ndb.EditableTable( "admissions", "adm_id", ( @@ -572,8 +563,8 @@ _admissionEditor = EditableTable( "bac": force_uppercase, "specialite": force_uppercase, "annee_bac": pivot_year, - "classement": int_null_is_null, - "apb_classsment_gr": int_null_is_null, + "classement": ndb.int_null_is_null, + "apb_classement_gr": ndb.int_null_is_null, }, output_formators={"type_admission": lambda x: x or scu.TYPE_ADMISSION_DEFAULT}, convert_null_outputs_to_empty=True, @@ -663,10 +654,10 @@ def get_etud_info(etudid=False, code_nip=False, filled=False, REQUEST=None): return [] cnx = ndb.GetDBConnexion() args = make_etud_args(etudid=etudid, code_nip=code_nip, REQUEST=REQUEST) - etud = scolars.etudident_list(cnx, args=args) + etud = etudident_list(cnx, args=args) if filled: - fillEtudsInfo(context, etud) + fill_etuds_info(etud) return etud @@ -679,6 +670,8 @@ def create_etud(context, cnx, args={}, REQUEST=None): Returns: etud, l'étudiant créé. """ + from app.scodoc import sco_news + # creation d'un etudiant etudid = etudident_create(cnx, args, context=context, REQUEST=REQUEST) # crée une adresse vide (chaque etudiant doit etre dans la table "adresse" !) @@ -710,7 +703,7 @@ def create_etud(context, cnx, args={}, REQUEST=None): msg="creation initiale", ) etud = etudident_list(cnx, {"etudid": etudid})[0] - fillEtudsInfo(context, [etud]) + fill_etuds_info([etud]) etud["url"] = "ficheEtud?etudid=%(etudid)s" % etud sco_news.add( context, @@ -724,7 +717,7 @@ def create_etud(context, cnx, args={}, REQUEST=None): # ---------- "EVENTS" -_scolar_eventsEditor = EditableTable( +_scolar_eventsEditor = ndb.EditableTable( "scolar_events", "event_id", ( @@ -738,8 +731,8 @@ _scolar_eventsEditor = EditableTable( ), sortkey="event_date", convert_null_outputs_to_empty=True, - output_formators={"event_date": DateISOtoDMY}, - input_formators={"event_date": DateDMYtoISO}, + output_formators={"event_date": ndb.DateISOtoDMY}, + input_formators={"event_date": ndb.DateDMYtoISO}, ) # scolar_events_create = _scolar_eventsEditor.create @@ -754,7 +747,7 @@ def scolar_events_create(cnx, args): # -------- -_etud_annotationsEditor = EditableTable( +_etud_annotationsEditor = ndb.EditableTable( "etud_annotations", "id", ( @@ -768,7 +761,7 @@ _etud_annotationsEditor = EditableTable( ), sortkey="date desc", convert_null_outputs_to_empty=True, - output_formators={"comment": safehtml.HTML2SafeHTML, "date": DateISOtoDMY}, + output_formators={"comment": safehtml.HTML2SafeHTML, "date": ndb.DateISOtoDMY}, ) @@ -792,7 +785,7 @@ def add_annotations_to_etud_list(context, etuds): # -------- APPRECIATIONS (sur bulletins) ------------------- # Les appreciations sont dans la table postgres notes_appreciations -_appreciationsEditor = EditableTable( +_appreciationsEditor = ndb.EditableTable( "notes_appreciations", "id", ( @@ -807,7 +800,7 @@ _appreciationsEditor = EditableTable( ), sortkey="date desc", convert_null_outputs_to_empty=True, - output_formators={"comment": safehtml.HTML2SafeHTML, "date": DateISOtoDMY}, + output_formators={"comment": safehtml.HTML2SafeHTML, "date": ndb.DateISOtoDMY}, ) appreciations_create = _appreciationsEditor.create @@ -903,11 +896,14 @@ def list_scolog(context, etudid): return cursor.dictfetchall() -def fillEtudsInfo(context, etuds): +def fill_etuds_info(etuds): """etuds est une liste d'etudiants (mappings) Pour chaque etudiant, ajoute ou formatte les champs -> informations pour fiche etudiant ou listes diverses """ + from app.scodoc import sco_formsemestre_inscriptions + + context = None # XXX en attendant la suppression du context ScoDoc7 cnx = ndb.GetDBConnexion() # open('/tmp/t','w').write( str(etuds) ) for etud in etuds: @@ -921,12 +917,14 @@ def fillEtudsInfo(context, etuds): else: adr = adrs[0] if len(adrs) > 1: - log("fillEtudsInfo: etudid=%s a %d adresses" % (etudid, len(adrs))) + log("fill_etuds_info: etudid=%s a %d adresses" % (etudid, len(adrs))) etud.update(adr) format_etud_ident(etud) # Semestres dans lesquel il est inscrit - ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, {"etudid": etudid}) + ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, {"etudid": etudid} + ) etud["ins"] = ins sems = [] cursem = None # semestre "courant" ou il est inscrit @@ -1020,7 +1018,7 @@ def descr_situation_etud(context, etudid, ne=""): if r["etat"] == "I": situation = "inscrit%s en %s" % (ne, sem["titremois"]) # Cherche la date d'inscription dans scolar_events: - events = scolars.scolar_events_list( + events = scolar_events_list( cnx, args={ "etudid": etudid, @@ -1040,7 +1038,7 @@ def descr_situation_etud(context, etudid, ne=""): else: situation = "démission de %s" % sem["titremois"] # Cherche la date de demission dans scolar_events: - events = scolars.scolar_events_list( + events = scolar_events_list( cnx, args={ "etudid": etudid, diff --git a/app/scodoc/sco_evaluations.py b/app/scodoc/sco_evaluations.py index 6cd0b67d..bbe98c2c 100644 --- a/app/scodoc/sco_evaluations.py +++ b/app/scodoc/sco_evaluations.py @@ -32,21 +32,25 @@ import urllib import operator import datetime -from notes_log import log, logCallStack -import sco_utils as scu -import notesdb as ndb -from notesdb import ScoDocCursor -from sco_exceptions import AccessDenied, ScoValueError -import VERSION -from gen_tables import GenTable -from TrivialFormulator import TrivialFormulator -import sco_news -import sco_formsemestre -import sco_moduleimpl -import sco_groups -import sco_abs -import sco_evaluations -import sco_saisie_notes +from app.scodoc.notes_log import log, logCallStack +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.sco_exceptions import AccessDenied, ScoValueError +from app.scodoc import VERSION +from app.scodoc.gen_tables import GenTable +from app.scodoc.TrivialFormulator import TrivialFormulator +from app.scodoc import html_sco_header +from app.scodoc import sco_abs +from app.scodoc import sco_core +from app.scodoc import sco_edit_module +from app.scodoc import sco_edit_ue +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_news +from app.scodoc import sco_permissions_check +from app.scodoc import sco_preferences + # -------------------------------------------------------------------- # @@ -170,7 +174,7 @@ def do_evaluation_list_in_formsemestre(context, formsemestre_id): mods = sco_moduleimpl.do_moduleimpl_list(context, formsemestre_id=formsemestre_id) evals = [] for mod in mods: - evals += sco_evaluations.do_evaluation_list( + evals += do_evaluation_list( context, args={"moduleimpl_id": mod["moduleimpl_id"]} ) return evals @@ -201,7 +205,7 @@ def do_evaluation_delete(context, REQUEST, evaluation_id): if not the_evals: raise ValueError("evaluation inexistante !") - NotesDB = context._notes_getall(evaluation_id) # { etudid : value } + NotesDB = do_evaluation_get_all_notes(context, evaluation_id) # { etudid : value } notes = [x["value"] for x in NotesDB.values()] if notes: raise ScoValueError( @@ -251,7 +255,7 @@ def do_evaluation_etat( context, evaluation_id, getallstudents=True ) ) - NotesDB = context._notes_getall(evaluation_id) # { etudid : value } + NotesDB = do_evaluation_get_all_notes(context, evaluation_id) # { etudid : value } notes = [x["value"] for x in NotesDB.values()] nb_abs = len([x for x in notes if x is None]) nb_neutre = len([x for x in notes if x == scu.NOTES_NEUTRALISE]) @@ -458,7 +462,7 @@ def do_evaluation_list_in_sem(context, formsemestre_id): """ req = "select E.* from notes_evaluation E, notes_moduleimpl MI where MI.formsemestre_id = %(formsemestre_id)s and MI.moduleimpl_id = E.moduleimpl_id order by moduleimpl_id, numero desc, jour desc, heure_debut desc" cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ScoDocCursor) + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) cursor.execute(req, {"formsemestre_id": formsemestre_id}) res = cursor.dictfetchall() # etat de chaque evaluation: @@ -469,15 +473,44 @@ def do_evaluation_list_in_sem(context, formsemestre_id): return res -# remplacé par nt.get_sem_evaluation_etat_list() -# -# def formsemestre_evaluations_list(context, formsemestre_id): -# """Liste (non triée) des evals pour ce semestre""" -# req = "select E.* from notes_evaluation E, notes_moduleimpl MI where MI.formsemestre_id = %(formsemestre_id)s and MI.moduleimpl_id = E.moduleimpl_id" -# cnx = ndb.GetDBConnexion() -# cursor = cnx.cursor(cursor_factory=ScoDocCursor) -# cursor.execute( req, { 'formsemestre_id' : formsemestre_id } ) -# return cursor.dictfetchall() +# ancien _notes_getall +def do_evaluation_get_all_notes( + context, evaluation_id, table="notes_notes", filter_suppressed=True, by_uid=None +): + """Toutes les notes pour une evaluation: { etudid : { 'value' : value, 'date' : date ... }} + Attention: inclut aussi les notes des étudiants qui ne sont plus inscrits au module. + """ + # log('do_evaluation_get_all_notes( e=%s fs=%s )' % (evaluation_id, filter_suppressed)) + do_cache = ( + filter_suppressed and table == "notes_notes" and (by_uid is None) + ) # pas de cache pour (rares) appels via undo_notes ou specifiant un enseignant + if do_cache: + cache = sco_core.get_evaluations_cache(context) + r = cache.get(evaluation_id) + if r != None: + return r + cnx = ndb.GetDBConnexion() + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) + cond = " where evaluation_id=%(evaluation_id)s" + if by_uid: + cond += " and uid=%(by_uid)s" + + cursor.execute( + "select * from " + table + cond, + {"evaluation_id": evaluation_id, "by_uid": by_uid}, + ) + res = cursor.dictfetchall() + d = {} + if filter_suppressed: + for x in res: + if x["value"] != scu.NOTES_SUPPRESS: + d[x["etudid"]] = x + else: + for x in res: + d[x["etudid"]] = x + if do_cache: + cache.set(evaluation_id, d) + return d def _eval_etat(evals): @@ -601,7 +634,7 @@ def formsemestre_evaluations_cal(context, formsemestre_id, REQUEST=None): e[2] = color_futur CalHTML = sco_abs.YearTable( - context.Absences, year, events=events.values(), halfday=False, pad_width=None + context, year, events=events.values(), halfday=False, pad_width=None ) H = [ @@ -649,9 +682,11 @@ def evaluation_date_first_completion(context, evaluation_id): # retire de insem ceux qui ne sont pas inscrits au module # ins = [i for i in insem if i["etudid"] in insmodset] - notes = context._notes_getall(evaluation_id, filter_suppressed=False).values() - notes_log = context._notes_getall( - evaluation_id, filter_suppressed=False, table="notes_notes_log" + notes = do_evaluation_get_all_notes( + context, evaluation_id, filter_suppressed=False + ).values() + notes_log = do_evaluation_get_all_notes( + context, evaluation_id, filter_suppressed=False, table="notes_notes_log" ).values() date_premiere_note = {} # etudid : date for note in notes + notes_log: @@ -853,6 +888,8 @@ def evaluation_describe(context, evaluation_id="", edit_in_place=True, REQUEST=N """HTML description of evaluation, for page headers edit_in_place: allow in-place editing when permitted (not implemented) """ + from app.scodoc import sco_saisie_notes + E = do_evaluation_list(context, {"evaluation_id": evaluation_id})[0] moduleimpl_id = E["moduleimpl_id"] M = sco_moduleimpl.do_moduleimpl_list(context, moduleimpl_id=moduleimpl_id)[0] @@ -861,7 +898,7 @@ def evaluation_describe(context, evaluation_id="", edit_in_place=True, REQUEST=N u = context.Users.user_info(M["responsable_id"]) resp = u["prenomnom"] nomcomplet = u["nomcomplet"] - can_edit = sco_saisie_notes.can_edit_notes( + can_edit = sco_permissions_check.can_edit_notes( context, REQUEST.AUTHENTICATED_USER, moduleimpl_id, allow_ens=False ) @@ -1038,9 +1075,7 @@ def evaluation_create_form( if not readonly: H = ["

%svaluation en %s

" % (action, mod_descr)] else: - return sco_evaluations.evaluation_describe( - context, evaluation_id, REQUEST=REQUEST - ) + return evaluation_describe(context, evaluation_id, REQUEST=REQUEST) heures = ["%02dh%02d" % (h, m) for h in range(8, 19) for m in (0, 30)] # diff --git a/app/scodoc/sco_excel.py b/app/scodoc/sco_excel.py index 29cd2b16..a3d6bcbf 100644 --- a/app/scodoc/sco_excel.py +++ b/app/scodoc/sco_excel.py @@ -28,18 +28,17 @@ """ Excel file handling """ +import time, datetime +from types import StringType, IntType, FloatType, LongType from pyExcelerator import * -from notes_log import log -from scolog import logdb +import app.scodoc.sco_utils as scu +from app.scodoc import notesdb +from app.scodoc.notes_log import log +from app.scodoc.scolog import logdb +from app.scodoc.sco_exceptions import ScoValueError -from sco_exceptions import ScoValueError -import sco_utils as scu -import notesdb - -import time, datetime -from types import StringType, IntType, FloatType, LongType # colors, voir exemple format.py COLOR_CODES = { diff --git a/app/scodoc/sco_export_results.py b/app/scodoc/sco_export_results.py index 25f02ef4..936498f4 100644 --- a/app/scodoc/sco_export_results.py +++ b/app/scodoc/sco_export_results.py @@ -29,20 +29,20 @@ """ from types import ListType -import notesdb as ndb -import sco_utils as scu -from notes_log import log -import scolars -import sco_bac -import sco_formsemestre -import sco_parcours_dut -import sco_codes_parcours -from sco_codes_parcours import NO_SEMESTRE_ID -import sco_excel -from gen_tables import GenTable -import sco_pvjury -import html_sco_header -import VERSION +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc import html_sco_header +from app.scodoc import sco_bac +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_formations +from app.scodoc import sco_preferences +from app.scodoc import sco_pvjury +from app.scodoc import sco_etud +from app.scodoc import VERSION +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_codes_parcours import NO_SEMESTRE_ID def _build_results_table(context, start_date=None, end_date=None, types_parcours=[]): @@ -62,8 +62,8 @@ def _build_results_table(context, start_date=None, end_date=None, types_parcours semlist = [dpv["formsemestre"] for dpv in dpv_by_sem.values() if dpv] semlist_parcours = [] for sem in semlist: - sem["formation"] = sco_formations.formation_list(context, - args={"formation_id": sem["formation_id"]} + sem["formation"] = sco_formations.formation_list( + context, args={"formation_id": sem["formation_id"]} )[0] sem["parcours"] = sco_codes_parcours.get_parcours_from_code( sem["formation"]["type_parcours"] @@ -83,7 +83,7 @@ def _build_results_table(context, start_date=None, end_date=None, types_parcours etudids = nt.get_etudids() for etudid in etudids: if etudid not in etuds_infos: # pas encore traité ? - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] for sem in etud["sems"]: # le plus récent d'abord if sem["formsemestre_id"] in formsemestre_ids_parcours: etuds_infos[etudid] = { @@ -337,10 +337,10 @@ _DATE_FORM = """ """ # /opt/scodoc/bin/zopectl debug from debug import * -from sco_export_results import * +from app.scodoc.sco_export_results import * context = go_dept(app, 'RT').Notes etudid = 'EID27764' -etud = scolars.get_etud_info( etudid=etudid, filled=True)[0] +etud = sco_etud.get_etud_info( etudid=etudid, filled=True)[0] start_date='2015-08-15' end_date='2017-08-31' diff --git a/app/scodoc/sco_find_etud.py b/app/scodoc/sco_find_etud.py index 676680d5..d5994b5a 100644 --- a/app/scodoc/sco_find_etud.py +++ b/app/scodoc/sco_find_etud.py @@ -27,19 +27,15 @@ """Recherche d'étudiants """ -from types import ListType -import xml.dom.minidom -import sco_utils as scu - -import notesdb as ndb -from notes_log import log -from gen_tables import GenTable -import html_sco_header -import scolars -import sco_formsemestre -import sco_groups -from sco_permissions import ScoView +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.gen_tables import GenTable +from app.scodoc import html_sco_header +from app.scodoc import sco_etud +from app.scodoc import sco_groups +from app.scodoc.sco_permissions import Permission +from app.scodoc import sco_preferences def form_search_etud( @@ -110,7 +106,7 @@ def search_etud_in_dept(context, expnom="", REQUEST=None): """ dest_url = "ficheEtud" if len(expnom) > 1: - etuds = scolars.get_etud_info(filled=1, etudid=expnom, REQUEST=REQUEST) + etuds = sco_etud.get_etud_info(filled=1, etudid=expnom, REQUEST=REQUEST) if len(etuds) != 1: if scu.is_valid_code_nip(expnom): etuds = search_etuds_infos(context, code_nip=expnom, REQUEST=REQUEST) @@ -194,14 +190,14 @@ def search_etuds_infos(context, expnom=None, code_nip=None, REQUEST=None): cnx = ndb.GetDBConnexion() if expnom and not may_be_nip: expnom = scu.strupper(expnom) # les noms dans la BD sont en uppercase - etuds = scolars.etudident_list(cnx, args={"nom": expnom}, test="~") + etuds = sco_etud.etudident_list(cnx, args={"nom": expnom}, test="~") else: code_nip = code_nip or expnom if code_nip: - etuds = scolars.etudident_list(cnx, args={"code_nip": code_nip}) + etuds = sco_etud.etudident_list(cnx, args={"code_nip": code_nip}) else: etuds = [] - scolars.fillEtudsInfo(context, etuds) + sco_etud.fill_etuds_info(etuds) return etuds @@ -230,7 +226,7 @@ def search_etud_by_name(context, term, REQUEST=None): data = [ { "label": "%s %s %s" - % (x["code_nip"], x["nom"], scolars.format_prenom(x["prenom"])), + % (x["code_nip"], x["nom"], sco_etud.format_prenom(x["prenom"])), "value": x["code_nip"], } for x in r @@ -244,7 +240,7 @@ def search_etud_by_name(context, term, REQUEST=None): data = [ { - "label": "%s %s" % (x["nom"], scolars.format_prenom(x["prenom"])), + "label": "%s %s" % (x["nom"], sco_etud.format_prenom(x["prenom"])), "value": x["etudid"], } for x in r diff --git a/app/scodoc/sco_formations.py b/app/scodoc/sco_formations.py index 385e787e..878cede7 100644 --- a/app/scodoc/sco_formations.py +++ b/app/scodoc/sco_formations.py @@ -30,19 +30,21 @@ from operator import itemgetter import xml.dom.minidom -import sco_utils as scu +import app.scodoc.sco_utils as scu -import notesdb as ndb -from notes_log import log -import sco_codes_parcours -import sco_formsemestre -import sco_tag_module -import sco_preferences -from gen_tables import GenTable -from sco_exceptions import ScoValueError -from sco_permissions import ScoChangeFormation -from sco_permissions import Permission -import VERSION +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_formsemestre +from app.scodoc import sco_tag_module +from app.scodoc import sco_preferences +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_permissions import Permission +from app.scodoc import VERSION +from app.scodoc import sco_edit_matiere +from app.scodoc import sco_edit_module +from app.scodoc import sco_edit_ue _formationEditor = ndb.EditableTable( "notes_formations", diff --git a/app/scodoc/sco_formsemestre.py b/app/scodoc/sco_formsemestre.py index e3896a78..84264eed 100644 --- a/app/scodoc/sco_formsemestre.py +++ b/app/scodoc/sco_formsemestre.py @@ -29,14 +29,16 @@ """ import time -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from gen_tables import GenTable +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.gen_tables import GenTable -import sco_codes_parcours -from sco_codes_parcours import NO_SEMESTRE_ID -from sco_exceptions import ScoValueError +from app.scodoc import sco_codes_parcours +from app.scodoc.sco_codes_parcours import NO_SEMESTRE_ID +from app.scodoc import sco_core +from app.scodoc import sco_preferences +from app.scodoc.sco_exceptions import ScoValueError _formsemestreEditor = ndb.EditableTable( "notes_formsemestre", @@ -129,7 +131,7 @@ def formsemestre_enrich(context, sem): """Ajoute champs souvent utiles: titre + annee et dateord (pour tris)""" # imports ici pour eviter refs circulaires import sco_formsemestre_edit - import scolars + import sco_etud from app.views import notes F = notes.formation_list(context, args={"formation_id": sem["formation_id"]})[0] @@ -184,7 +186,7 @@ def formsemestre_enrich(context, sem): sem["titreannee"] += "-" + annee_fin sem["annee"] += "-" + annee_fin # et les dates sous la forme "oct 2007 - fev 2008" - months = scolars.abbrvmonthsnames + months = sco_etud.MONTH_NAMES_ABBREV if mois_debut: mois_debut = months[int(mois_debut) - 1] if mois_fin: diff --git a/app/scodoc/sco_formsemestre_custommenu.py b/app/scodoc/sco_formsemestre_custommenu.py index 9e360810..0588a7fd 100644 --- a/app/scodoc/sco_formsemestre_custommenu.py +++ b/app/scodoc/sco_formsemestre_custommenu.py @@ -29,13 +29,13 @@ """ -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF -import sco_formsemestre -import sco_formsemestre_status -import sco_edt_cal +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.TrivialFormulator import TrivialFormulator +from app.scodoc import html_sco_header +from app.scodoc import htmlutils +from app.scodoc import sco_formsemestre +from app.scodoc import sco_edt_cal _custommenuEditor = ndb.EditableTable( "notes_formsemestre_custommenu", @@ -73,7 +73,7 @@ def formsemestre_custommenu_html(context, formsemestre_id): "args": {"formsemestre_id": formsemestre_id}, } ) - return sco_formsemestre_status.htmlutils.make_menu("Liens", menu) + return htmlutils.make_menu("Liens", menu) def formsemestre_custommenu_edit(context, formsemestre_id, REQUEST=None): diff --git a/app/scodoc/sco_formsemestre_edit.py b/app/scodoc/sco_formsemestre_edit.py index 76dd03c3..4e3cb6d2 100644 --- a/app/scodoc/sco_formsemestre_edit.py +++ b/app/scodoc/sco_formsemestre_edit.py @@ -28,25 +28,31 @@ """Form choix modules / responsables et creation formsemestre """ -import notesdb as ndb -import sco_utils as scu -import sco_core -import sco_groups -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF -import notes_table -from sco_exceptions import AccessDenied, ScoValueError -from sco_formsemestre import ApoEtapeVDI -from sco_permissions import Permission -import sco_codes_parcours -import sco_compute_moy -import sco_formsemestre -import sco_modalites -import sco_moduleimpl -import sco_parcours_dut -import sco_portal_apogee -import sco_preferences -import scolars +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc import sco_core +from app.scodoc import sco_groups +from app.scodoc.notes_log import log +from app.scodoc.TrivialFormulator import TrivialFormulator, TF +from app.scodoc.sco_exceptions import AccessDenied, ScoValueError +from app.scodoc.sco_formsemestre import ApoEtapeVDI +from app.scodoc.sco_permissions import Permission +from app.scodoc import html_sco_header +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_compute_moy +from app.scodoc import sco_edit_matiere +from app.scodoc import sco_edit_module +from app.scodoc import sco_edit_ue +from app.scodoc import sco_evaluations +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_modalites +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_permissions_check +from app.scodoc import sco_portal_apogee +from app.scodoc import sco_preferences +from app.scodoc import sco_etud def _default_sem_title(F): @@ -1219,11 +1225,11 @@ def _reassociate_moduleimpls( mod["module_id"] = modules_old2new[mod["module_id"]] sco_moduleimpl.do_moduleimpl_edit(context, mod, formsemestre_id=formsemestre_id) # update decisions: - events = scolars.scolar_events_list(cnx, args={"formsemestre_id": formsemestre_id}) + events = sco_etud.scolar_events_list(cnx, args={"formsemestre_id": formsemestre_id}) for e in events: if e["ue_id"]: e["ue_id"] = ues_old2new[e["ue_id"]] - scolars.scolar_events_edit(cnx, e) + sco_etud.scolar_events_edit(cnx, e) validations = sco_parcours_dut.scolar_formsemestre_validation_list( cnx, args={"formsemestre_id": formsemestre_id} ) @@ -1421,7 +1427,9 @@ def formsemestre_edit_options(context, formsemestre_id, target_url=None, REQUEST (accessible par ScoImplement ou dir. etudes) """ log("formsemestre_edit_options") - ok, err = context._check_access_diretud(formsemestre_id, REQUEST) + ok, err = sco_permissions_check.check_access_diretud( + context, formsemestre_id, REQUEST + ) if not ok: return err return sco_preferences.SemPreferences(context, formsemestre_id).edit( @@ -1435,7 +1443,9 @@ def formsemestre_change_lock( """Change etat (verrouille si ouvert, déverrouille si fermé) nota: etat (1 ouvert, 0 fermé) """ - ok, err = context._check_access_diretud(formsemestre_id, REQUEST) + ok, err = sco_permissions_check.check_access_diretud( + context, formsemestre_id, REQUEST + ) if not ok: return err sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) @@ -1475,7 +1485,9 @@ def formsemestre_change_publication_bul( context, formsemestre_id, REQUEST=None, dialog_confirmed=False ): """Change etat publication bulletins sur portail""" - ok, err = context._check_access_diretud(formsemestre_id, REQUEST) + ok, err = sco_permissions_check.check_access_diretud( + context, formsemestre_id, REQUEST + ) if not ok: return err sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) @@ -1515,8 +1527,12 @@ def formsemestre_change_publication_bul( def formsemestre_edit_uecoefs(context, formsemestre_id, err_ue_id=None, REQUEST=None): """Changement manuel des coefficients des UE capitalisées.""" + from app.scodoc import notes_table + context = context.Notes # si appele d'en haut, eg par exception ScoValueError - ok, err = context._check_access_diretud(formsemestre_id, REQUEST) + ok, err = sco_permissions_check.check_access_diretud( + context, formsemestre_id, REQUEST + ) if not ok: return err sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) diff --git a/app/scodoc/sco_formsemestre_exterieurs.py b/app/scodoc/sco_formsemestre_exterieurs.py index aecbc04a..1d09a858 100644 --- a/app/scodoc/sco_formsemestre_exterieurs.py +++ b/app/scodoc/sco_formsemestre_exterieurs.py @@ -31,29 +31,33 @@ On va créer/gérer des semestres de la même formation que le semestre ScoDoc où est inscrit l'étudiant, leur attribuer la modalité 'EXT'. Ces semestres n'auront qu'un seul inscrit ! """ -import TrivialFormulator -import sco_formsemestre -import sco_formsemestre_inscriptions -import sco_formsemestre_edit -import sco_formsemestre_validation -import sco_parcours_dut -import notesdb as ndb - -from sco_utils import log -import pprint import time +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.sco_utils import log +from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message +from app.scodoc import html_sco_header +from app.scodoc import sco_core +from app.scodoc import sco_edit_ue +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_formsemestre_validation +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_etud + def formsemestre_ext_create(context, etudid, sem_params, REQUEST=None): """Crée un formsemestre exterieur et y inscrit l'étudiant. sem_params: dict nécessaire à la création du formsemestre """ # Check args - _formation = sco_formations.formation_list(context, - args={"formation_id": sem_params["formation_id"]} + _formation = sco_formations.formation_list( + context, args={"formation_id": sem_params["formation_id"]} )[0] if etudid: - _etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + _etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] # Create formsemestre sem_params["modalite"] = "EXT" @@ -75,7 +79,7 @@ def formsemestre_ext_create(context, etudid, sem_params, REQUEST=None): def formsemestre_ext_create_form(context, etudid, formsemestre_id, REQUEST=None): """Formulaire creation/inscription à un semestre extérieur""" - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] H = [ html_sco_header.sco_header(context, REQUEST), """

Enregistrement d'une inscription antérieure dans un autre établissement

@@ -100,8 +104,8 @@ def formsemestre_ext_create_form(context, etudid, formsemestre_id, REQUEST=None) # et seulement si pas inscrit au même semestre_id d'un semestre ordinaire ScoDoc. # Les autres situations (eg redoublements en changeant d'établissement) # doivent être gérées par les validations de semestres "antérieurs" - insem = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, - args={"etudid": etudid, "etat": "I"} + insem = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, args={"etudid": etudid, "etat": "I"} ) semlist = [ sco_formsemestre.get_formsemestre(context, i["formsemestre_id"]) for i in insem @@ -172,7 +176,7 @@ def formsemestre_ext_create_form(context, etudid, formsemestre_id, REQUEST=None) ), ] - tf = TrivialFormulator.TrivialFormulator( + tf = TrivialFormulator( REQUEST.URL0, REQUEST.form, descr, @@ -214,7 +218,7 @@ def formsemestre_ext_edit_ue_validations( mais pas enregistrée. """ sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] ue_list = _list_ue_with_coef_and_validations(context, sem, etudid) descr = _ue_form_description(context, ue_list, REQUEST.form) if REQUEST and REQUEST.method == "GET": @@ -223,7 +227,7 @@ def formsemestre_ext_edit_ue_validations( } else: initvalues = {} - tf = TrivialFormulator.TrivialFormulator( + tf = TrivialFormulator( REQUEST.URL0, REQUEST.form, descr, @@ -267,7 +271,7 @@ def _make_page(context, etud, sem, tf, message="", REQUEST=None): page_title="Validation des UE d'un semestre extérieur", javascripts=["js/formsemestre_ext_edit_ue_validations.js"], ), - TrivialFormulator.tf_error_message(message), + tf_error_message(message), """

%(nomprenom)s est inscrit%(ne)s à ce semestre extérieur.

Voici les UE entregistrées avec leur notes et coefficients.

diff --git a/app/scodoc/sco_formsemestre_inscriptions.py b/app/scodoc/sco_formsemestre_inscriptions.py index 02acb2c5..3a45091c 100644 --- a/app/scodoc/sco_formsemestre_inscriptions.py +++ b/app/scodoc/sco_formsemestre_inscriptions.py @@ -27,22 +27,25 @@ """Opérations d'inscriptions aux semestres et modules """ +import time -import sco_utils as scu -from notes_log import log -from sco_exceptions import ScoValueError -from sco_permissions import ScoEtudInscrit -from sco_codes_parcours import UE_STANDARD, UE_SPORT, UE_TYPE_NAME -import notesdb as ndb -from notesdb import ScoDocCursor, DateISOtoDMY, DateDMYtoISO +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.scolog import logdb +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_codes_parcours import UE_STANDARD, UE_SPORT, UE_TYPE_NAME +import app.scodoc.notesdb as ndb +from app.scodoc.TrivialFormulator import TrivialFormulator, TF +from app.scodoc import sco_find_etud +from app.scodoc import sco_formsemestre +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_groups +from app.scodoc import sco_etud +from app.scodoc import sco_core +from app.scodoc import sco_formsemestre_edit +from app.scodoc import html_sco_header -from TrivialFormulator import TrivialFormulator, TF - -# from notes_table import * -import sco_find_etud -import sco_formsemestre -import sco_moduleimpl -import sco_groups # --- Gestion des inscriptions aux semestres _formsemestre_inscriptionEditor = ndb.EditableTable( @@ -75,7 +78,7 @@ def do_formsemestre_inscription_create(context, args, REQUEST, method=None): # r = _formsemestre_inscriptionEditor.create(cnx, args) # Evenement - scolars.scolar_events_create( + sco_etud.scolar_events_create( cnx, args={ "etudid": args["etudid"], @@ -135,8 +138,8 @@ def do_formsemestre_desinscription(context, etudid, formsemestre_id, REQUEST=Non "desinscription impossible: l'étudiant a une décision de jury (la supprimer avant si nécessaire)" ) - insem = do_formsemestre_inscription_list(context, - args={"formsemestre_id": formsemestre_id, "etudid": etudid} + insem = do_formsemestre_inscription_list( + context, args={"formsemestre_id": formsemestre_id, "etudid": etudid} ) if not insem: raise ScoValueError("%s n'est pas inscrit au semestre !" % etudid) @@ -160,8 +163,8 @@ def do_formsemestre_desinscription(context, etudid, formsemestre_id, REQUEST=Non ) # --- Semestre extérieur if sem["modalite"] == "EXT": - inscrits = do_formsemestre_inscription_list(context, - args={"formsemestre_id": formsemestre_id} + inscrits = do_formsemestre_inscription_list( + context, args={"formsemestre_id": formsemestre_id} ) nbinscrits = len(inscrits) if nbinscrits == 0: @@ -259,7 +262,7 @@ def formsemestre_inscription_with_modules_form( """Formulaire inscription de l'etud dans l'un des semestres existants. Si only_ext, ne montre que les semestre extérieurs. """ - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] H = [ html_sco_header.sco_header(context, REQUEST), "

Inscription de %s" % etud["nomprenom"], @@ -275,8 +278,8 @@ def formsemestre_inscription_with_modules_form( ) F = html_sco_header.sco_footer(context, REQUEST) sems = sco_formsemestre.do_formsemestre_list(context, args={"etat": "1"}) - insem = do_formsemestre_inscription_list(context, - args={"etudid": etudid, "etat": "I"} + insem = do_formsemestre_inscription_list( + context, args={"etudid": etudid, "etat": "I"} ) if sems: H.append("
    ") @@ -318,7 +321,7 @@ def formsemestre_inscription_with_modules( if multiple_ok: multiple_ok = int(multiple_ok) sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] H = [ html_sco_header.html_sem_header( context, @@ -416,7 +419,7 @@ def formsemestre_inscription_option(context, etudid, formsemestre_id, REQUEST=No if sem["etat"] != "1": raise ScoValueError("Modification impossible: semestre verrouille") - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] nt = sco_core.get_notes_cache(context).get_NotesTable( context, formsemestre_id ) # > get_etud_ue_status @@ -480,7 +483,7 @@ def formsemestre_inscription_option(context, etudid, formsemestre_id, REQUEST=No sem_origin["formsemestre_id"], etudid, sem_origin["titreannee"], - DateISOtoDMY(ue_status["event_date"]), + ndb.DateISOtoDMY(ue_status["event_date"]), ) descr.append( ( @@ -709,15 +712,15 @@ def est_inscrit_ailleurs(context, etudid, formsemestre_id): temps que celui indiqué (par formsemestre_id). Retourne la liste des semestres concernés (ou liste vide). """ - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) debut_s = sem["dateord"] - fin_s = DateDMYtoISO(sem["date_fin"]) + fin_s = ndb.DateDMYtoISO(sem["date_fin"]) r = [] for s in etud["sems"]: if s["formsemestre_id"] != formsemestre_id: debut = s["dateord"] - fin = DateDMYtoISO(s["date_fin"]) + fin = ndb.DateDMYtoISO(s["date_fin"]) if debut < fin_s and fin > debut_s: r.append(s) # intersection return r @@ -754,7 +757,7 @@ def formsemestre_inscrits_ailleurs(context, formsemestre_id, REQUEST=None): insd = list_inscrits_ailleurs(context, formsemestre_id) # liste ordonnée par nom etudlist = [ - scolars.get_etud_info(etudid=etudid, filled=1)[0] + sco_etud.get_etud_info(etudid=etudid, filled=1)[0] for etudid in insd.keys() if insd[etudid] ] diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py index 6d1437d0..cb08b9bd 100644 --- a/app/scodoc/sco_formsemestre_status.py +++ b/app/scodoc/sco_formsemestre_status.py @@ -28,33 +28,38 @@ """Tableau de bord semestre """ +import urllib +import cgi + # Rewritten from ancient DTML code from flask import current_app -from notes_log import log -import sco_utils as scu -import notesdb as ndb -from sco_permissions import Permission -from sco_exceptions import ScoValueError -import VERSION -import htmlutils -from sco_formsemestre_custommenu import formsemestre_custommenu_html -from gen_tables import GenTable -import html_sco_header -import sco_archives -import sco_bulletins -import sco_codes_parcours -import sco_core -import sco_compute_moy -import sco_evaluations -import sco_formations -import sco_formsemestre -import sco_formsemestre_edit -import sco_groups -import sco_moduleimpl -import sco_formsemestre_inscriptions -import sco_permissions -import sco_preferences +from app.scodoc.notes_log import log +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_exceptions import ScoValueError, ScoInvalidDateError +from app.scodoc import VERSION +from app.scodoc import html_sco_header +from app.scodoc import htmlutils +from app.scodoc import sco_abs +from app.scodoc import sco_archives +from app.scodoc import sco_bulletins +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_compute_moy +from app.scodoc import sco_core +from app.scodoc import sco_edit_ue +from app.scodoc import sco_evaluations +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_edit +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_permissions_check +from app.scodoc import sco_preferences +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_formsemestre_custommenu import formsemestre_custommenu_html # H = [ """
      @@ -124,7 +129,7 @@ def defMenuStats(context, formsemestre_id): }, { "title": "Estimation du coût de la formation", - "endpoint": "notes.formsemestre_estim_cost?formsemestre_id", + "endpoint": "notes.formsemestre_estim_cost", "args": {"formsemestre_id": formsemestre_id}, "enabled": True, }, @@ -162,9 +167,11 @@ def formsemestre_status_menubar(context, sem, REQUEST): }, { "title": "Modifier le semestre", - "endpoint": "notes.formsemestre_editwithmodules?formation_id=%(formation_id)s&formsemestre_id=%(formsemestre_id)s" - % sem, - "args": {"formsemestre_id": formsemestre_id}, + "endpoint": "notes.formsemestre_editwithmodules", + "args": { + "formation_id": sem["formation_id"], + "formsemestre_id": formsemestre_id, + }, "enabled": ( authuser.has_permission(Permission.ScoImplement) or ( @@ -177,7 +184,7 @@ def formsemestre_status_menubar(context, sem, REQUEST): }, { "title": "Préférences du semestre", - "endpoint": "notes.formsemestre_edit_preferences", + "endpoint": "scolar.formsemestre_edit_preferences", "args": {"formsemestre_id": formsemestre_id}, "enabled": ( authuser.has_permission(Permission.ScoImplement) @@ -292,27 +299,27 @@ def formsemestre_status_menubar(context, sem, REQUEST): }, { "title": "Importer des étudiants dans ce semestre (table Excel)", - "endpoint": "notes.form_students_import_excel", + "endpoint": "scolar.form_students_import_excel", "args": {"formsemestre_id": formsemestre_id}, "enabled": authuser.has_permission(Permission.ScoEtudInscrit) and (sem["etat"] == "1"), }, { "title": "Import/export des données admission", - "endpoint": "notes.form_students_import_infos_admissions", + "endpoint": "scolar.form_students_import_infos_admissions", "args": {"formsemestre_id": formsemestre_id}, "enabled": authuser.has_permission(Permission.ScoView), }, { "title": "Resynchroniser données identité", - "endpoint": "notes.formsemestre_import_etud_admission", + "endpoint": "scolar.formsemestre_import_etud_admission", "args": {"formsemestre_id": formsemestre_id}, "enabled": authuser.has_permission(Permission.ScoEtudChangeAdr) and sco_preferences.get_preference(context, "portal_url"), }, { "title": "Exporter table des étudiants", - "endpoint": "notes.groups_view", + "endpoint": "scolar.groups_view", "args": { "format": "allxls", "group_ids": sco_groups.get_default_group( @@ -330,14 +337,14 @@ def formsemestre_status_menubar(context, sem, REQUEST): menuGroupes = [ { "title": "Listes, photos, feuilles...", - "endpoint": "notes.groups_view", + "endpoint": "scolar.groups_view", "args": {"formsemestre_id": formsemestre_id}, "enabled": True, "helpmsg": "Accès aux listes des groupes d'étudiants", }, { "title": "Créer/modifier les partitions...", - "endpoint": "notes.editPartitionForm", + "endpoint": "scolar.editPartitionForm", "args": {"formsemestre_id": formsemestre_id}, "enabled": sco_groups.can_change_groups(context, REQUEST, formsemestre_id), }, @@ -354,7 +361,7 @@ def formsemestre_status_menubar(context, sem, REQUEST): submenu.append( { "title": "%s" % partition["partition_name"], - "endpoint": "notes.affectGroups", + "endpoint": "scolar.affectGroups", "args": {"partition_id": partition["partition_id"]}, "enabled": enabled, } @@ -422,7 +429,7 @@ def formsemestre_status_menubar(context, sem, REQUEST): "hidebac": 1, "pref_override": 0, }, - "enabled": sco_permissions.can_validate_sem( + "enabled": sco_permissions_check.can_validate_sem( context, REQUEST, formsemestre_id ), }, @@ -430,7 +437,9 @@ def formsemestre_status_menubar(context, sem, REQUEST): "title": "Editer les PV et archiver les résultats", "endpoint": "notes.formsemestre_archive", "args": {"formsemestre_id": formsemestre_id}, - "enabled": sco_permissions.can_edit_pv(context, REQUEST, formsemestre_id), + "enabled": sco_permissions_check.can_edit_pv( + context, REQUEST, formsemestre_id + ), }, { "title": "Documents archivés", diff --git a/app/scodoc/sco_formsemestre_validation.py b/app/scodoc/sco_formsemestre_validation.py index baaf3b8d..9f54f2ca 100644 --- a/app/scodoc/sco_formsemestre_validation.py +++ b/app/scodoc/sco_formsemestre_validation.py @@ -29,22 +29,28 @@ """ import urllib, time, datetime -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from scolog import logdb -import notes_table -from TrivialFormulator import TrivialFormulator, tf_error_message -from sco_exceptions import ScoValueError -from sco_abs import getAbsSemEtud -import sco_formsemestre -import sco_formsemestre_edit -import sco_formsemestre_status -import sco_parcours_dut -import sco_codes_parcours -from sco_codes_parcours import * -import sco_pvjury -import sco_photos +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.scolog import logdb +from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_abs import getAbsSemEtud + +from app.scodoc.sco_codes_parcours import * +from app.scodoc import html_sco_header +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_edit_ue +from app.scodoc import sco_etud +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_edit +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_formsemestre_status +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_photos +from app.scodoc import sco_preferences +from app.scodoc import sco_pvjury # ------------------------------------------------------------------------------------ def formsemestre_validation_etud_form( @@ -91,7 +97,7 @@ def formsemestre_validation_etud_form( if readonly: check = True - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] Se = sco_parcours_dut.SituationEtudParcours(context, etud, formsemestre_id) if Se.sem["etat"] != "1": raise ScoValueError("validation: semestre verrouille") @@ -108,13 +114,13 @@ def formsemestre_validation_etud_form( Footer = ["

      "] # Navigation suivant/precedent if etud_index_prev != None: - etud_p = scolars.get_etud_info(etudid=T[etud_index_prev][-1], filled=True)[0] + etud_p = sco_etud.get_etud_info(etudid=T[etud_index_prev][-1], filled=True)[0] Footer.append( 'Etud. précédent (%s)' % (formsemestre_id, etud_index_prev, etud_p["nomprenom"]) ) if etud_index_next != None: - etud_n = scolars.get_etud_info(etudid=T[etud_index_next][-1], filled=True)[0] + etud_n = sco_etud.get_etud_info(etudid=T[etud_index_next][-1], filled=True)[0] Footer.append( 'Etud. suivant (%s)' % (formsemestre_id, etud_index_next, etud_n["nomprenom"]) @@ -333,22 +339,22 @@ def formsemestre_validation_etud( REQUEST=None, ): """Enregistre validation""" - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] Se = sco_parcours_dut.SituationEtudParcours(context, etud, formsemestre_id) # retrouve la decision correspondant au code: choices = Se.get_possible_choices(assiduite=True) choices += Se.get_possible_choices(assiduite=False) - found = False + selected_choice = None for choice in choices: if choice.codechoice == codechoice: - found = True + selected_choice = choice break - if not found: + if not selected_choice: raise ValueError("code choix invalide ! (%s)" % codechoice) # - Se.valide_decision(choice, REQUEST) # enregistre + Se.valide_decision(selected_choice, REQUEST) # enregistre return _redirect_valid_choice( - formsemestre_id, etudid, Se, choice, desturl, sortcol, REQUEST + formsemestre_id, etudid, Se, selected_choice, desturl, sortcol, REQUEST ) @@ -368,7 +374,7 @@ def formsemestre_validation_etud_manu( """Enregistre validation""" if assidu: assidu = 1 - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] Se = sco_parcours_dut.SituationEtudParcours(context, etud, formsemestre_id) if code_etat in Se.parcours.UNUSED_CODES: raise ScoValueError("code decision invalide dans ce parcours") @@ -862,10 +868,10 @@ def do_formsemestre_validation_auto(context, formsemestre_id, REQUEST): nb_valid = 0 conflicts = [] # liste des etudiants avec decision differente déjà saisie for etudid in etudids: - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] Se = sco_parcours_dut.SituationEtudParcours(context, etud, formsemestre_id) - ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, - {"etudid": etudid, "formsemestre_id": formsemestre_id} + ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, {"etudid": etudid, "formsemestre_id": formsemestre_id} )[0] # Conditions pour validation automatique: @@ -964,10 +970,10 @@ def formsemestre_fix_validation_ues(context, formsemestre_id, REQUEST=None): modifs = [] # liste d'étudiants modifiés cnx = context.GetDBConnexion(autocommit=False) for etudid in etudids: - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] Se = sco_parcours_dut.SituationEtudParcours(context, etud, formsemestre_id) - ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, - {"etudid": etudid, "formsemestre_id": formsemestre_id} + ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, {"etudid": etudid, "formsemestre_id": formsemestre_id} )[0] decision_sem = nt.get_etud_decision_sem(etudid) if not decision_sem: @@ -1071,9 +1077,13 @@ def formsemestre_validate_previous_ue(context, formsemestre_id, etudid, REQUEST= """Form. saisie UE validée hors ScoDoc (pour étudiants arrivant avec un UE antérieurement validée). """ - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + from app.scodoc import sco_formations + + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - Fo = sco_formations.formation_list(context, args={"formation_id": sem["formation_id"]})[0] + Fo = sco_formations.formation_list( + context, args={"formation_id": sem["formation_id"]} + )[0] H = [ html_sco_header.sco_header( diff --git a/app/scodoc/sco_formulas.py b/app/scodoc/sco_formulas.py index ccac9df8..9bf0683e 100644 --- a/app/scodoc/sco_formulas.py +++ b/app/scodoc/sco_formulas.py @@ -29,14 +29,10 @@ """ import operator -import traceback from types import FloatType, IntType, LongType, StringType -import sco_utils as scu -from notes_log import log - -class NoteVector: +class NoteVector(object): """Vecteur de notes (ou coefficients) utilisé pour les formules définies par l'utilisateur. Les éléments sont accessibles soit par index v[i], soit par leur nom v['nom'] s'il en ont un. Les éléments sont toujours numériques (float). Les valeurs non numériques ('NI', ...) sont diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py index 00a98306..657994b0 100644 --- a/app/scodoc/sco_groups.py +++ b/app/scodoc/sco_groups.py @@ -43,17 +43,18 @@ import operator import jaxml import xml.dom.minidom -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from scolog import logdb -from TrivialFormulator import TrivialFormulator, TF -import sco_formsemestre -import scolars -import sco_parcours_dut -import sco_codes_parcours -from sco_permissions import ScoEtudChangeGroups -from sco_exceptions import ScoException, AccessDenied, ScoValueError +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.scolog import logdb +from app.scodoc import html_sco_header +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_etud +from app.scodoc import sco_formsemestre +from app.scodoc.sco_exceptions import ScoException, AccessDenied, ScoValueError +from app.scodoc.sco_permissions import Permission +from app.scodoc.TrivialFormulator import TrivialFormulator def can_change_groups(context, REQUEST, formsemestre_id): @@ -244,7 +245,7 @@ def get_group_members(context, group_id, etat=None): r = ndb.SimpleDictFetch(context, req, {"group_id": group_id, "etat": etat}) for etud in r: - scolars.format_etud_ident(etud) + sco_etud.format_etud_ident(etud) r.sort(key=operator.itemgetter("nom_disp", "prenom")) # tri selon nom_usuel ou nom @@ -285,7 +286,7 @@ def get_group_infos(context, group_id, etat=None): # was _getlisteetud if t["etat"] == "I": t["etath"] = "" # etudiant inscrit, ne l'indique pas dans la liste HTML elif t["etat"] == "D": - events = scolars.scolar_events_list( + events = sco_etud.scolar_events_list( cnx, args={ "etudid": t["etudid"], @@ -469,14 +470,14 @@ def XMLgetGroupsInPartition(context, partition_id, REQUEST=None): # was XMLgetG group_name=group["group_name"], ) for e in get_group_members(context, group["group_id"]): - etud = scolars.get_etud_info(etudid=e["etudid"], filled=1)[0] + etud = sco_etud.get_etud_info(etudid=e["etudid"], filled=1)[0] doc._push() doc.etud( etudid=e["etudid"], civilite=etud["civilite_str"], sexe=etud["civilite_str"], # compat - nom=scolars.format_nom(etud["nom"]), - prenom=scolars.format_prenom(etud["prenom"]), + nom=sco_etud.format_nom(etud["nom"]), + prenom=sco_etud.format_prenom(etud["prenom"]), origin=comp_origin(etud, sem), ) if e["etudid"] in etuds_set: @@ -494,13 +495,13 @@ def XMLgetGroupsInPartition(context, partition_id, REQUEST=None): # was XMLgetG group_name="", ) for etudid in etuds_set: - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] doc._push() doc.etud( etudid=etud["etudid"], sexe=etud["civilite_str"], - nom=scolars.format_nom(etud["nom"]), - prenom=scolars.format_prenom(etud["prenom"]), + nom=sco_etud.format_nom(etud["nom"]), + prenom=sco_etud.format_prenom(etud["prenom"]), origin=comp_origin(etud, sem), ) doc._pop() @@ -1297,9 +1298,9 @@ def get_prev_moy(context, etudid, formsemestre_id): """Donne la derniere moyenne generale calculee pour cette étudiant, ou 0 si on n'en trouve pas (nouvel inscrit,...). """ - import sco_parcours_dut + from app.scodoc import sco_parcours_dut - info = scolars.get_etud_info(etudid=etudid, filled=True) + info = sco_etud.get_etud_info(etudid=etudid, filled=True) if not info: raise ScoValueError("etudiant invalide: etudid=%s" % etudid) etud = info[0] @@ -1320,9 +1321,11 @@ def create_etapes_partition(context, formsemestre_id, partition_name="apo_etapes Si la partition existe déjà, ses groupes sont mis à jour (les groupes devenant vides ne sont pas supprimés). """ + from app.scodoc import sco_formsemestre_inscriptions + log("create_etapes_partition(%s)" % formsemestre_id) - ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, - args={"formsemestre_id": formsemestre_id} + ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, args={"formsemestre_id": formsemestre_id} ) etapes = {i["etape"] for i in ins if i["etape"]} partitions = get_partitions_list(context, formsemestre_id, with_default=False) diff --git a/app/scodoc/sco_groups_edit.py b/app/scodoc/sco_groups_edit.py index 4c727cc5..4fd0f7b9 100644 --- a/app/scodoc/sco_groups_edit.py +++ b/app/scodoc/sco_groups_edit.py @@ -28,14 +28,9 @@ """Formulaires gestion des groupes """ -import re - -import sco_utils as scu -import notesdb as ndb -from notes_log import log -import sco_formsemestre -import sco_groups -from sco_exceptions import AccessDenied +from app.scodoc import html_sco_header +from app.scodoc import sco_groups +from app.scodoc.sco_exceptions import AccessDenied def affectGroups(context, partition_id, REQUEST=None): @@ -49,7 +44,8 @@ def affectGroups(context, partition_id, REQUEST=None): raise AccessDenied("vous n'avez pas la permission d'effectuer cette opération") H = [ - html_sco_header.sco_header(context, + html_sco_header.sco_header( + context, REQUEST, page_title="Affectation aux groupes", javascripts=["js/groupmgr.js"], diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py index 9af18a48..b0c26bf3 100644 --- a/app/scodoc/sco_groups_view.py +++ b/app/scodoc/sco_groups_view.py @@ -37,21 +37,20 @@ import time import collections import operator -import sco_utils as scu -from sco_permissions import ScoEtudInscrit, ScoEtudAddAnnotations, ScoAbsChange -from sco_exceptions import ScoValueError -import html_sco_header -from gen_tables import GenTable -import scolars -import sco_abs -import sco_excel -import sco_formsemestre -import sco_moduleimpl -import sco_groups -import sco_trombino -import sco_portal_apogee -import sco_parcours_dut -import sco_report +import app.scodoc.sco_utils as scu +from app.scodoc import html_sco_header +from app.scodoc import sco_abs +from app.scodoc import sco_excel +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_portal_apogee +from app.scodoc import sco_preferences +from app.scodoc import sco_etud +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_permissions import Permission JAVASCRIPTS = html_sco_header.BOOTSTRAP_MULTISELECT_JS + [ "js/etud_info.js", @@ -452,6 +451,8 @@ def groups_table( format: csv, json, xml, xls, allxls, xlsappel, moodlecsv, pdf Si with_codes, ajoute 4 colonnes avec les codes etudid, NIP, INE et etape """ + from app.scodoc import sco_report + # log( # "enter groups_table %s: %s" # % (groups_infos.members[0]["nom"], groups_infos.members[0].get("etape", "-")) @@ -515,7 +516,7 @@ def groups_table( sco_archives_etud.add_archives_info_to_etud_list(context, groups_infos.members) columns_ids += ["etudarchive"] if with_annotations: - scolars.add_annotations_to_etud_list(context, groups_infos.members) + sco_etud.add_annotations_to_etud_list(context, groups_infos.members) columns_ids += ["annotations_str"] if groups_infos.formsemestre["semestre_id"] >= 0: @@ -785,9 +786,9 @@ def groups_table( # remplis infos lycee si on a que le code lycée # et ajoute infos inscription for m in groups_infos.members: - etud = scolars.get_etud_info(m["etudid"], filled=True)[0] + etud = sco_etud.get_etud_info(m["etudid"], filled=True)[0] m.update(etud) - scolars.etud_add_lycee_infos(etud) + sco_etud.etud_add_lycee_infos(etud) # et ajoute le parcours Se = sco_parcours_dut.SituationEtudParcours( context.Notes, etud, groups_infos.formsemestre_id @@ -873,6 +874,8 @@ def tab_absences_html(context, groups_infos, etat=None, REQUEST=None): def tab_photos_html(context, groups_infos, etat=None, REQUEST=None): """contenu du tab "photos" """ + from app.scodoc import sco_trombino + if not groups_infos.members: return '

      Aucun étudiant !

      ' @@ -974,7 +977,7 @@ def export_groups_as_moodle_csv(context, formsemestre_id=None, REQUEST=None): partition = sco_groups.get_partition(context, partition_id) members = partitions_etud_groups[partition_id] for etudid in members: - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] group_name = members[etudid]["group_name"] elts = [moodle_sem_name] if partition["partition_name"]: diff --git a/app/scodoc/sco_import_users.py b/app/scodoc/sco_import_users.py index 1e23b181..c489984c 100644 --- a/app/scodoc/sco_import_users.py +++ b/app/scodoc/sco_import_users.py @@ -27,20 +27,16 @@ """Import d'utilisateurs via fichier Excel """ - -import email from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from email.header import Header -import mails -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF -import sco_news -import sco_excel -from sco_exceptions import AccessDenied, ScoValueError, ScoException +from app.scodoc import mails +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.sco_exceptions import AccessDenied, ScoValueError, ScoException +from app.scodoc import sco_excel +from app.scodoc import sco_preferences TITLES = ("user_name", "nom", "prenom", "email", "roles", "dept") diff --git a/app/scodoc/sco_inscr_passage.py b/app/scodoc/sco_inscr_passage.py index 147d30e3..c3a9e64a 100644 --- a/app/scodoc/sco_inscr_passage.py +++ b/app/scodoc/sco_inscr_passage.py @@ -30,18 +30,20 @@ """ import datetime -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from gen_tables import GenTable -import sco_codes_parcours -import sco_pvjury -import sco_formsemestre -import sco_formsemestre_inscriptions -import sco_formsemestre -import sco_groups -import scolars -from sco_exceptions import ScoValueError +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.gen_tables import GenTable +from app.scodoc import html_sco_header +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_preferences +from app.scodoc import sco_pvjury +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_formations +from app.scodoc import sco_groups +from app.scodoc import sco_etud +from app.scodoc.sco_exceptions import ScoValueError def list_authorized_etuds_by_sem(context, sem, delai=274): @@ -59,7 +61,7 @@ def list_authorized_etuds_by_sem(context, sem, delai=274): for e in liste: # Filtre ceux qui se sont déjà inscrit dans un semestre APRES le semestre src auth_used = False # autorisation deja utilisée ? - etud = scolars.get_etud_info(etudid=e["etudid"], filled=True)[0] + etud = sco_etud.get_etud_info(etudid=e["etudid"], filled=True)[0] for isem in etud["sems"]: if ndb.DateDMYtoISO(isem["date_debut"]) >= ndb.DateDMYtoISO( src["date_fin"] @@ -110,11 +112,13 @@ def list_inscrits(context, formsemestre_id, with_dems=False): ) # optimized else: args = {"formsemestre_id": formsemestre_id} - ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, args=args) + ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, args=args + ) inscr = {} for i in ins: etudid = i["etudid"] - inscr[etudid] = scolars.get_etud_info(etudid=etudid, filled=True)[0] + inscr[etudid] = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] return inscr @@ -172,7 +176,7 @@ def do_inscrit(context, sem, etudids, REQUEST=None, inscrit_groupes=False): # (mise en correspondance à partir du nom du groupe, sans tenir compte # du nom de la partition: évidemment, cela ne marche pas si on a les # même noms de groupes dans des partitions différentes) - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] log("cherche groupes de %(nom)s" % etud) # recherche le semestre origine (il serait plus propre de l'avoir conservé!) @@ -242,7 +246,9 @@ def list_source_sems(context, sem, delai=None): if s["semestre_id"] == sco_codes_parcours.NO_SEMESTRE_ID: continue # - F = sco_formations.formation_list(context, args={"formation_id": s["formation_id"]})[0] + F = sco_formations.formation_list( + context, args={"formation_id": s["formation_id"]} + )[0] parcours = sco_codes_parcours.get_parcours_from_code(F["type_parcours"]) if not parcours.ALLOW_SEM_SKIP: if s["semestre_id"] < (sem["semestre_id"] - 1): @@ -569,7 +575,7 @@ def etuds_select_boxes( c = " inscrailleurs" else: c = "" - scolars.format_etud_ident(etud) + sco_etud.format_etud_ident(etud) if etud["etudid"]: elink = ( """%s""" diff --git a/app/scodoc/sco_liste_notes.py b/app/scodoc/sco_liste_notes.py index 7b8cb9ab..5fab6478 100644 --- a/app/scodoc/sco_liste_notes.py +++ b/app/scodoc/sco_liste_notes.py @@ -30,19 +30,26 @@ import urllib from types import StringType -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF -import sco_formsemestre -import sco_moduleimpl -import sco_groups -import sco_evaluations -import htmlutils -import sco_excel -from gen_tables import GenTable -from htmlutils import histogram_notes -import VERSION +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.TrivialFormulator import TrivialFormulator +from app.scodoc import htmlutils +from app.scodoc import html_sco_header +from app.scodoc import sco_abs +from app.scodoc import sco_core +from app.scodoc import sco_edit_module +from app.scodoc import sco_evaluations +from app.scodoc import sco_excel +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_preferences +from app.scodoc import sco_etud +from app.scodoc import VERSION +from app.scodoc.gen_tables import GenTable +from app.scodoc.htmlutils import histogram_notes def do_evaluation_listenotes(context, REQUEST): @@ -55,11 +62,15 @@ def do_evaluation_listenotes(context, REQUEST): if REQUEST.form.has_key("evaluation_id"): evaluation_id = REQUEST.form["evaluation_id"] mode = "eval" - evals = sco_evaluations.do_evaluation_list(context, {"evaluation_id": evaluation_id}) + evals = sco_evaluations.do_evaluation_list( + context, {"evaluation_id": evaluation_id} + ) if REQUEST.form.has_key("moduleimpl_id"): moduleimpl_id = REQUEST.form["moduleimpl_id"] mode = "module" - evals = sco_evaluations.do_evaluation_list(context, {"moduleimpl_id": moduleimpl_id}) + evals = sco_evaluations.do_evaluation_list( + context, {"moduleimpl_id": moduleimpl_id} + ) if not mode: raise ValueError("missing argument: evaluation or module") if not evals: @@ -284,10 +295,10 @@ def _make_table_notes( for etudid in etudids: css_row_class = None # infos identite etudiant - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] # infos inscription - inscr = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, - {"etudid": etudid, "formsemestre_id": M["formsemestre_id"]} + inscr = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, {"etudid": etudid, "formsemestre_id": M["formsemestre_id"]} )[0] if inscr["etat"] == "I": # si inscrit, indique groupe @@ -540,7 +551,7 @@ def _add_eval_columns( sum_notes = 0 notes = [] # liste des notes numeriques, pour calcul histogramme uniquement evaluation_id = e["evaluation_id"] - NotesDB = context._notes_getall(evaluation_id) + NotesDB = sco_evaluations.do_evaluation_get_all_notes(context, evaluation_id) for row in rows: etudid = row["etudid"] if NotesDB.has_key(etudid): @@ -717,17 +728,17 @@ def evaluation_check_absences(context, evaluation_id): am, pm, demijournee = _eval_demijournee(E) # Liste les absences à ce moment: - A = context.Absences.ListeAbsJour(ndb.DateDMYtoISO(E["jour"]), am=am, pm=pm) + A = sco_abs.ListeAbsJour(context, ndb.DateDMYtoISO(E["jour"]), am=am, pm=pm) As = set([x["etudid"] for x in A]) # ensemble des etudiants absents - NJ = context.Absences.ListeAbsNonJustJour(ndb.DateDMYtoISO(E["jour"]), am=am, pm=pm) + NJ = sco_abs.ListeAbsNonJustJour(context, ndb.DateDMYtoISO(E["jour"]), am=am, pm=pm) NJs = set([x["etudid"] for x in NJ]) # ensemble des etudiants absents non justifies - Just = context.Absences.ListeAbsJour( - ndb.DateDMYtoISO(E["jour"]), am=am, pm=pm, is_abs=None, is_just=True + Just = sco_abs.ListeAbsJour( + context, ndb.DateDMYtoISO(E["jour"]), am=am, pm=pm, is_abs=None, is_just=True ) Justs = set([x["etudid"] for x in Just]) # ensemble des etudiants avec justif # Les notes: - NotesDB = context._notes_getall(evaluation_id) + NotesDB = sco_evaluations.do_evaluation_get_all_notes(context, evaluation_id) ValButAbs = [] # une note mais noté absent AbsNonSignalee = [] # note ABS mais pas noté absent ExcNonSignalee = [] # note EXC mais pas noté absent @@ -803,7 +814,7 @@ def evaluation_check_absences_html( if not etudids and show_ok: H.append("
    • aucun
      • ") for etudid in etudids: - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] H.append( '
    • %(nomprenom)s' % etud @@ -877,7 +888,9 @@ def formsemestre_check_absences_html(context, formsemestre_id, REQUEST=None): context, formsemestre_id=formsemestre_id ) for M in Mlist: - evals = sco_evaluations.do_evaluation_list(context, {"moduleimpl_id": M["moduleimpl_id"]}) + evals = sco_evaluations.do_evaluation_list( + context, {"moduleimpl_id": M["moduleimpl_id"]} + ) if evals: H.append( '

      %s: %s

      ' diff --git a/app/scodoc/sco_lycee.py b/app/scodoc/sco_lycee.py index 84f2eff0..5275937d 100644 --- a/app/scodoc/sco_lycee.py +++ b/app/scodoc/sco_lycee.py @@ -30,16 +30,14 @@ - suivi cohortes """ -import tempfile, urllib, re - -import sco_utils as scu -from notes_log import log -import scolars -import sco_groups -import sco_report -from gen_tables import GenTable -import sco_formsemestre -import VERSION +import app.scodoc.sco_utils as scu +from app.scodoc import html_sco_header +from app.scodoc import sco_formsemestre +from app.scodoc import sco_preferences +from app.scodoc import sco_report +from app.scodoc import sco_etud +from app.scodoc import VERSION +from app.scodoc.gen_tables import GenTable def formsemestre_table_etuds_lycees( @@ -106,7 +104,7 @@ def scodoc_table_etuds_lycees(context, format="html", REQUEST=None): def _table_etuds_lycees( context, etuds, group_lycees, title, preferences, no_links=False ): - etuds = [scolars.etud_add_lycee_infos(e) for e in etuds] + etuds = [sco_etud.etud_add_lycee_infos(e) for e in etuds] etuds_by_lycee = scu.group_by_key(etuds, "codelycee") # if group_lycees: diff --git a/app/scodoc/sco_modalites.py b/app/scodoc/sco_modalites.py index 5a1151f9..5b70d66c 100644 --- a/app/scodoc/sco_modalites.py +++ b/app/scodoc/sco_modalites.py @@ -33,11 +33,9 @@ Elle n'est pas utilisée pour les parcours, ni pour rien d'autre (c'est donc un attribut "cosmétique"). """ -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF -import sco_codes_parcours +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log def list_formsemestres_modalites(context, sems): diff --git a/app/scodoc/sco_moduleimpl.py b/app/scodoc/sco_moduleimpl.py index 78f78fc7..76ee15aa 100644 --- a/app/scodoc/sco_moduleimpl.py +++ b/app/scodoc/sco_moduleimpl.py @@ -28,24 +28,20 @@ """Fonctions sur les moduleimpl """ # codes anciens déplacés de ZEntreprise -import datetime -import sco_utils as scu -import notesdb as ndb -from notesdb import ScoDocCursor, EditableTable, DateISOtoDMY, DateDMYtoISO -from sco_permissions import ScoImplement -from sco_exceptions import ScoValueError, AccessDenied -from notes_log import log -import scolog -import sco_edit_matiere -import sco_edit_module -import sco_edit_ue -import sco_formsemestre +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.sco_permissions import Permission +from app.scodoc.sco_exceptions import ScoValueError, AccessDenied +from app.scodoc.notes_log import log +from app.scodoc import scolog +from app.scodoc import sco_formsemestre +from app.scodoc import sco_core # --- Gestion des "Implémentations de Modules" # Un "moduleimpl" correspond a la mise en oeuvre d'un module # dans une formation spécifique, à une date spécifique. -_moduleimplEditor = EditableTable( +_moduleimplEditor = ndb.EditableTable( "notes_moduleimpl", "moduleimpl_id", ( @@ -57,7 +53,7 @@ _moduleimplEditor = EditableTable( ), ) -_modules_enseignantsEditor = EditableTable( +_modules_enseignantsEditor = ndb.EditableTable( "notes_modules_enseignants", "modules_enseignants_id", ("modules_enseignants_id", "moduleimpl_id", "ens_id"), @@ -78,7 +74,7 @@ def do_moduleimpl_delete(context, oid, formsemestre_id=None): "delete moduleimpl (desinscrit tous les etudiants)" cnx = ndb.GetDBConnexion() # --- desinscription des etudiants - cursor = cnx.cursor(cursor_factory=ScoDocCursor) + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) req = ( "DELETE FROM notes_moduleimpl_inscription WHERE moduleimpl_id=%(moduleimpl_id)s" ) @@ -106,7 +102,7 @@ def do_moduleimpl_list( "list moduleimpls" args = locals() cnx = ndb.GetDBConnexion() - modimpls = _moduleimplEditor.list(cnx, args) # *args, **kw) + modimpls = _moduleimplEditor.list(cnx, args) # Ajoute la liste des enseignants for mo in modimpls: mo["ens"] = do_ens_list(context, args={"moduleimpl_id": mo["moduleimpl_id"]}) @@ -130,10 +126,21 @@ def do_moduleimpl_withmodule_list( Attention: Cette fonction fait partie de l'API ScoDoc 7 et est publiée. """ + from app.scodoc import sco_edit_ue + from app.scodoc import sco_edit_matiere + from app.scodoc import sco_edit_module + args = locals() del args["context"] del args["REQUEST"] - modimpls = do_moduleimpl_list(context, **args) + modimpls = do_moduleimpl_list( + context, + **{ + "moduleimpl_id": moduleimpl_id, + "formsemestre_id": formsemestre_id, + "module_id": module_id, + } + ) for mo in modimpls: mo["module"] = sco_edit_module.do_module_list( context, args={"module_id": mo["module_id"]} @@ -174,7 +181,7 @@ def do_moduleimpl_listeetuds(context, moduleimpl_id): "retourne liste des etudids inscrits a ce module" req = "select distinct Im.etudid from notes_moduleimpl_inscription Im, notes_formsemestre_inscription Isem, notes_moduleimpl M where Isem.etudid=Im.etudid and Im.moduleimpl_id=M.moduleimpl_id and M.moduleimpl_id = %(moduleimpl_id)s" cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ScoDocCursor) + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) cursor.execute(req, {"moduleimpl_id": moduleimpl_id}) res = cursor.fetchall() return [x[0] for x in res] @@ -184,7 +191,7 @@ def do_moduleimpl_inscrit_tout_semestre(context, moduleimpl_id, formsemestre_id) "inscrit tous les etudiants inscrit au semestre a ce module" # UNUSED cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ScoDocCursor) + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) req = """INSERT INTO notes_moduleimpl_inscription (moduleimpl_id, etudid) SELECT %(moduleimpl_id)s, I.etudid @@ -195,7 +202,7 @@ def do_moduleimpl_inscrit_tout_semestre(context, moduleimpl_id, formsemestre_id) # --- Inscriptions aux modules -_moduleimpl_inscriptionEditor = EditableTable( +_moduleimpl_inscriptionEditor = ndb.EditableTable( "notes_moduleimpl_inscription", "moduleimpl_inscription_id", ("moduleimpl_inscription_id", "etudid", "moduleimpl_id"), @@ -237,6 +244,8 @@ def do_moduleimpl_inscrit_etuds( """Inscrit les etudiants (liste d'etudids) a ce module. Si reset, desinscrit tous les autres. """ + from app.scodoc import sco_formsemestre_inscriptions + # Verifie qu'ils sont tous bien inscrits au semestre for etudid in etudids: insem = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( @@ -248,7 +257,7 @@ def do_moduleimpl_inscrit_etuds( # Desinscriptions if reset: cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ScoDocCursor) + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) cursor.execute( "delete from notes_moduleimpl_inscription where moduleimpl_id = %(moduleimpl_id)s", {"moduleimpl_id": moduleimpl_id}, diff --git a/app/scodoc/sco_moduleimpl_inscriptions.py b/app/scodoc/sco_moduleimpl_inscriptions.py index 5b2abc4d..623e713e 100644 --- a/app/scodoc/sco_moduleimpl_inscriptions.py +++ b/app/scodoc/sco_moduleimpl_inscriptions.py @@ -29,16 +29,22 @@ """ -import notesdb as ndb -import sco_utils as scu -from notes_log import log -from scolog import logdb -import sco_formsemestre -import sco_moduleimpl -import sco_groups -import htmlutils -from sco_permissions import ScoEtudInscrit -from sco_exceptions import ScoValueError +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.scolog import logdb +from app.scodoc import html_sco_header +from app.scodoc import htmlutils +from app.scodoc import sco_core +from app.scodoc import sco_edit_module +from app.scodoc import sco_edit_ue +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_etud +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_permissions import Permission def moduleimpl_inscriptions_edit( @@ -87,7 +93,7 @@ def moduleimpl_inscriptions_edit( # Liste des inscrits à ce semestre inscrits = context.Notes.do_formsemestre_inscription_listinscrits(formsemestre_id) for ins in inscrits: - etuds_info = scolars.get_etud_info(etudid=ins["etudid"], filled=1) + etuds_info = sco_etud.get_etud_info(etudid=ins["etudid"], filled=1) if not etuds_info: log( "moduleimpl_inscriptions_edit: incoherency for etudid=%s !" @@ -238,8 +244,8 @@ def moduleimpl_inscriptions_stats(context, formsemestre_id, REQUEST=None): authuser = REQUEST.AUTHENTICATED_USER sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - inscrits = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, - args={"formsemestre_id": formsemestre_id} + inscrits = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, args={"formsemestre_id": formsemestre_id} ) set_all = set([x["etudid"] for x in inscrits]) partitions, partitions_etud_groups = sco_groups.get_formsemestre_groups( @@ -334,7 +340,10 @@ def moduleimpl_inscriptions_stats(context, formsemestre_id, REQUEST=None): UECaps = get_etuds_with_capitalized_ue(context, formsemestre_id) if UECaps: H.append('

      Etudiants avec UEs capitalisées:

        ') - ues = [sco_edit_ue.do_ue_list(context, {"ue_id": ue_id})[0] for ue_id in UECaps.keys()] + ues = [ + sco_edit_ue.do_ue_list(context, {"ue_id": ue_id})[0] + for ue_id in UECaps.keys() + ] ues.sort(key=lambda u: u["numero"]) for ue in ues: H.append( @@ -342,7 +351,7 @@ def moduleimpl_inscriptions_stats(context, formsemestre_id, REQUEST=None): ) H.append("
          ") for info in UECaps[ue["ue_id"]]: - etud = scolars.get_etud_info(etudid=info["etudid"], filled=True)[0] + etud = sco_etud.get_etud_info(etudid=info["etudid"], filled=True)[0] H.append( '
        • %(nomprenom)s' % etud @@ -446,7 +455,7 @@ def _fmt_etud_set(context, ins, max_list_size=7): return "%d étudiants" % len(ins) etuds = [] for etudid in ins: - etuds.append(scolars.get_etud_info(etudid=etudid, filled=True)[0]) + etuds.append(sco_etud.get_etud_info(etudid=etudid, filled=True)[0]) etuds.sort(lambda x, y: cmp(x["nom"], y["nom"])) return ", ".join( [ @@ -465,8 +474,8 @@ def get_etuds_with_capitalized_ue(context, formsemestre_id): nt = sco_core.get_notes_cache(context).get_NotesTable( context, formsemestre_id ) # > get_ues, get_etud_ue_status - inscrits = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, - args={"formsemestre_id": formsemestre_id} + inscrits = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, args={"formsemestre_id": formsemestre_id} ) ues = nt.get_ues() for ue in ues: @@ -544,8 +553,8 @@ def do_etud_desinscrit_ue(context, etudid, formsemestre_id, ue_id, REQUEST=None) def do_etud_inscrit_ue(context, etudid, formsemestre_id, ue_id, REQUEST=None): """Incrit l'etudiant de tous les modules de cette UE dans ce semestre.""" # Verifie qu'il est bien inscrit au semestre - insem = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, - args={"formsemestre_id": formsemestre_id, "etudid": etudid} + insem = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, args={"formsemestre_id": formsemestre_id, "etudid": etudid} ) if not insem: raise ScoValueError("%s n'est pas inscrit au semestre !" % etudid) diff --git a/app/scodoc/sco_moduleimpl_status.py b/app/scodoc/sco_moduleimpl_status.py index a6b1f3a8..b9f35586 100644 --- a/app/scodoc/sco_moduleimpl_status.py +++ b/app/scodoc/sco_moduleimpl_status.py @@ -28,31 +28,25 @@ """Tableau de bord module """ import time +import urllib -import sco_utils as scu -from sco_utils import ( - EVALUATION_NORMALE, - EVALUATION_RATTRAPAGE, - EVALUATION_SESSION2, -) -from sco_permissions import ScoEtudInscrit, ScoAbsChange -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF +import app.scodoc.sco_utils as scu +from app.scodoc.sco_permissions import Permission -# from notes_table import * -import sco_groups -import sco_evaluations -import htmlutils -import sco_excel -from gen_tables import GenTable -from htmlutils import histogram_notes -import sco_moduleimpl -import sco_formsemestre -import sco_formsemestre_status -import htmlutils -import sco_saisie_notes -import sco_compute_moy -import sco_abs +from app.scodoc import html_sco_header +from app.scodoc import htmlutils +from app.scodoc import sco_abs +from app.scodoc import sco_compute_moy +from app.scodoc import sco_core +from app.scodoc import sco_edit_module +from app.scodoc import sco_evaluations +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_status +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_permissions_check +from app.scodoc import sco_saisie_notes # ported from old DTML code in oct 2009 @@ -67,7 +61,7 @@ def moduleimpl_evaluation_menu(context, evaluation_id, nbnotes=0, REQUEST=None): group_id = sco_groups.get_default_group(context, modimpl["formsemestre_id"]) if ( - sco_saisie_notes.can_edit_notes( + sco_permissions_check.can_edit_notes( context, REQUEST.AUTHENTICATED_USER, E["moduleimpl_id"], allow_ens=False ) and nbnotes != 0 @@ -83,7 +77,7 @@ def moduleimpl_evaluation_menu(context, evaluation_id, nbnotes=0, REQUEST=None): "args": { "evaluation_id": evaluation_id, }, - "enabled": sco_saisie_notes.can_edit_notes( + "enabled": sco_permissions_check.can_edit_notes( context, REQUEST.AUTHENTICATED_USER, E["moduleimpl_id"] ), }, @@ -93,7 +87,7 @@ def moduleimpl_evaluation_menu(context, evaluation_id, nbnotes=0, REQUEST=None): "args": { "evaluation_id": evaluation_id, }, - "enabled": sco_saisie_notes.can_edit_notes( + "enabled": sco_permissions_check.can_edit_notes( context, REQUEST.AUTHENTICATED_USER, E["moduleimpl_id"], allow_ens=False ), }, @@ -104,7 +98,7 @@ def moduleimpl_evaluation_menu(context, evaluation_id, nbnotes=0, REQUEST=None): "evaluation_id": evaluation_id, }, "enabled": nbnotes == 0 - and sco_saisie_notes.can_edit_notes( + and sco_permissions_check.can_edit_notes( context, REQUEST.AUTHENTICATED_USER, E["moduleimpl_id"], allow_ens=False ), }, @@ -114,7 +108,7 @@ def moduleimpl_evaluation_menu(context, evaluation_id, nbnotes=0, REQUEST=None): "args": { "evaluation_id": evaluation_id, }, - "enabled": sco_saisie_notes.can_edit_notes( + "enabled": sco_permissions_check.can_edit_notes( context, REQUEST.AUTHENTICATED_USER, E["moduleimpl_id"], allow_ens=False ), }, @@ -133,14 +127,17 @@ def moduleimpl_evaluation_menu(context, evaluation_id, nbnotes=0, REQUEST=None): "evaluation_id": evaluation_id, }, "enabled": nbnotes == 0 - and sco_saisie_notes.can_edit_notes( + and sco_permissions_check.can_edit_notes( context, REQUEST.AUTHENTICATED_USER, E["moduleimpl_id"] ), }, { "title": "Absences ce jour", - "endpoint": "absences.EtatAbsencesDate?date=%s&group_ids=%s" - % (endpointlib.quote(E["jour"], safe=""), group_id), + "endpoint": "absences.EtatAbsencesDate", + "args": { + "date": urllib.quote(E["jour"], safe=""), + "group_ids": group_id, + }, "enabled": E["jour"], }, { @@ -163,7 +160,9 @@ def moduleimpl_status(context, moduleimpl_id=None, partition_id=None, REQUEST=No formsemestre_id = M["formsemestre_id"] Mod = sco_edit_module.do_module_list(context, args={"module_id": M["module_id"]})[0] sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - F = sco_formations.formation_list(context, args={"formation_id": sem["formation_id"]})[0] + F = sco_formations.formation_list( + context, args={"formation_id": sem["formation_id"]} + )[0] ModInscrits = sco_moduleimpl.do_moduleimpl_inscription_list( context, moduleimpl_id=M["moduleimpl_id"] ) @@ -171,16 +170,20 @@ def moduleimpl_status(context, moduleimpl_id=None, partition_id=None, REQUEST=No nt = sco_core.get_notes_cache( context, ).get_NotesTable(context, formsemestre_id) - ModEvals = sco_evaluations.do_evaluation_list(context, {"moduleimpl_id": moduleimpl_id}) + ModEvals = sco_evaluations.do_evaluation_list( + context, {"moduleimpl_id": moduleimpl_id} + ) ModEvals.sort( key=lambda x: (x["numero"], x["jour"], x["heure_debut"]), reverse=True ) # la plus RECENTE en tête # - caneditevals = sco_saisie_notes.can_edit_notes( + caneditevals = sco_permissions_check.can_edit_notes( context, authuser, moduleimpl_id, allow_ens=sem["ens_can_edit_eval"] ) - caneditnotes = sco_saisie_notes.can_edit_notes(context, authuser, moduleimpl_id) + caneditnotes = sco_permissions_check.can_edit_notes( + context, authuser, moduleimpl_id + ) arrow_up, arrow_down, arrow_none = sco_groups.getArrowIconsTags(context, REQUEST) # H = [ @@ -281,7 +284,7 @@ def moduleimpl_status(context, moduleimpl_id=None, partition_id=None, REQUEST=No # Adapté à partir d'une suggestion de DS (Le Havre) # Liens saisies absences seulement si permission et date courante dans le semestre if authuser.has_permission( - ScoAbsChange, context + Permission.ScoAbsChange ) and sco_formsemestre.sem_est_courant(context, sem): datelundi = sco_abs.ddmmyyyy(time.strftime("%d/%m/%Y")).prev_monday() group_id = sco_groups.get_default_group(context, formsemestre_id) @@ -366,7 +369,10 @@ def moduleimpl_status(context, moduleimpl_id=None, partition_id=None, REQUEST=No partition_id=partition_id, select_first_partition=True, ) - if eval["evaluation_type"] in (EVALUATION_RATTRAPAGE, EVALUATION_SESSION2): + if eval["evaluation_type"] in ( + scu.EVALUATION_RATTRAPAGE, + scu.EVALUATION_SESSION2, + ): tr_class = "mievr mievr_rattr" else: tr_class = "mievr" @@ -385,11 +391,11 @@ def moduleimpl_status(context, moduleimpl_id=None, partition_id=None, REQUEST=No % eval ) H.append("    %(description)s" % eval) - if eval["evaluation_type"] == EVALUATION_RATTRAPAGE: + if eval["evaluation_type"] == scu.EVALUATION_RATTRAPAGE: H.append( """rattrapage""" ) - elif eval["evaluation_type"] == EVALUATION_SESSION2: + elif eval["evaluation_type"] == scu.EVALUATION_SESSION2: H.append( """session 2""" ) diff --git a/app/scodoc/sco_news.py b/app/scodoc/sco_news.py index e405842d..a8d6b1f8 100644 --- a/app/scodoc/sco_news.py +++ b/app/scodoc/sco_news.py @@ -27,23 +27,24 @@ """Gestions des "nouvelles" """ - -import PyRSS2Gen # pylint: disable=import-error -from cStringIO import StringIO -import datetime, re +import datetime +import re import time -from stripogram import html2text, html2safehtml +from cStringIO import StringIO from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from email.header import Header +from stripogram import html2text +import PyRSS2Gen # pylint: disable=import-error -import notesdb as ndb -from notes_log import log -import mails -import scolars -from sco_utils import SCO_ENCODING, SCO_ANNONCES_WEBSITE -import sco_formsemestre -import sco_moduleimpl +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc import mails +from app.scodoc.sco_utils import SCO_ENCODING, SCO_ANNONCES_WEBSITE +from app.scodoc import sco_formsemestre +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_preferences _scolar_news_editor = ndb.EditableTable( "scolar_news", @@ -109,6 +110,7 @@ def scolar_news_summary(context, n=5): """Return last n news. News are "compressed", ie redondant events are joined. """ + from app.scodoc import sco_etud cnx = ndb.GetDBConnexion() cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) @@ -140,7 +142,7 @@ def scolar_news_summary(context, n=5): n[k] = _scolar_news_editor.output_formators[k](n[k]) # date resumee j, m = n["date"].split("/")[:2] - mois = scolars.abbrvmonthsnames[int(m) - 1] + mois = sco_etud.MONTH_NAMES_ABBREV[int(m) - 1] n["formatted_date"] = "%s %s %s" % (j, mois, n["hm"]) # indication semestre si ajout notes: infos = _get_formsemestre_infos_from_news(context, n) diff --git a/app/scodoc/sco_page_etud.py b/app/scodoc/sco_page_etud.py index 7272f051..e52b4278 100644 --- a/app/scodoc/sco_page_etud.py +++ b/app/scodoc/sco_page_etud.py @@ -31,31 +31,26 @@ """ -import sco_utils as scu -import notesdb as ndb -from notes_log import log -import scolars -import sco_bac -import sco_photos -import sco_groups -import sco_formsemestre -from scolars import format_telephone, format_pays, make_etud_args -import sco_formsemestre_status -import htmlutils -import html_sco_header -from sco_bulletins import etud_descr_situation_semestre -import sco_parcours_dut -import sco_codes_parcours -from sco_formsemestre_validation import formsemestre_recap_parcours_table -import sco_archives_etud -import sco_report -from sco_permissions import ( - ScoEtudChangeGroups, - ScoEtudInscrit, - ScoImplement, - ScoEtudChangeAdr, -) -from sco_exceptions import ScoValueError +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc import html_sco_header +from app.scodoc import htmlutils +from app.scodoc import sco_archives_etud +from app.scodoc import sco_bac +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_status +from app.scodoc import sco_groups +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_permissions_check +from app.scodoc import sco_photos +from app.scodoc import sco_report +from app.scodoc import sco_etud +from app.scodoc.sco_bulletins import etud_descr_situation_semestre +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_formsemestre_validation import formsemestre_recap_parcours_table +from app.scodoc.sco_permissions import Permission def _menuScolarite(context, authuser, sem, etudid): @@ -67,7 +62,7 @@ def _menuScolarite(context, authuser, sem, etudid): lockicon = scu.icontag("lock32_img", title="verrouillé", border="0") return lockicon # no menu if not authuser.has_permission( - ScoEtudInscrit, context + Permission.ScoEtudInscrit ) and not authuser.has_permission(Permission.ScoEtudChangeGroups): return "" # no menu ins = sem["ins"] @@ -147,14 +142,14 @@ def ficheEtud(context, etudid=None, REQUEST=None): # la sidebar est differente s'il y a ou pas un etudid # voir html_sidebar.sidebar() REQUEST.form["etudid"] = etudid - args = make_etud_args(etudid=etudid, REQUEST=REQUEST) - etuds = scolars.etudident_list(cnx, args) + args = sco_etud.make_etud_args(etudid=etudid, REQUEST=REQUEST) + etuds = sco_etud.etudident_list(cnx, args) if not etuds: log("ficheEtud: etudid=%s REQUEST.form=%s" % (etudid, REQUEST.form)) raise ScoValueError("Etudiant inexistant !") etud = etuds[0] etudid = etud["etudid"] - scolars.fillEtudsInfo(context, [etud]) + sco_etud.fill_etuds_info([etud]) # info = etud info["ScoURL"] = scu.ScoURL() @@ -172,7 +167,7 @@ def ficheEtud(context, etudid=None, REQUEST=None): ): info["domicile"] = "inconnue" if info["paysdomicile"]: - pays = format_pays(info["paysdomicile"]) + pays = sco_etud.format_pays(info["paysdomicile"]) if pays: info["paysdomicile"] = "(%s)" % pays else: @@ -273,9 +268,9 @@ def ficheEtud(context, etudid=None, REQUEST=None): # Liste des annotations alist = [] - annos = scolars.etud_annotations_list(cnx, args={"etudid": etudid}) + annos = sco_etud.etud_annotations_list(cnx, args={"etudid": etudid}) for a in annos: - if not sco_permissions.can_suppress_annotation(context, a["id"], REQUEST): + if not sco_permissions_check.can_suppress_annotation(context, a["id"], REQUEST): a["dellink"] = "" else: a[ @@ -351,7 +346,7 @@ def ficheEtud(context, etudid=None, REQUEST=None): # Devenir de l'étudiant: has_debouche = True # info['debouche'] - if sco_permissions.can_edit_suivi(context, REQUEST): + if sco_permissions_check.can_edit_suivi(context, REQUEST): suivi_readonly = "0" link_add_suivi = """
        • ajouter une ligne @@ -496,7 +491,7 @@ def menus_etud(context, REQUEST=None): return "" authuser = REQUEST.AUTHENTICATED_USER - etud = scolars.get_etud_info(filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] menuEtud = [ { @@ -550,7 +545,7 @@ def etud_info_html(context, etudid, with_photo="1", REQUEST=None, debug=False): # log('etud_info_html: formsemestre_id=%s' % formsemestre_id) with_photo = int(with_photo) - etud = scolars.get_etud_info(filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(filled=1, REQUEST=REQUEST)[0] photo_html = sco_photos.etud_photo_html( context, etud, title="fiche de " + etud["nom"], REQUEST=REQUEST ) diff --git a/app/scodoc/sco_parcours_dut.py b/app/scodoc/sco_parcours_dut.py index 1eb8c7cc..96516637 100644 --- a/app/scodoc/sco_parcours_dut.py +++ b/app/scodoc/sco_parcours_dut.py @@ -29,13 +29,14 @@ """ from types import FloatType -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from scolog import logdb -import sco_formsemestre - -from sco_codes_parcours import ( +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.scolog import logdb +from app.scodoc import sco_core +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formations +from app.scodoc.sco_codes_parcours import ( CMP, ADC, ADJ, @@ -58,8 +59,8 @@ from sco_codes_parcours import ( code_semestre_attente, code_semestre_validant, ) -from dutrules import DUTRules # regles generees a partir du CSV -from sco_exceptions import ScoValueError +from app.scodoc.dutrules import DUTRules # regles generees a partir du CSV +from app.scodoc.sco_exceptions import ScoValueError class DecisionSem: @@ -120,7 +121,7 @@ class SituationEtudParcoursGeneric: def __init__(self, context, etud, formsemestre_id, nt): """ - etud: dict filled by fillEtudsInfo() + etud: dict filled by fill_etuds_info() """ self.context = context self.etud = etud @@ -295,7 +296,7 @@ class SituationEtudParcoursGeneric: sem["semestre_id"] == n1 and sem["formation_code"] == self.formation["formation_code"] ): - nt = self.sco_core.get_notes_cache(context).get_NotesTable( + nt = sco_core.get_notes_cache(self.context).get_NotesTable( self.context, sem["formsemestre_id"] ) # > get_etud_decision_sem decision = nt.get_etud_decision_sem(self.etudid) @@ -311,7 +312,7 @@ class SituationEtudParcoursGeneric: sont validés. En sortie, sem_idx_set contient ceux qui n'ont pas été validés.""" for sem in self.get_semestres(): if sem["formation_code"] == self.formation["formation_code"]: - nt = self.sco_core.get_notes_cache(context).get_NotesTable( + nt = sco_core.get_notes_cache(self.context).get_NotesTable( self.context, sem["formsemestre_id"] ) # > get_etud_decision_sem decision = nt.get_etud_decision_sem(self.etudid) @@ -322,14 +323,14 @@ class SituationEtudParcoursGeneric: return not sem_idx_set def _comp_semestres(self): - # etud['sems'] est trie par date decroissante (voir fillEtudsInfo) + # etud['sems'] est trie par date decroissante (voir fill_etuds_info) sems = self.etud["sems"][:] # copy sems.reverse() # Nb max d'UE et acronymes ue_acros = {} # acronyme ue : 1 nb_max_ue = 0 for sem in sems: - nt = self.sco_core.get_notes_cache(context).get_NotesTable( + nt = sco_core.get_notes_cache(self.context).get_NotesTable( self.context, sem["formsemestre_id"] ) # > get_ues ues = nt.get_ues(filter_sport=True) @@ -339,8 +340,8 @@ class SituationEtudParcoursGeneric: if nb_ue > nb_max_ue: nb_max_ue = nb_ue # add formation_code to each sem: - sem["formation_code"] = self.sco_formations.formation_list(context, - args={"formation_id": sem["formation_id"]} + sem["formation_code"] = sco_formations.formation_list( + self.context, args={"formation_id": sem["formation_id"]} )[0]["formation_code"] # si sem peut servir à compenser le semestre courant, positionne # can_compensate @@ -399,7 +400,7 @@ class SituationEtudParcoursGeneric: if not sem: code = "" # non inscrit à ce semestre else: - nt = self.sco_core.get_notes_cache(context).get_NotesTable( + nt = sco_core.get_notes_cache(self.context).get_NotesTable( self.context, sem["formsemestre_id"] ) # > get_etud_decision_sem decision = nt.get_etud_decision_sem(self.etudid) @@ -471,7 +472,7 @@ class SituationEtudParcoursGeneric: # Verifications basiques: # ? # Code etat du semestre precedent: - nt = self.sco_core.get_notes_cache(context).get_NotesTable( + nt = sco_core.get_notes_cache(self.context).get_NotesTable( self.context, prev["formsemestre_id"] ) # > get_etud_decision_sem, get_etud_moy_gen, etud_check_conditions_ues self.prev_decision = nt.get_etud_decision_sem(self.etudid) @@ -530,7 +531,7 @@ class SituationEtudParcoursGeneric: sem["formation_code"] == self.formation["formation_code"] and sem["semestre_id"] == s ): - nt = self.sco_core.get_notes_cache(context).get_NotesTable( + nt = sco_core.get_notes_cache(self.context).get_NotesTable( self.context, sem["formsemestre_id"] ) # > get_etud_decision_sem decision = nt.get_etud_decision_sem(self.etudid) @@ -629,8 +630,8 @@ class SituationEtudParcoursGeneric: REQUEST=REQUEST, ) - self.sco_core.inval_cache( - context, formsemestre_id=self.prev["formsemestre_id"] + sco_core.inval_cache( + self.context, formsemestre_id=self.prev["formsemestre_id"] ) # > modif decisions jury (sem, UE) # -- supprime autorisations venant de ce formsemestre @@ -659,17 +660,18 @@ class SituationEtudParcoursGeneric: except: cnx.rollback() raise - self.sco_core.inval_cache( - context, formsemestre_id=self.formsemestre_id + sco_core.inval_cache( + self.context, formsemestre_id=self.formsemestre_id ) # > modif decisions jury et autorisations inscription if decision.formsemestre_id_utilise_pour_compenser: # inval aussi le semestre utilisé pour compenser: - self.sco_core.inval_cache( - context, formsemestre_id=decision.formsemestre_id_utilise_pour_compenser + sco_core.inval_cache( + self.context, + formsemestre_id=decision.formsemestre_id_utilise_pour_compenser, ) # > modif decision jury for formsemestre_id in to_invalidate: - self.sco_core.inval_cache( - context, formsemestre_id=formsemestre_id + sco_core.inval_cache( + self.context, formsemestre_id=formsemestre_id ) # > modif decision jury @@ -1098,7 +1100,9 @@ def list_formsemestre_utilisateurs_uecap(context, formsemestre_id): semestre): meme code formation, meme semestre_id, date posterieure""" cnx = ndb.GetDBConnexion() sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - F = sco_formations.formation_list(context, args={"formation_id": sem["formation_id"]})[0] + F = sco_formations.formation_list( + context, args={"formation_id": sem["formation_id"]} + )[0] cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) cursor.execute( """select sem.formsemestre_id diff --git a/app/scodoc/sco_pdf.py b/app/scodoc/sco_pdf.py index 2f53f714..4ae9118d 100644 --- a/app/scodoc/sco_pdf.py +++ b/app/scodoc/sco_pdf.py @@ -52,12 +52,17 @@ from reportlab.lib.enums import TA_LEFT, TA_RIGHT, TA_CENTER, TA_JUSTIFY from reportlab.lib import styles from reportlab.lib.pagesizes import letter, A4, landscape -import sco_utils as scu -from sco_utils import CONFIG, SCO_ENCODING, SCODOC_LOGOS_DIR, LOGOS_IMAGES_ALLOWED_TYPES -from notes_log import log -from sco_exceptions import ScoGenError +import app.scodoc.sco_utils as scu +from app.scodoc.sco_utils import ( + CONFIG, + SCO_ENCODING, + SCODOC_LOGOS_DIR, + LOGOS_IMAGES_ALLOWED_TYPES, +) +from app.scodoc.notes_log import log +from app.scodoc.sco_exceptions import ScoGenError from SuppressAccents import suppression_diacritics -import VERSION +from app.scodoc import VERSION from VERSION import SCOVERSION, SCONAME PAGE_HEIGHT = defaultPageSize[1] diff --git a/app/scodoc/sco_permissions.py b/app/scodoc/sco_permissions.py index 5787dc14..0336fc32 100644 --- a/app/scodoc/sco_permissions.py +++ b/app/scodoc/sco_permissions.py @@ -57,67 +57,3 @@ class Permission: Permission.init_permissions() - - -import notesdb as ndb -import scolars -import sco_formsemestre - - -def can_suppress_annotation(context, annotation_id, REQUEST): - """True if current user can suppress this annotation - Seuls l'auteur de l'annotation et le chef de dept peuvent supprimer - une annotation. - """ - cnx = ndb.GetDBConnexion() - annos = scolars.etud_annotations_list(cnx, args={"id": annotation_id}) - if len(annos) != 1: - raise ScoValueError("annotation inexistante !") - anno = annos[0] - authuser = REQUEST.AUTHENTICATED_USER - # note: les anciennes installations n'ont pas le role ScoEtudSupprAnnotations - # c'est pourquoi on teste aussi ScoEtudInscrit (normalement détenue par le chef) - return ( - (str(authuser) == anno["zope_authenticated_user"]) - or authuser.has_permission(Permission.ScoEtudSupprAnnotations) - or authuser.has_permission(Permission.ScoEtudInscrit) - ) - - -def can_edit_suivi(context, REQUEST=None): - """Vrai si l'utilisateur peut modifier les informations de suivi sur la page etud" """ - authuser = REQUEST.AUTHENTICATED_USER - return authuser.has_permission(Permission.ScoEtudChangeAdr) - - -def can_validate_sem(context, REQUEST, formsemestre_id): - "Vrai si utilisateur peut saisir decision de jury dans ce semestre" - sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - if sem["etat"] != "1": - return False # semestre verrouillé - - return is_chef_or_diretud(context, REQUEST, sem) - - -def can_edit_pv(context, REQUEST, formsemestre_id): - "Vrai si utilisateur peut editer un PV de jury de ce semestre" - - sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - if is_chef_or_diretud(context, REQUEST, sem): - return True - # Autorise les secrétariats, repérés via la permission ScoEtudChangeAdr - # (ceci nous évite d'ajouter une permission Zope aux installations existantes) - authuser = REQUEST.AUTHENTICATED_USER - return authuser.has_permission(Permission.ScoEtudChangeAdr) - - -def is_chef_or_diretud(context, REQUEST, sem): - "Vrai si utilisateur est admin, chef dept ou responsable du semestre" - authuser = REQUEST.AUTHENTICATED_USER - if authuser.has_permission(Permission.ScoImplement): - return True # admin, chef dept - uid = str(authuser) - if uid in sem["responsables"]: - return True - - return False \ No newline at end of file diff --git a/app/scodoc/sco_permissions_check.py b/app/scodoc/sco_permissions_check.py new file mode 100644 index 00000000..ef5ed90d --- /dev/null +++ b/app/scodoc/sco_permissions_check.py @@ -0,0 +1,139 @@ +# -*- mode: python -*- +# -*- coding: utf-8 -*- + +"""Functions checking permissions for some common operations +""" + +import app.scodoc.notesdb as ndb +from app.scodoc.sco_permissions import Permission +from app.scodoc import html_sco_header +from app.scodoc import sco_etud +from app.scodoc import sco_exceptions +from app.scodoc import sco_formsemestre +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_parcours_dut + + +def can_edit_notes(context, authuser, moduleimpl_id, allow_ens=True): + """True if authuser can enter or edit notes in this module. + If allow_ens, grant access to all ens in this module + + Si des décisions de jury ont déjà été saisies dans ce semestre, + seul le directeur des études peut saisir des notes (et il ne devrait pas). + """ + uid = str(authuser) + M = sco_moduleimpl.do_moduleimpl_list(context, moduleimpl_id=moduleimpl_id)[0] + sem = sco_formsemestre.get_formsemestre(context, M["formsemestre_id"]) + if sem["etat"] != "1": + return False # semestre verrouillé + + if sco_parcours_dut.formsemestre_has_decisions(context, sem["formsemestre_id"]): + # il y a des décisions de jury dans ce semestre ! + return ( + authuser.has_permission(Permission.ScoEditAllNotes) + or uid in sem["responsables"] + ) + else: + if ( + (not authuser.has_permission(Permission.ScoEditAllNotes)) + and uid != M["responsable_id"] + and uid not in sem["responsables"] + ): + # enseignant (chargé de TD) ? + if allow_ens: + for ens in M["ens"]: + if ens["ens_id"] == uid: + return True + return False + else: + return True + + +def can_suppress_annotation(context, annotation_id, REQUEST): + """True if current user can suppress this annotation + Seuls l'auteur de l'annotation et le chef de dept peuvent supprimer + une annotation. + """ + cnx = ndb.GetDBConnexion() + annos = sco_etud.etud_annotations_list(cnx, args={"id": annotation_id}) + if len(annos) != 1: + raise sco_exceptions.ScoValueError("annotation inexistante !") + anno = annos[0] + authuser = REQUEST.AUTHENTICATED_USER + # note: les anciennes installations n'ont pas le role ScoEtudSupprAnnotations + # c'est pourquoi on teste aussi ScoEtudInscrit (normalement détenue par le chef) + return ( + (str(authuser) == anno["zope_authenticated_user"]) + or authuser.has_permission(Permission.ScoEtudSupprAnnotations) + or authuser.has_permission(Permission.ScoEtudInscrit) + ) + + +def can_edit_suivi(context, REQUEST=None): + """Vrai si l'utilisateur peut modifier les informations de suivi sur la page etud" """ + authuser = REQUEST.AUTHENTICATED_USER + return authuser.has_permission(Permission.ScoEtudChangeAdr) + + +def can_validate_sem(context, REQUEST, formsemestre_id): + "Vrai si utilisateur peut saisir decision de jury dans ce semestre" + sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) + if sem["etat"] != "1": + return False # semestre verrouillé + + return is_chef_or_diretud(context, REQUEST, sem) + + +def can_edit_pv(context, REQUEST, formsemestre_id): + "Vrai si utilisateur peut editer un PV de jury de ce semestre" + + sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) + if is_chef_or_diretud(context, REQUEST, sem): + return True + # Autorise les secrétariats, repérés via la permission ScoEtudChangeAdr + # (ceci nous évite d'ajouter une permission Zope aux installations existantes) + authuser = REQUEST.AUTHENTICATED_USER + return authuser.has_permission(Permission.ScoEtudChangeAdr) + + +def is_chef_or_diretud(context, REQUEST, sem): + "Vrai si utilisateur est admin, chef dept ou responsable du semestre" + authuser = REQUEST.AUTHENTICATED_USER + if authuser.has_permission(Permission.ScoImplement): + return True # admin, chef dept + uid = str(authuser) + if uid in sem["responsables"]: + return True + + return False + + +def check_access_diretud( + context, formsemestre_id, REQUEST, required_permission=Permission.ScoImplement +): + """Check if access granted: responsable or ScoImplement + Return True|False, HTML_error_page + """ + authuser = REQUEST.AUTHENTICATED_USER + sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) + header = html_sco_header.sco_header( + context, page_title="Accès interdit", REQUEST=REQUEST + ) + footer = html_sco_header.sco_footer(context, REQUEST) + if (str(authuser) not in sem["responsables"]) and not authuser.has_permission( + required_permission + ): + return ( + False, + "\n".join( + [ + header, + "

          Opération non autorisée pour %s

          " % authuser, + "

          Responsable de ce semestre : %s

          " + % ", ".join(sem["responsables"]), + footer, + ] + ), + ) + else: + return True, "" diff --git a/app/scodoc/sco_photos.py b/app/scodoc/sco_photos.py index 549ba48e..480f2f70 100644 --- a/app/scodoc/sco_photos.py +++ b/app/scodoc/sco_photos.py @@ -54,17 +54,18 @@ from cStringIO import StringIO import glob from config import Config -from sco_utils import CONFIG, SCO_SRC_DIR -import notesdb as ndb -from notes_log import log -import scolars -import sco_portal_apogee -from scolog import logdb +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.scolog import logdb +from app.scodoc import sco_portal_apogee +from app.scodoc import sco_preferences +from app.scodoc import sco_etud # Full paths on server's filesystem. Something like "/opt/scodoc/var/scodoc/photos" PHOTO_DIR = os.path.join(Config.INSTANCE_HOME, "var", "scodoc", "photos") -ICONS_DIR = os.path.join(SCO_SRC_DIR, "app", "static", "icons") +ICONS_DIR = os.path.join(scu.SCO_SRC_DIR, "app", "static", "icons") UNKNOWN_IMAGE_PATH = os.path.join(ICONS_DIR, "unknown.jpg") UNKNOWN_IMAGE_URL = "get_photo_image?etudid=" # with empty etudid => unknown face image IMAGE_EXT = ".jpg" @@ -104,7 +105,7 @@ def etud_photo_url(context, etud, size="small", fast=False, REQUEST=None): if not new_path: # copy failed, can we use external url ? # nb: rarement utile, car le portail est rarement accessible sans authentification - if CONFIG.PUBLISH_PORTAL_PHOTO_URL: + if scu.CONFIG.PUBLISH_PORTAL_PHOTO_URL: photo_url = ext_url else: photo_url = UNKNOWN_IMAGE_URL @@ -118,7 +119,7 @@ def get_photo_image(context, etudid=None, size="small", REQUEST=None): if not etudid: filename = UNKNOWN_IMAGE_PATH else: - etud = scolars.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST)[0] filename = photo_pathname(context, etud, size=size) if not filename: filename = UNKNOWN_IMAGE_PATH @@ -173,7 +174,7 @@ def etud_photo_html( """ if not etud: if etudid: - etud = scolars.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST)[0] else: raise ValueError("etud_photo_html: either etud or etudid must be specified") photo_url = etud_photo_url(context, etud, size=size, REQUEST=REQUEST) @@ -247,7 +248,7 @@ def store_photo(context, etud, data, REQUEST=None): etud["foto"] = None cnx = ndb.GetDBConnexion() - scolars.identite_edit_nocheck(cnx, etud) + sco_etud.identite_edit_nocheck(cnx, etud) cnx.commit() # if REQUEST: @@ -263,7 +264,7 @@ def suppress_photo(context, etud, REQUEST=None): # 1- remove ref. from database etud["photo_filename"] = None cnx = ndb.GetDBConnexion() - scolars.identite_edit_nocheck(cnx, etud) + sco_etud.identite_edit_nocheck(cnx, etud) cnx.commit() # 2- erase images files if rel_path: @@ -341,7 +342,7 @@ def copy_portal_photo_to_fs(context, etud, REQUEST=None): """Copy the photo from portal (distant website) to local fs. Returns rel. path or None if copy failed, with a diagnotic message """ - scolars.format_etud_ident(etud) + sco_etud.format_etud_ident(etud) url = photo_portal_url(context, etud) if not url: return None, "%(nomprenom)s: pas de code NIP" % etud diff --git a/app/scodoc/sco_placement.py b/app/scodoc/sco_placement.py index 321cf7ac..344aed15 100644 --- a/app/scodoc/sco_placement.py +++ b/app/scodoc/sco_placement.py @@ -33,20 +33,25 @@ Contribution M. Salomon, UFC / IUT DE BELFORT-MONTBÉLIARD, 2016 import urllib import random -import sco_utils as scu -import notesdb as ndb -from notes_log import log -import scolars -import sco_formsemestre -import sco_moduleimpl -import sco_groups -import sco_evaluations -import sco_saisie_notes -import sco_excel -from sco_excel import * -from TrivialFormulator import TrivialFormulator -from gen_tables import GenTable -import VERSION +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc import html_sco_header +from app.scodoc import sco_edit_module +from app.scodoc import sco_evaluations +from app.scodoc import sco_excel +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_groups +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_permissions_check +from app.scodoc import sco_preferences +from app.scodoc import sco_saisie_notes +from app.scodoc import sco_etud +from app.scodoc import VERSION +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_excel import * +from app.scodoc.TrivialFormulator import TrivialFormulator def do_placement_selectetuds(context, REQUEST): @@ -240,7 +245,7 @@ def do_placement(context, REQUEST): # Check access # (admin, respformation, and responsable_id) - if not sco_saisie_notes.can_edit_notes(context, authuser, E["moduleimpl_id"]): + if not sco_permissions_check.can_edit_notes(context, authuser, E["moduleimpl_id"]): return ( "

          Génération du placement impossible pour %s

          " % authusername + """

          (vérifiez que le semestre n'est pas verrouillé et que vous @@ -294,12 +299,12 @@ def do_placement(context, REQUEST): listetud = [] # liste de couples (nom,prenom) for etudid in etudids: # infos identite etudiant (xxx sous-optimal: 1/select par etudiant) - ident = scolars.etudident_list(cnx, {"etudid": etudid})[ + ident = sco_etud.etudident_list(cnx, {"etudid": etudid})[ 0 ] # XXX utiliser ZScolar (parent) # infos inscription - inscr = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, - {"etudid": etudid, "formsemestre_id": M["formsemestre_id"]} + inscr = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, {"etudid": etudid, "formsemestre_id": M["formsemestre_id"]} )[0] if inscr["etat"] != "D": nom = scu.strupper(ident["nom"]) @@ -395,7 +400,9 @@ def do_placement(context, REQUEST): def placement_eval_selectetuds(context, evaluation_id, REQUEST=None): """Dialogue placement etudiants: choix methode et localisation""" - evals = sco_evaluations.do_evaluation_list(context, {"evaluation_id": evaluation_id}) + evals = sco_evaluations.do_evaluation_list( + context, {"evaluation_id": evaluation_id} + ) if not evals: raise ScoValueError("invalid evaluation_id") theeval = evals[0] diff --git a/app/scodoc/sco_portal_apogee.py b/app/scodoc/sco_portal_apogee.py index 1b2f57c2..8b7afb37 100644 --- a/app/scodoc/sco_portal_apogee.py +++ b/app/scodoc/sco_portal_apogee.py @@ -35,11 +35,10 @@ import xml.sax.saxutils import xml.dom.minidom import datetime -import sco_utils as scu -from sco_utils import SCO_ENCODING -from sco_permissions import ScoEtudInscrit -from sco_exceptions import ScoValueError -from notes_log import log +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc import sco_preferences SCO_CACHE_ETAPE_FILENAME = os.path.join(scu.SCO_TMP_DIR, "last_etapes.xml") @@ -247,7 +246,9 @@ def xml_to_list_of_dicts(doc, req=None): if e.nodeType == e.ELEMENT_NODE: childs = e.childNodes if len(childs): - d[str(e.nodeName)] = childs[0].nodeValue.encode(SCO_ENCODING) + d[str(e.nodeName)] = childs[0].nodeValue.encode( + scu.SCO_ENCODING + ) infos.append(d) except: log("*** invalid XML response from Etudiant Web Service") @@ -260,7 +261,7 @@ def xml_to_list_of_dicts(doc, req=None): def get_infos_apogee_allaccents(context, nom, prenom): "essai recup infos avec differents codages des accents" if nom: - unom = unicode(nom, SCO_ENCODING) + unom = unicode(nom, scu.SCO_ENCODING) nom_noaccents = str(scu.suppression_diacritics(unom)) nom_utf8 = unom.encode("utf-8") else: @@ -268,7 +269,7 @@ def get_infos_apogee_allaccents(context, nom, prenom): nom_utf8 = nom if prenom: - uprenom = unicode(prenom, SCO_ENCODING) + uprenom = unicode(prenom, scu.SCO_ENCODING) prenom_noaccents = str(scu.suppression_diacritics(uprenom)) prenom_utf8 = uprenom.encode("utf-8") else: @@ -336,7 +337,7 @@ def get_etud_apogee(context, code_nip): def get_default_etapes(context): """Liste par défaut, lue du fichier de config""" - filename = SCO_TOOLS_DIR + "/default-etapes.txt" + filename = scu.SCO_TOOLS_DIR + "/default-etapes.txt" log("get_default_etapes: reading %s" % filename) f = open(filename) etapes = {} @@ -366,7 +367,7 @@ def _parse_etapes_from_xml(context, doc): # Ancien format XML avec des sections par departement: for d in dom.childNodes[0].childNodes: if d.nodeType == d.ELEMENT_NODE: - dept = d.nodeName.encode(SCO_ENCODING) + dept = d.nodeName.encode(scu.SCO_ENCODING) _xml_list_codes(infos, dept, d.childNodes) else: # Toutes les étapes: @@ -415,8 +416,8 @@ def get_etapes_apogee(context): def _xml_list_codes(target_dict, dept, nodes): for e in nodes: if e.nodeType == e.ELEMENT_NODE: - intitule = e.childNodes[0].nodeValue.encode(SCO_ENCODING) - code = e.attributes["code"].value.encode(SCO_ENCODING) + intitule = e.childNodes[0].nodeValue.encode(scu.SCO_ENCODING) + code = e.attributes["code"].value.encode(scu.SCO_ENCODING) if target_dict.has_key(dept): target_dict[dept][code] = intitule else: diff --git a/app/scodoc/sco_poursuite_dut.py b/app/scodoc/sco_poursuite_dut.py index 3fa466f6..0a22ee8b 100644 --- a/app/scodoc/sco_poursuite_dut.py +++ b/app/scodoc/sco_poursuite_dut.py @@ -31,14 +31,16 @@ Recapitule tous les semestres validés dans une feuille excel. """ import collections -import sco_utils as scu -from notes_log import log -from gen_tables import GenTable -import sco_formsemestre -import sco_groups -import sco_abs -from sco_codes_parcours import code_semestre_validant, code_semestre_attente -import VERSION +import app.scodoc.sco_utils as scu +from app.scodoc import sco_abs +from app.scodoc import sco_core +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_preferences +from app.scodoc import sco_etud +from app.scodoc import VERSION +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_codes_parcours import code_semestre_validant, code_semestre_attente def etud_get_poursuite_info(context, sem, etud): @@ -158,7 +160,7 @@ def _getEtudInfoGroupes(context, group_ids, etat=None): for group_id in group_ids: members = sco_groups.get_group_members(context, group_id, etat=etat) for m in members: - etud = scolars.get_etud_info(etudid=m["etudid"], filled=True)[0] + etud = sco_etud.get_etud_info(etudid=m["etudid"], filled=True)[0] etuds.append(etud) return etuds diff --git a/app/scodoc/sco_preferences.py b/app/scodoc/sco_preferences.py index 35048409..444ab600 100644 --- a/app/scodoc/sco_preferences.py +++ b/app/scodoc/sco_preferences.py @@ -25,17 +25,6 @@ # ############################################################################## -"""ScoDoc preferences (replaces old Zope properties) -""" - -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF -import sco_formsemestre -import sco_bulletins_generator -from sco_exceptions import ScoValueError, ScoException - """Global/Semestre Preferences for ScoDoc (version dec 2008) Preferences (paramètres) communs à tous les utilisateurs. @@ -96,10 +85,10 @@ sinon, elle ne concerne que le semestre indiqué. PREF_CATEGORIES : définition des catégories de préférences (pour dialogues édition) -PREFS : pour chaque pref, donne infos pour édition (titre, type...) et +prefs_definition : pour chaque pref, donne infos pour édition (titre, type...) et valeur par défaut. -class sco_base_preferences +class BasePreferences Une instance unique par site (département, repéré par URL). - charge les preferences pour tous le semestres depuis la BD. .get(formsemestre_id, name) @@ -111,16 +100,42 @@ Une instance unique par site (département, repéré par URL). class SemPreferences(context,formsemestre_id) Une instance par semestre, et une instance pour prefs globales. -L'attribut .base_prefs point sur sco_base_preferences. +L'attribut .base_prefs point sur BasePreferences. .__getitem__ [name] .is_global(name) .edit(categories=[]) get_base_preferences(context, formsemestre_id) - Return base preferences for this context (instance sco_base_preferences) + Return base preferences for this context (instance BasePreferences) """ +from flask import g + +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.sco_exceptions import ScoValueError, ScoException +from app.scodoc.TrivialFormulator import TrivialFormulator + +_SCO_BASE_PREFERENCES = {} # { URL: BasePreferences instance } + + +def get_base_preferences(context): + """Return global preferences for the current department""" + dept = g.scodoc_dept + if not dept in _SCO_BASE_PREFERENCES: + _SCO_BASE_PREFERENCES[dept] = BasePreferences(context) + return _SCO_BASE_PREFERENCES[dept] + + +def get_preference(context, name, formsemestre_id=None): + """Returns value of named preference. + All preferences have a sensible default value, so this + function always returns a usable value for all defined preferences names. + """ + return get_base_preferences(context).get(formsemestre_id, name) + PREF_CATEGORIES = ( # sur page "Paramètres" @@ -175,1577 +190,9 @@ PREF_CATEGORIES = ( ) -PREFS = ( - ( - "DeptName", - { - "initvalue": "Dept", - "title": "Nom abrégé du département", - "size": 12, - "category": "general", - "only_global": True, - }, - ), - ( - "DeptFullName", - { - "initvalue": "nom du département", - "title": "Nom complet du département", - "explanation": "inutilisé par défaut", - "size": 40, - "category": "general", - "only_global": True, - }, - ), - ( - "UnivName", - { - "initvalue": "", - "title": "Nom de l'Université", - "explanation": "apparait sur les bulletins et PV de jury", - "size": 40, - "category": "general", - "only_global": True, - }, - ), - ( - "InstituteName", - { - "initvalue": "", - "title": "Nom de l'Institut", - "explanation": 'exemple "IUT de Villetaneuse". Peut être utilisé sur les bulletins.', - "size": 40, - "category": "general", - "only_global": True, - }, - ), - ( - "DeptIntranetTitle", - { - "initvalue": "Intranet", - "title": "Nom lien intranet", - "size": 40, - "explanation": 'titre du lien "Intranet" en haut à gauche', - "category": "general", - "only_global": True, - }, - ), - ( - "DeptIntranetURL", - { - "initvalue": "", - "title": """URL de l'"intranet" du département""", - "size": 40, - "explanation": 'lien "Intranet" en haut à gauche', - "category": "general", - "only_global": True, - }, - ), - ( - "emails_notifications", - { - "initvalue": "", - "title": "e-mails à qui notifier les opérations", - "size": 70, - "explanation": "adresses séparées par des virgules; notifie les opérations (saisies de notes, etc). (vous pouvez préférer utiliser le flux rss)", - "category": "general", - "only_global": False, # peut être spécifique à un semestre - }, - ), - # ------------------ MISC - ( - "use_ue_coefs", - { - "initvalue": 0, - "title": "Utiliser les coefficients d'UE pour calculer la moyenne générale", - "explanation": """Calcule les moyennes dans chaque UE, puis pondère ces résultats pour obtenir la moyenne générale. Par défaut, le coefficient d'une UE est simplement la somme des coefficients des modules dans lesquels l'étudiant a des notes. Attention: changer ce réglage va modifier toutes les moyennes du semestre !""", - "input_type": "boolcheckbox", - "category": "misc", - "labels": ["non", "oui"], - "only_global": False, - }, - ), - ( - "recap_hidebac", - { - "initvalue": 0, - "title": "Cacher la colonne Bac", - "explanation": "sur la table récapitulative", - "input_type": "boolcheckbox", - "category": "misc", - "labels": ["non", "oui"], - "only_global": False, - }, - ), - # ------------------ Absences - ( - "email_chefdpt", - { - "initvalue": "", - "title": "e-mail chef du département", - "size": 40, - "explanation": "utilisé pour envoi mail notification absences", - "category": "abs", - "only_global": True, - }, - ), - ( - "work_saturday", - { - "initvalue": 0, - "title": "Considérer le samedi comme travaillé", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "abs", - "only_global": True, # devrait etre par semestre, mais demanderait modif gestion absences - }, - ), - ( - "abs_require_module", # affecte l'UI mais pas les fonctions de base - { - "initvalue": 0, - "title": "Imposer l'indication du module lors de la saisie des absences", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "abs", - "only_global": False, - }, - ), - ( - "handle_billets_abs", - { - "initvalue": 0, - "title": 'Gestion de "billets" d\'absence', - "explanation": 'fonctions pour traiter les "billets" déclarés par les étudiants sur un portail externe', - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "abs", - "only_global": True, - }, - ), - ( - "abs_notify_chief", # renamed from "send_mail_absence_to_chef" - { - "initvalue": 0, - "title": "Notifier les absences au chef", - "explanation": "Envoyer un mail au chef si un étudiant a beaucoup d'absences", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "abs", - "only_global": True, - }, - ), - ( - "abs_notify_respsem", - { - "initvalue": 0, - "title": "Notifier les absences au dir. des études", - "explanation": "Envoyer un mail au responsable du semestre si un étudiant a beaucoup d'absences", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "abs", - }, - ), - ( - "abs_notify_respeval", - { - "initvalue": 0, - "title": "Notifier les absences aux resp. de modules", - "explanation": "Envoyer un mail à chaque absence aux responsable des modules avec évaluation à cette date", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "abs", - }, - ), - ( - "abs_notify_etud", - { - "initvalue": 0, - "title": "Notifier les absences aux étudiants concernés", - "explanation": "Envoyer un mail à l'étudiant s'il a \"beaucoup\" d'absences", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "abs", - }, - ), - ( - "abs_notify_email", - { - "initvalue": "", - "title": "Notifier à:", - "explanation": "e-mail à qui envoyer des notification d'absences (en sus des autres destinataires éventuels, comme le chef etc.)", - "size": 40, - "category": "abs", - }, - ), - ( - "abs_notify_max_freq", - { - "initvalue": 7, - "title": "Fréquence maximale de notification", - "explanation": "en jours (pas plus de X envois de mail pour chaque étudiant/destinataire)", - "size": 4, - "type": "int", - "convert_numbers": True, - "category": "abs", - }, - ), - ( - "abs_notify_abs_threshold", - { - "initvalue": 10, - "title": "Seuil de première notification", - "explanation": "nb minimum d'absences (en 1/2 journées) avant notification", - "size": 4, - "type": "int", - "convert_numbers": True, - "category": "abs", - }, - ), - ( - "abs_notify_abs_increment", - { - "initvalue": 20, # les notification suivantes seront donc rares - "title": "Seuil notifications suivantes", - "explanation": "nb minimum d'absences (en 1/2 journées supplémentaires)", - "size": 4, - "type": "int", - "convert_numbers": True, - "category": "abs", - }, - ), - ( - "abs_notification_mail_tmpl", - { - "initvalue": """ ---- Ceci est un message de notification automatique issu de ScoDoc --- +class BasePreferences(object): + """Global preferences""" -L'étudiant %(nomprenom)s -inscrit en %(inscription)s) - -a cumulé %(nbabsjust)s absences justifiées -et %(nbabsnonjust)s absences NON justifiées. - -Le compte a pu changer depuis cet envoi, voir la fiche sur %(url_ficheetud)s. - - -Votre dévoué serveur ScoDoc. - -PS: Au dela de %(abs_notify_abs_threshold)s, un email automatique est adressé toutes les %(abs_notify_abs_increment)s absences. Ces valeurs sont modifiables dans les préférences de ScoDoc. -""", - "title": """Message notification e-mail""", - "explanation": """Balises remplacées, voir la documentation""", - "input_type": "textarea", - "rows": 15, - "cols": 64, - "category": "abs", - }, - ), - # portal - ( - "portal_url", - { - "initvalue": "", - "title": "URL du portail", - "size": 40, - "category": "portal", - "only_global": True, - }, - ), - ( - "portal_timeout", - { - "initvalue": 3, - "title": "timeout", - "explanation": "secondes", - "size": 3, - "type": "int", - "convert_numbers": True, - "category": "portal", - "only_global": True, - }, - ), - ( - "portal_dept_name", - { - "initvalue": "Dept", - "title": "Code du département sur le portail", - "category": "portal", - "only_global": True, - }, - ), - ( - "etapes_url", - { - "initvalue": "", - "title": "URL listant les étapes Apogée", - "size": 40, - "category": "portal", - "only_global": True, - "explanation": "par defaut, selon l'api, getEtapes ou scodocEtapes sur l'URL du portail", - }, - ), - ( - "maquette_url", - { - "initvalue": "", - "title": "URL maquettes Apogee", - "size": 40, - "category": "portal", - "only_global": True, - "explanation": "par defaut, scodocMaquette sur l'URL du portail", - }, - ), - ( - "portal_api", - { - "initvalue": 1, - "title": "Version de l'API", - "explanation": "1 ou 2", - "size": 3, - "type": "int", - "convert_numbers": True, - "category": "portal", - "only_global": True, - }, - ), - ( - "etud_url", - { - "initvalue": "", - "title": "URL listant les étudiants Apogée", - "size": 40, - "category": "portal", - "only_global": True, - "explanation": "par defaut, selon l'api, getEtud ou scodocEtudiant sur l'URL du portail", - }, - ), - ( - "photo_url", - { - "initvalue": "", - "title": "URL donnant la photo d'un étudiant avec argument nip=", - "size": 40, - "category": "portal", - "only_global": True, - "explanation": "par defaut, selon l'api, getPhoto ou scodocPhoto sur l'URL du portail", - }, - ), - ( - "xml_etapes_by_dept", - { - "initvalue": 1, - "title": "Etapes séparées par département", - "explanation": "XML getEtapes structuré en départements ?", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "portal", - "only_global": True, - }, - ), - ( - "notify_etud_changes_to", - { - "initvalue": "", - "title": "e-mail à qui notifier les changements d'identité des étudiants", - "explanation": "utile pour mettre à jour manuellement d'autres bases de données", - "size": 40, - "category": "portal", - "only_global": True, - }, - ), - ( - "always_require_ine", - { - "initvalue": 0, - "title": "Impose la présence du code INE", - "explanation": "lors de toute création d'étudiant (manuelle ou non)", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "portal", - "only_global": True, - }, - ), - ( - "always_require_apo_sem_codes", - { - "initvalue": 0, - "title": "Impose la présence des codes Apogée", - "explanation": "lors des créations de semestres", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "portal", - "only_global": True, - }, - ), - # exports Apogée - ( - "export_res_etape", - { - "initvalue": 1, - "title": "Exporter résultat de l'étape", - "explanation": "remplissage maquettes export Apogée", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "portal", - "only_global": True, - }, - ), - ( - "export_res_sem", - { - "initvalue": 1, - "title": "Exporter résultat du semestre", - "explanation": "remplissage maquettes export Apogée", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "portal", - "only_global": True, - }, - ), - ( - "export_res_ues", - { - "initvalue": 1, - "title": "Exporter les résultats d'UE", - "explanation": "remplissage maquettes export Apogée", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "portal", - "only_global": True, - }, - ), - ( - "export_res_modules", - { - "initvalue": 1, - "title": "Exporter les résultats de modules", - "explanation": "remplissage maquettes export Apogée", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "portal", - "only_global": True, - }, - ), - ( - "export_res_sdj", - { - "initvalue": 0, - "title": "Exporter les résultats même sans décision de jury", - "explanation": "si coché, exporte exporte étudiants même si pas décision de jury saisie (sinon laisse vide)", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "portal", - "only_global": True, - }, - ), - ( - "export_res_rat", - { - "initvalue": 1, - "title": "Exporter les RAT comme ATT", - "explanation": "si coché, exporte exporte étudiants en attente de ratrapage comme ATT (sinon laisse vide)", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "portal", - "only_global": True, - }, - ), - # pdf - ( - "SCOLAR_FONT", - { - "initvalue": "Helvetica", - "title": "Police de caractère principale", - "explanation": "pour les pdf", - "size": 25, - "category": "pdf", - }, - ), - ( - "SCOLAR_FONT_SIZE", - { - "initvalue": 10, - "title": "Taille des caractères", - "explanation": "pour les pdf", - "size": 4, - "type": "int", - "convert_numbers": True, - "category": "pdf", - }, - ), - ( - "SCOLAR_FONT_SIZE_FOOT", - { - "initvalue": 6, - "title": "Taille des caractères pied de page", - "explanation": "pour les pdf", - "size": 4, - "type": "int", - "convert_numbers": True, - "category": "pdf", - }, - ), - ( - "pdf_footer_x", - { - "initvalue": 20, - "title": "Position horizontale du pied de page pdf (en mm)", - "size": 8, - "type": "float", - "category": "pdf", - }, - ), - ( - "pdf_footer_y", - { - "initvalue": 6.35, - "title": "Position verticale du pied de page pdf (en mm)", - "size": 8, - "type": "float", - "category": "pdf", - }, - ), - # pvpdf - ( - "DirectorName", - { - "initvalue": "", - "title": "Nom du directeur de l'établissement", - "size": 32, - "explanation": "pour les PV de jury", - "category": "pvpdf", - }, - ), - ( - "DirectorTitle", - { - "initvalue": """directeur de l'IUT""", - "title": 'Titre du "directeur"', - "explanation": "titre apparaissant à côté de la signature sur les PV de jury", - "size": 64, - "category": "pvpdf", - }, - ), - ( - "ChiefDeptName", - { - "initvalue": "", - "title": "Nom du chef de département", - "size": 32, - "explanation": "pour les bulletins pdf", - "category": "pvpdf", - }, - ), - ( - "INSTITUTION_NAME", - { - "initvalue": "Institut Universitaire de Technologie - Université Paris 13", - "title": "Nom institution sur pied de pages PV", - "explanation": "(pdf, balises <b> interprétées)", - "input_type": "textarea", - "rows": 4, - "cols": 64, - "category": "pvpdf", - }, - ), - ( - "INSTITUTION_ADDRESS", - { - "initvalue": "Web www.iutv.univ-paris13.fr - 99 avenue Jean-Baptiste Clément - F 93430 Villetaneuse", - "title": "Adresse institution sur pied de pages PV", - "explanation": "(pdf, balises <b> interprétées)", - "input_type": "textarea", - "rows": 4, - "cols": 64, - "category": "pvpdf", - }, - ), - ( - "INSTITUTION_CITY", - { - "initvalue": "Villetaneuse", - "title": "Ville de l'institution", - "explanation": "pour les lettres individuelles", - "size": 64, - "category": "pvpdf", - }, - ), - ( - "PV_INTRO", - { - "initvalue": """- -Vu l'arrêté du 3 août 2005 relatif au diplôme universitaire de technologie et notamment son article 4 et 6; - -- -vu l'arrêté n° %(Decnum)s du Président de l'%(UnivName)s; - -- -vu la délibération de la commission %(Type)s en date du %(Date)s présidée par le Chef du département; -""", - "title": """Paragraphe d'introduction sur le PV""", - "explanation": """Balises remplacées: %(Univname)s = nom de l'université, %(DecNum)s = numéro de l'arrêté, %(Date)s = date de la commission, %(Type)s = type de commission (passage ou délivrance), %(VDICode)s = code diplôme""", - "input_type": "textarea", - "cols": 80, - "rows": 10, - "category": "pvpdf", - }, - ), - ( - "PV_WITH_BACKGROUND", - { - "initvalue": 0, - "title": "Mettre l'image de fond sur les PV de jury (paysage)", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "pvpdf", - }, - ), - ( - "PV_WITH_HEADER", - { - "initvalue": 1, # legacy - "title": "Ajouter l'en-tête sur les PV (paysage)", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "pvpdf", - }, - ), - ( - "PV_WITH_FOOTER", - { - "initvalue": 1, # legacy - "title": "Ajouter le pied de page sur les PV (paysage)", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "pvpdf", - }, - ), - ( - "PV_TITLE_WITH_VDI", - { - "initvalue": 0, # legacy - "title": "Indiquer VDI et code dans le titre du PV", - "explanation": "il est souvent préférable de l'inclure dans le paragraphe d'introduction.", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "pvpdf", - }, - ), - # marges PV paysages (en millimètres) - ( - "pv_left_margin", - { - "initvalue": 0, - "size": 10, - "title": "Marge gauche PV en mm", - "type": "float", - "category": "pvpdf", - }, - ), - ( - "pv_top_margin", - { - "initvalue": 23, - "size": 10, - "title": "Marge haute PV", - "type": "float", - "category": "pvpdf", - }, - ), - ( - "pv_right_margin", - { - "initvalue": 0, - "size": 10, - "title": "Marge droite PV", - "type": "float", - "category": "pvpdf", - }, - ), - ( - "pv_bottom_margin", - { - "initvalue": 5, - "size": 10, - "title": "Marge basse PV", - "type": "float", - "category": "pvpdf", - }, - ), - ( - "PV_LETTER_DIPLOMA_SIGNATURE", - { - "initvalue": """Le %(DirectorTitle)s,
          %(DirectorName)s""", - "title": """Signature des lettres individuelles de diplôme""", - "explanation": """%(DirectorName)s et %(DirectorTitle)s remplacés""", - "input_type": "textarea", - "rows": 4, - "cols": 64, - "category": "pvpdf", - }, - ), - ( - "PV_LETTER_PASSAGE_SIGNATURE", - { - "initvalue": """Pour le Directeur de l'IUT
          -et par délégation
          -Le Chef du département""", - "title": """Signature des lettres individuelles de passage d'un semestre à l'autre""", - "explanation": """%(DirectorName)s et %(DirectorTitle)s remplacés""", - "input_type": "textarea", - "rows": 4, - "cols": 64, - "category": "pvpdf", - }, - ), - ( - "pv_sig_image_height", - { - "initvalue": 11, - "size": 10, - "title": "Hauteur de l'image de la signature", - "type": "float", - "explanation": "Lorsqu'on donne une image de signature, elle est redimensionnée à cette taille (en millimètres)", - "category": "pvpdf", - }, - ), - ( - "PV_LETTER_TEMPLATE", - { - "initvalue": """  -%(INSTITUTION_CITY)s, le %(date_jury)s - - - -à %(nomprenom)s - -%(domicile)s -%(codepostaldomicile)s %(villedomicile)s - - -Jury de %(type_jury)s
          %(titre_formation)s           -           - - -Le jury de %(type_jury_abbrv)s du département %(DeptName)s -s'est réuni le %(date_jury)s. - -Les décisions vous concernant sont : - - -%(prev_decision_sem_txt)s - - Décision %(decision_orig)s : %(decision_sem_descr)s - - - -%(decision_ue_txt)s - - - -%(observation_txt)s - - -%(autorisations_txt)s - -%(diplome_txt)s -""", - "title": """Lettre individuelle""", - "explanation": """Balises remplacées et balisage XML, voir la documentation""", - "input_type": "textarea", - "rows": 15, - "cols": 64, - "category": "pvpdf", - }, - ), - ( - "PV_LETTER_WITH_BACKGROUND", - { - "initvalue": 0, - "title": "Mettre l'image de fond sur les lettres individuelles de décision", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "pvpdf", - }, - ), - ( - "PV_LETTER_WITH_HEADER", - { - "initvalue": 0, - "title": "Ajouter l'en-tête sur les lettres individuelles de décision", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "pvpdf", - }, - ), - ( - "PV_LETTER_WITH_FOOTER", - { - "initvalue": 0, - "title": "Ajouter le pied de page sur les lettres individuelles de décision", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "pvpdf", - }, - ), - ( - "pv_htab1", - { - "initvalue": "8cm", - "title": "marge colonne droite lettre", - "explanation": "pour les courriers pdf", - "size": 10, - "category": "pvpdf", - }, - ), - ( - "pv_htab2", - { - "initvalue": "5mm", - "title": "marge colonne gauche lettre", - "explanation": "pour les courriers pdf", - "size": 10, - "category": "pvpdf", - }, - ), - ( - "PV_FONTNAME", - { - "initvalue": "Times-Roman", - "title": "Police de caractère pour les PV", - "explanation": "pour les pdf", - "size": 25, - "category": "pvpdf", - }, - ), - # bul - ( - "bul_title", - { - "initvalue": "Université Paris 13 - IUT de Villetaneuse - Département %(DeptName)s", - "size": 70, - "title": "Titre des bulletins", - "explanation": "%(DeptName)s est remplacé par le nom du département", - "category": "bul", - }, - ), - ( - "bul_class_name", - { - "initvalue": sco_bulletins_generator.bulletin_default_class_name(), - "input_type": "menu", - "labels": sco_bulletins_generator.bulletin_class_descriptions(), - "allowed_values": sco_bulletins_generator.bulletin_class_names(), - "title": "Format des bulletins", - "explanation": "format de présentation des bulletins de note (web et pdf)", - "category": "bul", - }, - ), - ( - "bul_show_abs", # ex "gestion_absence" - { - "initvalue": 1, - "title": "Indiquer les absences sous les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_abs_modules", - { - "initvalue": 0, - "title": "Indiquer les absences dans chaque module", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_decision", - { - "initvalue": 0, - "title": "Faire figurer les décisions sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_ects", - { - "initvalue": 1, - "title": "Faire figurer les ECTS sur les bulletins", - "explanation": "crédits associés aux UE ou aux modules, selon réglage", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_codemodules", - { - "initvalue": 0, - "title": "Afficher codes des modules sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_matieres", - { - "initvalue": 0, - "title": "Afficher les matières sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_all_evals", - { - "initvalue": 0, - "title": "Afficher toutes les évaluations sur les bulletins", - "explanation": "y compris incomplètes ou futures", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_rangs", - { - "initvalue": 1, - "title": "Afficher le classement sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_ue_rangs", - { - "initvalue": 1, - "title": "Afficher le classement dans chaque UE sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_mod_rangs", - { - "initvalue": 1, - "title": "Afficher le classement dans chaque module sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_moypromo", - { - "initvalue": 0, - "title": "Afficher moyennes de la promotion sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_minmax", - { - "initvalue": 0, - "title": "Afficher min/max moyennes sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_minmax_mod", - { - "initvalue": 0, - "title": "Afficher min/max moyennes des modules sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_minmax_eval", - { - "initvalue": 0, - "title": "Afficher min/max moyennes des évaluations sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_coef", - { - "initvalue": 1, - "title": "Afficher coefficient des ue/modules sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_ue_cap_details", - { - "initvalue": 0, - "title": "Afficher détail des notes des UE capitalisées sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_ue_cap_current", - { - "initvalue": 1, - "title": "Afficher les UE en cours mais capitalisées sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_temporary_forced", - { - "initvalue": 0, - "title": 'Bannière "provisoire" sur les bulletins', - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_temporary", - { - "initvalue": 1, - "title": 'Bannière "provisoire" si pas de décision de jury', - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_temporary_txt", - { - "initvalue": "Provisoire", - "title": 'Texte de la bannière "provisoire', - "explanation": "", - "size": 40, - "category": "bul", - }, - ), - ( - "bul_show_uevalid", - { - "initvalue": 1, - "title": "Faire figurer les UE validées sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_mention", - { - "initvalue": 0, - "title": "Faire figurer les mentions sur les bulletins et les PV", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_date_inscr", - { - "initvalue": 1, - "title": "Faire figurer la date d'inscription sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_sig_left", - { - "initvalue": 0, - "title": "Faire figurer le pied de page de gauche (ex.: nom du directeur) sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_show_sig_right", - { - "initvalue": 0, - "title": "Faire figurer le pied de page de droite (ex.: nom du chef de département) sur les bulletins", - "input_type": "boolcheckbox", - "category": "bul", - "labels": ["non", "oui"], - }, - ), - ( - "bul_display_publication", - { - "initvalue": 1, - "title": "Indique si les bulletins sont publiés", - "explanation": "décocher si vous n'avez pas de portal étudiant publiant les bulletins", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "bul", - "only_global": False, - }, - ), - # champs des bulletins PDF: - ( - "bul_pdf_title", - { - "initvalue": """ -%(UnivName)s - - -%(InstituteName)s - - -RELEVÉ DE NOTES - - - -%(nomprenom)s %(demission)s - - - -Formation: %(titre_num)s - -Année scolaire: %(anneescolaire)s -""", - "title": "Bulletins PDF: paragraphe de titre", - "explanation": "(balises interprétées, voir documentation)", - "input_type": "textarea", - "rows": 10, - "cols": 64, - "category": "bul", - }, - ), - ( - "bul_pdf_caption", - { - "initvalue": """%(situation)s""", - "title": "Bulletins PDF: paragraphe sous table note", - "explanation": '(visible seulement si "Faire figurer les décision" est coché)', - "input_type": "textarea", - "rows": 4, - "cols": 64, - "category": "bul", - }, - ), - ( - "bul_pdf_sig_left", - { - "initvalue": """La direction des études -
          -%(responsable)s -           -""", - "title": "Bulletins PDF: signature gauche", - "explanation": "(balises interprétées, voir documentation)", - "input_type": "textarea", - "rows": 4, - "cols": 64, - "category": "bul", - }, - ), - ( - "bul_pdf_sig_right", - { - "initvalue": """Le chef de département -
          -%(ChiefDeptName)s -           -""", - "title": "Bulletins PDF: signature droite", - "explanation": "(balises interprétées, voir documentation)", - "input_type": "textarea", - "rows": 4, - "cols": 64, - "category": "bul", - }, - ), - ( - "bul_pdf_mod_colwidth", - { - "initvalue": None, - "title": "Bulletins PDF: largeur col. modules", - "explanation": "en cm (vide si auto)", - "type": "float", - "category": "bul", - }, - ), - ( - "bul_pdf_with_background", - { - "initvalue": 0, - "title": "Mettre l'image de fond sur les bulletins", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "bul", - }, - ), - ( - "SCOLAR_FONT_BUL_FIELDS", - { - "initvalue": "Times-Roman", - "title": "Police titres bulletins", - "explanation": "pour les pdf", - "size": 25, - "category": "bul", - }, - ), - # XXX A COMPLETER, voir sco_formsemestre_edit.py XXX - # bul_mail - ( - "email_copy_bulletins", - { - "initvalue": "", - "title": "e-mail copie bulletins", - "size": 40, - "explanation": "adresse recevant une copie des bulletins envoyés aux étudiants", - "category": "bul_mail", - }, - ), - ( - "email_from_addr", - { - "initvalue": "noreply@scodoc.example.com", - "title": "adresse mail origine", - "size": 40, - "explanation": "adresse expéditeur pour les envois par mails (bulletins)", - "category": "bul_mail", - "only_global": True, - }, - ), - ( - "bul_intro_mail", - { - "initvalue": """%(nomprenom)s,\n\nvous trouverez ci-joint votre relevé de notes au format PDF.\nIl s\'agit d\'un relevé indicatif. Seule la version papier signée par le responsable pédagogique de l\'établissement prend valeur officielle.\n\nPour toute question sur ce document, contactez votre enseignant ou le directeur des études (ne pas répondre à ce message).\n\nCordialement,\nla scolarité du département %(dept)s.\n\nPS: si vous recevez ce message par erreur, merci de contacter %(webmaster)s""", - "input_type": "textarea", - "title": "Message d'accompagnement", - "explanation": "%(DeptName)s est remplacé par le nom du département, %(nomprenom)s par les noms et prénoms de l'étudiant, %(dept)s par le nom du département, et %(webmaster)s par l'adresse mail du Webmaster.", - "rows": 18, - "cols": 85, - "category": "bul_mail", - }, - ), - ( - "bul_mail_list_abs", - { - "initvalue": 0, - "title": "Indiquer la liste des dates d'absences par mail", - "explanation": "dans le mail envoyant le bulletin de notes", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "bul_mail", - }, - ), - ( - "bul_mail_contact_addr", - { - "initvalue": "l'administrateur", - "title": 'Adresse mail contact "webmaster"', - "explanation": 'apparait dans le mail accompagnant le bulletin, voir balise "webmaster" ci-dessus.', - "category": "bul_mail", - "size": 32, - }, - ), - ( - "bul_mail_allowed_for_all", - { - "initvalue": 1, - "title": "Autoriser tous les utilisateurs à expédier des bulletins par mail", - "input_type": "boolcheckbox", - "category": "bul_mail", - "labels": ["non", "oui"], - }, - ), - # bul_margins - ( - "left_margin", - { - "initvalue": 0, - "size": 10, - "title": "Marge gauche", - "type": "float", - "category": "bul_margins", - }, - ), - ( - "top_margin", - { - "initvalue": 0, - "size": 10, - "title": "Marge haute", - "type": "float", - "category": "bul_margins", - }, - ), - ( - "right_margin", - { - "initvalue": 0, - "size": 10, - "title": "Marge droite", - "type": "float", - "category": "bul_margins", - }, - ), - ( - "bottom_margin", - { - "initvalue": 0, - "size": 10, - "title": "Marge basse", - "type": "float", - "category": "bul_margins", - }, - ), - # Mise en page feuilles absences/trombinoscopes - ( - "feuille_releve_abs_taille", - { - "initvalue": "A3", - "input_type": "menu", - "labels": ["A3", "A4"], - "allowed_values": ["A3", "A4"], - "title": "Taille feuille relevé absences", - "explanation": "Dimensions du papier pour les feuilles de relevés d'absences hebdomadaire", - "category": "feuilles", - }, - ), - ( - "feuille_releve_abs_format", - { - "initvalue": "Paysage", - "input_type": "menu", - "labels": ["Paysage", "Portrait"], - "allowed_values": ["Paysage", "Portrait"], - "title": "Format feuille relevé absences", - "explanation": "Format du papier pour les feuilles de relevés d'absences hebdomadaire", - "category": "feuilles", - }, - ), - ( - "feuille_releve_abs_samedi", - { - "initvalue": 1, - "title": "Samedi travaillé", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "category": "feuilles", - }, - ), - ( - "feuille_releve_abs_AM", - { - "initvalue": "2", - "title": "Créneaux cours matin", - "explanation": "Nombre de créneaux de cours le matin", - "size": 4, - "type": "int", - "convert_numbers": True, - "category": "feuilles", - }, - ), - ( - "feuille_releve_abs_PM", - { - "initvalue": "3", - "title": "Créneaux cours après-midi", - "explanation": "Nombre de créneaux de cours l'après-midi", - "size": 4, - "type": "int", - "convert_numbers": True, - "category": "feuilles", - }, - ), - ( - "feuille_placement_emargement", - { - "initvalue": "625", - "title": "Feuille d'émargement des contrôles - Signature étudiant", - "explanation": "Hauteur de l'espace pour signer", - "size": 4, - "type": "int", - "convert_numbers": True, - "category": "feuilles", - }, - ), - ( - "feuille_placement_positions", - { - "initvalue": "45", - "title": "Feuille des places lors des contrôles", - "explanation": "Nombre maximum de lignes par colonne", - "size": 4, - "type": "int", - "convert_numbers": True, - "category": "feuilles", - }, - ), - # Feuille prepa jury - ( - "prepa_jury_nip", - { - "initvalue": 0, - "title": "Code NIP sur la feuille préparation jury", - "input_type": "boolcheckbox", - "category": "feuilles", - "labels": ["non", "oui"], - "only_global": True, - }, - ), - ( - "prepa_jury_ine", - { - "initvalue": 0, - "title": "Code INE sur la feuille préparation jury", - "input_type": "boolcheckbox", - "category": "feuilles", - "labels": ["non", "oui"], - "only_global": True, - }, - ), - ( - "anonymous_lst_code", - { - "initvalue": "NIP", - "input_type": "menu", - "labels": ["NIP", "INE"], - "allowed_values": ["NIP", "INE"], - "title": "Code pour listes anonymes", - "explanation": "à défaut, un code interne sera utilisé", - "category": "feuilles", - "only_global": True, - }, - ), - # Exports pour Moodle: - ( - "moodle_csv_with_headerline", - { - "initvalue": 0, - "title": "Inclure une ligne d'en-têtes dans les fichiers CSV pour Moodle", - "input_type": "boolcheckbox", - "labels": ["non", "oui"], - "only_global": True, - "category": "feuilles", - }, - ), - ( - "moodle_csv_separator", - { - "initvalue": ",", - "title": "séparateur de colonnes dans les fichiers CSV pour Moodle", - "size": 2, - "only_global": True, - "category": "feuilles", - }, - ), - # Experimental: avis poursuite d'études - ( - "NomResponsablePE", - { - "initvalue": "", - "title": "Nom du responsable des poursuites d'études", - "size": 32, - "explanation": "pour les avis pdf de poursuite", - "category": "pe", - }, - ), - ( - "pe_avis_latex_tmpl", - { - "title": "Template LaTeX des avis", - "initvalue": "", - "explanation": "préparez-le dans un éditeur de texte puis copier le contenu ici (en utf8). Sinon, le fichier un_avis.tex du serveur sera utilisé.", - "input_type": "textarea", - "rows": 4, - "cols": 80, - "category": "pe", - }, - ), - ( - "pe_avis_latex_footer", - { - "title": "Code LaTeX en fin d'avis", - "initvalue": "", - "explanation": "", - "input_type": "textarea", - "rows": 5, - "cols": 80, - "category": "pe", - }, - ), - ( - "pe_tag_annotation_avis_latex", - { - "title": "Tag désignant l'avis PE", - "initvalue": "PE>", - "explanation": """ajoutez une annotation aux étudiants précédée du tag désigné ici pour qu'elle soit interprétée comme un avis de poursuites d'études et ajoutée aux avis LaTeX.""", - "size": 25, - "category": "pe", - }, - ), - # Lien avec logiciel emplois du temps - ( - "edt_sem_ics_url", - { - "title": "Lien EDT", - "initvalue": "", - "explanation": "URL du calendrier ics emploi du temps du semestre (template)", - "size": 80, - "category": "edt", - }, - ), - ( - "edt_groups2scodoc", - { - "input_type": "textarea", - "initvalue": "", - "title": "Noms Groupes", - "explanation": "Transcodage: nom de groupe EDT ; non de groupe ScoDoc (sur plusieurs lignes)", - "rows": 8, - "cols": 16, - "category": "edt", - }, - ), - ( - "ImputationDept", - { - "title": "Département d'imputation", - "initvalue": "", - "explanation": "préfixe id de session (optionnel, remplace nom département)", - "size": 10, - "category": "edt", - }, - ), -) - -PREFS_NAMES = set([x[0] for x in PREFS]) -PREFS_ONLY_GLOBAL = set([x[0] for x in PREFS if x[1].get("only_global", False)]) - -PREFS_DICT = dict(PREFS) - - -class sco_base_preferences: _editor = ndb.EditableTable( "sco_prefs", "pref_id", @@ -1759,8 +206,1582 @@ class sco_base_preferences: def __init__(self, context): self.context = context + self.init() self.load() + def init(self): + from app.scodoc import sco_bulletins_generator + + self.prefs_definition = ( + ( + "DeptName", + { + "initvalue": "Dept", + "title": "Nom abrégé du département", + "size": 12, + "category": "general", + "only_global": True, + }, + ), + ( + "DeptFullName", + { + "initvalue": "nom du département", + "title": "Nom complet du département", + "explanation": "inutilisé par défaut", + "size": 40, + "category": "general", + "only_global": True, + }, + ), + ( + "UnivName", + { + "initvalue": "", + "title": "Nom de l'Université", + "explanation": "apparait sur les bulletins et PV de jury", + "size": 40, + "category": "general", + "only_global": True, + }, + ), + ( + "InstituteName", + { + "initvalue": "", + "title": "Nom de l'Institut", + "explanation": 'exemple "IUT de Villetaneuse". Peut être utilisé sur les bulletins.', + "size": 40, + "category": "general", + "only_global": True, + }, + ), + ( + "DeptIntranetTitle", + { + "initvalue": "Intranet", + "title": "Nom lien intranet", + "size": 40, + "explanation": 'titre du lien "Intranet" en haut à gauche', + "category": "general", + "only_global": True, + }, + ), + ( + "DeptIntranetURL", + { + "initvalue": "", + "title": """URL de l'"intranet" du département""", + "size": 40, + "explanation": 'lien "Intranet" en haut à gauche', + "category": "general", + "only_global": True, + }, + ), + ( + "emails_notifications", + { + "initvalue": "", + "title": "e-mails à qui notifier les opérations", + "size": 70, + "explanation": "adresses séparées par des virgules; notifie les opérations (saisies de notes, etc). (vous pouvez préférer utiliser le flux rss)", + "category": "general", + "only_global": False, # peut être spécifique à un semestre + }, + ), + # ------------------ MISC + ( + "use_ue_coefs", + { + "initvalue": 0, + "title": "Utiliser les coefficients d'UE pour calculer la moyenne générale", + "explanation": """Calcule les moyennes dans chaque UE, puis pondère ces résultats pour obtenir la moyenne générale. Par défaut, le coefficient d'une UE est simplement la somme des coefficients des modules dans lesquels l'étudiant a des notes. Attention: changer ce réglage va modifier toutes les moyennes du semestre !""", + "input_type": "boolcheckbox", + "category": "misc", + "labels": ["non", "oui"], + "only_global": False, + }, + ), + ( + "recap_hidebac", + { + "initvalue": 0, + "title": "Cacher la colonne Bac", + "explanation": "sur la table récapitulative", + "input_type": "boolcheckbox", + "category": "misc", + "labels": ["non", "oui"], + "only_global": False, + }, + ), + # ------------------ Absences + ( + "email_chefdpt", + { + "initvalue": "", + "title": "e-mail chef du département", + "size": 40, + "explanation": "utilisé pour envoi mail notification absences", + "category": "abs", + "only_global": True, + }, + ), + ( + "work_saturday", + { + "initvalue": 0, + "title": "Considérer le samedi comme travaillé", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "abs", + "only_global": True, # devrait etre par semestre, mais demanderait modif gestion absences + }, + ), + ( + "abs_require_module", # affecte l'UI mais pas les fonctions de base + { + "initvalue": 0, + "title": "Imposer l'indication du module lors de la saisie des absences", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "abs", + "only_global": False, + }, + ), + ( + "handle_billets_abs", + { + "initvalue": 0, + "title": 'Gestion de "billets" d\'absence', + "explanation": 'fonctions pour traiter les "billets" déclarés par les étudiants sur un portail externe', + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "abs", + "only_global": True, + }, + ), + ( + "abs_notify_chief", # renamed from "send_mail_absence_to_chef" + { + "initvalue": 0, + "title": "Notifier les absences au chef", + "explanation": "Envoyer un mail au chef si un étudiant a beaucoup d'absences", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "abs", + "only_global": True, + }, + ), + ( + "abs_notify_respsem", + { + "initvalue": 0, + "title": "Notifier les absences au dir. des études", + "explanation": "Envoyer un mail au responsable du semestre si un étudiant a beaucoup d'absences", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "abs", + }, + ), + ( + "abs_notify_respeval", + { + "initvalue": 0, + "title": "Notifier les absences aux resp. de modules", + "explanation": "Envoyer un mail à chaque absence aux responsable des modules avec évaluation à cette date", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "abs", + }, + ), + ( + "abs_notify_etud", + { + "initvalue": 0, + "title": "Notifier les absences aux étudiants concernés", + "explanation": "Envoyer un mail à l'étudiant s'il a \"beaucoup\" d'absences", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "abs", + }, + ), + ( + "abs_notify_email", + { + "initvalue": "", + "title": "Notifier à:", + "explanation": "e-mail à qui envoyer des notification d'absences (en sus des autres destinataires éventuels, comme le chef etc.)", + "size": 40, + "category": "abs", + }, + ), + ( + "abs_notify_max_freq", + { + "initvalue": 7, + "title": "Fréquence maximale de notification", + "explanation": "en jours (pas plus de X envois de mail pour chaque étudiant/destinataire)", + "size": 4, + "type": "int", + "convert_numbers": True, + "category": "abs", + }, + ), + ( + "abs_notify_abs_threshold", + { + "initvalue": 10, + "title": "Seuil de première notification", + "explanation": "nb minimum d'absences (en 1/2 journées) avant notification", + "size": 4, + "type": "int", + "convert_numbers": True, + "category": "abs", + }, + ), + ( + "abs_notify_abs_increment", + { + "initvalue": 20, # les notification suivantes seront donc rares + "title": "Seuil notifications suivantes", + "explanation": "nb minimum d'absences (en 1/2 journées supplémentaires)", + "size": 4, + "type": "int", + "convert_numbers": True, + "category": "abs", + }, + ), + ( + "abs_notification_mail_tmpl", + { + "initvalue": """ + --- Ceci est un message de notification automatique issu de ScoDoc --- + + L'étudiant %(nomprenom)s + inscrit en %(inscription)s) + + a cumulé %(nbabsjust)s absences justifiées + et %(nbabsnonjust)s absences NON justifiées. + + Le compte a pu changer depuis cet envoi, voir la fiche sur %(url_ficheetud)s. + + + Votre dévoué serveur ScoDoc. + + PS: Au dela de %(abs_notify_abs_threshold)s, un email automatique est adressé toutes les %(abs_notify_abs_increment)s absences. Ces valeurs sont modifiables dans les préférences de ScoDoc. + """, + "title": """Message notification e-mail""", + "explanation": """Balises remplacées, voir la documentation""", + "input_type": "textarea", + "rows": 15, + "cols": 64, + "category": "abs", + }, + ), + # portal + ( + "portal_url", + { + "initvalue": "", + "title": "URL du portail", + "size": 40, + "category": "portal", + "only_global": True, + }, + ), + ( + "portal_timeout", + { + "initvalue": 3, + "title": "timeout", + "explanation": "secondes", + "size": 3, + "type": "int", + "convert_numbers": True, + "category": "portal", + "only_global": True, + }, + ), + ( + "portal_dept_name", + { + "initvalue": "Dept", + "title": "Code du département sur le portail", + "category": "portal", + "only_global": True, + }, + ), + ( + "etapes_url", + { + "initvalue": "", + "title": "URL listant les étapes Apogée", + "size": 40, + "category": "portal", + "only_global": True, + "explanation": "par defaut, selon l'api, getEtapes ou scodocEtapes sur l'URL du portail", + }, + ), + ( + "maquette_url", + { + "initvalue": "", + "title": "URL maquettes Apogee", + "size": 40, + "category": "portal", + "only_global": True, + "explanation": "par defaut, scodocMaquette sur l'URL du portail", + }, + ), + ( + "portal_api", + { + "initvalue": 1, + "title": "Version de l'API", + "explanation": "1 ou 2", + "size": 3, + "type": "int", + "convert_numbers": True, + "category": "portal", + "only_global": True, + }, + ), + ( + "etud_url", + { + "initvalue": "", + "title": "URL listant les étudiants Apogée", + "size": 40, + "category": "portal", + "only_global": True, + "explanation": "par defaut, selon l'api, getEtud ou scodocEtudiant sur l'URL du portail", + }, + ), + ( + "photo_url", + { + "initvalue": "", + "title": "URL donnant la photo d'un étudiant avec argument nip=", + "size": 40, + "category": "portal", + "only_global": True, + "explanation": "par defaut, selon l'api, getPhoto ou scodocPhoto sur l'URL du portail", + }, + ), + ( + "xml_etapes_by_dept", + { + "initvalue": 1, + "title": "Etapes séparées par département", + "explanation": "XML getEtapes structuré en départements ?", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "portal", + "only_global": True, + }, + ), + ( + "notify_etud_changes_to", + { + "initvalue": "", + "title": "e-mail à qui notifier les changements d'identité des étudiants", + "explanation": "utile pour mettre à jour manuellement d'autres bases de données", + "size": 40, + "category": "portal", + "only_global": True, + }, + ), + ( + "always_require_ine", + { + "initvalue": 0, + "title": "Impose la présence du code INE", + "explanation": "lors de toute création d'étudiant (manuelle ou non)", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "portal", + "only_global": True, + }, + ), + ( + "always_require_apo_sem_codes", + { + "initvalue": 0, + "title": "Impose la présence des codes Apogée", + "explanation": "lors des créations de semestres", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "portal", + "only_global": True, + }, + ), + # exports Apogée + ( + "export_res_etape", + { + "initvalue": 1, + "title": "Exporter résultat de l'étape", + "explanation": "remplissage maquettes export Apogée", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "portal", + "only_global": True, + }, + ), + ( + "export_res_sem", + { + "initvalue": 1, + "title": "Exporter résultat du semestre", + "explanation": "remplissage maquettes export Apogée", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "portal", + "only_global": True, + }, + ), + ( + "export_res_ues", + { + "initvalue": 1, + "title": "Exporter les résultats d'UE", + "explanation": "remplissage maquettes export Apogée", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "portal", + "only_global": True, + }, + ), + ( + "export_res_modules", + { + "initvalue": 1, + "title": "Exporter les résultats de modules", + "explanation": "remplissage maquettes export Apogée", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "portal", + "only_global": True, + }, + ), + ( + "export_res_sdj", + { + "initvalue": 0, + "title": "Exporter les résultats même sans décision de jury", + "explanation": "si coché, exporte exporte étudiants même si pas décision de jury saisie (sinon laisse vide)", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "portal", + "only_global": True, + }, + ), + ( + "export_res_rat", + { + "initvalue": 1, + "title": "Exporter les RAT comme ATT", + "explanation": "si coché, exporte exporte étudiants en attente de ratrapage comme ATT (sinon laisse vide)", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "portal", + "only_global": True, + }, + ), + # pdf + ( + "SCOLAR_FONT", + { + "initvalue": "Helvetica", + "title": "Police de caractère principale", + "explanation": "pour les pdf", + "size": 25, + "category": "pdf", + }, + ), + ( + "SCOLAR_FONT_SIZE", + { + "initvalue": 10, + "title": "Taille des caractères", + "explanation": "pour les pdf", + "size": 4, + "type": "int", + "convert_numbers": True, + "category": "pdf", + }, + ), + ( + "SCOLAR_FONT_SIZE_FOOT", + { + "initvalue": 6, + "title": "Taille des caractères pied de page", + "explanation": "pour les pdf", + "size": 4, + "type": "int", + "convert_numbers": True, + "category": "pdf", + }, + ), + ( + "pdf_footer_x", + { + "initvalue": 20, + "title": "Position horizontale du pied de page pdf (en mm)", + "size": 8, + "type": "float", + "category": "pdf", + }, + ), + ( + "pdf_footer_y", + { + "initvalue": 6.35, + "title": "Position verticale du pied de page pdf (en mm)", + "size": 8, + "type": "float", + "category": "pdf", + }, + ), + # pvpdf + ( + "DirectorName", + { + "initvalue": "", + "title": "Nom du directeur de l'établissement", + "size": 32, + "explanation": "pour les PV de jury", + "category": "pvpdf", + }, + ), + ( + "DirectorTitle", + { + "initvalue": """directeur de l'IUT""", + "title": 'Titre du "directeur"', + "explanation": "titre apparaissant à côté de la signature sur les PV de jury", + "size": 64, + "category": "pvpdf", + }, + ), + ( + "ChiefDeptName", + { + "initvalue": "", + "title": "Nom du chef de département", + "size": 32, + "explanation": "pour les bulletins pdf", + "category": "pvpdf", + }, + ), + ( + "INSTITUTION_NAME", + { + "initvalue": "Institut Universitaire de Technologie - Université Paris 13", + "title": "Nom institution sur pied de pages PV", + "explanation": "(pdf, balises <b> interprétées)", + "input_type": "textarea", + "rows": 4, + "cols": 64, + "category": "pvpdf", + }, + ), + ( + "INSTITUTION_ADDRESS", + { + "initvalue": "Web www.iutv.univ-paris13.fr - 99 avenue Jean-Baptiste Clément - F 93430 Villetaneuse", + "title": "Adresse institution sur pied de pages PV", + "explanation": "(pdf, balises <b> interprétées)", + "input_type": "textarea", + "rows": 4, + "cols": 64, + "category": "pvpdf", + }, + ), + ( + "INSTITUTION_CITY", + { + "initvalue": "Villetaneuse", + "title": "Ville de l'institution", + "explanation": "pour les lettres individuelles", + "size": 64, + "category": "pvpdf", + }, + ), + ( + "PV_INTRO", + { + "initvalue": """- + Vu l'arrêté du 3 août 2005 relatif au diplôme universitaire de technologie et notamment son article 4 et 6; +           + - + vu l'arrêté n° %(Decnum)s du Président de l'%(UnivName)s; + + - + vu la délibération de la commission %(Type)s en date du %(Date)s présidée par le Chef du département; + """, + "title": """Paragraphe d'introduction sur le PV""", + "explanation": """Balises remplacées: %(Univname)s = nom de l'université, %(DecNum)s = numéro de l'arrêté, %(Date)s = date de la commission, %(Type)s = type de commission (passage ou délivrance), %(VDICode)s = code diplôme""", + "input_type": "textarea", + "cols": 80, + "rows": 10, + "category": "pvpdf", + }, + ), + ( + "PV_WITH_BACKGROUND", + { + "initvalue": 0, + "title": "Mettre l'image de fond sur les PV de jury (paysage)", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "pvpdf", + }, + ), + ( + "PV_WITH_HEADER", + { + "initvalue": 1, # legacy + "title": "Ajouter l'en-tête sur les PV (paysage)", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "pvpdf", + }, + ), + ( + "PV_WITH_FOOTER", + { + "initvalue": 1, # legacy + "title": "Ajouter le pied de page sur les PV (paysage)", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "pvpdf", + }, + ), + ( + "PV_TITLE_WITH_VDI", + { + "initvalue": 0, # legacy + "title": "Indiquer VDI et code dans le titre du PV", + "explanation": "il est souvent préférable de l'inclure dans le paragraphe d'introduction.", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "pvpdf", + }, + ), + # marges PV paysages (en millimètres) + ( + "pv_left_margin", + { + "initvalue": 0, + "size": 10, + "title": "Marge gauche PV en mm", + "type": "float", + "category": "pvpdf", + }, + ), + ( + "pv_top_margin", + { + "initvalue": 23, + "size": 10, + "title": "Marge haute PV", + "type": "float", + "category": "pvpdf", + }, + ), + ( + "pv_right_margin", + { + "initvalue": 0, + "size": 10, + "title": "Marge droite PV", + "type": "float", + "category": "pvpdf", + }, + ), + ( + "pv_bottom_margin", + { + "initvalue": 5, + "size": 10, + "title": "Marge basse PV", + "type": "float", + "category": "pvpdf", + }, + ), + ( + "PV_LETTER_DIPLOMA_SIGNATURE", + { + "initvalue": """Le %(DirectorTitle)s,
          %(DirectorName)s""", + "title": """Signature des lettres individuelles de diplôme""", + "explanation": """%(DirectorName)s et %(DirectorTitle)s remplacés""", + "input_type": "textarea", + "rows": 4, + "cols": 64, + "category": "pvpdf", + }, + ), + ( + "PV_LETTER_PASSAGE_SIGNATURE", + { + "initvalue": """Pour le Directeur de l'IUT
          + et par délégation
          + Le Chef du département""", + "title": """Signature des lettres individuelles de passage d'un semestre à l'autre""", + "explanation": """%(DirectorName)s et %(DirectorTitle)s remplacés""", + "input_type": "textarea", + "rows": 4, + "cols": 64, + "category": "pvpdf", + }, + ), + ( + "pv_sig_image_height", + { + "initvalue": 11, + "size": 10, + "title": "Hauteur de l'image de la signature", + "type": "float", + "explanation": "Lorsqu'on donne une image de signature, elle est redimensionnée à cette taille (en millimètres)", + "category": "pvpdf", + }, + ), + ( + "PV_LETTER_TEMPLATE", + { + "initvalue": """  + %(INSTITUTION_CITY)s, le %(date_jury)s + + + + à %(nomprenom)s + + %(domicile)s + %(codepostaldomicile)s %(villedomicile)s + + + Jury de %(type_jury)s
          %(titre_formation)s           +           + + + Le jury de %(type_jury_abbrv)s du département %(DeptName)s + s'est réuni le %(date_jury)s. + + Les décisions vous concernant sont : + + + %(prev_decision_sem_txt)s + + Décision %(decision_orig)s : %(decision_sem_descr)s + + + + %(decision_ue_txt)s + + + + %(observation_txt)s + + + %(autorisations_txt)s + + %(diplome_txt)s + """, + "title": """Lettre individuelle""", + "explanation": """Balises remplacées et balisage XML, voir la documentation""", + "input_type": "textarea", + "rows": 15, + "cols": 64, + "category": "pvpdf", + }, + ), + ( + "PV_LETTER_WITH_BACKGROUND", + { + "initvalue": 0, + "title": "Mettre l'image de fond sur les lettres individuelles de décision", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "pvpdf", + }, + ), + ( + "PV_LETTER_WITH_HEADER", + { + "initvalue": 0, + "title": "Ajouter l'en-tête sur les lettres individuelles de décision", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "pvpdf", + }, + ), + ( + "PV_LETTER_WITH_FOOTER", + { + "initvalue": 0, + "title": "Ajouter le pied de page sur les lettres individuelles de décision", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "pvpdf", + }, + ), + ( + "pv_htab1", + { + "initvalue": "8cm", + "title": "marge colonne droite lettre", + "explanation": "pour les courriers pdf", + "size": 10, + "category": "pvpdf", + }, + ), + ( + "pv_htab2", + { + "initvalue": "5mm", + "title": "marge colonne gauche lettre", + "explanation": "pour les courriers pdf", + "size": 10, + "category": "pvpdf", + }, + ), + ( + "PV_FONTNAME", + { + "initvalue": "Times-Roman", + "title": "Police de caractère pour les PV", + "explanation": "pour les pdf", + "size": 25, + "category": "pvpdf", + }, + ), + # bul + ( + "bul_title", + { + "initvalue": "Université Paris 13 - IUT de Villetaneuse - Département %(DeptName)s", + "size": 70, + "title": "Titre des bulletins", + "explanation": "%(DeptName)s est remplacé par le nom du département", + "category": "bul", + }, + ), + ( + "bul_class_name", + { + "initvalue": sco_bulletins_generator.bulletin_default_class_name(), + "input_type": "menu", + "labels": sco_bulletins_generator.bulletin_class_descriptions(), + "allowed_values": sco_bulletins_generator.bulletin_class_names(), + "title": "Format des bulletins", + "explanation": "format de présentation des bulletins de note (web et pdf)", + "category": "bul", + }, + ), + ( + "bul_show_abs", # ex "gestion_absence" + { + "initvalue": 1, + "title": "Indiquer les absences sous les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_abs_modules", + { + "initvalue": 0, + "title": "Indiquer les absences dans chaque module", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_decision", + { + "initvalue": 0, + "title": "Faire figurer les décisions sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_ects", + { + "initvalue": 1, + "title": "Faire figurer les ECTS sur les bulletins", + "explanation": "crédits associés aux UE ou aux modules, selon réglage", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_codemodules", + { + "initvalue": 0, + "title": "Afficher codes des modules sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_matieres", + { + "initvalue": 0, + "title": "Afficher les matières sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_all_evals", + { + "initvalue": 0, + "title": "Afficher toutes les évaluations sur les bulletins", + "explanation": "y compris incomplètes ou futures", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_rangs", + { + "initvalue": 1, + "title": "Afficher le classement sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_ue_rangs", + { + "initvalue": 1, + "title": "Afficher le classement dans chaque UE sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_mod_rangs", + { + "initvalue": 1, + "title": "Afficher le classement dans chaque module sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_moypromo", + { + "initvalue": 0, + "title": "Afficher moyennes de la promotion sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_minmax", + { + "initvalue": 0, + "title": "Afficher min/max moyennes sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_minmax_mod", + { + "initvalue": 0, + "title": "Afficher min/max moyennes des modules sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_minmax_eval", + { + "initvalue": 0, + "title": "Afficher min/max moyennes des évaluations sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_coef", + { + "initvalue": 1, + "title": "Afficher coefficient des ue/modules sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_ue_cap_details", + { + "initvalue": 0, + "title": "Afficher détail des notes des UE capitalisées sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_ue_cap_current", + { + "initvalue": 1, + "title": "Afficher les UE en cours mais capitalisées sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_temporary_forced", + { + "initvalue": 0, + "title": 'Bannière "provisoire" sur les bulletins', + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_temporary", + { + "initvalue": 1, + "title": 'Bannière "provisoire" si pas de décision de jury', + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_temporary_txt", + { + "initvalue": "Provisoire", + "title": 'Texte de la bannière "provisoire', + "explanation": "", + "size": 40, + "category": "bul", + }, + ), + ( + "bul_show_uevalid", + { + "initvalue": 1, + "title": "Faire figurer les UE validées sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_mention", + { + "initvalue": 0, + "title": "Faire figurer les mentions sur les bulletins et les PV", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_date_inscr", + { + "initvalue": 1, + "title": "Faire figurer la date d'inscription sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_sig_left", + { + "initvalue": 0, + "title": "Faire figurer le pied de page de gauche (ex.: nom du directeur) sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_show_sig_right", + { + "initvalue": 0, + "title": "Faire figurer le pied de page de droite (ex.: nom du chef de département) sur les bulletins", + "input_type": "boolcheckbox", + "category": "bul", + "labels": ["non", "oui"], + }, + ), + ( + "bul_display_publication", + { + "initvalue": 1, + "title": "Indique si les bulletins sont publiés", + "explanation": "décocher si vous n'avez pas de portal étudiant publiant les bulletins", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "bul", + "only_global": False, + }, + ), + # champs des bulletins PDF: + ( + "bul_pdf_title", + { + "initvalue": """ + %(UnivName)s + + + %(InstituteName)s + + + RELEVÉ DE NOTES + + + + %(nomprenom)s %(demission)s + + + + Formation: %(titre_num)s + + Année scolaire: %(anneescolaire)s + """, + "title": "Bulletins PDF: paragraphe de titre", + "explanation": "(balises interprétées, voir documentation)", + "input_type": "textarea", + "rows": 10, + "cols": 64, + "category": "bul", + }, + ), + ( + "bul_pdf_caption", + { + "initvalue": """%(situation)s""", + "title": "Bulletins PDF: paragraphe sous table note", + "explanation": '(visible seulement si "Faire figurer les décision" est coché)', + "input_type": "textarea", + "rows": 4, + "cols": 64, + "category": "bul", + }, + ), + ( + "bul_pdf_sig_left", + { + "initvalue": """La direction des études +
          + %(responsable)s +           + """, + "title": "Bulletins PDF: signature gauche", + "explanation": "(balises interprétées, voir documentation)", + "input_type": "textarea", + "rows": 4, + "cols": 64, + "category": "bul", + }, + ), + ( + "bul_pdf_sig_right", + { + "initvalue": """Le chef de département +
          + %(ChiefDeptName)s +           + """, + "title": "Bulletins PDF: signature droite", + "explanation": "(balises interprétées, voir documentation)", + "input_type": "textarea", + "rows": 4, + "cols": 64, + "category": "bul", + }, + ), + ( + "bul_pdf_mod_colwidth", + { + "initvalue": None, + "title": "Bulletins PDF: largeur col. modules", + "explanation": "en cm (vide si auto)", + "type": "float", + "category": "bul", + }, + ), + ( + "bul_pdf_with_background", + { + "initvalue": 0, + "title": "Mettre l'image de fond sur les bulletins", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "bul", + }, + ), + ( + "SCOLAR_FONT_BUL_FIELDS", + { + "initvalue": "Times-Roman", + "title": "Police titres bulletins", + "explanation": "pour les pdf", + "size": 25, + "category": "bul", + }, + ), + # XXX A COMPLETER, voir sco_formsemestre_edit.py XXX + # bul_mail + ( + "email_copy_bulletins", + { + "initvalue": "", + "title": "e-mail copie bulletins", + "size": 40, + "explanation": "adresse recevant une copie des bulletins envoyés aux étudiants", + "category": "bul_mail", + }, + ), + ( + "email_from_addr", + { + "initvalue": "noreply@scodoc.example.com", + "title": "adresse mail origine", + "size": 40, + "explanation": "adresse expéditeur pour les envois par mails (bulletins)", + "category": "bul_mail", + "only_global": True, + }, + ), + ( + "bul_intro_mail", + { + "initvalue": """%(nomprenom)s,\n\nvous trouverez ci-joint votre relevé de notes au format PDF.\nIl s\'agit d\'un relevé indicatif. Seule la version papier signée par le responsable pédagogique de l\'établissement prend valeur officielle.\n\nPour toute question sur ce document, contactez votre enseignant ou le directeur des études (ne pas répondre à ce message).\n\nCordialement,\nla scolarité du département %(dept)s.\n\nPS: si vous recevez ce message par erreur, merci de contacter %(webmaster)s""", + "input_type": "textarea", + "title": "Message d'accompagnement", + "explanation": "%(DeptName)s est remplacé par le nom du département, %(nomprenom)s par les noms et prénoms de l'étudiant, %(dept)s par le nom du département, et %(webmaster)s par l'adresse mail du Webmaster.", + "rows": 18, + "cols": 85, + "category": "bul_mail", + }, + ), + ( + "bul_mail_list_abs", + { + "initvalue": 0, + "title": "Indiquer la liste des dates d'absences par mail", + "explanation": "dans le mail envoyant le bulletin de notes", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "bul_mail", + }, + ), + ( + "bul_mail_contact_addr", + { + "initvalue": "l'administrateur", + "title": 'Adresse mail contact "webmaster"', + "explanation": 'apparait dans le mail accompagnant le bulletin, voir balise "webmaster" ci-dessus.', + "category": "bul_mail", + "size": 32, + }, + ), + ( + "bul_mail_allowed_for_all", + { + "initvalue": 1, + "title": "Autoriser tous les utilisateurs à expédier des bulletins par mail", + "input_type": "boolcheckbox", + "category": "bul_mail", + "labels": ["non", "oui"], + }, + ), + # bul_margins + ( + "left_margin", + { + "initvalue": 0, + "size": 10, + "title": "Marge gauche", + "type": "float", + "category": "bul_margins", + }, + ), + ( + "top_margin", + { + "initvalue": 0, + "size": 10, + "title": "Marge haute", + "type": "float", + "category": "bul_margins", + }, + ), + ( + "right_margin", + { + "initvalue": 0, + "size": 10, + "title": "Marge droite", + "type": "float", + "category": "bul_margins", + }, + ), + ( + "bottom_margin", + { + "initvalue": 0, + "size": 10, + "title": "Marge basse", + "type": "float", + "category": "bul_margins", + }, + ), + # Mise en page feuilles absences/trombinoscopes + ( + "feuille_releve_abs_taille", + { + "initvalue": "A3", + "input_type": "menu", + "labels": ["A3", "A4"], + "allowed_values": ["A3", "A4"], + "title": "Taille feuille relevé absences", + "explanation": "Dimensions du papier pour les feuilles de relevés d'absences hebdomadaire", + "category": "feuilles", + }, + ), + ( + "feuille_releve_abs_format", + { + "initvalue": "Paysage", + "input_type": "menu", + "labels": ["Paysage", "Portrait"], + "allowed_values": ["Paysage", "Portrait"], + "title": "Format feuille relevé absences", + "explanation": "Format du papier pour les feuilles de relevés d'absences hebdomadaire", + "category": "feuilles", + }, + ), + ( + "feuille_releve_abs_samedi", + { + "initvalue": 1, + "title": "Samedi travaillé", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "category": "feuilles", + }, + ), + ( + "feuille_releve_abs_AM", + { + "initvalue": "2", + "title": "Créneaux cours matin", + "explanation": "Nombre de créneaux de cours le matin", + "size": 4, + "type": "int", + "convert_numbers": True, + "category": "feuilles", + }, + ), + ( + "feuille_releve_abs_PM", + { + "initvalue": "3", + "title": "Créneaux cours après-midi", + "explanation": "Nombre de créneaux de cours l'après-midi", + "size": 4, + "type": "int", + "convert_numbers": True, + "category": "feuilles", + }, + ), + ( + "feuille_placement_emargement", + { + "initvalue": "625", + "title": "Feuille d'émargement des contrôles - Signature étudiant", + "explanation": "Hauteur de l'espace pour signer", + "size": 4, + "type": "int", + "convert_numbers": True, + "category": "feuilles", + }, + ), + ( + "feuille_placement_positions", + { + "initvalue": "45", + "title": "Feuille des places lors des contrôles", + "explanation": "Nombre maximum de lignes par colonne", + "size": 4, + "type": "int", + "convert_numbers": True, + "category": "feuilles", + }, + ), + # Feuille prepa jury + ( + "prepa_jury_nip", + { + "initvalue": 0, + "title": "Code NIP sur la feuille préparation jury", + "input_type": "boolcheckbox", + "category": "feuilles", + "labels": ["non", "oui"], + "only_global": True, + }, + ), + ( + "prepa_jury_ine", + { + "initvalue": 0, + "title": "Code INE sur la feuille préparation jury", + "input_type": "boolcheckbox", + "category": "feuilles", + "labels": ["non", "oui"], + "only_global": True, + }, + ), + ( + "anonymous_lst_code", + { + "initvalue": "NIP", + "input_type": "menu", + "labels": ["NIP", "INE"], + "allowed_values": ["NIP", "INE"], + "title": "Code pour listes anonymes", + "explanation": "à défaut, un code interne sera utilisé", + "category": "feuilles", + "only_global": True, + }, + ), + # Exports pour Moodle: + ( + "moodle_csv_with_headerline", + { + "initvalue": 0, + "title": "Inclure une ligne d'en-têtes dans les fichiers CSV pour Moodle", + "input_type": "boolcheckbox", + "labels": ["non", "oui"], + "only_global": True, + "category": "feuilles", + }, + ), + ( + "moodle_csv_separator", + { + "initvalue": ",", + "title": "séparateur de colonnes dans les fichiers CSV pour Moodle", + "size": 2, + "only_global": True, + "category": "feuilles", + }, + ), + # Experimental: avis poursuite d'études + ( + "NomResponsablePE", + { + "initvalue": "", + "title": "Nom du responsable des poursuites d'études", + "size": 32, + "explanation": "pour les avis pdf de poursuite", + "category": "pe", + }, + ), + ( + "pe_avis_latex_tmpl", + { + "title": "Template LaTeX des avis", + "initvalue": "", + "explanation": "préparez-le dans un éditeur de texte puis copier le contenu ici (en utf8). Sinon, le fichier un_avis.tex du serveur sera utilisé.", + "input_type": "textarea", + "rows": 4, + "cols": 80, + "category": "pe", + }, + ), + ( + "pe_avis_latex_footer", + { + "title": "Code LaTeX en fin d'avis", + "initvalue": "", + "explanation": "", + "input_type": "textarea", + "rows": 5, + "cols": 80, + "category": "pe", + }, + ), + ( + "pe_tag_annotation_avis_latex", + { + "title": "Tag désignant l'avis PE", + "initvalue": "PE>", + "explanation": """ajoutez une annotation aux étudiants précédée du tag désigné ici pour qu'elle soit interprétée comme un avis de poursuites d'études et ajoutée aux avis LaTeX.""", + "size": 25, + "category": "pe", + }, + ), + # Lien avec logiciel emplois du temps + ( + "edt_sem_ics_url", + { + "title": "Lien EDT", + "initvalue": "", + "explanation": "URL du calendrier ics emploi du temps du semestre (template)", + "size": 80, + "category": "edt", + }, + ), + ( + "edt_groups2scodoc", + { + "input_type": "textarea", + "initvalue": "", + "title": "Noms Groupes", + "explanation": "Transcodage: nom de groupe EDT ; non de groupe ScoDoc (sur plusieurs lignes)", + "rows": 8, + "cols": 16, + "category": "edt", + }, + ), + ( + "ImputationDept", + { + "title": "Département d'imputation", + "initvalue": "", + "explanation": "préfixe id de session (optionnel, remplace nom département)", + "size": 10, + "category": "edt", + }, + ), + ) + + self.prefs_name = set([x[0] for x in self.prefs_definition]) + self.prefs_only_global = set( + [x[0] for x in self.prefs_definition if x[1].get("only_global", False)] + ) + self.prefs_dict = dict(self.prefs_definition) + def load(self): """Load all preferences from db""" log("loading preferences") @@ -1775,8 +1796,10 @@ class sco_base_preferences: self.prefs[p["formsemestre_id"]] = {} # Convert types: - if p["name"] in PREFS_DICT and PREFS_DICT[p["name"]].has_key("type"): - typ = PREFS_DICT[p["name"]]["type"] + if p["name"] in self.prefs_dict and self.prefs_dict[p["name"]].has_key( + "type" + ): + typ = self.prefs_dict[p["name"]]["type"] if typ == "float": # special case for float values (where NULL means 0) if p["value"]: @@ -1787,8 +1810,9 @@ class sco_base_preferences: func = eval(typ) p["value"] = func(p["value"]) if ( - p["name"] in PREFS_DICT - and PREFS_DICT[p["name"]].get("input_type", None) == "boolcheckbox" + p["name"] in self.prefs_dict + and self.prefs_dict[p["name"]].get("input_type", None) + == "boolcheckbox" ): if p["value"]: p["value"] = int(p["value"]) # boolcheckboxes are always 0/1 @@ -1796,32 +1820,21 @@ class sco_base_preferences: p["value"] = 0 # NULL (backward compat) self.prefs[p["formsemestre_id"]][p["name"]] = p["value"] - # log('prefs=%s' % self.prefs) - # add defaults for missing prefs - for pref in PREFS: + for pref in self.prefs_definition: name = pref[0] - - # Migration from previous ScoDoc installations (before june 2008) - # search preferences in Zope properties and in configuration file - if name and name[0] != "_" and not name in self.prefs[None]: - try: - value = getattr(self.context, name) + # search preferences in configuration file + if name and name[0] != "_" and name not in self.prefs[None]: + # search in scu.CONFIG + if hasattr(scu.CONFIG, name): + value = getattr(scu.CONFIG, name) log( - "sco_preferences: found default value in Zope for %s=%s" + "sco_preferences: found default value in config for %s=%s" % (name, value) ) - except: - # search in scu.CONFIG - if hasattr(scu.CONFIG, name): - value = getattr(scu.CONFIG, name) - log( - "sco_preferences: found default value in config for %s=%s" - % (name, value) - ) - else: - # uses hardcoded default - value = pref[1]["initvalue"] + else: + # uses hardcoded default + value = pref[1]["initvalue"] self.default[name] = value self.prefs[None][name] = value @@ -1911,9 +1924,9 @@ class sco_base_preferences: scu.GSL.release() def set(self, formsemestre_id, name, value): - if not name or name[0] == "_" or name not in PREFS_NAMES: + if not name or name[0] == "_" or name not in self.prefs_name: raise ValueError("invalid preference name: %s" % name) - if formsemestre_id and name in PREFS_ONLY_GLOBAL: + if formsemestre_id and name in self.prefs_only_global: raise ValueError("pref %s is always defined globaly") if not formsemestre_id in self.prefs: self.prefs[formsemestre_id] = {} @@ -1940,14 +1953,16 @@ class sco_base_preferences: def edit(self, REQUEST): """HTML dialog: edit global preferences""" + from app.scodoc import html_sco_header + H = [ - self.html_sco_header.sco_header(context, REQUEST, page_title="Préférences"), - "

          Préférences globales pour %s

          " % self.scu.ScoURL(), + html_sco_header.sco_header(self.context, REQUEST, page_title="Préférences"), + "

          Préférences globales pour %s

          " % scu.ScoURL(), """

          Ces paramètres s'appliquent par défaut à tous les semestres, sauf si ceux-ci définissent des valeurs spécifiques.

          Attention: cliquez sur "Enregistrer les modifications" en bas de page pour appliquer vos changements !

          """, ] - form = _build_form(self, global_edit=True) + form = self.build_tf_form() tf = TrivialFormulator( REQUEST.URL0, REQUEST.form, @@ -1957,31 +1972,90 @@ class sco_base_preferences: ) if tf[0] == 0: return ( - "\n".join(H) + tf[1] + self.html_sco_header.sco_footer(context, REQUEST) + "\n".join(H) + tf[1] + html_sco_header.sco_footer(self.context, REQUEST) ) elif tf[0] == -1: return REQUEST.RESPONSE.redirect(scu.ScoURL()) # cancel else: - for pref in PREFS: + for pref in self.prefs_definition: self.prefs[None][pref[0]] = tf[2][pref[0]] self.save() return REQUEST.RESPONSE.redirect( scu.ScoURL() + "?head_message=Préférences modifiées" ) + def build_tf_form(self, categories=[], formsemestre_id=None): + """Build list of elements for TrivialFormulator. + If formsemestre_id is not specified, edit global prefs. + """ + form = [] + for cat, cat_descr in PREF_CATEGORIES: + if categories and cat not in categories: + continue # skip this category + # + cat_elems = [] + for pref_name, pref in self.prefs_definition: + if pref["category"] == cat: + if pref.get("only_global", False) and formsemestre_id: + continue # saute les prefs seulement globales + descr = pref.copy() + descr["comment"] = descr.get("explanation", None) + if "explanation" in descr: + del descr["explanation"] + if formsemestre_id: + descr["explanation"] = ( + """ou utiliser paramètre global""" + % pref_name + ) + # if descr.get('only_global',False): + # # pas modifiable, donne juste la valeur courante + # descr['readonly'] = True + # descr['explanation'] = '(valeur globale, non modifiable)' + # elif + if formsemestre_id and self.is_global(formsemestre_id, pref_name): + # valeur actuelle globale (ou vient d'etre supprimee localement): + # montre la valeur et menus pour la rendre locale + descr["readonly"] = True + menu_global = ( + """ + """ + % pref_name + ) + # + descr["explanation"] = menu_global -_SCO_BASE_PREFERENCES = {} # { URL: sco_base_preferences instance } + cat_elems.append((pref_name, descr)) + if cat_elems: + # category titles: + title = cat_descr.get("title", None) + if title: + form.append( + ( + "sep_%s" % cat, + {"input_type": "separator", "title": "

          %s

          " % title}, + ) + ) + subtitle = cat_descr.get("subtitle", None) + if subtitle: + form.append( + ( + "sepsub_%s" % cat, + { + "input_type": "separator", + "title": '

          %s

          ' % subtitle, + }, + ) + ) + form.extend(cat_elems) + return form -def get_base_preferences(context): - """Return global preferences for this context""" - u = scu.ScoURL() - if not u in _SCO_BASE_PREFERENCES: - _SCO_BASE_PREFERENCES[u] = sco_base_preferences(context) - return _SCO_BASE_PREFERENCES[u] +class SemPreferences(object): + """Preferences for a formsemestre""" - -class SemPreferences: def __init__(self, context, formsemestre_id=None): self.context = context self.formsemestre_id = formsemestre_id @@ -2008,6 +2082,9 @@ class SemPreferences: # The dialog def edit(self, categories=[], REQUEST=None): """Dialog to edit semestre preferences in given categories""" + from app.scodoc import html_sco_header + from app.scodoc import sco_formsemestre + if not self.formsemestre_id: raise ScoValueError( "sem_preferences.edit doit etre appele sur un semestre !" @@ -2049,7 +2126,9 @@ function set_global_pref(el, pref_name) { """, ] # build the form: - form = _build_form(self, categories=categories) + form = self.base_prefs.build_tf_form( + categories=categories, formsemestre_id=self.formsemestre_id + ) form.append(("suppress", {"input_type": "hidden"})) form.append(("create_local", {"input_type": "hidden"})) form.append(("destination", {"input_type": "hidden"})) @@ -2063,12 +2142,12 @@ function set_global_pref(el, pref_name) { submitlabel="Enregistrer les modifications", ) dest_url = ( - self.scu.NotesURL() + scu.NotesURL() + "/formsemestre_status?formsemestre_id=%s" % self.formsemestre_id ) if tf[0] == 0: return ( - "\n".join(H) + tf[1] + self.html_sco_header.sco_footer(context, REQUEST) + "\n".join(H) + tf[1] + html_sco_header.sco_footer(self.context, REQUEST) ) elif tf[0] == -1: return REQUEST.RESPONSE.redirect( @@ -2085,7 +2164,7 @@ function set_global_pref(el, pref_name) { self.formsemestre_id, tf[2]["create_local"], cur_value ) # Modifie valeurs: - for (pref_name, descr) in PREFS: + for (pref_name, descr) in self.base_prefs.prefs_definition: if ( pref_name in tf[2] and not descr.get("only_global", False) @@ -2115,83 +2194,7 @@ function set_global_pref(el, pref_name) { REQUEST.URL0 + "?formsemestre_id=" + self.formsemestre_id ) elif destination == "global": - return REQUEST.RESPONSE.redirect( - self.scu.ScoURL() + "/edit_preferences" - ) - - -# Build list of elements for TrivialFormulator... -def _build_form(self, categories=[], global_edit=False): - form = [] - for cat, cat_descr in PREF_CATEGORIES: - if categories and cat not in categories: - continue # skip this category - # - cat_elems = [] - for pref_name, pref in PREFS: - if pref["category"] == cat: - if pref.get("only_global", False) and not global_edit: - continue # saute les prefs seulement globales - descr = pref.copy() - descr["comment"] = descr.get("explanation", None) - if "explanation" in descr: - del descr["explanation"] - if not global_edit: - descr["explanation"] = ( - """ou utiliser paramètre global""" - % pref_name - ) - # if descr.get('only_global',False): - # # pas modifiable, donne juste la valeur courante - # descr['readonly'] = True - # descr['explanation'] = '(valeur globale, non modifiable)' - # elif - if not global_edit and self.is_global(pref_name): - # valeur actuelle globale (ou vient d'etre supprimee localement): - # montre la valeur et menus pour la rendre locale - descr["readonly"] = True - menu_global = ( - """ - """ - % pref_name - ) - # - descr["explanation"] = menu_global - - cat_elems.append((pref_name, descr)) - if cat_elems: - # category titles: - title = cat_descr.get("title", None) - if title: - form.append( - ( - "sep_%s" % cat, - {"input_type": "separator", "title": "

          %s

          " % title}, - ) - ) - subtitle = cat_descr.get("subtitle", None) - if subtitle: - form.append( - ( - "sepsub_%s" % cat, - { - "input_type": "separator", - "title": '

          %s

          ' % subtitle, - }, - ) - ) - form.extend(cat_elems) - return form - - -def get_preference(context, name, formsemestre_id=None): - """Returns value of named preference. - All preferences have a sensible default value, so this function always returns a usable value for all defined preferences names. - """ - return get_base_preferences(context).get(formsemestre_id, name) + return REQUEST.RESPONSE.redirect(scu.ScoURL() + "/edit_preferences") # @@ -2204,7 +2207,7 @@ def doc_preferences(context): L.append([""]) L.append(["Nom", " ", " "]) L.append(["----", "----", "----"]) - for pref_name, pref in PREFS: + for pref_name, pref in get_base_preferences(context).prefs_definition: if pref["category"] == cat: L.append( ["`" + pref_name + "`", pref["title"], pref.get("explanation", "")] diff --git a/app/scodoc/sco_prepajury.py b/app/scodoc/sco_prepajury.py index 3fc41e6b..5104af00 100644 --- a/app/scodoc/sco_prepajury.py +++ b/app/scodoc/sco_prepajury.py @@ -29,17 +29,17 @@ """ import time -import sco_utils as scu -from notes_log import log -import notes_table -import sco_groups -import sco_excel -import sco_formsemestre -import sco_parcours_dut -import sco_codes_parcours -from scolars import format_nom, format_prenom, format_civilite, format_lycee -from sco_abs import getAbsSemEtud -import VERSION +import app.scodoc.sco_utils as scu +from app.scodoc import sco_groups +from app.scodoc import sco_core +from app.scodoc import sco_excel +from app.scodoc import sco_formsemestre +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_codes_parcours +from app.scodoc.sco_abs import getAbsSemEtud +from app.scodoc import VERSION +from app.scodoc import sco_etud +from app.scodoc import sco_preferences def feuille_preparation_jury(context, formsemestre_id, REQUEST): @@ -71,7 +71,7 @@ def feuille_preparation_jury(context, formsemestre_id, REQUEST): nbabs = {} nbabsjust = {} for etudid in etudids: - info = scolars.get_etud_info(etudid=etudid, filled=True) + info = sco_etud.get_etud_info(etudid=etudid, filled=True) if not info: continue # should not occur... etud = info[0] @@ -230,8 +230,8 @@ def feuille_preparation_jury(context, formsemestre_id, REQUEST): l += [ etudid, etud["civilite_str"], - format_nom(etud["nom"]), - format_prenom(etud["prenom"]), + sco_etud.format_nom(etud["nom"]), + sco_etud.format_prenom(etud["prenom"]), etud["date_naissance"], etud["bac"], etud["specialite"], diff --git a/app/scodoc/sco_pvjury.py b/app/scodoc/sco_pvjury.py index 47f98e35..f68c6fb2 100644 --- a/app/scodoc/sco_pvjury.py +++ b/app/scodoc/sco_pvjury.py @@ -26,29 +26,8 @@ ############################################################################## """Edition des PV de jury -""" -import time -from reportlab.platypus import Paragraph -from reportlab.lib import styles -import sco_utils as scu -import notesdb as ndb -from notes_log import log -import scolars -import sco_formsemestre -import sco_groups -import sco_groups_view -import sco_parcours_dut -import sco_codes_parcours -from sco_codes_parcours import NO_SEMESTRE_ID -import sco_excel -from TrivialFormulator import TrivialFormulator -from gen_tables import GenTable -import sco_pvpdf -import sco_pdf -from sco_pdf import PDFLOCK - -"""PV Jury IUTV 2006: on détaillait 8 cas: +PV Jury IUTV 2006: on détaillait 8 cas: Jury de semestre n On a 8 types de décisions: Passages: @@ -67,6 +46,31 @@ Jury de semestre n 8. non validation de Sn-1 et Sn et non redoublement """ +import time +from reportlab.platypus import Paragraph +from reportlab.lib import styles + +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc import html_sco_header +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_edit_ue +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_groups_view +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_pdf +from app.scodoc import sco_preferences +from app.scodoc import sco_pvpdf +from app.scodoc import sco_etud +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_codes_parcours import NO_SEMESTRE_ID +from app.scodoc.sco_pdf import PDFLOCK +from app.scodoc.TrivialFormulator import TrivialFormulator + def _descr_decisions_ues(context, nt, etudid, decisions_ue, decision_sem): """Liste des UE validées dans ce semestre""" @@ -87,7 +91,6 @@ def _descr_decisions_ues(context, nt, etudid, decisions_ue, decision_sem): uelist.append(ue) except: log("descr_decisions_ues: ue_id=%s decisions_ue=%s" % (ue_id, decisions_ue)) - pass # Les UE capitalisées dans d'autres semestres: for ue in nt.ue_capitalisees[etudid]: try: @@ -226,7 +229,7 @@ def dict_pvjury( L = [] D = {} # même chose que L, mais { etudid : dec } for etudid in etudids: - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] Se = sco_parcours_dut.SituationEtudParcours(context, etud, formsemestre_id) semestre_non_terminal = semestre_non_terminal or Se.semestre_non_terminal d = {} @@ -327,7 +330,7 @@ def dict_pvjury( max_date = date # Code semestre precedent if with_prev: # optionnel car un peu long... - info = scolars.get_etud_info(etudid=etudid, filled=True) + info = sco_etud.get_etud_info(etudid=etudid, filled=True) if not info: continue # should not occur etud = info[0] @@ -353,9 +356,9 @@ def dict_pvjury( "formsemestre": sem, "has_prev": has_prev, "semestre_non_terminal": semestre_non_terminal, - "formation": sco_formations.formation_list(context, args={"formation_id": sem["formation_id"]})[ - 0 - ], + "formation": sco_formations.formation_list( + context, args={"formation_id": sem["formation_id"]} + )[0], "decisions": L, "decisions_dict": D, } @@ -427,7 +430,7 @@ def pvjury_table( lines = [] for e in dpv["decisions"]: - scolars.format_etud_ident(e["identite"]) + sco_etud.format_etud_ident(e["identite"]) l = { "etudid": e["identite"]["etudid"], "code_nip": e["identite"]["code_nip"], @@ -614,7 +617,7 @@ def formsemestre_pvjury_pdf( groups_infos = None if etudid: # PV pour ce seul étudiant: - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] etuddescr = '%s' % ( etudid, etud["nomprenom"], diff --git a/app/scodoc/sco_pvpdf.py b/app/scodoc/sco_pvpdf.py index c4fec96b..d4e346d1 100644 --- a/app/scodoc/sco_pvpdf.py +++ b/app/scodoc/sco_pvpdf.py @@ -42,16 +42,16 @@ from reportlab.lib.pagesizes import A4, landscape from reportlab.lib import styles from reportlab.lib.colors import Color -import sco_utils as scu -import sco_pdf -from sco_pdf import SU -import sco_formsemestre -import sco_pvjury -import sco_codes_parcours -from sco_pdf import PDFLOCK -import sco_preferences -import sco_bulletins_pdf -import VERSION +import app.scodoc.sco_utils as scu +from app.scodoc import sco_bulletins_pdf +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_formsemestre +from app.scodoc import sco_pdf +from app.scodoc import sco_preferences +from app.scodoc import sco_etud +from app.scodoc import VERSION +from app.scodoc.sco_pdf import PDFLOCK +from app.scodoc.sco_pdf import SU LOGO_FOOTER_ASPECT = scu.CONFIG.LOGO_FOOTER_ASPECT # XXX A AUTOMATISER LOGO_FOOTER_HEIGHT = scu.CONFIG.LOGO_FOOTER_HEIGHT * mm @@ -337,6 +337,7 @@ def pdf_lettres_individuelles( (tous ceux du semestre, ou la liste indiquée par etudids) Renvoie pdf data ou chaine vide si aucun etudiant avec décision de jury. """ + from app.scodoc import sco_pvjury dpv = sco_pvjury.dict_pvjury( context, formsemestre_id, etudids=etudids, with_prev=True @@ -345,7 +346,7 @@ def pdf_lettres_individuelles( return "" # Ajoute infos sur etudiants etuds = [x["identite"] for x in dpv["decisions"]] - scolars.fillEtudsInfo(context, etuds) + sco_etud.fill_etuds_info(etuds) # sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) prefs = sco_preferences.SemPreferences(context, formsemestre_id) @@ -357,7 +358,7 @@ def pdf_lettres_individuelles( "htab2": "1cm", } # copie preferences - for name in sco_preferences.PREFS_NAMES: + for name in sco_preferences.get_base_preferences(context).prefs_name: params[name] = sco_preferences.get_preference( context, name, sem["formsemestre_id"] ) @@ -367,7 +368,7 @@ def pdf_lettres_individuelles( npages = 0 for e in dpv["decisions"]: if e["decision_sem"]: # decision prise - etud = scolars.get_etud_info(e["identite"]["etudid"], filled=True)[0] + etud = sco_etud.get_etud_info(e["identite"]["etudid"], filled=True)[0] params["nomEtud"] = etud["nomprenom"] bookmarks[npages + 1] = scu.suppress_accents(etud["nomprenom"]) objects += pdf_lettre_individuelle( @@ -705,6 +706,8 @@ def _pvjury_pdf_type( """Doc PDF récapitulant les décisions de jury pour un type de jury (passage ou delivrance) dpv: result of dict_pvjury """ + from app.scodoc import sco_pvjury + # Jury de diplome si sem. terminal OU que l'on demande les diplomés d'un semestre antérieur diplome = (not dpv["semestre_non_terminal"]) or only_diplome diff --git a/app/scodoc/sco_recapcomplet.py b/app/scodoc/sco_recapcomplet.py index 4bddb19e..43a6f40c 100644 --- a/app/scodoc/sco_recapcomplet.py +++ b/app/scodoc/sco_recapcomplet.py @@ -31,19 +31,25 @@ import time import datetime import jaxml -import sco_utils as scu -from notes_log import log -import scolars -import sco_bulletins, sco_excel -import sco_groups -import sco_evaluations -import sco_formsemestre -import sco_formsemestre_status -import sco_bulletins_xml -import sco_bulletins_json -import sco_codes_parcours -from sco_codes_parcours import DEF, UE_SPORT -import sco_bac +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc import html_sco_header +from app.scodoc import sco_bac +from app.scodoc import sco_bulletins_json +from app.scodoc import sco_bulletins_xml +from app.scodoc import sco_bulletins, sco_excel +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_evaluations +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_status +from app.scodoc import sco_groups +from app.scodoc import sco_permissions +from app.scodoc import sco_permissions_check +from app.scodoc import sco_preferences +from app.scodoc import sco_etud +from app.scodoc.sco_codes_parcours import DEF, UE_SPORT def formsemestre_recapcomplet( @@ -66,7 +72,9 @@ def formsemestre_recapcomplet( trié par moyenne générale décroissante. """ sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - F = sco_formations.formation_list(context, args={"formation_id": sem["formation_id"]})[0] + F = sco_formations.formation_list( + context, args={"formation_id": sem["formation_id"]} + )[0] parcours = sco_codes_parcours.get_parcours_from_code(F["type_parcours"]) # traduit du DTML modejury = int(modejury) @@ -165,7 +173,7 @@ def formsemestre_recapcomplet( """

          Voir les décisions du jury

          """ % formsemestre_id ) - if sco_permcan_validate_semdate_sem(context, REQUEST, formsemestre_id): + if sco_permissions_check.can_validate_sem(context, REQUEST, formsemestre_id): H.append("

          ") if modejury: H.append( @@ -395,7 +403,7 @@ def make_formsemestre_recapcomplet( e = nt.identdict[etudid] if civ_nom_prenom: - scolars.format_etud_ident(e) + sco_etud.format_etud_ident(e) l = [rank, e["civilite_str"], e["nom_disp"], e["prenom"]] # civ, nom prenom else: l = [rank, nt.get_nom_short(etudid)] # rang, nom, @@ -800,7 +808,9 @@ def _list_notes_evals(context, evals, etudid): or e["etat"]["evalattente"] or e["publish_incomplete"] ): - NotesDB = context._notes_getall(e["evaluation_id"]) + NotesDB = sco_evaluations.do_evaluation_get_all_notes( + context, e["evaluation_id"] + ) if NotesDB.has_key(etudid): val = NotesDB[etudid]["value"] else: diff --git a/app/scodoc/sco_report.py b/app/scodoc/sco_report.py index aafcf070..95f22517 100644 --- a/app/scodoc/sco_report.py +++ b/app/scodoc/sco_report.py @@ -36,19 +36,25 @@ import re import time import datetime -import sco_utils as scu -import VERSION -from notes_log import log -from gen_tables import GenTable -import sco_excel, sco_pdf -from notesdb import DateDMYtoISO -from sco_exceptions import ScoValueError -import sco_codes_parcours -from sco_codes_parcours import code_semestre_validant -import sco_parcours_dut -import sco_formsemestre -import sco_formsemestre_status -from sco_pdf import SU +import app.scodoc.sco_utils as scu +from app.scodoc import notesdb as ndb +from app.scodoc import html_sco_header +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_core +from app.scodoc import sco_etud +from app.scodoc import sco_excel +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_formsemestre_status +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_pdf +from app.scodoc import sco_preferences +from app.scodoc import VERSION +from app.scodoc.gen_tables import GenTable +from app.scodoc.notes_log import log +from app.scodoc.sco_codes_parcours import code_semestre_validant +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_pdf import SU MAX_ETUD_IN_DESCR = 20 @@ -63,7 +69,7 @@ def formsemestre_etuds_stats(context, sem, only_primo=False): etuds = [] for t in T: etudid = t[-1] - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] decision = nt.get_etud_decision_sem(etudid) if decision: etud["codedecision"] = decision["code"] @@ -418,7 +424,7 @@ def table_suivi_cohorte( civilites = set() statuts = set() for etudid in etudids: - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] bacspe = etud["bac"] + " / " + etud["specialite"] # sélection sur bac: if ( @@ -432,7 +438,9 @@ def table_suivi_cohorte( orig_set.add(etudid) # semestres suivants: for s in etud["sems"]: - if DateDMYtoISO(s["date_debut"]) > DateDMYtoISO(sem["date_debut"]): + if ndb.DateDMYtoISO(s["date_debut"]) > ndb.DateDMYtoISO( + sem["date_debut"] + ): S[s["formsemestre_id"]] = s bacs.add(etud["bac"]) bacspecialites.add(bacspe) @@ -451,8 +459,8 @@ def table_suivi_cohorte( logt("B: etuds sets") sem["members"] = orig_set for s in sems: - ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, - args={"formsemestre_id": s["formsemestre_id"]} + ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, args={"formsemestre_id": s["formsemestre_id"]} ) # sans dems inset = set([i["etudid"] for i in ins]) s["members"] = orig_set.intersection(inset) @@ -900,7 +908,7 @@ def _descr_etud_set(context, etudids): "textual html description of a set of etudids" etuds = [] for etudid in etudids: - etuds.append(scolars.get_etud_info(etudid=etudid, filled=True)[0]) + etuds.append(sco_etud.get_etud_info(etudid=etudid, filled=True)[0]) # sort by name etuds.sort(lambda x, y: cmp(x["nom"], y["nom"])) return ", ".join([e["nomprenom"] for e in etuds]) @@ -1032,7 +1040,7 @@ def tsp_etud_list( civilites = set() statuts = set() for etudid in etudids: - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] bacspe = etud["bac"] + " / " + etud["specialite"] # sélection sur bac, primo, ...: if ( diff --git a/app/scodoc/sco_roles_default.py b/app/scodoc/sco_roles_default.py index 406daee1..30c5bbb1 100644 --- a/app/scodoc/sco_roles_default.py +++ b/app/scodoc/sco_roles_default.py @@ -4,7 +4,7 @@ """Definition of ScoDoc default roles """ -from sco_permissions import Permission as p +from app.scodoc.sco_permissions import Permission as p SCO_ROLES_DEFAULTS = { "Observateur": (p.ScoObservateur,), @@ -55,4 +55,4 @@ SCO_ROLES_DEFAULTS = { # Super Admin est un root: création/suppression de départements # _tous_ les droits "SuperAdmin": p.ALL_PERMISSIONS, -} \ No newline at end of file +} diff --git a/app/scodoc/sco_saisie_notes.py b/app/scodoc/sco_saisie_notes.py index f960c19c..3501bc05 100644 --- a/app/scodoc/sco_saisie_notes.py +++ b/app/scodoc/sco_saisie_notes.py @@ -33,65 +33,32 @@ import time import datetime import psycopg2 -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from TrivialFormulator import TrivialFormulator, TF -from notesdb import ScoDocCursor, quote_dict, DateISOtoDMY, DateDMYtoISO -from sco_exceptions import ( - InvalidNoteValue, +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc.sco_exceptions import ( AccessDenied, + InvalidNoteValue, NoteProcessError, ScoValueError, ) -from sco_permissions import ScoEditAllNotes -import sco_core -import sco_formsemestre -import sco_moduleimpl -import sco_groups -import sco_groups_view -import sco_evaluations -import sco_parcours_dut -import sco_undo_notes -import htmlutils -import sco_excel -import scolars -import sco_news - - -def can_edit_notes(context, authuser, moduleimpl_id, allow_ens=True): - """True if authuser can enter or edit notes in this module. - If allow_ens, grant access to all ens in this module - - Si des décisions de jury ont déjà été saisies dans ce semestre, - seul le directeur des études peut saisir des notes (et il ne devrait pas). - """ - uid = str(authuser) - M = sco_moduleimpl.do_moduleimpl_list(context, moduleimpl_id=moduleimpl_id)[0] - sem = sco_formsemestre.get_formsemestre(context, M["formsemestre_id"]) - if sem["etat"] != "1": - return False # semestre verrouillé - - if sco_parcours_dut.formsemestre_has_decisions(context, sem["formsemestre_id"]): - # il y a des décisions de jury dans ce semestre ! - return ( - authuser.has_permission(Permission.ScoEditAllNotes) - or uid in sem["responsables"] - ) - else: - if ( - (not authuser.has_permission(Permission.ScoEditAllNotes)) - and uid != M["responsable_id"] - and uid not in sem["responsables"] - ): - # enseignant (chargé de TD) ? - if allow_ens: - for ens in M["ens"]: - if ens["ens_id"] == uid: - return True - return False - else: - return True +from app.scodoc.sco_permissions import Permission +from app.scodoc.TrivialFormulator import TrivialFormulator, TF +from app.scodoc import html_sco_header +from app.scodoc import htmlutils +from app.scodoc import sco_core +from app.scodoc import sco_edit_module +from app.scodoc import sco_evaluations +from app.scodoc import sco_excel +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_groups +from app.scodoc import sco_groups_view +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_news +from app.scodoc import sco_permissions_check +from app.scodoc import sco_undo_notes +from app.scodoc import sco_etud def convert_note_from_string( @@ -203,7 +170,7 @@ def do_evaluation_upload_xls(context, REQUEST): )[0] # Check access # (admin, respformation, and responsable_id) - if not can_edit_notes(context, authuser, E["moduleimpl_id"]): + if not sco_permissions_check.can_edit_notes(context, authuser, E["moduleimpl_id"]): # XXX imaginer un redirect + msg erreur raise AccessDenied("Modification des notes impossible pour %s" % authuser) # @@ -265,7 +232,7 @@ def do_evaluation_upload_xls(context, REQUEST): ) if len(invalids) < 25: etudsnames = [ - scolars.get_etud_info(etudid=etudid, filled=True)[0]["nomprenom"] + sco_etud.get_etud_info(etudid=etudid, filled=True)[0]["nomprenom"] for etudid in invalids ] diag.append("Notes invalides pour: " + ", ".join(etudsnames)) @@ -328,11 +295,11 @@ def do_evaluation_set_missing( )[0] # Check access # (admin, respformation, and responsable_id) - if not can_edit_notes(context, authuser, E["moduleimpl_id"]): + if not sco_permissions_check.can_edit_notes(context, authuser, E["moduleimpl_id"]): # XXX imaginer un redirect + msg erreur raise AccessDenied("Modification des notes impossible pour %s" % authuser) # - NotesDB = context._notes_getall(evaluation_id) + NotesDB = sco_evaluations.do_evaluation_get_all_notes(context, evaluation_id) etudids = sco_groups.do_evaluation_listeetuds_groups( context, evaluation_id, getallstudents=True, include_dems=False ) @@ -405,13 +372,19 @@ def evaluation_suppress_alln(context, evaluation_id, REQUEST, dialog_confirmed=F authuser = REQUEST.AUTHENTICATED_USER E = sco_evaluations.do_evaluation_list(context, {"evaluation_id": evaluation_id})[0] - if can_edit_notes(context, authuser, E["moduleimpl_id"], allow_ens=False): + if sco_permissions_check.can_edit_notes( + context, authuser, E["moduleimpl_id"], allow_ens=False + ): # On a le droit de modifier toutes les notes # recupere les etuds ayant une note - NotesDB = context._notes_getall(evaluation_id) - elif can_edit_notes(context, authuser, E["moduleimpl_id"], allow_ens=True): + NotesDB = sco_evaluations.do_evaluation_get_all_notes(context, evaluation_id) + elif sco_permissions_check.can_edit_notes( + context, authuser, E["moduleimpl_id"], allow_ens=True + ): # Enseignant associé au module: ne peut supprimer que les notes qu'il a saisi - NotesDB = context._notes_getall(evaluation_id, by_uid=str(authuser)) + NotesDB = sco_evaluations.do_evaluation_get_all_notes( + context, evaluation_id, by_uid=str(authuser) + ) else: raise AccessDenied("Modification des notes impossible pour %s" % authuser) @@ -496,10 +469,10 @@ def _notes_add(context, uid, evaluation_id, notes, comment=None, do_it=True): "etudiant %s: valeur de note invalide (%s)" % (etudid, value) ) # Recherche notes existantes - NotesDB = context._notes_getall(evaluation_id) + NotesDB = sco_evaluations.do_evaluation_get_all_notes(context, evaluation_id) # Met a jour la base cnx = context.GetDBConnexion(autocommit=False) - cursor = cnx.cursor(cursor_factory=ScoDocCursor) + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) nb_changed = 0 nb_suppress = 0 E = sco_evaluations.do_evaluation_list(context, {"evaluation_id": evaluation_id})[0] @@ -522,7 +495,7 @@ def _notes_add(context, uid, evaluation_id, notes, comment=None, do_it=True): "uid": uid, "date": now, } - quote_dict(aa) + ndb.quote_dict(aa) cursor.execute( "insert into notes_notes (etudid,evaluation_id,value,comment,date,uid) values (%(etudid)s,%(evaluation_id)s,%(value)s,%(comment)s,%(date)s,%(uid)s)", aa, @@ -554,7 +527,7 @@ def _notes_add(context, uid, evaluation_id, notes, comment=None, do_it=True): "comment": comment, "uid": uid, } - quote_dict(aa) + ndb.quote_dict(aa) if value != scu.NOTES_SUPPRESS: if do_it: cursor.execute( @@ -614,7 +587,7 @@ def saisie_notes_tableur(context, evaluation_id, group_ids=[], REQUEST=None): E = evals[0] M = sco_moduleimpl.do_moduleimpl_list(context, moduleimpl_id=E["moduleimpl_id"])[0] formsemestre_id = M["formsemestre_id"] - if not can_edit_notes(context, authuser, E["moduleimpl_id"]): + if not sco_permissions_check.can_edit_notes(context, authuser, E["moduleimpl_id"]): return ( html_sco_header.sco_header(context, REQUEST) + "

          Modification des notes impossible pour %s

          " % authusername @@ -733,7 +706,7 @@ def saisie_notes_tableur(context, evaluation_id, group_ids=[], REQUEST=None): ) # H.append("""

      Autres opérations

        """) - if can_edit_notes( + if sco_permissions_check.can_edit_notes( context, REQUEST.AUTHENTICATED_USER, E["moduleimpl_id"], allow_ens=False ): H.append( @@ -795,7 +768,7 @@ def feuille_saisie_notes(context, evaluation_id, group_ids=[], REQUEST=None): Mod = sco_edit_module.do_module_list(context, args={"module_id": M["module_id"]})[0] sem = sco_formsemestre.get_formsemestre(context, M["formsemestre_id"]) if E["jour"]: - indication_date = DateDMYtoISO(E["jour"]) + indication_date = ndb.DateDMYtoISO(E["jour"]) else: indication_date = scu.sanitize_filename(E["description"])[:12] evalname = "%s-%s" % (Mod["code"], indication_date) @@ -899,7 +872,7 @@ def saisie_notes(context, evaluation_id, group_ids=[], REQUEST=None): formsemestre_id = M["formsemestre_id"] # Check access # (admin, respformation, and responsable_id) - if not can_edit_notes(context, authuser, E["moduleimpl_id"]): + if not sco_permissions_check.can_edit_notes(context, authuser, E["moduleimpl_id"]): return ( html_sco_header.sco_header(context, REQUEST) + "

        Modification des notes impossible pour %s

        " % authusername @@ -1006,13 +979,15 @@ def saisie_notes(context, evaluation_id, group_ids=[], REQUEST=None): def _get_sorted_etuds(context, E, etudids, formsemestre_id): sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - NotesDB = context._notes_getall(E["evaluation_id"]) # Notes existantes + NotesDB = sco_evaluations.do_evaluation_get_all_notes( + context, E["evaluation_id"] + ) # Notes existantes cnx = ndb.GetDBConnexion() etuds = [] for etudid in etudids: # infos identite etudiant - e = scolars.etudident_list(cnx, {"etudid": etudid})[0] - scolars.format_etud_ident(e) + e = sco_etud.etudident_list(cnx, {"etudid": etudid})[0] + sco_etud.format_etud_ident(e) etuds.append(e) # infos inscription dans ce semestre e["inscr"] = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( @@ -1022,12 +997,12 @@ def _get_sorted_etuds(context, E, etudids, formsemestre_id): e["groups"] = sco_groups.get_etud_groups(context, etudid, sem) # Information sur absence (tenant compte de la demi-journée) - jour_iso = DateDMYtoISO(E["jour"]) + jour_iso = ndb.DateDMYtoISO(E["jour"]) warn_abs_lst = [] if E["matin"]: - nbabs = context.Absences.CountAbs(etudid, jour_iso, jour_iso, matin=1) - nbabsjust = context.Absences.CountAbsJust( - etudid, jour_iso, jour_iso, matin=1 + nbabs = sco_abs.CountAbs(context, etudid, jour_iso, jour_iso, matin=1) + nbabsjust = sco_abs.CountAbsJust( + context, etudid, jour_iso, jour_iso, matin=1 ) if nbabs: if nbabsjust: @@ -1035,9 +1010,9 @@ def _get_sorted_etuds(context, E, etudids, formsemestre_id): else: warn_abs_lst.append("absent le matin !") if E["apresmidi"]: - nbabs = context.Absences.CountAbs(etudid, jour_iso, jour_iso, matin=0) - nbabsjust = context.Absences.CountAbsJust( - etudid, jour_iso, jour_iso, matin=0 + nbabs = sco_abs.CountAbs(context, etudid, jour_iso, jour_iso, matin=0) + nbabsjust = sco_abs.CountAbsJust( + context, etudid, jour_iso, jour_iso, matin=0 ) if nbabs: if nbabsjust: @@ -1156,7 +1131,7 @@ def _form_saisie_notes(context, E, M, group_ids, destination="", REQUEST=None): '' % classdem + e["civilite_str"] + " " - + scolars.format_nomprenom(e, reverse=True) + + sco_etud.format_nomprenom(e, reverse=True) + "" ) @@ -1262,7 +1237,7 @@ def save_note( Mod["url"] = "Notes/moduleimpl_status?moduleimpl_id=%(moduleimpl_id)s" % M result = {"nbchanged": 0} # JSON # Check access: admin, respformation, or responsable_id - if not can_edit_notes(context, authuser, E["moduleimpl_id"]): + if not sco_permissions_check.can_edit_notes(context, authuser, E["moduleimpl_id"]): result["status"] = "unauthorized" else: L, _, _, _, _ = _check_notes([(etudid, value)], E, Mod) diff --git a/app/scodoc/sco_semset.py b/app/scodoc/sco_semset.py index f4fd4df1..1fbe912a 100644 --- a/app/scodoc/sco_semset.py +++ b/app/scodoc/sco_semset.py @@ -39,17 +39,20 @@ sem_set_list(context) """ -import sco_utils as scu -import notesdb as ndb -from notes_log import log -import sco_formsemestre -from sco_formsemestre import ApoEtapeVDI -import sco_formsemestre_status -import sco_etape_apogee -from sco_etape_bilan import EtapeBilan -import sco_portal_apogee -from gen_tables import GenTable -from sco_exceptions import ScoValueError +from app.scodoc import html_sco_header +from app.scodoc import sco_core +from app.scodoc import sco_etape_apogee +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_status +from app.scodoc import sco_portal_apogee +from app.scodoc import sco_preferences +from app.scodoc.gen_tables import GenTable +from app.scodoc.notes_log import log +from app.scodoc.sco_etape_bilan import EtapeBilan +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_formsemestre import ApoEtapeVDI +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu _semset_editor = ndb.EditableTable( diff --git a/app/scodoc/sco_synchro_etuds.py b/app/scodoc/sco_synchro_etuds.py index 1cb2456d..cb425976 100644 --- a/app/scodoc/sco_synchro_etuds.py +++ b/app/scodoc/sco_synchro_etuds.py @@ -31,21 +31,21 @@ import time import pprint -import sco_utils as scu -import notesdb as ndb -from sco_permissions import ScoEtudInscrit -from sco_exceptions import ScoValueError -from notesdb import ScoDocCursor -from notes_log import log -import sco_portal_apogee -import sco_inscr_passage -import scolars -import sco_groups -import sco_news, sco_excel -import sco_formsemestre -import sco_formsemestre_inscriptions -import sco_formsemestre_status -from sco_news import NEWS_INSCR, NEWS_NOTE, NEWS_FORM, NEWS_SEM, NEWS_MISC +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc import html_sco_header +from app.scodoc import sco_core +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_groups +from app.scodoc import sco_inscr_passage +from app.scodoc import sco_news +from app.scodoc import sco_excel +from app.scodoc import sco_portal_apogee +from app.scodoc import sco_etud +from app.scodoc.notes_log import log +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_permissions import Permission # Clés utilisées pour la synchro EKEY_APO = "nip" @@ -196,11 +196,11 @@ def formsemestre_synchro_etuds( if a_desinscrire or a_desinscrire_without_key: H.append("

        Etudiants à désinscrire :

          ") for key in a_desinscrire: - etud = scolars.get_etud_info(filled=1, code_nip=key)[0] + etud = sco_etud.get_etud_info(filled=1, code_nip=key)[0] H.append('
        1. %(nomprenom)s
          2. ' % etud) for etudid in a_desinscrire_without_key: etud = inscrits_without_key_all[etudid] - scolars.format_etud_ident(etud) + sco_etud.format_etud_ident(etud) H.append('
        2. %(nomprenom)s
          3. ' % etud) H.append("
        ") @@ -230,7 +230,7 @@ def formsemestre_synchro_etuds( # Conversions des listes de codes NIP en listes de codes etudid def nip2etudid(code_nip): - etud = scolars.get_etud_info(code_nip=code_nip)[0] + etud = sco_etud.get_etud_info(code_nip=code_nip)[0] return etud["etudid"] etudids_a_inscrire = [nip2etudid(x) for x in a_inscrire] @@ -400,7 +400,7 @@ def list_synch(context, sem, anneeapogee=None): def key2etud(key, etud_apo=False): if not etud_apo: etudid = key2etudid[key] - etud = scolars.identite_list(cnx, {"etudid": etudid})[0] + etud = sco_etud.identite_list(cnx, {"etudid": etudid})[0] etud["inscrit"] = is_inscrit # checkbox state etud[ "datefinalisationinscription" @@ -507,7 +507,7 @@ def list_all(context, etudsapo_set): # si tres grosse base, il serait mieux de faire une requete # d'interrogation par etudiant. cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ScoDocCursor) + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) cursor.execute("select " + EKEY_SCO + ", etudid from identite") key2etudid = dict([(x[0], x[1]) for x in cursor.fetchall()]) all_set = set(key2etudid.keys()) @@ -618,13 +618,13 @@ def do_import_etuds_from_portal(context, sem, a_importer, etudsapo_ident, REQUES } # Identite - args["etudid"] = scolars.identite_create(cnx, args) + args["etudid"] = sco_etud.identite_create(cnx, args) created_etudids.append(args["etudid"]) # Admissions do_import_etud_admission(context, cnx, args["etudid"], etud) # Adresse - scolars.adresse_create(cnx, args) + sco_etud.adresse_create(cnx, args) # Inscription au semestre sco_formsemestre_inscriptions.do_formsemestre_inscription_with_modules( @@ -641,7 +641,7 @@ def do_import_etuds_from_portal(context, sem, a_importer, etudsapo_ident, REQUES log("do_import_etuds_from_portal: aborting transaction !") # Nota: db transaction is sometimes partly commited... # here we try to remove all created students - cursor = cnx.cursor(cursor_factory=ScoDocCursor) + cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) for etudid in created_etudids: log("do_import_etuds_from_portal: deleting etudid=%s" % etudid) cursor.execute( @@ -677,7 +677,7 @@ def do_import_etuds_from_portal(context, sem, a_importer, etudsapo_ident, REQUES sco_news.add( context, REQUEST, - typ=NEWS_INSCR, + typ=sco_news.NEWS_INSCR, text="Import Apogée de %d étudiants en " % len(created_etudids), object=sem["formsemestre_id"], ) @@ -701,9 +701,9 @@ def do_import_etud_admission( "boursier": get_opt_str(etud, "bourse"), } log("do_import_etud_admission: etud=%s" % pprint.pformat(etud)) - al = scolars.admission_list(cnx, args={"etudid": etudid}) + al = sco_etud.admission_list(cnx, args={"etudid": etudid}) if not al: - scolars.admission_create(cnx, args) # -> adm_id + sco_etud.admission_create(cnx, args) # -> adm_id else: # existing data: merge e = al[0] @@ -714,13 +714,13 @@ def do_import_etud_admission( if not args[k]: del args[k] e.update(args) - scolars.admission_edit(cnx, e) + sco_etud.admission_edit(cnx, e) # Traite cas particulier de la date de naissance pour anciens # etudiants IUTV if import_naissance: date_naissance = etud["naissance"].strip() if date_naissance: - scolars.identite_edit_nocheck( + sco_etud.identite_edit_nocheck( cnx, {"etudid": etudid, "date_naissance": date_naissance} ) # Reimport des identités @@ -745,7 +745,7 @@ def do_import_etud_admission( if civilite: args["civilite"] = civilite - scolars.identite_edit_nocheck(cnx, args) + sco_etud.identite_edit_nocheck(cnx, args) def get_bac(etud): @@ -770,7 +770,9 @@ def update_etape_formsemestre_inscription(context, ins, etud): """ if etud["etape"] != ins["etape"]: ins["etape"] = etud["etape"] - sco_formsemestre_inscriptions.do_formsemestre_inscription_edit(context, args=ins) + sco_formsemestre_inscriptions.do_formsemestre_inscription_edit( + context, args=ins + ) def formsemestre_import_etud_admission( @@ -783,7 +785,9 @@ def formsemestre_import_etud_admission( N'affecte pas les etudiants inconnus sur le portail. """ sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list(context, {"formsemestre_id": formsemestre_id}) + ins = sco_formsemestre_inscriptions.do_formsemestre_inscription_list( + context, {"formsemestre_id": formsemestre_id} + ) log( "formsemestre_import_etud_admission: %s (%d etuds)" % (formsemestre_id, len(ins)) @@ -808,7 +812,7 @@ def formsemestre_import_etud_admission( for i in ins: etudid = i["etudid"] - info = scolars.get_etud_info(etudid=etudid, filled=1)[0] + info = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] code_nip = info["code_nip"] if not code_nip: no_nip.append(etudid) @@ -835,7 +839,7 @@ def formsemestre_import_etud_admission( and info["email"] != etud["mail"] or info["emailperso"] != apo_emailperso ): - scolars.adresse_edit( + sco_etud.adresse_edit( cnx, args={ "etudid": etudid, diff --git a/app/scodoc/sco_tag_module.py b/app/scodoc/sco_tag_module.py index 58c52dc1..9a2d4ac5 100644 --- a/app/scodoc/sco_tag_module.py +++ b/app/scodoc/sco_tag_module.py @@ -36,11 +36,14 @@ import types -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from sco_exceptions import ScoValueError, AccessDenied -from sco_permissions import ScoEditFormationTags, ScoChangeFormation +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log +from app.scodoc import sco_core +from app.scodoc import sco_edit_module +from app.scodoc import sco_etud +from app.scodoc.sco_exceptions import ScoValueError, AccessDenied +from app.scodoc.sco_permissions import Permission # Opérations à implementer: # + liste des modules des formations de code donné (formation_code) avec ce tag @@ -236,7 +239,7 @@ def module_tag_set(context, module_id="", taglist=[], REQUEST=None): if REQUEST: # called from Web authuser = REQUEST.AUTHENTICATED_USER tag_editable = authuser.has_permission( - ScoEditFormationTags, context + Permission.ScoEditFormationTags ) or authuser.has_permission(Permission.ScoChangeFormation) if not tag_editable: raise AccessDenied("Modification des tags impossible pour %s" % authuser) @@ -270,7 +273,7 @@ def get_etud_tagged_modules(context, etudid, tagname): Cherche dans tous les semestres dans lesquel l'étudiant est ou a été inscrit. Construit la liste des modules avec le tag donné par tagname """ - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] R = [] for sem in etud["sems"]: nt = sco_core.get_notes_cache( @@ -316,7 +319,7 @@ def split_tagname_coeff(tag, separateur=":"): """Tests: from debug import * -from sco_tag_module import * +from app.scodoc.sco_tag_module import * context = go_dept(app, 'RT').Notes t = ModuleTag(context, 'essai') @@ -333,11 +336,11 @@ t.list_modules(formation_code='FCOD2') Un essai de get_etud_tagged_modules: from debug import * -from sco_tag_module import * +from app.scodoc.sco_tag_module import * context = go_dept(app, 'GEA').Notes etudid='GEAEID80687' -etud = scolars.get_etud_info( etudid=etudid, filled=True)[0] +etud = sco_etud.get_etud_info( etudid=etudid, filled=True)[0] sem = etud['sems'][0] [ tm['moy'] for tm in get_etud_tagged_modules(context, etudid, 'allo') ] diff --git a/app/scodoc/sco_trombino.py b/app/scodoc/sco_trombino.py index c7619a6c..af8ff0a4 100644 --- a/app/scodoc/sco_trombino.py +++ b/app/scodoc/sco_trombino.py @@ -30,8 +30,6 @@ from cStringIO import StringIO from zipfile import ZipFile, BadZipfile -import xml -import tempfile import reportlab from reportlab.lib.units import cm, mm from reportlab.lib.enums import TA_LEFT, TA_RIGHT, TA_CENTER, TA_JUSTIFY @@ -45,21 +43,23 @@ from reportlab.lib.colors import Color from reportlab.lib import colors from PIL import Image as PILImage -from notes_log import log -import sco_utils as scu -import sco_pdf -from sco_pdf import SU -from sco_exceptions import ScoValueError -from TrivialFormulator import TrivialFormulator -import scolars -import sco_photos -import sco_formsemestre -import sco_groups -import sco_groups_view -import sco_portal_apogee -import htmlutils -import ImportScolars -import sco_excel +from app.scodoc.notes_log import log +import app.scodoc.sco_utils as scu +from app.scodoc.TrivialFormulator import TrivialFormulator +from app.scodoc.sco_exceptions import ScoValueError +from app.scodoc.sco_pdf import SU +from app.scodoc import html_sco_header +from app.scodoc import htmlutils +from app.scodoc import ImportScolars +from app.scodoc import sco_excel +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_groups_view +from app.scodoc import sco_pdf +from app.scodoc import sco_photos +from app.scodoc import sco_portal_apogee +from app.scodoc import sco_preferences +from app.scodoc import sco_etud def trombino( @@ -158,9 +158,9 @@ def trombino_html(context, groups_infos, REQUEST=None): H.append("") H.append( '' - + scolars.format_prenom(t["prenom"]) + + sco_etud.format_prenom(t["prenom"]) + '' - + scolars.format_nom(t["nom"]) + + sco_etud.format_nom(t["nom"]) ) H.append("") i += 1 @@ -168,7 +168,7 @@ def trombino_html(context, groups_infos, REQUEST=None): H.append("

") H.append( '' - % args + % groups_infos.groups_query_args ) return "\n".join(H) @@ -345,7 +345,7 @@ def _trombino_pdf(context, groups_infos, REQUEST): [img], [ Paragraph( - SU(scolars.format_nomprenom(t)), + SU(sco_etud.format_nomprenom(t)), StyleSheet["Normal"], ) ], @@ -424,7 +424,7 @@ def _listeappel_photos_pdf(context, groups_infos, REQUEST): t = groups_infos.members[i] img = _get_etud_platypus_image(context, t, image_width=PHOTOWIDTH) txt = Paragraph( - SU(scolars.format_nomprenom(t)), + SU(sco_etud.format_nomprenom(t)), StyleSheet["Normal"], ) if currow: @@ -626,7 +626,7 @@ def zip_excel_import_files( etudid = Filename2Etud[normname] # ok, store photo try: - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] del Filename2Etud[normname] except: raise ScoValueError("ID étudiant invalide: %s" % etudid) diff --git a/app/scodoc/sco_trombino_tours.py b/app/scodoc/sco_trombino_tours.py index 27dbea07..93262e2e 100644 --- a/app/scodoc/sco_trombino_tours.py +++ b/app/scodoc/sco_trombino_tours.py @@ -34,25 +34,21 @@ try: from cStringIO import StringIO except: from StringIO import StringIO -from zipfile import ZipFile, BadZipfile -import xml -import tempfile -import sco_utils as scu -from notes_log import log -import sco_abs -import scolars -import sco_photos -import sco_formsemestre -import sco_groups -import sco_groups_view - -import sco_trombino -from sco_pdf import * from reportlab.lib import colors from reportlab.lib import pagesizes from reportlab.lib.pagesizes import A4, A3 +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc import sco_abs +from app.scodoc import sco_groups +from app.scodoc import sco_groups_view +from app.scodoc import sco_preferences +from app.scodoc import sco_trombino +from app.scodoc import sco_etud +from app.scodoc.sco_pdf import * + # Paramétrage de l'aspect graphique: PHOTOWIDTH = 2.8 * cm @@ -200,9 +196,9 @@ def pdf_trombino_tours( Paragraph( SU( "" - + scolars.format_prenom(m["prenom"]) + + sco_etud.format_prenom(m["prenom"]) + " " - + scolars.format_nom(m["nom"]) + + sco_etud.format_nom(m["nom"]) + text_group + "" ), @@ -422,9 +418,9 @@ def pdf_feuille_releve_absences( currow = [ Paragraph( SU( - scolars.format_nom(m["nom"]) + sco_etud.format_nom(m["nom"]) + " " - + scolars.format_prenom(m["prenom"]) + + sco_etud.format_prenom(m["prenom"]) ), StyleSheet["Normal"], ) @@ -469,7 +465,10 @@ def pdf_feuille_releve_absences( taille = A3 elif sco_preferences.get_preference(context, "feuille_releve_abs_taille") == "A4": taille = A4 - if sco_preferences.get_preference(context, "feuille_releve_abs_format") == "Paysage": + if ( + sco_preferences.get_preference(context, "feuille_releve_abs_format") + == "Paysage" + ): document = BaseDocTemplate(report, pagesize=landscape(taille)) else: document = BaseDocTemplate(report, pagesize=taille) diff --git a/app/scodoc/sco_ue_external.py b/app/scodoc/sco_ue_external.py index cbbee9d3..81313bbf 100644 --- a/app/scodoc/sco_ue_external.py +++ b/app/scodoc/sco_ue_external.py @@ -54,17 +54,23 @@ Solution proposée (nov 2014): """ -import notesdb as ndb -import sco_utils as scu -from notes_log import log -import sco_formsemestre -import sco_moduleimpl -import sco_edit_ue -import sco_saisie_notes -import sco_codes_parcours -from TrivialFormulator import TrivialFormulator, tf_error_message -from sco_permissions import ScoImplement -from sco_exceptions import AccessDenied, ScoValueError +import app.scodoc.notesdb as ndb +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log +from app.scodoc import html_sco_header +from app.scodoc import sco_codes_parcours +from app.scodoc import sco_edit_matiere +from app.scodoc import sco_edit_module +from app.scodoc import sco_edit_ue +from app.scodoc import sco_evaluations +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_saisie_notes +from app.scodoc import sco_etud +from app.scodoc.sco_exceptions import AccessDenied, ScoValueError +from app.scodoc.sco_permissions import Permission +from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message def external_ue_create( @@ -91,7 +97,8 @@ def external_ue_create( numero = sco_edit_ue.next_ue_numero( context, formation_id, semestre_id=sem["semestre_id"] ) - ue_id = sco_edit_ue.do_ue_create(context, + ue_id = sco_edit_ue.do_ue_create( + context, { "formation_id": formation_id, "titre": titre, @@ -104,11 +111,12 @@ def external_ue_create( REQUEST, ) - matiere_id = sco_edit_matiere.do_matiere_create(context, - {"ue_id": ue_id, "titre": titre or acronyme, "numero": 1}, REQUEST + matiere_id = sco_edit_matiere.do_matiere_create( + context, {"ue_id": ue_id, "titre": titre or acronyme, "numero": 1}, REQUEST ) - module_id = sco_edit_module.do_module_create(context, + module_id = sco_edit_module.do_module_create( + context, { "titre": "UE extérieure", "code": acronyme, @@ -148,7 +156,9 @@ def external_ue_inscrit_et_note( ) # Création d'une évaluation si il n'y en a pas déjà: - ModEvals = sco_evaluations.do_evaluation_list(context, args={"moduleimpl_id": moduleimpl_id}) + ModEvals = sco_evaluations.do_evaluation_list( + context, args={"moduleimpl_id": moduleimpl_id} + ) if len(ModEvals): # met la note dans le première évaluation existante: evaluation_id = ModEvals[0]["evaluation_id"] @@ -176,7 +186,9 @@ def external_ue_inscrit_et_note( def get_existing_external_ue(context, formation_id): "la liste de toutes les UE externes définies dans cette formation" - return sco_edit_ue.do_ue_list(context, args={"formation_id": formation_id, "is_external": 1}) + return sco_edit_ue.do_ue_list( + context, args={"formation_id": formation_id, "is_external": 1} + ) def get_external_moduleimpl_id(context, formsemestre_id, ue_id): @@ -214,7 +226,7 @@ def external_ue_create_form(context, formsemestre_id, etudid, REQUEST=None): if not sem["resp_can_edit"] or str(authuser) not in sem["responsables"]: raise AccessDenied("vous n'avez pas le droit d'effectuer cette opération") - etud = scolars.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST)[0] formation_id = sem["formation_id"] existing_external_ue = get_existing_external_ue(context, formation_id) @@ -235,7 +247,9 @@ def external_ue_create_form(context, formsemestre_id, etudid, REQUEST=None): """, ] html_footer = html_sco_header.sco_footer(context, REQUEST) - Fo = sco_formations.formation_list(context, args={"formation_id": sem["formation_id"]})[0] + Fo = sco_formations.formation_list( + context, args={"formation_id": sem["formation_id"]} + )[0] parcours = sco_codes_parcours.get_parcours_from_code(Fo["type_parcours"]) ue_types = parcours.ALLOWED_UE_TYPES ue_types.sort() diff --git a/app/scodoc/sco_undo_notes.py b/app/scodoc/sco_undo_notes.py index a7694a69..4ae468fa 100644 --- a/app/scodoc/sco_undo_notes.py +++ b/app/scodoc/sco_undo_notes.py @@ -46,16 +46,16 @@ Opérations: """ import datetime -from intervals import intervalmap +from app.scodoc.intervals import intervalmap -import sco_utils as scu -import notesdb as ndb -from notes_log import log -from gen_tables import GenTable -import sco_core -import sco_formsemestre -import sco_moduleimpl -import VERSION +import app.scodoc.sco_utils as scu +import app.scodoc.notesdb as ndb +from app.scodoc import sco_evaluations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_preferences +from app.scodoc import VERSION +from app.scodoc.gen_tables import GenTable # deux notes (de même uid) sont considérées comme de la même opération si # elles sont séparées de moins de 2*tolerance: @@ -101,9 +101,11 @@ class NotesOperation(dict): def list_operations(context, evaluation_id): """returns list of NotesOperation for this evaluation""" - notes = context._notes_getall(evaluation_id, filter_suppressed=False).values() - notes_log = context._notes_getall( - evaluation_id, filter_suppressed=False, table="notes_notes_log" + notes = sco_evaluations.do_evaluation_get_all_notes( + context, evaluation_id, filter_suppressed=False + ).values() + notes_log = sco_evaluations.do_evaluation_get_all_notes( + context, evaluation_id, filter_suppressed=False, table="notes_notes_log" ).values() dt = OPERATION_DATE_TOLERANCE NotesDates = {} # { uid : intervalmap } @@ -251,7 +253,7 @@ def get_note_history(context, evaluation_id, etudid, REQUEST=None, fmt=""): """ from debug import * -from sco_undo_notes import * +from app.scodoc.sco_undo_notes import * context = go_dept(app, 'RT').Notes get_note_history(context, 'EVAL29740', 'EID28403') """ diff --git a/app/scodoc/sco_up_to_date.py b/app/scodoc/sco_up_to_date.py index 5175960f..b710fb9e 100644 --- a/app/scodoc/sco_up_to_date.py +++ b/app/scodoc/sco_up_to_date.py @@ -30,10 +30,9 @@ N'effectue pas la mise à jour automatiquement, mais permet un affichage d'avertissement. """ import datetime -import re -import sco_utils as scu -from notes_log import log +import app.scodoc.sco_utils as scu +from app.scodoc.notes_log import log # Appel renvoyant la subversion "stable" # La notion de "stable" est juste là pour éviter d'afficher trop frequemment diff --git a/app/scodoc/sco_users.py b/app/scodoc/sco_users.py index 703d6b18..2390fa67 100644 --- a/app/scodoc/sco_users.py +++ b/app/scodoc/sco_users.py @@ -32,8 +32,7 @@ import cracklib # pylint: disable=import-error -import sco_utils as scu -from sco_utils import CONFIG, SCO_ENCODING +import app.scodoc.sco_utils as scu def is_valid_password(cleartxt): @@ -41,9 +40,9 @@ def is_valid_password(cleartxt): returns True if OK. """ if ( - hasattr(CONFIG, "MIN_PASSWORD_LENGTH") - and CONFIG.MIN_PASSWORD_LENGTH > 0 - and len(cleartxt) < CONFIG.MIN_PASSWORD_LENGTH + hasattr(scu.CONFIG, "MIN_PASSWORD_LENGTH") + and scu.CONFIG.MIN_PASSWORD_LENGTH > 0 + and len(cleartxt) < scu.CONFIG.MIN_PASSWORD_LENGTH ): return False # invalid: too short try: diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py index e81e431b..5fa0e6e1 100644 --- a/app/scodoc/sco_utils.py +++ b/app/scodoc/sco_utils.py @@ -28,19 +28,20 @@ """ Common definitions """ -import os -import sys -import copy -import re import bisect -import types -import numbers -import thread -import urllib2 -import xml.sax.saxutils -import time +import copy import datetime import json +import numbers +import os +import re +import sys +import thread +import time +import types +import urllib +import urllib2 +import xml.sax.saxutils # XML generation package (apt-get install jaxml) import jaxml @@ -57,14 +58,16 @@ from PIL import Image as PILImage from flask import g, url_for -from VERSION import SCOVERSION -import VERSION +from scodoc_manager import sco_mgr from config import Config -from SuppressAccents import suppression_diacritics -from notes_log import log -from sco_codes_parcours import NOTES_TOLERANCE, CODES_EXPL +from app.scodoc.SuppressAccents import suppression_diacritics +from app.scodoc.notes_log import log +from app.scodoc.sco_codes_parcours import NOTES_TOLERANCE, CODES_EXPL +from app.scodoc import sco_exceptions +from app.scodoc import VERSION + # ----- CALCUL ET PRESENTATION DES NOTES NOTES_PRECISION = 1e-4 # evite eventuelles erreurs d'arrondis @@ -211,10 +214,10 @@ class WrapDict: def group_by_key(d, key): - g = DictDefault(defaultvalue=[]) + gr = DictDefault(defaultvalue=[]) for e in d: - g[e[key]].append(e) - return g + gr[e[key]].append(e) + return gr # ----- Global lock for critical sections (except notes_tables caches) @@ -241,8 +244,8 @@ SCO_TOOLS_DIR = os.path.join(SCO_SRC_DIR, "config") # ----- Lecture du fichier de configuration -import sco_config -import sco_config_load +from app.scodoc import sco_config +from app.scodoc import sco_config_load sco_config_load.load_local_configuration(SCODOC_CFG_DIR) CONFIG = sco_config.CONFIG @@ -326,7 +329,7 @@ TYPES_ADMISSION = (TYPE_ADMISSION_DEFAULT, "APB", "APB-PC", "CEF", "Direct") def get_dept_id(): if g.scodoc_dept in sco_mgr.get_dept_ids(): return g.scodoc_dept - raise ScoInvalidDept("département invalide: %s" % g.scodoc_dept) + raise sco_exceptions.ScoInvalidDept("département invalide: %s" % g.scodoc_dept) def get_db_cnx_string(): @@ -593,7 +596,7 @@ def sendPDFFile(REQUEST, data, filename): class ScoDocJSONEncoder(json.JSONEncoder): def default(self, o): # pylint: disable=E0202 - import sco_formsemestre + from app.scodoc import sco_formsemestre # ScoDoc 7.22 n'utilise plus mx: if str(type(o)) == "": @@ -903,7 +906,9 @@ def log_unknown_etud(context, REQUEST=None, format="html"): "unknown student: etudid=%s code_nip=%s code_ine=%s" % (etudid, code_nip, code_ine) ) - return _sco_error_response("unknown student", format=format, REQUEST=REQUEST) + return _sco_error_response( + context, "unknown student", format=format, REQUEST=REQUEST + ) # XXX #sco8 à tester ou ré-écrire @@ -911,37 +916,19 @@ def _sco_error_response(context, msg, format="html", REQUEST=None): """Send an error message to the client, in html or xml format.""" REQUEST.RESPONSE.setStatus(404, reason=msg) if format == "html" or format == "pdf": - raise ScoValueError(msg) + raise sco_exceptions.ScoValueError(msg) elif format == "xml": - REQUEST.RESPONSE.setHeader("content-type", scu.XML_MIMETYPE) - doc = jaxml.XML_document(encoding=scu.SCO_ENCODING) + REQUEST.RESPONSE.setHeader("content-type", XML_MIMETYPE) + doc = jaxml.XML_document(encoding=SCO_ENCODING) doc.error(msg=msg) return repr(doc) elif format == "json": - REQUEST.RESPONSE.setHeader("content-type", scu.JSON_MIMETYPE) + REQUEST.RESPONSE.setHeader("content-type", JSON_MIMETYPE) return "undefined" # XXX voir quoi faire en cas d'erreur json else: raise ValueError("ScoErrorResponse: invalid format") -# XXX -# OK mais ne fonctione pas avec le publisher du vieux Zope car la signature de la méthode change -# def zope_method_str_or_json(func): -# """Decorateur: pour les méthodes publiées qui ramène soit du texte (HTML) soit du JSON -# sauf quand elles sont appellées depuis python. -# La présence de l'argument REQUEST indique la publication. -# """ -# def wrapper(*args, **kwargs): -# r = func(*args, **kwargs) -# REQUEST = kwargs.get('REQUEST', None) -# # Published on the web but not string => convert to JSON -# if REQUEST and not isinstance(r, six.string_types): -# return sendJSON(REQUEST, r) -# return r -# wrapper.__doc__ = func.__doc__ -# return wrapper - - def return_text_if_published(val, REQUEST): """Pour les méthodes publiées qui ramènent soit du texte (HTML) soit du JSON sauf quand elles sont appellées depuis python. @@ -965,6 +952,8 @@ def confirm_dialog( REQUEST=None, # required helpmsg=None, ): + from app.scodoc import html_sco_header + # dialog de confirmation simple parameters[target_variable] = 1 # Attention: la page a pu etre servie en GET avec des parametres diff --git a/app/scodoc/sco_zope.py b/app/scodoc/sco_zope.py deleted file mode 100644 index b780de44..00000000 --- a/app/scodoc/sco_zope.py +++ /dev/null @@ -1,67 +0,0 @@ -# -*- mode: python -*- -# -*- coding: utf-8 -*- - -############################################################################## -# -# Gestion scolarite IUT -# -# Copyright (c) 1999 - 2021 Emmanuel Viennet. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Emmanuel Viennet emmanuel.viennet@gmail.com -# -############################################################################## - -"""Imports et configuration des composants Zope -""" -# Avoid pylint warnings when linting without Zope -# pylint: skip-file - -# Allows code linting on platforms without Zope: -# pylint: disable=import-error -from OFS.SimpleItem import Item # Basic zope object -from OFS.PropertyManager import PropertyManager # provide the 'Properties' tab with the - -# 'manage_propertiesForm' method -from OFS.ObjectManager import ObjectManager -from AccessControl.Role import RoleManager # provide the 'Ownership' tab with - -# the 'manage_owner' method -from AccessControl import ClassSecurityInfo as ZopeClassSecurityInfo -import Globals -from Globals import DTMLFile # can use DTML files -from Globals import Persistent -from Globals import INSTANCE_HOME -from Acquisition import Implicit - - -# Collect all security declarations (Zope2Flask) - -import inspect - -LOG_SECURITY = False # use for dev - - -class ClassSecurityInfo(ZopeClassSecurityInfo): - def declareProtected(self, perm, funcname): - if LOG_SECURITY: - frame = inspect.currentframe() - module = str(frame.f_back.f_locals["__module__"]) - assert module.startswith("Products.ScoDoc.") - module = module[len("Products.ScoDoc.") :] - with open("/tmp/protected_methods.txt", "a") as f: - f.write("%s\t%s\n" % (module, funcname)) - super(ClassSecurityInfo, self).declareProtected(perm, funcname) diff --git a/app/scodoc/scolog.py b/app/scodoc/scolog.py index 6ce6e542..1b097135 100644 --- a/app/scodoc/scolog.py +++ b/app/scodoc/scolog.py @@ -25,16 +25,15 @@ # ############################################################################## +"""Logging des opérations en base de données +""" -import pdb -import os -import sys - -import notesdb as ndb -from notes_log import retreive_request +import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import retreive_request def logdb(REQUEST=None, cnx=None, method=None, etudid=None, msg=None, commit=True): + "Add entry" if not cnx: raise ValueError("logdb: cnx is None") if not REQUEST: @@ -51,7 +50,10 @@ def logdb(REQUEST=None, cnx=None, method=None, etudid=None, msg=None, commit=Tru ndb.quote_dict(args) cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) cursor.execute( - "insert into scolog (authenticated_user,remote_addr,remote_host,method,etudid,msg) values (%(authenticated_user)s,%(remote_addr)s,%(remote_host)s,%(method)s,%(etudid)s,%(msg)s)", + """INSERT INTO scolog + (authenticated_user,remote_addr,remote_host,method,etudid,msg) + VALUES + (%(authenticated_user)s,%(remote_addr)s,%(remote_host)s,%(method)s,%(etudid)s,%(msg)s)""", args, ) if commit: @@ -62,7 +64,9 @@ def loglist(cnx, method=None, authenticated_user=None): """List of events logged for these method and user""" cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) cursor.execute( - "select * from scolog where method=%(method)s and authenticated_user=%(authenticated_user)s", + """SELECT * FROM scolog + WHERE method=%(method)s + AND authenticated_user=%(authenticated_user)s""", {"method": method, "authenticated_user": authenticated_user}, ) return cursor.dictfetchall() diff --git a/app/views/__init__.py b/app/views/__init__.py index 307d77e6..abffe92d 100644 --- a/app/views/__init__.py +++ b/app/views/__init__.py @@ -11,4 +11,3 @@ essais_bp = Blueprint("essais", __name__) from app.views import notes, scolar, absences, essais scolar.context.Notes = notes.context -scolar.context.Absences = absences.context diff --git a/app/views/absences.py b/app/views/absences.py index 3bea3190..4e824f60 100644 --- a/app/views/absences.py +++ b/app/views/absences.py @@ -67,7 +67,6 @@ from app.decorators import ( admin_required, login_required, ) -from app.auth.models import Permission from app.views import absences_bp as bp @@ -76,21 +75,22 @@ from app.scodoc import sco_utils as scu from app.scodoc import notesdb as ndb from app.scodoc.notes_log import log from app.scodoc.scolog import logdb -from app.scodoc.sco_permissions import ScoAbsAddBillet, ScoAbsChange, ScoView +from app.scodoc.sco_permissions import Permission from app.scodoc.sco_exceptions import ScoValueError, ScoInvalidDateError -from app.scodoc.TrivialFormulator import TrivialFormulator, TF +from app.scodoc.TrivialFormulator import TrivialFormulator from app.scodoc.gen_tables import GenTable from app.scodoc import html_sco_header -from app.scodoc import scolars -from app.scodoc import sco_formsemestre -from app.scodoc import sco_moduleimpl -from app.scodoc import sco_groups -from app.scodoc import sco_groups_view -from app.scodoc import sco_excel +from app.scodoc import sco_abs from app.scodoc import sco_abs_notification, sco_abs_views from app.scodoc import sco_compute_moy -from app.scodoc import sco_abs -from app.scodoc.sco_abs import ddmmyyyy +from app.scodoc import sco_etud +from app.scodoc import sco_excel +from app.scodoc import sco_formsemestre +from app.scodoc import sco_groups +from app.scodoc import sco_groups_view +from app.scodoc import sco_moduleimpl +from app.scodoc import sco_preferences + CSSSTYLES = html_sco_header.BOOTSTRAP_MULTISELECT_CSS @@ -106,13 +106,8 @@ def sco_publish(route, function, permission): def _toboolean(x): - "convert a value to boolean (ensure backward compat with OLD intranet code)" - if type(x) == type(""): - x = x.lower() - if x and x != "false": # backward compat... - return True - else: - return False + "convert a value to boolean" + return x # not necessary anymore ! # -------------------------------------------------------------------- @@ -139,6 +134,12 @@ sco_publish( ) sco_publish("/doAnnuleAbsence", sco_abs_views.doAnnuleAbsence, Permission.ScoAbsChange) sco_publish("/doAnnuleJustif", sco_abs_views.doAnnuleJustif, Permission.ScoAbsChange) +sco_publish( + "/AnnuleAbsencesDatesNoJust", + sco_abs_views.AnnuleAbsencesDatesNoJust, + Permission.ScoAbsChange, +) + sco_publish("/ListeAbsEtud", sco_abs_views.ListeAbsEtud, Permission.ScoView) # -------------------------------------------------------------------- @@ -148,476 +149,8 @@ sco_publish("/ListeAbsEtud", sco_abs_views.ListeAbsEtud, Permission.ScoView) # -------------------------------------------------------------------- -def _AddAbsence( - context, - etudid, - jour, - matin, - estjust, - REQUEST, - description=None, - moduleimpl_id=None, -): - "Ajoute une absence dans la bd" - # unpublished - if context._isFarFutur(jour): - raise ScoValueError("date absence trop loin dans le futur !") - estjust = _toboolean(estjust) - matin = _toboolean(matin) - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - cursor.execute( - "insert into absences (etudid,jour,estabs,estjust,matin,description, moduleimpl_id) values (%(etudid)s, %(jour)s, TRUE, %(estjust)s, %(matin)s, %(description)s, %(moduleimpl_id)s )", - vars(), - ) - logdb( - REQUEST, - cnx, - "AddAbsence", - etudid=etudid, - msg="JOUR=%(jour)s,MATIN=%(matin)s,ESTJUST=%(estjust)s,description=%(description)s,moduleimpl_id=%(moduleimpl_id)s" - % vars(), - ) - cnx.commit() - sco_abs.invalidateAbsEtudDate(context, etudid, jour) - sco_abs_notification.abs_notify(context, etudid, jour) - - -def _AddJustif(context, etudid, jour, matin, REQUEST, description=None): - "Ajoute un justificatif dans la base" - # unpublished - if context._isFarFutur(jour): - raise ScoValueError("date justificatif trop loin dans le futur !") - matin = _toboolean(matin) - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - cursor.execute( - "insert into absences (etudid,jour,estabs,estjust,matin, description) values (%(etudid)s,%(jour)s, FALSE, TRUE, %(matin)s, %(description)s )", - vars(), - ) - logdb( - REQUEST, - cnx, - "AddJustif", - etudid=etudid, - msg="JOUR=%(jour)s,MATIN=%(matin)s" % vars(), - ) - cnx.commit() - sco_abs.invalidateAbsEtudDate(context, etudid, jour) - - -def _AnnuleAbsence(context, etudid, jour, matin, moduleimpl_id=None, REQUEST=None): - """Annule une absence ds base - Si moduleimpl_id, n'annule que pour ce module - """ - # unpublished - matin = _toboolean(matin) - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - req = "delete from absences where jour=%(jour)s and matin=%(matin)s and etudid=%(etudid)s and estabs" - if moduleimpl_id: - req += " and moduleimpl_id=%(moduleimpl_id)s" - cursor.execute(req, vars()) - logdb( - REQUEST, - cnx, - "AnnuleAbsence", - etudid=etudid, - msg="JOUR=%(jour)s,MATIN=%(matin)s,moduleimpl_id=%(moduleimpl_id)s" % vars(), - ) - cnx.commit() - sco_abs.invalidateAbsEtudDate(context, etudid, jour) - - -def _AnnuleJustif(context, etudid, jour, matin, REQUEST=None): - "Annule un justificatif" - # unpublished - matin = _toboolean(matin) - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - cursor.execute( - "delete from absences where jour=%(jour)s and matin=%(matin)s and etudid=%(etudid)s and ESTJUST AND NOT ESTABS", - vars(), - ) - cursor.execute( - "update absences set estjust=false where jour=%(jour)s and matin=%(matin)s and etudid=%(etudid)s", - vars(), - ) - logdb( - REQUEST, - cnx, - "AnnuleJustif", - etudid=etudid, - msg="JOUR=%(jour)s,MATIN=%(matin)s" % vars(), - ) - cnx.commit() - sco_abs.invalidateAbsEtudDate(context, etudid, jour) - - -@bp.route("/AnnuleAbsencesDatesNoJust") -@permission_required(Permission.ScoAbsChange) -@scodoc7func(context) -def AnnuleAbsencesDatesNoJust(context, etudid, dates, moduleimpl_id=None, REQUEST=None): - """Supprime les absences aux dates indiquées - mais ne supprime pas les justificatifs. - """ - # log('AnnuleAbsencesDatesNoJust: moduleimpl_id=%s' % moduleimpl_id) - if not dates: - return - date0 = dates[0] - if len(date0.split(":")) == 2: - # am/pm is present - for date in dates: - jour, ampm = date.split(":") - if ampm == "am": - matin = 1 - elif ampm == "pm": - matin = 0 - else: - raise ValueError("invalid ampm !") - context._AnnuleAbsence(etudid, jour, matin, moduleimpl_id, REQUEST) - return - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - # supr les absences non justifiees - for date in dates: - cursor.execute( - "delete from absences where etudid=%(etudid)s and (not estjust) and jour=%(date)s and moduleimpl_id=%(moduleimpl_id)s", - vars(), - ) - sco_abs.invalidateAbsEtudDate(context, etudid, date) - # s'assure que les justificatifs ne sont pas "absents" - for date in dates: - cursor.execute( - "update absences set estabs=FALSE where etudid=%(etudid)s and jour=%(date)s and moduleimpl_id=%(moduleimpl_id)s", - vars(), - ) - if dates: - date0 = dates[0] - else: - date0 = None - if len(dates) > 1: - date1 = dates[1] - else: - date1 = None - logdb( - REQUEST, - cnx, - "AnnuleAbsencesDatesNoJust", - etudid=etudid, - msg="%s - %s - %s" % (date0, date1, moduleimpl_id), - ) - cnx.commit() - - -def _list_abs_in_range( - context, etudid, debut, fin, matin=None, moduleimpl_id=None, cursor=None -): - """Liste des absences entre deux dates. - - Args: - etudid - debut string iso date ("2020-03-12") - end string iso date ("2020-03-12") - matin None, True, False - moduleimpl_id - """ - if matin != None: - matin = _toboolean(matin) - ismatin = " AND A.MATIN = %(matin)s " - else: - ismatin = "" - if moduleimpl_id: - modul = " AND A.MODULEIMPL_ID = %(moduleimpl_id)s " - else: - modul = "" - if not cursor: - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - cursor.execute( - """ -SELECT DISTINCT A.JOUR, A.MATIN -FROM ABSENCES A -WHERE A.ETUDID = %(etudid)s - AND A.ESTABS""" - + ismatin - + modul - + """ - AND A.JOUR BETWEEN %(debut)s AND %(fin)s - """, - vars(), - ) - res = cursor.dictfetchall() - return res - - -@bp.route("/CountAbs") -@permission_required(Permission.ScoView) -@scodoc7func(context) -def CountAbs(context, etudid, debut, fin, matin=None, moduleimpl_id=None): - """CountAbs - matin= 1 ou 0. - - Returns: - An integer. - """ - return len( - _list_abs_in_range( - context, etudid, debut, fin, matin=matin, moduleimpl_id=moduleimpl_id - ) - ) - - -@bp.route("/CountAbsJust") -@permission_required(Permission.ScoView) -@scodoc7func(context) -def CountAbsJust(context, etudid, debut, fin, matin=None, moduleimpl_id=None): - "Count just. abs" - if matin != None: - matin = _toboolean(matin) - ismatin = " AND A.MATIN = %(matin)s " - else: - ismatin = "" - if moduleimpl_id: - modul = " AND A.MODULEIMPL_ID = %(moduleimpl_id)s " - else: - modul = "" - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - cursor.execute( - """SELECT COUNT(*) AS NbAbsJust FROM ( -SELECT DISTINCT A.JOUR, A.MATIN -FROM ABSENCES A, ABSENCES B -WHERE A.ETUDID = %(etudid)s - AND A.ETUDID = B.ETUDID - AND A.JOUR = B.JOUR AND A.MATIN = B.MATIN - AND A.JOUR BETWEEN %(debut)s AND %(fin)s - AND A.ESTABS AND (A.ESTJUST OR B.ESTJUST)""" - + ismatin - + modul - + """ -) AS tmp - """, - vars(), - ) - res = cursor.fetchone()[0] - return res - - -def _ListeAbsDate(context, etudid, beg_date, end_date): - # Liste des absences et justifs entre deux dates - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - cursor.execute( - """SELECT jour, matin, estabs, estjust, description FROM ABSENCES A - WHERE A.ETUDID = %(etudid)s - AND A.jour >= %(beg_date)s - AND A.jour <= %(end_date)s - """, - vars(), - ) - Abs = cursor.dictfetchall() - # remove duplicates - A = {} # { (jour, matin) : abs } - for a in Abs: - jour, matin = a["jour"], a["matin"] - if (jour, matin) in A: - # garde toujours la description - a["description"] = a["description"] or A[(jour, matin)]["description"] - # et la justif: - a["estjust"] = a["estjust"] or A[(jour, matin)]["estjust"] - a["estabs"] = a["estabs"] or A[(jour, matin)]["estabs"] - A[(jour, matin)] = a - else: - A[(jour, matin)] = a - if A[(jour, matin)]["description"] is None: - A[(jour, matin)]["description"] = "" - # add hours: matin = 8:00 - 12:00, apresmidi = 12:00 - 18:00 - dat = "%04d-%02d-%02d" % (a["jour"].year, a["jour"].month, a["jour"].day) - if a["matin"]: - A[(jour, matin)]["begin"] = dat + " 08:00:00" - A[(jour, matin)]["end"] = dat + " 11:59:59" - else: - A[(jour, matin)]["begin"] = dat + " 12:00:00" - A[(jour, matin)]["end"] = dat + " 17:59:59" - # sort - R = A.values() - R.sort(key=lambda x: (x["begin"])) - return R - - -@bp.route("/ListeAbsJust") -@permission_required(Permission.ScoView) -@scodoc7func(context) -def ListeAbsJust(context, etudid, datedebut): - "Liste des absences justifiees (par ordre chronologique)" - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - cursor.execute( - """SELECT DISTINCT A.ETUDID, A.JOUR, A.MATIN FROM ABSENCES A, ABSENCES B -WHERE A.ETUDID = %(etudid)s -AND A.ETUDID = B.ETUDID -AND A.JOUR = B.JOUR AND A.MATIN = B.MATIN AND A.JOUR >= %(datedebut)s -AND A.ESTABS AND (A.ESTJUST OR B.ESTJUST) -ORDER BY A.JOUR - """, - vars(), - ) - A = cursor.dictfetchall() - for a in A: - a["description"] = context._GetAbsDescription(a, cursor=cursor) - return A - - -@bp.route("/ListeAbsNonJust") -@permission_required(Permission.ScoView) -@scodoc7func(context) -def ListeAbsNonJust(context, etudid, datedebut): - "Liste des absences NON justifiees (par ordre chronologique)" - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - cursor.execute( - """SELECT ETUDID, JOUR, MATIN FROM ABSENCES A -WHERE A.ETUDID = %(etudid)s -AND A.estabs -AND A.jour >= %(datedebut)s -EXCEPT SELECT ETUDID, JOUR, MATIN FROM ABSENCES B -WHERE B.estjust -AND B.ETUDID = %(etudid)s -ORDER BY JOUR - """, - vars(), - ) - A = cursor.dictfetchall() - for a in A: - a["description"] = context._GetAbsDescription(a, cursor=cursor) - return A - - -@bp.route("/ListeJustifs") -@permission_required(Permission.ScoView) -@scodoc7func(context) -def ListeJustifs(context, etudid, datedebut, datefin=None, only_no_abs=False): - """Liste des justificatifs (sans absence relevée) à partir d'une date, - ou, si datefin spécifié, entre deux dates. - Si only_no_abs: seulement les justificatifs correspondant aux jours sans absences relevées. - """ - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - req = """SELECT DISTINCT ETUDID, JOUR, MATIN FROM ABSENCES A -WHERE A.ETUDID = %(etudid)s -AND A.ESTJUST -AND A.JOUR >= %(datedebut)s""" - if datefin: - req += """AND A.JOUR <= %(datefin)s""" - if only_no_abs: - req += """ -EXCEPT SELECT ETUDID, JOUR, MATIN FROM ABSENCES B -WHERE B.estabs -AND B.ETUDID = %(etudid)s - """ - cursor.execute(req, vars()) - A = cursor.dictfetchall() - for a in A: - a["description"] = context._GetAbsDescription(a, cursor=cursor) - - return A - - -def _GetAbsDescription(context, a, cursor=None): - "Description associee a l'absence" - if not cursor: - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - a = a.copy() - # a['jour'] = a['jour'].date() - if a["matin"]: # devrait etre booleen... :-( - a["matin"] = True - else: - a["matin"] = False - cursor.execute( - """select * from absences where etudid=%(etudid)s and jour=%(jour)s and matin=%(matin)s order by entry_date desc""", - a, - ) - A = cursor.dictfetchall() - desc = None - module = "" - for a in A: - if a["description"]: - desc = a["description"] - if a["moduleimpl_id"] and a["moduleimpl_id"] != "NULL": - # Trouver le nom du module - Mlist = sco_moduleimpl.do_moduleimpl_withmodule_list( - context.Notes, moduleimpl_id=a["moduleimpl_id"] - ) - if Mlist: - M = Mlist[0] - module += "%s " % M["module"]["code"] - - if desc: - return "(%s) %s" % (desc, module) - if module: - return module - return "" - - -@bp.route("/ListeAbsJour") -@permission_required(Permission.ScoView) -@scodoc7func(context) -def ListeAbsJour(context, date, am=True, pm=True, is_abs=True, is_just=None): - """Liste des absences et/ou justificatifs ce jour. - is_abs: None (peu importe), True, False - is_just: idem - """ - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - req = """SELECT DISTINCT etudid, jour, matin FROM ABSENCES A -WHERE A.jour = %(date)s -""" - if is_abs != None: - req += " AND A.estabs = %(is_abs)s" - if is_just != None: - req += " AND A.estjust = %(is_just)s" - if not am: - req += " AND NOT matin " - if not pm: - req += " AND matin" - - cursor.execute(req, {"date": date, "is_just": is_just, "is_abs": is_abs}) - A = cursor.dictfetchall() - for a in A: - a["description"] = context._GetAbsDescription(a, cursor=cursor) - return A - - -@bp.route("/ListeAbsNonJustJour") -@permission_required(Permission.ScoView) -@scodoc7func(context) -def ListeAbsNonJustJour(context, date, am=True, pm=True): - "Liste des absences non justifiees ce jour" - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - reqa = "" - if not am: - reqa += " AND NOT matin " - if not pm: - reqa += " AND matin " - req = ( - """SELECT etudid, jour, matin FROM ABSENCES A -WHERE A.estabs -AND A.jour = %(date)s -""" - + reqa - + """EXCEPT SELECT etudid, jour, matin FROM ABSENCES B -WHERE B.estjust AND B.jour = %(date)s""" - + reqa - ) - - cursor.execute(req, {"date": date}) - A = cursor.dictfetchall() - for a in A: - a["description"] = context._GetAbsDescription(a, cursor=cursor) - return A +sco_publish("/CountAbs", sco_abs.CountAbs, Permission.ScoView) +sco_publish("/CountAbsJust", sco_abs.CountAbsJust, Permission.ScoView) @bp.route("/doSignaleAbsenceGrSemestre") @@ -649,43 +182,19 @@ def doSignaleAbsenceGrSemestre( # 1- Efface les absences if dates: for etudid in etudids: - context.AnnuleAbsencesDatesNoJust(etudid, dates, moduleimpl_id, REQUEST) + sco_abs_views.AnnuleAbsencesDatesNoJust( + context, etudid, dates, moduleimpl_id, REQUEST + ) return "Absences effacées" # 2- Ajoute les absences if abslist: - context._add_abslist(abslist, REQUEST, moduleimpl_id) + sco_abs._add_abslist(context, abslist, REQUEST, moduleimpl_id) return "Absences ajoutées" return "" -def _add_abslist(context, abslist, REQUEST, moduleimpl_id=None): - for a in abslist: - etudid, jour, ampm = a.split(":") - if ampm == "am": - matin = 1 - elif ampm == "pm": - matin = 0 - else: - raise ValueError("invalid ampm !") - # ajoute abs si pas deja absent - if context.CountAbs(etudid, jour, jour, matin, moduleimpl_id) == 0: - context._AddAbsence(etudid, jour, matin, 0, REQUEST, "", moduleimpl_id) - - -# --- Misc tools.... ------------------ - - -def _isFarFutur(context, jour): - # check si jour est dans le futur "lointain" - # pour autoriser les saisies dans le futur mais pas a plus de 6 mois - y, m, d = [int(x) for x in jour.split("-")] - j = datetime.date(y, m, d) - # 6 mois ~ 182 jours: - return j - datetime.date.today() > datetime.timedelta(182) - - # ------------ HTML Interfaces @bp.route("/SignaleAbsenceGrHebdo") @permission_required(Permission.ScoAbsChange) @@ -720,7 +229,7 @@ def SignaleAbsenceGrHebdo( context, "abs_require_module", formsemestre_id ) etuds = [ - scolars.get_etud_info(etudid=m["etudid"], filled=True)[0] + sco_etud.get_etud_info(etudid=m["etudid"], filled=True)[0] for m in groups_infos.members ] # Restreint aux inscrits au module sélectionné @@ -846,8 +355,8 @@ def SignaleAbsenceGrHebdo( % {"menu_module": menu_module, "url": base_url, "sel": sel} ) - H += context._gen_form_saisie_groupe( - etuds, datessem, destination, moduleimpl_id, require_module + H += _gen_form_saisie_groupe( + context, etuds, datessem, destination, moduleimpl_id, require_module ) H.append(html_sco_header.sco_footer(REQUEST)) @@ -884,7 +393,7 @@ def SignaleAbsenceGrSemestre( context, "abs_require_module", formsemestre_id ) etuds = [ - scolars.get_etud_info(etudid=m["etudid"], filled=True)[0] + sco_etud.get_etud_info(etudid=m["etudid"], filled=True)[0] for m in groups_infos.members ] # Restreint aux inscrits au module sélectionné @@ -919,9 +428,9 @@ def SignaleAbsenceGrSemestre( context, {"formsemestre_id": formsemestre_id} )[0] work_saturday = sco_abs.is_work_saturday(context) - jourdebut = ddmmyyyy(datedebut, work_saturday=work_saturday) - jourfin = ddmmyyyy(datefin, work_saturday=work_saturday) - today = ddmmyyyy( + jourdebut = sco_abs.ddmmyyyy(datedebut, work_saturday=work_saturday) + jourfin = sco_abs.ddmmyyyy(datefin, work_saturday=work_saturday) + today = sco_abs.ddmmyyyy( time.strftime("%d/%m/%Y", time.localtime()), work_saturday=work_saturday, ) @@ -937,8 +446,8 @@ def SignaleAbsenceGrSemestre( % (str(jourdebut), jourdebut.iswork()) ) # calcule dates - dates = [] # ddmmyyyy instances - d = ddmmyyyy(datedebut, work_saturday=work_saturday) + dates = [] # sco_abs.ddmmyyyy instances + d = sco_abs.ddmmyyyy(datedebut, work_saturday=work_saturday) while d <= jourfin: dates.append(d) d = d.next(7) # avance d'une semaine @@ -1040,8 +549,8 @@ onchange="document.location='%(url)s&moduleimpl_id='+document.getElementById('mo } ) - H += context._gen_form_saisie_groupe( - etuds, dates, destination, moduleimpl_id, require_module + H += _gen_form_saisie_groupe( + context, etuds, dates, destination, moduleimpl_id, require_module ) H.append(html_sco_header.sco_footer(REQUEST)) return "\n".join(H) @@ -1148,7 +657,7 @@ def _gen_form_saisie_groupe( '%s%s' % (tr_class, etudid, etudid, etud["nomprenom"], capstr) ) - etud_abs = _list_abs_in_range( + etud_abs = sco_abs.list_abs_in_range( context, etudid, begin, end, moduleimpl_id=moduleimpl_id, cursor=cursor ) for d in odates: @@ -1227,136 +736,6 @@ def _gen_form_saisie_groupe( return H -def _TablesAbsEtud( - context, - etudid, - datedebut, - with_evals=True, - format="html", - absjust_only=0, - REQUEST=None, -): - """Tables des absences justifiees et non justifiees d'un étudiant sur l'année en cours""" - absjust = context.ListeAbsJust(etudid=etudid, datedebut=datedebut) - absnonjust = context.ListeAbsNonJust(etudid=etudid, datedebut=datedebut) - # examens ces jours là ? - if with_evals: - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - for a in absnonjust + absjust: - cursor.execute( - """select eval.* - from notes_evaluation eval, notes_moduleimpl_inscription mi, notes_moduleimpl m - where eval.jour = %(jour)s and eval.moduleimpl_id = m.moduleimpl_id - and mi.moduleimpl_id = m.moduleimpl_id and mi.etudid = %(etudid)s""", - {"jour": a["jour"].strftime("%Y-%m-%d"), "etudid": etudid}, - ) - a["evals"] = cursor.dictfetchall() - cursor.execute( - """SELECT mi.moduleimpl_id - from absences abs, notes_moduleimpl_inscription mi, notes_moduleimpl m - where abs.matin = %(matin)s and abs.jour = %(jour)s and abs.etudid=%(etudid)s and abs.moduleimpl_id=mi.moduleimpl_id and mi.moduleimpl_id=m.moduleimpl_id - and mi.etudid = %(etudid)s""", - { - "matin": bool(a["matin"]), - "jour": a["jour"].strftime("%Y-%m-%d"), - "etudid": etudid, - }, - ) - a["absent"] = cursor.dictfetchall() - - def matin(x): - if x: - return "matin" - else: - return "après-midi" - - def descr_exams(a): - if not a.has_key("evals"): - return "" - ex = [] - for ev in a["evals"]: - mod = sco_moduleimpl.do_moduleimpl_withmodule_list( - context.Notes, moduleimpl_id=ev["moduleimpl_id"] - )[0] - if format == "html": - ex.append( - '%s' - % (mod["moduleimpl_id"], mod["module"]["code"]) - ) - else: - ex.append(mod["module"]["code"]) - if ex: - return ", ".join(ex) - return "" - - def descr_abs(a): - ex = [] - for ev in a.get("absent", []): - mod = sco_moduleimpl.do_moduleimpl_withmodule_list( - context.Notes, moduleimpl_id=ev["moduleimpl_id"] - )[0] - if format == "html": - ex.append( - '%s' - % (mod["moduleimpl_id"], mod["module"]["code"]) - ) - else: - ex.append(mod["module"]["code"]) - if ex: - return ", ".join(ex) - return "" - - # ajoute date formatée et évaluations - for L in (absnonjust, absjust): - for a in L: - if with_evals: - a["exams"] = descr_exams(a) - a["datedmy"] = a["jour"].strftime("%d/%m/%Y") - a["ampm"] = int(a["matin"]) - a["matin"] = matin(a["matin"]) - index = a["description"].find(")") - if index != -1: - a["motif"] = a["description"][1:index] - else: - a["motif"] = "" - a["description"] = descr_abs(a) or "" - - # ajoute lien pour justifier - if format == "html": - for a in absnonjust: - a["justlink"] = "justifier" - a[ - "_justlink_target" - ] = "doJustifAbsence?etudid=%s&datedebut=%s&datefin=%s&demijournee=%s" % ( - etudid, - a["datedmy"], - a["datedmy"], - a["ampm"], - ) - # - titles = { - "datedmy": "Date", - "matin": "", - "exams": "Examens ce jour", - "justlink": "", - "description": "Modules", - "motif": "Motif", - } - columns_ids = ["datedmy", "matin"] - if format in ("json", "xml"): - columns_ids += ["jour", "ampm"] - if with_evals: - columns_ids.append("exams") - - columns_ids.append("description") - columns_ids.append("motif") - if format == "html": - columns_ids.append("justlink") - - return titles, columns_ids, absnonjust, absjust - - @bp.route("/EtatAbsencesGr") @permission_required(Permission.ScoView) @scodoc7func(context) # ported from dtml @@ -1382,14 +761,16 @@ def EtatAbsencesGr( # Construit tableau (etudid, statut, nomprenom, nbJust, nbNonJust, NbTotal) T = [] for m in groups_infos.members: - etud = scolars.get_etud_info(etudid=m["etudid"], filled=True)[0] - nbabs = context.CountAbs(etudid=etud["etudid"], debut=datedebut, fin=datefin) + etud = sco_etud.get_etud_info(etudid=m["etudid"], filled=True)[0] + nbabs = sco_abs.CountAbs( + context, etudid=etud["etudid"], debut=datedebut, fin=datefin + ) nbabsjust = context.CountAbsJust( etudid=etud["etudid"], debut=datedebut, fin=datefin ) nbjustifs_noabs = len( - context.ListeJustifs( - etudid=etud["etudid"], datedebut=datedebut, only_no_abs=True + sco_abs.ListeJustifs( + context, etudid=etud["etudid"], datedebut=datedebut, only_no_abs=True ) ) # retrouve sem dans etud['sems'] @@ -1529,11 +910,11 @@ def EtatAbsencesDate( """ ) for etud in groups_infos.members: - nbabsam = context.CountAbs( - etudid=etud["etudid"], debut=dateiso, fin=dateiso, matin=1 + nbabsam = sco_abs.CountAbs( + context, etudid=etud["etudid"], debut=dateiso, fin=dateiso, matin=1 ) - nbabspm = context.CountAbs( - etudid=etud["etudid"], debut=dateiso, fin=dateiso, matin=0 + nbabspm = sco_abs.CountAbs( + context, etudid=etud["etudid"], debut=dateiso, fin=dateiso, matin=0 ) if (nbabsam != 0) or (nbabspm != 0): nbetud += 1 @@ -1606,7 +987,7 @@ def AddBilletAbsence( """ t0 = time.time() # check etudid - etuds = scolars.get_etud_info( + etuds = sco_etud.get_etud_info( etudid=etudid, code_nip=code_nip, REQUEST=REQUEST, filled=True ) if not etuds: @@ -1638,7 +1019,7 @@ def AddBilletAbsence( REQUEST.RESPONSE.setHeader("content-type", scu.XML_MIMETYPE) billets = sco_abs.billet_absence_list(cnx, {"billet_id": billet_id}) - tab = context._tableBillets(billets, etud=etud) + tab = _tableBillets(context, billets, etud=etud) log("AddBilletAbsence: new billet_id=%s (%gs)" % (billet_id, time.time() - t0)) return tab.make_page(context, REQUEST=REQUEST, format="xml") else: @@ -1652,7 +1033,7 @@ def AddBilletAbsenceForm(context, etudid, REQUEST=None): """Formulaire ajout billet (pour tests seulement, le vrai formulaire accessible aux etudiants étant sur le portail étudiant). """ - etud = scolars.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST)[0] H = [ html_sco_header.sco_header( context, REQUEST, page_title="Billet d'absence de %s" % etud["nomprenom"] @@ -1682,7 +1063,8 @@ def AddBilletAbsenceForm(context, etudid, REQUEST=None): e = tf[2]["end"].split("/") end = e[2] + "-" + e[1] + "-" + e[0] + " 00:00:00" log( - context.AddBilletAbsence( + AddBilletAbsence( + context, begin, end, tf[2]["description"], @@ -1721,7 +1103,7 @@ def _tableBillets(context, billets, etud=None, title=""): b["etat_str"] = "ok" if not etud: # ajoute info etudiant - e = scolars.get_etud_info(etudid=b["etudid"], filled=1) + e = sco_etud.get_etud_info(etudid=b["etudid"], filled=1) if not e: b["nomprenom"] = "???" # should not occur else: @@ -1761,14 +1143,14 @@ def _tableBillets(context, billets, etud=None, title=""): @scodoc7func(context) def listeBilletsEtud(context, etudid=False, REQUEST=None, format="html"): """Liste billets pour un etudiant""" - etuds = scolars.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST) + etuds = sco_etud.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST) if not etuds: return scu.log_unknown_etud(context, format=format, REQUEST=REQUEST) etud = etuds[0] cnx = ndb.GetDBConnexion() billets = sco_abs.billet_absence_list(cnx, {"etudid": etud["etudid"]}) - tab = context._tableBillets(billets, etud=etud) + tab = _tableBillets(context, billets, etud=etud) return tab.make_page(context, REQUEST=REQUEST, format=format) @@ -1780,7 +1162,7 @@ def XMLgetBilletsEtud(context, etudid=False, REQUEST=None): if not sco_preferences.get_preference(context, "handle_billets_abs"): return "" t0 = time.time() - r = context.listeBilletsEtud(etudid, REQUEST=REQUEST, format="xml") + r = listeBilletsEtud(context, etudid, REQUEST=REQUEST, format="xml") log("XMLgetBilletsEtud (%gs)" % (time.time() - t0)) return r @@ -1792,7 +1174,7 @@ def listeBillets(context, REQUEST=None): """Page liste des billets non traités et formulaire recherche d'un billet""" cnx = ndb.GetDBConnexion() billets = sco_abs.billet_absence_list(cnx, {"etat": 0}) - tab = context._tableBillets(billets) + tab = _tableBillets(context, billets) T = tab.html() H = [ html_sco_header.sco_header( @@ -1827,7 +1209,7 @@ def deleteBilletAbsence(context, billet_id, REQUEST=None, dialog_confirmed=False "listeBillets?head_message=Billet%%20%s%%20inexistant !" % billet_id ) if not dialog_confirmed: - tab = context._tableBillets(billets) + tab = _tableBillets(context, billets) return context.confirmDialog( """

Supprimer ce billet ?

""" + tab.html(), dest_url="", @@ -1858,14 +1240,21 @@ def _ProcessBilletAbsence(context, billet, estjust, description, REQUEST): dates = sco_abs.DateRangeISO(context, datedebut, datefin) # commence après-midi ? if dates and billet["abs_begin"].hour > 11: - context._AddAbsence( - billet["etudid"], dates[0], 0, estjust, REQUEST, description=description + sco_abs.add_absence( + context, + billet["etudid"], + dates[0], + 0, + estjust, + REQUEST, + description=description, ) n += 1 dates = dates[1:] # termine matin ? if dates and billet["abs_end"].hour < 12: - context._AddAbsence( + sco_abs.add_absence( + context, billet["etudid"], dates[-1], 1, @@ -1877,11 +1266,23 @@ def _ProcessBilletAbsence(context, billet, estjust, description, REQUEST): dates = dates[:-1] for jour in dates: - context._AddAbsence( - billet["etudid"], jour, 0, estjust, REQUEST, description=description + sco_abs.add_absence( + context, + billet["etudid"], + jour, + 0, + estjust, + REQUEST, + description=description, ) - context._AddAbsence( - billet["etudid"], jour, 1, estjust, REQUEST, description=description + sco_abs.add_absence( + context, + billet["etudid"], + jour, + 1, + estjust, + REQUEST, + description=description, ) n += 2 @@ -1904,7 +1305,7 @@ def ProcessBilletAbsenceForm(context, billet_id, REQUEST=None): ) billet = billets[0] etudid = billet["etudid"] - etud = scolars.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1, REQUEST=REQUEST)[0] H = [ html_sco_header.sco_header( @@ -1939,7 +1340,7 @@ def ProcessBilletAbsenceForm(context, billet_id, REQUEST=None): submitlabel="Enregistrer ces absences", ) if tf[0] == 0: - tab = context._tableBillets([billet], etud=etud) + tab = _tableBillets(context, [billet], etud=etud) H.append(tab.html()) if billet["justified"] == 1: H.append( @@ -1955,8 +1356,8 @@ def ProcessBilletAbsenceForm(context, billet_id, REQUEST=None): elif tf[0] == -1: return REQUEST.RESPONSE.redirect(scu.ScoURL()) else: - n = context._ProcessBilletAbsence( - billet, tf[2]["estjust"], tf[2]["description"], REQUEST + n = _ProcessBilletAbsence( + context, billet, tf[2]["estjust"], tf[2]["description"], REQUEST ) if tf[2]["estjust"]: j = "justifiées" @@ -1974,7 +1375,7 @@ def ProcessBilletAbsenceForm(context, billet_id, REQUEST=None): % (etud["nomprenom"]) ) billets = sco_abs.billet_absence_list(cnx, {"etudid": etud["etudid"]}) - tab = context._tableBillets(billets, etud=etud) + tab = _tableBillets(context, billets, etud=etud) H.append(tab.html()) return "\n".join(H) + html_sco_header.sco_footer(REQUEST) @@ -1985,14 +1386,14 @@ def ProcessBilletAbsenceForm(context, billet_id, REQUEST=None): def XMLgetAbsEtud(context, beg_date="", end_date="", REQUEST=None): """returns list of absences in date interval""" t0 = time.time() - etud = scolars.get_etud_info(REQUEST=REQUEST)[0] + etud = sco_etud.get_etud_info(REQUEST=REQUEST)[0] exp = re.compile(r"^(\d{4})\D?(0[1-9]|1[0-2])\D?([12]\d|0[1-9]|3[01])$") if not exp.match(beg_date): raise ScoValueError("invalid date: %s" % beg_date) if not exp.match(end_date): raise ScoValueError("invalid date: %s" % end_date) - Abs = context._ListeAbsDate(etud["etudid"], beg_date, end_date) + Abs = sco_abs.ListeAbsDate(context, etud["etudid"], beg_date, end_date) REQUEST.RESPONSE.setHeader("content-type", scu.XML_MIMETYPE) doc = jaxml.XML_document(encoding=scu.SCO_ENCODING) diff --git a/app/views/entreprises.py b/app/views/entreprises.py index 5e0f7703..eabe5366 100644 --- a/app/views/entreprises.py +++ b/app/views/entreprises.py @@ -42,15 +42,15 @@ import calendar # A REVOIR # from sco_permissions import ScoEntrepriseView, ScoEntrepriseChange -# from notes_log import log +# from app.scodoc.notes_log import log # from scolog import logdb # from sco_utils import SCO_ENCODING -# import sco_utils as scu +# import app.scodoc.sco_utils as scu # import html_sidebar # import VERSION -# from gen_tables import GenTable -# from TrivialFormulator import TrivialFormulator, TF -# import scolars +# from app.scodoc.gen_tables import GenTable +# from app.scodoc.TrivialFormulator import TrivialFormulator, TF +# import sco_etud # import sco_entreprises @@ -1135,7 +1135,7 @@ security.declareProtected(ScoEntrepriseView, "entreprise_edit") def entreprise_edit(context, entreprise_id, REQUEST=None, start=1): """Form. edit entreprise""" authuser = REQUEST.AUTHENTICATED_USER - readonly = not authuser.has_permission(Permission.ScoEntrepriseChange, context) + readonly = not authuser.has_permission(Permission.ScoEntrepriseChange) F = sco_entreprises.do_entreprise_list( context, args={"entreprise_id": entreprise_id} )[0] diff --git a/app/views/notes.py b/app/views/notes.py index 66908fd0..07dd7171 100644 --- a/app/views/notes.py +++ b/app/views/notes.py @@ -40,7 +40,7 @@ from flask import g from flask import current_app from config import Config -from scodoc_manager import sco_mgr +import scodoc_manager from app.decorators import ( scodoc7func, ScoDoc7Context, @@ -48,7 +48,6 @@ from app.decorators import ( admin_required, login_required, ) -from app.auth.models import Permission from app.views import notes_bp as bp @@ -67,17 +66,11 @@ from app.scodoc.sco_exceptions import ( ScoGenError, AccessDenied, ) -from app.scodoc.sco_pdf import PDFLOCK -import app.scodoc.VERSION as VERSION -from app.scodoc.sco_news import NEWS_INSCR, NEWS_NOTE, NEWS_FORM, NEWS_SEM, NEWS_MISC -from app.scodoc.gen_tables import GenTable -from app.scodoc.sco_permissions import Permission, ScoImplement -from app.scodoc.TrivialFormulator import TrivialFormulator -from app.scodoc import sco_core -from app.scodoc import htmlutils from app.scodoc import html_sco_header +from app.scodoc import htmlutils from app.scodoc import notes_table from app.scodoc import pe_view +from app.scodoc import sco_abs from app.scodoc import sco_apogee_compare from app.scodoc import sco_apogee_csv from app.scodoc import sco_archives @@ -86,6 +79,7 @@ from app.scodoc import sco_bulletins_pdf from app.scodoc import sco_cache from app.scodoc import sco_codes_parcours from app.scodoc import sco_compute_moy +from app.scodoc import sco_core from app.scodoc import sco_cost_formation from app.scodoc import sco_debouche from app.scodoc import sco_edit_formation @@ -93,6 +87,7 @@ from app.scodoc import sco_edit_matiere from app.scodoc import sco_edit_module from app.scodoc import sco_edit_ue from app.scodoc import sco_etape_apogee_view +from app.scodoc import sco_etud from app.scodoc import sco_evaluations from app.scodoc import sco_excel from app.scodoc import sco_export_results @@ -113,8 +108,10 @@ from app.scodoc import sco_moduleimpl_inscriptions from app.scodoc import sco_moduleimpl_status from app.scodoc import sco_news from app.scodoc import sco_parcours_dut +from app.scodoc import sco_permissions_check from app.scodoc import sco_placement from app.scodoc import sco_poursuite_dut +from app.scodoc import sco_preferences from app.scodoc import sco_prepajury from app.scodoc import sco_pvjury from app.scodoc import sco_pvpdf @@ -126,7 +123,11 @@ from app.scodoc import sco_synchro_etuds from app.scodoc import sco_tag_module from app.scodoc import sco_ue_external from app.scodoc import sco_undo_notes -from app.scodoc import scolars +from app.scodoc.gen_tables import GenTable +from app.scodoc.sco_pdf import PDFLOCK +from app.scodoc.sco_permissions import Permission +from app.scodoc.TrivialFormulator import TrivialFormulator +import app.scodoc.VERSION as VERSION context = ScoDoc7Context("notes") @@ -366,9 +367,7 @@ sco_publish( def index_html(context, REQUEST=None): "Page accueil formations" - editable = REQUEST.AUTHENTICATED_USER.has_permission( - Permission.ScoChangeFormation, g.scodoc_dept - ) + editable = REQUEST.AUTHENTICATED_USER.has_permission(Permission.ScoChangeFormation) H = [ html_sco_header.sco_header( @@ -503,7 +502,7 @@ def formation_create_new_version(context, formation_id, redirect=True, REQUEST=N sco_news.add( context, REQUEST, - typ=NEWS_FORM, + typ=sco_news.NEWS_FORM, object=new_id, text="Nouvelle version de la formation %(acronyme)s" % F, ) @@ -611,7 +610,7 @@ def do_formsemestre_create(context, args, REQUEST, silent=False): sco_news.add( context, REQUEST, - typ=NEWS_SEM, + typ=sco_news.NEWS_SEM, text='Création du semestre %(titre)s' % args, url=args["url"], ) @@ -695,37 +694,6 @@ sco_publish( ) -def _check_access_diretud( - context, formsemestre_id, REQUEST, required_permission=ScoImplement -): - """Check if access granted: responsable or ScoImplement - Return True|False, HTML_error_page - """ - authuser = REQUEST.AUTHENTICATED_USER - sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - header = html_sco_header.sco_header( - context, page_title="Accès interdit", REQUEST=REQUEST - ) - footer = html_sco_header.sco_footer(context, REQUEST) - if (str(authuser) not in sem["responsables"]) and not authuser.has_permission( - required_permission, context - ): - return ( - False, - "\n".join( - [ - header, - "

Opération non autorisée pour %s

" % authuser, - "

Responsable de ce semestre : %s

" - % ", ".join(sem["responsables"]), - footer, - ] - ), - ) - else: - return True, "" - - @bp.route("/formsemestre_custommenu_edit") @permission_required(Permission.ScoView) @scodoc7func(context) @@ -1044,17 +1012,22 @@ def view_module_abs(context, REQUEST, moduleimpl_id, format="html"): T = [] for etudid in list_insc: - nb_abs = context.Absences.CountAbs( - etudid=etudid, debut=debut_sem, fin=fin_sem, moduleimpl_id=moduleimpl_id + nb_abs = sco_abs.CountAbs( + context, + etudid=etudid, + debut=debut_sem, + fin=fin_sem, + moduleimpl_id=moduleimpl_id, ) if nb_abs: - nb_abs_just = context.Absences.CountAbsJust( + nb_abs_just = sco_abs.CountAbsJust( + context, etudid=etudid, debut=debut_sem, fin=fin_sem, moduleimpl_id=moduleimpl_id, ) - etud = scolars.get_etud_info(etudid=etudid, filled=True)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=True)[0] T.append( { "nomprenom": etud["nomprenom"], @@ -1312,7 +1285,7 @@ def do_formsemestre_inscription_listinscrits( context, formsemestre_id, format=None, REQUEST=None ): """Liste les inscrits (état I) à ce semestre et cache le résultat""" - cache = context.get_formsemestre_inscription_cache() + cache = sco_core.get_formsemestre_inscription_cache(context) r = cache.get(formsemestre_id) if r is None: # retreive list @@ -1352,7 +1325,7 @@ def formsemestre_desinscription( % (etudid, formsemestre_id) ) if not dialog_confirmed: - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] if sem["modalite"] != "EXT": msg_ext = """

%s sera désinscrit de tous les modules du semestre %s (%s - %s).

@@ -1500,7 +1473,7 @@ def _evaluation_check_write_access(context, REQUEST, moduleimpl_id=None): sem = sco_formsemestre.get_formsemestre(context, M["formsemestre_id"]) if ( - (not authuser.has_permission(Permission.ScoEditAllEvals, context)) + (not authuser.has_permission(Permission.ScoEditAllEvals)) and uid != M["responsable_id"] and uid not in sem["responsables"] ): @@ -1588,7 +1561,7 @@ def do_evaluation_create( sco_news.add( context, REQUEST, - typ=NEWS_NOTE, + typ=sco_news.NEWS_NOTE, object=moduleimpl_id, text='Création d\'une évaluation dans %(titre)s' % mod, url=mod["url"], @@ -1770,7 +1743,7 @@ def evaluation_listenotes(context, REQUEST=None): F = html_sco_header.sco_footer(context, REQUEST) else: H, F = "", "" - B = context.do_evaluation_listenotes(REQUEST) + B = sco_liste_notes.do_evaluation_listenotes(context, REQUEST) return H + B + F @@ -1828,45 +1801,6 @@ sco_publish( ) -def _notes_getall( - context, evaluation_id, table="notes_notes", filter_suppressed=True, by_uid=None -): - """get tt les notes pour une evaluation: { etudid : { 'value' : value, 'date' : date ... }} - Attention: inclue aussi les notes des étudiants qui ne sont plus inscrits au module. - """ - # log('_notes_getall( e=%s fs=%s )' % (evaluation_id, filter_suppressed)) - do_cache = ( - filter_suppressed and table == "notes_notes" and (by_uid is None) - ) # pas de cache pour (rares) appels via undo_notes ou specifiant un enseignant - if do_cache: - cache = sco_core.get_evaluations_cache(context) - r = cache.get(evaluation_id) - if r != None: - return r - cnx = ndb.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor) - cond = " where evaluation_id=%(evaluation_id)s" - if by_uid: - cond += " and uid=%(by_uid)s" - - cursor.execute( - "select * from " + table + cond, - {"evaluation_id": evaluation_id, "by_uid": by_uid}, - ) - res = cursor.dictfetchall() - d = {} - if filter_suppressed: - for x in res: - if x["value"] != scu.NOTES_SUPPRESS: - d[x["etudid"]] = x - else: - for x in res: - d[x["etudid"]] = x - if do_cache: - cache.set(evaluation_id, d) - return d - - # --- Bulletins @bp.route("/formsemestre_bulletins_pdf") @permission_required(Permission.ScoView) @@ -1881,6 +1815,9 @@ def formsemestre_bulletins_pdf( return scu.sendPDFFile(REQUEST, pdfdoc, filename) +_EXPL_BULL = """Versions des bulletins:
  • courte: moyennes des modules
  • intermédiaire: moyennes des modules et notes des évaluations sélectionnées
  • complète: toutes les notes
      • """ + + @bp.route("/formsemestre_bulletins_pdf_choice") @permission_required(Permission.ScoView) @scodoc7func(context) @@ -1896,7 +1833,7 @@ def formsemestre_bulletins_pdf_choice(context, REQUEST, formsemestre_id, version REQUEST, formsemestre_id, title="Choisir la version des bulletins à générer", - explanation=expl_bull, + explanation=_EXPL_BULL, ) @@ -2057,7 +1994,7 @@ def appreciation_add_form( cnx = ndb.GetDBConnexion() authuser = REQUEST.AUTHENTICATED_USER if id: # edit mode - apps = scolars.appreciations_list(cnx, args={"id": id}) + apps = sco_etud.appreciations_list(cnx, args={"id": id}) if not apps: raise ScoValueError("id d'appreciation invalide !") app = apps[0] @@ -2072,7 +2009,7 @@ def appreciation_add_form( sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) # check custom access permission can_edit_app = (str(authuser) in sem["responsables"]) or ( - authuser.has_permission(Permission.ScoEtudInscrit, context) + authuser.has_permission(Permission.ScoEtudInscrit) ) if not can_edit_app: raise AccessDenied("vous n'avez pas le droit d'ajouter une appreciation") @@ -2082,11 +2019,11 @@ def appreciation_add_form( etudid, ) if suppress: - scolars.appreciations_delete(cnx, id) + sco_etud.appreciations_delete(cnx, id) logdb(REQUEST, cnx, method="appreciation_suppress", etudid=etudid, msg="") return REQUEST.RESPONSE.redirect(bull_url) # - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] if id: a = "Edition" else: @@ -2134,9 +2071,9 @@ def appreciation_add_form( } if edit: args["id"] = id - scolars.appreciations_edit(cnx, args) + sco_etud.appreciations_edit(cnx, args) else: # nouvelle - scolars.appreciations_create(cnx, args, has_uniq_values=False) + sco_etud.appreciations_create(cnx, args, has_uniq_values=False) # log logdb( REQUEST, @@ -2169,7 +2106,9 @@ def formsemestre_validation_etud_form( REQUEST=None, ): "Formulaire choix jury pour un étudiant" - readonly = not sco_permissions.can_validate_sem(context, REQUEST, formsemestre_id) + readonly = not sco_permissions_check.can_validate_sem( + context, REQUEST, formsemestre_id + ) return sco_formsemestre_validation.formsemestre_validation_etud_form( context, formsemestre_id, @@ -2196,7 +2135,7 @@ def formsemestre_validation_etud( REQUEST=None, ): "Enregistre choix jury pour un étudiant" - if not sco_permissions.can_validate_sem(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_validate_sem(context, REQUEST, formsemestre_id): return scu.confirm_dialog( context, message="

      Opération non autorisée pour %s" @@ -2232,7 +2171,7 @@ def formsemestre_validation_etud_manu( REQUEST=None, ): "Enregistre choix jury pour un étudiant" - if not sco_permissions.can_validate_sem(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_validate_sem(context, REQUEST, formsemestre_id): return scu.confirm_dialog( context, message="

      Opération non autorisée pour %s" @@ -2262,7 +2201,7 @@ def formsemestre_validate_previous_ue( context, formsemestre_id, etudid=None, REQUEST=None ): "Form. saisie UE validée hors ScoDoc " - if not sco_permissions.can_validate_sem(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_validate_sem(context, REQUEST, formsemestre_id): return scu.confirm_dialog( context, message="

      Opération non autorisée pour %s" @@ -2289,7 +2228,7 @@ def formsemestre_ext_edit_ue_validations( context, formsemestre_id, etudid=None, REQUEST=None ): "Form. edition UE semestre extérieur" - if not sco_permissions.can_validate_sem(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_validate_sem(context, REQUEST, formsemestre_id): return scu.confirm_dialog( context, message="

      Opération non autorisée pour %s" @@ -2314,7 +2253,7 @@ sco_publish( @scodoc7func(context) def etud_ue_suppress_validation(context, etudid, formsemestre_id, ue_id, REQUEST=None): """Suppress a validation (ue_id, etudid) and redirect to formsemestre""" - if not sco_permissions.can_validate_sem(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_validate_sem(context, REQUEST, formsemestre_id): return scu.confirm_dialog( context, message="

      Opération non autorisée pour %s" @@ -2332,7 +2271,7 @@ def etud_ue_suppress_validation(context, etudid, formsemestre_id, ue_id, REQUEST @scodoc7func(context) def formsemestre_validation_auto(context, formsemestre_id, REQUEST): "Formulaire saisie automatisee des decisions d'un semestre" - if not sco_permissions.can_validate_sem(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_validate_sem(context, REQUEST, formsemestre_id): return scu.confirm_dialog( context, message="

      Opération non autorisée pour %s" @@ -2351,7 +2290,7 @@ def formsemestre_validation_auto(context, formsemestre_id, REQUEST): @scodoc7func(context) def do_formsemestre_validation_auto(context, formsemestre_id, REQUEST): "Formulaire saisie automatisee des decisions d'un semestre" - if not sco_permissions.can_validate_sem(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_validate_sem(context, REQUEST, formsemestre_id): return scu.confirm_dialog( context, message="

      Opération non autorisée pour %s" @@ -2370,7 +2309,7 @@ def do_formsemestre_validation_auto(context, formsemestre_id, REQUEST): @scodoc7func(context) def formsemestre_fix_validation_ues(context, formsemestre_id, REQUEST=None): "Verif/reparation codes UE" - if not sco_permissions.can_validate_sem(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_validate_sem(context, REQUEST, formsemestre_id): return scu.confirm_dialog( context, message="

      Opération non autorisée pour %s" @@ -2391,7 +2330,7 @@ def formsemestre_validation_suppress_etud( context, formsemestre_id, etudid, REQUEST=None, dialog_confirmed=False ): """Suppression des decisions de jury pour un etudiant.""" - if not sco_permissions.can_validate_sem(context, REQUEST, formsemestre_id): + if not sco_permissions_check.can_validate_sem(context, REQUEST, formsemestre_id): return scu.confirm_dialog( context, message="

      Opération non autorisée pour %s" @@ -2401,7 +2340,7 @@ def formsemestre_validation_suppress_etud( ) if not dialog_confirmed: sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - etud = scolars.get_etud_info(etudid=etudid, filled=1)[0] + etud = sco_etud.get_etud_info(etudid=etudid, filled=1)[0] nt = sco_core.get_notes_cache(context).get_NotesTable( context, formsemestre_id ) # > get_etud_decision_sem @@ -2761,3 +2700,5 @@ sco_publish( ) context.populate(globals()) + +context.Users = scodoc_manager.FakeUsers() diff --git a/app/views/scolar.py b/app/views/scolar.py index ead578c7..eebb7b9b 100644 --- a/app/views/scolar.py +++ b/app/views/scolar.py @@ -53,7 +53,7 @@ from flask import g from flask import current_app from config import Config -from scodoc_manager import sco_mgr +import scodoc_manager from app.decorators import ( scodoc7func, ScoDoc7Context, @@ -61,33 +61,14 @@ from app.decorators import ( admin_required, login_required, ) -from app.auth.models import Permission from app.views import scolar_bp as bp -from app.scodoc.notes_log import log - import app.scodoc.sco_utils as scu import app.scodoc.notesdb as ndb +from app.scodoc.notes_log import log from app.scodoc.scolog import logdb -from app.scodoc.sco_permissions import ( - ScoAbsChange, - ScoView, - ScoEnsView, - ScoImplement, - ScoChangeFormation, - ScoChangePreferences, - ScoObservateur, - ScoEtudAddAnnotations, - ScoEtudInscrit, - ScoEtudChangeGroups, - ScoEtudChangeAdr, - ScoEditAllEvals, - ScoEditAllNotes, - ScoEditFormationTags, - ScoEditApo, - ScoSuperAdmin, -) +from app.scodoc.sco_permissions import Permission from app.scodoc.sco_exceptions import ( AccessDenied, ScoException, @@ -98,52 +79,43 @@ from app.scodoc.sco_exceptions import ( ScoInvalidDept, ) from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message -from app.scodoc.sco_news import NEWS_INSCR, NEWS_NOTE, NEWS_FORM, NEWS_SEM, NEWS_MISC -from app.scodoc.VERSION import SCOVERSION, SCONEWS - -from app.scodoc.scolars import ( - format_nom, - format_prenom, - format_civilite, - format_lycee, - format_lycee_from_code, -) -from app.scodoc.scolars import format_telephone, format_pays, make_etud_args +from app.scodoc import VERSION from app.scodoc.gen_tables import GenTable -from app.scodoc import scolars -from app.scodoc import sco_codes_parcours -from app.scodoc import sco_preferences -from app.scodoc import sco_formations -from app.scodoc import sco_permissions -from app.scodoc import sco_find_etud -from app.scodoc import sco_photos -from app.scodoc import sco_formsemestre -from app.scodoc import sco_formsemestre_edit -from app.scodoc import sco_formsemestre_inscriptions -from app.scodoc import sco_news from app.scodoc import html_sco_header from app.scodoc import html_sidebar -from app.scodoc import sco_excel from app.scodoc import imageresize from app.scodoc import ImportScolars from app.scodoc import sco_abs -from app.scodoc import sco_portal_apogee -from app.scodoc import sco_synchro_etuds -from app.scodoc import sco_page_etud -from app.scodoc import sco_groups -from app.scodoc import sco_trombino -from app.scodoc import sco_groups_view -from app.scodoc import sco_trombino_tours -from app.scodoc import sco_parcours_dut -from app.scodoc import sco_report from app.scodoc import sco_archives_etud +from app.scodoc import sco_codes_parcours from app.scodoc import sco_debouche -from app.scodoc import sco_groups_edit -from app.scodoc import sco_up_to_date -from app.scodoc import sco_edt_cal from app.scodoc import sco_dept from app.scodoc import sco_dump_db +from app.scodoc import sco_edt_cal +from app.scodoc import sco_excel +from app.scodoc import sco_find_etud +from app.scodoc import sco_formations +from app.scodoc import sco_formsemestre +from app.scodoc import sco_formsemestre_edit +from app.scodoc import sco_formsemestre_inscriptions +from app.scodoc import sco_groups +from app.scodoc import sco_groups_edit +from app.scodoc import sco_groups_view +from app.scodoc import sco_news +from app.scodoc import sco_page_etud +from app.scodoc import sco_parcours_dut +from app.scodoc import sco_permissions +from app.scodoc import sco_permissions_check +from app.scodoc import sco_photos +from app.scodoc import sco_portal_apogee +from app.scodoc import sco_preferences +from app.scodoc import sco_report +from app.scodoc import sco_synchro_etuds +from app.scodoc import sco_trombino +from app.scodoc import sco_trombino_tours +from app.scodoc import sco_up_to_date +from app.scodoc import sco_etud context = ScoDoc7Context("scolar") @@ -189,7 +161,7 @@ def about(context, REQUEST): H.append( '

      Logiciel libre écrit en Python.

      Utilise ReportLab pour générer les documents PDF, et pyExcelerator pour le traitement des documents Excel.

      ' ) - H.append("

      Dernières évolutions

      " + SCONEWS) + H.append("

      Dernières évolutions

      " + VERSION.SCONEWS) H.append( '