From 5277b7f35592157136e88b971d2c2d5fc76ebf5d Mon Sep 17 00:00:00 2001 From: Soriba SYLLA Date: Mon, 11 May 2026 13:20:13 +0000 Subject: [PATCH] Bug: Validation de reservation --- SIRH/__pycache__/__init__.cpython-310.pyc | Bin 126 -> 126 bytes SIRH/__pycache__/settings.cpython-310.pyc | Bin 3074 -> 3074 bytes SIRH/__pycache__/urls.cpython-310.pyc | Bin 1519 -> 1519 bytes SIRH/__pycache__/views.cpython-310.pyc | Bin 1249 -> 1249 bytes SIRH/__pycache__/wsgi.cpython-310.pyc | Bin 523 -> 523 bytes .../fonctions_utilitaire.cpython-310.pyc | Bin 2234 -> 2234 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 135 -> 135 bytes .../__pycache__/admin.cpython-310.pyc | Bin 176 -> 176 bytes .../__pycache__/apps.cpython-310.pyc | Bin 427 -> 427 bytes .../__pycache__/forms.cpython-310.pyc | Bin 861 -> 861 bytes .../__pycache__/models.cpython-310.pyc | Bin 1287 -> 1287 bytes .../__pycache__/urls.cpython-310.pyc | Bin 554 -> 554 bytes .../__pycache__/views.cpython-310.pyc | Bin 6053 -> 6053 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 137 -> 137 bytes .../__pycache__/admin.cpython-310.pyc | Bin 628 -> 628 bytes .../__pycache__/forms.cpython-310.pyc | Bin 2742 -> 2742 bytes .../__pycache__/models.cpython-310.pyc | Bin 5607 -> 5607 bytes .../__pycache__/urls.cpython-310.pyc | Bin 1511 -> 1511 bytes .../__pycache__/views.cpython-310.pyc | Bin 14436 -> 14436 bytes .../tags_personnaliser.cpython-310.pyc | Bin 1120 -> 1120 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 136 -> 136 bytes .../__pycache__/admin.cpython-310.pyc | Bin 441 -> 441 bytes .../__pycache__/forms.cpython-310.pyc | Bin 4554 -> 4554 bytes .../__pycache__/models.cpython-310.pyc | Bin 7657 -> 7657 bytes .../__pycache__/urls.cpython-310.pyc | Bin 2349 -> 2349 bytes .../__pycache__/views.cpython-310.pyc | Bin 16696 -> 16696 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 135 -> 135 bytes .../__pycache__/admin.cpython-310.pyc | Bin 176 -> 176 bytes .../__pycache__/apps.cpython-310.pyc | Bin 370 -> 370 bytes .../__pycache__/forms.cpython-310.pyc | Bin 1556 -> 1556 bytes .../__pycache__/models.cpython-310.pyc | Bin 1502 -> 1502 bytes .../__pycache__/urls.cpython-310.pyc | Bin 929 -> 929 bytes .../__pycache__/views.cpython-310.pyc | Bin 7435 -> 7468 bytes .../static/gestion_salle/js/index.js | 7 ------- gestion_salle/views.py | 4 +++- 35 files changed, 3 insertions(+), 8 deletions(-) diff --git a/SIRH/__pycache__/__init__.cpython-310.pyc b/SIRH/__pycache__/__init__.cpython-310.pyc index 78d96969ae083a6a76617b63f58c8b369a74fa11..92d486cc0f049ea40a94cbcb8e03ab405436c939 100644 GIT binary patch delta 16 Vcmb=ch)A{RAQa diff --git a/SIRH/__pycache__/settings.cpython-310.pyc b/SIRH/__pycache__/settings.cpython-310.pyc index 1a699968bcfaf993e9f65e62bfd7044ffa810249..3f3bbb0a7221aeb8669254ba37b24a0ad9a238e3 100644 GIT binary patch delta 19 ZcmZpYXp-Q{=jG*M0D=wsHgf&o1^_CV1pWX3 delta 19 ZcmZpYXp-Q{=jG*M00P}L8@YaP0{|y21Ze;O diff --git a/SIRH/__pycache__/urls.cpython-310.pyc b/SIRH/__pycache__/urls.cpython-310.pyc index c54e4be3abf9203b74ad2a5df58700aa9f58008e..7058e388eec67f8ee10a7de85632d7028eeb512e 100644 GIT binary patch delta 21 bcmaFQ{hpgApO=@50SN3aGiGh%dCUp`KSl+$ delta 21 bcmaFQ{hpgApO=@50SL~m{*$?p=P@e)NQ(y- diff --git a/SIRH/__pycache__/views.cpython-310.pyc b/SIRH/__pycache__/views.cpython-310.pyc index 612ae0644945a1a8ee9023dcd63e6d0de37ead80..6611fc59ffb4285b004b13b57a15f66ef2a1ff3d 100644 GIT binary patch delta 19 ZcmaFJ`H+(1N@|=jG*M0D{_m8@U*n0459rwEzGB delta 19 ZcmeBX>1N@|=jG*M0D^O?H*zsD0RShH1M>g? diff --git a/fonction_utilitaire/__pycache__/fonctions_utilitaire.cpython-310.pyc b/fonction_utilitaire/__pycache__/fonctions_utilitaire.cpython-310.pyc index 73a176d21a99278dd0dcb06638d21243f161a5ac..9c2adc8297f452a4dfa9f3184f11de6500098e43 100644 GIT binary patch delta 19 ZcmdlbxJ!^LpO=@50SG?s+sL(n0{}991y%q6 delta 19 ZcmdlbxJ!^LpO=@50SI!|Y~}2H1=jG*M0D{_m6S?XEA<+Z} delta 18 YcmeBV>}2H1=jG*M0D^O?Cvw#T03#X%MF0Q* diff --git a/gestion_employe/__pycache__/admin.cpython-310.pyc b/gestion_employe/__pycache__/admin.cpython-310.pyc index 947a89b78409155f9947d913e052bded1aecf861..b3b000c18fac3c453df9ed353d00dfc584c32426 100644 GIT binary patch delta 19 Zcmeyu@`Z&fpO=@50SIdMZRE;g0su9l1n>X= delta 19 Zcmeyu@`Z&fpO=@50SL~m-pG~31OPWF1ug&p diff --git a/gestion_employe/__pycache__/forms.cpython-310.pyc b/gestion_employe/__pycache__/forms.cpython-310.pyc index 317d145c902d0a47ff76165e70c34d0065d4a56a..a88d33a9d4cebc0bf9a758fa450c49f00b76fd77 100644 GIT binary patch delta 19 Zcmdlcx=oZTpO=@50SIdMZRA?R1pqI&1mFMw delta 19 Zcmdlcx=oZTpO=@50SL~m-pI9v3ji@c1s(tZ diff --git a/gestion_employe/__pycache__/models.cpython-310.pyc b/gestion_employe/__pycache__/models.cpython-310.pyc index 5fe7a42ba34a35610835eae7386a567aa709bc7d..afc99ae5d3e0468452c0e552243b1101a3b78650 100644 GIT binary patch delta 19 ZcmaE^{al+XpO=@50SHv~Z{)fw3II3c1yTS2 delta 19 ZcmaE^{al+XpO=@50SGRw*~oQQ6aYJ!1?>O; diff --git a/gestion_employe/__pycache__/urls.cpython-310.pyc b/gestion_employe/__pycache__/urls.cpython-310.pyc index cafc2f8acc86f86b6c61f34388c9b35fef14a7ed..93ed628222ab9eb45626344d179ca0b930fdfc56 100644 GIT binary patch delta 19 ZcmaFP{hXUCpO=@50SK)2Z{)hm3IH@11sDJT delta 19 ZcmaFP{hXUCpO=@50SI2L*~oR56#zHc1+@SG diff --git a/gestion_employe/__pycache__/views.cpython-310.pyc b/gestion_employe/__pycache__/views.cpython-310.pyc index 481b9bbaada86094fb4147dbc6363deeb6d728f8..583bcce751d4857268ea5ab0d9e14d2cb689ac89 100644 GIT binary patch delta 19 ZcmaD-@T7n%pO=@50SManZ{&)y002S}1=#=q delta 19 ZcmaD-@T7n%pO=@50SJ26Zsdxx002ST1|o@|=jG*M0D{_m6S?XDA+7`j delta 18 YcmeBR>|o@|=jG*M0D^O?Cvw#R03!DULI3~& diff --git a/gestion_projet/__pycache__/admin.cpython-310.pyc b/gestion_projet/__pycache__/admin.cpython-310.pyc index ec3bca329eb1fccc3d244778417e61e3cf23d57c..21dd0522e1c49e71433e49752baf8f6796002c25 100644 GIT binary patch delta 19 ZcmdnVypx$LpO=@50SIdMZRA?d2mmd;1iSzM delta 19 ZcmdnVypx$LpO=@50SL~m-pI9{5dbel1o{8~ diff --git a/gestion_projet/__pycache__/forms.cpython-310.pyc b/gestion_projet/__pycache__/forms.cpython-310.pyc index d9a0c6b12b0eeb45fef7bdefcb1443874461688d..22bbb9bd08e10c0acf9408cc406226a294846035 100644 GIT binary patch delta 19 ZcmX@5d`g)spO=@50SIdMZR9#22mmyb1wQ}) delta 19 ZcmX@5d`g)spO=@50SL~m-pF-85CAqB1$_Vj diff --git a/gestion_projet/__pycache__/models.cpython-310.pyc b/gestion_projet/__pycache__/models.cpython-310.pyc index 884b5ccc9c8759419ad356c4aa5b0dd962063cdb..19a467cc0d5310c4f51a889243363cd9efc3f371 100644 GIT binary patch delta 19 ZcmaE9{nDB%pO=@50SIdMZRENy3jjQ61=s)p delta 19 ZcmaE9{nDB%pO=@50SL~m-pF-d763i)1{MGS diff --git a/gestion_projet/__pycache__/urls.cpython-310.pyc b/gestion_projet/__pycache__/urls.cpython-310.pyc index 8383432d777afcd6537c620055f741c6d6463e8f..8e7cb093773371eb53b5433b8e3b5183d11a80ab 100644 GIT binary patch delta 20 acmZ20v{r~apO=@50SMeS|J}%~#0da1kp%hx delta 20 acmZ20v{r~apO=@50SFv7{MpE@#0da1R|N3@ diff --git a/gestion_projet/__pycache__/views.cpython-310.pyc b/gestion_projet/__pycache__/views.cpython-310.pyc index 5570f3fc3364e6a5d518c5e4ad4d9f7fa11a5697..ad531d93f38e587e375db4b2716845762c20a9f7 100644 GIT binary patch delta 23 dcmdnd#JHo0ktd&*mx}=i>@G8AZRF8$1OQ6?1-t+N delta 23 dcmdnd#JHo0ktd&*mx}=i95?*Q+{mNj2mnw029^K- diff --git a/gestion_salle/__pycache__/__init__.cpython-310.pyc b/gestion_salle/__pycache__/__init__.cpython-310.pyc index 85587a64b0e23703bb7af09a4db1ac2d2d1f1780..13c3ba84d63a8ade19232439883684daabf9254d 100644 GIT binary patch delta 18 XcmZo?Y-i-k=jG*M0D{_m6S-;uA&Ue7 delta 18 YcmZo?Y-i-k=jG*M0D^O?Cvw#S03y@`KL7v# diff --git a/gestion_salle/__pycache__/admin.cpython-310.pyc b/gestion_salle/__pycache__/admin.cpython-310.pyc index 082cec0f01034ad670e67c2c11d88169c8681278..4e1b01c12740533a9b523da869540435fb52eacb 100644 GIT binary patch delta 18 YcmdnMxPg%?pO=@50SIdMP2^ez04F8{d;kCd delta 18 YcmdnMxPg%?pO=@50SL~mp2)Qf04Q$+x&QzG diff --git a/gestion_salle/__pycache__/apps.cpython-310.pyc b/gestion_salle/__pycache__/apps.cpython-310.pyc index 3e0b9e8d3e1d67ef83f80bacaa6eb1c80610c34a..8c518c83764c04a530cc77b3759a3e320b7f7e1b 100644 GIT binary patch delta 19 Zcmeyw^ofZppO=@50SIdMZRE;e1OPP=1myq# delta 19 Zcmeyw^ofZppO=@50SL~m-pG}~2mm&i1tS0e diff --git a/gestion_salle/__pycache__/forms.cpython-310.pyc b/gestion_salle/__pycache__/forms.cpython-310.pyc index 15fd593618a79a73f4598d827d244295c7b8314f..fdcd7e108a7602e75c576aec38f55e2d6193dc93 100644 GIT binary patch delta 19 ZcmbQjGlhpMpO=@50SIdMZRFx&0{|#?1LObz delta 19 ZcmbQjGlhpMpO=@50SL~m-pIwp1^_Aj1R?+c diff --git a/gestion_salle/__pycache__/models.cpython-310.pyc b/gestion_salle/__pycache__/models.cpython-310.pyc index 563752a46bd9524056e06222831eaf0992e7fb54..f8270c37e061b44702639e720ca6fc8b45dd77ad 100644 GIT binary patch delta 20 acmcb|eUFB&*UNjRYv~JGX#_w*)l=m>5~r% znlt8X{wZk0C;`%Si={ZREValUq?ZMz*IC$rana@yVMe&FYLPa^w8>1OI*fZZ>x)Li z#5Ye6yT{0QW^=wo09@#($BEH1(b E0OPq+NB{r; delta 325 zcmZ2u)osO_&&$ij00fR3{$zG+FXhW-G-u4-EG1;bC;`%Si={ZREValUq?ZMzH$~Whalz)P z!i;cTb41!0Qzt8n>M-uw93UDE6W_d1>>eZIsm&840^mZ=Bo{C;KAJp1LU!{KX?{k= Yl*wCU(gk^#L { const data = rowData.getData(); - console.log(data); - if(data.besoin_zoom === false){ $("lien_zoom_container").className = 'd-none'; } - // if(data.statut !== "refusee"){ - // $("motif_refus_container").className = 'd-none'; - // } - $("id_reservation_detail").value = data.id; $("id_reservation_refus").value = data.id; $("id_reservation_zoom").value = data.id; @@ -189,7 +183,6 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => { $("besoin_zoom").checked=data.besoin_zoom; $("besoin_ordinateur").checked=data.besoin_ordi; $("lien_zoom").value=data.lien_zoom; - // $("motif_refus").value=data.motif_refus; const modal = new bootstrap.Modal($("modalDetailReservation")); bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide(); diff --git a/gestion_salle/views.py b/gestion_salle/views.py index 11503d3..91ecb67 100644 --- a/gestion_salle/views.py +++ b/gestion_salle/views.py @@ -130,7 +130,8 @@ def liste_reservation_attente(request): { **model_to_dict(reservation), "employe": f"{reservation.employe.user.first_name} {reservation.employe.user.last_name}", - "salle": dict(Reservation.TYPE_CHOICES).get(reservation.salle) + "salle": dict(Reservation.TYPE_CHOICES).get(reservation.salle), + 'statut': dict(Reservation.STATUT).get(reservation.statut), } for reservation in reservations ] @@ -155,6 +156,7 @@ def detail_reservation(request:HttpRequest, reservation_id:int): 'besoin_ordinateur': reservation.besoin_ordi, 'lien_zoom': reservation.lien_zoom or '', } + return JsonResponse(reservation_json, safe=True) @login_required