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 @@ + diff --git a/gestion_salle/__pycache__/views.cpython-310.pyc b/gestion_salle/__pycache__/views.cpython-310.pyc index 638c83b..277fbe0 100644 Binary files a/gestion_salle/__pycache__/views.cpython-310.pyc and b/gestion_salle/__pycache__/views.cpython-310.pyc differ 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 @@