forked from ScoDoc/ScoDoc
Update opolka/ScoDoc from ScoDoc/ScoDoc #2
@ -183,7 +183,7 @@ def formsemestre_edt_dict(
|
|||||||
except ScoValueError as exc:
|
except ScoValueError as exc:
|
||||||
return exc.args[0]
|
return exc.args[0]
|
||||||
# Génération des événements pour le calendrier html
|
# Génération des événements pour le calendrier html
|
||||||
promo_icon = f"""<img height="28px" src="{scu.STATIC_DIR}/icons/promo.svg"
|
promo_icon = f"""<img height="18px" src="{scu.STATIC_DIR}/icons/promo.svg"
|
||||||
title="promotion complète" alt="promotion"/>"""
|
title="promotion complète" alt="promotion"/>"""
|
||||||
abs_icon = f"""<img height="28px" src="{scu.STATIC_DIR}/icons/absences.svg"
|
abs_icon = f"""<img height="28px" src="{scu.STATIC_DIR}/icons/absences.svg"
|
||||||
title="saisir absences" alt="saisir absences"/>"""
|
title="saisir absences" alt="saisir absences"/>"""
|
||||||
@ -228,14 +228,13 @@ def formsemestre_edt_dict(
|
|||||||
case None: # Module edt non trouvé dans ScoDoc
|
case None: # Module edt non trouvé dans ScoDoc
|
||||||
mod_disp = f"""<span class="mod-etd">{
|
mod_disp = f"""<span class="mod-etd">{
|
||||||
scu.EMO_WARNING} {event['edt_module']}</span>"""
|
scu.EMO_WARNING} {event['edt_module']}</span>"""
|
||||||
bubble = "code module non trouvé dans ScoDoc. Vérifier configuration."
|
bubble = "code module non trouvé dans ce semestre ScoDoc. Vérifier configuration."
|
||||||
case _: # module EDT bien retrouvé dans ScoDoc
|
case _: # module EDT bien retrouvé dans ScoDoc
|
||||||
bubble = f"""{modimpl.module.abbrev or modimpl.module.titre or ''
|
bubble = f"""{modimpl.module.abbrev or modimpl.module.titre or ''
|
||||||
} ({event['edt_module']})"""
|
} ({event['edt_module']})"""
|
||||||
mod_disp = (
|
mod_disp = (
|
||||||
f"""<span class="mod-name mod-code">{modimpl.module.code}</span>"""
|
f"""<span class="mod-name mod-code">{modimpl.module.code}</span>"""
|
||||||
)
|
)
|
||||||
# {event['title_edt']}
|
|
||||||
span_title = f" <span>{event['title']}</span>" if show_modules_titles else ""
|
span_title = f" <span>{event['title']}</span>" if show_modules_titles else ""
|
||||||
title = f"""<div class = "module-edt" title="{bubble}">
|
title = f"""<div class = "module-edt" title="{bubble}">
|
||||||
<a class="discretelink" href="{url_abs or ''}">{mod_disp}{span_title}</a>
|
<a class="discretelink" href="{url_abs or ''}">{mod_disp}{span_title}</a>
|
||||||
@ -251,11 +250,17 @@ def formsemestre_edt_dict(
|
|||||||
else ""
|
else ""
|
||||||
)
|
)
|
||||||
|
|
||||||
ens_nomprenoms = (
|
if event["users"]:
|
||||||
"(" + ", ".join([u.get_nomprenom() for u in event["users"]]) + ")"
|
# enseignants reconnus dans l'evènement EDT
|
||||||
if event["users"]
|
ens_nomprenoms = f"""<span class="edt-ens">({
|
||||||
else ""
|
", ".join([u.get_nomprenom() for u in event["users"]])
|
||||||
)
|
})</span>"""
|
||||||
|
else:
|
||||||
|
ens_nomprenoms = f"""<span class="ens-non-reconnu"
|
||||||
|
title="enseignants edt: {', '.join(event['edt_ens_ids'])
|
||||||
|
if event["edt_ens_ids"] else '?'
|
||||||
|
}">(ens. ?)</span>"""
|
||||||
|
|
||||||
ens_user_names = (
|
ens_user_names = (
|
||||||
",".join([u.user_name for u in event["users"]]) if event["users"] else ""
|
",".join([u.user_name for u in event["users"]]) if event["users"] else ""
|
||||||
)
|
)
|
||||||
|
@ -3,6 +3,9 @@
|
|||||||
margin-left: 16px;
|
margin-left: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
span.ens-non-reconnu {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
/* Style for the dropdown button */
|
/* Style for the dropdown button */
|
||||||
.dropdown {
|
.dropdown {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
@ -241,7 +241,7 @@ document.addEventListener('DOMContentLoaded', function() {
|
|||||||
// current calendar date, ISO, without time
|
// current calendar date, ISO, without time
|
||||||
const iso_date = calendar.getDateRangeStart().toDate().toISOString().split('T')[0];
|
const iso_date = calendar.getDateRangeStart().toDate().toISOString().split('T')[0];
|
||||||
updateCurrentDateInUrl(iso_date);
|
updateCurrentDateInUrl(iso_date);
|
||||||
calendar_control_form.current_date = iso_date;
|
calendar_control_form.current_date.value = iso_date;
|
||||||
}
|
}
|
||||||
// View menu
|
// View menu
|
||||||
const dropdown = document.querySelector('.dropdown');
|
const dropdown = document.querySelector('.dropdown');
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# -*- mode: python -*-
|
# -*- mode: python -*-
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
SCOVERSION = "9.6.74"
|
SCOVERSION = "9.6.75"
|
||||||
|
|
||||||
SCONAME = "ScoDoc"
|
SCONAME = "ScoDoc"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user