forked from ScoDoc/ScoDoc
Ajoute liens sur bulletins BUT, précise année de validation, corrige bug affichage decision annéee BUT
This commit is contained in:
parent
5b76654b7b
commit
03b9a92ba8
@ -503,7 +503,8 @@ class BulletinGeneratorBUTCourt(BulletinGeneratorStandard):
|
||||
txt += f"""
|
||||
Jury tenu le {
|
||||
datetime.datetime.fromisoformat(self.bul["semestre"]["decision_annee"]["date"]).strftime("%d/%m/%Y")
|
||||
}, année BUT <b>{self.bul["semestre"]["decision_annee"]["code"]}</b>.
|
||||
}, année BUT{self.bul["semestre"]["decision_annee"]["ordre"]}
|
||||
<b>{self.bul["semestre"]["decision_annee"]["code"]}</b>.
|
||||
<br/>
|
||||
"""
|
||||
if self.bul["semestre"].get("autorisation_inscription", None):
|
||||
|
@ -214,10 +214,12 @@ def dict_decision_jury(etud: Identite, formsemestre: FormSemestre) -> dict:
|
||||
decisions["decision_rcue"] = []
|
||||
decisions["descr_decisions_rcue"] = ""
|
||||
decisions["descr_decisions_niveaux"] = ""
|
||||
# --- Année: prend la validation pour l'année scolaire de ce semestre
|
||||
# --- Année: prend la validation pour l'année scolaire et l'ordre de ce semestre
|
||||
annee_but = (formsemestre.semestre_id + 1) // 2
|
||||
validation = ApcValidationAnnee.query.filter_by(
|
||||
etudid=etud.id,
|
||||
annee_scolaire=formsemestre.annee_scolaire(),
|
||||
ordre=annee_but,
|
||||
referentiel_competence_id=formsemestre.formation.referentiel_competence_id,
|
||||
).first()
|
||||
if validation:
|
||||
|
@ -405,6 +405,7 @@ def dict_decision_jury(
|
||||
"""dict avec decision pour bulletins json
|
||||
- autorisation_inscription
|
||||
- decision : décision semestre
|
||||
- decision_annee : annee BUT
|
||||
- decision_ue : list des décisions UE
|
||||
- situation
|
||||
|
||||
|
@ -5,11 +5,17 @@
|
||||
}
|
||||
}
|
||||
|
||||
div.but_bul_court_links {
|
||||
margin-left: 16px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
div.but_bul_court {
|
||||
width: 17cm;
|
||||
/* width: 17cm; */
|
||||
display: grid;
|
||||
grid-template-columns: 6cm 11cm;
|
||||
font-size: 11pt;
|
||||
grid-template-columns: 6cm 11cm;
|
||||
margin-left: 16px;
|
||||
}
|
||||
|
||||
#infos_etudiant {
|
||||
|
@ -28,7 +28,7 @@ main {
|
||||
;
|
||||
--couleurSurlignage: rgba(255, 253, 110, 0.49);
|
||||
max-width: 1000px;
|
||||
margin: auto;
|
||||
margin-left: 16px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
@ -3077,7 +3077,7 @@ div.bul_foot {
|
||||
border-radius: 16px;
|
||||
border: 1px solid #AAA;
|
||||
padding: 16px 32px;
|
||||
margin: auto;
|
||||
margin-left: 16px;
|
||||
}
|
||||
|
||||
div.bull_appreciations {
|
||||
|
@ -42,17 +42,24 @@
|
||||
format='pdf',
|
||||
version=version,
|
||||
)}}">{{scu.ICON_PDF|safe}}</a>
|
||||
{% if formsemestre.formation.is_apc() %}
|
||||
<a style="margin-left: 20px;" class="stdlink"
|
||||
href="{{url_for(
|
||||
'notes.bulletin_but_html',
|
||||
scodoc_dept=g.scodoc_dept,
|
||||
formsemestre_id=formsemestre.id,
|
||||
etudid=etud.id
|
||||
)}}">version courte spéciale BUT</a>
|
||||
{% endif %}
|
||||
</span>
|
||||
</div>
|
||||
{% if formsemestre.formation.is_apc() %}
|
||||
<div>
|
||||
<a style="margin-left: 32px;" class="stdlink"
|
||||
href="{{url_for(
|
||||
'notes.bulletin_but_html',
|
||||
scodoc_dept=g.scodoc_dept,
|
||||
formsemestre_id=formsemestre.id,
|
||||
etudid=etud.id
|
||||
)}}">version courte spéciale BUT</a>
|
||||
<a style="margin-left: 32px;" class="stdlink"
|
||||
href="{{url_for('notes.validation_rcues',
|
||||
scodoc_dept=g.scodoc_dept, etudid=etud.id,
|
||||
formsemestre_id=formsemestre.id
|
||||
)}}">visualiser les compétences BUT</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</form>
|
||||
</div>
|
||||
{% if not is_apc %}
|
||||
|
@ -39,19 +39,23 @@
|
||||
{%- endmacro %}
|
||||
|
||||
{% block app_content %}
|
||||
<p>
|
||||
<a href="{{url_for(
|
||||
'notes.bulletin_but_pdf', scodoc_dept=g.scodoc_dept, etudid=etud.id,
|
||||
formsemestre_id=formsemestre.id
|
||||
)}}" class="stdlink">version pdf {{scu.ICON_PDF|safe}}</a>
|
||||
<a style="margin-left: 32px;"
|
||||
href="{{url_for(
|
||||
'notes.formsemestre_bulletinetud',
|
||||
scodoc_dept=g.scodoc_dept, etudid=etud.id,
|
||||
formsemestre_id=formsemestre.id
|
||||
)}}" class="stdlink">version complète</a>
|
||||
</p>
|
||||
|
||||
<div class="but_bul_court_links">
|
||||
<a href="{{url_for(
|
||||
'notes.bulletin_but_pdf', scodoc_dept=g.scodoc_dept, etudid=etud.id,
|
||||
formsemestre_id=formsemestre.id
|
||||
)}}" class="stdlink">version pdf {{scu.ICON_PDF|safe}}</a>
|
||||
<a style="margin-left: 32px;"
|
||||
href="{{url_for(
|
||||
'notes.formsemestre_bulletinetud',
|
||||
scodoc_dept=g.scodoc_dept, etudid=etud.id,
|
||||
formsemestre_id=formsemestre.id
|
||||
)}}" class="stdlink">version complète</a>
|
||||
<a style="margin-left: 32px;" class="stdlink"
|
||||
href="{{url_for('notes.validation_rcues',
|
||||
scodoc_dept=g.scodoc_dept, etudid=etud.id,
|
||||
formsemestre_id=formsemestre.id
|
||||
)}}">visualiser les compétences BUT</a>
|
||||
</div>
|
||||
<div class="but_bul_court">
|
||||
<div id="infos_etudiant">
|
||||
<div class="nom">{{etud.nomprenom}}</div>
|
||||
@ -157,7 +161,8 @@
|
||||
Jury tenu le {{
|
||||
datetime.datetime.fromisoformat(bul.semestre.decision_annee.date).strftime("%d/%m/%Y")
|
||||
}},
|
||||
année BUT <b>{{bul.semestre.decision_annee.code}}</b>.
|
||||
année <b>BUT{{bul.semestre.decision_annee.ordre}}</b>
|
||||
<b>{{bul.semestre.decision_annee.code}}</b>.
|
||||
{% endif %}
|
||||
{% set virg = joiner(", ") %}
|
||||
{% for aut in bul.semestre.autorisation_inscription -%}
|
||||
|
Loading…
Reference in New Issue
Block a user