oimer/GTA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TypeCongés

Browse Source
This commit is contained in:
Ouijdane IMER
2025-08-12 17:26:18 +02:00
parent e1e4e81420
commit e4eb8a945c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
project/public/getPendingRequests.php
View File

@@ -55,7 +55,7 @@ function getWorkingDays($startDate, $endDate) {
} }
try { try {
// D'abord, récupérer le service du manager // Récupérer le service du manager
$queryManagerService = "SELECT ServiceId FROM Users WHERE ID = ?"; $queryManagerService = "SELECT ServiceId FROM Users WHERE ID = ?";
$stmtManager = $conn->prepare($queryManagerService); $stmtManager = $conn->prepare($queryManagerService);
$stmtManager->bind_param("i", $managerId); $stmtManager->bind_param("i", $managerId);
@@ -66,7 +66,7 @@ try {
$serviceId = $managerRow['ServiceId']; $serviceId = $managerRow['ServiceId'];
error_log("getPendingRequests - Service ID du manager: $serviceId"); error_log("getPendingRequests - Service ID du manager: $serviceId");
// Récupérer les demandes en attente de l'équipe // Récupérer les demandes en attente (multi-types)
$queryRequests = " $queryRequests = "
SELECT SELECT
dc.Id, dc.Id,
@@ -78,13 +78,16 @@ try {
dc.EmployeeId, dc.EmployeeId,
CONCAT(u.Prenom, ' ', u.Nom) as employee_name, CONCAT(u.Prenom, ' ', u.Nom) as employee_name,
u.Email as employee_email, u.Email as employee_email,
tc.Nom as type GROUP_CONCAT(tc.Nom ORDER BY tc.Nom SEPARATOR ', ') as types
FROM DemandeConge dc FROM DemandeConge dc
JOIN Users u ON dc.EmployeeId = u.ID JOIN Users u ON dc.EmployeeId = u.ID
JOIN TypeConge tc ON dc.TypeCongeId = tc.Id JOIN TypeConge tc ON FIND_IN_SET(tc.Id, dc.TypeCongeId)
WHERE u.ServiceId = ? WHERE u.ServiceId = ?
AND dc.Statut = 'En attente' AND dc.Statut = 'En attente'
AND u.ID != ? AND u.ID != ?
GROUP BY
dc.Id, dc.DateDebut, dc.DateFin, dc.Statut, dc.DateDemande,
dc.Commentaire, dc.EmployeeId, u.Prenom, u.Nom, u.Email
ORDER BY dc.DateDemande ASC ORDER BY dc.DateDemande ASC
"; ";
@@ -112,7 +115,7 @@ try {
'employee_id' => (int)$row['EmployeeId'], 'employee_id' => (int)$row['EmployeeId'],
'employee_name' => $row['employee_name'], 'employee_name' => $row['employee_name'],
'employee_email' => $row['employee_email'], 'employee_email' => $row['employee_email'],
'type' => $row['type'], 'type' => $row['types'], // ex: "Congé payé, RTT"
'start_date' => $row['DateDebut'], 'start_date' => $row['DateDebut'],
'end_date' => $row['DateFin'], 'end_date' => $row['DateFin'],
'date_display' => $dateDisplay, 'date_display' => $dateDisplay,