CERFIG/sirh
2
0
Fork 0
Code Issues 9 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fix: Correction de l'affichage des dates dans les détails de la réservation

Browse Source
This commit is contained in:
Soriba Sylla
2026-09-07 11:33:21 +00:00
parent 1a21998c39
commit 0eb745d5f3
9 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -16,7 +16,7 @@ pipeline
{ {
steps steps
{ {
sh 'echo "Debut du pipeline"' sh 'echo "Debut du pipeline test"'
cleanWs() cleanWs()
checkout scm checkout scm
} }

3
SIRH/templates/SIRH/parts/menu_application.html
View File

@@ -15,6 +15,9 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{ SGL_LIEN }}">SGL</a> <a class="nav-link" href="{{ SGL_LIEN }}">SGL</a>
</li> </li>
<li class="nav-item">
<a class="nav-link" href="#">Laboratoire</a>
</li>
</ul> </ul>
</div> </div>
</div> </div>

BIN
gestion_salle/__pycache__/views.cpython-310.pyc
View File

Binary file not shown.

9
gestion_salle/static/gestion_salle/js/index.js
View File

@@ -26,7 +26,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
$("employe").value=data.employe; $("employe").value=data.employe;
$("salle").value=data.salle; $("salle").value=data.salle;
$("statut-reservation").innerHTML=data.statut; $("statut-reservation").innerHTML=data.statut;
$("date_debut").value=data.date_debut; $("date_evenement").value=data.date_evenement;
$("heure_debut").value=data.heure_debut; $("heure_debut").value=data.heure_debut;
$("heure_fin").value=data.heure_fin; $("heure_fin").value=data.heure_fin;
$("motif_reservation").value=data.motif_reservation; $("motif_reservation").value=data.motif_reservation;
@@ -171,7 +171,7 @@ const tableau_reservation_attente = new Tabulator("#tableau-reservation-attente"
columns: [ columns: [
{title: "Employé", field: "employe"}, {title: "Employé", field: "employe"},
{title: "Salle", field: "salle"}, {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 début", field: "heure_debut"},
{title: "Heure de fin", field: "heure_fin"}, {title: "Heure de fin", field: "heure_fin"},
{title: "Motif de reservation", field: "motif_reservation"}, {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) => { tableau_reservation_attente.on("rowClick", (row, rowData) => {
const data = rowData.getData(); const data = rowData.getData();
console.log(data);
if(data.besoin_zoom === false){ if(data.besoin_zoom === false){
$("lien_zoom_container").className = 'd-none'; $("lien_zoom_container").className = 'd-none';
} }
@@ -196,8 +198,7 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => {
$("employe").value=data.employe; $("employe").value=data.employe;
$("salle").value=data.salle; $("salle").value=data.salle;
$("statut-reservation").innerHTML=data.statut; $("statut-reservation").innerHTML=data.statut;
$("date_debut").value = data.date_debut; $("date_evenement").value = data.date_evenement;
$("date_fin").value = data.date_fin;
$("heure_debut").value=data.heure_debut; $("heure_debut").value=data.heure_debut;
$("heure_fin").value=data.heure_fin; $("heure_fin").value=data.heure_fin;
$("motif_reservation").value=data.motif_reservation; $("motif_reservation").value=data.motif_reservation;

4
gestion_salle/templates/gestion_salle/index.html
View File

@@ -16,7 +16,7 @@
{% endif %} {% endif %}
<div class="row"> <div class="row">
<div class="col py-2 px-4"> <div class="col py-2 px-4">
<h1 class="text-center">Reservation de salle</h1> <h1 class="text-center">Réservation de salle</h1>
<hr> <hr>
<div class="row d-flex justify-content-around"> <div class="row d-flex justify-content-around">
<div class="form-group col-5 me-2"> <div class="form-group col-5 me-2">
@@ -34,7 +34,7 @@
</div> </div>
<div class="row mt-2"> <div class="row mt-2">
<div class="col d-flex justify-content-center"> <div class="col d-flex justify-content-center">
<button class="btn btn-lg btn-primary me-2" data-bs-toggle="modal" data-bs-target="#modalReservation">Nouvelle reservation</button> <button class="btn btn-lg btn-primary me-2" data-bs-toggle="modal" data-bs-target="#modalReservation">Nouvelle réservation</button>
<button type="button" class="btn btn-warning" data-bs-toggle="modal" data-bs-target="#modalReservationAttente"> <button type="button" class="btn btn-warning" data-bs-toggle="modal" data-bs-target="#modalReservationAttente">
Validation en attente <span class="badge badge-light">{{ nb_reservation_attente }}</span> Validation en attente <span class="badge badge-light">{{ nb_reservation_attente }}</span>
</button> </button>

2
gestion_salle/templates/gestion_salle/parts/modalCreationReservation.html
View File

@@ -4,7 +4,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title fs-5" id="modalReservationLabel"> <h1 class="modal-title fs-5" id="modalReservationLabel">
Nouvelle reservation Nouvelle réservation
</h1> </h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>

13
gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
View File

@@ -5,7 +5,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title fs-5" id="modalDetailReservationLabel"> <h1 class="modal-title fs-5" id="modalDetailReservationLabel">
Détails de la reservation (<span id='statut-reservation'></span>) Détails de la réservation (<span id='statut-reservation'></span>)
</h1> </h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
@@ -22,12 +22,8 @@
<input class="form-control" id="salle" readonly> <input class="form-control" id="salle" readonly>
</div> </div>
<div class="form-group mb-2"> <div class="form-group mb-2">
<label>Date de debut :</label> <label>Date de l'évènement :</label>
<input type='date' class="form-control" id="date_debut" readonly > <input type='date' class="form-control" id="date_evenement" readonly >
</div>
<div class="form-group mb-2">
<label>Date de fin :</label>
<input type='date' class="form-control" id="date_fin" readonly >
</div> </div>
<div class="form-group mb-2"> <div class="form-group mb-2">
<label>Heure de début :</label> <label>Heure de début :</label>
@@ -38,7 +34,7 @@
<input type='time' class="form-control" id="heure_fin" readonly > <input type='time' class="form-control" id="heure_fin" readonly >
</div> </div>
<div class="form-group mb-2"> <div class="form-group mb-2">
<label>Motif de la reservation :</label> <label>Motif de la réservation :</label>
<textarea class="form-control" id="motif_reservation" readonly ></textarea> <textarea class="form-control" id="motif_reservation" readonly ></textarea>
</div> </div>
<div class="form-check mb-2"> <div class="form-check mb-2">
@@ -53,6 +49,7 @@
<label class="form-check-label">Besoin d'un ordinateur {{ reservation.statut }}</label> <label class="form-check-label">Besoin d'un ordinateur {{ reservation.statut }}</label>
<input type="checkbox" class="form-check-input" id="besoin_ordinateur" readonly > <input type="checkbox" class="form-check-input" id="besoin_ordinateur" readonly >
</div> </div>
<hr />
<div class='d-flex justify-content-around mt-2'> <div class='d-flex justify-content-around mt-2'>
{% if appartient_au_departement_informatique %} {% if appartient_au_departement_informatique %}
<button class="btn btn-primary" id="ajoutZoom">Ajout du lien zoom</button> <button class="btn btn-primary" id="ajoutZoom">Ajout du lien zoom</button>

2
gestion_salle/templates/gestion_salle/parts/modalListeValidation.html
View File

@@ -4,7 +4,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title fs-5" id="modalReservationAttenteLabel"> <h1 class="modal-title fs-5" id="modalReservationAttenteLabel">
Liste des reservation en attente de validation Liste des réservation en attente de validation
</h1> </h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>

3
gestion_salle/views.py
View File

@@ -139,6 +139,7 @@ def liste_reservation_attente(request):
"employe_id": reservation.employe.user.id, "employe_id": reservation.employe.user.id,
"salle": dict(Reservation.TYPE_CHOICES).get(reservation.salle), "salle": dict(Reservation.TYPE_CHOICES).get(reservation.salle),
'statut': dict(Reservation.STATUT).get(reservation.statut), 'statut': dict(Reservation.STATUT).get(reservation.statut),
"date_evenement": reservation.date_debut.strftime('%Y-%m-%d'),
} for reservation in reservations } for reservation in reservations
] ]
@@ -151,7 +152,7 @@ def detail_reservation(request:HttpRequest, reservation_id:int):
reservation_json = { reservation_json = {
'id_reservation': reservation_id, 'id_reservation': reservation_id,
'employe': f"{employe.first_name} {employe.last_name}", '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), 'statut': dict(Reservation.STATUT).get(reservation.statut),
'date_evenement': reservation.date_debut.strftime('%Y-%m-%d'), 'date_evenement': reservation.date_debut.strftime('%Y-%m-%d'),
'heure_debut': reservation.heure_debut.strftime('%H:%M'), 'heure_debut': reservation.heure_debut.strftime('%H:%M'),