From 0eb745d5f3327f58ae028756f1dbf8616c01a0e6 Mon Sep 17 00:00:00 2001 From: Soriba SYLLA Date: Mon, 7 Sep 2026 11:33:21 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Correction=20de=20l'affichage=20des=20da?= =?UTF-8?q?tes=20dans=20les=20d=C3=A9tails=20de=20la=20r=C3=A9servation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 2 +- .../SIRH/parts/menu_application.html | 3 +++ .../__pycache__/views.cpython-310.pyc | Bin 7505 -> 7554 bytes .../static/gestion_salle/js/index.js | 9 +++++---- .../templates/gestion_salle/index.html | 4 ++-- .../parts/modalCreationReservation.html | 2 +- .../parts/modalDetailResevation.html | 13 +++++-------- .../parts/modalListeValidation.html | 2 +- gestion_salle/views.py | 3 ++- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6908fb3..f721473 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { steps { - sh 'echo "Debut du pipeline"' + sh 'echo "Debut du pipeline test"' cleanWs() checkout scm } diff --git a/SIRH/templates/SIRH/parts/menu_application.html b/SIRH/templates/SIRH/parts/menu_application.html index 0ea4fed..1f97c24 100644 --- a/SIRH/templates/SIRH/parts/menu_application.html +++ b/SIRH/templates/SIRH/parts/menu_application.html @@ -15,6 +15,9 @@
  • SGL
    • +
  • + Laboratoire +
    • diff --git a/gestion_salle/__pycache__/views.cpython-310.pyc b/gestion_salle/__pycache__/views.cpython-310.pyc index 638c83b41baf7a6aa3a858e9acc8bbb79860f734..277fbe03a0781d17a959c30206653117a82e4fbb 100644 GIT binary patch delta 745 zcmYL{OK1~e5XUoLb~oEL`{?e5ZW^%>4PpC`q6cY3gsLFEKzdS;Qr)d4+SYv8wzj4g z>QxUq;;Be;5G{C-c^Sf@krfP|zyqOl);O=Er|#zj-bDZg}~yIc*s233|Nx zlk#ByOLNF@*&ijVUL#yh)Do8l@uG1is6p9SHAARFC|1;`@IX|=Xd+0;Jl)&U3l|0o zlLLh?P;uSJc}+7MkE5|@Hkyhiqp3Ksq>49uAHNyBDd|v(JdRm&f45IkO9);3&_Mk5 zg$_2IcF?wP%zT{EweRT;S;AlD0Nle~t8Xbz#fh?h7gj}0l-ugi^4quljyg~@y=sKX zmNH2xEoJ>vHr?nXbI9DAM?y8!Ryr1y*sCdFD%9`uR&D3jKn6Tzo^ge+pcYOJ7tZ2a zYp*IJ3OuxjAcMp9K6`}k9AkKl2`t(D&NRyuAyB2ox{S~4k>C-@>TZGwI*24M%j@z{ zT1N+MGi}OB!|B`u+9YRQ$06qsOgAdd0r0tQQ>l*6M)D}hK-sCj?he9p{Nf&jIm~-+ zGk;S#Uou*wRZ(OnoEi2xc`dnWN0wd43ji-OROTfEGW>aE8{z!XD-L@{2X3T zJ$sm{io_D^n*!{Y&61$gRu1s7`ZSSH_A{xVh9#{G_iaKJ*Z_7-gwv zKum9C{8*$oDLGQ=Kc&$ZIz^Tu*PQa>zOtEKlS2bPYEEh;S)3~uZN`zKI;`l z8Z>)nv*V!L63#`e=cb_1d!9Q9w&>fJTh;cBV1}eC54wLbPQXhXH7B8sSIoE8AFJ>$ z2}JV+IB6~9LXivec5Gno<{jLz40wZk);KIv1GA?NdxHUbGb0s9M?UeU!5RF?ZG5C_ zxMLUKE_N*w_iY1qkvkrAdee>r?*9QMgeRJ!CDfR}J%NJ23a%b{4v(MRVpe6Q4$Ps@ IC`L^94cdE_IRF3v diff --git a/gestion_salle/static/gestion_salle/js/index.js b/gestion_salle/static/gestion_salle/js/index.js index c9f82d1..d2a3253 100644 --- a/gestion_salle/static/gestion_salle/js/index.js +++ b/gestion_salle/static/gestion_salle/js/index.js @@ -26,7 +26,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), { $("employe").value=data.employe; $("salle").value=data.salle; $("statut-reservation").innerHTML=data.statut; - $("date_debut").value=data.date_debut; + $("date_evenement").value=data.date_evenement; $("heure_debut").value=data.heure_debut; $("heure_fin").value=data.heure_fin; $("motif_reservation").value=data.motif_reservation; @@ -171,7 +171,7 @@ const tableau_reservation_attente = new Tabulator("#tableau-reservation-attente" columns: [ {title: "Employé", field: "employe"}, {title: "Salle", field: "salle"}, - {title: "Date de l'evenement", field: "date_debut"}, + {title: "Date de l'evenement", field: "date_evenement"}, {title: "Heure de début", field: "heure_debut"}, {title: "Heure de fin", field: "heure_fin"}, {title: "Motif de reservation", field: "motif_reservation"}, @@ -183,6 +183,8 @@ const tableau_reservation_attente = new Tabulator("#tableau-reservation-attente" tableau_reservation_attente.on("rowClick", (row, rowData) => { const data = rowData.getData(); + console.log(data); + if(data.besoin_zoom === false){ $("lien_zoom_container").className = 'd-none'; } @@ -196,8 +198,7 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => { $("employe").value=data.employe; $("salle").value=data.salle; $("statut-reservation").innerHTML=data.statut; - $("date_debut").value = data.date_debut; - $("date_fin").value = data.date_fin; + $("date_evenement").value = data.date_evenement; $("heure_debut").value=data.heure_debut; $("heure_fin").value=data.heure_fin; $("motif_reservation").value=data.motif_reservation; diff --git a/gestion_salle/templates/gestion_salle/index.html b/gestion_salle/templates/gestion_salle/index.html index 6d178e3..f4fafae 100644 --- a/gestion_salle/templates/gestion_salle/index.html +++ b/gestion_salle/templates/gestion_salle/index.html @@ -16,7 +16,7 @@ {% endif %}
    -

    Reservation de salle

    +

    Réservation de salle

    @@ -34,7 +34,7 @@
    - + diff --git a/gestion_salle/templates/gestion_salle/parts/modalCreationReservation.html b/gestion_salle/templates/gestion_salle/parts/modalCreationReservation.html index 0db15f8..4e0ce50 100644 --- a/gestion_salle/templates/gestion_salle/parts/modalCreationReservation.html +++ b/gestion_salle/templates/gestion_salle/parts/modalCreationReservation.html @@ -4,7 +4,7 @@

    - Nouvelle reservation + Nouvelle réservation

    diff --git a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html index bbf4381..4202a1a 100644 --- a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html +++ b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html @@ -5,7 +5,7 @@

    - Détails de la reservation () + Détails de la réservation ()

    @@ -22,12 +22,8 @@
    - - -
    -
    - - + +
    @@ -38,7 +34,7 @@
    - +
    @@ -53,6 +49,7 @@
    +
    {% if appartient_au_departement_informatique %} diff --git a/gestion_salle/templates/gestion_salle/parts/modalListeValidation.html b/gestion_salle/templates/gestion_salle/parts/modalListeValidation.html index 0f50e01..1af71cb 100644 --- a/gestion_salle/templates/gestion_salle/parts/modalListeValidation.html +++ b/gestion_salle/templates/gestion_salle/parts/modalListeValidation.html @@ -4,7 +4,7 @@

    - Liste des reservation en attente de validation + Liste des réservation en attente de validation

    diff --git a/gestion_salle/views.py b/gestion_salle/views.py index 3382142..22c4f0e 100644 --- a/gestion_salle/views.py +++ b/gestion_salle/views.py @@ -139,6 +139,7 @@ def liste_reservation_attente(request): "employe_id": reservation.employe.user.id, "salle": dict(Reservation.TYPE_CHOICES).get(reservation.salle), 'statut': dict(Reservation.STATUT).get(reservation.statut), + "date_evenement": reservation.date_debut.strftime('%Y-%m-%d'), } for reservation in reservations ] @@ -151,7 +152,7 @@ def detail_reservation(request:HttpRequest, reservation_id:int): reservation_json = { 'id_reservation': reservation_id, 'employe': f"{employe.first_name} {employe.last_name}", - 'salle': reservation.salle, + 'salle': dict(Reservation.TYPE_CHOICES).get(reservation.salle), 'statut': dict(Reservation.STATUT).get(reservation.statut), 'date_evenement': reservation.date_debut.strftime('%Y-%m-%d'), 'heure_debut': reservation.heure_debut.strftime('%H:%M'),