Filtrage des reservations par salle
All checks were successful
Organisation/sirh/pipeline/head This commit looks good

This commit is contained in:
2026-05-15 17:13:02 +00:00
parent 8503689aa4
commit 415860f233
5 changed files with 9 additions and 8 deletions

View File

@@ -26,9 +26,9 @@
<div class="form-group col-5 me-2"> <div class="form-group col-5 me-2">
<label>Selectionner une salle :</label> <label>Selectionner une salle :</label>
<select class = "form-select" id="liste-salle"> <select class = "form-select" id="liste-salle">
<option value='formation'>Salle de formation</option> <option value='Salle de formation'>Salle de formation</option>
<option value='reunion'>Salle de réunion</option> <option value='Salle de réunion'>Salle de réunion</option>
<option value='lien_zoom'>Lien Zoom</option> <option value='Lien Zoom'>Lien Zoom</option>
</select> </select>
</div> </div>
</div> </div>

View File

@@ -12,7 +12,7 @@
<div class="modal-body"> <div class="modal-body">
<form method="POST" data-urlannuler="{% url 'gestion_salle:annuler-reservation' %}" data-urlvalider="{% url 'gestion_salle:valider-reservation' %}" id="formulaire-details"> <form method="POST" data-urlannuler="{% url 'gestion_salle:annuler-reservation' %}" data-urlvalider="{% url 'gestion_salle:valider-reservation' %}" id="formulaire-details">
{% csrf_token %} {% csrf_token %}
<input type='' class="form-control" id="id_reservation_detail" name='id_reservation'> <input type='hidden' class="form-control" id="id_reservation_detail" name='id_reservation'>
<div class="form-group mb-2"> <div class="form-group mb-2">
<label>Employé :</label> <label>Employé :</label>
<input class="form-control" id="employe" readonly> <input class="form-control" id="employe" readonly>

View File

@@ -71,7 +71,6 @@ def index(request: HttpRequest):
messages.success(request, "Réservation(s) créée(s) avec succès.") messages.success(request, "Réservation(s) créée(s) avec succès.")
print(fonctions_utilitaire.EMAIL_ASSISTANTE_DE_DIRECTION)
if fonctions_utilitaire.EMAIL_ASSISTANTE_DE_DIRECTION: if fonctions_utilitaire.EMAIL_ASSISTANTE_DE_DIRECTION:
fonctions_utilitaire.envoyer_mail( fonctions_utilitaire.envoyer_mail(
sujet = "Reservation de salle", sujet = "Reservation de salle",
@@ -106,8 +105,8 @@ def liste_reservation(request:HttpRequest):
"""Vue d'affichage des creneaux disponibles""" """Vue d'affichage des creneaux disponibles"""
reservations = Reservation.objects.filter(statut = "validee") reservations = Reservation.objects.filter(statut = "validee")
liste_reservation = [] liste_reservation = []
for reservation in reservations: for reservation in reservations:
print(reservation.statut)
color = None color = None
if reservation.statut == "en_attente": if reservation.statut == "en_attente":
color = "#ffc107" color = "#ffc107"
@@ -116,6 +115,8 @@ def liste_reservation(request:HttpRequest):
else: else:
color = "#dc3545" color = "#dc3545"
print(dict(Reservation.TYPE_CHOICES).get(reservation.salle))
liste_reservation.append({ liste_reservation.append({
"guid": reservation.pk, "guid": reservation.pk,
"title": dict(Reservation.TYPE_CHOICES).get(reservation.salle), "title": dict(Reservation.TYPE_CHOICES).get(reservation.salle),
@@ -226,7 +227,7 @@ def valider_reservation(request: HttpRequest):
destinataires = [reservation.employe.user.email] destinataires = [reservation.employe.user.email]
) )
messages.success(request, f"Réservation de {reservation.employe.get_full_name()} validée avec succès.") messages.success(request, f"La réservation de {request.user.first_name} {request.user.last_name} validée avec succès.")
return redirect('gestion_salle:reservation-salle') return redirect('gestion_salle:reservation-salle')
@login_required @login_required