From d4f4b7d954cc1fd34905d99c082034d09958e723 Mon Sep 17 00:00:00 2001 From: Soriba SYLLA Date: Mon, 11 May 2026 15:27:50 +0000 Subject: [PATCH] Bug: Validation des conges --- .../__pycache__/views.cpython-310.pyc | Bin 6053 -> 6053 bytes .../__pycache__/urls.cpython-310.pyc | Bin 2349 -> 2349 bytes .../__pycache__/views.cpython-310.pyc | Bin 16696 -> 16696 bytes .../__pycache__/models.cpython-310.pyc | Bin 1502 -> 1502 bytes .../__pycache__/views.cpython-310.pyc | Bin 7468 -> 7510 bytes .../static/gestion_salle/js/index.js | 10 +++++----- .../parts/modalDetailResevation.html | 7 ++++--- gestion_salle/views.py | 7 ++++++- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gestion_conge/__pycache__/views.cpython-310.pyc b/gestion_conge/__pycache__/views.cpython-310.pyc index 32be9701dbce7b1f8449e61b74e72120b9eac314..176c828bf3e137c9514a38551fbde0034a1fce86 100644 GIT binary patch delta 21 bcmZ3gzf_+mpO=@50SHRoFlKG!nJEqcI_m|1 delta 21 bcmZ3gzf_+mpO=@50SMIg|H<6QGgBM@Jsk!A diff --git a/gestion_projet/__pycache__/urls.cpython-310.pyc b/gestion_projet/__pycache__/urls.cpython-310.pyc index 8e7cb093773371eb53b5433b8e3b5183d11a80ab..1a95b18849e0d9156831ce8cbb9a89fef033ffdf 100644 GIT binary patch delta 21 bcmZ20v{r~GpO=@50SHRoFlKG!QRD;wHs1u$ delta 21 bcmZ20v{r~GpO=@50SMeS|IOUUqsR#WIl~2H diff --git a/gestion_projet/__pycache__/views.cpython-310.pyc b/gestion_projet/__pycache__/views.cpython-310.pyc index ad531d93f38e587e375db4b2716845762c20a9f7..a986bd00b17164d29c519269eaf160e4c5c43dde 100644 GIT binary patch delta 21 bcmdnd#JHo0kt?5@IKQ(sKj=Kz9XC diff --git a/gestion_salle/__pycache__/models.cpython-310.pyc b/gestion_salle/__pycache__/models.cpython-310.pyc index cf5d983c96a919916266af7a963b9b61280eeefb..ce668cca77f57871caf6fe9d212773d9f440c921 100644 GIT binary patch delta 19 Zcmcb|eUF6#zE21*!l5 diff --git a/gestion_salle/__pycache__/views.cpython-310.pyc b/gestion_salle/__pycache__/views.cpython-310.pyc index f45a192c1e0ced52ef606e656f59912f953dc85a..cf85ac6737d199a9a970f02b2e9a4014857bc50a 100644 GIT binary patch delta 1233 zcmb7@&upPe`R z-pqIAy}dK~`>0xtL=;K<4y=Nm-?E~1GdPAxwqIX$Lat;hOR&IPw%py6_-gAEi$U6n z+kHy_5?B_GjpR~RstH#mEA28nyv!`Q3CnMM88;~2^nV+n-T2g( zPYk+Id(ax5W3J|W;PxzmwfS1tLd@CNn)9#tU=wD7*8}aY8ZT8G{5kkJ#zVX1w!d7e zJ2(+K50m&uXeZplm@>l@h9{K)@Z%L_2oAM=Qa%HDpD2!xqZ;1d{{@*x36pD>B5PW} z#zuH6OyiC4tR52c2{G!&1ZE{yIy!>=k&Q=Ou)$__mm@m?JGcbPA>mP);LW>V&%;fy z;F|v?e8cA1gp^}^Kt##;d0IT$O7TRkTs>3Fmn_~Z96UoWBRqtUqoy`O9#64K);Qjc zWXC+&>lL?^F>1g}^+fICb7EyZE+9)Rz+T9}{xew+H1U^TVo=>74s=Y-CJPjiD($Gg zoxre~FwRmKx(X^2Ap-LAu)=3sH`SdW_Wu>#W_YqJ+E0>sjPNODwaiq7%z!|yi$}>m zPVi)VHEXA-&uDFQ5%L@>qjjM@*Kr0;om(UK?Res zTW}bEja~SV^0xi;LZis{2vf9peRjGf#dXPWQIErScv;_p^M-+c>OUB-VpD>7f_Eky zZ})z=$Dug|{@&LSxKqDgs8mjti~QXJe!+uA7Ea@RGt;_gq}PgAiI2kJ)}y!qnwNlD z&i4{N!5&k8)#h=Uds1Gvd6&5@cZ!^oYoMFk)*FR#$y%TJH@swKdYB&=90UdAf0J?$ z_(JQxIk=|cL1M(HQ>YDuGlT)cS2&dX=Y53jP3g(6X(ydO@05s@lnD<>58g;=u!#3k z&vqZ8mEJ|16;|6PK5SkiUxRR(us~QOysg)>rtm>}d*2b(r$9_)aSd2PjHno9FZ>T} C_a6BG delta 1190 zcmbV~%TE(g6o=>BwqrZA!!Tv~v^+#Xg6P79geX2^qArwxL=z2GI*^XFmD>RoM~y)j zCT`4GiitJBXmlaYR^vZ_F(%>y7cPA4bb)Ss1@9RRR+cuIujih79>06febxP-TP;N* ziX?s)UV-(pV@9oEa0pXuZ*;*9Ig+JJ!g=PfTQwDlFSw_f4!RZNpKQa5=VH0Iov<}4 ziPOFgNZ|`#G?~h!D{w=~Wt^a3!_A1D7O}BOz^}f+WTR7St;)5XV2);|ow`ZLt(^*- z*XwkSBgJgPsorXjQ1m{8c&u=&Yd_H zY3}i~{VQu;*-XbADxEylb4f&&sfH{unSGamEhd--8puE7#feU=s7c(f#^5LptIftS zs!NBeJ}6G94aNoGEYm<$CThs?w{VD??sK&ZL~2l5Z+NgzGue&gKh)+$@`XJZtAm#cTLPYlEWuUTX$9Pnjba);B=`cjppD@~y&b_gDAv_6m8kSbZjP)@7~Im~HYw+8mrHl}_Hqr_qgIn)=-HE$dU=0kcK|9^-`3j0;i2eQ2y%lK(o^4Fhg0Za|k; zi>{S#BWx#Vgl@uS!tZxTmZ#y*#SSIbYh&cBxnGMgTT+> zl#y`*$-t5bE!AO+Qh`RoX+jg>3?4|mz4*Vns6vzwCwLF|ELk*uzFe>H%}2R8JSK)+ zJ@R)FK1#0x2j8T>Y&l4o-jg&b-j^@hyhuKqFito}a0q`d!?XHP%WQ}rW^o1d2#aaJ MlH#isU%VcE0jWm`!~g&Q diff --git a/gestion_salle/static/gestion_salle/js/index.js b/gestion_salle/static/gestion_salle/js/index.js index 092b27c..91591b1 100644 --- a/gestion_salle/static/gestion_salle/js/index.js +++ b/gestion_salle/static/gestion_salle/js/index.js @@ -33,11 +33,6 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), { $("lien_zoom_container").className = "d-none"; } - // if(data.statut !== "annulee"){ - // $("motif_refus_container").className = "d-none"; - // }else{ - // $("motif_refus").value=data.motif_refus; - // } }) } }); @@ -168,6 +163,7 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => { $("lien_zoom_container").className = 'd-none'; } + const id_user = $("current-user-id").dataset.userid; $("id_reservation_detail").value = data.id; $("id_reservation_refus").value = data.id; $("id_reservation_zoom").value = data.id; @@ -184,6 +180,10 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => { $("besoin_ordinateur").checked=data.besoin_ordi; $("lien_zoom").value=data.lien_zoom; + if (id_user != data.employe_id){ + $("bouton-annuler").className = "d-none"; + } + const modal = new bootstrap.Modal($("modalDetailReservation")); bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide(); modal.show(); diff --git a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html index 86e1006..20bf762 100644 --- a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html +++ b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html @@ -1,4 +1,5 @@ +{% load tags_personnaliser %}