opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

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
Conversation 0 Commits 1272 Files Changed 656 +46 -28
9 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e44a5ee55d - Show all commits

1
app/scodoc/html_sco_header.py
View File

@ -179,6 +179,7 @@ def sco_header(
H = [ H = [
"""<!DOCTYPE html><html lang="fr"> """<!DOCTYPE html><html lang="fr">
<!-- ScoDoc legacy -->
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>%(page_title)s</title> <title>%(page_title)s</title>

4
app/scodoc/html_sidebar.py
View File

@ -141,7 +141,9 @@ def sidebar(etudid: int = None):
params = {} params = {}
H = [ H = [
f"""<div class="sidebar"> f"""
<!-- sidebar py -->
<div class="sidebar">
{ sidebar_common() } { sidebar_common() }
<div class="box-chercheetud">Chercher étudiant:<br> <div class="box-chercheetud">Chercher étudiant:<br>
<form method="get" id="form-chercheetud" <form method="get" id="form-chercheetud"

3
app/scodoc/sco_edit_ue.py
View File

@ -837,8 +837,7 @@ du programme" (menu "Semestre") si vous avez un semestre en cours);
<a href="{url_for('notes.refcomp_show', <a href="{url_for('notes.refcomp_show',
scodoc_dept=g.scodoc_dept, refcomp_id=formation.referentiel_competence.id)}" scodoc_dept=g.scodoc_dept, refcomp_id=formation.referentiel_competence.id)}"
class="stdlink"> class="stdlink">
{formation.referentiel_competence.type_titre} {formation.referentiel_competence.get_title()}
{formation.referentiel_competence.specialite_long}
</a>&nbsp;""" </a>&nbsp;"""
msg_refcomp = "changer" msg_refcomp = "changer"
H.append(f"""<ul><li>{descr_refcomp}""") H.append(f"""<ul><li>{descr_refcomp}""")

4
app/scodoc/sco_formsemestre_status.py
View File

@ -143,8 +143,10 @@ def _build_menu_stats(formsemestre: FormSemestre):
] ]
def formsemestre_status_menubar(formsemestre: FormSemestre) -> str: def formsemestre_status_menubar(formsemestre: FormSemestre | None) -> str:
"""HTML to render menubar""" """HTML to render menubar"""
if formsemestre is None:
return ""
formsemestre_id = formsemestre.id formsemestre_id = formsemestre.id
if formsemestre.etat: if formsemestre.etat:
change_lock_msg = "Verrouiller" change_lock_msg = "Verrouiller"

3
app/scodoc/sco_report.py
View File

@ -1535,6 +1535,9 @@ def graph_cursus(
# semestre de depart en vert # semestre de depart en vert
n = g.get_node("SEM" + str(formsemestre_id))[0] n = g.get_node("SEM" + str(formsemestre_id))[0]
n.set_color("green") n.set_color("green")
n.set_style("filled")
n.set_fillcolor("lightgreen")
n.set_penwidth(2.0)
# demissions en rouge, octagonal # demissions en rouge, octagonal
for nid in dem_nodes.values(): for nid in dem_nodes.values():
n = g.get_node(nid)[0] n = g.get_node(nid)[0]

8
app/templates/bul_head.j2
View File

@ -11,9 +11,9 @@
)}}">{{etud.nomprenom}}</a></h2> )}}">{{etud.nomprenom}}</a></h2>
{% endif %} {% endif %}
<form name="f" method="GET" action="{{request.base_url}}"> <form name="f" method="GET" action="{{request.base_url}}">
<input type="hidden" name="formsemestre_id" value="{{formsemestre.id}}"></input> <input type="hidden" name="formsemestre_id" value="{{formsemestre.id}}">
<input type="hidden" name="etudid" value="{{etud.id}}"></input> <input type="hidden" name="etudid" value="{{etud.id}}">
<input type="hidden" name="fmt" value="{{fmt}}"></input> <input type="hidden" name="fmt" value="{{fmt}}">
<div class="bull_titre_semestre"> <div class="bull_titre_semestre">
Bulletin Bulletin
<span class="bull_liensemestre"> <span class="bull_liensemestre">
@ -36,7 +36,7 @@
formsemestre_id=formsemestre.id, formsemestre_id=formsemestre.id,
etudid=etud.id, etudid=etud.id,
) )
}}&version='+this.value;"" class="noprint"> }}&version='+this.value;" class="noprint">
{% if formsemestre.formation.is_apc() %} {% if formsemestre.formation.is_apc() %}
{% set menu_items = scu.BULLETINS_VERSIONS_BUT.items() %} {% set menu_items = scu.BULLETINS_VERSIONS_BUT.items() %}
{% else %} {% else %}

19
app/templates/formsemestre_header.j2
View File

