dubacq/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

Fix: validations UE antérieur / template

Browse Source
This commit is contained in:
Emmanuel Viennet 2024-09-10 23:16:27 +02:00
parent 996df5f7b3
commit 770134bb3d
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/but/cursus_but.py
View File

@ -447,11 +447,11 @@ def validations_count_ects(validations: list[ScolarFormSemestreValidation]) -> i
doublons (niveaux de compétences validés plusieurs fois)"""
ects_dict = {}
for v in validations:
if v.code in CODES_UE_VALIDES:
key = (
v.ue.semestre_idx,
v.ue.niveau_competence.id if v.ue.niveau_competence else None,
)
if v.code in CODES_UE_VALIDES:
ects_dict[key] = v.ue.ects or 0.0
return int(sum(ects_dict.values())) if ects_dict else 0

2
app/models/etudiants.py
View File

@ -216,7 +216,7 @@ class Identite(models.ScoDocModel):
except (TypeError, ValueError):
if accept_none:
return None
abort(404, "etudid invalide")
abort(404, f"etudid invalide {request.url if request else ''}")
query = (
cls.query.filter_by(id=etudid, dept_id=g.scodoc_dept_id)

5
app/scodoc/sco_formsemestre_validation.py
View File

@ -61,6 +61,7 @@ from app.scodoc import sco_cursus_dut
from app.scodoc.sco_cursus_dut import etud_est_inscrit_ue
from app.scodoc import sco_preferences
from app.scodoc import sco_pv_dict
from app.views import ScoData
# ------------------------------------------------------------------------------------
@ -1219,6 +1220,7 @@ def formsemestre_validate_previous_ue(formsemestre: FormSemestre, etud: Identite
"min_value": 0,
"max_value": 20,
"title": "Moyenne (/20) obtenue dans cette UE:",
"explanation": "mettre 10 si non notée",
},
),
(
@ -1249,6 +1251,7 @@ def formsemestre_validate_previous_ue(formsemestre: FormSemestre, etud: Identite
cssstyles=["css/jury_delete_manual.css"],
etudid=etud.id,
formsemestre_id=formsemestre.id,
sco=ScoData(etud=etud, formsemestre=formsemestre),
content=f"""
<h2 class="formsemestre">Gestion des validations d'UEs antérieures
de {etud.html_link_fiche()}
@ -1401,7 +1404,7 @@ def do_formsemestre_validate_previous_ue(
semestre_id=semestre_id,
is_external=True,
)
log(f"formsemestre_validate_previous_ue: etudid={etudid}, ue={ue}, code={code}")
Scolog.logdb(
method="formsemestre_validate_previous_ue",
etudid=etudid,

4
app/templates/sco_page.j2
View File

@ -38,17 +38,15 @@
<img id="toggle-sidebar-img" src="{{scu.STATIC_DIR}}/icons/back.svg" width="12px" alt="toggle sidebar"/>
</div>
</div>
{% include "flashed_messages.j2" %}
{% if sco.formsemestre %}
<div class="formsemestre-page-header">
{% include "flashed_messages.j2" %}
{% if sco.formsemestre %}
{% block formsemestre_header %}
{% include "formsemestre_header.j2" %}
{% endblock %}
{% endif %}
</div>
{% else %}
{% include "flashed_messages.j2" %}
{% endif %}
<div id="sidebar">
{% include "sidebar.j2" %}