forked from ScoDoc/ScoDoc
Compare commits
10 Commits
dc25ad7ca2
...
08a585aa1b
| Author | SHA1 | Date | |
|---|---|---|---|
| 08a585aa1b | |||
| 91af5704dc | |||
| 906ed1331b | |||
| 50a01c8bd7 | |||
| cd3adb4177 | |||
| 754ebde544 | |||
| 25f69aebb3 | |||
| fa29725f92 | |||
| d46e77b48a | |||
| ebd71a3299 |
@ -239,7 +239,7 @@ class LogoForm(FlaskForm):
|
||||
|
||||
if self.do_delete.data and self.can_delete:
|
||||
return LogoDelete.build_action(self.data)
|
||||
if self.upload.data and self.validate():
|
||||
if self.upload.data:
|
||||
return LogoUpdate.build_action(self.data)
|
||||
if self.do_rename.data and self.validate():
|
||||
return LogoRename.build_action(self.data)
|
||||
|
||||
@ -760,7 +760,7 @@ class GenTable:
|
||||
return js
|
||||
else:
|
||||
log(f"make_page: format={fmt}")
|
||||
raise ValueError("_make_page: invalid format")
|
||||
raise ValueError("make_page: invalid format")
|
||||
|
||||
|
||||
# -----
|
||||
|
||||
@ -25,222 +25,9 @@
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
"""HTML Header/Footer for ScoDoc pages"""
|
||||
|
||||
from flask import g, render_template, url_for
|
||||
from flask_login import current_user
|
||||
|
||||
import app.scodoc.sco_utils as scu
|
||||
from app import scodoc_flash_status_messages
|
||||
from app.scodoc import html_sidebar
|
||||
import sco_version
|
||||
"""Legacy constants (TODO: remove)"""
|
||||
|
||||
|
||||
# Some constants:
|
||||
BOOTSTRAP_JS = ["libjs/bootstrap/js/bootstrap.min.js", "libjs/purl.js"]
|
||||
BOOTSTRAP_CSS = ["libjs/bootstrap/css/bootstrap.min.css"]
|
||||
|
||||
|
||||
def standard_html_header():
|
||||
"""Standard HTML header for pages outside depts"""
|
||||
# not used in ZScolar, see sco_header
|
||||
return f"""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
|
||||
<html><head>
|
||||
<title>ScoDoc: accueil</title>
|
||||
<META http-equiv="Content-Type" content="text/html; charset={scu.SCO_ENCODING}">
|
||||
<META http-equiv="Content-Style-Type" content="text/css">
|
||||
<META name="LANG" content="fr">
|
||||
<META name="DESCRIPTION" content="ScoDoc: gestion scolarite">
|
||||
|
||||
<link href="{scu.STATIC_DIR}/css/scodoc.css" rel="stylesheet" type="text/css"/>
|
||||
|
||||
</head><body>{scu.CUSTOM_HTML_HEADER_CNX}"""
|
||||
|
||||
|
||||
def standard_html_footer():
|
||||
"""Le pied de page HTML de la page d'accueil."""
|
||||
return f"""<p class="footer">
|
||||
Problème de connexion (identifiant, mot de passe): <em>contacter votre responsable ou chef de département</em>.</p>
|
||||
<p>Problèmes et suggestions sur le logiciel: <a href="mailto:{scu.SCO_USERS_LIST}">{scu.SCO_USERS_LIST}</a></p>
|
||||
<p><em>ScoDoc est un logiciel libre développé par Emmanuel Viennet.</em></p>
|
||||
</body></html>"""
|
||||
|
||||
|
||||
_HTML_BEGIN = f"""<!DOCTYPE html>
|
||||
<html lang="fr">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=%(encoding)s" />
|
||||
<meta http-equiv="Content-Style-Type" content="text/css" />
|
||||
<meta name="LANG" content="fr" />
|
||||
<meta name="DESCRIPTION" content="ScoDoc" />
|
||||
<title>%(page_title)s</title>
|
||||
|
||||
<link type="text/css" rel="stylesheet" href="{scu.STATIC_DIR}/libjs/jquery-ui-1.10.4.custom/css/smoothness/jquery-ui-1.10.4.custom.min.css" />
|
||||
|
||||
<link href="{scu.STATIC_DIR}/css/scodoc.css" rel="stylesheet" type="text/css" />
|
||||
<link href="{scu.STATIC_DIR}/css/menu.css" rel="stylesheet" type="text/css" />
|
||||
<link rel="stylesheet" type="text/css" href="{scu.STATIC_DIR}/DataTables/datatables.min.css" />
|
||||
<link href="{scu.STATIC_DIR}/css/gt_table.css" rel="stylesheet" type="text/css" />
|
||||
<script src="{scu.STATIC_DIR}/libjs/menu.js"></script>
|
||||
<script src="{scu.STATIC_DIR}/libjs/bubble.js"></script>
|
||||
|
||||
|
||||
<script src="{scu.STATIC_DIR}/jQuery/jquery.js"></script>
|
||||
<script src="{scu.STATIC_DIR}/jQuery/jquery-migrate-3.5.2.min.js"></script>
|
||||
<script src="{scu.STATIC_DIR}/libjs/jquery.field.min.js"></script>
|
||||
|
||||
<script src="{scu.STATIC_DIR}/libjs/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.min.js"></script>
|
||||
<script src="{scu.STATIC_DIR}/DataTables/datatables.min.js"></script>
|
||||
|
||||
<script src="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.js"></script>
|
||||
<link type="text/css" rel="stylesheet" href="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.css" />
|
||||
|
||||
<link type="text/css" rel="stylesheet" href="{scu.STATIC_DIR}/libjs/timepicker-1.3.5/jquery.timepicker.min.css" />
|
||||
<script src="{scu.STATIC_DIR}/libjs/timepicker-1.3.5/jquery.timepicker.min.js"></script>
|
||||
|
||||
<script src="{scu.STATIC_DIR}/js/scodoc.js"></script>
|
||||
<script src="{scu.STATIC_DIR}/js/etud_info.js"></script>
|
||||
|
||||
<script src="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.js"></script>
|
||||
<link type="text/css" rel="stylesheet" href="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.css" />
|
||||
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function() {{
|
||||
if (document.getElementById('gtrcontent')) {{
|
||||
enableTooltips("gtrcontent");
|
||||
}}
|
||||
if (document.getElementById('sidebar')) {{
|
||||
enableTooltips("sidebar");
|
||||
}}
|
||||
}});
|
||||
</script>
|
||||
"""
|
||||
|
||||
|
||||
def scodoc_top_html_header(page_title="ScoDoc: bienvenue"):
|
||||
"""HTML header for top level pages"""
|
||||
H = [
|
||||
_HTML_BEGIN % {"page_title": page_title, "encoding": scu.SCO_ENCODING},
|
||||
"""</head><body id="gtrcontent">""",
|
||||
scu.CUSTOM_HTML_HEADER_CNX,
|
||||
]
|
||||
return "\n".join(H)
|
||||
|
||||
|
||||
# Header:
|
||||
def sco_header(
|
||||
# optional args
|
||||
page_title="", # page title
|
||||
no_sidebar=False, # hide sidebar
|
||||
cssstyles=(), # additionals CSS sheets
|
||||
javascripts=(), # additionals JS filenames to load
|
||||
scripts=(), # script to put in page header
|
||||
init_google_maps=False, # Google maps
|
||||
titrebandeau="", # titre dans bandeau superieur
|
||||
etudid=None,
|
||||
formsemestre_id=None,
|
||||
):
|
||||
"""Main HTML page header for ScoDoc
|
||||
Utilisé dans les anciennes pages. Les nouvelles pages utilisent le template Jinja.
|
||||
"""
|
||||
from app.scodoc.sco_formsemestre_status import formsemestre_page_title
|
||||
|
||||
if etudid is not None:
|
||||
g.current_etudid = etudid
|
||||
scodoc_flash_status_messages()
|
||||
|
||||
params = {
|
||||
"page_title": page_title or sco_version.SCONAME,
|
||||
"no_sidebar": no_sidebar,
|
||||
"ScoURL": url_for("scolar.index_html", scodoc_dept=g.scodoc_dept),
|
||||
"encoding": scu.SCO_ENCODING,
|
||||
"titrebandeau_mkup": "<td>" + titrebandeau + "</td>",
|
||||
"authuser": current_user.user_name,
|
||||
}
|
||||
if no_sidebar:
|
||||
params["margin_left"] = "1em"
|
||||
else:
|
||||
params["margin_left"] = "140px"
|
||||
|
||||
H = [_HTML_BEGIN % params]
|
||||
|
||||
if init_google_maps:
|
||||
# It may be necessary to add an API key:
|
||||
H.append('<script src="https://maps.google.com/maps/api/js"></script>')
|
||||
|
||||
# Feuilles de style additionnelles:
|
||||
for cssstyle in cssstyles:
|
||||
H.append(
|
||||
f"""<link type="text/css" rel="stylesheet" href="{scu.STATIC_DIR}/{cssstyle}" />\n"""
|
||||
)
|
||||
|
||||
H.append(
|
||||
f"""
|
||||
<script>
|
||||
const SCO_URL="{url_for("scolar.index_html", scodoc_dept=g.scodoc_dept)}";
|
||||
const SCO_TIMEZONE="{scu.TIME_ZONE}";
|
||||
</script>"""
|
||||
)
|
||||
|
||||
if init_google_maps: # utilisé uniquement pour carte lycées
|
||||
H.append(
|
||||
f'<script src="{scu.STATIC_DIR}/libjs/jquery.ui.map.full.min.js"></script>'
|
||||
)
|
||||
|
||||
# JS additionels
|
||||
for js in javascripts:
|
||||
H.append(f"""<script src="{scu.STATIC_DIR}/{js}"></script>\n""")
|
||||
|
||||
H.append(
|
||||
f"""<style>
|
||||
#gtrcontent {{
|
||||
margin-left: {params["margin_left"]};
|
||||
height: 100%%;
|
||||
margin-bottom: 16px;
|
||||
}}
|
||||
</style>
|
||||
"""
|
||||
)
|
||||
# Scripts de la page:
|
||||
if scripts:
|
||||
H.append("""<script>""")
|
||||
for script in scripts:
|
||||
H.append(script)
|
||||
H.append("""</script>""")
|
||||
|
||||
# Fin head, Body et bandeau haut:
|
||||
H.append(
|
||||
f"""</head>
|
||||
<!-- Legacy ScoDoc header -->
|
||||
<body>
|
||||
{scu.CUSTOM_HTML_HEADER}
|
||||
{'' if no_sidebar else html_sidebar.sidebar(etudid)}
|
||||
<div id="mobileNav" mobile="true" style="display:none;"></div>
|
||||
|
||||
<div id="gtrcontent">
|
||||
"""
|
||||
)
|
||||
# En attendant le replacement complet de cette fonction,
|
||||
# inclusion ici des messages flask
|
||||
H.append(render_template("flashed_messages.j2"))
|
||||
#
|
||||
# Barre menu semestre:
|
||||
H.append(formsemestre_page_title(formsemestre_id))
|
||||
|
||||
# div pour affichage messages temporaires
|
||||
H.append('<div id="sco_msg" class="head_message"></div>')
|
||||
#
|
||||
H.append('<div class="sco-app-content">')
|
||||
return "".join(H)
|
||||
|
||||
|
||||
def sco_footer():
|
||||
"""Main HTMl pages footer"""
|
||||
return (
|
||||
"""</div></div><!-- /gtrcontent -->"""
|
||||
+ scu.CUSTOM_HTML_FOOTER
|
||||
+ """</body></html>"""
|
||||
)
|
||||
|
||||
@ -69,7 +69,6 @@ et sur page "réglages bulletin" (avec formsemestre_id)
|
||||
# raise ValueError("invalid value for 'side' parameter")
|
||||
# signatureloc = get_bul_sig_img()
|
||||
# H = [
|
||||
# self.sco_header(page_title="Changement de signature"),
|
||||
# """<h2>Changement de la signature bulletin de %(sidetxt)s</h2>
|
||||
# """
|
||||
# % (sidetxt,),
|
||||
|
||||
@ -43,7 +43,6 @@ import app.scodoc.sco_utils as scu
|
||||
from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message
|
||||
from app.scodoc.sco_exceptions import ScoValueError, ScoNonEmptyFormationObject
|
||||
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc import sco_cache
|
||||
from app.scodoc import codes_cursus
|
||||
from app.scodoc import sco_edit_ue
|
||||
@ -96,7 +95,7 @@ def formation_delete(formation_id=None, dialog_confirmed=False):
|
||||
)
|
||||
|
||||
return render_template(
|
||||
"sco_page-dept.j2", content="\n".join(H), title="Suppression d'une formation"
|
||||
"sco_page_dept.j2", content="\n".join(H), title="Suppression d'une formation"
|
||||
)
|
||||
|
||||
|
||||
@ -146,7 +145,6 @@ def formation_edit(formation_id=None, create=False):
|
||||
"""Edit or create a formation"""
|
||||
if create:
|
||||
H = [
|
||||
html_sco_header.sco_header(page_title="Création d'une formation"),
|
||||
"""<h2>Création d'une formation</h2>
|
||||
|
||||
<p class="help">Une "formation" décrit une filière, comme un DUT ou une Licence. La formation se subdivise en unités pédagogiques (UE, matières, modules). Elle peut se diviser en plusieurs semestres (ou sessions), qui seront mis en place séparément.
|
||||
@ -168,7 +166,6 @@ def formation_edit(formation_id=None, create=False):
|
||||
is_locked = formation.has_locked_sems(formation_id)
|
||||
submitlabel = "Modifier les valeurs"
|
||||
H = [
|
||||
html_sco_header.sco_header(page_title="Modification d'une formation"),
|
||||
f"""<h2>Modification de la formation {formation.acronyme}
|
||||
version {formation.version}
|
||||
</h2>""",
|
||||
@ -251,52 +248,57 @@ def formation_edit(formation_id=None, create=False):
|
||||
submitlabel=submitlabel,
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return "\n".join(H) + tf[1] + html_sco_header.sco_footer()
|
||||
elif tf[0] == -1:
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title="Modification d'une formation",
|
||||
content="\n".join(H) + tf[1],
|
||||
)
|
||||
if tf[0] == -1:
|
||||
return flask.redirect(url_for("notes.index_html", scodoc_dept=g.scodoc_dept))
|
||||
|
||||
# check unicity : constraint UNIQUE(acronyme,titre,version)
|
||||
if create:
|
||||
version = 1
|
||||
else:
|
||||
# check unicity : constraint UNIQUE(acronyme,titre,version)
|
||||
if create:
|
||||
version = 1
|
||||
else:
|
||||
version = initvalues["version"]
|
||||
args = {
|
||||
"acronyme": tf[2]["acronyme"],
|
||||
"titre": tf[2]["titre"],
|
||||
"version": version,
|
||||
"dept_id": g.scodoc_dept_id,
|
||||
}
|
||||
other_formations: list[Formation] = Formation.query.filter_by(**args).all()
|
||||
if other_formations and (
|
||||
(len(other_formations) > 1) or other_formations[0].id != formation_id
|
||||
):
|
||||
return (
|
||||
version = initvalues["version"]
|
||||
args = {
|
||||
"acronyme": tf[2]["acronyme"],
|
||||
"titre": tf[2]["titre"],
|
||||
"version": version,
|
||||
"dept_id": g.scodoc_dept_id,
|
||||
}
|
||||
other_formations: list[Formation] = Formation.query.filter_by(**args).all()
|
||||
if other_formations and (
|
||||
(len(other_formations) > 1) or other_formations[0].id != formation_id
|
||||
):
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title="Modification d'une formation",
|
||||
content=(
|
||||
"\n".join(H)
|
||||
+ tf_error_message(
|
||||
f"""Valeurs incorrectes: il existe déjà <a href="{
|
||||
url_for('notes.ue_table',
|
||||
scodoc_dept=g.scodoc_dept, formation_id=other_formations[0].id)
|
||||
}">une formation</a> avec même titre,
|
||||
acronyme et version.
|
||||
"""
|
||||
url_for('notes.ue_table',
|
||||
scodoc_dept=g.scodoc_dept, formation_id=other_formations[0].id)
|
||||
}">une formation</a> avec même titre,
|
||||
acronyme et version.
|
||||
"""
|
||||
)
|
||||
+ tf[1]
|
||||
+ html_sco_header.sco_footer()
|
||||
)
|
||||
#
|
||||
if create:
|
||||
formation = do_formation_create(tf[2])
|
||||
else:
|
||||
if do_formation_edit(tf[2]):
|
||||
flash(
|
||||
f"""Modification de la formation {
|
||||
formation.titre} ({formation.acronyme}) version {formation.version}"""
|
||||
)
|
||||
return flask.redirect(
|
||||
url_for(
|
||||
"notes.ue_table", scodoc_dept=g.scodoc_dept, formation_id=formation.id
|
||||
)
|
||||
),
|
||||
)
|
||||
#
|
||||
if create:
|
||||
formation = do_formation_create(tf[2])
|
||||
else:
|
||||
if do_formation_edit(tf[2]):
|
||||
flash(
|
||||
f"""Modification de la formation {
|
||||
formation.titre} ({formation.acronyme}) version {formation.version}"""
|
||||
)
|
||||
return flask.redirect(
|
||||
url_for("notes.ue_table", scodoc_dept=g.scodoc_dept, formation_id=formation.id)
|
||||
)
|
||||
|
||||
|
||||
def do_formation_create(args: dict) -> Formation:
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
(portage from DTML)
|
||||
"""
|
||||
import flask
|
||||
from flask import g, url_for, request
|
||||
from flask import g, render_template, request, url_for
|
||||
|
||||
from app import db, log
|
||||
from app.models import Formation, Matiere, UniteEns, ScolarNews
|
||||
@ -43,7 +43,6 @@ from app.scodoc.sco_exceptions import (
|
||||
ScoLockedFormError,
|
||||
ScoNonEmptyFormationObject,
|
||||
)
|
||||
from app.scodoc import html_sco_header
|
||||
|
||||
_matiereEditor = ndb.EditableTable(
|
||||
"notes_matieres",
|
||||
@ -63,7 +62,6 @@ def matiere_list(*args, **kw):
|
||||
def do_matiere_edit(*args, **kw):
|
||||
"edit a matiere"
|
||||
from app.scodoc import sco_edit_ue
|
||||
from app.scodoc import sco_edit_formation
|
||||
|
||||
cnx = ndb.GetDBConnexion()
|
||||
# check
|
||||
@ -79,7 +77,6 @@ def do_matiere_edit(*args, **kw):
|
||||
def do_matiere_create(args):
|
||||
"create a matiere"
|
||||
from app.scodoc import sco_edit_ue
|
||||
from app.models import ScolarNews
|
||||
|
||||
cnx = ndb.GetDBConnexion()
|
||||
# check
|
||||
@ -103,7 +100,6 @@ def matiere_create(ue_id=None):
|
||||
ue: UniteEns = UniteEns.query.get_or_404(ue_id)
|
||||
default_numero = max([mat.numero for mat in ue.matieres] or [9]) + 1
|
||||
H = [
|
||||
html_sco_header.sco_header(page_title="Création d'une matière"),
|
||||
f"""<h2>Création d'une matière dans l'UE {ue.titre or ''} ({ue.acronyme})</h2>
|
||||
<p class="help">Les matières sont des groupes de modules dans une UE
|
||||
d'une formation donnée. Les matières servent surtout pour la
|
||||
@ -151,21 +147,25 @@ associé.
|
||||
)
|
||||
|
||||
if tf[0] == 0:
|
||||
return "\n".join(H) + tf[1] + html_sco_header.sco_footer()
|
||||
elif tf[0] == -1:
|
||||
return render_template(
|
||||
"sco_page.j2", title="Création d'une matière", content="\n".join(H) + tf[1]
|
||||
)
|
||||
if tf[0] == -1:
|
||||
return flask.redirect(dest_url)
|
||||
else:
|
||||
# check unicity
|
||||
mats = matiere_list(args={"ue_id": ue_id, "titre": tf[2]["titre"]})
|
||||
if mats:
|
||||
return (
|
||||
# check unicity
|
||||
mats = matiere_list(args={"ue_id": ue_id, "titre": tf[2]["titre"]})
|
||||
if mats:
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Création d'une matière",
|
||||
content=(
|
||||
"\n".join(H)
|
||||
+ tf_error_message("Titre de matière déjà existant dans cette UE")
|
||||
+ tf[1]
|
||||
+ html_sco_header.sco_footer()
|
||||
)
|
||||
_ = do_matiere_create(tf[2])
|
||||
return flask.redirect(dest_url)
|
||||
),
|
||||
)
|
||||
_ = do_matiere_create(tf[2])
|
||||
return flask.redirect(dest_url)
|
||||
|
||||
|
||||
def can_delete_matiere(matiere: Matiere) -> tuple[bool, str]:
|
||||
@ -230,7 +230,6 @@ def matiere_delete(matiere_id=None):
|
||||
mat = matiere_list(args={"matiere_id": matiere_id})[0]
|
||||
UE = sco_edit_ue.ue_list(args={"ue_id": mat["ue_id"]})[0]
|
||||
H = [
|
||||
html_sco_header.sco_header(page_title="Suppression d'une matière"),
|
||||
"<h2>Suppression de la matière %(titre)s" % mat,
|
||||
" dans l'UE (%(acronyme)s))</h2>" % UE,
|
||||
]
|
||||
@ -248,13 +247,17 @@ def matiere_delete(matiere_id=None):
|
||||
cancelbutton="Annuler",
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return "\n".join(H) + tf[1] + html_sco_header.sco_footer()
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(dest_url)
|
||||
else:
|
||||
do_matiere_delete(matiere_id)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Suppression d'une matière",
|
||||
content="\n".join(H) + tf[1],
|
||||
)
|
||||
if tf[0] == -1:
|
||||
return flask.redirect(dest_url)
|
||||
|
||||
do_matiere_delete(matiere_id)
|
||||
return flask.redirect(dest_url)
|
||||
|
||||
|
||||
def matiere_edit(matiere_id=None):
|
||||
"""Edit matiere"""
|
||||
@ -273,11 +276,10 @@ def matiere_edit(matiere_id=None):
|
||||
ue_names = ["%(acronyme)s (%(titre)s)" % u for u in ues]
|
||||
ue_ids = [u["ue_id"] for u in ues]
|
||||
H = [
|
||||
html_sco_header.sco_header(page_title="Modification d'une matière"),
|
||||
"""<h2>Modification de la matière %(titre)s""" % F,
|
||||
f"""(formation ({formation.acronyme}, version {formation.version})</h2>""",
|
||||
]
|
||||
help = """<p class="help">Les matières sont des groupes de modules dans une UE
|
||||
help_msg = """<p class="help">Les matières sont des groupes de modules dans une UE
|
||||
d'une formation donnée. Les matières servent surtout pour la
|
||||
présentation (bulletins, etc) mais <em>n'ont pas de rôle dans le calcul
|
||||
des notes.</em>
|
||||
@ -325,18 +327,25 @@ associé.
|
||||
formation_id=str(ue["formation_id"]),
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return "\n".join(H) + tf[1] + help + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Modification d'une matière",
|
||||
content="\n".join(H) + tf[1] + help_msg,
|
||||
)
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(dest_url)
|
||||
else:
|
||||
# check unicity
|
||||
mats = matiere_list(args={"ue_id": tf[2]["ue_id"], "titre": tf[2]["titre"]})
|
||||
if len(mats) > 1 or (len(mats) == 1 and mats[0]["matiere_id"] != matiere_id):
|
||||
return (
|
||||
"\n".join(H)
|
||||
+ tf_error_message("Titre de matière déjà existant dans cette UE")
|
||||
+ tf[1]
|
||||
+ html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Modification d'une matière",
|
||||
content=(
|
||||
"\n".join(H)
|
||||
+ tf_error_message("Titre de matière déjà existant dans cette UE")
|
||||
+ tf[1]
|
||||
),
|
||||
)
|
||||
|
||||
# changement d'UE ?
|
||||
|
||||
@ -32,12 +32,11 @@ import io
|
||||
from zipfile import ZipFile
|
||||
|
||||
import flask
|
||||
from flask import flash, g, request, Response, send_file, url_for
|
||||
from flask import flash, g, render_template, request, Response, send_file, url_for
|
||||
|
||||
import app.scodoc.sco_utils as scu
|
||||
from app import log
|
||||
from app.models import Formation
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc import sco_apogee_csv, sco_apogee_reader
|
||||
from app.scodoc import sco_etape_apogee
|
||||
from app.scodoc import sco_formsemestre
|
||||
@ -100,10 +99,6 @@ def apo_semset_maq_status(
|
||||
ok_for_export &= semset["jury_ok"]
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title="Export Apogée",
|
||||
javascripts=["js/apo_semset_maq_status.js"],
|
||||
),
|
||||
"""<h2>Export des résultats vers Apogée</h2>"""
|
||||
"""<div class="semset_descr">""",
|
||||
semset.html_descr(),
|
||||
@ -438,8 +433,12 @@ def apo_semset_maq_status(
|
||||
</div>
|
||||
"""
|
||||
)
|
||||
H.append(html_sco_header.sco_footer())
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title="Export Apogée",
|
||||
javascripts=["js/apo_semset_maq_status.js"],
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
|
||||
def table_apo_csv_list(semset):
|
||||
@ -594,21 +593,21 @@ def _view_etuds_page(
|
||||
if fmt != "html":
|
||||
return tab.make_page(fmt=fmt)
|
||||
|
||||
return f"""
|
||||
{html_sco_header.sco_header(
|
||||
page_title=title,
|
||||
)}
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title=title,
|
||||
content=f"""
|
||||
<h2>{title}</h2>
|
||||
|
||||
{tab.html()}
|
||||
|
||||
<p><a href="{
|
||||
<div class="space-before-24"><a class="stdlink" href="{
|
||||
url_for("notes.apo_semset_maq_status",
|
||||
scodoc_dept=g.scodoc_dept, semset_id=semset_id)
|
||||
}">Retour à la page d'export Apogée</a>
|
||||
</p>
|
||||
{html_sco_header.sco_footer()}
|
||||
"""
|
||||
</div>
|
||||
""",
|
||||
)
|
||||
|
||||
|
||||
def view_apo_csv_store(semset_id="", csvfile=None, data: bytes = "", autodetect=False):
|
||||
@ -747,9 +746,6 @@ def view_apo_csv(etape_apo="", semset_id="", fmt="html"):
|
||||
) = sco_etape_apogee.apo_csv_semset_check(semset)
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title=f"""Maquette Apogée enregistrée pour {etape_apo}""",
|
||||
),
|
||||
f"""<h2>Étudiants dans la maquette Apogée {etape_apo}</h2>
|
||||
<p>Pour l'ensemble <a class="stdlink" href="{
|
||||
url_for("notes.apo_semset_maq_status",
|
||||
@ -768,7 +764,11 @@ def view_apo_csv(etape_apo="", semset_id="", fmt="html"):
|
||||
# Liste des étudiants (sans les résultats pour le moment): TODO
|
||||
etuds = apo_data.etuds
|
||||
if not etuds:
|
||||
return "\n".join(H) + "<p>Aucun étudiant</p>" + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title=f"""Maquette Apogée {etape_apo}""",
|
||||
content="\n".join(H) + "<p>Aucun étudiant</p>",
|
||||
)
|
||||
|
||||
# Ajout infos sur ScoDoc vs Apogee
|
||||
for e in etuds:
|
||||
@ -830,10 +830,13 @@ def view_apo_csv(etape_apo="", semset_id="", fmt="html"):
|
||||
}">Retour</a>
|
||||
</div>
|
||||
""",
|
||||
html_sco_header.sco_footer(),
|
||||
]
|
||||
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title=f"""Maquette Apogée enregistrée pour {etape_apo}""",
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
|
||||
# called from Web (GET)
|
||||
|
||||
@ -42,7 +42,6 @@ import app.scodoc.sco_utils as scu
|
||||
from app.scodoc.sco_utils import ModuleType
|
||||
from app.scodoc.sco_exceptions import ScoValueError
|
||||
from app.scodoc.TrivialFormulator import TrivialFormulator
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc import sco_cache
|
||||
from app.scodoc import sco_evaluations
|
||||
from app.scodoc import sco_preferences
|
||||
@ -74,16 +73,18 @@ def evaluation_create_form(
|
||||
min_note_max = scu.NOTES_PRECISION # le plus petit bareme possible
|
||||
#
|
||||
if not modimpl.can_edit_evaluation(current_user):
|
||||
return f"""
|
||||
{html_sco_header.sco_header()}
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Opération non autorisée",
|
||||
content=f"""
|
||||
<h2>Opération non autorisée</h2>
|
||||
<p>Modification évaluation impossible pour {current_user.get_nomplogin()}</p>
|
||||
<p><a href="{url_for('notes.moduleimpl_status',
|
||||
scodoc_dept=g.scodoc_dept, moduleimpl_id=moduleimpl_id)
|
||||
}" class="stdlink">Revenir</a>
|
||||
</p>
|
||||
{html_sco_header.sco_footer()}
|
||||
"""
|
||||
""",
|
||||
)
|
||||
if not edit:
|
||||
# création nouvel
|
||||
if moduleimpl_id is None:
|
||||
@ -361,20 +362,21 @@ def evaluation_create_form(
|
||||
"""
|
||||
]
|
||||
if tf[0] == 0:
|
||||
head = html_sco_header.sco_header(page_title=page_title)
|
||||
return (
|
||||
head
|
||||
+ "\n".join(H)
|
||||
+ "\n"
|
||||
+ tf[1]
|
||||
+ render_template(
|
||||
"scodoc/forms/evaluation_edit.j2",
|
||||
)
|
||||
+ render_template(
|
||||
"scodoc/help/evaluations.j2", is_apc=is_apc, modimpl=modimpl
|
||||
)
|
||||
+ render_template("sco_timepicker.j2")
|
||||
+ html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title=page_title,
|
||||
content=(
|
||||
"\n".join(H)
|
||||
+ "\n"
|
||||
+ tf[1]
|
||||
+ render_template(
|
||||
"scodoc/forms/evaluation_edit.j2",
|
||||
)
|
||||
+ render_template(
|
||||
"scodoc/help/evaluations.j2", is_apc=is_apc, modimpl=modimpl
|
||||
)
|
||||
+ render_template("sco_timepicker.j2")
|
||||
),
|
||||
)
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(dest_url)
|
||||
|
||||
@ -17,7 +17,6 @@ from app.models import Evaluation, FormSemestre
|
||||
from app.comp import res_sem
|
||||
from app.comp.res_compat import NotesTableCompat
|
||||
from app.comp.moy_mod import ModuleImplResults
|
||||
from app.scodoc import html_sco_header
|
||||
import app.scodoc.sco_utils as scu
|
||||
|
||||
|
||||
@ -63,9 +62,7 @@ def evaluations_recap(formsemestre_id: int) -> str:
|
||||
pas pris en compte dans cette table.</div>
|
||||
"""
|
||||
)
|
||||
H.append(
|
||||
html_sco_header.sco_footer(),
|
||||
)
|
||||
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Évaluations du semestre",
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
"""Export d'une table avec les résultats de tous les étudiants
|
||||
"""
|
||||
from flask import url_for, g, request
|
||||
from flask import url_for, g, render_template, request
|
||||
|
||||
from app.comp import res_sem
|
||||
from app.comp.res_compat import NotesTableCompat
|
||||
@ -42,12 +42,12 @@ from app.scodoc import codes_cursus
|
||||
from app.scodoc import sco_preferences
|
||||
from app.scodoc import sco_pv_dict
|
||||
from app.scodoc import sco_etud
|
||||
import sco_version
|
||||
from app.scodoc.gen_tables import GenTable
|
||||
from app.scodoc.codes_cursus import NO_SEMESTRE_ID
|
||||
import sco_version
|
||||
|
||||
|
||||
def _build_results_table(start_date=None, end_date=None, types_parcours=[]):
|
||||
def _build_results_table(start_date=None, end_date=None, types_parcours=()):
|
||||
"""Construit une table avec les résultats de jury de TOUS les étudiants
|
||||
de TOUS les semestres ScoDoc de ce département entre les dates indiquées
|
||||
(c'est à dire commençant APRES ou à start_date et terminant avant ou à end_date)
|
||||
@ -285,11 +285,6 @@ def scodoc_table_results(
|
||||
info_sems.append("</ul>")
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title="Export résultats",
|
||||
javascripts=html_sco_header.BOOTSTRAP_JS + ["js/export_results.js"],
|
||||
cssstyles=html_sco_header.BOOTSTRAP_CSS,
|
||||
),
|
||||
# XXX
|
||||
"""
|
||||
<h2>Table des résultats de tous les semestres</h2>
|
||||
@ -310,9 +305,14 @@ def scodoc_table_results(
|
||||
""",
|
||||
"\n".join(info_sems),
|
||||
"""</div>""",
|
||||
html_sco_header.sco_footer(),
|
||||
]
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title="Export résultats",
|
||||
javascripts=html_sco_header.BOOTSTRAP_JS + ["js/export_results.js"],
|
||||
cssstyles=html_sco_header.BOOTSTRAP_CSS,
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
|
||||
# Formulaire pour saisie dates et sélection parcours
|
||||
|
||||
@ -31,12 +31,11 @@ import flask
|
||||
from flask import g, url_for, render_template, request
|
||||
from flask_login import current_user
|
||||
|
||||
from app.models.config import ScoDocSiteConfig, PersonalizedLink
|
||||
from app.models.config import ScoDocSiteConfig
|
||||
from app.models import FormSemestre
|
||||
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
|
||||
|
||||
_custommenuEditor = ndb.EditableTable(
|
||||
"notes_formsemestre_custommenu",
|
||||
@ -107,7 +106,7 @@ def formsemestre_custommenu_edit(formsemestre_id):
|
||||
dest_url = url_for(
|
||||
"notes.formsemestre_status",
|
||||
scodoc_dept=g.scodoc_dept,
|
||||
formsemestre_id=formsemestre_id,
|
||||
formsemestre_id=formsemestre.id,
|
||||
)
|
||||
H = [
|
||||
"""<div class="help">
|
||||
|
||||
@ -1720,7 +1720,6 @@ def formsemestre_edit_options(formsemestre_id):
|
||||
"""dialog to change formsemestre options
|
||||
(accessible par EditFormSemestre ou dir. etudes)
|
||||
"""
|
||||
log("formsemestre_edit_options")
|
||||
ok, err = sco_permissions_check.check_access_diretud(formsemestre_id)
|
||||
if not ok:
|
||||
return err
|
||||
|
||||
@ -34,7 +34,7 @@ Ces semestres n'auront qu'un seul inscrit !
|
||||
import time
|
||||
|
||||
import flask
|
||||
from flask import url_for, g, request
|
||||
from flask import flash, g, render_template, request, url_for
|
||||
from flask_login import current_user
|
||||
|
||||
from app.comp import res_sem
|
||||
@ -50,7 +50,6 @@ from app.models import (
|
||||
import app.scodoc.sco_utils as scu
|
||||
from app import log
|
||||
from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message
|
||||
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_formsemestre_validation
|
||||
@ -86,7 +85,6 @@ def formsemestre_ext_create_form(etudid, formsemestre_id):
|
||||
"""Formulaire création/inscription à un semestre extérieur"""
|
||||
etud = Identite.get_etud(etudid)
|
||||
H = [
|
||||
html_sco_header.sco_header(),
|
||||
f"""<h2>Enregistrement d'une inscription antérieure dans un autre
|
||||
établissement</h2>
|
||||
<p class="help">
|
||||
@ -106,7 +104,6 @@ def formsemestre_ext_create_form(etudid, formsemestre_id):
|
||||
}" class="stdlink">Étudiant {etud.nomprenom}</a></h3>
|
||||
""",
|
||||
]
|
||||
F = html_sco_header.sco_footer()
|
||||
orig_sem = sco_formsemestre.get_formsemestre(formsemestre_id)
|
||||
# Ne propose que des semestres de semestre_id strictement inférieur
|
||||
# au semestre courant
|
||||
@ -133,7 +130,7 @@ def formsemestre_ext_create_form(etudid, formsemestre_id):
|
||||
(indices entre {min_semestre_id} et {max_semestre_id}, semestre courant.)
|
||||
</p>"""
|
||||
)
|
||||
return "\n".join(H) + F
|
||||
return render_template("sco_page.j2", content="\n".join(H))
|
||||
# Formulaire
|
||||
semestre_ids_list = sorted(semestre_ids)
|
||||
semestre_ids_labels = [f"S{x}" for x in semestre_ids_list]
|
||||
@ -205,7 +202,7 @@ def formsemestre_ext_create_form(etudid, formsemestre_id):
|
||||
la formation effectué dans un autre établissement.
|
||||
</p>"""
|
||||
)
|
||||
return "\n".join(H) + "\n" + tf[1] + F
|
||||
return render_template("sco_page.j2", content="\n".join(H) + "\n" + tf[1])
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(
|
||||
url_for(
|
||||
@ -270,17 +267,35 @@ def formsemestre_ext_edit_ue_validations(formsemestre_id, etudid):
|
||||
),
|
||||
)
|
||||
if tf[0] == -1:
|
||||
return "<h4>annulation</h4>"
|
||||
flash("annulation")
|
||||
return flask.redirect(
|
||||
url_for(
|
||||
"notes.formsemestre_bulletinetud",
|
||||
scodoc_dept=g.scodoc_dept,
|
||||
formsemestre_id=formsemestre_id,
|
||||
etudid=etudid,
|
||||
)
|
||||
)
|
||||
else:
|
||||
H = _make_page(etud, formsemestre, tf)
|
||||
if tf[0] == 0: # premier affichage
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Validation des UE d'un semestre extérieur",
|
||||
javascripts=["js/formsemestre_ext_edit_ue_validations.js"],
|
||||
content="\n".join(H),
|
||||
)
|
||||
else: # soumission
|
||||
# simule erreur
|
||||
ok, message = _check_values(formsemestre, ues, tf[2])
|
||||
if not ok:
|
||||
H = _make_page(etud, formsemestre, tf, message=message)
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Validation des UE d'un semestre extérieur",
|
||||
javascripts=["js/formsemestre_ext_edit_ue_validations.js"],
|
||||
content="\n".join(H),
|
||||
)
|
||||
else:
|
||||
# Submit
|
||||
_record_ue_validations_and_coefs(formsemestre, etud, ues, tf[2])
|
||||
@ -299,10 +314,6 @@ def _make_page(etud: Identite, formsemestre: FormSemestre, tf, message="") -> li
|
||||
nt: NotesTableCompat = res_sem.load_formsemestre_results(formsemestre)
|
||||
moy_gen = nt.get_etud_moy_gen(etud.id)
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title="Validation des UE d'un semestre extérieur",
|
||||
javascripts=["js/formsemestre_ext_edit_ue_validations.js"],
|
||||
),
|
||||
tf_error_message(message),
|
||||
f"""<p><b>{etud.nomprenom}</b> est inscrit{etud.e} à ce semestre extérieur.</p>
|
||||
<p>Voici ses UE enregistrées avec leur notes
|
||||
@ -324,7 +335,6 @@ def _make_page(etud: Identite, formsemestre: FormSemestre, tf, message="") -> li
|
||||
)}">retour au bulletin de notes</a>
|
||||
</div>
|
||||
""",
|
||||
html_sco_header.sco_footer(),
|
||||
]
|
||||
return H
|
||||
|
||||
@ -522,7 +532,8 @@ def _record_ue_validations_and_coefs(
|
||||
coef = None
|
||||
now_dmy = time.strftime(scu.DATE_FMT)
|
||||
log(
|
||||
f"_record_ue_validations_and_coefs: {formsemestre.id} etudid={etud.id} ue_id={ue.id} moy_ue={note} ue_coef={coef}"
|
||||
f"""_record_ue_validations_and_coefs: {
|
||||
formsemestre.id} etudid={etud.id} ue_id={ue.id} moy_ue={note} ue_coef={coef}"""
|
||||
)
|
||||
assert code is None or (note) # si code validant, il faut une note
|
||||
sco_formsemestre_validation.do_formsemestre_validate_previous_ue(
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
"""Opérations d'inscriptions aux semestres et modules
|
||||
"""
|
||||
import collections
|
||||
import time
|
||||
|
||||
import flask
|
||||
from flask import flash, url_for, g, render_template, request
|
||||
@ -52,7 +51,6 @@ from app.scodoc import sco_moduleimpl
|
||||
from app.scodoc import sco_groups
|
||||
from app.scodoc import sco_etud
|
||||
from app.scodoc import sco_cache
|
||||
from app.scodoc import html_sco_header
|
||||
|
||||
|
||||
# --- Gestion des inscriptions aux semestres
|
||||
@ -250,7 +248,6 @@ def do_formsemestre_inscription_with_modules(
|
||||
]
|
||||
formsemestre = FormSemestre.get_formsemestre(formsemestre_id, dept_id=dept_id)
|
||||
# Inscription au semestre
|
||||
args = {"formsemestre_id": formsemestre_id, "etudid": etudid}
|
||||
formsemestre.inscrit_etudiant(etud, etat=etat, etape=etape, method=method)
|
||||
log(
|
||||
f"""do_formsemestre_inscription_with_modules: etudid={
|
||||
@ -307,7 +304,6 @@ def formsemestre_inscription_with_modules_form(etudid, only_ext=False):
|
||||
id=etudid, dept_id=g.scodoc_dept_id
|
||||
).first_or_404()
|
||||
H = [
|
||||
html_sco_header.sco_header(),
|
||||
f"<h2>Inscription de {etud.nomprenom}",
|
||||
]
|
||||
if only_ext:
|
||||
@ -319,8 +315,6 @@ def formsemestre_inscription_with_modules_form(etudid, only_ext=False):
|
||||
</p>
|
||||
<h3>Choisir un semestre:</h3>"""
|
||||
)
|
||||
footer = html_sco_header.sco_footer()
|
||||
# sems = sco_formsemestre.do_formsemestre_list(args={"etat": "1"})
|
||||
formsemestres = (
|
||||
FormSemestre.query.filter_by(etat=True, dept_id=g.scodoc_dept_id)
|
||||
.join(Formation)
|
||||
@ -359,7 +353,9 @@ def formsemestre_inscription_with_modules_form(etudid, only_ext=False):
|
||||
url_for("scolar.fiche_etud", scodoc_dept=g.scodoc_dept, etudid=etudid)
|
||||
}">retour à la fiche de {etud.nomprenom}</a>"""
|
||||
)
|
||||
return "\n".join(H) + footer
|
||||
return render_template(
|
||||
"sco_page_dept.j2", title="Inscription", content="\n".join(H)
|
||||
)
|
||||
|
||||
|
||||
def formsemestre_inscription_with_modules(
|
||||
@ -501,9 +497,7 @@ def formsemestre_inscription_option(etudid, formsemestre_id):
|
||||
formsemestre = FormSemestre.get_formsemestre(formsemestre_id)
|
||||
nt: NotesTableCompat = res_sem.load_formsemestre_results(formsemestre)
|
||||
|
||||
footer = html_sco_header.sco_footer()
|
||||
H = [
|
||||
html_sco_header.sco_header(),
|
||||
f"""<h2>Inscription de {etud.nomprenom} aux modules de {formsemestre.titre_mois()}</h2>""",
|
||||
]
|
||||
|
||||
@ -620,7 +614,7 @@ function chkbx_select(field_id, state) {
|
||||
</p>
|
||||
"""
|
||||
)
|
||||
return "\n".join(H) + "\n" + tf[1] + footer
|
||||
return render_template("sco_page.j2", content="\n".join(H) + "\n" + tf[1])
|
||||
if tf[0] == -1:
|
||||
return flask.redirect(
|
||||
url_for("scolar.fiche_etud", scodoc_dept=g.scodoc_dept, etudid=etudid)
|
||||
@ -663,7 +657,7 @@ function chkbx_select(field_id, state) {
|
||||
}">retour à la fiche étudiant</a></p>
|
||||
"""
|
||||
)
|
||||
return "\n".join(H) + footer
|
||||
return render_template("sco_page.j2", content="\n".join(H))
|
||||
|
||||
H.append("<h3>Confirmer les modifications:</h3>")
|
||||
if a_desinscrire:
|
||||
@ -711,7 +705,7 @@ function chkbx_select(field_id, state) {
|
||||
</form>
|
||||
"""
|
||||
)
|
||||
return "\n".join(H) + footer
|
||||
return render_template("sco_page.j2", content="\n".join(H))
|
||||
|
||||
|
||||
def do_moduleimpl_incription_options(
|
||||
@ -765,17 +759,15 @@ def do_moduleimpl_incription_options(
|
||||
)
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(),
|
||||
f"""<h3>Modifications effectuées</h3>
|
||||
<p><a class="stdlink" href="{
|
||||
url_for("scolar.fiche_etud", scodoc_dept=g.scodoc_dept, etudid=etudid)
|
||||
}">
|
||||
Retour à la fiche étudiant</a>
|
||||
</p>
|
||||
""",
|
||||
html_sco_header.sco_footer(),
|
||||
"""
|
||||
]
|
||||
return "\n".join(H)
|
||||
return render_template("sco_page.j2", content="\n".join(H))
|
||||
|
||||
|
||||
def est_inscrit_ailleurs(etudid, formsemestre_id):
|
||||
|
||||
@ -51,11 +51,9 @@ from app.scodoc.sco_exceptions import ScoValueError
|
||||
from app.scodoc.codes_cursus import *
|
||||
from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message
|
||||
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc import sco_assiduites
|
||||
from app.scodoc import codes_cursus
|
||||
from app.scodoc import sco_cache
|
||||
from app.scodoc import sco_etud
|
||||
from app.scodoc import sco_formsemestre
|
||||
from app.scodoc import sco_formsemestre_inscriptions
|
||||
from app.scodoc import sco_cursus
|
||||
@ -75,7 +73,7 @@ def formsemestre_validation_etud_form(
|
||||
sortcol=None,
|
||||
read_only=True,
|
||||
):
|
||||
"""Formulaire de validation des décisions de jury"""
|
||||
"""Formulaire de validation des décisions de jury (formations classiques)"""
|
||||
formsemestre: FormSemestre = FormSemestre.query.filter_by(
|
||||
id=formsemestre_id, dept_id=g.scodoc_dept_id
|
||||
).first_or_404()
|
||||
@ -112,7 +110,6 @@ def formsemestre_validation_etud_form(
|
||||
if read_only:
|
||||
check = True
|
||||
|
||||
etud_d = sco_etud.get_etud_info(etudid=etudid, filled=True)[0]
|
||||
Se = sco_cursus.get_situation_etud_cursus(etud, formsemestre_id)
|
||||
if not Se.sem["etat"]:
|
||||
raise ScoValueError("validation: semestre verrouille")
|
||||
@ -125,13 +122,7 @@ def formsemestre_validation_etud_form(
|
||||
selected_etudid=etudid, # va a la bonne ligne
|
||||
)
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title=f"Parcours {etud.nomprenom}",
|
||||
javascripts=["js/recap_parcours.js"],
|
||||
)
|
||||
]
|
||||
|
||||
H = []
|
||||
# Navigation suivant/precedent
|
||||
if etud_index_prev is not None:
|
||||
etud_prev = Identite.get_etud(T[etud_index_prev][-1])
|
||||
@ -167,8 +158,6 @@ def formsemestre_validation_etud_form(
|
||||
)
|
||||
footer.append("</span></div>")
|
||||
|
||||
footer.append(html_sco_header.sco_footer())
|
||||
|
||||
H.append('<table style="width: 100%"><tr><td>')
|
||||
if not check:
|
||||
H.append(
|
||||
@ -206,7 +195,12 @@ def formsemestre_validation_etud_form(
|
||||
</div>
|
||||
"""
|
||||
)
|
||||
return "\n".join(H + footer)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
javascripts=["js/recap_parcours.js"],
|
||||
title=f"Parcours {etud.nomprenom}",
|
||||
content="\n".join(H + footer),
|
||||
)
|
||||
|
||||
H.append(
|
||||
formsemestre_recap_parcours_table(
|
||||
@ -218,7 +212,12 @@ def formsemestre_validation_etud_form(
|
||||
dest_url = url_tableau
|
||||
H.append(f'<ul><li><a href="{dest_url}">Continuer</a></li></ul>')
|
||||
|
||||
return "\n".join(H + footer)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
javascripts=["js/recap_parcours.js"],
|
||||
title=f"Parcours {etud.nomprenom}",
|
||||
content="\n".join(H + footer),
|
||||
)
|
||||
|
||||
decision_jury = Se.nt.get_etud_decision_sem(etudid)
|
||||
|
||||
@ -236,7 +235,12 @@ def formsemestre_validation_etud_form(
|
||||
"""
|
||||
)
|
||||
)
|
||||
return "\n".join(H + footer)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
javascripts=["js/recap_parcours.js"],
|
||||
title=f"Parcours {etud.nomprenom}",
|
||||
content="\n".join(H + footer),
|
||||
)
|
||||
|
||||
evaluations_a_debloquer = Evaluation.get_evaluations_blocked_for_etud(
|
||||
formsemestre, etud
|
||||
@ -256,7 +260,12 @@ def formsemestre_validation_etud_form(
|
||||
"""
|
||||
)
|
||||
)
|
||||
return "\n".join(H + footer)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
javascripts=["js/recap_parcours.js"],
|
||||
title=f"Parcours {etud.nomprenom}",
|
||||
content="\n".join(H + footer),
|
||||
)
|
||||
|
||||
# Infos si pas de semestre précédent
|
||||
if not Se.prev_formsemestre:
|
||||
@ -287,8 +296,12 @@ def formsemestre_validation_etud_form(
|
||||
}" class="stdlink">Supprimer décision existante</a>
|
||||
"""
|
||||
)
|
||||
H.append(html_sco_header.sco_footer())
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
javascripts=["js/recap_parcours.js"],
|
||||
title=f"Parcours {etud.nomprenom}",
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
# Infos sur decisions déjà saisies
|
||||
if decision_jury:
|
||||
@ -329,8 +342,12 @@ def formsemestre_validation_etud_form(
|
||||
H.append(f"""<input type="hidden" name="sortcol" value="{sortcol}"/>""")
|
||||
H.append("</form></div>")
|
||||
|
||||
H.append(html_sco_header.sco_footer())
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
javascripts=["js/recap_parcours.js"],
|
||||
title=f"Parcours {etud.nomprenom}",
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
# Explication sur barres actuelles
|
||||
H.append('<p class="sfv_explication">L\'étudiant ')
|
||||
@ -393,7 +410,12 @@ def formsemestre_validation_etud_form(
|
||||
else:
|
||||
H.append("sans semestres décalés</p>")
|
||||
|
||||
return "".join(H + footer)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
javascripts=["js/recap_parcours.js"],
|
||||
title=f"Parcours {etud.nomprenom}",
|
||||
content="\n".join(H + footer),
|
||||
)
|
||||
|
||||
|
||||
def formsemestre_validation_etud(
|
||||
@ -1062,7 +1084,7 @@ def do_formsemestre_validation_auto(formsemestre_id):
|
||||
),
|
||||
)
|
||||
H = [
|
||||
f"""{html_sco_header.sco_header(page_title="Saisie automatique")}
|
||||
f"""
|
||||
<h2>Saisie automatique des décisions du semestre {formsemestre.titre_annee()}</h2>
|
||||
<p>Opération effectuée.</p>
|
||||
<p>{nb_valid} étudiants validés sur {len(etudids)}</p>
|
||||
@ -1088,8 +1110,10 @@ def do_formsemestre_validation_auto(formsemestre_id):
|
||||
scodoc_dept=g.scodoc_dept, formsemestre_id=formsemestre_id, mode_jury=1)
|
||||
}">continuer</a>"""
|
||||
)
|
||||
H.append(html_sco_header.sco_footer())
|
||||
return "\n".join(H)
|
||||
|
||||
return render_template(
|
||||
"sco_page.j2", title="Saisie automatique", content="\n".join(H)
|
||||
)
|
||||
|
||||
|
||||
def formsemestre_validation_suppress_etud(formsemestre_id, etudid):
|
||||
@ -1218,14 +1242,14 @@ def formsemestre_validate_previous_ue(formsemestre: FormSemestre, etud: Identite
|
||||
submitlabel="Enregistrer validation d'UE",
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return f"""
|
||||
{html_sco_header.sco_header(
|
||||
page_title="Validation UE antérieure",
|
||||
javascripts=["js/validate_previous_ue.js"],
|
||||
cssstyles=["css/jury_delete_manual.css"],
|
||||
etudid=etud.id,
|
||||
formsemestre_id=formsemestre.id,
|
||||
)}
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title="Validation UE antérieure",
|
||||
javascripts=["js/validate_previous_ue.js"],
|
||||
cssstyles=["css/jury_delete_manual.css"],
|
||||
etudid=etud.id,
|
||||
formsemestre_id=formsemestre.id,
|
||||
content=f"""
|
||||
<h2 class="formsemestre">Gestion des validations d'UEs antérieures
|
||||
de {etud.html_link_fiche()}
|
||||
</h2>
|
||||
@ -1265,8 +1289,8 @@ def formsemestre_validate_previous_ue(formsemestre: FormSemestre, etud: Identite
|
||||
<!-- filled by ue_sharing_code -->
|
||||
</div>
|
||||
{check_formation_ues(formation)[0]}
|
||||
{html_sco_header.sco_footer()}
|
||||
"""
|
||||
""",
|
||||
)
|
||||
|
||||
dest_url = url_for(
|
||||
"notes.formsemestre_validate_previous_ue",
|
||||
|
||||
@ -34,8 +34,7 @@ from xml.etree import ElementTree
|
||||
from xml.etree.ElementTree import Element
|
||||
|
||||
import flask
|
||||
from flask import g, request
|
||||
from flask import url_for, make_response
|
||||
from flask import g, make_response, render_template, request, url_for
|
||||
from sqlalchemy.sql import text
|
||||
|
||||
from app import cache, db, log
|
||||
@ -45,7 +44,6 @@ from app.models import FormSemestre, Identite, Scolog
|
||||
from app.models import SHORT_STR_LEN
|
||||
from app.models.groups import GroupDescr, Partition
|
||||
import app.scodoc.notesdb as ndb
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc import sco_cache
|
||||
from app.scodoc import codes_cursus
|
||||
from app.scodoc import sco_cursus
|
||||
@ -56,7 +54,6 @@ from app.scodoc import sco_xml
|
||||
from app.scodoc.sco_exceptions import ScoException, AccessDenied, ScoValueError
|
||||
from app.scodoc.TrivialFormulator import TrivialFormulator
|
||||
|
||||
|
||||
partitionEditor = ndb.EditableTable(
|
||||
"partition",
|
||||
"partition_id",
|
||||
@ -930,16 +927,12 @@ def edit_partition_form(formsemestre_id=None):
|
||||
raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !")
|
||||
|
||||
partitions = get_partitions_list(formsemestre_id)
|
||||
arrow_up, arrow_down, arrow_none = get_arrow_icons_tags()
|
||||
arrow_up, arrow_down, _ = get_arrow_icons_tags()
|
||||
suppricon = scu.icontag(
|
||||
"delete_small_img", border="0", alt="supprimer", title="Supprimer"
|
||||
)
|
||||
#
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title="Partitions...",
|
||||
javascripts=["js/edit_partition_form.js"],
|
||||
),
|
||||
# limite à SHORT_STR_LEN
|
||||
r"""<script type="text/javascript">
|
||||
function checkname() {
|
||||
@ -1057,7 +1050,8 @@ def edit_partition_form(formsemestre_id=None):
|
||||
H.append(
|
||||
f"""
|
||||
<div style="margin-top: 10px"><a class="stdlink" href="{
|
||||
url_for("scolar.create_partition_parcours", scodoc_dept=g.scodoc_dept, formsemestre_id=formsemestre_id)
|
||||
url_for("scolar.create_partition_parcours",
|
||||
scodoc_dept=g.scodoc_dept, formsemestre_id=formsemestre_id)
|
||||
}">Créer une partition avec un groupe par parcours (BUT)</a>
|
||||
</div>
|
||||
"""
|
||||
@ -1082,14 +1076,19 @@ def edit_partition_form(formsemestre_id=None):
|
||||
(ainsi, on peut afficher le classement en groupes de TD mais pas en
|
||||
groupe de TP, si ce sont deux partitions).
|
||||
</li>
|
||||
<li>Décocher "Afficher ces groupes sur les tableaux et bulletins" pour ne pas que cette partition
|
||||
apparaisse dans les noms de groupes
|
||||
<li>Décocher "Afficher ces groupes sur les tableaux et bulletins"
|
||||
pour ne pas que cette partition apparaisse dans les noms de groupes
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
"""
|
||||
)
|
||||
return "\n".join(H) + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Partitions...",
|
||||
javascripts=["js/edit_partition_form.js"],
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
|
||||
def partition_set_attr(partition_id, attr, value):
|
||||
@ -1248,12 +1247,10 @@ def partition_rename(partition_id):
|
||||
cancelbutton="Annuler",
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return (
|
||||
html_sco_header.sco_header()
|
||||
+ "\n".join(H)
|
||||
+ "\n"
|
||||
+ tf[1]
|
||||
+ html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Renommer une partition",
|
||||
content=("\n".join(H) + "\n" + tf[1]),
|
||||
)
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(
|
||||
@ -1308,6 +1305,8 @@ def groups_auto_repartition(partition: Partition):
|
||||
"""Réparti les etudiants dans des groupes dans une partition, en respectant le niveau
|
||||
et la mixité.
|
||||
"""
|
||||
from app.views import ScoData
|
||||
|
||||
if not partition.groups_editable:
|
||||
raise AccessDenied("Partition non éditable")
|
||||
formsemestre = partition.formsemestre
|
||||
@ -1334,9 +1333,6 @@ def groups_auto_repartition(partition: Partition):
|
||||
]
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title="Répartition des groupes", formsemestre_id=formsemestre.id
|
||||
),
|
||||
f"""<h2>Répartition des groupes de {partition.partition_name}</h2>
|
||||
<p>Semestre {formsemestre.titre_annee()}</p>
|
||||
<p class="help">Les groupes existants seront <b>effacés</b> et remplacés par
|
||||
@ -1357,7 +1353,12 @@ def groups_auto_repartition(partition: Partition):
|
||||
name="tf",
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return "\n".join(H) + "\n" + tf[1] + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Répartition des groupes",
|
||||
content="\n".join(H) + "\n" + tf[1],
|
||||
sco=ScoData(formsemestre=formsemestre),
|
||||
)
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(dest_url)
|
||||
else:
|
||||
|
||||
@ -32,14 +32,13 @@ from flask import flash, g, render_template, request, url_for
|
||||
|
||||
from app.models import FormSemestre, GroupDescr, Partition
|
||||
from app.models import GROUPNAME_STR_LEN
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc.sco_exceptions import AccessDenied
|
||||
import app.scodoc.sco_utils as scu
|
||||
from app.scodoc.TrivialFormulator import TrivialFormulator
|
||||
|
||||
|
||||
def affect_groups(partition_id):
|
||||
"""Formulaire affectation des etudiants aux groupes de la partition.
|
||||
"""(ancien) formulaire affectation des etudiants aux groupes de la partition.
|
||||
Permet aussi la creation et la suppression de groupes.
|
||||
"""
|
||||
# réécrit pour 9.0.47 avec un template
|
||||
@ -50,12 +49,9 @@ def affect_groups(partition_id):
|
||||
formsemestre.setup_parcours_groups()
|
||||
return render_template(
|
||||
"scolar/affect_groups.j2",
|
||||
sco_header=html_sco_header.sco_header(
|
||||
page_title="Affectation aux groupes",
|
||||
javascripts=["js/groupmgr.js"],
|
||||
cssstyles=["css/groups.css"],
|
||||
),
|
||||
sco_footer=html_sco_header.sco_footer(),
|
||||
title="Affectation aux groupes",
|
||||
javascripts=["js/groupmgr.js"],
|
||||
cssstyles=["css/groups.css"],
|
||||
partition=partition,
|
||||
# Liste des partitions sans celle par defaut:
|
||||
partitions_list=partition.formsemestre.partitions.filter(
|
||||
@ -86,9 +82,11 @@ def group_rename(group_id):
|
||||
"size": 12,
|
||||
"allow_null": False,
|
||||
"validator": lambda val, _: len(val) < GROUPNAME_STR_LEN,
|
||||
"explanation": "doit être unique dans cette partition"
|
||||
if group.partition.groups_editable
|
||||
else "groupes non modifiables dans cette partition",
|
||||
"explanation": (
|
||||
"doit être unique dans cette partition"
|
||||
if group.partition.groups_editable
|
||||
else "groupes non modifiables dans cette partition"
|
||||
),
|
||||
"enabled": group.partition.groups_editable,
|
||||
},
|
||||
),
|
||||
@ -117,12 +115,10 @@ def group_rename(group_id):
|
||||
edit_partition=1,
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return (
|
||||
html_sco_header.sco_header()
|
||||
+ "\n".join(H)
|
||||
+ "\n"
|
||||
+ tf[1]
|
||||
+ html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Renommer un groupe",
|
||||
content=("\n".join(H) + "\n" + tf[1]),
|
||||
)
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(dest_url)
|
||||
|
||||
@ -33,7 +33,7 @@ import os
|
||||
import re
|
||||
import time
|
||||
|
||||
from flask import g, url_for
|
||||
from flask import g, render_template, url_for
|
||||
|
||||
from app import db, log
|
||||
from app.models import Identite, GroupDescr, ScolarNews
|
||||
@ -46,7 +46,6 @@ from app.scodoc.sco_exceptions import (
|
||||
ScoException,
|
||||
ScoValueError,
|
||||
)
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc import sco_cache
|
||||
from app.scodoc import sco_etud
|
||||
from app.scodoc import sco_groups
|
||||
@ -231,7 +230,7 @@ def students_import_excel(
|
||||
check_homonyms=True,
|
||||
require_ine=False,
|
||||
return_html=True,
|
||||
):
|
||||
) -> str:
|
||||
"import students from Excel file"
|
||||
diag = scolars_import_excel_file(
|
||||
csvfile,
|
||||
@ -250,18 +249,20 @@ def students_import_excel(
|
||||
if formsemestre_id
|
||||
else url_for("notes.index_html", scodoc_dept=g.scodoc_dept)
|
||||
)
|
||||
H = [html_sco_header.sco_header(page_title="Import etudiants")]
|
||||
H.append("<ul>")
|
||||
H = ["<ul>"]
|
||||
for d in diag:
|
||||
H.append(f"<li>{d}</li>")
|
||||
H.append(
|
||||
f"""
|
||||
</ul>)
|
||||
<p>Import terminé !</p>
|
||||
<p><a class="stdlink" href="{dest_url}">Continuer</a></p>
|
||||
"""
|
||||
</ul>)
|
||||
<p>Import terminé !</p>
|
||||
<p><a class="stdlink" href="{dest_url}">Continuer</a></p>
|
||||
"""
|
||||
)
|
||||
return "\n".join(H) + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2", title="Import etudiants", content="\n".join(H)
|
||||
)
|
||||
return ""
|
||||
|
||||
|
||||
def scolars_import_excel_file(
|
||||
@ -518,8 +519,7 @@ def students_import_admission(
|
||||
use_etudid=use_etudid,
|
||||
)
|
||||
if return_html:
|
||||
H = [html_sco_header.sco_header(page_title="Import données admissions")]
|
||||
H.append("<p>Import terminé !</p>")
|
||||
H = ["<p>Import terminé !</p>"]
|
||||
H.append(
|
||||
f"""<p><a class="stdlink" href="{ url_for(
|
||||
"notes.formsemestre_status",
|
||||
@ -536,7 +536,9 @@ def students_import_admission(
|
||||
"""
|
||||
)
|
||||
|
||||
return "\n".join(H) + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2", title="Import données admissions", content="\n".join(H)
|
||||
)
|
||||
return ""
|
||||
|
||||
|
||||
|
||||
@ -28,14 +28,16 @@
|
||||
"""Rapports sur lycées d'origine des étudiants d'un semestre.
|
||||
- statistiques decisions
|
||||
- suivi cohortes
|
||||
|
||||
|
||||
TODO: remplacer Google Map par https://leafletjs.com/
|
||||
"""
|
||||
from operator import itemgetter
|
||||
|
||||
from flask import url_for, g, request
|
||||
from flask import url_for, g, render_template, request
|
||||
|
||||
import app
|
||||
from app.scodoc import (
|
||||
html_sco_header,
|
||||
sco_formsemestre,
|
||||
sco_groups_view,
|
||||
sco_preferences,
|
||||
@ -91,24 +93,16 @@ def scodoc_table_etuds_lycees(fmt="html"):
|
||||
no_links=True,
|
||||
)
|
||||
tab.base_url = request.base_url
|
||||
t = tab.make_page(fmt=fmt, with_html_headers=False)
|
||||
table_html = tab.make_page(fmt=fmt, with_html_headers=False)
|
||||
if fmt != "html":
|
||||
return t
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title=tab.page_title,
|
||||
init_google_maps=True,
|
||||
javascripts=["js/map_lycees.js"],
|
||||
),
|
||||
"""<h2 class="formsemestre">Lycées d'origine des %d étudiants (%d semestres)</h2>"""
|
||||
% (len(etuds), len(semdepts)),
|
||||
t,
|
||||
"""<div id="lyc_map_canvas"></div>
|
||||
""",
|
||||
js_coords_lycees(etuds_by_lycee),
|
||||
html_sco_header.sco_footer(),
|
||||
]
|
||||
return "\n".join(H)
|
||||
return table_html
|
||||
return render_template(
|
||||
"formsemestre/etuds_lycees.j2",
|
||||
table_html=table_html,
|
||||
title=tab.page_title,
|
||||
title_h2=f"Lycées d'origine des {len(etuds)} étudiants ({len(semdepts)} semestres)",
|
||||
js_coords_lycees=js_coords_lycees(etuds_by_lycee),
|
||||
)
|
||||
|
||||
|
||||
def _table_etuds_lycees(etuds, group_lycees, title, preferences, no_links=False):
|
||||
@ -206,30 +200,19 @@ def formsemestre_etuds_lycees(
|
||||
tab.base_url += "&only_primo=1"
|
||||
if no_grouping:
|
||||
tab.base_url += "&no_grouping=1"
|
||||
t = tab.make_page(fmt=fmt, with_html_headers=False)
|
||||
table_html = tab.make_page(fmt=fmt, with_html_headers=False)
|
||||
if fmt != "html":
|
||||
return t
|
||||
F = [
|
||||
sco_report.tsp_form_primo_group(
|
||||
return table_html
|
||||
return render_template(
|
||||
"formsemestre/etuds_lycees.j2",
|
||||
form_primo_group=sco_report.tsp_form_primo_group(
|
||||
only_primo, no_grouping, formsemestre_id, fmt, groups_infos=groups_infos
|
||||
)
|
||||
]
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title=tab.page_title,
|
||||
init_google_maps=True,
|
||||
cssstyles=sco_groups_view.CSSSTYLES,
|
||||
javascripts=sco_groups_view.JAVASCRIPTS + ["js/map_lycees.js"],
|
||||
),
|
||||
"""<h2 class="formsemestre">Lycées d'origine des étudiants</h2>""",
|
||||
"\n".join(F),
|
||||
t,
|
||||
"""<div id="lyc_map_canvas"></div>
|
||||
""",
|
||||
js_coords_lycees(etuds_by_lycee),
|
||||
html_sco_header.sco_footer(),
|
||||
]
|
||||
return "\n".join(H)
|
||||
table_html=table_html,
|
||||
title=tab.page_title,
|
||||
title_h2="Lycées d'origine des étudiants",
|
||||
js_coords_lycees=js_coords_lycees(etuds_by_lycee),
|
||||
)
|
||||
|
||||
|
||||
def qjs(txt): # quote for JS
|
||||
|
||||
@ -3,15 +3,12 @@
|
||||
|
||||
"""Functions checking permissions for some common operations
|
||||
"""
|
||||
from flask import g
|
||||
from flask import g, render_template
|
||||
from flask_login import current_user
|
||||
|
||||
from app import db
|
||||
from app.auth.models import User
|
||||
import app.scodoc.notesdb as ndb
|
||||
from app.models import EtudAnnotation, FormSemestre, Identite
|
||||
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
|
||||
|
||||
|
||||
@ -20,12 +17,15 @@ def can_suppress_annotation(annotation_id):
|
||||
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:
|
||||
annotation = (
|
||||
EtudAnnotation.query.filter_by(id=annotation_id)
|
||||
.join(Identite)
|
||||
.filter_by(dept_id=g.scodoc_dept_id)
|
||||
.first_or_404()
|
||||
)
|
||||
if not annotation:
|
||||
raise sco_exceptions.ScoValueError("annotation inexistante !")
|
||||
anno = annos[0]
|
||||
return (current_user.user_name == anno["author"]) or current_user.has_permission(
|
||||
return (current_user.user_name == annotation.author) or current_user.has_permission(
|
||||
Permission.EtudAddAnnotations
|
||||
)
|
||||
|
||||
@ -35,49 +35,35 @@ def can_edit_suivi():
|
||||
return current_user.has_permission(Permission.EtudChangeAdr)
|
||||
|
||||
|
||||
def is_chef_or_diretud(sem): # remplacé par formsemestre.est_chef_or_diretud
|
||||
"Vrai si utilisateur est admin, chef dept ou responsable du semestre"
|
||||
if (
|
||||
current_user.has_permission(Permission.EditFormSemestre)
|
||||
or current_user.id in sem["responsables"]
|
||||
):
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def check_access_diretud(
|
||||
formsemestre_id, required_permission=Permission.EditFormSemestre
|
||||
):
|
||||
"""Check if access granted: responsable or EditFormSemestre
|
||||
Return True|False, HTML_error_page
|
||||
"""
|
||||
from app.scodoc import sco_formsemestre
|
||||
|
||||
sem = sco_formsemestre.get_formsemestre(formsemestre_id)
|
||||
header = html_sco_header.sco_header(page_title="Accès interdit")
|
||||
footer = html_sco_header.sco_footer()
|
||||
if (current_user.id not in sem["responsables"]) and not current_user.has_permission(
|
||||
required_permission
|
||||
formsemestre = FormSemestre.get_formsemestre(formsemestre_id)
|
||||
if (not current_user.has_permission(required_permission)) and (
|
||||
current_user.id not in (u.id for u in formsemestre.responsables)
|
||||
):
|
||||
return (
|
||||
False,
|
||||
"\n".join(
|
||||
[
|
||||
header,
|
||||
"<h2>Opération non autorisée pour %s</h2>" % current_user,
|
||||
"<p>Responsable de ce semestre : <b>%s</b></p>"
|
||||
% ", ".join(
|
||||
render_template(
|
||||
"sco_page.j2",
|
||||
title="Accès interdit",
|
||||
content=f"""<h2>Opération non autorisée pour {current_user}</h2>
|
||||
|
||||
<p>Responsable(s) de ce semestre : <b>{
|
||||
', '.join(
|
||||
[
|
||||
db.session.get(User, i).get_prenomnom()
|
||||
for i in sem["responsables"]
|
||||
]
|
||||
),
|
||||
footer,
|
||||
]
|
||||
u.get_prenomnom()
|
||||
for u in formsemestre.responsables
|
||||
])
|
||||
}</b>
|
||||
</p>
|
||||
""",
|
||||
),
|
||||
)
|
||||
else:
|
||||
return True, ""
|
||||
return True, ""
|
||||
|
||||
|
||||
def can_handle_passwd(user: User, allow_admindepts=False) -> bool:
|
||||
|
||||
@ -51,7 +51,7 @@ from wtforms import (
|
||||
from app.models import Evaluation, ModuleImpl
|
||||
import app.scodoc.sco_utils as scu
|
||||
import app.scodoc.notesdb as ndb
|
||||
from app.scodoc import html_sco_header, sco_preferences
|
||||
from app.scodoc import sco_preferences
|
||||
from app.scodoc import sco_edit_module
|
||||
from app.scodoc import sco_evaluations
|
||||
from app.scodoc import sco_excel
|
||||
@ -204,14 +204,14 @@ def placement_eval_selectetuds(evaluation_id):
|
||||
% runner.__dict__
|
||||
)
|
||||
return runner.exec_placement() # calcul et generation du fichier
|
||||
htmls = [
|
||||
html_sco_header.sco_header(),
|
||||
sco_evaluations.evaluation_describe(evaluation_id=evaluation_id),
|
||||
"<h3>Placement et émargement des étudiants</h3>",
|
||||
render_template("scodoc/forms/placement.j2", form=form),
|
||||
]
|
||||
footer = html_sco_header.sco_footer()
|
||||
return "\n".join(htmls) + "<p>" + footer
|
||||
|
||||
return render_template(
|
||||
"scodoc/forms/placement.j2",
|
||||
evaluations_description=sco_evaluations.evaluation_describe(
|
||||
evaluation_id=evaluation_id
|
||||
),
|
||||
form=form,
|
||||
)
|
||||
|
||||
|
||||
class PlacementRunner:
|
||||
|
||||
@ -37,7 +37,7 @@ import time
|
||||
import datetime
|
||||
from operator import itemgetter
|
||||
|
||||
from flask import url_for, g, request
|
||||
from flask import url_for, g, render_template, request
|
||||
import pydot
|
||||
|
||||
from app import log
|
||||
@ -50,7 +50,6 @@ from app.models.etudiants import Identite
|
||||
|
||||
from app.scodoc import (
|
||||
codes_cursus,
|
||||
html_sco_header,
|
||||
sco_etud,
|
||||
sco_formsemestre,
|
||||
sco_formsemestre_inscriptions,
|
||||
@ -411,11 +410,6 @@ def formsemestre_report_counts(
|
||||
if fmt != "html":
|
||||
return tableau
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
cssstyles=sco_groups_view.CSSSTYLES,
|
||||
javascripts=sco_groups_view.JAVASCRIPTS,
|
||||
page_title=title,
|
||||
),
|
||||
tableau,
|
||||
"\n".join(F),
|
||||
"""<p class="help">Le tableau affiche le nombre d'étudiants de ce semestre dans chacun
|
||||
@ -423,9 +417,14 @@ def formsemestre_report_counts(
|
||||
pour les lignes et les colonnes. Le <tt>codedecision</tt> est le code de la décision
|
||||
du jury.
|
||||
</p>""",
|
||||
html_sco_header.sco_footer(),
|
||||
]
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
cssstyles=sco_groups_view.CSSSTYLES,
|
||||
javascripts=sco_groups_view.JAVASCRIPTS,
|
||||
title=title,
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
@ -813,11 +812,6 @@ def formsemestre_suivi_cohorte(
|
||||
href="{burl}&percent=1">Afficher les résultats en pourcentages</a></p>"""
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
cssstyles=sco_groups_view.CSSSTYLES,
|
||||
javascripts=sco_groups_view.JAVASCRIPTS,
|
||||
page_title=tab.page_title,
|
||||
),
|
||||
"""<h2 class="formsemestre">Suivi cohorte: devenir des étudiants de ce semestre</h2>""",
|
||||
_gen_form_selectetuds(
|
||||
formsemestre.id,
|
||||
@ -853,9 +847,14 @@ def formsemestre_suivi_cohorte(
|
||||
</p>
|
||||
""",
|
||||
expl,
|
||||
html_sco_header.sco_footer(),
|
||||
]
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
cssstyles=sco_groups_view.CSSSTYLES,
|
||||
javascripts=sco_groups_view.JAVASCRIPTS,
|
||||
title=tab.page_title,
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
|
||||
def _gen_form_selectetuds(
|
||||
@ -1365,15 +1364,11 @@ def formsemestre_suivi_cursus(
|
||||
]
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title=tab.page_title,
|
||||
),
|
||||
"""<h2 class="formsemestre">Cursus suivis par les étudiants de ce semestre</h2>""",
|
||||
"\n".join(F),
|
||||
t,
|
||||
html_sco_header.sco_footer(),
|
||||
]
|
||||
return "\n".join(H)
|
||||
return render_template("sco_page.j2", title=tab.page_title, content="\n".join(H))
|
||||
|
||||
|
||||
# -------------
|
||||
@ -1742,12 +1737,6 @@ def formsemestre_graph_cursus(
|
||||
)
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
cssstyles=sco_groups_view.CSSSTYLES,
|
||||
javascripts=sco_groups_view.JAVASCRIPTS,
|
||||
page_title="Graphe cursus de %(titreannee)s" % sem,
|
||||
no_sidebar=True,
|
||||
),
|
||||
"""<h2 class="formsemestre">Cursus des étudiants de ce semestre</h2>""",
|
||||
doc,
|
||||
f"<p>{len(etuds)} étudiants sélectionnés</p>",
|
||||
@ -1771,11 +1760,12 @@ def formsemestre_graph_cursus(
|
||||
),
|
||||
"""<p>Origine et devenir des étudiants inscrits dans %(titreannee)s"""
|
||||
% sem,
|
||||
"""(<a href="%s">version pdf</a>"""
|
||||
% url_for("notes.formsemestre_graph_cursus", fmt="pdf", **url_kw),
|
||||
""", <a href="%s">image PNG</a>)"""
|
||||
% url_for("notes.formsemestre_graph_cursus", fmt="png", **url_kw),
|
||||
f"""
|
||||
f"""(<a href="{
|
||||
url_for("notes.formsemestre_graph_cursus", fmt="pdf", **url_kw)
|
||||
}">version pdf</a>,
|
||||
<a href="{
|
||||
url_for("notes.formsemestre_graph_cursus", fmt="png", **url_kw)}">image PNG</a>)
|
||||
|
||||
</p>
|
||||
<p class="help">Le graphe permet de suivre les étudiants inscrits dans le semestre
|
||||
sélectionné (dessiné en vert). Chaque rectangle représente un semestre (cliquez dedans
|
||||
@ -1788,8 +1778,14 @@ def formsemestre_graph_cursus(
|
||||
étudiants appartenant aux groupes indiqués <em>dans le semestre d'origine</em>.
|
||||
</p>
|
||||
""",
|
||||
html_sco_header.sco_footer(),
|
||||
]
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
cssstyles=sco_groups_view.CSSSTYLES,
|
||||
javascripts=sco_groups_view.JAVASCRIPTS,
|
||||
page_title=f"Graphe cursus de {sem['titreannee']}",
|
||||
no_sidebar=True,
|
||||
content="\n".join(H),
|
||||
)
|
||||
else:
|
||||
raise ValueError(f"invalid format: {fmt}")
|
||||
|
||||
@ -31,21 +31,18 @@
|
||||
from collections import defaultdict
|
||||
|
||||
|
||||
from flask import request
|
||||
from flask import render_template, request
|
||||
|
||||
from app import db
|
||||
from app.but import jury_but
|
||||
from app.models import FormSemestre
|
||||
from app.models.formsemestre import FormSemestreInscription
|
||||
|
||||
import app.scodoc.sco_utils as scu
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc import codes_cursus
|
||||
from app.scodoc.sco_exceptions import ScoValueError
|
||||
|
||||
from app.scodoc import sco_preferences
|
||||
import sco_version
|
||||
from app.scodoc.gen_tables import GenTable
|
||||
import sco_version
|
||||
|
||||
|
||||
# Titres, ordonnés
|
||||
@ -107,13 +104,11 @@ def formsemestre_but_indicateurs(formsemestre_id: int, fmt="html"):
|
||||
if fmt != "html":
|
||||
return t
|
||||
H = [
|
||||
html_sco_header.sco_header(page_title=title),
|
||||
t,
|
||||
"""<p class="help">
|
||||
</p>""",
|
||||
html_sco_header.sco_footer(),
|
||||
]
|
||||
return "\n".join(H)
|
||||
return render_template("sco_page.j2", title=title, content="\n".join(H))
|
||||
|
||||
|
||||
def but_indicateurs_by_bac(formsemestre: FormSemestre) -> dict[str:dict]:
|
||||
|
||||
@ -928,7 +928,7 @@ def _get_sheet_evaluations(
|
||||
i, r = _xls_search_sheet_code(rows, diag)
|
||||
if isinstance(r, int): # mono-eval
|
||||
sheet_eval_id = r
|
||||
if sheet_eval_id != evaluation.id:
|
||||
if (evaluation is None) or (sheet_eval_id != evaluation.id):
|
||||
diag.append(
|
||||
f"""Erreur: fichier invalide: le code d'évaluation de correspond pas ! ('{
|
||||
sheet_eval_id or ('non trouvé')}' != '{evaluation.id}')"""
|
||||
|
||||
@ -40,17 +40,15 @@ sem_set_list()
|
||||
"""
|
||||
|
||||
import flask
|
||||
from flask import g, url_for
|
||||
from flask import g, render_template, url_for
|
||||
|
||||
from app import db, log
|
||||
from app.comp import res_sem
|
||||
from app.comp.res_compat import NotesTableCompat
|
||||
from app.models import FormSemestre
|
||||
from app.scodoc import html_sco_header
|
||||
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.sco_etape_bilan import EtapeBilan
|
||||
@ -412,7 +410,7 @@ def do_semset_delete(semset_id, dialog_confirmed=False):
|
||||
s = SemSet(semset_id=semset_id)
|
||||
if not dialog_confirmed:
|
||||
return scu.confirm_dialog(
|
||||
"<h2>Suppression de l'ensemble %(title)s ?</h2>" % s,
|
||||
f"<h2>Suppression de l'ensemble {s['title']} ?</h2>",
|
||||
dest_url="",
|
||||
parameters={"semset_id": semset_id},
|
||||
cancel_url="semset_page",
|
||||
@ -421,14 +419,14 @@ def do_semset_delete(semset_id, dialog_confirmed=False):
|
||||
return flask.redirect("semset_page")
|
||||
|
||||
|
||||
def edit_semset_set_title(id=None, value=None):
|
||||
def edit_semset_set_title(oid=None, value=None):
|
||||
"""Change title of semset"""
|
||||
title = value.strip()
|
||||
if not id:
|
||||
if not oid:
|
||||
raise ScoValueError("empty semset_id")
|
||||
SemSet(semset_id=id)
|
||||
SemSet(semset_id=oid)
|
||||
cnx = ndb.GetDBConnexion()
|
||||
semset_edit(cnx, {"semset_id": id, "title": title})
|
||||
semset_edit(cnx, {"semset_id": oid, "title": title})
|
||||
return title
|
||||
|
||||
|
||||
@ -517,22 +515,18 @@ def semset_page(fmt="html"):
|
||||
|
||||
page_title = "Ensembles de semestres"
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title=page_title,
|
||||
javascripts=["libjs/jinplace-1.2.1.min.js"],
|
||||
),
|
||||
"""<script>$(function() {
|
||||
$('.inplace_edit').jinplace();
|
||||
});
|
||||
</script>""",
|
||||
"<h2>%s</h2>" % page_title,
|
||||
f"<h2>{page_title}</h2>",
|
||||
]
|
||||
H.append(tab.html())
|
||||
|
||||
annee_courante = int(scu.annee_scolaire())
|
||||
menu_annee = "\n".join(
|
||||
[
|
||||
'<option value="%s">%s</option>' % (i, i)
|
||||
f"""<option value="{i}">{i}</option>"""
|
||||
for i in range(2014, annee_courante + 1)
|
||||
]
|
||||
)
|
||||
@ -561,8 +555,8 @@ def semset_page(fmt="html"):
|
||||
|
||||
H.append(
|
||||
"""
|
||||
<div>
|
||||
<h4>Autres opérations:</h4>
|
||||
<div class="scobox space-before-24">
|
||||
<div class="scobox-title">Autres opérations :</div>
|
||||
<ul>
|
||||
<li><a class="stdlink" href="scodoc_table_results">
|
||||
Table des résultats de tous les semestres
|
||||
@ -575,4 +569,9 @@ def semset_page(fmt="html"):
|
||||
"""
|
||||
)
|
||||
|
||||
return "\n".join(H) + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title=page_title,
|
||||
javascripts=["libjs/jinplace-1.2.1.min.js"],
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
@ -49,7 +49,6 @@ import app.scodoc.sco_utils as scu
|
||||
from app.scodoc.TrivialFormulator import TrivialFormulator
|
||||
from app.scodoc.sco_exceptions import ScoPDFFormatError, ScoValueError
|
||||
from app.scodoc.sco_pdf import SU
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc import htmlutils
|
||||
from app.scodoc import sco_import_etuds
|
||||
from app.scodoc import sco_excel
|
||||
@ -90,12 +89,7 @@ def trombino(
|
||||
return _listeappel_photos_pdf(groups_infos)
|
||||
elif fmt == "doc":
|
||||
return sco_trombino_doc.trombino_doc(groups_infos)
|
||||
else:
|
||||
raise Exception("invalid format")
|
||||
|
||||
|
||||
def _trombino_html_header():
|
||||
return html_sco_header.sco_header(javascripts=["js/trombino.js"])
|
||||
raise ValueError("invalid format")
|
||||
|
||||
|
||||
def trombino_html(groups_infos):
|
||||
@ -251,14 +245,18 @@ def trombino_copy_photos(group_ids=None, dialog_confirmed=False):
|
||||
back_url = "groups_photos?" + str(groups_infos.groups_query_args)
|
||||
|
||||
portal_url = sco_portal_apogee.get_portal_url()
|
||||
header = html_sco_header.sco_header(page_title="Chargement des photos")
|
||||
footer = html_sco_header.sco_footer()
|
||||
if not portal_url:
|
||||
return f"""{ header }
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
content=f"""
|
||||
<p>portail non configuré</p>
|
||||
<p><a href="{back_url}" class="stdlink">Retour au trombinoscope</a></p>
|
||||
{ footer }
|
||||
"""
|
||||
<div>
|
||||
<a class="stdlink" href="{back_url}" class="stdlink">
|
||||
Retour au trombinoscope
|
||||
</a>
|
||||
</div>
|
||||
""",
|
||||
)
|
||||
if not dialog_confirmed:
|
||||
return scu.confirm_dialog(
|
||||
f"""<h2>Copier les photos du portail vers ScoDoc ?</h2>
|
||||
@ -285,14 +283,18 @@ def trombino_copy_photos(group_ids=None, dialog_confirmed=False):
|
||||
|
||||
msg.append(f"<b>{nok} photos correctement chargées</b>")
|
||||
|
||||
return f"""{ header }
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
content=f"""
|
||||
<h2>Chargement des photos depuis le portail</h2>
|
||||
<ul><li>
|
||||
{ '</li><li>'.join(msg) }
|
||||
</li></ul>
|
||||
<p><a href="{back_url}">retour au trombinoscope</a>
|
||||
{ footer }
|
||||
"""
|
||||
<div class="space-before-24">
|
||||
<a class="stdlink" href="{back_url}">retour au trombinoscope</a>
|
||||
</div>
|
||||
""",
|
||||
)
|
||||
|
||||
|
||||
def _get_etud_platypus_image(t, image_width=2 * cm):
|
||||
@ -506,7 +508,6 @@ def photos_import_files_form(group_ids=()):
|
||||
back_url = f"groups_photos?{groups_infos.groups_query_args}"
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(page_title="Import des photos des étudiants"),
|
||||
f"""<h2 class="formsemestre">Téléchargement des photos des étudiants</h2>
|
||||
<p><b>Vous pouvez aussi charger les photos individuellement via la fiche
|
||||
de chaque étudiant (menu "Étudiant" / "Changer la photo").</b>
|
||||
@ -526,7 +527,6 @@ def photos_import_files_form(group_ids=()):
|
||||
<li style="padding-top: 2em;">
|
||||
""",
|
||||
]
|
||||
F = html_sco_header.sco_footer()
|
||||
vals = scu.get_request_args()
|
||||
vals["group_ids"] = groups_infos.group_ids
|
||||
tf = TrivialFormulator(
|
||||
@ -540,37 +540,40 @@ def photos_import_files_form(group_ids=()):
|
||||
)
|
||||
|
||||
if tf[0] == 0:
|
||||
return "\n".join(H) + tf[1] + "</li></ol>" + F
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(back_url)
|
||||
else:
|
||||
|
||||
def callback(etud: Identite, data, filename):
|
||||
return sco_photos.store_photo(etud, data, filename)
|
||||
|
||||
(
|
||||
ignored_zipfiles,
|
||||
unmatched_files,
|
||||
stored_etud_filename,
|
||||
) = zip_excel_import_files(
|
||||
xlsfile=tf[2]["xlsfile"],
|
||||
zipfile=tf[2]["zipfile"],
|
||||
callback=callback,
|
||||
filename_title="fichier_photo",
|
||||
back_url=back_url,
|
||||
)
|
||||
return render_template(
|
||||
"scolar/photos_import_files.j2",
|
||||
page_title="Téléchargement des photos des étudiants",
|
||||
ignored_zipfiles=ignored_zipfiles,
|
||||
unmatched_files=unmatched_files,
|
||||
stored_etud_filename=stored_etud_filename,
|
||||
next_page=url_for(
|
||||
"scolar.groups_photos",
|
||||
scodoc_dept=g.scodoc_dept,
|
||||
formsemestre_id=groups_infos.formsemestre_id,
|
||||
),
|
||||
"sco_page.j2",
|
||||
title="Import des photos des étudiants",
|
||||
content="\n".join(H) + tf[1] + "</li></ol>",
|
||||
)
|
||||
if tf[0] == -1:
|
||||
return flask.redirect(back_url)
|
||||
|
||||
def callback(etud: Identite, data, filename):
|
||||
return sco_photos.store_photo(etud, data, filename)
|
||||
|
||||
(
|
||||
ignored_zipfiles,
|
||||
unmatched_files,
|
||||
stored_etud_filename,
|
||||
) = zip_excel_import_files(
|
||||
xlsfile=tf[2]["xlsfile"],
|
||||
zipfile=tf[2]["zipfile"],
|
||||
callback=callback,
|
||||
filename_title="fichier_photo",
|
||||
back_url=back_url,
|
||||
)
|
||||
return render_template(
|
||||
"scolar/photos_import_files.j2",
|
||||
page_title="Téléchargement des photos des étudiants",
|
||||
ignored_zipfiles=ignored_zipfiles,
|
||||
unmatched_files=unmatched_files,
|
||||
stored_etud_filename=stored_etud_filename,
|
||||
next_page=url_for(
|
||||
"scolar.groups_photos",
|
||||
scodoc_dept=g.scodoc_dept,
|
||||
formsemestre_id=groups_infos.formsemestre_id,
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
def _norm_zip_filename(fn, lowercase=True):
|
||||
|
||||
@ -39,7 +39,6 @@ from app import Departement
|
||||
|
||||
from app.auth.models import Permission, Role, User, UserRole
|
||||
from app.models import ScoDocSiteConfig, USERNAME_STR_LEN
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc import sco_preferences
|
||||
from app.scodoc.gen_tables import GenTable
|
||||
from app import cache
|
||||
|
||||
@ -59,11 +59,11 @@ div.sco-app-content {
|
||||
}
|
||||
|
||||
.space-before-18 {
|
||||
margin-top: 18px;
|
||||
margin-top: 18px !important;
|
||||
}
|
||||
|
||||
.space-before-24 {
|
||||
margin-top: 24px;
|
||||
margin-top: 24px !important;
|
||||
}
|
||||
|
||||
div.scobox.maxwidth {
|
||||
@ -2476,6 +2476,10 @@ li.notes_formation_list {
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.dt-scroll-body {
|
||||
overflow: initial !important;
|
||||
}
|
||||
|
||||
table.dataTable.formation_list_table.gt_table {
|
||||
border-collapse: collapse;
|
||||
margin-right: 12px;
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
// Affichage progressif du trombinoscope html
|
||||
|
||||
$().ready(function () {
|
||||
var spans = $(".unloaded_img");
|
||||
for (var i = 0; i < spans.size(); i++) {
|
||||
var sp = spans[i];
|
||||
var etudid = sp.id;
|
||||
$(sp).load(SCO_URL + "etud_photo_html?etudid=" + etudid);
|
||||
}
|
||||
});
|
||||
@ -10,7 +10,7 @@
|
||||
<br />
|
||||
Ces utilisateurs peuvent être réactivés à tout moment.
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="row space-before-24">
|
||||
<div class="col-md-4">
|
||||
{{ wtf.quick_form(form, button_map={'submit':'secondary'}) }}
|
||||
</div>
|
||||
|
||||
32
app/templates/formsemestre/etuds_lycees.j2
Normal file
32
app/templates/formsemestre/etuds_lycees.j2
Normal file
@ -0,0 +1,32 @@
|
||||
{% extends "sco_page.j2" %}
|
||||
|
||||
{% block styles %}
|
||||
{{super()}}
|
||||
<style>
|
||||
|
||||
</style>
|
||||
{% endblock %}
|
||||
|
||||
{% block app_content %}
|
||||
<h2 class="formsemestre">{{title_h2}}</h2>
|
||||
|
||||
<div class="help warning">
|
||||
Page non fonctionnelle dans cette version (modif. API Google)
|
||||
</div>
|
||||
|
||||
{{form_primo_group|safe}}
|
||||
|
||||
{{table_html|safe}}
|
||||
|
||||
<div id="lyc_map_canvas"></div>
|
||||
|
||||
{{js_coords_lycees|safe}}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
{{super()}}
|
||||
<script src="{{scu.STATIC_DIR}}/libjs/jquery.ui.map.full.min.js"></script>
|
||||
<script src="https://maps.google.com/maps/api/js"></script>
|
||||
<script src="{{scu.STATIC_DIR}}/js/map_lycees.js"></script>
|
||||
{% endblock %}
|
||||
@ -3,15 +3,13 @@
|
||||
|
||||
{% block styles %}
|
||||
{{super()}}
|
||||
<link type="text/css" rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/qtip/jquery.qtip-3.0.3.min.css" />
|
||||
<link rel="stylesheet" type="text/css" href="{{scu.STATIC_DIR}}/DataTables/datatables.min.css" />
|
||||
<link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/scodoc.css">
|
||||
<link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/scodoc97.css">
|
||||
<link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/scodoc9_mobile.css">
|
||||
<link href="{{scu.STATIC_DIR}}/css/menu.css" rel="stylesheet" type="text/css" />
|
||||
<link href="{{scu.STATIC_DIR}}/css/gt_table.css" rel="stylesheet" type="text/css" />
|
||||
<link type="text/css" rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/qtip/jquery.qtip-3.0.3.min.css" />
|
||||
{#
|
||||
<link href="{{scu.STATIC_DIR}}/css/tooltip.css" rel="stylesheet" type="text/css" /> #}
|
||||
<link rel="stylesheet" type="text/css" href="{{scu.STATIC_DIR}}/DataTables/datatables.min.css" />
|
||||
{% endblock %}
|
||||
|
||||
{% block title %}
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
{% extends 'sco_page.j2' %}
|
||||
|
||||
{% import 'wtf.j2' as wtf %}
|
||||
|
||||
{% macro render_field(field) %}
|
||||
@ -15,6 +17,12 @@
|
||||
</tr>
|
||||
{% endmacro %}
|
||||
|
||||
{% block app_content %}
|
||||
|
||||
{{ evaluations_description|safe}}
|
||||
|
||||
<h3 class="space-before-24">Placement et émargement des étudiants</h3>
|
||||
|
||||
<div class="saisienote_etape1 form_placement">
|
||||
<form method=post>
|
||||
{{ form.evaluation_id }}
|
||||
@ -78,3 +86,4 @@
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -1,5 +1,7 @@
|
||||
{# -*- mode: jinja-html -*- #}
|
||||
{{ sco_header|safe }}
|
||||
{% extends "sco_page.j2" %}
|
||||
|
||||
{% block app_content %}
|
||||
<h2 class="formsemestre">Affectation aux groupes de {{ partition.partition_name }}</h2>
|
||||
|
||||
<p class="help">
|
||||
@ -54,4 +56,4 @@
|
||||
|
||||
</div>
|
||||
|
||||
{{ sco_footer|safe }}
|
||||
{% endblock %}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{# -*- mode: jinja-html -*- #}
|
||||
{% extends 'base.j2' %}
|
||||
{% extends 'sco_page.j2' %}
|
||||
|
||||
{% block app_content %}
|
||||
|
||||
|
||||
@ -24,7 +24,8 @@
|
||||
##############################################################################
|
||||
|
||||
"""
|
||||
Module absences: remplacé par assiduité en août 2023, reste ici seulement la gestion des "billets"
|
||||
Module absences: remplacé par assiduité en août 2023,
|
||||
reste ici seulement la gestion des "billets"
|
||||
|
||||
"""
|
||||
|
||||
@ -32,8 +33,7 @@ import dateutil
|
||||
import dateutil.parser
|
||||
|
||||
import flask
|
||||
from flask import g, request
|
||||
from flask import abort, flash, url_for
|
||||
from flask import abort, flash, g, render_template, request, url_for
|
||||
from flask_login import current_user
|
||||
|
||||
from app import db, log
|
||||
@ -54,11 +54,8 @@ from app.scodoc import sco_utils as scu
|
||||
from app.scodoc.sco_permissions import Permission
|
||||
from app.scodoc.sco_exceptions import ScoValueError
|
||||
from app.scodoc.TrivialFormulator import TrivialFormulator
|
||||
from app.scodoc import html_sco_header
|
||||
from app.scodoc import sco_cal
|
||||
from app.scodoc import sco_assiduites as scass
|
||||
from app.scodoc import sco_abs_billets
|
||||
from app.scodoc import sco_etud
|
||||
from app.scodoc import sco_preferences
|
||||
|
||||
|
||||
@ -77,11 +74,7 @@ from app.scodoc import sco_preferences
|
||||
def index_html():
|
||||
"""Gestionnaire absences, page principale"""
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title="Billets d'absences",
|
||||
),
|
||||
]
|
||||
H = []
|
||||
if current_user.has_permission(
|
||||
Permission.AbsChange
|
||||
) and sco_preferences.get_preference("handle_billets_abs"):
|
||||
@ -93,8 +86,9 @@ def index_html():
|
||||
</li></ul>
|
||||
"""
|
||||
)
|
||||
H.append(html_sco_header.sco_footer())
|
||||
return "\n".join(H)
|
||||
return render_template(
|
||||
"sco_page_dept.j2", title="Billets d'absences", content="\n".join(H)
|
||||
)
|
||||
|
||||
|
||||
# ----- Gestion des "billets d'absence": signalement par les etudiants eux mêmes (à travers le portail)
|
||||
@ -158,12 +152,8 @@ def add_billets_absence_form(etudid):
|
||||
"""Formulaire ajout billet (pour tests seulement, le vrai
|
||||
formulaire accessible aux etudiants étant sur le portail étudiant).
|
||||
"""
|
||||
etud = sco_etud.get_etud_info(filled=True, etudid=etudid)[0]
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title="Billet d'absence de %s" % etud["nomprenom"]
|
||||
)
|
||||
]
|
||||
_ = Identite.get_etud(etudid) # check
|
||||
H = ["""<h2>Formulaire ajout billet (pour tests)</h2>"""]
|
||||
tf = TrivialFormulator(
|
||||
request.base_url,
|
||||
scu.get_request_args(),
|
||||
@ -179,7 +169,11 @@ def add_billets_absence_form(etudid):
|
||||
),
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return "\n".join(H) + tf[1] + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title="""Billet d'absence de {etud["nomprenom"]}""",
|
||||
content="\n".join(H) + tf[1],
|
||||
)
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(url_for("scolar.index_html", scodoc_dept=g.scodoc_dept))
|
||||
else:
|
||||
@ -242,11 +236,8 @@ def list_billets():
|
||||
et formulaire recherche d'un billet.
|
||||
"""
|
||||
table = sco_abs_billets.table_billets_etud(etat=False)
|
||||
T = table.html()
|
||||
table_html = table.html()
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title="Billet d'absence non traités",
|
||||
),
|
||||
f"<h2>Billets d'absence en attente de traitement ({table.get_nb_rows()})</h2>",
|
||||
]
|
||||
|
||||
@ -257,15 +248,18 @@ def list_billets():
|
||||
submitbutton=False,
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return "\n".join(H) + tf[1] + T + html_sco_header.sco_footer()
|
||||
else:
|
||||
return flask.redirect(
|
||||
url_for(
|
||||
"absences.process_billet_absence_form",
|
||||
billet_id=tf[2]["billet_id"],
|
||||
scodoc_dept=g.scodoc_dept,
|
||||
)
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Billet d'absence non traités",
|
||||
content="\n".join(H) + tf[1] + table_html,
|
||||
)
|
||||
return flask.redirect(
|
||||
url_for(
|
||||
"absences.process_billet_absence_form",
|
||||
billet_id=tf[2]["billet_id"],
|
||||
scodoc_dept=g.scodoc_dept,
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@bp.route("/delete_billets_absence", methods=["POST", "GET"])
|
||||
@ -337,7 +331,8 @@ def _ProcessBilletAbsence(
|
||||
def process_billet_absence_form(billet_id: int):
|
||||
"""Formulaire traitement d'un billet"""
|
||||
if not isinstance(billet_id, int):
|
||||
raise abort(404, "billet_id invalide")
|
||||
abort(404, "billet_id invalide")
|
||||
return # safety guard
|
||||
billet: BilletAbsence = (
|
||||
BilletAbsence.query.filter_by(id=billet_id)
|
||||
.join(Identite)
|
||||
@ -352,9 +347,6 @@ def process_billet_absence_form(billet_id: int):
|
||||
etud = billet.etudiant
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title=f"Traitement billet d'absence de {etud.nomprenom}",
|
||||
),
|
||||
f"""<h2>Traitement du billet {billet.id} : <a class="discretelink" href="{
|
||||
url_for("scolar.fiche_etud", scodoc_dept=g.scodoc_dept, etudid=etud.id)
|
||||
}">{etud.nomprenom}</a></h2>
|
||||
@ -403,7 +395,11 @@ def process_billet_absence_form(billet_id: int):
|
||||
</p>
|
||||
"""
|
||||
|
||||
return "\n".join(H) + "<br>" + tf[1] + F + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title=f"Traitement billet d'absence de {etud.nomprenom}",
|
||||
content="\n".join(H) + "<br>" + tf[1] + F,
|
||||
)
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(url_for("scolar.index_html", scodoc_dept=g.scodoc_dept))
|
||||
else:
|
||||
@ -414,7 +410,7 @@ def process_billet_absence_form(billet_id: int):
|
||||
j = "non justifiées"
|
||||
H.append('<div class="head_message">')
|
||||
if n > 0:
|
||||
H.append("%d absences (1/2 journées) %s ajoutées" % (n, j))
|
||||
H.append(f"{n} absences (1/2 journées) {j} ajoutées")
|
||||
elif n == 0:
|
||||
H.append("Aucun jour d'absence dans les dates indiquées !")
|
||||
elif n < 0:
|
||||
@ -434,4 +430,8 @@ def process_billet_absence_form(billet_id: int):
|
||||
)
|
||||
tab = sco_abs_billets.table_billets(billets, etud=etud)
|
||||
H.append(tab.html())
|
||||
return "\n".join(H) + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title=f"Traitement billet d'absence de {etud.nomprenom}",
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
@ -1073,10 +1073,10 @@ def signal_assiduites_group():
|
||||
select_all_when_unspecified=True,
|
||||
)
|
||||
if not groups_infos.members:
|
||||
return (
|
||||
html_sco_header.sco_header(page_title="Saisie de l'assiduité")
|
||||
+ "<h3>Aucun étudiant ! </h3>"
|
||||
+ html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Saisie de l'assiduité",
|
||||
content="<h3>Aucun étudiant !</h3>",
|
||||
)
|
||||
|
||||
# --- Filtrage par formsemestre ---
|
||||
@ -1952,10 +1952,10 @@ def signal_assiduites_hebdo():
|
||||
group_ids, formsemestre_id=formsemestre.id, select_all_when_unspecified=True
|
||||
)
|
||||
if not groups_infos.members:
|
||||
return (
|
||||
html_sco_header.sco_header(page_title="Assiduité: saisie hebdomadaire")
|
||||
+ "<h3>Aucun étudiant ! </h3>"
|
||||
+ html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Assiduité: feuille saisie hebdomadaire",
|
||||
content="<h3>Aucun étudiant !</h3>",
|
||||
)
|
||||
|
||||
# Récupération des étudiants
|
||||
@ -2305,12 +2305,10 @@ def feuille_abs_hebdo():
|
||||
group_ids, formsemestre_id=formsemestre.id, select_all_when_unspecified=True
|
||||
)
|
||||
if not groups_infos.members:
|
||||
return (
|
||||
html_sco_header.sco_header(
|
||||
page_title="Assiduité: feuille saisie hebdomadaire"
|
||||
)
|
||||
+ "<h3>Aucun étudiant ! </h3>"
|
||||
+ html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Assiduité: feuille saisie hebdomadaire",
|
||||
content="<h3>Aucun étudiant !</h3>",
|
||||
)
|
||||
|
||||
# Gestion des jours
|
||||
|
||||
@ -60,7 +60,6 @@ from app.models import (
|
||||
ScoDocSiteConfig,
|
||||
)
|
||||
from app.scodoc import (
|
||||
html_sco_header,
|
||||
sco_bulletins_json,
|
||||
sco_cache,
|
||||
sco_formsemestre_exterieurs,
|
||||
@ -251,27 +250,23 @@ def formsemestre_validation_but(
|
||||
</div>
|
||||
"""
|
||||
|
||||
H = [
|
||||
html_sco_header.sco_header(
|
||||
page_title=f"Validation BUT S{formsemestre.semestre_id}",
|
||||
formsemestre_id=formsemestre_id,
|
||||
etudid=etudid,
|
||||
H = ["""<div class="jury_but">"""]
|
||||
inscription = formsemestre.etuds_inscriptions.get(etudid)
|
||||
if not inscription:
|
||||
raise ScoValueError("étudiant non inscrit au semestre")
|
||||
if inscription.etat != scu.INSCRIT:
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title=f"Validation BUT S{formsemestre.semestre_id}",
|
||||
sco=ScoData(etud=etud, formsemestre=formsemestre),
|
||||
cssstyles=[
|
||||
"css/jury_but.css",
|
||||
"css/cursus_but.css",
|
||||
],
|
||||
javascripts=("js/jury_but.js",),
|
||||
),
|
||||
"""<div class="jury_but">
|
||||
""",
|
||||
]
|
||||
inscription = formsemestre.etuds_inscriptions.get(etudid)
|
||||
if not inscription:
|
||||
raise ScoValueError("étudiant non inscrit au semestre")
|
||||
if inscription.etat != scu.INSCRIT:
|
||||
return (
|
||||
"\n".join(H)
|
||||
+ f"""
|
||||
content=(
|
||||
"\n".join(H)
|
||||
+ f"""
|
||||
<div>
|
||||
<div class="bull_head">
|
||||
<div>
|
||||
@ -291,7 +286,7 @@ def formsemestre_validation_but(
|
||||
{navigation_div}
|
||||
</div>
|
||||
"""
|
||||
+ html_sco_header.sco_footer()
|
||||
),
|
||||
)
|
||||
|
||||
deca = jury_but.DecisionsProposeesAnnee(etud, formsemestre)
|
||||
@ -341,7 +336,7 @@ def formsemestre_validation_but(
|
||||
êtes-vous certain de vouloir enregistrer une décision de jury ?
|
||||
</div>"""
|
||||
if read_only:
|
||||
warning += f"""<div class="warning">Affichage en lecture seule</div>"""
|
||||
warning += """<div class="warning">Affichage en lecture seule</div>"""
|
||||
|
||||
if deca.formsemestre_impair:
|
||||
inscription = deca.formsemestre_impair.etuds_inscriptions.get(etud.id)
|
||||
@ -507,7 +502,17 @@ def formsemestre_validation_but(
|
||||
</div>
|
||||
"""
|
||||
)
|
||||
return "\n".join(H) + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title=f"Validation BUT S{formsemestre.semestre_id}",
|
||||
sco=ScoData(etud=etud, formsemestre=formsemestre),
|
||||
cssstyles=[
|
||||
"css/jury_but.css",
|
||||
"css/cursus_but.css",
|
||||
],
|
||||
javascripts=("js/jury_but.js",),
|
||||
content="\n".join(H),
|
||||
)
|
||||
|
||||
|
||||
@bp.route(
|
||||
|
||||
@ -88,7 +88,6 @@ from app.scodoc.sco_exceptions import (
|
||||
ScoInvalidIdType,
|
||||
)
|
||||
from app.scodoc import (
|
||||
html_sco_header,
|
||||
sco_apogee_compare,
|
||||
sco_archives_formsemestre,
|
||||
sco_assiduites,
|
||||
@ -770,8 +769,10 @@ def formation_import_xml_form():
|
||||
cancelbutton="Annuler",
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return f"""
|
||||
{ html_sco_header.sco_header(page_title="Import d'une formation") }
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title="Import d'une formation",
|
||||
content=f"""
|
||||
<h2>Import d'une formation</h2>
|
||||
<p>Création d'une formation (avec UE, matières, modules)
|
||||
à partir un fichier XML (réservé aux utilisateurs avertis).
|
||||
@ -783,8 +784,8 @@ def formation_import_xml_form():
|
||||
}">page des référentiels</a>).
|
||||
</p>
|
||||
{ tf[1] }
|
||||
{ html_sco_header.sco_footer() }
|
||||
"""
|
||||
""",
|
||||
)
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(url_for("notes.index_html", scodoc_dept=g.scodoc_dept))
|
||||
else:
|
||||
@ -792,8 +793,10 @@ def formation_import_xml_form():
|
||||
tf[2]["xmlfile"].read()
|
||||
)
|
||||
|
||||
return f"""
|
||||
{ html_sco_header.sco_header(page_title="Import d'une formation") }
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title="Import d'une formation",
|
||||
content=f"""
|
||||
<h2>Import effectué !</h2>
|
||||
<ul>
|
||||
<li><a class="stdlink" href="{
|
||||
@ -806,8 +809,8 @@ def formation_import_xml_form():
|
||||
(en cas d'erreur, par exemple pour charger auparavant le référentiel de compétences)
|
||||
</li>
|
||||
</ul>
|
||||
{ html_sco_header.sco_footer() }
|
||||
"""
|
||||
""",
|
||||
)
|
||||
|
||||
|
||||
sco_publish("/module_move", sco_edit_formation.module_move, Permission.EditFormation)
|
||||
@ -2182,15 +2185,17 @@ def formsemestre_bulletins_mailetuds(
|
||||
if sent:
|
||||
nb_sent += 1
|
||||
#
|
||||
return f"""
|
||||
{html_sco_header.sco_header()}
|
||||
return render_template(
|
||||
"sco_page.j2",
|
||||
title="Mailing bulletins",
|
||||
content=f"""
|
||||
<p>{nb_sent} bulletins sur {len(inscriptions)} envoyés par mail !</p>
|
||||
<p><a class="stdlink" href="{url_for('notes.formsemestre_status',
|
||||
scodoc_dept=g.scodoc_dept,
|
||||
formsemestre_id=formsemestre_id)
|
||||
}">continuer</a></p>
|
||||
{html_sco_header.sco_footer()}
|
||||
"""
|
||||
""",
|
||||
)
|
||||
|
||||
|
||||
sco_publish(
|
||||
@ -2258,10 +2263,8 @@ def appreciation_add_form(
|
||||
else:
|
||||
action = "Ajout"
|
||||
H = [
|
||||
html_sco_header.sco_header(),
|
||||
f"""<h2>{action} d'une appréciation sur {etud.nomprenom}</h2>""",
|
||||
]
|
||||
F = html_sco_header.sco_footer()
|
||||
descr = [
|
||||
("edit", {"input_type": "hidden", "default": edit}),
|
||||
("etudid", {"input_type": "hidden"}),
|
||||
@ -2286,7 +2289,7 @@ def appreciation_add_form(
|
||||
submitlabel="Ajouter appréciation",
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return "\n".join(H) + "\n" + tf[1] + F
|
||||
return render_template("sco_page.j2", content="\n".join(H) + "\n" + tf[1])
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(bul_url)
|
||||
else:
|
||||
@ -2643,7 +2646,7 @@ def check_form_integrity(formation_id, fix=False):
|
||||
else:
|
||||
txth = "OK"
|
||||
log("ok")
|
||||
return html_sco_header.sco_header() + txth + html_sco_header.sco_footer()
|
||||
return render_template("sco_page.j2", content=txth)
|
||||
|
||||
|
||||
@bp.route("/check_formsemestre_integrity")
|
||||
@ -2681,6 +2684,4 @@ def check_formsemestre_integrity(formsemestre_id):
|
||||
else:
|
||||
diag = ["OK"]
|
||||
log("ok")
|
||||
return (
|
||||
html_sco_header.sco_header() + "<br>".join(diag) + html_sco_header.sco_footer()
|
||||
)
|
||||
return render_template("sco_page.j2", content="<br>".join(diag))
|
||||
|
||||
@ -64,7 +64,7 @@ from app.decorators import (
|
||||
permission_required,
|
||||
)
|
||||
|
||||
from app.scodoc import html_sco_header, sco_import_users, sco_roles_default
|
||||
from app.scodoc import sco_import_users, sco_roles_default
|
||||
from app.scodoc import sco_users
|
||||
from app.scodoc import sco_utils as scu
|
||||
from app.scodoc import sco_xml
|
||||
@ -74,7 +74,6 @@ from app.scodoc.sco_import_users import generate_password
|
||||
from app.scodoc.sco_permissions_check import can_handle_passwd
|
||||
from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message
|
||||
from app.views import users_bp as bp
|
||||
from app.views import scodoc_bp
|
||||
|
||||
|
||||
_ = lambda x: x # sans babel
|
||||
@ -92,7 +91,7 @@ class ChangePasswordForm(FlaskForm):
|
||||
validators=[
|
||||
EqualTo(
|
||||
"new_password",
|
||||
message="Les deux saisies sont " "différentes, recommencez",
|
||||
message="Les deux saisies sont différentes, recommencez",
|
||||
),
|
||||
],
|
||||
)
|
||||
@ -106,9 +105,9 @@ class ChangePasswordForm(FlaskForm):
|
||||
submit = SubmitField()
|
||||
cancel = SubmitField("Annuler")
|
||||
|
||||
def validate_email(self, email):
|
||||
"vérifie que le mail est unique"
|
||||
user = User.query.filter_by(email=email.data.strip()).first()
|
||||
def validate_email(self, e_mail):
|
||||
"vérifie que le mail est unique (inline wtf validator)"
|
||||
user = User.query.filter_by(email=e_mail.data.strip()).first()
|
||||
if user is not None and self.user_name.data != user.user_name:
|
||||
raise ValidationError(
|
||||
_("Cette adresse e-mail est déjà attribuée à un autre compte")
|
||||
@ -120,6 +119,7 @@ class ChangePasswordForm(FlaskForm):
|
||||
raise ValidationError("Mot de passe trop simple, recommencez")
|
||||
|
||||
def validate_old_password(self, old_password):
|
||||
"vérifie password actuel"
|
||||
if not current_user.check_password(old_password.data):
|
||||
raise ValidationError("Mot de passe actuel incorrect, ré-essayez")
|
||||
|
||||
@ -855,9 +855,7 @@ def import_users_generate_excel_sample():
|
||||
@scodoc7func
|
||||
def import_users_form():
|
||||
"""Import utilisateurs depuis feuille Excel"""
|
||||
head = html_sco_header.sco_header(page_title="Import utilisateurs")
|
||||
H = [
|
||||
head,
|
||||
"""<h2>Téléchargement d'une liste d'utilisateurs</h2>
|
||||
<p style="color: red">A utiliser pour importer de <b>nouveaux</b>
|
||||
utilisateurs (enseignants ou secrétaires)
|
||||
@ -886,12 +884,10 @@ def import_users_form():
|
||||
<li><b>Étape 1: </b><a class="stdlink" href="{
|
||||
url_for("users.import_users_generate_excel_sample", scodoc_dept=g.scodoc_dept)
|
||||
}">Obtenir la feuille excel vide à remplir</a>
|
||||
ou bien la liste complète des utilisateurs.
|
||||
</li>
|
||||
<li><b> Étape 2:</b>
|
||||
"""
|
||||
)
|
||||
F = html_sco_header.sco_footer()
|
||||
tf = TrivialFormulator(
|
||||
request.base_url,
|
||||
scu.get_request_args(),
|
||||
@ -915,7 +911,11 @@ def import_users_form():
|
||||
submitlabel="Télécharger",
|
||||
)
|
||||
if tf[0] == 0:
|
||||
return "\n".join(H) + tf[1] + "</li></ul>" + help_msg + F
|
||||
return render_template(
|
||||
"sco_page_dept.j2",
|
||||
title="Import utilisateurs",
|
||||
content="\n".join(H) + tf[1] + "</li></ul>" + help_msg,
|
||||
)
|
||||
elif tf[0] == -1:
|
||||
return flask.redirect(url_for("scolar.index_html", docodc_dept=g.scodoc_dept))
|
||||
|
||||
@ -923,8 +923,10 @@ def import_users_form():
|
||||
ok, diags, nb_created = sco_import_users.import_excel_file(
|
||||
tf[2]["xlsfile"], tf[2]["force"]
|
||||
)
|
||||
H = [html_sco_header.sco_header(page_title="Import utilisateurs")]
|
||||
H.append("<ul>")
|
||||
H = [
|
||||
"""<h2>Téléchargement d'une liste d'utilisateurs</h2>
|
||||
<ul>"""
|
||||
]
|
||||
for diag in diags:
|
||||
H.append(f"<li>{diag}</li>")
|
||||
H.append("</ul>")
|
||||
@ -942,7 +944,9 @@ def import_users_form():
|
||||
<p><a class="stdlink" href="{dest_url}">Continuer</a></p>
|
||||
"""
|
||||
)
|
||||
return "\n".join(H) + html_sco_header.sco_footer()
|
||||
return render_template(
|
||||
"sco_page_dept.j2", title="Import utilisateurs", content="\n".join(H)
|
||||
)
|
||||
|
||||
|
||||
@bp.route("/user_info_page")
|
||||
@ -1061,76 +1065,6 @@ def form_change_password(user_name=None):
|
||||
)
|
||||
|
||||
|
||||
@bp.route("/change_password", methods=["POST"])
|
||||
@scodoc
|
||||
@permission_required(Permission.ScoView)
|
||||
@scodoc7func
|
||||
def change_password(user_name, password, password2):
|
||||
"Change the password for user given by user_name"
|
||||
if user_name is not None: # scodoc7func converti en int !
|
||||
user_name = str(user_name)
|
||||
u = User.query.filter_by(user_name=user_name).first()
|
||||
# Check access permission
|
||||
if not can_handle_passwd(u):
|
||||
# access denied
|
||||
log(
|
||||
f"change_password: access denied (authuser={current_user}, user_name={user_name})"
|
||||
)
|
||||
raise AccessDenied("vous n'avez pas la permission de changer ce mot de passe")
|
||||
H = []
|
||||
F = html_sco_header.sco_footer()
|
||||
# check password
|
||||
dest_url = url_for(
|
||||
"users.form_change_password", scodoc_dept=g.scodoc_dept, user_name=user_name
|
||||
)
|
||||
if password != password2:
|
||||
H.append(
|
||||
f"""<p>Les deux mots de passes saisis sont différents !</p>
|
||||
<p><a href="{dest_url}" class="stdlink">Recommencer</a></p>
|
||||
"""
|
||||
)
|
||||
else:
|
||||
if not is_valid_password(password):
|
||||
H.append(
|
||||
f"""<p><b>ce mot de passe n'est pas assez compliqué !</b>
|
||||
<br>(oui, il faut un mot de passe vraiment compliqué !)
|
||||
</p>
|
||||
<p><a href="{dest_url}" class="stdlink">Recommencer</a></p>
|
||||
"""
|
||||
)
|
||||
else:
|
||||
# ok, strong password
|
||||
db.session.add(u)
|
||||
u.set_password(password)
|
||||
db.session.commit()
|
||||
#
|
||||
# ici page simplifiee car on peut ne plus avoir
|
||||
# le droit d'acceder aux feuilles de style
|
||||
return f"""<?xml version="1.0" encoding="{scu.SCO_ENCODING}"?>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Mot de passe changé</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset={scu.SCO_ENCODING}" />
|
||||
<body>
|
||||
<h1>Mot de passe changé !</h1>
|
||||
<h2>Changement effectué</h2>
|
||||
<p>Ne notez pas ce mot de passe, mais mémorisez le !</p>
|
||||
<p>Rappel: il est <b>interdit</b> de communiquer son mot de passe à
|
||||
un tiers, même si c'est un collègue de confiance !</p>
|
||||
<p><b>Si vous n'êtes pas administrateur, le système va vous redemander
|
||||
votre login et nouveau mot de passe au prochain accès.</b>
|
||||
</p>
|
||||
<a href="{
|
||||
url_for("scolar.index_html", scodoc_dept=g.scodoc_dept)
|
||||
}" class="stdlink">Continuer</a>
|
||||
</body>
|
||||
</html>
|
||||
"""
|
||||
|
||||
return html_sco_header.sco_header() + "\n".join(H) + F
|
||||
|
||||
|
||||
@bp.route("/toggle_active_user/<user_name>", methods=["GET", "POST"])
|
||||
@scodoc
|
||||
@permission_required(Permission.UsersAdmin)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# -*- mode: python -*-
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
SCOVERSION = "9.7.8"
|
||||
SCOVERSION = "9.7.10"
|
||||
|
||||
SCONAME = "ScoDoc"
|
||||
|
||||
|
||||
0
tools/debian/prerm
Normal file → Executable file
0
tools/debian/prerm
Normal file → Executable file
@ -122,3 +122,14 @@ remove_install_status() {
|
||||
rm -f "${SCODOC_INSTALL_STATUS_FILE}"
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
alarm_admin() {
|
||||
echo "Error: alarm_admin $1"
|
||||
echo "Sending email to admin..."
|
||||
echo "Subject: ScoDoc: $1" | mail -s "ScoDoc: $1" root <<EOF
|
||||
|
||||
Erreur lors de la mise à jour de ScoDoc sur $(hostname --fqdn)
|
||||
|
||||
EOF
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user