Merge branch 'main' of https://jenkins.cerfig.org/CERFIG/sirh
This commit is contained in:
Binary file not shown.
@@ -1,4 +1,4 @@
|
||||
# Generated by Django 5.2.13 on 2026-09-01 10:51
|
||||
# Generated by Django 5.2.13 on 2026-09-03 14:33
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
@@ -12,7 +12,12 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
|
||||
const modal = new bootstrap.Modal($("modalDetailReservation"));
|
||||
modal.show();
|
||||
fetch (`/gestion-salle/revervation/details/${event.guid}`)
|
||||
.then(response => response.json())
|
||||
.then(response => {
|
||||
if (!response.ok) {
|
||||
throw new Error(`Erreur HTTP ${response.status}`);
|
||||
}
|
||||
return response.json();
|
||||
})
|
||||
.then(data => {
|
||||
currentReservationId = data.id_reservation;
|
||||
$("id_reservation_detail").value = data.id_reservation;
|
||||
@@ -21,7 +26,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
|
||||
$("employe").value=data.employe;
|
||||
$("salle").value=data.salle;
|
||||
$("statut-reservation").innerHTML=data.statut;
|
||||
$("date_evenement").value=data.date_evenement;
|
||||
$("date_debut").value=data.date_debut;
|
||||
$("heure_debut").value=data.heure_debut;
|
||||
$("heure_fin").value=data.heure_fin;
|
||||
$("motif_reservation").value=data.motif_reservation;
|
||||
@@ -40,6 +45,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
|
||||
}
|
||||
|
||||
})
|
||||
.catch(error => console.error("Impossible de charger les détails de la réservation :", error));
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -55,5 +55,5 @@
|
||||
{% block 'js' %}
|
||||
<script src="https://cdn.jsdelivr.net/npm/lemonadejs/dist/lemonade.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/@calendarjs/ce/dist/index.min.js"></script>
|
||||
<script src="{% static 'gestion_salle/js/index.js' %}"></script>
|
||||
<script src="{% static 'gestion_salle/js/index.js' %}?v=3"></script>
|
||||
{% endblock %}
|
||||
@@ -108,6 +108,7 @@ def liste_reservation(request:HttpRequest):
|
||||
"""Vue d'affichage des creneaux disponibles"""
|
||||
reservations = Reservation.objects.filter(statut = "validee")
|
||||
liste_reservation = []
|
||||
|
||||
for reservation in reservations:
|
||||
print(reservation.statut)
|
||||
color = None
|
||||
@@ -118,6 +119,8 @@ def liste_reservation(request:HttpRequest):
|
||||
else:
|
||||
color = "#dc3545"
|
||||
|
||||
print(dict(Reservation.TYPE_CHOICES).get(reservation.salle))
|
||||
|
||||
liste_reservation.append({
|
||||
"guid": reservation.pk,
|
||||
"title": dict(Reservation.TYPE_CHOICES).get(reservation.salle),
|
||||
|
||||
Reference in New Issue
Block a user