diff --git a/app/models/groups.py b/app/models/groups.py index f6452cf7c..9cf5f2364 100644 --- a/app/models/groups.py +++ b/app/models/groups.py @@ -74,6 +74,10 @@ class GroupDescr(db.Model): f"""<{self.__class__.__name__} {self.id} "{self.group_name or '(tous)'}">""" ) + def get_nom_with_part(self) -> str: + "Nom avec partition: 'TD A'" + return f"{self.partition.partition_name or ''} {self.group_name or '-'}" + group_membership = db.Table( "group_membership", diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py index 53efbfc95..c700c1b80 100644 --- a/app/scodoc/html_sidebar.py +++ b/app/scodoc/html_sidebar.py @@ -86,9 +86,9 @@ def sidebar(): f"""
{ sidebar_common() }
Chercher étudiant:
-
-
+ +
""" diff --git a/app/scodoc/sco_abs.py b/app/scodoc/sco_abs.py index 77cc6048d..5662df3a9 100644 --- a/app/scodoc/sco_abs.py +++ b/app/scodoc/sco_abs.py @@ -31,9 +31,7 @@ import calendar import datetime import html -import string import time -import types from app.scodoc import notesdb as ndb from app import log @@ -42,9 +40,9 @@ from app.scodoc.sco_exceptions import ScoValueError, ScoInvalidDateError from app.scodoc import sco_abs_notification from app.scodoc import sco_cache from app.scodoc import sco_etud -from app.scodoc import sco_formsemestre from app.scodoc import sco_formsemestre_inscriptions from app.scodoc import sco_preferences +import app.scodoc.sco_utils as scu # --- Misc tools.... ------------------ @@ -247,9 +245,9 @@ def day_names(): If work_saturday property is set, include saturday """ if is_work_saturday(): - return ["Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"] + return scu.DAY_NAMES[:-1] else: - return ["Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi"] + return scu.DAY_NAMES[:-2] def next_iso_day(date): diff --git a/app/scodoc/sco_find_etud.py b/app/scodoc/sco_find_etud.py index 9c5630480..91c53cca6 100644 --- a/app/scodoc/sco_find_etud.py +++ b/app/scodoc/sco_find_etud.py @@ -53,12 +53,10 @@ def form_search_etud( ): "form recherche par nom" H = [] - if title: - H.append("

%s

" % title) H.append( f"""
{title} - +
(entrer une partie du nom) """ diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py index 50b11f6fa..0a36697b7 100644 --- a/app/scodoc/sco_formsemestre_status.py +++ b/app/scodoc/sco_formsemestre_status.py @@ -761,22 +761,29 @@ def _make_listes_sem(sem, with_absences=True): if with_absences: first_monday = sco_abs.ddmmyyyy(sem["date_debut"]).prev_monday() form_abs_tmpl = f""" - absences + + + - + - état + + saisie par semaine
""" else: @@ -788,7 +795,7 @@ def _make_listes_sem(sem, with_absences=True): # Genere liste pour chaque partition (categorie de groupes) for partition in sco_groups.get_partitions_list(sem["formsemestre_id"]): if not partition["partition_name"]: - H.append("

Tous les étudiants

" % partition) + H.append("

Tous les étudiants

") else: H.append("

Groupes de %(partition_name)s

" % partition) groups = sco_groups.get_partition_groups(partition) @@ -818,20 +825,6 @@ def _make_listes_sem(sem, with_absences=True): ) }">{group["label"]} - (tableur) - Photos ({n_members} étudiants) """ diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py index 8cba3a59c..543d97074 100644 --- a/app/scodoc/sco_utils.py +++ b/app/scodoc/sco_utils.py @@ -178,6 +178,7 @@ MONTH_NAMES = ( "novembre", "décembre", ) +DAY_NAMES = ("lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi", "dimanche") def fmt_note(val, note_max=None, keep_numeric=False): diff --git a/app/static/js/scodoc.js b/app/static/js/scodoc.js index 25f4b26dd..eae42d0a4 100644 --- a/app/static/js/scodoc.js +++ b/app/static/js/scodoc.js @@ -3,14 +3,14 @@ $(function () { // Autocomplete recherche etudiants par nom - $("#in-expnom").autocomplete( + $(".in-expnom").autocomplete( { delay: 300, // wait 300ms before suggestions minLength: 2, // min nb of chars before suggest position: { collision: 'flip' }, // automatic menu position up/down - source: "search_etud_by_name", + source: SCO_URL + "/search_etud_by_name", select: function (event, ui) { - $("#in-expnom").val(ui.item.value); + $(".in-expnom").val(ui.item.value); $("#form-chercheetud").submit(); } }); diff --git a/app/templates/sidebar.html b/app/templates/sidebar.html index 5ed8ee883..e0282c4f2 100644 --- a/app/templates/sidebar.html +++ b/app/templates/sidebar.html @@ -15,7 +15,7 @@

Dépt. {{ sco.prefs["DeptName"] }}

Accueil
{% if sco.prefs["DeptIntranetURL"] %} - + {{ sco.prefs["DeptIntranetTitle"] }} {% endif %}
@@ -41,7 +41,7 @@
- +
@@ -49,7 +49,7 @@
{% if sco.etud %}

+ 'scolar.ficheEtud', scodoc_dept=g.scodoc_dept, etudid=sco.etud.id )}}" class="sidebar"> {{sco.etud.nomprenom}}

Absences diff --git a/app/views/absences.py b/app/views/absences.py index ae95d7eba..f664333af 100644 --- a/app/views/absences.py +++ b/app/views/absences.py @@ -69,7 +69,7 @@ from app.decorators import ( permission_required, permission_required_compat_scodoc7, ) -from app.models import FormSemestre +from app.models import FormSemestre, GroupDescr from app.models.absences import BilletAbsence from app.views import absences_bp as bp @@ -119,63 +119,71 @@ def sco_publish(route, function, permission, methods=["GET"]): @scodoc7func def index_html(): """Gestionnaire absences, page principale""" - # crude portage from 1999 DTML - sems = sco_formsemestre.do_formsemestre_list() - authuser = current_user H = [ html_sco_header.sco_header( - page_title="Gestion des absences", + page_title="Saisie des absences", cssstyles=["css/calabs.css"], javascripts=["js/calabs.js"], ), - """

Gestion des Absences

""", + """

Traitement des absences

+

+ Pour saisir des absences ou consulter les états, il est recommandé par passer par + le semestre concerné (saisie par jours nommés ou par semaines). +

+ """, ] - if not sems: + H.append( + """

Pour signaler, annuler ou justifier une absence pour un seul étudiant, + choisissez d'abord concerné:

""" + ) + H.append(sco_find_etud.form_search_etud()) + if current_user.has_permission( + Permission.ScoAbsChange + ) and sco_preferences.get_preference("handle_billets_abs"): H.append( - """

Aucun semestre défini (ou aucun groupe d'étudiant)

""" - ) - else: - H.append( - """