Ajout de la prise en charge des photos de profil

This commit is contained in:
2026-04-30 13:28:57 +02:00
committed by Soriba SYLLA
parent ef86e03c37
commit cad7c94541
275 changed files with 44562 additions and 3 deletions

View File

3
gestion_salle/admin.py Normal file
View File

@@ -0,0 +1,3 @@
from django.contrib import admin
# Register your models here.

5
gestion_salle/apps.py Normal file
View File

@@ -0,0 +1,5 @@
from django.apps import AppConfig
class GestionSalleConfig(AppConfig):
name = 'gestion_salle'

32
gestion_salle/forms.py Normal file
View File

@@ -0,0 +1,32 @@
from django import forms
from .models import Reservation
class ReservationForm(forms.ModelForm):
class Meta:
model = Reservation
fields = ['salle', 'date_debut', 'date_fin', 'heure_debut', 'heure_fin', 'motif_reservation', 'besoin_zoom', 'besoin_ordi']
widgets = {
'date_debut': forms.DateInput(attrs={'type': 'date', 'class': 'form-control'}),
'date_fin': forms.DateInput(attrs={'type': 'date', 'class': 'form-control'}),
'heure_debut': forms.TimeInput(attrs={'type': 'time', 'class': 'form-control'}),
'heure_fin': forms.TimeInput(attrs={'type': 'time', 'class': 'form-control'}),
'motif_reservation': forms.Textarea(attrs={'rows': 3, 'cols': 40, 'style':'resize:none;', 'class': 'form-control'}),
'salle': forms.Select(attrs={'class': 'form-select'}),
}
besoin_zoom = forms.BooleanField(
required=False,
label="Besoin d'un lien Zoom ?",
widget=forms.CheckboxInput(attrs={'class': 'form-check-input', 'id': 'id_besoin_zoom'})
)
besoin_ordi = forms.BooleanField(
required=False,
label="Besoin d'ordinateur ?",
widget=forms.CheckboxInput(attrs={'class': 'form-check-input', 'id': 'id_besoin_ordi'})
)
class RefusReservationForm(forms.Form):
motif_refus = forms.CharField(
label= "Motif du refus",
widget=forms.Textarea(attrs={'rows': 3, 'cols': 40, 'style': 'resize:none;'}),
required=True
)

View File

@@ -0,0 +1,34 @@
# Generated by Django 5.2.13 on 2026-04-17 12:03
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
('gestion_employe', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='Reservation',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('salle', models.CharField(choices=[('formation', 'Salle de formation'), ('reunion', 'Salle de réunion'), ('lien_zoom', 'Lien Zoom')], max_length=100)),
('date_demande', models.DateTimeField(auto_now_add=True)),
('date_debut', models.DateField()),
('date_fin', models.DateField(blank=True, null=True)),
('heure_debut', models.TimeField()),
('heure_fin', models.TimeField()),
('besoin_zoom', models.BooleanField(default=False, verbose_name="Besoin d'un lien Zoom ?")),
('besoin_ordi', models.BooleanField(default=False, verbose_name="Besoin d'un ordinateur ?")),
('lien_zoom', models.URLField(blank=True, null=True, verbose_name='Lien Zoom')),
('motif_reservation', models.TextField()),
('statut', models.CharField(choices=[('en_attente', 'En attente'), ('validee', 'Validée'), ('refusee', 'Refusée'), ('annulee', 'Annulée')], default='en_attente', max_length=25)),
('employe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion_employe.employe')),
],
),
]

View File

33
gestion_salle/models.py Normal file
View File

