diff --git a/app/scodoc/sco_edt_cal.py b/app/scodoc/sco_edt_cal.py
index e182b27f7..d4b8a1aa8 100644
--- a/app/scodoc/sco_edt_cal.py
+++ b/app/scodoc/sco_edt_cal.py
@@ -183,7 +183,7 @@ def formsemestre_edt_dict(
except ScoValueError as exc:
return exc.args[0]
# Génération des événements pour le calendrier html
- promo_icon = f""""""
abs_icon = f""""""
@@ -228,14 +228,13 @@ def formsemestre_edt_dict(
case None: # Module edt non trouvé dans ScoDoc
mod_disp = f"""{
scu.EMO_WARNING} {event['edt_module']}"""
- 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
bubble = f"""{modimpl.module.abbrev or modimpl.module.titre or ''
} ({event['edt_module']})"""
mod_disp = (
f"""{modimpl.module.code}"""
)
- # {event['title_edt']}
span_title = f" {event['title']}" if show_modules_titles else ""
title = f"""
{mod_disp}{span_title}
@@ -251,11 +250,17 @@ def formsemestre_edt_dict(
else ""
)
- ens_nomprenoms = (
- "(" + ", ".join([u.get_nomprenom() for u in event["users"]]) + ")"
- if event["users"]
- else ""
- )
+ if event["users"]:
+ # enseignants reconnus dans l'evènement EDT
+ ens_nomprenoms = f"""
({
+ ", ".join([u.get_nomprenom() for u in event["users"]])
+ })"""
+ else:
+ ens_nomprenoms = f"""
(ens. ?)"""
+
ens_user_names = (
",".join([u.user_name for u in event["users"]]) if event["users"] else ""
)
diff --git a/app/static/css/edt.css b/app/static/css/edt.css
index 86ad9f4c0..94a9a42ff 100644
--- a/app/static/css/edt.css
+++ b/app/static/css/edt.css
@@ -3,6 +3,9 @@
margin-left: 16px;
}
+span.ens-non-reconnu {
+ color: red;
+}
/* Style for the dropdown button */
.dropdown {
position: relative;
diff --git a/app/templates/formsemestre/edt.j2 b/app/templates/formsemestre/edt.j2
index fab72f51b..b143d99b4 100644
--- a/app/templates/formsemestre/edt.j2
+++ b/app/templates/formsemestre/edt.j2
@@ -241,7 +241,7 @@ document.addEventListener('DOMContentLoaded', function() {
// current calendar date, ISO, without time
const iso_date = calendar.getDateRangeStart().toDate().toISOString().split('T')[0];
updateCurrentDateInUrl(iso_date);
- calendar_control_form.current_date = iso_date;
+ calendar_control_form.current_date.value = iso_date;
}
// View menu
const dropdown = document.querySelector('.dropdown');
diff --git a/sco_version.py b/sco_version.py
index 526737817..8d330985d 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
# -*- mode: python -*-
# -*- coding: utf-8 -*-
-SCOVERSION = "9.6.74"
+SCOVERSION = "9.6.75"
SCONAME = "ScoDoc"