@ -11,19 +11,25 @@
{% if sco.formsemestre.semestre_id != -1 %}, {{sco.formsemestre.formation.get_cursus().SESSION_NAME}} {% if sco.formsemestre.semestre_id != -1 %}, {{sco.formsemestre.formation.get_cursus().SESSION_NAME}}
{{sco.formsemestre.semestre_id}} {{sco.formsemestre.semestre_id}}
{% endif %}</a> {% endif %}</a>
{% if sco.formsemestre.modalite %} en {{sco.formsemestre.modalite}}{% endif %}</span> {% if sco.formsemestre.modalite %} en {{sco.formsemestre.modalite}}{% endif %}
</span>
<span class="dates"> <span class="dates">
<a title="du {{sco.formsemestre.date_debut.strftime('%d/%m/%Y')}} <a title="du {{sco.formsemestre.date_debut.strftime('%d/%m/%Y')}}
au {{sco.formsemestre.date_fin.strftime('%d/%m/%Y')}} ">{{scu.MONTH_NAMES_ABBREV[ sco.formsemestre.date_debut.month - 1]}} au {{sco.formsemestre.date_fin.strftime('%d/%m/%Y')}} ">{{scu.MONTH_NAMES_ABBREV[ sco.formsemestre.date_debut.month - 1]}}
{{sco.formsemestre.date_debut.year}} - {{scu.MONTH_NAMES_ABBREV[sco.formsemestre.date_fin.month - 1]}} {{sco.formsemestre.date_debut.year}} - {{scu.MONTH_NAMES_ABBREV[sco.formsemestre.date_fin.month - 1]}}
{{sco.formsemestre.date_fin.year}}</a></span> {{sco.formsemestre.date_fin.year}}</a>
</span>
<span class="resp"><a <span class="resp"><a
title="{{sco.formsemestre.responsables_str(abbrev_prenom=False)}}">{{sco.formsemestre.responsables_str()}}</a></span> title="{{sco.formsemestre.responsables_str(abbrev_prenom=False)}}">{{sco.formsemestre.responsables_str()}}</a></span>
<span class="nbinscrits"><a class="discretelink" href="{{url_for('scolar.groups_view', scodoc_dept=g.scodoc_dept, <span class="nbinscrits"><a class="discretelink" href="{{url_for('scolar.groups_view', scodoc_dept=g.scodoc_dept,
formsemestre_id=sco.formsemestre.id)}}">{{sco.formsemestre.inscriptions|length}} inscrits</a></span><span class="lock">{% if formsemestre_id=sco.formsemestre.id)}}">{{sco.formsemestre.inscriptions|length}} inscrits</a></span>
not sco.formsemestre.etat %}<a href="{{url_for('notes.formsemestre_flip_lock', scodoc_dept=g.scodoc_dept, <span class="lock">
{% if not sco.formsemestre.etat %}<a href="{{url_for('notes.formsemestre_flip_lock', scodoc_dept=g.scodoc_dept,
formsemestre_id=sco.formsemestre.id)}}">{{scu.icontag("lock_img", border="0", title="Semestre formsemestre_id=sco.formsemestre.id)}}">{{scu.icontag("lock_img", border="0", title="Semestre
verrouillé")|safe}}</a>{% endif %}</span><span class="eye"> verrouillé")|safe}}</a>
{% endif %}
</span>
<span class="eye">
{% if not scu.is_passerelle_disabled() %} {% if not scu.is_passerelle_disabled() %}
<a href="{{url_for('notes.formsemestre_change_publication_bul', scodoc_dept=g.scodoc_dept, <a href="{{url_for('notes.formsemestre_change_publication_bul', scodoc_dept=g.scodoc_dept,
formsemestre_id=sco.formsemestre.id)}}"> formsemestre_id=sco.formsemestre.id)}}">
@ -32,10 +38,11 @@
{% else %} {% else %}
{{ scu.ICON_PUBLISHED|safe }} {{ scu.ICON_PUBLISHED|safe }}
{% endif %} {% endif %}
</a>
{% endif %} {% endif %}
</span> </span>
</div> </div>
{{ sco.formsemestre_menu_bar|safe }} {{ sco.formsemestre_status_menu_bar()|safe }}
</div> </div>
<!-- end of formsemestre_header --> <!-- end of formsemestre_header -->

6
app/templates/sco_page.j2
View File

@ -1,6 +1,5 @@
{%- extends 'babase.j2' -%} {%- extends 'babase.j2' -%}
{# -*- Base des pages ordinaires, dans départements -*- #} {# -*- Base des pages ordinaires, dans départements -*- #}
<!-- sco_page -->
{% block styles %} {% block styles %}
{{super()}} {{super()}}
@ -22,11 +21,12 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<!-- sco_page -->
{% block scodoc_sidebar %} {% block scodoc_sidebar %}
{% include "sidebar.j2" %} {% include "sidebar.j2" %}
{% endblock %} {% endblock %}
<div id="gtrcontent" class="gtrcontent"> <div id="gtrcontent" class="gtrcontent">
{% include "flashed_messages.j2" %} {% include "flashed_messages.j2" %}
{% if sco.formsemestre %} {% if sco.formsemestre %}
{% block formsemestre_header %} {% block formsemestre_header %}
@ -39,7 +39,7 @@
page vide page vide
{% endblock %} {% endblock %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}

4
app/views/__init__.py
View File

@ -135,6 +135,10 @@ class ScoData:
self.formsemestre.id if self.formsemestre else None self.formsemestre.id if self.formsemestre else None
) )
def formsemestre_status_menu_bar(self) -> str:
"Le HTML de la barre de menu semestre"
return sco_formsemestre_status.formsemestre_status_menubar(self.formsemestre)
from app.views import ( from app.views import (
absences, absences,