@@ -0,0 +1,33 @@
from django.db import models
from gestion_employe.models import Employe
class Reservation(models.Model):
"""Modèle de création des réservations"""
TYPE_CHOICES = [
('formation', 'Salle de formation'),
('reunion', 'Salle de réunion'),
('lien_zoom', 'Lien Zoom'),
]
STATUT = [
('en_attente', 'En attente'),
('validee', 'Validée'),
('refusee', 'Refusée'),
('annulee', 'Annulée'),
]
employe = models.ForeignKey(Employe, on_delete=models.CASCADE)
salle = models.CharField(max_length=100, choices=TYPE_CHOICES)
date_demande = models.DateTimeField(auto_now_add=True)
date_debut = models.DateField()
date_fin = models.DateField(blank=True,null=True)
heure_debut = models.TimeField()
heure_fin = models.TimeField()
besoin_zoom = models.BooleanField(default=False, verbose_name="Besoin d'un lien Zoom ?")
besoin_ordi = models.BooleanField(default=False, verbose_name="Besoin d'un ordinateur ?")
lien_zoom = models.URLField(blank=True, null=True, verbose_name="Lien Zoom")
motif_reservation = models.TextField()
statut = models.CharField(choices=STATUT, default='en_attente', max_length=25)
def __str__(self):
return f"{self.salle} - {self.employe.user.first_name} {self.employe.user.last_name} le {self.date_reservation}"

View File

