From 6b7a48f0d199d708d7fd206c243722dfa38e4267 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Fri, 16 Dec 2022 23:23:24 -0300 Subject: [PATCH] Cosmetic: BUT ue_table: cache UE rattachement pour res. et SAE --- app/static/css/scodoc.css | 7 ++++++- app/templates/pn/form_mods.html | 21 ++++++++++++--------- sco_version.py | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 5bad1423..02c83f00 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -2125,7 +2125,8 @@ li.module_malus span.formation_module_tit { } span.formation_module_ue { - background-color: #b7d2fa; + color: #6e7d92; + font-size: 75%; } span.notes_module_list_buts { @@ -2191,6 +2192,10 @@ ul.notes_module_list span.ue_coefs_list { font-size: 70%; } +ul.notes_module_list span.ue_coefs_list span { + margin-right: 1em; +} + div.formation_ue_list_externes { background-color: #98cc98; } diff --git a/app/templates/pn/form_mods.html b/app/templates/pn/form_mods.html index 15bdff5f..805d4708 100644 --- a/app/templates/pn/form_mods.html +++ b/app/templates/pn/form_mods.html @@ -37,8 +37,7 @@ {% if editable %} {% endif %} {{mod.code}} {{mod.titre|default("", true)}} @@ -46,9 +45,12 @@ {% endif %} - ({{mod.ue.acronyme}}), - - parcours {{ mod.get_parcours()|map(attribute="code")|join(", ")|default('tronc commun', true)|safe }} + {% if (mod.module_type != 2) and (mod.module_type != 3) %} + ({{mod.ue.acronyme}}), + {% endif %} + + parcours {{ mod.get_parcours()|map(attribute="code")|join(", ")|default('tronc commun', true)|safe + }} {% if mod.heures_cours or mod.heures_td or mod.heures_tp %} ({{mod.heures_cours|default(" ",true)|safe}}/{{mod.heures_td|default(" ",true)|safe}}/{{mod.heures_tp|default(" ",true)|safe}}, {% else %} @@ -56,10 +58,11 @@ data-url="edit_module_set_code_apogee" id="{{mod.id}}" data-placeholder="{{scu.APO_MISSING_CODE_STR}}"> {{mod.code_apogee|default("", true)}}) - - {% for coef in mod.ue_coefs %} - {{coef.ue.acronyme}}:{{coef.coef}} - {% endfor %} + + {% for coef in mod.ue_coefs %} + {{coef.ue.acronyme}}: {{coef.coef}} + {% endfor %} + {% if mod.ue.type != 0 and mod.module_type != 0 %} diff --git a/sco_version.py b/sco_version.py index 579cc343..3a642d88 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.4.15" +SCOVERSION = "9.4.16" SCONAME = "ScoDoc"