opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Assiduité : fix bug module selector signal_assiduites_group

Browse Source
This commit is contained in:
Iziram 2024-02-29 08:47:03 +01:00
parent e56cbfc5a2
commit 21b2e0f582
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/templates/assiduites/pages/signal_assiduites_group.j2
View File

@ -1,23 +1,23 @@
{% extends "sco_page.j2" %} {% extends "sco_page.j2" %}
{% block title %} {% block title %}
{{title}} {{title}}
{% endblock title %} {% endblock title %}
{% block scripts %} {% block scripts %}
{{ super() }} {{ super() }}
<script src="{{scu.STATIC_DIR}}/libjs/bootstrap-multiselect-1.1.2/bootstrap-multiselect.min.js"></script> <script src="{{scu.STATIC_DIR}}/libjs/bootstrap-multiselect-1.1.2/bootstrap-multiselect.min.js"></script>
<script src="{{scu.STATIC_DIR}}/libjs/purl.js"></script> <script src="{{scu.STATIC_DIR}}/libjs/purl.js"></script>
<script src="{{scu.STATIC_DIR}}/js/etud_info.js"></script> <script src="{{scu.STATIC_DIR}}/js/etud_info.js"></script>
<script src="{{scu.STATIC_DIR}}/js/groups_view.js"></script> <script src="{{scu.STATIC_DIR}}/js/groups_view.js"></script>
<script src="{{scu.STATIC_DIR}}/js/date_utils.js"></script> <script src="{{scu.STATIC_DIR}}/js/date_utils.js"></script>
<script src="{{scu.STATIC_DIR}}/js/assiduites.js"></script> <script src="{{scu.STATIC_DIR}}/js/assiduites.js"></script>
<script> <script>
{% if readonly != "false" %} {% if readonly != "false" %}
function getPeriodValues(){ function getPeriodValues() {
return [0, 23] return [0, 23]
} }
{% endif %} {% endif %}
@ -30,9 +30,9 @@
setupDate(); setupDate();
updateDate(); updateDate();
if (!readOnly){ if (!readOnly) {
setupTimeLine(()=>{ setupTimeLine(() => {
generateAllEtudRow(); generateAllEtudRow();
}); });
} }
@ -63,16 +63,16 @@
} }
}); });
} }
</script> </script>
{% endblock scripts %} {% endblock scripts %}
{% block styles %} {% block styles %}
{{ super() }} {{ super() }}
<link rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/bootstrap/css/bootstrap-theme.min.css"> <link rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/bootstrap/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/bootstrap-multiselect-1.1.2/bootstrap-multiselect.min.css"> <link rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/bootstrap-multiselect-1.1.2/bootstrap-multiselect.min.css">
<link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/assiduites.css"> <link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/assiduites.css">
<link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/minitimeline.css"> <link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/minitimeline.css">
{% endblock styles %} {% endblock styles %}
@ -80,7 +80,11 @@
{% include "assiduites/widgets/toast.j2" %} {% include "assiduites/widgets/toast.j2" %}
{{ minitimeline|safe }} {{ minitimeline|safe }}
<style>
#moduleimpl_select {
max-width: 200px;
}
</style>
<section id="content"> <section id="content">
<div class="no-display"> <div class="no-display">
@ -102,8 +106,7 @@
<div class="infos-button">Groupes&nbsp;: {{grp|safe}}</div> <div class="infos-button">Groupes&nbsp;: {{grp|safe}}</div>
<div class="infos-button" style="margin-left: 24px;">Date&nbsp;: <span style="margin-left: 8px;" <div class="infos-button" style="margin-left: 24px;">Date&nbsp;: <span style="margin-left: 8px;"
id="datestr"></span> id="datestr"></span>
<input type="text" name="tl_date" id="tl_date" value="{{ date }}" <input type="text" name="tl_date" id="tl_date" value="{{ date }}" onchange="updateDate()">
onchange="updateDate()">
</div> </div>
</div> </div>
</fieldset> </fieldset>
@ -162,4 +165,4 @@
</section> </section>
{% endblock app_content %} {% endblock app_content %}

6
app/views/assiduites.py
View File

@ -2181,12 +2181,8 @@ def _module_selector(formsemestre: FormSemestre, moduleimpl_id: int = None) -> s
""" """
# récupération des ues du semestre # récupération des ues du semestre
ntc: NotesTableCompat = res_sem.load_formsemestre_results(formsemestre) ntc: NotesTableCompat = res_sem.load_formsemestre_results(formsemestre)
ues = ntc.get_ues_stat_dict()
modimpls_list: list[dict] = [] modimpls_list: list[dict] = ntc.get_modimpls_dict()
for ue in ues:
# Ajout des moduleimpl de chaque ue dans la liste des moduleimpls
modimpls_list += ntc.get_modimpls_dict(ue_id=ue["ue_id"])
# prévoie la sélection par défaut d'un moduleimpl s'il a été passé en paramètre # prévoie la sélection par défaut d'un moduleimpl s'il a été passé en paramètre
selected = "" if moduleimpl_id is not None else "selected" selected = "" if moduleimpl_id is not None else "selected"