jmplace/ScoDoc-Lille
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Pas de niveau de compétence pour les UE bonus

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-06-23 15:33:01 +02:00
parent a41f92d550
commit 995fe1981b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/but/apc_edit_ue.py
View File

@ -11,10 +11,13 @@ from flask import g, url_for
from app import db, log from app import db, log
from app.models import Formation, UniteEns from app.models import Formation, UniteEns
from app.models.but_refcomp import ApcNiveau from app.models.but_refcomp import ApcNiveau
from app.scodoc import sco_codes_parcours
def form_ue_choix_niveau(formation: Formation, ue: UniteEns) -> str: def form_ue_choix_niveau(formation: Formation, ue: UniteEns) -> str:
"""Form. HTML pour associer une UE à un niveau de compétence""" """Form. HTML pour associer une UE à un niveau de compétence"""
if ue.type != sco_codes_parcours.UE_STANDARD:
return ""
ref_comp = ue.formation.referentiel_competence ref_comp = ue.formation.referentiel_competence
if ref_comp is None: if ref_comp is None:
return f"""<div class="ue_choix_niveau"> return f"""<div class="ue_choix_niveau">

11
app/templates/pn/form_ues.html
View File

@ -32,8 +32,13 @@
ue.color if ue.color is not none else 'blue'}}"></span> ue.color if ue.color is not none else 'blue'}}"></span>
<b>{{ue.acronyme}}</b> <a class="discretelink" href="{{ <b>{{ue.acronyme}}</b> <a class="discretelink" href="{{
url_for('notes.ue_infos', scodoc_dept=g.scodoc_dept, ue_id=ue.id)}}" url_for('notes.ue_infos', scodoc_dept=g.scodoc_dept, ue_id=ue.id)}}"
title="{{ue.acronyme}}: {{'pas de compétence associée' if ue.niveau_competence is none title="{{ue.acronyme}}: {{
else 'compétence ' + ue.niveau_competence.annee + ' ' + ue.niveau_competence.competence.titre_long}}" ('pas de compétence associée'
if ue.niveau_competence is none
else 'compétence ' + ue.niveau_competence.annee + ' ' + ue.niveau_competence.competence.titre_long)
if ue.type == 0
else ''
}}"
>{{ue.titre}}</a> >{{ue.titre}}</a>
{% set virg = joiner(", ") %} {% set virg = joiner(", ") %}
<span class="ue_code">( <span class="ue_code">(
@ -42,7 +47,7 @@
else '<span class="missing_ue_ects">aucun</span>'|safe}} ECTS) else '<span class="missing_ue_ects">aucun</span>'|safe}} ECTS)
</span> </span>
</span> </span>
{% if ue.niveau_competence is none %} {% if (ue.niveau_competence is none) and ue.type == 0 %}
<span class="fontred">pas de compétence associée</span> <span class="fontred">pas de compétence associée</span>
{% endif %} {% endif %}