forked from ScoDoc/ScoDoc
bug fix
This commit is contained in:
parent
4b3ac58bc0
commit
31288efb73
@ -1031,9 +1031,7 @@ def _formsemestre_bulletinetud_header_html(
|
|||||||
uid = str(authuser)
|
uid = str(authuser)
|
||||||
H = [
|
H = [
|
||||||
html_sco_header.sco_header(
|
html_sco_header.sco_header(
|
||||||
context,
|
|
||||||
page_title="Bulletin de %(nomprenom)s" % etud,
|
page_title="Bulletin de %(nomprenom)s" % etud,
|
||||||
REQUEST=REQUEST,
|
|
||||||
javascripts=[
|
javascripts=[
|
||||||
"js/bulletin.js",
|
"js/bulletin.js",
|
||||||
"libjs/d3.v3.min.js",
|
"libjs/d3.v3.min.js",
|
||||||
|
@ -124,12 +124,10 @@ def search_etud_in_dept(context, expnom="", REQUEST=None):
|
|||||||
|
|
||||||
H = [
|
H = [
|
||||||
html_sco_header.sco_header(
|
html_sco_header.sco_header(
|
||||||
context,
|
|
||||||
page_title="Recherche d'un étudiant",
|
page_title="Recherche d'un étudiant",
|
||||||
no_side_bar=True,
|
no_side_bar=True,
|
||||||
init_qtip=True,
|
init_qtip=True,
|
||||||
javascripts=["js/etud_info.js"],
|
javascripts=["js/etud_info.js"],
|
||||||
REQUEST=REQUEST,
|
|
||||||
),
|
),
|
||||||
"""<h2>%d résultats pour "%s": choisissez un étudiant:</h2>"""
|
"""<h2>%d résultats pour "%s": choisissez un étudiant:</h2>"""
|
||||||
% (len(etuds), expnom),
|
% (len(etuds), expnom),
|
||||||
|
@ -148,9 +148,7 @@ def check_access_diretud(
|
|||||||
from app.scodoc import sco_formsemestre
|
from app.scodoc import sco_formsemestre
|
||||||
|
|
||||||
sem = sco_formsemestre.get_formsemestre(context, formsemestre_id)
|
sem = sco_formsemestre.get_formsemestre(context, formsemestre_id)
|
||||||
header = html_sco_header.sco_header(
|
header = html_sco_header.sco_header(page_title="Accès interdit")
|
||||||
context, page_title="Accès interdit", REQUEST=REQUEST
|
|
||||||
)
|
|
||||||
footer = html_sco_header.sco_footer()
|
footer = html_sco_header.sco_footer()
|
||||||
if (
|
if (
|
||||||
current_user.user_name not in sem["responsables"]
|
current_user.user_name not in sem["responsables"]
|
||||||
|
@ -323,9 +323,7 @@ def SignaleAbsenceGrHebdo(
|
|||||||
)
|
)
|
||||||
if not groups_infos.members:
|
if not groups_infos.members:
|
||||||
return (
|
return (
|
||||||
html_sco_header.sco_header(
|
html_sco_header.sco_header(page_title="Saisie des absences")
|
||||||
context, page_title="Saisie des absences", REQUEST=REQUEST
|
|
||||||
)
|
|
||||||
+ "<h3>Aucun étudiant !</h3>"
|
+ "<h3>Aucun étudiant !</h3>"
|
||||||
+ html_sco_header.sco_footer()
|
+ html_sco_header.sco_footer()
|
||||||
)
|
)
|
||||||
@ -492,9 +490,7 @@ def SignaleAbsenceGrSemestre(
|
|||||||
)
|
)
|
||||||
if not groups_infos.members:
|
if not groups_infos.members:
|
||||||
return (
|
return (
|
||||||
html_sco_header.sco_header(
|
html_sco_header.sco_header(page_title="Saisie des absences")
|
||||||
context, page_title="Saisie des absences", REQUEST=REQUEST
|
|
||||||
)
|
|
||||||
+ "<h3>Aucun étudiant !</h3>"
|
+ "<h3>Aucun étudiant !</h3>"
|
||||||
+ html_sco_header.sco_footer()
|
+ html_sco_header.sco_footer()
|
||||||
)
|
)
|
||||||
@ -586,12 +582,10 @@ def SignaleAbsenceGrSemestre(
|
|||||||
|
|
||||||
H = [
|
H = [
|
||||||
html_sco_header.sco_header(
|
html_sco_header.sco_header(
|
||||||
context,
|
|
||||||
page_title="Saisie des absences",
|
page_title="Saisie des absences",
|
||||||
init_qtip=True,
|
init_qtip=True,
|
||||||
javascripts=["js/etud_info.js", "js/abs_ajax.js"],
|
javascripts=["js/etud_info.js", "js/abs_ajax.js"],
|
||||||
no_side_bar=1,
|
no_side_bar=1,
|
||||||
REQUEST=REQUEST,
|
|
||||||
),
|
),
|
||||||
"""<table border="0" cellspacing="16"><tr><td>
|
"""<table border="0" cellspacing="16"><tr><td>
|
||||||
<h2>Saisie des absences %s %s,
|
<h2>Saisie des absences %s %s,
|
||||||
@ -1000,11 +994,7 @@ def EtatAbsencesDate(
|
|||||||
groups_infos = sco_groups_view.DisplayedGroupsInfos(
|
groups_infos = sco_groups_view.DisplayedGroupsInfos(
|
||||||
context, group_ids, REQUEST=REQUEST
|
context, group_ids, REQUEST=REQUEST
|
||||||
)
|
)
|
||||||
H = [
|
H = [html_sco_header.sco_header(page_title="Etat des absences")]
|
||||||
html_sco_header.sco_header(
|
|
||||||
context, page_title="Etat des absences", REQUEST=REQUEST
|
|
||||||
)
|
|
||||||
]
|
|
||||||
if date:
|
if date:
|
||||||
dateiso = ndb.DateDMYtoISO(date)
|
dateiso = ndb.DateDMYtoISO(date)
|
||||||
nbetud = 0
|
nbetud = 0
|
||||||
|
@ -462,9 +462,7 @@ def formation_import_xml(context, file, REQUEST):
|
|||||||
def formation_import_xml_form(context, REQUEST):
|
def formation_import_xml_form(context, REQUEST):
|
||||||
"form import d'une formation en XML"
|
"form import d'une formation en XML"
|
||||||
H = [
|
H = [
|
||||||
html_sco_header.sco_header(
|
html_sco_header.sco_header(page_title="Import d'une formation"),
|
||||||
context, page_title="Import d'une formation", REQUEST=REQUEST
|
|
||||||
),
|
|
||||||
"""<h2>Import d'une formation</h2>
|
"""<h2>Import d'une formation</h2>
|
||||||
<p>Création d'une formation (avec UE, matières, modules)
|
<p>Création d'une formation (avec UE, matières, modules)
|
||||||
à partir un fichier XML (réservé aux utilisateurs avertis)</p>
|
à partir un fichier XML (réservé aux utilisateurs avertis)</p>
|
||||||
@ -2370,7 +2368,7 @@ def check_sem_integrity(context, formsemestre_id, REQUEST, fix=False):
|
|||||||
modimpl["mod"] = mod
|
modimpl["mod"] = mod
|
||||||
|
|
||||||
H = [
|
H = [
|
||||||
html_sco_header.sco_header(context, REQUEST=REQUEST),
|
html_sco_header.sco_header(),
|
||||||
"<p>formation_id=%s" % sem["formation_id"],
|
"<p>formation_id=%s" % sem["formation_id"],
|
||||||
]
|
]
|
||||||
if bad_ue:
|
if bad_ue:
|
||||||
@ -2447,11 +2445,7 @@ def check_form_integrity(context, formation_id, fix=False, REQUEST=None):
|
|||||||
else:
|
else:
|
||||||
txth = "OK"
|
txth = "OK"
|
||||||
log("ok")
|
log("ok")
|
||||||
return (
|
return html_sco_header.sco_header() + txth + html_sco_header.sco_footer()
|
||||||
html_sco_header.sco_header(context, REQUEST=REQUEST)
|
|
||||||
+ txth
|
|
||||||
+ html_sco_header.sco_footer()
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@bp.route("/check_formsemestre_integrity")
|
@bp.route("/check_formsemestre_integrity")
|
||||||
@ -2500,9 +2494,7 @@ def check_formsemestre_integrity(context, formsemestre_id, REQUEST=None):
|
|||||||
diag = ["OK"]
|
diag = ["OK"]
|
||||||
log("ok")
|
log("ok")
|
||||||
return (
|
return (
|
||||||
html_sco_header.sco_header(context, REQUEST=REQUEST)
|
html_sco_header.sco_header() + "<br/>".join(diag) + html_sco_header.sco_footer()
|
||||||
+ "<br/>".join(diag)
|
|
||||||
+ html_sco_header.sco_footer()
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -2520,7 +2512,7 @@ def check_integrity_all(context, REQUEST=None):
|
|||||||
for sem in sco_formsemestre.do_formsemestre_list(context):
|
for sem in sco_formsemestre.do_formsemestre_list(context):
|
||||||
check_formsemestre_integrity(context, sem["formsemestre_id"], REQUEST=REQUEST)
|
check_formsemestre_integrity(context, sem["formsemestre_id"], REQUEST=REQUEST)
|
||||||
return (
|
return (
|
||||||
html_sco_header.sco_header(context, REQUEST=REQUEST)
|
html_sco_header.sco_header()
|
||||||
+ "<p>empty page: see logs and mails</p>"
|
+ "<p>empty page: see logs and mails</p>"
|
||||||
+ html_sco_header.sco_footer()
|
+ html_sco_header.sco_footer()
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user