Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
2 changed files with 9 additions and 5 deletions
Showing only changes of commit 77388e2d87 - Show all commits

View File

@ -18,8 +18,12 @@
Bulletin Bulletin
<span class="bull_liensemestre"> <span class="bull_liensemestre">
{{formsemestre.html_link_status() | safe}} {{formsemestre.html_link_status() | safe}}
{% if formsemestre.etuds_inscriptions[etud.id].parcour %} {% if etud.id in formsemestre.etuds_inscriptions %}
<span class="parcours">Parcours {{formsemestre.etuds_inscriptions[etud.id].parcour.code}}</span> {% if formsemestre.etuds_inscriptions[etud.id].parcour %}
<span class="parcours">Parcours {{formsemestre.etuds_inscriptions[etud.id].parcour.code}}</span>
{% endif %}
{% else %}
<span class="parcours">{{scu.EMO_WARNING|safe}} non inscrit !?</span>
{% endif %} {% endif %}
</span> </span>
</div> </div>
@ -67,8 +71,8 @@
)}}">version courte spéciale BUT</a> )}}">version courte spéciale BUT</a>
{% endif %} {% endif %}
<a style="margin-left: 32px;" class="stdlink" <a style="margin-left: 32px;" class="stdlink"
href="{{url_for('notes.validation_rcues', href="{{url_for('notes.validation_rcues',
scodoc_dept=g.scodoc_dept, etudid=etud.id, scodoc_dept=g.scodoc_dept, etudid=etud.id,
formsemestre_id=formsemestre.id formsemestre_id=formsemestre.id
)}}">visualiser les compétences BUT</a> )}}">visualiser les compétences BUT</a>
</div> </div>

View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.6.58" SCOVERSION = "9.6.59"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"