From 699f6419f306ee0c087c320565e267625e08ab85 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet <emmanuel.viennet@gmail.com> Date: Wed, 22 Feb 2023 22:45:39 +0100 Subject: [PATCH] =?UTF-8?q?Am=C3=A9liore=20signalement=20des=20sem.=20verr?= =?UTF-8?q?ouill=C3=A9s=20sur=20page=20=C3=A9dition=20programme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_edit_ue.py | 12 ++++++++++-- app/scodoc/sco_synchro_etuds.py | 2 +- app/static/css/scodoc.css | 11 ++++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py index 11d36e7f0..9f4900bc4 100644 --- a/app/scodoc/sco_edit_ue.py +++ b/app/scodoc/sco_edit_ue.py @@ -775,11 +775,19 @@ du programme" (menu "Semestre") si vous avez un semestre en cours); # Formation APC (BUT) ? if is_apc: + lock_info = ( + """<span class="lock_info">verrouillé (voir liste des semestres utilisateurs + en bas de page)</span> + """ + if locked + else "" + ) H.append( f"""<div class="formation_apc_infos"> <div class="ue_list_tit">Formation par compétences (BUT) - - Semestre {_html_select_semestre_idx(formation_id, semestre_ids, semestre_idx)} + - {_html_select_semestre_idx(formation_id, semestre_ids, semestre_idx)} </form> + {lock_info} </div> """ ) @@ -985,7 +993,7 @@ du programme" (menu "Semestre") si vous avez un semestre en cours); def _html_select_semestre_idx(formation_id, semestre_ids, semestre_idx): - htm = """<form method="get">Semestre: + htm = """<form method="get">Semestre: <select onchange="this.form.submit()" name="semestre_idx" id="semestre_idx" > """ for i in list(semestre_ids) + ["all"]: diff --git a/app/scodoc/sco_synchro_etuds.py b/app/scodoc/sco_synchro_etuds.py index 2c80db6fd..6685909c4 100644 --- a/app/scodoc/sco_synchro_etuds.py +++ b/app/scodoc/sco_synchro_etuds.py @@ -414,7 +414,7 @@ def list_synch(sem, anneeapogee=None): etudid = key2etudid[key] etuds = sco_etud.identite_list(cnx, {"etudid": etudid}) if not etuds: # ? cela ne devrait pas arriver XXX - log(f"XXX key2etud etudid={{etudid}}, type {{type(etudid)}}") + log(f"XXX key2etud etudid={etudid}, type {type(etudid)}") etud = etuds[0] etud["inscrit"] = is_inscrit # checkbox state etud[ diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index e377cacb1..e1e3d0b83 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -2239,7 +2239,16 @@ span.notes_module_list_buts { div.ue_list_tit { font-weight: bold; - margin-top: 5px; + margin-top: 8px; +} + +div.ue_list_tit form { + display: inline-block; +} + +div.ue_list_tit span.lock_info { + color: red; + margin-left: 8px; } ul.apc_ue_list { -- GitLab