From 415860f2332c8360907f5945578938ccd298a2a0 Mon Sep 17 00:00:00 2001
From: Soriba SYLLA <soribasyllakamsar@gmail.com>
Date: Fri, 15 May 2026 17:13:02 +0000
Subject: [PATCH] Filtrage des reservations par salle

---
 .../__pycache__/views.cpython-310.pyc         | Bin 16653 -> 16653 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 7597 -> 7588 bytes
 .../templates/gestion_salle/index.html        |   6 +++---
 .../parts/modalDetailResevation.html          |   2 +-
 gestion_salle/views.py                        |   9 +++++----
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/gestion_projet/__pycache__/views.cpython-310.pyc b/gestion_projet/__pycache__/views.cpython-310.pyc
index 6b014969d40fa10b10979c4a928de38484bb804e..ec80360ab603a845d2183160119dda5d58995aff 100644
GIT binary patch
delta 21
acmeBeV(e{V<jUve<zfJWM6Zop%#Hvzxddnc

delta 21
acmeBeV(e{V<jUve<zfH=3)hWY%#HvyssuU!

diff --git a/gestion_salle/__pycache__/views.cpython-310.pyc b/gestion_salle/__pycache__/views.cpython-310.pyc
index ac650fc52f868ae7ce261c2cc550357b8fbb10a7..9efbbdabc1aedd12f8db19c3bc224f8aa23e91ba 100644
GIT binary patch
delta 1189
zcmbu9O>7fK6oB{5u79$z*J~SlZO0~w1A$QfQaC{QQ$r{cLV`4*0*MH@nJsvd*wJ`G
z5$q~atsboc!v#?!8$m0Cia@?_LmYc7Dyr%uHzXu->4^ipaYYG;TSt1IX5O3kyFb6}
zxxFV^jYdrk*XyrCY}3PNiolc{B1e)dqQ}#iSqGnZq}kij_)2@3Bp|`k{G~`Sho-3`
zGQwtAd0+o*DM$NSa6_YckFZFS&|nLi?{oz(jFz=Gqv)5W{S6&75u#QdCN<Gh*L=$Z
z*5}7CpU(2EKnLhx1Db1Fnr~x#U<D6ooE95|_0u7`j;?PIKkixo+R!rGfMRo?rFpT-
zP%U^dHb^(j63-SzFJ1?_@#lb_5JT;Y#zP&}$<5(g@>%#z-y!Upk1BkQ=!9mf72#eG
zcQrmKU-j&QU*tw}h6IWH$vm`l0<X*f;@t}1Mh)&DO6?j#XjmzsKuH69IIH2@U|gHt
z<?B@U4Nqq}HD(ESXuvlrX7>zu?x#UK6B_ajVTb@m3D%(*LVLIcbpQ>g-{Zw~W`1at
zCwm`nIgELE0nrI8@Nz})F{Mx?@tq256!s%JWMNj0MfUBUP@2;UlmB5#?Y>2vL#YiT
zEMh<y#e`s243cg?ifo47ZhTAKKPX>C2M4<0K8(~c_s*4TVx~I3u>VK7-8z<-#`_}%
z@4D?!zK7)%D`$V?mX*h?Ed0=ZW*r5XmPLCjjL8W*3FFeWcff?aZuj-B@{x~i2d=dL
zvbPcVMuw7iwy0t{#$4I0eAHYgUSicn;qo)ec;;fYI{$0?@8ne&`BeSMQl+vuhnKlq
zbNTs_C|4^_<h9fRSdo9Go~ASwWfs2A>idYY8151`1G1eyk7aCf?uC<B#?jIMmmOym
zax#+Hck)ZswXN`l!d`{<kE;8W5=u9&p!~U`kVkX^?tG~{#}6pQ_X?|L@F0_cKjiP3
z;b1Ws2JW^0$=o4J|05m0^r<|mjwE-#Tf~8^9?J_f)QSjGPXNKcg9Q<=Wj3FNWw||{
t0$+ZWe-0<)NTHbXRODra_Z@V1Q_?MrI;Tj^goH)XHjpez48>UkZvpf_4N?FA

delta 1193
zcmb7COKcNK5S{KB|HkpepEx$Q$8nqxh{8t!q+Lh?t6hEqB*b4r5M$B<^2G5(?M@b<
z8FrEPz+o*S`nZc^BS0X;A+p4Q3mmwE5T`jH#0hcZz=;D?4+|KU3nSH=uC7=0s;m3@
z#NCOA6^W=4e0*2HoLr71F`DK>cu(Rj3)zyXHjsmD+zPiP`nK~Yj-wpwH&YFSB=M(j
z0Mn$Oq}U1;H8cFWJoZPHWZUQ;iR5f-_OvkZw^8fUo^A&rlD`@e*<_$8L!AK88t9P3
zLJi5$Y-Hw~UQm`z-OQ5$8Em4~KwEO6P#>9j8<7|(HnCYCLu8n&Y+@&7Yae3}8EK+o
zYp^ZZy-Ua{+P!9xteVAklnvRj1|qBf^*M1i+?iLFWweqPgVzGCZ=P0aj6Vv#&+ddd
z&~X790NlWgRb$3Ec3Yx{`SZ}v=oU|@Gm47+h}-Ipfulg0K>(jVA1uT$e*>#u;xE+9
z-VKh-WLq{BF)|`MidYk67SkN@IZ93Sd<6b5@q>>^064higMB{>Fv$!yP%8wU$`6De
zjO~Wf^cMlTfUN*7o}Z;cl5Q8UNkAU}pX!;~d{B5N1swhiN5twhKn1Km0-#|91(Avr
zFu!L?r_-|rg}t(x;BV)zBZCF6+}D*{b+THivl(k{e(PU+Oxquy2L7l*y|j%YcQ^lA
z%Y?hq__CHq7dub1eF&bL9$lC8goq$}=ZcHf4t^@SahoTZ1K*8Oqi)c}GOJj%l3BNE
z-<-*f6N8m2)lwI4sq-|t9;0I%CvL12rCg<2G5(hsE1T8=GiXT!OXn?X?q=s%;tCr5
z-hmV4T5X{U<Sw0u{Bm*|dc_|npGL5mYGv9IJoNZgncwSQ1o^e8JH9B$ALK7m<KZm*
zNgOZ+z^AhVd?MX9`m5Lx6uL#gq<}BCDlU}%H<feg{AM?D)?lSG3)O0=R-QBH?;_qc
zVQ}5VV!2u&U-$WhKTMDKGyWi=4qr~{ozRL)_y@G_XZ7K4WvFpx0WPL{9IyDh>{#j|
wbTL|RgQUz1R)H?D=<))e%DqHKc|k8`9I+v2UA=qdkMI-vxO^O^`I6rE0c^7*M*si-

diff --git a/gestion_salle/templates/gestion_salle/index.html b/gestion_salle/templates/gestion_salle/index.html
index b0fa88e..db35f40 100644
--- a/gestion_salle/templates/gestion_salle/index.html
+++ b/gestion_salle/templates/gestion_salle/index.html
@@ -26,9 +26,9 @@
                 <div class="form-group col-5 me-2">
                     <label>Selectionner une salle :</label>
                     <select class = "form-select" id="liste-salle">
-                        <option value='formation'>Salle de formation</option>
-                        <option value='reunion'>Salle de réunion</option>
-                        <option value='lien_zoom'>Lien Zoom</option>
+                        <option value='Salle de formation'>Salle de formation</option>
+                        <option value='Salle de réunion'>Salle de réunion</option>
+                        <option value='Lien Zoom'>Lien Zoom</option>
                     </select>
                 </div>
             </div>
diff --git a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
index 0d09ef3..20bf762 100644
--- a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
+++ b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
@@ -12,7 +12,7 @@
             <div class="modal-body">
                 <form method="POST" data-urlannuler="{% url 'gestion_salle:annuler-reservation' %}" data-urlvalider="{% url 'gestion_salle:valider-reservation' %}" id="formulaire-details">
                      {% 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">
                         <label>Employé :</label>
                         <input class="form-control" id="employe"  readonly>
diff --git a/gestion_salle/views.py b/gestion_salle/views.py
index 84903ae..075aef5 100644
--- a/gestion_salle/views.py
+++ b/gestion_salle/views.py
@@ -71,7 +71,6 @@ def index(request: HttpRequest):
 
             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:
                 fonctions_utilitaire.envoyer_mail(
                     sujet = "Reservation de salle",
@@ -106,8 +105,8 @@ def liste_reservation(request:HttpRequest):
     """Vue d'affichage des creneaux disponibles"""
     reservations = Reservation.objects.filter(statut = "validee")
     liste_reservation = []
+
     for reservation in reservations:
-        print(reservation.statut)
         color = None
         if reservation.statut == "en_attente":
             color = "#ffc107"
@@ -116,6 +115,8 @@ def liste_reservation(request:HttpRequest):
         else:
             color = "#dc3545"
 
+        print(dict(Reservation.TYPE_CHOICES).get(reservation.salle))
+
         liste_reservation.append({ 
             "guid": reservation.pk, 
             "title": dict(Reservation.TYPE_CHOICES).get(reservation.salle),
@@ -226,7 +227,7 @@ def valider_reservation(request: HttpRequest):
             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')
 
 @login_required
@@ -250,4 +251,4 @@ def refuser_reservation(request: HttpRequest):
             destinataires = [reservation.employe.user.email]
         )
 
-        return JsonResponse({"message": "Réservation refusée avec succès."})
+        return JsonResponse({"message": "Réservation refusée avec succès."})
\ No newline at end of file