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

Ajout de la prise en charge des photos de profil

Browse Source
This commit is contained in:
fatima
2026-04-30 13:28:57 +02:00
committed by Soriba SYLLA
parent cb4470e481
commit 7b3ba53e97
265 changed files with 42067 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
gestion_salle/__init__.py Normal file
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
)

4
gestion_salle/migrations/0001_initial.py
View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
# Generated by Django 5.2.13 on 2026-06-16 11:06
=======
# Generated by Django 5.2.13 on 2026-04-17 12:03
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
import django.db.models.deletion
from django.db import migrations, models

0
gestion_salle/migrations/__init__.py Normal file
View File

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

@@ -21,8 +21,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_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;
@@ -82,14 +81,11 @@ document.addEventListener("DOMContentLoaded", function () {
})
$("bouton-annuler").addEventListener("click", (e) => {
e.preventDefault();
const csrf = document.querySelector("[name=csrfmiddlewaretoken]").value;
const url_annuler = $("formulaire-details").dataset.urlannuler;
console.log("URL d'annulation :");
console.log($("formulaire-details"))
e.preventDefault();
fetch(
url_annuler,
{
@@ -136,13 +132,12 @@ if($("ajoutZoom")){
if($("refuserReservation")){
$("refuserReservation").addEventListener("click", (e) => {
e.preventDefault();
const csrf = document.querySelector("[name=csrfmiddlewaretoken]").value;
const url = e.currentTarget.dataset.lienrefus;
const idRes = $("id_reservation_detail").value;
console.log(idRes);
e.preventDefault();
fetch(url, {
method: "POST",
headers: {
@@ -186,9 +181,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_debut;
$("heure_debut").value=data.heure_debut;
$("heure_fin").value=data.heure_fin;
$("motif_reservation").value=data.motif_reservation;

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

@@ -26,9 +26,15 @@
<div class="form-group col-5 me-2">
<label>Selectionner une salle :</label>
<select class = "form-select" id="liste-salle">
<<<<<<< HEAD
<option value='Salle de formation'>Salle de formation</option>
<option value='Salle de réunion'>Salle de réunion</option>
<option value='Lien Zoom'>Lien Zoom</option>
=======
<option value='formation'>Salle de formation</option>
<option value='reunion'>Salle de réunion</option>
<option value='lien_zoom'>Lien Zoom</option>
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
</select>
</div>
</div>

22
gestion_salle/templates/gestion_salle/parts/ModalRefusReservation.html Normal file
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>

26
gestion_salle/templates/gestion_salle/parts/ModaleAjoutLienZoom.html Normal file
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>

23
gestion_salle/templates/gestion_salle/parts/modalCreationReservation.html Normal file
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>

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

@@ -1,5 +1,8 @@
<!-- Modal d'affichage des détails d'une reservation -->
<<<<<<< HEAD
{% load tags_personnaliser %}
=======
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
<div class="modal fade" id="modalDetailReservation" tabindex="-1" aria-labelledby="modalDetailReservationLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
@@ -22,7 +25,11 @@
<input class="form-control" id="salle" readonly>
</div>
<div class="form-group mb-2">
<<<<<<< HEAD
<label>Date de debut :</label>
=======
<label>Date de l'évènement :</label>
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
<input type='date' class="form-control" id="date_evenement" readonly >
</div>
<div class="form-group mb-2">
@@ -46,6 +53,7 @@
<input type="url" class="form-control" id="lien_zoom" readonly >
</div>
<div class="form-check mb-2">
<<<<<<< HEAD
<label class="form-check-label">Besoin d'un ordinateur</label>
<input type="checkbox" class="form-check-input" id="besoin_ordinateur" readonly >
</div>
@@ -59,9 +67,33 @@
{% endif %}
<span id="current-user-id" data-user-id="{{ request.user.id }}"></span>
<button class="btn btn-danger" id="bouton-annuler">Annuler</button>
=======
<label label="form-check-label">Besoin d'un ordinateur</label>
<input type="checkbox" class="form-check-input" id="besoin_ordinateur" readonly >
</div>
<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>
<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>
{% 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>
<<<<<<< HEAD
</div>
=======
</div>
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)

16
gestion_salle/templates/gestion_salle/parts/modalListeValidation.html Normal file
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"
)
]

10
gestion_salle/views.py
View File

@@ -108,7 +108,6 @@ def liste_reservation(request:HttpRequest):
"""Vue d'affichage des creneaux disponibles"""
reservations = Reservation.objects.filter(statut = "validee")
liste_reservation = []
for reservation in reservations:
color = None
if reservation.statut == "en_attente":
@@ -146,24 +145,21 @@ def liste_reservation_attente(request):
return JsonResponse(liste_reservation, safe=False)
def detail_reservation(request:HttpRequest, reservation_id:int):
reservation = Reservation.objects.get(id=reservation_id)
employe = reservation.employe.user
reservation_json = {
'id_reservation': reservation_id,
'employe': f"{employe.first_name} {employe.last_name}",
'salle': reservation.salle,
'statut': dict(Reservation.STATUT).get(reservation.statut),
'date_debut': reservation.date_debut.strftime('%Y-%m-%d'),
'date_fin': reservation.date_fin.strftime('%Y-%m-%d'),
'statut': reservation.statut,
'date_evenement': reservation.date_debut.strftime('%Y-%m-%d'),
'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 '',
'motif_refus': reservation.motif_refus or '',
}
return JsonResponse(reservation_json, safe=True)