Compare commits
2 Commits
feature/li
...
41dcb84987
| Author | SHA1 | Date | |
|---|---|---|---|
| 41dcb84987 | |||
| 9fb079c9a7 |
@@ -29,7 +29,6 @@ tableau_liste_employe.on("rowClick", function (row, rowData) {
|
||||
const data = rowData.getData();
|
||||
|
||||
document.getElementById('detail-id').value = data.id;
|
||||
document.querySelector("#modalContratsEmploye").dataset.employeId = data.id;
|
||||
document.getElementById('detail-matricule').value = data.matricule;
|
||||
document.getElementById('detail-employe').value = data.employe;
|
||||
document.getElementById('detail-fonction').value = data.fonction;
|
||||
@@ -271,86 +270,68 @@ const listeContratExpirant = new Tabulator("#listeContratExpirant", {
|
||||
ajaxURL: $("boutonContratExpirants").dataset.urlexpirants,
|
||||
})
|
||||
|
||||
let tabContrats = null;
|
||||
/* let tabContrats = null;
|
||||
|
||||
document.getElementById("modalContratsEmploye").addEventListener("show.bs.modal", function () {
|
||||
|
||||
const employeId = document.getElementById("detail-id").value;
|
||||
|
||||
$("boutonVoirContrats").addEventListener("click", function () {
|
||||
const employeId = $("detail-id").value;
|
||||
if (!employeId) {
|
||||
$("nom-employe-contrat").textContent = "Aucun employé sélectionné.";
|
||||
alert("Aucun employé sélectionné");
|
||||
return;
|
||||
}
|
||||
|
||||
$("modalContratsEmploye").dataset.employeId = employeId;
|
||||
|
||||
const modalDetail = $("modalDetailEmploye");
|
||||
modalDetail.addEventListener(
|
||||
"hidden.bs.modal",
|
||||
() => bootstrap.Modal.getOrCreateInstance($("modalContratsEmploye")).show(),
|
||||
{once: true}
|
||||
);
|
||||
bootstrap.Modal.getOrCreateInstance(modalDetail).hide();
|
||||
});
|
||||
|
||||
$("modalContratsEmploye").addEventListener("shown.bs.modal", function () {
|
||||
const employeId = this.dataset.employeId;
|
||||
const urlTemplate = this.dataset.urlTemplate;
|
||||
const tableElement = $("table-contrats-tabulator");
|
||||
|
||||
if (tabContrats) {
|
||||
tabContrats.destroy();
|
||||
tabContrats = null;
|
||||
}
|
||||
|
||||
if (!employeId) {
|
||||
$("nom-employe-contrat").textContent = "Aucun employé sélectionné.";
|
||||
return;
|
||||
}
|
||||
|
||||
tableElement.replaceChildren();
|
||||
$("nom-employe-contrat").textContent = "Chargement...";
|
||||
const url = urlTemplate.replace("123456789", employeId);
|
||||
|
||||
fetch(url)
|
||||
fetch(`/employé/employe/${employeId}/contrats/`)
|
||||
.then(response => {
|
||||
if (!response.ok) {
|
||||
throw new Error(`Erreur HTTP ${response.status}`);
|
||||
throw new Error("Erreur HTTP " + response.status);
|
||||
}
|
||||
return response.json();
|
||||
})
|
||||
.then(data => {
|
||||
$("nom-employe-contrat").textContent = data.employe;
|
||||
|
||||
tabContrats = new Tabulator(tableElement, {
|
||||
data: data.contrats,
|
||||
layout: "fitColumns",
|
||||
pagination: true,
|
||||
paginationSize: 10,
|
||||
placeholder: "Aucun contrat",
|
||||
columns: [
|
||||
{title: "Numéro", field: "numero_contrat"},
|
||||
{title: "Type", field: "type_contrat"},
|
||||
{title: "Date début", field: "date_debut"},
|
||||
{title: "Date fin", field: "date_fin"},
|
||||
{title: "Salaire", field: "salaire_mensuel"},
|
||||
{title: "Statut", field: "statut"},
|
||||
{
|
||||
title: "Contrat",
|
||||
field: "fichier",
|
||||
formatter: "link",
|
||||
formatterParams: {target: "_blank"},
|
||||
},
|
||||
],
|
||||
});
|
||||
document.getElementById("nom-employe-contrat").innerText =
|
||||
data.employe;
|
||||
|
||||
if (tabContrats) {
|
||||
tabContrats.destroy();
|
||||
}
|
||||
|
||||
tabContrats = new Tabulator(
|
||||
"#table-contrats-tabulator",
|
||||
{
|
||||
data: data.contrats,
|
||||
layout: "fitColumns",
|
||||
placeholder: "Aucun contrat",
|
||||
|
||||
columns: [
|
||||
{ title: "Numéro", field: "numero_contrat" },
|
||||
{ title: "Type", field: "type_contrat" },
|
||||
{ title: "Date début", field: "date_debut" },
|
||||
{ title: "Date fin", field: "date_fin" },
|
||||
{ title: "Salaire", field: "salaire_mensuel" },
|
||||
{ title: "Statut", field: "statut" },
|
||||
|
||||
{
|
||||
title: "Contrat",
|
||||
field: "fichier",
|
||||
formatter: function(cell) {
|
||||
const url = cell.getValue();
|
||||
|
||||
if (!url) {
|
||||
return "<span class='text-danger'>Aucun fichier</span>";
|
||||
}
|
||||
|
||||
return `<a href="${url}" target="_blank" class="btn btn-sm btn-primary">
|
||||
<i class="bi bi-file-earmark-pdf"></i> Ouvrir
|
||||
</a>`;
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
);
|
||||
})
|
||||
.catch(error => {
|
||||
console.error("Erreur lors du chargement des contrats :", error);
|
||||
$("nom-employe-contrat").textContent =
|
||||
"Impossible de charger les contrats.";
|
||||
tableElement.textContent =
|
||||
"Une erreur est survenue lors du chargement des contrats.";
|
||||
console.error("Erreur :", error);
|
||||
});
|
||||
});
|
||||
|
||||
$("modalContratsEmploye").addEventListener("hidden.bs.modal", function () {
|
||||
bootstrap.Modal.getOrCreateInstance($("modalDetailEmploye")).show();
|
||||
});
|
||||
}); */
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
{% block 'modal' %}
|
||||
{% include "gestion_employe/parts/modalDetailEmploye.html" %}
|
||||
{% include "gestion_employe/parts/modalCreationContrat.html" %}
|
||||
{% include "gestion_employe/parts/modalContratsEmploye.html" %}
|
||||
{% include "gestion_employe/parts/modalAffectationProjet.html" %}
|
||||
{% include "gestion_employe/parts/modalDocument.html" %}
|
||||
{% include "gestion_employe/parts/modalListeContratExpirants.html" %}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<div class="modal fade" id="modalContratsEmploye" data-url-template="{% url 'gestion_employe:contrats-employe' 123456789 %}" tabindex="-1">
|
||||
<div class="modal fade" id="modalContratsEmploye" tabindex="-1">
|
||||
<div class="modal-dialog modal-xl">
|
||||
<div class="modal-content">
|
||||
|
||||
@@ -14,3 +14,4 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -97,15 +97,11 @@
|
||||
<i class="bi bi-file-earmark-text me-2"></i> Liste des Contrats
|
||||
</h5>
|
||||
{% if user|has_group:"ressource_humaine" %}
|
||||
<div class="d-flex gap-2">
|
||||
<button type="button" class="btn btn-outline-primary" id="boutonVoirContrats">
|
||||
<i class="bi bi-files"></i> Voir tous les contrats
|
||||
</button>
|
||||
<button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#modalContrat">
|
||||
<div>
|
||||
<button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#modalContrat{{ item.employe.id }}">
|
||||
<i class="bi bi-file-earmark-text"></i> Créer contrat
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
{% csrf_token %}
|
||||
|
||||
@@ -90,10 +90,5 @@ urlpatterns = [
|
||||
"liste-contrat-expirants",
|
||||
views.liste_contrat_expirants,
|
||||
name='liste-contrat-expirants'
|
||||
),
|
||||
path(
|
||||
"liste-contrats-employe/<int:id_employe>/",
|
||||
views.liste_contrats_employe,
|
||||
name="liste-contrats-employe"
|
||||
)
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import json
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
import requests
|
||||
from dateutil.relativedelta import relativedelta
|
||||
from django.contrib.auth import update_session_auth_hash
|
||||
from decouple import config
|
||||
from django.contrib import messages
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.contrib.auth.models import User
|
||||
@@ -299,8 +300,6 @@ def creation_contrat(request):
|
||||
|
||||
@login_required
|
||||
def contrats_employe(request, employe_id):
|
||||
if not request.user.groups.filter(name="ressource_humaine").exists():
|
||||
return JsonResponse({"error": "Accès non autorisé"}, status=403)
|
||||
|
||||
try:
|
||||
employe = Employe.objects.get(id=employe_id)
|
||||
@@ -507,55 +506,42 @@ def supprimer_formation(request, id_formation):
|
||||
def modifier_mot_passe(request):
|
||||
"""Vue pour permettre à un employé de modifier son mot de passe"""
|
||||
if request.method == "POST":
|
||||
username = request.user.username
|
||||
ancien_mdp = request.POST.get("ancien-mdp")
|
||||
nouveau_mdp = request.POST.get("nouveau-mdp")
|
||||
confirmation_mdp = request.POST.get("confirmation-mdp")
|
||||
|
||||
if not request.user.check_password(ancien_mdp):
|
||||
messages.error(request, "L'ancien mot de passe est incorrect.")
|
||||
return redirect("gestion_employe:mon-profil")
|
||||
|
||||
if nouveau_mdp != confirmation_mdp:
|
||||
messages.error(request, "Les nouveaux mots de passe ne correspondent pas.")
|
||||
return redirect("gestion_employe:mon-profil")
|
||||
|
||||
try:
|
||||
validate_password(nouveau_mdp, user=request.user)
|
||||
except ValidationError as e:
|
||||
messages.error(request, f"Erreur : {' '.join(e.messages)}")
|
||||
return redirect("gestion_employe:mon-profil")
|
||||
|
||||
request.user.set_password(nouveau_mdp)
|
||||
request.user.save(update_fields=["password"])
|
||||
update_session_auth_hash(request, request.user)
|
||||
messages.success(request, "Mot de passe modifié avec succès.")
|
||||
donnees = {
|
||||
"username": username,
|
||||
"ancien_mdp": ancien_mdp,
|
||||
"nouveau_mdp": nouveau_mdp,
|
||||
"confirmation_mdp": confirmation_mdp
|
||||
}
|
||||
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
"Accept": "application/json",
|
||||
}
|
||||
|
||||
response = requests.post(
|
||||
f"{config('SERVEUR_AUTHENTIFICATION')}modifier-mot-de-passe/",
|
||||
json=donnees,
|
||||
headers=headers
|
||||
)
|
||||
|
||||
data = response.json()
|
||||
cle = next(iter(data.keys()))
|
||||
valeur = next(iter(data.values()))
|
||||
|
||||
if cle == "success":
|
||||
messages.success(request, valeur)
|
||||
else:
|
||||
messages.error(request, valeur)
|
||||
|
||||
return redirect("gestion_employe:mon-profil")
|
||||
|
||||
def liste_contrats_employe(request, id_employe):
|
||||
"""Vue pour retourner la liste des contrats d'un employé spécifique"""
|
||||
try:
|
||||
employe = Employe.objects.get(id=id_employe)
|
||||
except Employe.DoesNotExist:
|
||||
return JsonResponse({"error": "Employé non trouvé"}, status=404)
|
||||
|
||||
contrats = Contrat.objects.filter(employe=employe).order_by("-date_debut")
|
||||
|
||||
data = [
|
||||
{
|
||||
"id": contrat.id,
|
||||
"numero_contrat": contrat.numero_contrat,
|
||||
"type_contrat": dict(Contrat.TYPE_CONTRAT).get(contrat.type_contrat),
|
||||
"date_debut": contrat.date_debut.strftime("%Y-%m-%d"),
|
||||
"date_fin": contrat.date_fin.strftime("%Y-%m-%d") if contrat.date_fin else "",
|
||||
"salaire_mensuel": contrat.salaire_mensuel,
|
||||
"statut": dict(Contrat.STATUT_CONTRAT).get(contrat.statut),
|
||||
"fichier_contrat": contrat.fichier_contrat.url if contrat.fichier_contrat else "",
|
||||
}
|
||||
for contrat in contrats
|
||||
]
|
||||
|
||||
return JsonResponse({
|
||||
"employe": f"{employe.user.first_name} {employe.user.last_name}",
|
||||
"contrats": data
|
||||
})
|
||||
@@ -2,7 +2,71 @@ const $ = (element) => document.getElementById(element);
|
||||
const { Schedule } = calendarjs;
|
||||
|
||||
let dateAUtiliser = new Date().toISOString().split('T')[0];
|
||||
let currentReservationId = null;
|
||||
|
||||
function afficherDetailsReservation(data) {
|
||||
const reservationId = data.id_reservation || data.id;
|
||||
$("id_reservation_detail").value = reservationId;
|
||||
$("id_reservation_refus").value = reservationId;
|
||||
$("id_reservation_zoom").value = reservationId;
|
||||
$("employe").value = data.employe;
|
||||
$("salle").value = data.salle;
|
||||
$("statut-reservation").textContent = data.statut;
|
||||
$("date_evenement").value = data.date_evenement || data.date_debut;
|
||||
$("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_ordinateur ?? data.besoin_ordi;
|
||||
$("lien_zoom").value = data.lien_zoom || "";
|
||||
$("lien_zoom_container").classList.toggle("d-none", !data.besoin_zoom);
|
||||
|
||||
const currentUserId = $("current-user-id").dataset.userId;
|
||||
const isOwner = data.est_proprietaire === true
|
||||
|| String(data.employe_id) === currentUserId;
|
||||
const isPending = data.est_en_attente === true
|
||||
|| data.statut === "En attente"
|
||||
|| data.statut === "en_attente";
|
||||
|
||||
$("bouton-supprimer-reservation").classList.toggle(
|
||||
"d-none",
|
||||
!(isOwner && isPending)
|
||||
);
|
||||
|
||||
for (const id of ["refuserReservation", "refuserReservationInfo", "bouton-valider", "bouton-valider-info"]) {
|
||||
const button = $(id);
|
||||
if (button) {
|
||||
button.style.display = isPending && !isOwner ? "inline-block" : "none";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function supprimerReservation(reservationId) {
|
||||
if (!window.confirm("Voulez-vous vraiment supprimer cette demande de réservation en attente ?")) {
|
||||
return;
|
||||
}
|
||||
|
||||
const form = $("formulaire-details");
|
||||
const csrf = form.querySelector("[name=csrfmiddlewaretoken]").value;
|
||||
const url = $("bouton-supprimer-reservation").dataset.url.replace(
|
||||
"/0/",
|
||||
`/${reservationId}/`
|
||||
);
|
||||
|
||||
fetch(url, {
|
||||
method: "POST",
|
||||
headers: {"X-CSRFToken": csrf},
|
||||
})
|
||||
.then(response => response.json().then(data => ({response, data})))
|
||||
.then(({response, data}) => {
|
||||
window.alert(data.message);
|
||||
if (response.ok && data.success) {
|
||||
window.location.reload();
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
window.alert("La suppression a échoué. Veuillez réessayer.");
|
||||
});
|
||||
}
|
||||
|
||||
const calendrier = Schedule(document.getElementById('planning-reservation'), {
|
||||
type: 'weekdays',
|
||||
@@ -19,31 +83,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
|
||||
return response.json();
|
||||
})
|
||||
.then(data => {
|
||||
currentReservationId = data.id_reservation;
|
||||
$("id_reservation_detail").value = data.id_reservation;
|
||||
$("id_reservation_refus").value = data.id_reservation;
|
||||
$("id_reservation_zoom").value = data.id_reservation;
|
||||
$("employe").value=data.employe;
|
||||
$("salle").value=data.salle;
|
||||
$("statut-reservation").innerHTML=data.statut;
|
||||
$("date_evenement").value=data.date_evenement;
|
||||
$("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_ordinateur;
|
||||
$("lien_zoom").value=data.lien_zoom;
|
||||
|
||||
const zoomContainer = $("lien_zoom_container");
|
||||
if (!data.besoin_zoom) {
|
||||
zoomContainer.classList.add("d-none");
|
||||
} else {
|
||||
zoomContainer.classList.remove("d-none");
|
||||
}
|
||||
if (data.besoin_zoom === false){
|
||||
$("lien_zoom_container").className = "d-none";
|
||||
}
|
||||
|
||||
afficherDetailsReservation(data);
|
||||
})
|
||||
.catch(error => console.error("Impossible de charger les détails de la réservation :", error));
|
||||
}
|
||||
@@ -58,6 +98,10 @@ $('semaineDate').addEventListener('change', () => {
|
||||
calendrier.render();
|
||||
})
|
||||
|
||||
$("bouton-supprimer-reservation").addEventListener("click", () => {
|
||||
supprimerReservation($("id_reservation_detail").value);
|
||||
});
|
||||
|
||||
evenement_defini = null
|
||||
|
||||
$("liste-salle").addEventListener("change", (e) => {
|
||||
@@ -76,39 +120,22 @@ $("liste-salle").addEventListener("change", (e) => {
|
||||
function chargement_evenement(){
|
||||
const url = $("planning-reservation").dataset.url;
|
||||
fetch (url)
|
||||
.then(response => response.json())
|
||||
.then(response => {
|
||||
if (!response.ok) {
|
||||
throw new Error(`Erreur HTTP ${response.status}`);
|
||||
}
|
||||
return response.json();
|
||||
})
|
||||
.then(data => {
|
||||
calendrier.setData(data);
|
||||
})
|
||||
.catch(error => console.error("Impossible de charger les réservations :", error));
|
||||
}
|
||||
|
||||
document.addEventListener("DOMContentLoaded", function () {
|
||||
chargement_evenement()
|
||||
})
|
||||
|
||||
$("bouton-annuler").addEventListener("click", (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
const csrf = document.querySelector("[name=csrfmiddlewaretoken]").value;
|
||||
const url_annuler = $("formulaire-details").dataset.urlannuler;
|
||||
|
||||
e.preventDefault();
|
||||
|
||||
fetch(
|
||||
url_annuler,
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"X-Requested-With": "XMTHttpRequest",
|
||||
"X-CSRFToken": csrf
|
||||
},
|
||||
body: new FormData($("formulaire-details"))
|
||||
}
|
||||
)
|
||||
.then(response => response.json())
|
||||
.then(data => console.log(data))
|
||||
})
|
||||
|
||||
if($("bouton-valider")){
|
||||
$("bouton-valider").addEventListener("click", (e) => {
|
||||
const csrf = document.querySelector("[name=csrfmiddlewaretoken]").value;
|
||||
@@ -180,40 +207,7 @@ 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';
|
||||
}
|
||||
|
||||
const id_user = $("current-user-id").dataset.userId;
|
||||
|
||||
$("id_reservation_detail").value = data.id;
|
||||
$("id_reservation_refus").value = data.id;
|
||||
$("id_reservation_zoom").value = data.id;
|
||||
|
||||
$("employe").value=data.employe;
|
||||
$("salle").value=data.salle;
|
||||
$("statut-reservation").innerHTML=data.statut;
|
||||
$("date_evenement").value = data.date_evenement;
|
||||
$("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;
|
||||
|
||||
const refuserReservation = document.querySelector("#refuserReservation");
|
||||
const bouton_valider = document.querySelector("#bouton-valider");
|
||||
|
||||
if((refuserReservation | bouton_valider) && data.statut === "En attente"){
|
||||
refuserReservation.style.display = "inline-block";
|
||||
bouton_valider.style.display = "inline-block";
|
||||
}
|
||||
|
||||
if (id_user != data.employe_id){
|
||||
$("bouton-annuler").className = "d-none";
|
||||
}
|
||||
afficherDetailsReservation(data);
|
||||
|
||||
const modal = new bootstrap.Modal($("modalDetailReservation"));
|
||||
bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide();
|
||||
|
||||
@@ -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' %}?v=3"></script>
|
||||
<script src="{% static 'gestion_salle/js/index.js' %}?v=5"></script>
|
||||
{% endblock %}
|
||||
@@ -10,7 +10,7 @@
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form method="POST" data-urlannuler="{% url 'gestion_salle:annuler-reservation' %}" data-urlvalider="{% url 'gestion_salle:valider-reservation' %}" id="formulaire-details">
|
||||
<form method="POST" data-urlvalider="{% url 'gestion_salle:valider-reservation' %}" id="formulaire-details">
|
||||
{% csrf_token %}
|
||||
<input type='' class="form-control" id="id_reservation_detail" name='id_reservation' hidden>
|
||||
<div class="form-group mb-2">
|
||||
@@ -63,7 +63,18 @@
|
||||
<button class="btn btn-success me-1" id="bouton-valider-info">Valider</button>
|
||||
{% endif %}
|
||||
<span id="current-user-id" data-user-id="{{ user.id }}"></span>
|
||||
<button class="btn btn-danger" id="bouton-annuler">Annuler</button>
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-outline-danger d-none"
|
||||
id="bouton-supprimer-reservation"
|
||||
data-url="{% url 'gestion_salle:supprimer-reservation' 0 %}"
|
||||
>
|
||||
Supprimer ma demande
|
||||
</button>
|
||||
|
||||
<button type="button" class="btn btn-secondary" id="bouton-annuler" data-bs-dismiss="modal">
|
||||
Fermer
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -45,5 +45,10 @@ urlpatterns = [
|
||||
'liste-reservation-attente',
|
||||
views.liste_reservation_attente,
|
||||
name="liste-reservation-attente"
|
||||
),
|
||||
path(
|
||||
'reservation/<int:reservation_id>/supprimer',
|
||||
views.supprimer_reservation,
|
||||
name="supprimer-reservation",
|
||||
)
|
||||
]
|
||||
@@ -125,19 +125,25 @@ Veuillez vous connecter à la plateforme pour traiter cette demande.""",
|
||||
|
||||
return render(request, "gestion_salle/index.html", context)
|
||||
|
||||
@login_required
|
||||
def liste_reservation(request:HttpRequest):
|
||||
"""Vue d'affichage des creneaux disponibles"""
|
||||
reservations = Reservation.objects.filter(statut = "validee")
|
||||
try:
|
||||
employe = Employe.objects.get(user=request.user)
|
||||
reservations = Reservation.objects.filter(
|
||||
Q(statut="validee")
|
||||
| Q(statut="en_attente", employe=employe)
|
||||
)
|
||||
except Employe.DoesNotExist:
|
||||
reservations = Reservation.objects.filter(statut="validee")
|
||||
|
||||
liste_reservation = []
|
||||
|
||||
for reservation in reservations:
|
||||
color = None
|
||||
if reservation.statut == "en_attente":
|
||||
color = "#ffc107"
|
||||
elif reservation.statut == "validee":
|
||||
color = "#198754"
|
||||
else:
|
||||
color = "#dc3545"
|
||||
color = "#198754"
|
||||
|
||||
liste_reservation.append({
|
||||
"guid": reservation.pk,
|
||||
@@ -146,6 +152,7 @@ def liste_reservation(request:HttpRequest):
|
||||
"start": reservation.heure_debut,
|
||||
"end": reservation.heure_fin,
|
||||
"color": color,
|
||||
"statut": dict(Reservation.STATUT).get(reservation.statut),
|
||||
})
|
||||
return JsonResponse(liste_reservation, safe=False)
|
||||
|
||||
@@ -183,6 +190,7 @@ def liste_reservation_attente(request):
|
||||
liste_reservation = [
|
||||
{
|
||||
**model_to_dict(reservation),
|
||||
"id": reservation.pk,
|
||||
"employe": f"{reservation.employe.user.first_name} {reservation.employe.user.last_name}",
|
||||
"employe_id": reservation.employe.user.id,
|
||||
"salle": dict(Reservation.TYPE_CHOICES).get(reservation.salle),
|
||||
@@ -193,6 +201,49 @@ def liste_reservation_attente(request):
|
||||
|
||||
return JsonResponse(liste_reservation, safe=False)
|
||||
|
||||
|
||||
@login_required
|
||||
def supprimer_reservation(request: HttpRequest, reservation_id: int):
|
||||
if request.method != "POST":
|
||||
return JsonResponse(
|
||||
{"success": False, "message": "Méthode non autorisée."},
|
||||
status=405,
|
||||
)
|
||||
|
||||
try:
|
||||
employe = Employe.objects.get(user=request.user)
|
||||
except Employe.DoesNotExist:
|
||||
return JsonResponse(
|
||||
{"success": False, "message": "Profil employé introuvable."},
|
||||
status=403,
|
||||
)
|
||||
|
||||
try:
|
||||
reservation = Reservation.objects.get(
|
||||
pk=reservation_id,
|
||||
employe=employe,
|
||||
)
|
||||
except Reservation.DoesNotExist:
|
||||
return JsonResponse(
|
||||
{"success": False, "message": "Réservation introuvable ou accès non autorisé."},
|
||||
status=404,
|
||||
)
|
||||
|
||||
if reservation.statut != "en_attente":
|
||||
return JsonResponse(
|
||||
{
|
||||
"success": False,
|
||||
"message": "Seules les réservations en attente peuvent être supprimées.",
|
||||
},
|
||||
status=400,
|
||||
)
|
||||
|
||||
reservation.delete()
|
||||
return JsonResponse(
|
||||
{"success": True, "message": "Votre réservation en attente a été supprimée."}
|
||||
)
|
||||
|
||||
|
||||
def detail_reservation(request:HttpRequest, reservation_id:int):
|
||||
reservation = Reservation.objects.get(id=reservation_id)
|
||||
employe = reservation.employe.user
|
||||
@@ -209,6 +260,8 @@ def detail_reservation(request:HttpRequest, reservation_id:int):
|
||||
'besoin_zoom': reservation.besoin_zoom,
|
||||
'besoin_ordinateur': reservation.besoin_ordi,
|
||||
'lien_zoom': reservation.lien_zoom or '',
|
||||
'est_proprietaire': request.user.is_authenticated and reservation.employe.user_id == request.user.id,
|
||||
'est_en_attente': reservation.statut == "en_attente",
|
||||
}
|
||||
|
||||
return JsonResponse(reservation_json, safe=True)
|
||||
|
||||
Reference in New Issue
Block a user