@@ -167,9 +167,15 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => {
$("lien_zoom_container").className = 'd-none';
}
<<<<<<< HEAD
// if(data.statut !== "refusee"){
// $("motif_refus_container").className = 'd-none';
// }
=======
if(data.statut !== "refusee"){
$("motif_refus_container").className = 'd-none';
}
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
$("id_reservation_detail").value = data.id;
$("id_reservation_refus").value = data.id;
@@ -178,15 +184,23 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => {
$("employe").value=data.employe;
$("salle").value=data.salle;
$("statut-reservation").innerHTML=data.statut;
<<<<<<< HEAD
$("date_debut").value = data.date_debut;
$("date_fin").value = data.date_fin;
=======
$("date_evenement").value=data.date_debut;
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
$("heure_debut").value=data.heure_debut;
$("heure_fin").value=data.heure_fin;
$("motif_reservation").value=data.motif_reservation;
$("besoin_zoom").checked=data.besoin_zoom;
$("besoin_ordinateur").checked=data.besoin_ordi;
$("lien_zoom").value=data.lien_zoom;
<<<<<<< HEAD
// $("motif_refus").value=data.motif_refus;
=======
$("motif_refus").value=data.motif_refus;
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
const modal = new bootstrap.Modal($("modalDetailReservation"));
bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide();

View File

@@ -0,0 +1,59 @@
{% extends "BASE.html" %}
{% load static %}
{% block 'titre_page' %} Gestion des projets {% endblock %}
{% block 'css' %}
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Material+Icons" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@calendarjs/ce/dist/style.min.css" />
{% endblock %}
{% block 'contenu' %}
{% if messages %}
{% for message in messages %}
<div class="alert alert-{% if message.tags == "error" %}danger{% else %}success{% endif %} alert-dismissible fade show" role="alert">
{{ message }}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
{% endfor %}
{% endif %}
<div class="row">
<div class="col py-2 px-4">
<h1 class="text-center">Reservation de salle</h1>
<hr>
<div class="row d-flex justify-content-around">
<div class="form-group col-5 me-2">
<label>Selectionner le jour concerné :</label>
<input type="date" class="form-control" id="semaineDate" />
</div>
<div class="form-group col-5 me-2">
<label>Selectionner une salle :</label>
<select class = "form-select" id="liste-salle">
<option value='formation'>Salle de formation</option>
<option value='reunion'>Salle de réunion</option>
<option value='lien_zoom'>Lien Zoom</option>
</select>
</div>
</div>
<div class="row mt-2">
<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 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>
</button>
</div>
</div>
<hr>
<div data-url="{% url 'gestion_salle:liste-reservation' %}" id="planning-reservation"></div>
</div>
</div>
{% endblock %}
{% block 'modal' %}
{% include 'gestion_salle/parts/modalCreationReservation.html' %}
{% include 'gestion_salle/parts/ModaleAjoutLienZoom.html' %}
{% include 'gestion_salle/parts/ModalRefusReservation.html' %}
{% include 'gestion_salle/parts/modalDetailResevation.html' %}
{% include 'gestion_salle/parts/modalListeValidation.html' %}
{% endblock %}
{% 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>
{% endblock %}

View File

@@ -0,0 +1,22 @@
<div class="modal fade" id="refusModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header ">
<h5 class="modal-title">Motif du refus</h5>
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form method="POST" id="refusForm" action="{% url 'gestion_salle:refuser-reservation' %}">
{% csrf_token %}
<input type='' class="form-control" id="id_reservation_refus" name='id_reservation' value="">
<textarea class="form-control" name="motif_refus" rows="3" required></textarea>
<div class="modal-footer">
<button type="submit" class="btn btn-danger">Refuser</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Annuler</button>
</div>
</form>
</div>
</div>
</div>
</div>

View File

@@ -0,0 +1,26 @@
<!-- Modal Ajouter/Modifier lien Zoom -->
<div class="modal fade" id="modalZoom" tabindex="-1" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header ">
<h5 class="modal-title">Ajouter/Modifier le lien Zoom</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form method="post" id="formZoom" action="{% url 'gestion_salle:ajouter-lien_zoom' %}">
{% csrf_token %}
<input type='hidden' class="form-control" id="id_reservation_zoom" name='id_reservation'>
<div class="mb-3">
<label for="lienZoom" class="form-label">Lien Zoom</label>
<input type="url" class="form-control" name="lien_zoom" id="lienZoom"
value="" required>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-success">Enregistrer</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Annuler</button>
</div>
</form>
</div>
</div>
</div>
</div>

View File

@@ -0,0 +1,23 @@
<!-- Modal de création d'une nouvelle reservation -->
<div class="modal fade" id="modalReservation" tabindex="-1" aria-labelledby="modalReservationLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="modalReservationLabel">
Nouvelle reservation
</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form method="POST" action="{% url 'gestion_salle:reservation-salle' %}">
{% csrf_token %}
{{ formulaire_reservation.as_p }}
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Fermer</button>
<button type="submit" class="btn btn-primary">Enregistrer</button>
</div>
</form>
</div>
</div>
</div>
</div>

View File

@@ -21,12 +21,17 @@
<input class="form-control" id="salle" readonly>
</div>
<div class="form-group mb-2">
<<<<<<< HEAD
<label>Date de debut :</label>
<input type='date' class="form-control" id="date_debut" readonly >
</div>
<div class="form-group mb-2">
<label>Date de fin :</label>
<input type='date' class="form-control" id="date_fin" readonly >
=======
<label>Date de l'évènement :</label>
<input type='date' class="form-control" id="date_evenement" readonly >
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
</div>
<div class="form-group mb-2">
<label>Heure de début :</label>
@@ -52,19 +57,38 @@
<label label="form-check-label">Besoin d'un ordinateur</label>
<input type="checkbox" class="form-check-input" id="besoin_ordinateur" readonly >
</div>
<<<<<<< HEAD
=======
<div class="form-group mb-2" id='motif_refus_container'>
<label>Motif de refus de la reservation :</label>
<textarea class="form-control" id="motif_refus" readonly></textarea>
</div>
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
<div class='d-flex justify-content-around mt-2'>
{% if appartient_au_departement_informatique %}
<button class="btn btn-primary" id="ajoutZoom">Ajout du lien zoom</button>
{% endif %}
{% if appartient_direction and reservation.statut == "en_attente" %}
<button class="btn btn-danger" id="refuserReservation" data-lienrefus="{% url 'gestion_salle:refuser-reservation' %}">Refuser</button>
<<<<<<< HEAD
<button class="btn btn-success" id="bouton-valider">Valider</button>
{% endif %}
<span id="current-user-id" data-user-id="{{ request.user.id }}"></span>
<button class="btn btn-danger" id="bouton-annuler">Annuler</button>
=======
{% endif %}
<button class="btn btn-danger" id="bouton-annuler">Annuler</button>
{% if appartient_direction %}
<button class="btn btn-success" id="bouton-valider">Valider</button>
{% endif %}
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
</div>
</form>
</div>
</div>
</div>
</div>
<<<<<<< HEAD
</div>
=======
</div>
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)

View File

@@ -0,0 +1,16 @@
<!-- Modal d'affichage des détails d'une reservation -->
<div class="modal fade" id="modalReservationAttente" tabindex="-1" aria-labelledby="modalReservationAttenteLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="modalReservationAttenteLabel">
Liste des reservation en attente de validation
</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div id="tableau-reservation-attente" data-reservationattentes = "{% url 'gestion_salle:liste-reservation-attente' %}"></div>
</div>
</div>
</div>
</div>

3
gestion_salle/tests.py Normal file
View File

@@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.

48
gestion_salle/urls.py Normal file
View File

@@ -0,0 +1,48 @@
from django.urls import path
from . import views
app_name = "gestion_salle"
urlpatterns = [
path(
'revervation/',
views.index,
name='reservation-salle'
),
path(
'revervation/details/<int:reservation_id>',
views.detail_reservation,
name='detail-reservation'
),
path(
'reservation/annuler',
views.annuler_reservation,
name='annuler-reservation'
),
path(
'reservation/valider',
views.valider_reservation,
name='valider-reservation'
),
path(
'reservation/refuser',
views.refuser_reservation,
name='refuser-reservation'
),
path(
'reservation/ajout-de-lien-zoom',
views.ajouter_lien_zoom,
name='ajouter-lien_zoom'
),
path(
'liste-reservation',
views.liste_reservation,
name='liste-reservation'
),
path(
'liste-reservation-attente',
views.liste_reservation_attente,
name="liste-reservation-attente"
)
]

View File

@@ -8,6 +8,7 @@ from django.forms import model_to_dict
from gestion_employe.models import Employe
from gestion_salle.forms import ReservationForm
from .models import Reservation
<<<<<<< HEAD
from datetime import timedelta
from django.contrib.auth.models import User
@@ -95,6 +96,65 @@ def index(request: HttpRequest):
}
return render(request, "gestion_salle/index.html", context)
=======
@login_required
def index(request:HttpRequest):
"""Vue de gestion de la reservation de la salle"""
try:
employe = Employe.objects.get(user=request.user)
except Employe.DoesNotExist:
messages.error(request, "Impossible d'accéder au menu 'Reservation de salle' car votre profil Utilisateur n'est lié à aucun profil Employe. Veuillez contacter l'administrateur.")
return redirect('gestion_conges:conge')
if request.method == "POST":
form = ReservationForm(request.POST)
if form.is_valid():
date_debut = form.cleaned_data.get('date_debut')
date_fin = form.cleaned_data.get('date_fin')
salle = form.cleaned_data.get('salle')
heure_debut = form.cleaned_data.get('heure_debut')
heure_fin = form.cleaned_data.get('heure_fin')
motif_reservation = form.cleaned_data.get('motif_reservation')
besoin_zoom = form.cleaned_data.get('besoin_zoom')
besoin_ordi = form.cleaned_data.get('besoin_ordi')
while date_debut <= date_fin :
reservation = Reservation(
employe = employe,
date_debut = date_debut,
date_fin = date_debut,
salle = salle,
heure_debut = heure_debut,
heure_fin = heure_fin,
besoin_zoom = besoin_zoom,
besoin_ordi = besoin_ordi,
motif_reservation=motif_reservation,
)
reservation.save()
date_debut = date_debut + timedelta(days=1)
messages.success(request, "Réservation(s) créées avec succès.")
return redirect('gestion_salle:reservation-salle')
formulaire_reservation = ReservationForm()
departement = Employe.objects.get(user__username=request.user).departement
appartient_direction = 'direction' in request.user.groups.values_list('name', flat=True)
liste_demande_reservation = [
reservation.id for reservation in
Reservation.objects.filter(employe=employe, statut='en_attente')
]
context = {
'formulaire_reservation': formulaire_reservation,
'nb_reservation_attente': Reservation.objects.filter(statut='en_attente').count(),
'appartient_au_departement_informatique': 'Informatique' == departement.nom if departement else False,
'appartient_direction': appartient_direction,
'liste_demande_reservation': liste_demande_reservation
}
return render(request, "gestion_salle/index.html", context)
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
def liste_reservation(request:HttpRequest):
"""Vue d'affichage des creneaux disponibles"""
reservations = Reservation.objects.filter(statut = "validee")
@@ -116,6 +176,10 @@ def liste_reservation(request:HttpRequest):
"end": reservation.heure_fin,
"color": color,
})
<<<<<<< HEAD
=======
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
return JsonResponse(liste_reservation, safe=False)
@login_required
@@ -132,25 +196,41 @@ def liste_reservation_attente(request):
return JsonResponse(liste_reservation, safe=False)
def detail_reservation(request:HttpRequest, reservation_id:int):
<<<<<<< HEAD
reservation = Reservation.objects.get(id=reservation_id)
employe = reservation.employe.user
reservation_json = {
=======
reservation = Reservation.objects.get(id=reservation_id)
employe = reservation.employe.user
reservation_json = {
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
'id_reservation': reservation_id,
'employe': f"{employe.first_name} {employe.last_name}",
'salle': reservation.salle,
'statut': reservation.statut,
<<<<<<< HEAD
'date_debut': reservation.date_debut.strftime('%Y-%m-%d'),
'date_fin': reservation.date_fin.strftime('%Y-%m-%d'),
=======
'date_evenement': reservation.date_debut.strftime('%Y-%m-%d'),
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
'heure_debut': reservation.heure_debut.strftime('%H:%M'),
'heure_fin': reservation.heure_fin.strftime('%H:%M'),
'motif_reservation': reservation.motif_reservation,
'besoin_zoom': reservation.besoin_zoom,
'besoin_ordinateur': reservation.besoin_ordi,
'lien_zoom': reservation.lien_zoom or '',
<<<<<<< HEAD
}
=======
'motif_refus': reservation.motif_refus or '',
}
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
return JsonResponse(reservation_json, safe=True)
@login_required
@@ -196,6 +276,7 @@ def annuler_reservation(request:HttpRequest):
return redirect('gestion_salle:reservation-salle')
@login_required
<<<<<<< HEAD
def valider_reservation(request: HttpRequest):
"""Validation d'une réservation"""
if request.method == 'POST':
@@ -227,4 +308,34 @@ def refuser_reservation(request: HttpRequest):
reservation.statut = 'refusee'
reservation.save()
return redirect('gestion_salle:reservation-salle')
return redirect('gestion_salle:reservation-salle')
=======
def valider_reservation(request:HttpRequest):
"""Vue de gestion de l'annulation de la reservation"""
if request.method == 'POST':
reservation_id= request.POST['id_reservation']
try:
reservation = Reservation.objects.get(id=reservation_id)
except reservation.DoesNotExist:
messages.error(request, "La resevertion selectionné n'existe pas.")
return redirect("salle")
reservation.statut = 'validee'
reservation.save()
messages.success(request, f"Réservation de {reservation.employe.get_full_name()} validée avec succès.")
return redirect('gestion_salle:reservation-salle')
@login_required
def refuser_reservation(request:HttpRequest):
"""Vue de gestion de refus de la reservation"""
data = json.loads(request.body)
reservation_id = data.get("id_reservation")
try:
reservation = Reservation.objects.get(id=reservation_id)
except Reservation.DoesNotExist and ValueError:
return JsonResponse({"message": "La resevertion selectionné n'existe pas."})
else:
reservation.statut = "refusee"
reservation.save()
return JsonResponse({"message": "Réservation refusée avec succès."})
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)