Semestre
-
+
+
@@ -97,7 +97,7 @@ class releveBUT extends HTMLElement {
-
Synthèse
+Unités d'enseignement
La moyenne des ressources dans une UE dépend des poids donnés aux évaluations.
@@ -126,7 +126,7 @@ class releveBUT extends HTMLElement {
- 
+ `;
/*${data.semestre.groupes.map(groupe => {
return `
SAÉ
+Situations d'apprentissage et d'évaluation (SAÉ)
Liste
+
diff --git a/app/templates/bul_head.html b/app/templates/bul_head.html
index 5211fcd4f..12df3c4f8 100644
--- a/app/templates/bul_head.html
+++ b/app/templates/bul_head.html
@@ -5,10 +5,12 @@
diff --git a/app/templates/but/bulletin.html b/app/templates/but/bulletin.html
index 02a09e848..c3e8c834e 100644
--- a/app/templates/but/bulletin.html
+++ b/app/templates/but/bulletin.html
@@ -6,8 +6,8 @@
{% endblock %}
{% block app_content %}
-
+{% if not is_apc %}
{{etud.nomprenom}}+{% endif %} |
+{% if not is_apc %}
{{etud.photo_html(title="fiche de " + etud["nom"])|safe}} | +{% endif %}
Totoro
+{% include 'bul_head.html' %}
+
\ No newline at end of file
diff --git a/app/views/__init__.py b/app/views/__init__.py
index 3d8af0777..f3c8e13d4 100644
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -50,27 +50,29 @@ def close_dept_db_connection(arg):
class ScoData:
"""Classe utilisée pour passer des valeurs aux vues (templates)"""
- def __init__(self):
+ def __init__(self, etud=None, formsemestre=None):
# Champs utilisés par toutes les pages ScoDoc (sidebar, en-tête)
self.Permission = Permission
self.scu = scu
self.SCOVERSION = sco_version.SCOVERSION
# -- Informations étudiant courant, si sélectionné:
- etudid = g.get("etudid", None)
- if not etudid:
- if request.method == "GET":
- etudid = request.args.get("etudid", None)
- elif request.method == "POST":
- etudid = request.form.get("etudid", None)
-
- if etudid:
+ if etud is None:
+ etudid = g.get("etudid", None)
+ if etudid is None:
+ if request.method == "GET":
+ etudid = request.args.get("etudid", None)
+ elif request.method == "POST":
+ etudid = request.form.get("etudid", None)
+ if etudid is not None:
+ etud = Identite.query.get_or_404(etudid)
+ self.etud = etud
+ if etud is not None:
# Infos sur l'étudiant courant
- self.etud = Identite.query.get_or_404(etudid)
ins = self.etud.inscription_courante()
if ins:
self.etud_cur_sem = ins.formsemestre
self.nbabs, self.nbabsjust = sco_abs.get_abs_count_in_interval(
- etudid,
+ etud.id,
self.etud_cur_sem.date_debut.isoformat(),
self.etud_cur_sem.date_fin.isoformat(),
)
@@ -80,17 +82,22 @@ class ScoData:
else:
self.etud = None
# --- Informations sur semestre courant, si sélectionné
- formsemestre_id = sco_formsemestre_status.retreive_formsemestre_from_request()
- if formsemestre_id is None:
+ if formsemestre is None:
+ formsemestre_id = (
+ sco_formsemestre_status.retreive_formsemestre_from_request()
+ )
+ if formsemestre_id is not None:
+ formsemestre = FormSemestre.query.get_or_404(formsemestre_id)
+ if formsemestre is None:
self.sem = None
self.sem_menu_bar = None
else:
- self.sem = FormSemestre.query.get_or_404(formsemestre_id)
+ self.sem = formsemestre
self.sem_menu_bar = sco_formsemestre_status.formsemestre_status_menubar(
self.sem.to_dict()
)
# --- Préférences
- self.prefs = sco_preferences.SemPreferences(formsemestre_id)
+ self.prefs = sco_preferences.SemPreferences(formsemestre.id)
from app.views import scodoc, notes, scolar, absences, users, pn_modules, refcomp
diff --git a/app/views/notes.py b/app/views/notes.py
index 6cbf0be43..5ca463b4c 100644
--- a/app/views/notes.py
+++ b/app/views/notes.py
@@ -32,6 +32,7 @@ Emmanuel Viennet, 2021
"""
from operator import itemgetter
+import time
from xml.etree import ElementTree
import flask
@@ -276,7 +277,7 @@ sco_publish(
def formsemestre_bulletinetud(
etudid=None,
formsemestre_id=None,
- format="html",
+ format=None,
version="long",
xml_with_decisions=False,
force_publishing=False,
@@ -284,6 +285,7 @@ def formsemestre_bulletinetud(
code_nip=None,
code_ine=None,
):
+ format = format or "html"
if not formsemestre_id:
flask.abort(404, "argument manquant: formsemestre_id")
if not isinstance(formsemestre_id, int):
@@ -311,12 +313,16 @@ def formsemestre_bulletinetud(
if format == "json":
r = bulletin_but.BulletinBUT(formsemestre)
return jsonify(
- r.bulletin_etud(etud, formsemestre, force_publishing=force_publishing)
+ r.bulletin_etud(
+ etud,
+ formsemestre,
+ force_publishing=force_publishing,
+ version=version,
+ )
)
elif format == "html":
return render_template(
"but/bulletin.html",
- title=f"Bul. {etud.nom} - BUT",
bul_url=url_for(
"notes.formsemestre_bulletinetud",
scodoc_dept=g.scodoc_dept,
@@ -324,8 +330,19 @@ def formsemestre_bulletinetud(
etudid=etudid,
format="json",
force_publishing=1, # pour ScoDoc lui même
+ version=version,
),
- sco=ScoData(),
+ etud=etud,
+ formsemestre=formsemestre,
+ is_apc=formsemestre.formation.is_apc(),
+ menu_autres_operations=sco_bulletins.make_menu_autres_operations(
+ formsemestre, etud, "notes.formsemestre_bulletinetud", version
+ ),
+ sco=ScoData(etud=etud),
+ scu=scu,
+ time=time,
+ title=f"Bul. {etud.nom} - BUT",
+ version=version,
)
if not (etudid or code_nip or code_ine):
+ TATO {{formsemestre.titre}}
+ {%- if formsemestre.semestre_id != -1 -%}
+ , {{
+ formsemestre.formation.get_parcours().SESSION_NAME}}
+ {{formsemestre.semestre_id}}
+ {%- endif -%}
+ {%- if formsemestre.modalite %} en {{formsemestre.modalite}}
+ {%- endif %}{{formsemestre.mois_debut()}} - {{formsemestre.mois_fin()}}{{formsemestre.responsables_str()}}{{formsemestre.etuds_inscriptions|length}} inscrits
+ {%-if formsemestre.etat -%}
+ {{
+ scu.icontag("lock_img", border="0", title="Semestre verrouillé")|safe
+ }}
+ {%- endif -%}
+ {%-
+ if formsemestre.bul_hide_xml -%}}
+ {{scu.icontag("hide_img", border="0", title="Bulletins NON publiés")|safe}}
+ {%- else -%}
+ {{scu.icontag("eye_img", border="0", title="Bulletins publiés")|safe}}
+ {%- endif -%}
+
+
+ {{sem_menu_bar|safe}}
+