@@ -4379,7 +5323,6 @@ app.post('/api/submitLeaveRequest', uploadMedical.array('medicalDocuments', 5),
console.error('❌ Erreur email:', mailError.message);
}
} else {
- // ⭐ EMAIL NORMAL (incluant Récup)
const subjectCollab = '✅ Confirmation de réception de votre demande de congé';
const bodyCollab = `
@@ -4456,14 +5399,13 @@ app.post('/api/submitLeaveRequest', uploadMedical.array('medicalDocuments', 5),
}
});
-
app.get('/api/download-medical/:documentId', async (req, res) => {
try {
const { documentId } = req.params;
const conn = await pool.getConnection();
const [docs] = await conn.query(
- 'SELECT * FROM DocumentsMedicaux WHERE Id = ?',
+ 'SELECT TOP 1 * FROM DocumentsMedicaux WHERE Id = ?',
[documentId]
);
@@ -4487,6 +5429,7 @@ app.get('/api/download-medical/:documentId', async (req, res) => {
}
});
+
// Récupérer les documents d'une demande
app.get('/api/medical-documents/:demandeId', async (req, res) => {
try {
@@ -4520,6 +5463,8 @@ app.get('/api/medical-documents/:demandeId', async (req, res) => {
res.status(500).json({ success: false, message: 'Erreur serveur' });
}
});
+
+
app.post('/api/validateRequest', async (req, res) => {
const conn = await pool.getConnection();
try {
@@ -4532,15 +5477,19 @@ app.post('/api/validateRequest', async (req, res) => {
return res.json({ success: false, message: 'Données manquantes' });
}
- const [validator] = await conn.query('SELECT Id, prenom, nom, email, CampusId FROM CollaborateurAD WHERE Id = ?', [validator_id]);
+ // Récupérer le validateur
+ const [validator] = await conn.query(
+ 'SELECT TOP 1 Id, prenom, nom, email, CampusId FROM CollaborateurAD WHERE Id = ?',
+ [validator_id]
+ );
if (validator.length === 0) {
throw new Error('Validateur introuvable');
}
- // Récupérer les informations de la demande
+ // Récupérer la demande
const [requests] = await conn.query(
- `SELECT
+ `SELECT TOP 1
dc.Id,
dc.CollaborateurADId,
dc.TypeCongeId,
@@ -4556,8 +5505,7 @@ app.post('/api/validateRequest', async (req, res) => {
FROM DemandeConge dc
JOIN TypeConge tc ON dc.TypeCongeId = tc.Id
LEFT JOIN CollaborateurAD ca ON dc.CollaborateurADId = ca.Id
- WHERE dc.Id = ?
- LIMIT 1`,
+ WHERE dc.Id = ?`,
[request_id]
);
@@ -4567,7 +5515,6 @@ app.post('/api/validateRequest', async (req, res) => {
const request = requests[0];
- // ⭐ DÉBOGAGE : Afficher TOUTES les données
console.log('\n=== DONNÉES RÉCUPÉRÉES ===');
console.log('request:', JSON.stringify(request, null, 2));
console.log('validator:', JSON.stringify(validator[0], null, 2));
@@ -4579,31 +5526,41 @@ app.post('/api/validateRequest', async (req, res) => {
const newStatus = action === 'approve' ? 'Validée' : 'Refusée';
+ // Si refus, restaurer les soldes
if (action === 'reject' && request.CollaborateurADId) {
console.log(`\n🔄 REFUS - Restauration des soldes...`);
const restoration = await restoreLeaveBalance(conn, request_id, request.CollaborateurADId);
console.log('Restauration:', restoration);
}
+ // Mettre à jour le statut
await conn.query(
- `UPDATE DemandeConge SET Statut = ?, ValidateurId = ?, ValidateurADId = ?, DateValidation = NOW(), CommentaireValidation = ? WHERE Id = ?`,
+ `UPDATE DemandeConge
+ SET Statut = ?,
+ ValidateurId = ?,
+ ValidateurADId = ?,
+ DateValidation = GETDATE(),
+ CommentaireValidation = ?
+ WHERE Id = ?`,
[newStatus, validator_id, validator_id, comment || '', request_id]
);
+ // Créer une notification
const notifTitle = action === 'approve' ? 'Demande approuvée ✅' : 'Demande refusée ❌';
let notifMessage = `Votre demande a été ${action === 'approve' ? 'approuvée' : 'refusée'}`;
if (comment) notifMessage += ` (Commentaire: ${comment})`;
const notifType = action === 'approve' ? 'Success' : 'Error';
await conn.query(
- 'INSERT INTO Notifications (CollaborateurADId, Titre, Message, Type, DemandeCongeId, DateCreation, lu) VALUES (?, ?, ?, ?, ?, ?, 0)',
- [request.CollaborateurADId, notifTitle, notifMessage, notifType, request_id, nowFR()]
+ `INSERT INTO Notifications
+ (CollaborateurADId, Titre, Message, Type, DemandeCongeId, DateCreation, lu)
+ VALUES (?, ?, ?, ?, ?, GETDATE(), 0)`,
+ [request.CollaborateurADId, notifTitle, notifMessage, notifType, request_id]
);
await conn.commit();
- // ⭐ TEST EMAIL
- // ⭐ ENVOI EMAIL AVEC TEMPLATE PROFESSIONNEL
+ // Envoyer email via Microsoft Graph
console.log('\n📧 === TENTATIVE ENVOI EMAIL ===');
console.log('1. Récupération token...');
@@ -4629,116 +5586,49 @@ app.post('/api/validateRequest', async (req, res) => {
? '✅ Votre demande de congé a été approuvée'
: '❌ Votre demande de congé a été refusée';
- const body = action === 'approve'
- ? `
-
-
✅ Demande approuvée
-
-
-
Bonjour ${collaborateurNom},
-
Votre demande de congé a été approuvée par ${validateurNom}.
-
-
Type : ${request.TypeConge}
-
Période : ${datesPeriode}
-
Durée : ${request.NombreJours} jour(s)
- ${comment ? `
Commentaire : ${comment}
` : ''}
-
-
Vous pouvez consulter votre demande dans votre espace personnel.
-
-
`
- : `
-
-
❌ Demande refusée
-
-
-
Bonjour ${collaborateurNom},
-
Votre demande de congé a été refusée par ${validateurNom}.
-
-
Type : ${request.TypeConge}
-
Période : ${datesPeriode}
-
Durée : ${request.NombreJours} jour(s)
- ${comment ? `
Motif du refus : ${comment}
` : ''}
-
-
Pour plus d'informations, contactez ${validateurNom}.
-
-
`;
+ const emailHtml = `
+
+
+
+
${subject}
+
+
Bonjour ${collaborateurNom},
+
+
Votre demande de ${request.TypeConge} pour ${request.NombreJours} jour(s) ${datesPeriode} a été ${action === 'approve' ? 'approuvée' : 'refusée'} par ${validateurNom}.
+
+ ${comment ? `
Commentaire: ${comment}
` : ''}
+
+
Vous pouvez consulter les détails dans l'application GTA.
+
+
+
+
+ Ceci est un email automatique, merci de ne pas y répondre.
+
+
+
+
+ `;
- console.log('4. Sujet:', subject);
- console.log('5. Appel sendMailGraph...');
-
- try {
- await sendMailGraph(
- accessToken,
- fromEmail,
- request.collaborateur_email,
- subject,
- body
- );
- console.log('✅✅✅ EMAIL ENVOYÉ AVEC SUCCÈS ! ✅✅✅');
- } catch (mailError) {
- console.error('❌❌❌ ERREUR ENVOI EMAIL ❌❌❌');
- console.error('Message:', mailError.message);
- console.error('Stack:', mailError.stack);
- }
- } else {
- if (!accessToken) console.error('❌ Token manquant');
- if (!request.collaborateur_email) console.error('❌ Email collaborateur manquant');
- }
- console.log('=== FIN ENVOI EMAIL ===\n');
-
- // Notifier les clients SSE locaux
- notifyCollabClients({
- type: 'demande-validated',
- demandeId: parseInt(request_id),
- statut: newStatus,
- timestamp: new Date().toISOString()
- }, request.CollaborateurADId);
-
- notifyCollabClients({
- type: 'demande-list-updated',
- action: 'validation',
- demandeId: parseInt(request_id),
- timestamp: new Date().toISOString()
- });
-
- // Envoyer webhook au serveur RH
- try {
- await webhookManager.sendWebhook(
- WEBHOOKS.RH_URL,
- EVENTS.DEMANDE_VALIDATED,
- {
- demandeId: parseInt(request_id),
- statut: newStatus,
- collaborateurId: request.CollaborateurADId,
- validateurId: validator_id,
- commentaire: comment
- }
- );
- console.log('✅ Webhook envoyé au serveur RH');
- } catch (webhookError) {
- console.error('❌ Erreur envoi webhook (non bloquant):', webhookError.message);
+ const emailSent = await sendMailGraph(accessToken, fromEmail, request.collaborateur_email, subject, emailHtml);
+ console.log('4. Email envoyé ?', emailSent ? 'OUI ✅' : 'NON ❌');
}
res.json({
success: true,
- message: `Demande ${action === 'approve' ? 'approuvée' : 'refusée'}`,
- new_status: newStatus
+ message: `Demande ${action === 'approve' ? 'approuvée' : 'refusée'} avec succès`
});
- console.log(`✅ Demande ${request_id} ${newStatus}\n`);
-
} catch (error) {
await conn.rollback();
- console.error('\n❌ ERREUR lors de la validation:', error);
- res.status(500).json({
- success: false,
- message: error.message
- });
+ console.error('❌ Erreur validateRequest:', error);
+ res.status(500).json({ success: false, message: error.message });
} finally {
conn.release();
}
});
+
app.get('/api/testRestoration', async (req, res) => {
const conn = await pool.getConnection();
try {
@@ -4888,7 +5778,7 @@ app.get('/api/getCampusBySociete', async (req, res) => {
// ========================================
app.get('/api/getTeamLeaves', async (req, res) => {
try {
- let { user_id: userIdParam, role: roleParam, selectedCampus, selectedSociete, selectedService } = req.query;
+ let { user_id: userIdParam, role: roleParam, selectedCampus, selectedSociete, selectedService } = req.query;
console.log(`🔍 Paramètres reçus: user_id=${userIdParam}, role=${roleParam}, selectedCampus=${selectedCampus}`);
@@ -4896,11 +5786,12 @@ app.get('/api/getTeamLeaves', async (req, res) => {
return res.json({ success: false, message: 'ID utilisateur manquant' });
}
- const conn = await pool.getConnection();
-
const isUUID = userIdParam.length > 10 && userIdParam.includes('-');
console.log(`📝 Type ID détecté: ${isUUID ? 'UUID' : 'Numérique'}`);
+ const userRequest = pool.request();
+ userRequest.input('userIdParam', userIdParam);
+
const userQuery = `
SELECT
ca.id,
@@ -4915,23 +5806,23 @@ app.get('/api/getTeamLeaves', async (req, res) => {
LEFT JOIN Services s ON ca.ServiceId = s.Id
LEFT JOIN Campus c ON ca.CampusId = c.Id
LEFT JOIN Societe so ON ca.SocieteId = so.Id
- WHERE ${isUUID ? 'ca.entraUserId' : 'ca.id'} = ?
- LIMIT 1
+ WHERE ${isUUID ? 'ca.entraUserId' : 'ca.id'} = @userIdParam
`;
- const [userRows] = await conn.query(userQuery, [userIdParam]);
+ const userResult = await userRequest.query(userQuery);
- if (!userRows || userRows.length === 0) {
- conn.release();
+ if (!userResult.recordset || userResult.recordset.length === 0) {
return res.json({ success: false, message: 'Collaborateur non trouvé' });
}
- const userInfo = userRows[0];
+ const userInfo = userResult.recordset[0];
const serviceId = userInfo.ServiceId;
const campusId = userInfo.CampusId;
const societeId = userInfo.SocieteId;
const userEmail = userInfo.email;
const campusNom = userInfo.campusNom;
+ const serviceNom = userInfo.serviceNom;
+ const societeNom = userInfo.societeNom;
function normalizeRole(role) {
if (!role) return null;
@@ -4952,138 +5843,122 @@ app.get('/api/getTeamLeaves', async (req, res) => {
console.log(` - ServiceId: ${serviceId}`);
console.log(` - CampusId: ${campusId}`);
console.log(` - CampusNom: ${campusNom}`);
+ console.log(` - ServiceNom: ${serviceNom}`);
console.log(` - SocieteId: ${societeId}`);
console.log(` - Role normalisé: ${role}`);
- let query, params;
const filters = {};
-
-
- // ========================================
- // CAS 1: PRESIDENT, ADMIN, RH
- // ========================================
// ========================================
// CAS 1: PRESIDENT, ADMIN, RH, DIRECTEUR DE CAMPUS
+ // ⚠️ SANS VALIDATEUR - C'est la correction principale !
// ========================================
if (role === 'president' || role === 'admin' || role === 'rh' || role === 'directeur de campus') {
console.log("CAS 1: President/Admin/RH/Directeur de Campus - Vue globale");
console.log(` Filtres reçus: Société=${selectedSociete}, Campus=${selectedCampus}, Service=${selectedService}`);
- // ========================================
- // 🔧 LISTE COMPLÈTE DES FILTRES DISPONIBLES
- // ========================================
-
- // 1️⃣ SOCIÉTÉS (toutes disponibles)
- const [societesList] = await conn.query(`
- SELECT DISTINCT Nom
- FROM Societe
- ORDER BY Nom
- `);
- filters.societes = societesList.map(s => s.Nom);
+ // 1️⃣ SOCIÉTÉS
+ const societesRequest = pool.request();
+ const societesResult = await societesRequest.query(`
+ SELECT DISTINCT Nom
+ FROM Societe
+ ORDER BY Nom
+ `);
+ filters.societes = societesResult.recordset.map(s => s.Nom);
console.log('📊 Sociétés disponibles:', filters.societes);
- // 2️⃣ CAMPUS (tous les campus, filtrés par société si nécessaire)
+ // 2️⃣ CAMPUS
+ let campusRequest = pool.request();
let campusQuery;
- let campusParams = [];
if (selectedSociete && selectedSociete !== 'all') {
campusQuery = `
- SELECT DISTINCT c.Nom
- FROM Campus c
- JOIN CollaborateurAD ca ON ca.CampusId = c.Id
- JOIN Societe so ON ca.SocieteId = so.Id
- WHERE so.Nom = ?
- AND (ca.actif = 1 OR ca.actif IS NULL)
- ORDER BY c.Nom
- `;
- campusParams = [selectedSociete];
+ SELECT DISTINCT c.Nom
+ FROM Campus c
+ JOIN CollaborateurAD ca ON ca.CampusId = c.Id
+ JOIN Societe so ON ca.SocieteId = so.Id
+ WHERE so.Nom = @selectedSociete
+ AND (ca.actif = 1 OR ca.actif IS NULL)
+ ORDER BY c.Nom
+ `;
+ campusRequest.input('selectedSociete', selectedSociete);
} else {
campusQuery = `
- SELECT DISTINCT Nom
- FROM Campus
- ORDER BY Nom
- `;
+ SELECT DISTINCT Nom
+ FROM Campus
+ ORDER BY Nom
+ `;
}
- const [campusList] = await conn.query(campusQuery, campusParams);
- filters.campus = campusList.map(c => c.Nom);
+ const campusResult = await campusRequest.query(campusQuery);
+ filters.campus = campusResult.recordset.map(c => c.Nom);
console.log('📊 Campus disponibles:', filters.campus);
- // ⭐ NOUVEAU : Pour directeur de campus, envoyer son campus par défaut
if (role === 'directeur de campus') {
- filters.defaultCampus = campusNom; // Le campus du directeur
+ filters.defaultCampus = campusNom;
console.log('🏢 Campus par défaut pour directeur:', campusNom);
}
- // 3️⃣ SERVICES (filtrés selon société + campus)
+ // 3️⃣ SERVICES
let servicesQuery = `
- SELECT DISTINCT s.Nom
- FROM Services s
- JOIN CollaborateurAD ca ON ca.ServiceId = s.Id
- `;
+ SELECT DISTINCT s.Nom
+ FROM Services s
+ JOIN CollaborateurAD ca ON ca.ServiceId = s.Id
+ `;
- let servicesJoins = [];
let servicesConditions = ['(ca.actif = 1 OR ca.actif IS NULL)'];
- let servicesParams = [];
+ let servicesRequest = pool.request();
if (selectedSociete && selectedSociete !== 'all') {
- servicesJoins.push('JOIN Societe so ON ca.SocieteId = so.Id');
- servicesConditions.push('so.Nom = ?');
- servicesParams.push(selectedSociete);
+ servicesQuery += '\nJOIN Societe so ON ca.SocieteId = so.Id';
+ servicesConditions.push('so.Nom = @selectedSociete');
+ servicesRequest.input('selectedSociete', selectedSociete);
}
if (selectedCampus && selectedCampus !== 'all') {
- servicesJoins.push('JOIN Campus c ON ca.CampusId = c.Id');
- servicesConditions.push('c.Nom = ?');
- servicesParams.push(selectedCampus);
- }
-
- if (servicesJoins.length > 0) {
- servicesQuery += '\n' + servicesJoins.join('\n');
+ servicesQuery += '\nJOIN Campus c ON ca.CampusId = c.Id';
+ servicesConditions.push('c.Nom = @selectedCampus');
+ servicesRequest.input('selectedCampus', selectedCampus);
}
servicesQuery += `\nWHERE ${servicesConditions.join(' AND ')}\nORDER BY s.Nom`;
- const [servicesList] = await conn.query(servicesQuery, servicesParams);
- filters.services = servicesList.map(s => s.Nom);
+ const servicesResult = await servicesRequest.query(servicesQuery);
+ filters.services = servicesResult.recordset.map(s => s.Nom);
- // ========================================
- // 🔧 LISTE DES EMPLOYÉS (avec filtres appliqués)
- // ========================================
+ // ⭐ LISTE DES EMPLOYÉS
let employeesQuery = `
- SELECT DISTINCT
- CONCAT(ca.prenom, ' ', ca.nom) AS fullname,
- c.Nom AS campusnom,
- so.Nom AS societenom,
- s.Nom AS servicenom
- FROM CollaborateurAD ca
- JOIN Services s ON ca.ServiceId = s.Id
- JOIN Campus c ON ca.CampusId = c.Id
- JOIN Societe so ON ca.SocieteId = so.Id
- WHERE (ca.actif = 1 OR ca.actif IS NULL)
- `;
+ SELECT
+ CONCAT(ca.prenom, ' ', ca.nom) AS fullname,
+ c.Nom AS campusnom,
+ so.Nom AS societenom,
+ s.Nom AS servicenom
+ FROM CollaborateurAD ca
+ JOIN Services s ON ca.ServiceId = s.Id
+ JOIN Campus c ON ca.CampusId = c.Id
+ JOIN Societe so ON ca.SocieteId = so.Id
+ WHERE (ca.actif = 1 OR ca.actif IS NULL)
+ `;
let employeesConditions = [];
- let employeesParams = [];
+ let employeesRequest = pool.request();
if (selectedSociete && selectedSociete !== 'all') {
- employeesConditions.push('so.Nom = ?');
- employeesParams.push(selectedSociete);
+ employeesConditions.push('so.Nom = @selectedSociete');
+ employeesRequest.input('selectedSociete', selectedSociete);
}
if (selectedCampus && selectedCampus !== 'all') {
- employeesConditions.push('c.Nom = ?');
- employeesParams.push(selectedCampus);
+ employeesConditions.push('c.Nom = @selectedCampus');
+ employeesRequest.input('selectedCampus', selectedCampus);
} else if (role === 'directeur de campus' && campusNom) {
- // ⭐ NOUVEAU : Si directeur et pas de filtre campus, filtrer par son campus par défaut
- employeesConditions.push('c.Nom = ?');
- employeesParams.push(campusNom);
+ employeesConditions.push('c.Nom = @campusNom');
+ employeesRequest.input('campusNom', campusNom);
}
if (selectedService && selectedService !== 'all') {
- employeesConditions.push('s.Nom = ?');
- employeesParams.push(selectedService);
+ employeesConditions.push('s.Nom = @selectedService');
+ employeesRequest.input('selectedService', selectedService);
}
if (employeesConditions.length > 0) {
@@ -5092,9 +5967,9 @@ app.get('/api/getTeamLeaves', async (req, res) => {
employeesQuery += ` ORDER BY so.Nom, c.Nom, ca.prenom, ca.nom`;
- const [employeesList] = await conn.query(employeesQuery, employeesParams);
+ const employeesResult = await employeesRequest.query(employeesQuery);
- filters.employees = employeesList.map(e => ({
+ filters.employees = employeesResult.recordset.map(e => ({
name: e.fullname,
campus: e.campusnom,
societe: e.societenom,
@@ -5103,195 +5978,196 @@ app.get('/api/getTeamLeaves', async (req, res) => {
console.log(`👥 Employés trouvés:`, filters.employees.length);
- // ========================================
- // 🔧 QUERY DES CONGÉS (avec filtres appliqués)
- // ========================================
+ // QUERY DES CONGÉS
let whereConditions = [`dc.Statut IN ('Validé', 'Validée', 'Valide', 'En attente')`];
- let whereParams = [];
+ let queryRequest = pool.request();
if (selectedSociete && selectedSociete !== 'all') {
- whereConditions.push('so.Nom = ?');
- whereParams.push(selectedSociete);
+ whereConditions.push('so.Nom = @selectedSociete');
+ queryRequest.input('selectedSociete', selectedSociete);
}
if (selectedCampus && selectedCampus !== 'all') {
- whereConditions.push('c.Nom = ?');
- whereParams.push(selectedCampus);
+ whereConditions.push('c.Nom = @selectedCampus');
+ queryRequest.input('selectedCampus', selectedCampus);
} else if (role === 'directeur de campus' && campusNom) {
- // ⭐ NOUVEAU : Si directeur et pas de filtre campus, filtrer par son campus par défaut
- whereConditions.push('c.Nom = ?');
- whereParams.push(campusNom);
+ whereConditions.push('c.Nom = @campusNom');
+ queryRequest.input('campusNom', campusNom);
}
if (selectedService && selectedService !== 'all') {
- whereConditions.push('s.Nom = ?');
- whereParams.push(selectedService);
+ whereConditions.push('s.Nom = @selectedService');
+ queryRequest.input('selectedService', selectedService);
}
- query = `
- SELECT
- DATE_FORMAT(dc.DateDebut, '%Y-%m-%d') AS startdate,
- DATE_FORMAT(dc.DateFin, '%Y-%m-%d') AS enddate,
- CONCAT(ca.prenom, ' ', ca.nom) AS employeename,
- GROUP_CONCAT(DISTINCT tc.Nom ORDER BY tc.Nom SEPARATOR ', ') AS type,
- CONCAT(
- '[',
- GROUP_CONCAT(
- JSON_OBJECT(
- 'type', tc.Nom,
- 'jours', dct.NombreJours,
- 'periode', COALESCE(dct.PeriodeJournee, 'Journée entière')
- )
- SEPARATOR ','
- ),
- ']'
- ) AS detailsconges,
- MAX(tc.CouleurHex) AS color,
- dc.Statut AS statut,
- s.Nom AS servicenom,
- c.Nom AS campusnom,
- so.Nom AS societenom,
- dc.NombreJours AS nombrejoursouvres
- FROM DemandeConge dc
- JOIN CollaborateurAD ca ON dc.CollaborateurADId = ca.id
- LEFT JOIN DemandeCongeType dct ON dc.Id = dct.DemandeCongeId
- LEFT JOIN TypeConge tc ON dct.TypeCongeId = tc.Id
- JOIN Services s ON ca.ServiceId = s.Id
- JOIN Campus c ON ca.CampusId = c.Id
- JOIN Societe so ON ca.SocieteId = so.Id
- WHERE ${whereConditions.join(' AND ')}
- GROUP BY dc.Id, dc.DateDebut, dc.DateFin, ca.prenom, ca.nom, dc.Statut, s.Nom, c.Nom, so.Nom, dc.NombreJours
- ORDER BY so.Nom, c.Nom, dc.DateDebut ASC
- `;
- params = whereParams;
+ const query = `
+ SELECT
+ CONVERT(VARCHAR(10), dc.DateDebut, 23) AS startdate,
+ CONVERT(VARCHAR(10), dc.DateFin, 23) AS enddate,
+ CONCAT(ca.prenom, ' ', ca.nom) AS employeename,
+ (
+ SELECT STRING_AGG(Nom, ', ') WITHIN GROUP (ORDER BY Nom)
+ FROM (SELECT DISTINCT tc2.Nom
+ FROM DemandeCongeType dct2
+ JOIN TypeConge tc2 ON dct2.TypeCongeId = tc2.Id
+ WHERE dct2.DemandeCongeId = dc.Id) AS DistinctTypes
+ ) AS type,
+ CONCAT(
+ '[',
+ STRING_AGG(
+ CONCAT(
+ '{"type":"', tc.Nom,
+ '","jours":', dct.NombreJours,
+ ',"periode":"', COALESCE(dct.PeriodeJournee, 'Journée entière'), '"}'
+ ),
+ ','
+ ),
+ ']'
+ ) AS detailsconges,
+ MAX(tc.CouleurHex) AS color,
+ dc.Statut AS statut,
+ s.Nom AS servicenom,
+ c.Nom AS campusnom,
+ so.Nom AS societenom,
+ dc.NombreJours AS nombrejoursouvres
+ FROM DemandeConge dc
+ JOIN CollaborateurAD ca ON dc.CollaborateurADId = ca.id
+ LEFT JOIN DemandeCongeType dct ON dc.Id = dct.DemandeCongeId
+ LEFT JOIN TypeConge tc ON dct.TypeCongeId = tc.Id
+ JOIN Services s ON ca.ServiceId = s.Id
+ JOIN Campus c ON ca.CampusId = c.Id
+ JOIN Societe so ON ca.SocieteId = so.Id
+ WHERE ${whereConditions.join(' AND ')}
+ GROUP BY dc.Id, dc.DateDebut, dc.DateFin, ca.prenom, ca.nom, dc.Statut, s.Nom, c.Nom, so.Nom, dc.NombreJours
+ ORDER BY c.Nom, dc.DateDebut ASC
+ `;
console.log(`🔍 Query finale WHERE:`, whereConditions.join(' AND '));
- console.log(`🔍 Params:`, whereParams);
+
+ const leavesResult = await queryRequest.query(query);
+ const formattedLeaves = leavesResult.recordset.map(leave => ({
+ ...leave
+ }));
+
+ console.log(`✅ ${formattedLeaves.length} congés trouvés`);
+
+ return res.json({
+ success: true,
+ role: role,
+ leaves: formattedLeaves,
+ filters: filters
+ });
}
-
-
// ========================================
- // CAS 3: COLLABORATEUR
+ // CAS 2: VALIDATEUR - Vue équipe via HierarchieValidationAD
+ // ⚠️ C'est ici que le validateur doit tomber !
// ========================================
- // Dans la route /getTeamLeaves, modifiez la section CAS 3: COLLABORATEUR
- // ========================================
- // CAS 3: COLLABORATEUR
- // ========================================
- // ========================================
- // CAS 3: COLLABORATEUR
- // ========================================
- else if (role === 'collaborateur' || role === 'validateur' || role === 'apprenti') {
- console.log("CAS 3: Collaborateur/Apprenti avec filtres avancés");
+ else if (role === 'validateur') {
+ console.log("CAS 2: Validateur - Vue de l'équipe via HierarchieValidationAD");
- const serviceNom = userInfo.serviceNom || 'Non défini';
- const campusNom = userInfo.campusNom || 'Non défini';
- const societeNom = userInfo.societeNom || 'Non défini';
+ console.log(`📍 Validateur: Service=${serviceNom}, Campus=${campusNom}, Société=${societeNom}`);
- console.log(`📍 Filtres reçus du frontend: Société=${selectedSociete}, Campus=${selectedCampus}, Service=${selectedService}`);
-
- // ⭐ NOUVEAU : Si AUCUN filtre n'est envoyé (premier chargement), utiliser les valeurs par défaut
- // Sinon, respecter EXACTEMENT ce que le frontend envoie (même "all")
const isFirstLoad = !selectedCampus && !selectedService && !selectedSociete;
if (isFirstLoad) {
- console.log('🎯 Premier chargement : initialisation avec service par défaut');
+ console.log('🎯 Premier chargement validateur : initialisation avec valeurs par défaut');
selectedCampus = campusNom;
selectedService = serviceNom;
selectedSociete = societeNom;
}
- // Si le frontend envoie "all", on garde "all" (ne pas forcer les valeurs par défaut)
- console.log(`📍 Filtres appliqués finaux: Société=${selectedSociete}, Campus=${selectedCampus}, Service=${selectedService}`);
+ console.log(`📍 Filtres appliqués: Société=${selectedSociete}, Campus=${selectedCampus}, Service=${selectedService}`);
- // ⭐ Construire les listes de filtres disponibles
- // 1️⃣ Sociétés disponibles (TOUTES)
- const [societesList] = await conn.query(`
- SELECT DISTINCT so.Nom
- FROM Societe so
- JOIN CollaborateurAD ca ON ca.SocieteId = so.Id
- WHERE (ca.actif = 1 OR ca.actif IS NULL)
- ORDER BY so.Nom
- `);
- filters.societes = societesList.map(s => s.Nom);
+ // Sociétés disponibles
+ const societesRequest = pool.request();
+ const societesResult = await societesRequest.query(`
+ SELECT DISTINCT so.Nom
+ FROM Societe so
+ JOIN CollaborateurAD ca ON ca.SocieteId = so.Id
+ WHERE (ca.actif = 1 OR ca.actif IS NULL)
+ ORDER BY so.Nom
+ `);
+ filters.societes = societesResult.recordset.map(s => s.Nom);
- // 2️⃣ Campus disponibles (filtrés par société si sélectionné)
+ // Campus disponibles
let campusQuery = `
- SELECT DISTINCT c.Nom
- FROM Campus c
- JOIN CollaborateurAD ca ON ca.CampusId = c.Id
- WHERE (ca.actif = 1 OR ca.actif IS NULL)
- `;
- let campusParams = [];
+ SELECT DISTINCT c.Nom
+ FROM Campus c
+ JOIN CollaborateurAD ca ON ca.CampusId = c.Id
+ WHERE (ca.actif = 1 OR ca.actif IS NULL)
+ `;
+ let campusRequest = pool.request();
if (selectedSociete && selectedSociete !== 'all') {
- campusQuery += ` AND ca.SocieteId = (SELECT Id FROM Societe WHERE Nom = ? LIMIT 1)`;
- campusParams.push(selectedSociete);
+ campusQuery += ` AND ca.SocieteId = (SELECT Id FROM Societe WHERE Nom = @selectedSociete)`;
+ campusRequest.input('selectedSociete', selectedSociete);
}
campusQuery += ` ORDER BY c.Nom`;
- const [campusList] = await conn.query(campusQuery, campusParams);
- filters.campus = campusList.map(c => c.Nom);
+ const campusResult = await campusRequest.query(campusQuery);
+ filters.campus = campusResult.recordset.map(c => c.Nom);
- // 3️⃣ Services disponibles (filtrés par société + campus)
+ // Services disponibles
let servicesQuery = `
- SELECT DISTINCT s.Nom
- FROM Services s
- JOIN CollaborateurAD ca ON ca.ServiceId = s.Id
- WHERE (ca.actif = 1 OR ca.actif IS NULL)
- `;
- let servicesParams = [];
+ SELECT DISTINCT s.Nom
+ FROM Services s
+ JOIN CollaborateurAD ca ON ca.ServiceId = s.Id
+ WHERE (ca.actif = 1 OR ca.actif IS NULL)
+ `;
+ let servicesRequest = pool.request();
if (selectedSociete && selectedSociete !== 'all') {
- servicesQuery += ` AND ca.SocieteId = (SELECT Id FROM Societe WHERE Nom = ? LIMIT 1)`;
- servicesParams.push(selectedSociete);
+ servicesQuery += ` AND ca.SocieteId = (SELECT Id FROM Societe WHERE Nom = @selectedSociete)`;
+ servicesRequest.input('selectedSociete', selectedSociete);
}
if (selectedCampus && selectedCampus !== 'all') {
- servicesQuery += ` AND ca.CampusId = (SELECT Id FROM Campus WHERE Nom = ? LIMIT 1)`;
- servicesParams.push(selectedCampus);
+ servicesQuery += ` AND ca.CampusId = (SELECT Id FROM Campus WHERE Nom = @selectedCampus)`;
+ servicesRequest.input('selectedCampus', selectedCampus);
}
servicesQuery += ` ORDER BY s.Nom`;
- const [servicesList] = await conn.query(servicesQuery, servicesParams);
- filters.services = servicesList.map(s => s.Nom);
+ const servicesResult = await servicesRequest.query(servicesQuery);
+ filters.services = servicesResult.recordset.map(s => s.Nom);
- // ⭐ Envoyer les valeurs par défaut au frontend (pour initialisation)
filters.defaultCampus = campusNom;
filters.defaultService = serviceNom;
filters.defaultSociete = societeNom;
- // ⭐ LISTE DES EMPLOYÉS (avec filtres conditionnels)
+ // ⭐ LISTE DES EMPLOYÉS - UNIQUEMENT CEUX DE L'ÉQUIPE DU VALIDATEUR
let employeesQuery = `
- SELECT DISTINCT
- CONCAT(ca.prenom, ' ', ca.nom) AS fullname,
- c.Nom AS campusnom,
- so.Nom AS societenom,
- s.Nom AS servicenom
- FROM CollaborateurAD ca
- JOIN Services s ON ca.ServiceId = s.Id
- JOIN Campus c ON ca.CampusId = c.Id
- JOIN Societe so ON ca.SocieteId = so.Id
- WHERE (ca.actif = 1 OR ca.actif IS NULL)
- `;
+ SELECT
+ CONCAT(ca.prenom, ' ', ca.nom) AS fullname,
+ c.Nom AS campusnom,
+ so.Nom AS societenom,
+ s.Nom AS servicenom
+ FROM CollaborateurAD ca
+ JOIN Services s ON ca.ServiceId = s.Id
+ JOIN Campus c ON ca.CampusId = c.Id
+ JOIN Societe so ON ca.SocieteId = so.Id
+ JOIN HierarchieValidationAD h ON ca.id = h.CollaborateurId
+ WHERE h.SuperieurId = @userId
+ AND (ca.actif = 1 OR ca.actif IS NULL)
+ `;
- let employeesParams = [];
+ let employeesRequest = pool.request();
+ employeesRequest.input('userId', userInfo.id);
let employeesConditions = [];
- // ⭐ N'ajouter les filtres QUE si différents de "all"
if (selectedSociete && selectedSociete !== 'all') {
- employeesConditions.push('so.Nom = ?');
- employeesParams.push(selectedSociete);
+ employeesConditions.push('so.Nom = @selectedSociete');
+ employeesRequest.input('selectedSociete', selectedSociete);
}
if (selectedCampus && selectedCampus !== 'all') {
- employeesConditions.push('c.Nom = ?');
- employeesParams.push(selectedCampus);
+ employeesConditions.push('c.Nom = @selectedCampus');
+ employeesRequest.input('selectedCampus', selectedCampus);
}
if (selectedService && selectedService !== 'all') {
- employeesConditions.push('s.Nom = ?');
- employeesParams.push(selectedService);
+ employeesConditions.push('s.Nom = @selectedService');
+ employeesRequest.input('selectedService', selectedService);
}
if (employeesConditions.length > 0) {
@@ -5300,9 +6176,221 @@ app.get('/api/getTeamLeaves', async (req, res) => {
employeesQuery += ` ORDER BY s.Nom, ca.prenom, ca.nom`;
- const [employeesList] = await conn.query(employeesQuery, employeesParams);
+ const employeesResult = await employeesRequest.query(employeesQuery);
- filters.employees = employeesList.map(emp => ({
+ filters.employees = employeesResult.recordset.map(emp => ({
+ name: emp.fullname,
+ campus: emp.campusnom,
+ societe: emp.societenom,
+ service: emp.servicenom
+ }));
+
+ console.log(`👥 Équipe du validateur: ${filters.employees.length} personnes`);
+
+ // ⭐ QUERY DES CONGÉS - UNIQUEMENT LES COLLABORATEURS DU VALIDATEUR
+ let queryConditions = `WHERE dc.Statut IN ('Validé', 'Validée', 'Valide', 'En attente')
+ AND ca.id IN (
+ SELECT CollaborateurId FROM HierarchieValidationAD WHERE SuperieurId = @userId
+ )`;
+
+ let queryRequest = pool.request();
+ queryRequest.input('userId', userInfo.id);
+ let congesConditions = [];
+
+ if (selectedSociete && selectedSociete !== 'all') {
+ congesConditions.push('so.Nom = @selectedSociete');
+ queryRequest.input('selectedSociete', selectedSociete);
+ }
+
+ if (selectedCampus && selectedCampus !== 'all') {
+ congesConditions.push('c.Nom = @selectedCampus');
+ queryRequest.input('selectedCampus', selectedCampus);
+ }
+
+ if (selectedService && selectedService !== 'all') {
+ congesConditions.push('s.Nom = @selectedService');
+ queryRequest.input('selectedService', selectedService);
+ }
+
+ if (congesConditions.length > 0) {
+ queryConditions += ` AND ${congesConditions.join(' AND ')}`;
+ }
+
+ const query = `
+ SELECT
+ CONVERT(VARCHAR(10), dc.DateDebut, 23) AS startdate,
+ CONVERT(VARCHAR(10), dc.DateFin, 23) AS enddate,
+ CONCAT(ca.prenom, ' ', ca.nom) AS employeename,
+ (
+ SELECT STRING_AGG(Nom, ', ') WITHIN GROUP (ORDER BY Nom)
+ FROM (SELECT DISTINCT tc2.Nom
+ FROM DemandeCongeType dct2
+ JOIN TypeConge tc2 ON dct2.TypeCongeId = tc2.Id
+ WHERE dct2.DemandeCongeId = dc.Id) AS DistinctTypes
+ ) AS type,
+ CONCAT(
+ '[',
+ STRING_AGG(
+ CONCAT(
+ '{"type":"', tc.Nom,
+ '","jours":', dct.NombreJours,
+ ',"periode":"', COALESCE(dct.PeriodeJournee, 'Journée entière'), '"}'
+ ),
+ ','
+ ),
+ ']'
+ ) AS detailsconges,
+ MAX(tc.CouleurHex) AS color,
+ dc.Statut AS statut,
+ s.Nom AS servicenom,
+ c.Nom AS campusnom,
+ so.Nom AS societenom,
+ dc.NombreJours AS nombrejoursouvres
+ FROM DemandeConge dc
+ JOIN CollaborateurAD ca ON dc.CollaborateurADId = ca.id
+ LEFT JOIN DemandeCongeType dct ON dc.Id = dct.DemandeCongeId
+ LEFT JOIN TypeConge tc ON dct.TypeCongeId = tc.Id
+ JOIN Services s ON ca.ServiceId = s.Id
+ JOIN Campus c ON ca.CampusId = c.Id
+ JOIN Societe so ON ca.SocieteId = so.Id
+ ${queryConditions}
+ GROUP BY dc.Id, dc.DateDebut, dc.DateFin, ca.prenom, ca.nom, dc.Statut, s.Nom, c.Nom, so.Nom, dc.NombreJours
+ ORDER BY s.Nom, dc.DateDebut ASC
+ `;
+
+ console.log(`🔍 Query WHERE final validateur:`, queryConditions);
+
+ const leavesResult = await queryRequest.query(query);
+ const formattedLeaves = leavesResult.recordset.map(leave => ({
+ ...leave
+ }));
+
+ console.log(`✅ ${formattedLeaves.length} congés trouvés pour l'équipe du validateur`);
+
+ return res.json({
+ success: true,
+ role: role,
+ leaves: formattedLeaves,
+ filters: filters
+ });
+ }
+
+ // ========================================
+ // CAS 3: COLLABORATEUR / APPRENTI
+ // ========================================
+ else if (role === 'collaborateur' || role === 'apprenti') {
+ console.log("CAS 3: Collaborateur/Apprenti avec filtres avancés");
+
+ console.log(`📍 Filtres reçus du frontend: Société=${selectedSociete}, Campus=${selectedCampus}, Service=${selectedService}`);
+
+ const isFirstLoad = !selectedCampus && !selectedService && !selectedSociete;
+
+ if (isFirstLoad) {
+ console.log('🎯 Premier chargement : initialisation avec service par défaut');
+ selectedCampus = campusNom;
+ selectedService = serviceNom;
+ selectedSociete = societeNom;
+ }
+
+ console.log(`📍 Filtres appliqués finaux: Société=${selectedSociete}, Campus=${selectedCampus}, Service=${selectedService}`);
+
+ // Sociétés disponibles
+ const societesRequest = pool.request();
+ const societesResult = await societesRequest.query(`
+ SELECT DISTINCT so.Nom
+ FROM Societe so
+ JOIN CollaborateurAD ca ON ca.SocieteId = so.Id
+ WHERE (ca.actif = 1 OR ca.actif IS NULL)
+ ORDER BY so.Nom
+ `);
+ filters.societes = societesResult.recordset.map(s => s.Nom);
+
+ // Campus disponibles
+ let campusQuery = `
+ SELECT DISTINCT c.Nom
+ FROM Campus c
+ JOIN CollaborateurAD ca ON ca.CampusId = c.Id
+ WHERE (ca.actif = 1 OR ca.actif IS NULL)
+ `;
+ let campusRequest = pool.request();
+
+ if (selectedSociete && selectedSociete !== 'all') {
+ campusQuery += ` AND ca.SocieteId = (SELECT Id FROM Societe WHERE Nom = @selectedSociete)`;
+ campusRequest.input('selectedSociete', selectedSociete);
+ }
+
+ campusQuery += ` ORDER BY c.Nom`;
+ const campusResult = await campusRequest.query(campusQuery);
+ filters.campus = campusResult.recordset.map(c => c.Nom);
+
+ // Services disponibles
+ let servicesQuery = `
+ SELECT DISTINCT s.Nom
+ FROM Services s
+ JOIN CollaborateurAD ca ON ca.ServiceId = s.Id
+ WHERE (ca.actif = 1 OR ca.actif IS NULL)
+ `;
+ let servicesRequest = pool.request();
+
+ if (selectedSociete && selectedSociete !== 'all') {
+ servicesQuery += ` AND ca.SocieteId = (SELECT Id FROM Societe WHERE Nom = @selectedSociete)`;
+ servicesRequest.input('selectedSociete', selectedSociete);
+ }
+
+ if (selectedCampus && selectedCampus !== 'all') {
+ servicesQuery += ` AND ca.CampusId = (SELECT Id FROM Campus WHERE Nom = @selectedCampus)`;
+ servicesRequest.input('selectedCampus', selectedCampus);
+ }
+
+ servicesQuery += ` ORDER BY s.Nom`;
+ const servicesResult = await servicesRequest.query(servicesQuery);
+ filters.services = servicesResult.recordset.map(s => s.Nom);
+
+ filters.defaultCampus = campusNom;
+ filters.defaultService = serviceNom;
+ filters.defaultSociete = societeNom;
+
+ // ⭐ LISTE DES EMPLOYÉS
+ let employeesQuery = `
+ SELECT
+ CONCAT(ca.prenom, ' ', ca.nom) AS fullname,
+ c.Nom AS campusnom,
+ so.Nom AS societenom,
+ s.Nom AS servicenom
+ FROM CollaborateurAD ca
+ JOIN Services s ON ca.ServiceId = s.Id
+ JOIN Campus c ON ca.CampusId = c.Id
+ JOIN Societe so ON ca.SocieteId = so.Id
+ WHERE (ca.actif = 1 OR ca.actif IS NULL)
+ `;
+
+ let employeesRequest = pool.request();
+ let employeesConditions = [];
+
+ if (selectedSociete && selectedSociete !== 'all') {
+ employeesConditions.push('so.Nom = @selectedSociete');
+ employeesRequest.input('selectedSociete', selectedSociete);
+ }
+
+ if (selectedCampus && selectedCampus !== 'all') {
+ employeesConditions.push('c.Nom = @selectedCampus');
+ employeesRequest.input('selectedCampus', selectedCampus);
+ }
+
+ if (selectedService && selectedService !== 'all') {
+ employeesConditions.push('s.Nom = @selectedService');
+ employeesRequest.input('selectedService', selectedService);
+ }
+
+ if (employeesConditions.length > 0) {
+ employeesQuery += ` AND ${employeesConditions.join(' AND ')}`;
+ }
+
+ employeesQuery += ` ORDER BY s.Nom, ca.prenom, ca.nom`;
+
+ const employeesResult = await employeesRequest.query(employeesQuery);
+
+ filters.employees = employeesResult.recordset.map(emp => ({
name: emp.fullname,
campus: emp.campusnom,
societe: emp.societenom,
@@ -5311,94 +6399,114 @@ app.get('/api/getTeamLeaves', async (req, res) => {
console.log(`👥 Employés trouvés: ${filters.employees.length}`);
- // ⭐ QUERY DES CONGÉS (avec mêmes filtres conditionnels)
+ // QUERY DES CONGÉS
let queryConditions = `WHERE dc.Statut IN ('Validé', 'Validée', 'Valide', 'En attente')`;
- params = [];
+ let queryRequest = pool.request();
let congesConditions = [];
- // ⭐ N'ajouter les filtres QUE si différents de "all"
if (selectedSociete && selectedSociete !== 'all') {
- congesConditions.push('so.Nom = ?');
- params.push(selectedSociete);
+ congesConditions.push('so.Nom = @selectedSociete');
+ queryRequest.input('selectedSociete', selectedSociete);
}
if (selectedCampus && selectedCampus !== 'all') {
- congesConditions.push('c.Nom = ?');
- params.push(selectedCampus);
+ congesConditions.push('c.Nom = @selectedCampus');
+ queryRequest.input('selectedCampus', selectedCampus);
}
if (selectedService && selectedService !== 'all') {
- congesConditions.push('s.Nom = ?');
- params.push(selectedService);
+ congesConditions.push('s.Nom = @selectedService');
+ queryRequest.input('selectedService', selectedService);
}
if (congesConditions.length > 0) {
queryConditions += ` AND ${congesConditions.join(' AND ')}`;
}
- query = `
- SELECT
- DATE_FORMAT(dc.DateDebut, '%Y-%m-%d') AS startdate,
- DATE_FORMAT(dc.DateFin, '%Y-%m-%d') AS enddate,
- CONCAT(ca.prenom, ' ', ca.nom) AS employeename,
- GROUP_CONCAT(DISTINCT tc.Nom ORDER BY tc.Nom SEPARATOR ', ') AS type,
- CONCAT(
- '[',
- GROUP_CONCAT(
- JSON_OBJECT(
- 'type', tc.Nom,
- 'jours', dct.NombreJours,
- 'periode', COALESCE(dct.PeriodeJournee, 'Journée entière')
- )
- SEPARATOR ','
- ),
- ']'
- ) AS detailsconges,
- MAX(tc.CouleurHex) AS color,
- dc.Statut AS statut,
- s.Nom AS servicenom,
- c.Nom AS campusnom,
- so.Nom AS societenom,
- dc.NombreJours AS nombrejoursouvres
- FROM DemandeConge dc
- JOIN CollaborateurAD ca ON dc.CollaborateurADId = ca.id
- LEFT JOIN DemandeCongeType dct ON dc.Id = dct.DemandeCongeId
- LEFT JOIN TypeConge tc ON dct.TypeCongeId = tc.Id
- JOIN Services s ON ca.ServiceId = s.Id
- JOIN Campus c ON ca.CampusId = c.Id
- JOIN Societe so ON ca.SocieteId = so.Id
- ${queryConditions}
- GROUP BY dc.Id, dc.DateDebut, dc.DateFin, ca.prenom, ca.nom, dc.Statut, s.Nom, c.Nom, so.Nom, dc.NombreJours
- ORDER BY s.Nom, dc.DateDebut ASC
- `;
+ const query = `
+ SELECT
+ CONVERT(VARCHAR(10), dc.DateDebut, 23) AS startdate,
+ CONVERT(VARCHAR(10), dc.DateFin, 23) AS enddate,
+ CONCAT(ca.prenom, ' ', ca.nom) AS employeename,
+ (
+ SELECT STRING_AGG(Nom, ', ') WITHIN GROUP (ORDER BY Nom)
+ FROM (SELECT DISTINCT tc2.Nom
+ FROM DemandeCongeType dct2
+ JOIN TypeConge tc2 ON dct2.TypeCongeId = tc2.Id
+ WHERE dct2.DemandeCongeId = dc.Id) AS DistinctTypes
+ ) AS type,
+ CONCAT(
+ '[',
+ STRING_AGG(
+ CONCAT(
+ '{"type":"', tc.Nom,
+ '","jours":', dct.NombreJours,
+ ',"periode":"', COALESCE(dct.PeriodeJournee, 'Journée entière'), '"}'
+ ),
+ ','
+ ),
+ ']'
+ ) AS detailsconges,
+ MAX(tc.CouleurHex) AS color,
+ dc.Statut AS statut,
+ s.Nom AS servicenom,
+ c.Nom AS campusnom,
+ so.Nom AS societenom,
+ dc.NombreJours AS nombrejoursouvres
+ FROM DemandeConge dc
+ JOIN CollaborateurAD ca ON dc.CollaborateurADId = ca.id
+ LEFT JOIN DemandeCongeType dct ON dc.Id = dct.DemandeCongeId
+ LEFT JOIN TypeConge tc ON dct.TypeCongeId = tc.Id
+ JOIN Services s ON ca.ServiceId = s.Id
+ JOIN Campus c ON ca.CampusId = c.Id
+ JOIN Societe so ON ca.SocieteId = so.Id
+ ${queryConditions}
+ GROUP BY dc.Id, dc.DateDebut, dc.DateFin, ca.prenom, ca.nom, dc.Statut, s.Nom, c.Nom, so.Nom, dc.NombreJours
+ ORDER BY s.Nom, dc.DateDebut ASC
+ `;
console.log(`🔍 Query WHERE final:`, queryConditions);
- console.log(`🔍 Params:`, params);
+
+ const leavesResult = await queryRequest.query(query);
+ const formattedLeaves = leavesResult.recordset.map(leave => ({
+ ...leave
+ }));
+
+ console.log(`✅ ${formattedLeaves.length} congés trouvés`);
+
+ return res.json({
+ success: true,
+ role: role,
+ leaves: formattedLeaves,
+ filters: filters
+ });
}
-
-
// ========================================
- // CAS 4: AUTRES RÔLES
+ // CAS 4: AUTRES RÔLES (Fallback)
// ========================================
else {
- console.log("CAS 4: Autres rôles");
+ console.log("CAS 4: Autres rôles - Fallback service/campus");
if (!serviceId) {
- conn.release();
return res.json({
success: false,
message: 'ServiceId manquant'
});
}
- const [checkService] = await conn.query(`SELECT Nom FROM Services WHERE Id = ?`, [serviceId]);
- const serviceNom = checkService.length > 0 ? checkService[0].Nom : "Inconnu";
- const isAdminFinancier = serviceNom === "Administratif & Financier";
+ const checkServiceRequest = pool.request();
+ checkServiceRequest.input('serviceId', serviceId);
+ const checkServiceResult = await checkServiceRequest.query(`SELECT Nom FROM Services WHERE Id = @serviceId`);
+ const serviceNomCheck = checkServiceResult.recordset.length > 0 ? checkServiceResult.recordset[0].Nom : "Inconnu";
+ const isAdminFinancier = serviceNomCheck === "Administratif & Financier";
if (isAdminFinancier) {
- const [employeesList] = await conn.query(`
- SELECT DISTINCT
+ // Service multi-campus
+ const employeesRequest = pool.request();
+ employeesRequest.input('serviceId', serviceId);
+ const employeesResult = await employeesRequest.query(`
+ SELECT
CONCAT(ca.prenom, ' ', ca.nom) AS fullname,
c.Nom AS campusnom,
so.Nom AS societenom,
@@ -5407,33 +6515,42 @@ app.get('/api/getTeamLeaves', async (req, res) => {
JOIN Services s ON ca.ServiceId = s.Id
JOIN Campus c ON ca.CampusId = c.Id
JOIN Societe so ON ca.SocieteId = so.Id
- WHERE ca.ServiceId = ?
+ WHERE ca.ServiceId = @serviceId
AND (ca.actif = 1 OR ca.actif IS NULL)
ORDER BY ca.prenom, ca.nom
- `, [serviceId]);
+ `);
- filters.employees = employeesList.map(e => ({
+ filters.employees = employeesResult.recordset.map(e => ({
name: e.fullname,
campus: e.campusnom,
societe: e.societenom,
service: e.servicenom
}));
- query = `
+ const queryRequest = pool.request();
+ queryRequest.input('serviceId', serviceId);
+
+ const query = `
SELECT
- DATE_FORMAT(dc.DateDebut, '%Y-%m-%d') AS startdate,
- DATE_FORMAT(dc.DateFin, '%Y-%m-%d') AS enddate,
+ CONVERT(VARCHAR(10), dc.DateDebut, 23) AS startdate,
+ CONVERT(VARCHAR(10), dc.DateFin, 23) AS enddate,
CONCAT(ca.prenom, ' ', ca.nom) AS employeename,
- GROUP_CONCAT(DISTINCT tc.Nom ORDER BY tc.Nom SEPARATOR ', ') AS type,
+ (
+ SELECT STRING_AGG(Nom, ', ') WITHIN GROUP (ORDER BY Nom)
+ FROM (SELECT DISTINCT tc2.Nom
+ FROM DemandeCongeType dct2
+ JOIN TypeConge tc2 ON dct2.TypeCongeId = tc2.Id
+ WHERE dct2.DemandeCongeId = dc.Id) AS DistinctTypes
+ ) AS type,
CONCAT(
'[',
- GROUP_CONCAT(
- JSON_OBJECT(
- 'type', tc.Nom,
- 'jours', dct.NombreJours,
- 'periode', COALESCE(dct.PeriodeJournee, 'Journée entière')
- )
- SEPARATOR ','
+ STRING_AGG(
+ CONCAT(
+ '{"type":"', tc.Nom,
+ '","jours":', dct.NombreJours,
+ ',"periode":"', COALESCE(dct.PeriodeJournee, 'Journée entière'), '"}'
+ ),
+ ','
),
']'
) AS detailsconges,
@@ -5451,15 +6568,32 @@ app.get('/api/getTeamLeaves', async (req, res) => {
JOIN Campus c ON ca.CampusId = c.Id
JOIN Societe so ON ca.SocieteId = so.Id
WHERE dc.Statut IN ('Validé', 'Validée', 'Valide', 'En attente')
- AND ca.ServiceId = ?
+ AND ca.ServiceId = @serviceId
GROUP BY dc.Id, dc.DateDebut, dc.DateFin, ca.prenom, ca.nom, dc.Statut, s.Nom, c.Nom, so.Nom, dc.NombreJours
ORDER BY c.Nom, dc.DateDebut ASC
`;
- params = [serviceId];
+
+ const leavesResult = await queryRequest.query(query);
+ const formattedLeaves = leavesResult.recordset.map(leave => ({
+ ...leave
+ }));
+
+ console.log(`✅ ${formattedLeaves.length} congés trouvés`);
+
+ return res.json({
+ success: true,
+ role: role,
+ leaves: formattedLeaves,
+ filters: filters
+ });
} else {
- const [employeesList] = await conn.query(`
- SELECT DISTINCT
+ // Service + Campus
+ const employeesRequest = pool.request();
+ employeesRequest.input('serviceId', serviceId);
+ employeesRequest.input('campusId', campusId);
+ const employeesResult = await employeesRequest.query(`
+ SELECT
CONCAT(ca.prenom, ' ', ca.nom) AS fullname,
c.Nom AS campusnom,
so.Nom AS societenom,
@@ -5468,34 +6602,44 @@ app.get('/api/getTeamLeaves', async (req, res) => {
JOIN Services s ON ca.ServiceId = s.Id
JOIN Campus c ON ca.CampusId = c.Id
JOIN Societe so ON ca.SocieteId = so.Id
- WHERE ca.ServiceId = ?
- AND ca.CampusId = ?
+ WHERE ca.ServiceId = @serviceId
+ AND ca.CampusId = @campusId
AND (ca.actif = 1 OR ca.actif IS NULL)
ORDER BY ca.prenom, ca.nom
- `, [serviceId, campusId]);
+ `);
- filters.employees = employeesList.map(e => ({
+ filters.employees = employeesResult.recordset.map(e => ({
name: e.fullname,
campus: e.campusnom,
societe: e.societenom,
service: e.servicenom
}));
- query = `
+ const queryRequest = pool.request();
+ queryRequest.input('serviceId', serviceId);
+ queryRequest.input('campusId', campusId);
+
+ const query = `
SELECT
- DATE_FORMAT(dc.DateDebut, '%Y-%m-%d') AS startdate,
- DATE_FORMAT(dc.DateFin, '%Y-%m-%d') AS enddate,
+ CONVERT(VARCHAR(10), dc.DateDebut, 23) AS startdate,
+ CONVERT(VARCHAR(10), dc.DateFin, 23) AS enddate,
CONCAT(ca.prenom, ' ', ca.nom) AS employeename,
- GROUP_CONCAT(DISTINCT tc.Nom ORDER BY tc.Nom SEPARATOR ', ') AS type,
+ (
+ SELECT STRING_AGG(Nom, ', ') WITHIN GROUP (ORDER BY Nom)
+ FROM (SELECT DISTINCT tc2.Nom
+ FROM DemandeCongeType dct2
+ JOIN TypeConge tc2 ON dct2.TypeCongeId = tc2.Id
+ WHERE dct2.DemandeCongeId = dc.Id) AS DistinctTypes
+ ) AS type,
CONCAT(
'[',
- GROUP_CONCAT(
- JSON_OBJECT(
- 'type', tc.Nom,
- 'jours', dct.NombreJours,
- 'periode', COALESCE(dct.PeriodeJournee, 'Journée entière')
- )
- SEPARATOR ','
+ STRING_AGG(
+ CONCAT(
+ '{"type":"', tc.Nom,
+ '","jours":', dct.NombreJours,
+ ',"periode":"', COALESCE(dct.PeriodeJournee, 'Journée entière'), '"}'
+ ),
+ ','
),
']'
) AS detailsconges,
@@ -5513,67 +6657,28 @@ app.get('/api/getTeamLeaves', async (req, res) => {
JOIN Campus c ON ca.CampusId = c.Id
JOIN Societe so ON ca.SocieteId = so.Id
WHERE dc.Statut IN ('Validé', 'Validée', 'Valide', 'En attente')
- AND ca.ServiceId = ?
- AND ca.CampusId = ?
+ AND ca.ServiceId = @serviceId
+ AND ca.CampusId = @campusId
GROUP BY dc.Id, dc.DateDebut, dc.DateFin, ca.prenom, ca.nom, dc.Statut, s.Nom, c.Nom, so.Nom, dc.NombreJours
ORDER BY c.Nom, dc.DateDebut ASC
`;
- params = [serviceId, campusId];
+
+ const leavesResult = await queryRequest.query(query);
+ const formattedLeaves = leavesResult.recordset.map(leave => ({
+ ...leave
+ }));
+
+ console.log(`✅ ${formattedLeaves.length} congés trouvés`);
+
+ return res.json({
+ success: true,
+ role: role,
+ leaves: formattedLeaves,
+ filters: filters
+ });
}
}
- const [leavesRows] = await conn.query(query, params);
-
- const formattedLeaves = leavesRows.map(leave => ({
- ...leave
- }));
-
- console.log(`✅ ${formattedLeaves.length} congés trouvés`);
-
- if (formattedLeaves.length === 0 && (role === 'collaborateur' || role === 'collaboratrice')) {
- console.log('🔍 DEBUG: Aucun congé trouvé, vérification...');
-
- const [debugLeaves] = await conn.query(`
- SELECT COUNT(*) as total
- FROM DemandeConge dc
- JOIN CollaborateurAD ca ON dc.CollaborateurADId = ca.id
- JOIN Services s ON ca.ServiceId = s.Id
- WHERE s.Nom = ?
- AND dc.Statut IN ('Validé', 'Validée', 'Valide', 'En attente')
- `, [userInfo.serviceNom]);
-
- console.log(`🔍 Total congés dans le service "${userInfo.serviceNom}":`, debugLeaves[0].total);
-
- const [debugCollabs] = await conn.query(`
- SELECT ca.id, ca.prenom, ca.nom, ca.email, ca.ServiceId, s.Nom as ServiceNom
- FROM CollaborateurAD ca
- JOIN Services s ON ca.ServiceId = s.Id
- WHERE s.Nom = ?
- `, [userInfo.serviceNom]);
-
- console.log(`🔍 Collaborateurs dans "${userInfo.serviceNom}":`, debugCollabs);
- }
-
- console.log(`✅ Filtres:`, {
- campus: filters.campus?.length || 0,
- societes: filters.societes?.length || 0,
- services: filters.services?.length || 0,
- employees: filters.employees?.length || 0
- });
-
- if (formattedLeaves.length > 0) {
- console.log('📝 Exemple de congé formaté:', formattedLeaves[0]);
- }
-
- conn.release();
-
- res.json({
- success: true,
- role: role,
- leaves: formattedLeaves,
- filters: filters
- });
-
} catch (error) {
console.error("❌ Erreur getTeamLeaves:", error);
res.status(500).json({
@@ -5584,198 +6689,383 @@ app.get('/api/getTeamLeaves', async (req, res) => {
}
});
+// ========================================
+// SYNCHRONISATION ENTRA ID CORRIGÉE
+// À remplacer dans server.js à partir de la ligne ~3700
+// ========================================
-
-// ================================================
-// ROUTE DE SYNCHRONISATION INITIALE (CORRIGÉE)
-// ================================================
-
-
-// ✅ APRÈS - Version CORRIGÉE
-// ✅ VERSION COMPLÈTE ET CORRIGÉE
app.post('/api/initial-sync', async (req, res) => {
+ let errorCount = 0;
+ const syncResults = {
+ processed: 0,
+ inserted: 0,
+ updated: 0,
+ deactivated: 0,
+ errors: []
+ };
+
try {
- // 1. Obtenir le token Admin
+ console.log('\n🔄 === DÉBUT SYNCHRONISATION ENTRA ID ===');
+
+ // 1️⃣ Obtenir le token Admin
const accessToken = await getGraphToken();
- if (!accessToken) return res.json({ success: false, message: 'Impossible obtenir token Microsoft Graph' });
+ if (!accessToken) {
+ return res.json({
+ success: false,
+ message: '❌ Impossible d\'obtenir le token Microsoft Graph'
+ });
+ }
+ console.log('✅ Token Microsoft Graph obtenu');
// =============================================================================
// SCÉNARIO 1 : Synchronisation unitaire (Un seul utilisateur spécifique)
// =============================================================================
if (req.body.userPrincipalName || req.body.mail) {
- const userEmail = req.body.mail || req.body.userPrincipalName;
+ const userEmail = (req.body.mail || req.body.userPrincipalName).toLowerCase().trim();
const entraUserId = req.body.id;
- console.log(`🔄 Synchronisation utilisateur unique : ${userEmail}`);
+ console.log(`\n🔄 Synchronisation utilisateur unique : ${userEmail}`);
- // Insertion ou Mise à jour
- await pool.query(`
- INSERT INTO CollaborateurAD
- (entraUserId, prenom, nom, email, service, description, role, SocieteId, Actif, DateEntree, TypeContrat)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1, NOW(), '37h')
- ON DUPLICATE KEY UPDATE
- prenom=VALUES(prenom),
- nom=VALUES(nom),
- email=VALUES(email),
- service=VALUES(service),
- description=VALUES(description),
- Actif=1, -- On réactive si l'utilisateur revient
- entraUserId=VALUES(entraUserId)
- `, [
- entraUserId,
- req.body.givenName || 'Prénom',
- req.body.surname || 'Nom',
- userEmail,
- req.body.department || '',
- req.body.jobTitle || null,
- 'Collaborateur',
- 1 // SocieteId par défaut (ex: ENSUP)
- ]);
-
- // Récupération des données fraîches pour renvoyer au front
- const [userRows] = await pool.query(`
- SELECT
- ca.id as localUserId,
- ca.entraUserId,
- ca.prenom,
- ca.nom,
- ca.email,
- ca.role,
- s.Nom as service,
- ca.TypeContrat as typeContrat,
- ca.DateEntree as dateEntree,
- ca.description,
- ca.CampusId,
- ca.SocieteId,
- so.Nom as societe_nom
- FROM CollaborateurAD ca
- LEFT JOIN Services s ON ca.ServiceId = s.Id
- LEFT JOIN Societe so ON ca.SocieteId = so.Id
- WHERE ca.email = ?
- `, [userEmail]);
-
- if (userRows.length === 0) {
- return res.json({ success: false, message: 'Erreur : Utilisateur synchronisé mais introuvable en base.' });
+ // ⭐ VALIDATION : Email requis
+ if (!userEmail || userEmail === '') {
+ return res.json({
+ success: false,
+ message: '❌ Email utilisateur manquant ou invalide'
+ });
}
- const userData = userRows[0];
- console.log(`✅ Utilisateur synchronisé avec succès : ${userData.email}`);
+ // ⭐ VALIDATION : Format email
+ const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+ if (!emailRegex.test(userEmail)) {
+ return res.json({
+ success: false,
+ message: `❌ Format d'email invalide : ${userEmail}`
+ });
+ }
- return res.json({
- success: true,
- message: 'Utilisateur synchronisé',
- localUserId: userData.localUserId,
- role: userData.role,
- service: userData.service,
- typeContrat: userData.typeContrat,
- dateEntree: userData.dateEntree,
- societeId: userData.SocieteId,
- user: userData
- });
+ const conn = await pool.getConnection();
+ try {
+ await conn.beginTransaction();
+
+ // Vérifier si l'utilisateur existe déjà
+ const [existing] = await conn.query(
+ 'SELECT id, email, Actif FROM CollaborateurAD WHERE LOWER(email) = ?',
+ [userEmail]
+ );
+
+ if (existing.length > 0) {
+ // MISE À JOUR
+ await conn.query(`
+ UPDATE CollaborateurAD
+ SET
+ entraUserId = ?,
+ prenom = ?,
+ nom = ?,
+ service = ?,
+ description = ?,
+ Actif = 1
+ WHERE LOWER(email) = ?
+ `, [
+ entraUserId || existing[0].entraUserId,
+ req.body.givenName || 'Prénom',
+ req.body.surname || 'Nom',
+ req.body.department || '',
+ req.body.jobTitle || null,
+ userEmail
+ ]);
+
+ console.log(` ✅ Utilisateur mis à jour : ${userEmail}`);
+ syncResults.updated++;
+
+ } else {
+ // INSERTION
+ await conn.query(`
+ INSERT INTO CollaborateurAD
+ (entraUserId, prenom, nom, email, service, description, role, SocieteId, Actif, DateEntree, TypeContrat)
+ VALUES (?, ?, ?, ?, ?, ?, 'Collaborateur', 1, 1, GETDATE(), '37h')
+ `, [
+ entraUserId,
+ req.body.givenName || 'Prénom',
+ req.body.surname || 'Nom',
+ userEmail,
+ req.body.department || '',
+ req.body.jobTitle || null
+ ]);
+
+ console.log(` ✅ Nouvel utilisateur créé : ${userEmail}`);
+ syncResults.inserted++;
+ }
+
+ // Récupération des données fraîches
+ const [userRows] = await conn.query(`
+ SELECT
+ ca.id as localUserId,
+ ca.entraUserId,
+ ca.prenom,
+ ca.nom,
+ ca.email,
+ ca.role,
+ s.Nom as service,
+ ca.TypeContrat as typeContrat,
+ ca.DateEntree as dateEntree,
+ ca.description,
+ ca.CampusId,
+ ca.SocieteId,
+ so.Nom as societe_nom
+ FROM CollaborateurAD ca
+ LEFT JOIN Services s ON ca.ServiceId = s.Id
+ LEFT JOIN Societe so ON ca.SocieteId = so.Id
+ WHERE LOWER(ca.email) = ?
+ `, [userEmail]);
+
+ await conn.commit();
+
+ if (userRows.length === 0) {
+ await conn.rollback();
+ throw new Error('Utilisateur synchronisé mais introuvable en base');
+ }
+
+ const userData = userRows[0];
+ console.log(`✅ Synchronisation réussie : ${userData.email}`);
+
+ return res.json({
+ success: true,
+ message: 'Utilisateur synchronisé avec succès',
+ localUserId: userData.localUserId,
+ role: userData.role,
+ service: userData.service,
+ typeContrat: userData.typeContrat,
+ dateEntree: userData.dateEntree,
+ societeId: userData.SocieteId,
+ user: userData
+ });
+
+ } catch (syncError) {
+ await conn.rollback();
+ console.error('❌ Erreur sync unitaire:', syncError);
+ return res.json({
+ success: false,
+ message: `❌ Erreur synchronisation: ${syncError.message}`
+ });
+ } finally {
+ conn.release();
+ }
}
// =============================================================================
// SCÉNARIO 2 : Full Sync (Tous les membres du groupe Azure)
// =============================================================================
- console.log('🔄 Démarrage Full Sync des membres du groupe...');
+ console.log('\n🔄 === FULL SYNC - Tous les membres du groupe ===');
- // A. Récupérer le nom du groupe (pour info)
+ // A. Récupérer le nom du groupe
const groupResponse = await axios.get(
`https://graph.microsoft.com/v1.0/groups/${AZURE_CONFIG.groupId}?$select=id,displayName`,
{ headers: { Authorization: `Bearer ${accessToken}` } }
);
const groupName = groupResponse.data.displayName;
+ console.log(`📋 Groupe : ${groupName}`);
- // B. Récupérer TOUS les membres avec pagination (boucle while)
+ // B. Récupérer TOUS les membres avec pagination
let allAzureMembers = [];
- let nextLink = `https://graph.microsoft.com/v1.0/groups/${AZURE_CONFIG.groupId}/members?$select=id,givenName,surname,mail,department,jobTitle&$top=999`;
+ let nextLink = `https://graph.microsoft.com/v1.0/groups/${AZURE_CONFIG.groupId}/members?$select=id,givenName,surname,mail,department,jobTitle,accountEnabled&$top=999`;
+ console.log('📥 Récupération des membres...');
while (nextLink) {
- const membersResponse = await axios.get(nextLink, { headers: { Authorization: `Bearer ${accessToken}` } });
+ const membersResponse = await axios.get(nextLink, {
+ headers: { Authorization: `Bearer ${accessToken}` }
+ });
allAzureMembers = allAzureMembers.concat(membersResponse.data.value);
- nextLink = membersResponse.data['@odata.nextLink']; // Lien vers la page suivante (si existe)
- }
+ nextLink = membersResponse.data['@odata.nextLink'];
- console.log(`📋 ${allAzureMembers.length} utilisateurs trouvés dans le groupe Azure "${groupName}".`);
-
- const azureEmails = new Set(); // Liste blanche des emails actifs
- let usersInserted = 0;
-
- // C. Traitement de chaque membre Azure
- for (const m of allAzureMembers) {
- if (!m.mail) continue; // Ignorer ceux sans email
-
- azureEmails.add(m.mail.toLowerCase());
-
- await pool.query(`
- INSERT INTO CollaborateurAD (
- entraUserId, prenom, nom, email, service, description, role, SocieteId, Actif, DateEntree, TypeContrat
- ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1, NOW(), '37h')
- ON DUPLICATE KEY UPDATE
- prenom=VALUES(prenom),
- nom=VALUES(nom),
- service=VALUES(service),
- entraUserId=VALUES(entraUserId),
- Actif = 1 -- On s'assure qu'il est actif
- `, [
- m.id,
- m.givenName || 'Prénom',
- m.surname || 'Nom',
- m.mail,
- m.department || '',
- m.jobTitle || null,
- 'Collaborateur',
- 1, // SocieteId par défaut
- ]);
-
- usersInserted++;
- }
-
- // D. Désactivation des fantômes (Ceux en base locale mais ABSENTS d'Azure)
- const activeEmailsArray = Array.from(azureEmails);
- let deactivatedCount = 0;
-
- if (activeEmailsArray.length > 0) {
- // Création dynamique des placeholders (?, ?, ?)
- const placeholders = activeEmailsArray.map(() => '?').join(',');
-
- // On désactive tous ceux qui NE SONT PAS dans la liste activeEmailsArray
- const [resultDeactivate] = await pool.query(`
- UPDATE CollaborateurAD
- SET Actif = 0
- WHERE Email IS NOT NULL
- AND LOWER(Email) NOT IN (${placeholders})
- AND Actif = 1 -- On ne modifie que ceux qui étaient actifs
- `, activeEmailsArray);
-
- deactivatedCount = resultDeactivate.affectedRows;
- }
-
- console.log(`✅ Full sync terminée avec succès.`);
- console.log(` - ${usersInserted} utilisateurs synchronisés/actifs`);
- console.log(` - ${deactivatedCount} utilisateurs désactivés (partis)`);
-
- res.json({
- success: true,
- message: 'Synchronisation globale terminée',
- groupe_sync: groupName,
- stats: {
- total_azure: allAzureMembers.length,
- processed: usersInserted,
- deactivated: deactivatedCount
+ if (nextLink) {
+ console.log(` 📄 ${allAzureMembers.length} membres récupérés... (suite)`);
}
+ }
+
+ console.log(`✅ ${allAzureMembers.length} membres trouvés dans Entra ID`);
+
+ // C. Filtrer et valider les emails
+ const validMembers = allAzureMembers.filter(m => {
+ // Ignorer si pas d'email
+ if (!m.mail || m.mail.trim() === '') {
+ console.log(` ⚠️ Ignoré (pas d'email) : ${m.givenName} ${m.surname} (${m.id})`);
+ return false;
+ }
+
+ // Ignorer si compte désactivé
+ if (m.accountEnabled === false) {
+ console.log(` ⚠️ Ignoré (compte désactivé) : ${m.mail}`);
+ return false;
+ }
+
+ // Valider format email
+ const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+ if (!emailRegex.test(m.mail)) {
+ console.log(` ⚠️ Ignoré (format email invalide) : ${m.mail}`);
+ return false;
+ }
+
+ return true;
});
+ console.log(`✅ ${validMembers.length} membres valides à synchroniser`);
+
+ const conn = await pool.getConnection();
+ try {
+ await conn.beginTransaction();
+
+ // D. Construire la liste des emails valides
+ const azureEmails = new Set();
+ validMembers.forEach(m => {
+ azureEmails.add(m.mail.toLowerCase().trim());
+ });
+
+ console.log('\n📝 Traitement des utilisateurs...');
+
+ // E. Traitement de chaque membre valide
+ for (const m of validMembers) {
+ try {
+ const emailClean = m.mail.toLowerCase().trim();
+ syncResults.processed++;
+
+ // Vérifier si l'utilisateur existe déjà
+ const [existing] = await conn.query(
+ 'SELECT id, email, entraUserId, Actif FROM CollaborateurAD WHERE LOWER(email) = ?',
+ [emailClean]
+ );
+
+ if (existing.length > 0) {
+ // MISE À JOUR si changements
+ await conn.query(`
+ UPDATE CollaborateurAD
+ SET
+ entraUserId = ?,
+ prenom = ?,
+ nom = ?,
+ service = ?,
+ description = ?,
+ Actif = 1
+ WHERE LOWER(email) = ?
+ `, [
+ m.id,
+ m.givenName || existing[0].prenom || 'Prénom',
+ m.surname || existing[0].nom || 'Nom',
+ m.department || '',
+ m.jobTitle || null,
+ emailClean
+ ]);
+
+ syncResults.updated++;
+ console.log(` ✓ Mis à jour : ${emailClean}`);
+
+ } else {
+ // INSERTION nouveau
+ await conn.query(`
+ INSERT INTO CollaborateurAD
+ (entraUserId, prenom, nom, email, service, description, role, SocieteId, Actif, DateEntree, TypeContrat)
+ VALUES (?, ?, ?, ?, ?, ?, 'Collaborateur', 1, 1, GETDATE(), '37h')
+ `, [
+ m.id,
+ m.givenName || 'Prénom',
+ m.surname || 'Nom',
+ emailClean,
+ m.department || '',
+ m.jobTitle || null
+ ]);
+
+ syncResults.inserted++;
+ console.log(` ✓ Créé : ${emailClean}`);
+ }
+
+ } catch (userError) {
+ errorCount++;
+ syncResults.errors.push({
+ email: m.mail,
+ error: userError.message
+ });
+ console.error(` ❌ Erreur ${m.mail}:`, userError.message);
+ // Continuer avec les autres
+ }
+ }
+
+ // F. ⭐ DÉSACTIVATION SÉCURISÉE
+ console.log('\n🔍 Désactivation des comptes obsolètes...');
+
+ if (azureEmails.size > 0) {
+ const activeEmailsArray = Array.from(azureEmails);
+ const placeholders = activeEmailsArray.map(() => '?').join(',');
+
+ // ⭐ REQUÊTE PROTÉGÉE : Ne désactive que les comptes qui :
+ // 1. Ont un email valide
+ // 2. Ne sont pas dans Entra ID
+ // 3. Ne sont pas RH/Admin/President
+ // 4. Sont actuellement actifs
+ const [resultDeactivate] = await conn.query(`
+ UPDATE CollaborateurAD
+ SET Actif = 0
+ WHERE
+ Email IS NOT NULL
+ AND Email != ''
+ AND Email NOT LIKE '%@noemail.local'
+ AND LOWER(Email) NOT IN (${placeholders})
+ AND Actif = 1
+ AND role NOT IN ('RH', 'Admin', 'President')
+ `, activeEmailsArray);
+
+ syncResults.deactivated = resultDeactivate.affectedRows;
+ console.log(` ✓ ${syncResults.deactivated} compte(s) désactivé(s)`);
+ }
+
+ await conn.commit();
+
+ // G. Logging final
+ console.log('\n📊 === RÉSUMÉ SYNCHRONISATION ===');
+ console.log(` Groupe Azure: ${groupName}`);
+ console.log(` Total membres Entra: ${allAzureMembers.length}`);
+ console.log(` Membres valides: ${validMembers.length}`);
+ console.log(` Traités: ${syncResults.processed}`);
+ console.log(` Créés: ${syncResults.inserted}`);
+ console.log(` Mis à jour: ${syncResults.updated}`);
+ console.log(` Désactivés: ${syncResults.deactivated}`);
+ console.log(` Erreurs: ${errorCount}`);
+
+ res.json({
+ success: true,
+ message: 'Synchronisation globale terminée',
+ groupe_sync: groupName,
+ stats: {
+ total_azure: allAzureMembers.length,
+ membres_valides: validMembers.length,
+ processed: syncResults.processed,
+ inserted: syncResults.inserted,
+ updated: syncResults.updated,
+ deactivated: syncResults.deactivated,
+ errors: errorCount,
+ error_details: syncResults.errors.length > 0 ? syncResults.errors : undefined
+ }
+ });
+
+ } catch (error) {
+ await conn.rollback();
+ throw error;
+ } finally {
+ conn.release();
+ }
+
} catch (error) {
- console.error('❌ Erreur critique lors de la synchronisation:', error);
+ console.error('\n❌ === ERREUR CRITIQUE SYNCHRONISATION ===');
+ console.error('Message:', error.message);
+ console.error('Stack:', error.stack);
+
res.status(500).json({
success: false,
message: 'Erreur lors de la synchronisation',
- error: error.message
+ error: error.message,
+ stats: syncResults
});
}
});
-
+''
// ========================================
// NOUVELLES ROUTES ADMINISTRATION RTT
@@ -5912,8 +7202,9 @@ app.post('/api/updateConfigurationRTT', async (req, res) => {
app.post('/api/updateRequest', upload.array('medicalDocuments', 5), async (req, res) => {
let connection;
try {
- console.log('📥 Body reçu:', req.body);
- console.log('📎 Fichiers reçus:', req.files);
+ console.log('\n📥 === MODIFICATION DEMANDE ===');
+ console.log('Body reçu:', req.body);
+ console.log('Fichiers reçus:', req.files?.length || 0);
const {
requestId,
@@ -5928,8 +7219,35 @@ app.post('/api/updateRequest', upload.array('medicalDocuments', 5), async (req,
accessToken
} = req.body;
+ // ⭐ PARSER LA RÉPARTITION (CRITIQUE)
+ let Repartition;
+ try {
+ Repartition = JSON.parse(req.body.Repartition || '[]');
+ console.log('📊 Répartition parsée:', JSON.stringify(Repartition, null, 2));
+ } catch (parseError) {
+ console.error('❌ Erreur parsing Repartition:', parseError);
+ if (req.files) {
+ req.files.forEach(file => {
+ if (fs.existsSync(file.path)) {
+ fs.unlinkSync(file.path);
+ }
+ });
+ }
+ return res.status(400).json({
+ success: false,
+ message: 'Erreur de format de la répartition'
+ });
+ }
+
// Validation
if (!requestId || !leaveType || !startDate || !endDate || !businessDays || !userId) {
+ if (req.files) {
+ req.files.forEach(file => {
+ if (fs.existsSync(file.path)) {
+ fs.unlinkSync(file.path);
+ }
+ });
+ }
return res.status(400).json({
success: false,
message: '❌ Données manquantes'
@@ -5939,7 +7257,8 @@ app.post('/api/updateRequest', upload.array('medicalDocuments', 5), async (req,
connection = await pool.getConnection();
await connection.beginTransaction();
- console.log('\n✏️ === MODIFICATION DEMANDE ===');
+ const uploadedFiles = req.files || [];
+
console.log(`Demande ID: ${requestId}, User ID: ${userId}`);
// 1️⃣ RÉCUPÉRER LA DEMANDE ORIGINALE
@@ -5950,6 +7269,13 @@ app.post('/api/updateRequest', upload.array('medicalDocuments', 5), async (req,
if (originalRequest.length === 0) {
await connection.rollback();
+ if (req.files) {
+ req.files.forEach(file => {
+ if (fs.existsSync(file.path)) {
+ fs.unlinkSync(file.path);
+ }
+ });
+ }
return res.status(404).json({
success: false,
message: '❌ Demande introuvable ou non autorisée'
@@ -5961,6 +7287,57 @@ app.post('/api/updateRequest', upload.array('medicalDocuments', 5), async (req,
console.log(`📋 Demande originale: Statut=${oldStatus}`);
+ // ⭐ VALIDATION : Si arrêt maladie, il faut au moins 1 fichier
+ const hasABS = Repartition.some(r => r.TypeConge === 'ABS');
+ if (hasABS && uploadedFiles.length === 0) {
+ await connection.rollback();
+ return res.json({
+ success: false,
+ message: 'Un justificatif médical est obligatoire pour un arrêt maladie'
+ });
+ }
+
+ // ⭐ VALIDATION DE LA RÉPARTITION
+ console.log('📊 Validation répartition...');
+ console.log('Nombre de jours total:', businessDays);
+ console.log('Répartition reçue:', JSON.stringify(Repartition, null, 2));
+
+ // Ne compter que CP, RTT ET RÉCUP dans la répartition
+ const sommeRepartition = Repartition.reduce((sum, r) => {
+ if (r.TypeConge === 'CP' || r.TypeConge === 'RTT' || r.TypeConge === 'Récup') {
+ return sum + parseFloat(r.NombreJours || 0);
+ }
+ return sum;
+ }, 0);
+
+ console.log('Somme répartition CP+RTT+Récup:', sommeRepartition.toFixed(2));
+
+ // Validation : La somme doit correspondre au total
+ const hasCountableLeave = Repartition.some(r =>
+ r.TypeConge === 'CP' || r.TypeConge === 'RTT' || r.TypeConge === 'Récup'
+ );
+
+ if (hasCountableLeave && Math.abs(sommeRepartition - businessDays) > 0.01) {
+ console.error('❌ ERREUR : Répartition incohérente !');
+
+ if (req.files) {
+ req.files.forEach(file => {
+ if (fs.existsSync(file.path)) {
+ fs.unlinkSync(file.path);
+ }
+ });
+ }
+
+ await connection.rollback();
+
+ return res.json({
+ success: false,
+ message: `Erreur de répartition : la somme (${sommeRepartition.toFixed(2)}j) ne correspond pas au total (${businessDays}j)`
+ });
+ }
+
+ console.log('✅ Validation répartition OK');
+
// 2️⃣ REMBOURSER L'ANCIENNE DEMANDE (via DeductionDetails)
let restorationStats = { count: 0, details: [] };
@@ -5982,7 +7359,7 @@ app.post('/api/updateRequest', upload.array('medicalDocuments', 5), async (req,
if (compteur.length > 0) {
const newSolde = parseFloat(compteur[0].Solde) + parseFloat(d.JoursUtilises);
await connection.query(
- 'UPDATE CompteurConges SET Solde = ?, DerniereMiseAJour = NOW() WHERE Id = ?',
+ 'UPDATE CompteurConges SET Solde = ?, DerniereMiseAJour = GETDATE() WHERE Id = ?',
[newSolde, compteur[0].Id]
);
restorationStats.count++;
@@ -5997,7 +7374,7 @@ app.post('/api/updateRequest', upload.array('medicalDocuments', 5), async (req,
}
}
- // 3️⃣ METTRE À JOUR LA DEMANDE
+ // 3️⃣ METTRE À JOUR LA DEMANDE (⭐ SQL SERVER : GETDATE + FORMAT)
console.log('📝 Mise à jour de la demande...');
// Si elle était validée, on la repasse en "En attente"
@@ -6011,155 +7388,204 @@ app.post('/api/updateRequest', upload.array('medicalDocuments', 5), async (req,
Commentaire = ?,
NombreJours = ?,
Statut = ?,
- DateValidation = NOW(),
- CommentaireValidation = CONCAT(
- COALESCE(CommentaireValidation, ''),
- '\n[Modifiée le ',
- DATE_FORMAT(NOW(), '%d/%m/%Y à %H:%i'),
+ DateValidation = GETDATE(),
+ CommentaireValidation = COALESCE(CommentaireValidation, '') +
+ CHAR(10) + '[Modifiée le ' +
+ FORMAT(GETDATE(), 'dd/MM/yyyy à HH:mm', 'fr-FR') +
']'
- )
WHERE Id = ?`,
[leaveType, startDate, endDate, reason || '', businessDays, newStatus, requestId]
);
- // 4️⃣ CALCULER ET APPLIQUER LA NOUVELLE RÉPARTITION
- let newRepartition = [];
+ console.log(`✅ Demande ${requestId} modifiée - Statut: ${newStatus}`);
- if (parseInt(leaveType) !== 3) { // Pas pour Arrêt maladie
- console.log('📊 Calcul de la nouvelle répartition...');
+ // 4️⃣ SUPPRIMER L'ANCIENNE RÉPARTITION DANS DemandeCongeType
+ await connection.query('DELETE FROM DemandeCongeType WHERE DemandeCongeId = ?', [requestId]);
- const currentYear = new Date().getFullYear();
- const previousYear = currentYear - 1;
- let joursRestants = parseFloat(businessDays);
+ // 5️⃣ Sauvegarder la nouvelle répartition AVEC GÉNÉRATION MANUELLE D'ID
+ console.log('\n📊 Sauvegarde de la nouvelle répartition en base...');
+ for (const rep of Repartition) {
+ const code = rep.TypeConge;
+ const name = code === 'CP' ? 'Congé payé' :
+ code === 'RTT' ? 'RTT' :
+ code === 'ABS' ? 'Congé maladie' :
+ code === 'Formation' ? 'Formation' :
+ code === 'Récup' ? 'Récupération' : code;
- // A. CONGÉ PAYÉ : N-1 → N → Anticipé
- if (parseInt(leaveType) === 1) {
- // Essayer N-1
- const [compteurN1] = await connection.query(
- 'SELECT Id, Solde FROM CompteurConges WHERE CollaborateurADId = ? AND TypeCongeId = ? AND Annee = ?',
- [userId, leaveType, previousYear]
- );
+ const [typeRow] = await connection.query(
+ 'SELECT Id FROM TypeConge WHERE Nom = ? LIMIT 1',
+ [name]
+ );
- if (compteurN1.length > 0 && compteurN1[0].Solde > 0 && joursRestants > 0) {
- const disponibleN1 = parseFloat(compteurN1[0].Solde);
- const aPrendreN1 = Math.min(disponibleN1, joursRestants);
+ if (typeRow.length > 0) {
+ // ⭐ GÉNÉRER L'ID MANUELLEMENT
+ const demandeCongeTypeId = await getNextId(connection, 'DemandeCongeType');
- await connection.query(
- 'UPDATE CompteurConges SET Solde = Solde - ?, DerniereMiseAJour = NOW() WHERE Id = ?',
- [aPrendreN1, compteurN1[0].Id]
- );
-
- await connection.query(`
- INSERT INTO DeductionDetails (DemandeCongeId, TypeCongeId, Annee, JoursUtilises, TypeDeduction)
- VALUES (?, ?, ?, ?, ?)
- `, [requestId, leaveType, previousYear, aPrendreN1, 'Année N-1']);
-
- newRepartition.push({
- typeCongeId: leaveType,
- annee: previousYear,
- jours: aPrendreN1,
- typeDeduction: 'Année N-1'
- });
-
- joursRestants -= aPrendreN1;
- console.log(` ✅ Déduit ${aPrendreN1}j de N-1`);
- }
-
- // Essayer N
- if (joursRestants > 0) {
- const [compteurN] = await connection.query(
- 'SELECT Id, Solde FROM CompteurConges WHERE CollaborateurADId = ? AND TypeCongeId = ? AND Annee = ?',
- [userId, leaveType, currentYear]
- );
-
- if (compteurN.length > 0) {
- const disponibleN = parseFloat(compteurN[0].Solde);
- const aPrendreN = Math.min(disponibleN, joursRestants);
-
- await connection.query(
- 'UPDATE CompteurConges SET Solde = Solde - ?, DerniereMiseAJour = NOW() WHERE Id = ?',
- [aPrendreN, compteurN[0].Id]
- );
-
- await connection.query(`
- INSERT INTO DeductionDetails (DemandeCongeId, TypeCongeId, Annee, JoursUtilises, TypeDeduction)
- VALUES (?, ?, ?, ?, ?)
- `, [requestId, leaveType, currentYear, aPrendreN, 'Année N']);
-
- newRepartition.push({
- typeCongeId: leaveType,
- annee: currentYear,
- jours: aPrendreN,
- typeDeduction: 'Année N'
- });
-
- joursRestants -= aPrendreN;
- console.log(` ✅ Déduit ${aPrendreN}j de N`);
- }
- }
-
- // Anticipé (si encore des jours restants)
- if (joursRestants > 0) {
- const [compteurN] = await connection.query(
- 'SELECT Id FROM CompteurConges WHERE CollaborateurADId = ? AND TypeCongeId = ? AND Annee = ?',
- [userId, leaveType, currentYear]
- );
-
- if (compteurN.length > 0) {
- await connection.query(
- 'UPDATE CompteurConges SET Solde = Solde - ?, DerniereMiseAJour = NOW() WHERE Id = ?',
- [joursRestants, compteurN[0].Id]
- );
-
- await connection.query(`
- INSERT INTO DeductionDetails (DemandeCongeId, TypeCongeId, Annee, JoursUtilises, TypeDeduction, IsAnticipe)
- VALUES (?, ?, ?, ?, ?, 1)
- `, [requestId, leaveType, currentYear, joursRestants, 'N Anticip']);
-
- newRepartition.push({
- typeCongeId: leaveType,
- annee: currentYear,
- jours: joursRestants,
- typeDeduction: 'N Anticip'
- });
-
- console.log(` ⚠️ Déduit ${joursRestants}j en ANTICIPÉ`);
- }
- }
+ await connection.query(`
+ INSERT INTO DemandeCongeType
+ (Id, DemandeCongeId, TypeCongeId, NombreJours, PeriodeJournee)
+ VALUES (?, ?, ?, ?, ?)
+ `, [
+ demandeCongeTypeId,
+ requestId,
+ typeRow[0].Id,
+ rep.NombreJours,
+ rep.PeriodeJournee || 'Journée entière'
+ ]);
+ console.log(` ✓ ${name}: ${rep.NombreJours}j (${rep.PeriodeJournee || 'Journée entière'})`);
}
+ }
- // B. RTT : Uniquement année N
- else if (parseInt(leaveType) === 2) {
- const [compteurRTT] = await connection.query(
- 'SELECT Id, Solde FROM CompteurConges WHERE CollaborateurADId = ? AND TypeCongeId = ? AND Annee = ?',
- [userId, leaveType, currentYear]
- );
+ // 6️⃣ CALCULER ET APPLIQUER LA NOUVELLE DÉDUCTION
+ let newRepartition = [];
+ const currentYear = new Date().getFullYear();
+ const previousYear = currentYear - 1;
- if (compteurRTT.length > 0) {
- const disponible = parseFloat(compteurRTT[0].Solde);
+ const isFormationOnly = Repartition.length === 1 && Repartition[0].TypeConge === 'Formation';
- if (disponible < joursRestants) {
- throw new Error(`Solde RTT insuffisant: ${disponible.toFixed(2)}j disponibles, ${joursRestants}j demandés`);
+ if (!isFormationOnly) {
+ console.log('📉 Déduction des compteurs...');
+
+ for (const rep of Repartition) {
+ if (rep.TypeConge === 'ABS' || rep.TypeConge === 'Formation') {
+ console.log(` ⏩ ${rep.TypeConge} ignoré (pas de déduction)`);
+ continue;
+ }
+
+ // ⭐ TRAITEMENT SPÉCIAL POUR RÉCUP
+ if (rep.TypeConge === 'Récup') {
+ const [recupType] = await connection.query('SELECT Id FROM TypeConge WHERE Nom = ? LIMIT 1', ['Récupération']);
+
+ if (recupType.length > 0) {
+ await connection.query(`
+ UPDATE CompteurConges
+ SET Solde = CASE WHEN Solde - ? < 0 THEN 0 ELSE Solde - ? END,
+ DerniereMiseAJour = GETDATE()
+ WHERE CollaborateurADId = ? AND TypeCongeId = ? AND Annee = ?
+ `, [rep.NombreJours, rep.NombreJours, userId, recupType[0].Id, currentYear]);
+
+ await connection.query(`
+ INSERT INTO DeductionDetails
+ (DemandeCongeId, TypeCongeId, Annee, TypeDeduction, JoursUtilises)
+ VALUES (?, ?, ?, 'Récup Posée', ?)
+ `, [requestId, recupType[0].Id, currentYear, rep.NombreJours]);
+
+ newRepartition.push({
+ typeCongeId: recupType[0].Id,
+ annee: currentYear,
+ jours: rep.NombreJours,
+ typeDeduction: 'Récup Posée'
+ });
+
+ console.log(` ✓ Récup: ${rep.NombreJours}j déduits`);
+ }
+ continue;
+ }
+
+ // ⭐ CP et RTT : déduction normale
+ const name = rep.TypeConge === 'CP' ? 'Congé payé' : 'RTT';
+ const [typeRow] = await connection.query('SELECT Id FROM TypeConge WHERE Nom = ? LIMIT 1', [name]);
+
+ if (typeRow.length > 0) {
+ let joursRestants = parseFloat(rep.NombreJours);
+
+ // A. Essayer N-1 (CP uniquement)
+ if (rep.TypeConge === 'CP') {
+ const [compteurN1] = await connection.query(
+ 'SELECT Id, Solde FROM CompteurConges WHERE CollaborateurADId = ? AND TypeCongeId = ? AND Annee = ?',
+ [userId, typeRow[0].Id, previousYear]
+ );
+
+ if (compteurN1.length > 0 && compteurN1[0].Solde > 0) {
+ const disponibleN1 = parseFloat(compteurN1[0].Solde);
+ const aPrendreN1 = Math.min(disponibleN1, joursRestants);
+
+ await connection.query(
+ 'UPDATE CompteurConges SET Solde = Solde - ?, DerniereMiseAJour = GETDATE() WHERE Id = ?',
+ [aPrendreN1, compteurN1[0].Id]
+ );
+
+ await connection.query(`
+ INSERT INTO DeductionDetails
+ (DemandeCongeId, TypeCongeId, Annee, TypeDeduction, JoursUtilises)
+ VALUES (?, ?, ?, 'Année N-1', ?)
+ `, [requestId, typeRow[0].Id, previousYear, aPrendreN1]);
+
+ newRepartition.push({
+ typeCongeId: typeRow[0].Id,
+ annee: previousYear,
+ jours: aPrendreN1,
+ typeDeduction: 'Année N-1'
+ });
+
+ joursRestants -= aPrendreN1;
+ console.log(` ✓ ${name} N-1: ${aPrendreN1}j déduits (reste: ${joursRestants}j)`);
+ }
}
- await connection.query(
- 'UPDATE CompteurConges SET Solde = Solde - ?, DerniereMiseAJour = NOW() WHERE Id = ?',
- [joursRestants, compteurRTT[0].Id]
- );
+ // B. Essayer N
+ if (joursRestants > 0) {
+ const [compteurN] = await connection.query(
+ 'SELECT Id, Solde FROM CompteurConges WHERE CollaborateurADId = ? AND TypeCongeId = ? AND Annee = ?',
+ [userId, typeRow[0].Id, currentYear]
+ );
- await connection.query(`
- INSERT INTO DeductionDetails (DemandeCongeId, TypeCongeId, Annee, JoursUtilises, TypeDeduction)
- VALUES (?, ?, ?, ?, ?)
- `, [requestId, leaveType, currentYear, joursRestants, 'Année N']);
+ if (compteurN.length > 0) {
+ const disponibleN = parseFloat(compteurN[0].Solde);
+ const aPrendreN = Math.min(disponibleN, joursRestants);
- newRepartition.push({
- typeCongeId: leaveType,
- annee: currentYear,
- jours: joursRestants,
- typeDeduction: 'Année N'
- });
+ await connection.query(
+ 'UPDATE CompteurConges SET Solde = Solde - ?, DerniereMiseAJour = GETDATE() WHERE Id = ?',
+ [aPrendreN, compteurN[0].Id]
+ );
- console.log(` ✅ Déduit ${joursRestants}j RTT de N`);
+ await connection.query(`
+ INSERT INTO DeductionDetails
+ (DemandeCongeId, TypeCongeId, Annee, TypeDeduction, JoursUtilises)
+ VALUES (?, ?, ?, 'Année N', ?)
+ `, [requestId, typeRow[0].Id, currentYear, aPrendreN]);
+
+ newRepartition.push({
+ typeCongeId: typeRow[0].Id,
+ annee: currentYear,
+ jours: aPrendreN,
+ typeDeduction: 'Année N'
+ });
+
+ joursRestants -= aPrendreN;
+ console.log(` ✓ ${name} N: ${aPrendreN}j déduits (reste: ${joursRestants}j)`);
+ }
+ }
+
+ // C. Si il reste des jours → Anticipé
+ if (joursRestants > 0) {
+ const [compteurN] = await connection.query(
+ 'SELECT Id FROM CompteurConges WHERE CollaborateurADId = ? AND TypeCongeId = ? AND Annee = ?',
+ [userId, typeRow[0].Id, currentYear]
+ );
+
+ if (compteurN.length > 0) {
+ await connection.query(
+ 'UPDATE CompteurConges SET Solde = Solde - ?, DerniereMiseAJour = GETDATE() WHERE Id = ?',
+ [joursRestants, compteurN[0].Id]
+ );
+
+ await connection.query(`
+ INSERT INTO DeductionDetails
+ (DemandeCongeId, TypeCongeId, Annee, TypeDeduction, JoursUtilises)
+ VALUES (?, ?, ?, 'N Anticip', ?)
+ `, [requestId, typeRow[0].Id, currentYear, joursRestants]);
+
+ newRepartition.push({
+ typeCongeId: typeRow[0].Id,
+ annee: currentYear,
+ jours: joursRestants,
+ typeDeduction: 'N Anticip'
+ });
+
+ console.log(` ⚠️ ${name} Anticipé: ${joursRestants}j`);
+ }
+ }
}
}
}
@@ -6167,7 +7593,7 @@ app.post('/api/updateRequest', upload.array('medicalDocuments', 5), async (req,
await connection.commit();
console.log(`✅ Demande ${requestId} modifiée avec succès`);
- // 5️⃣ ENVOI DES EMAILS (Asynchrone, ne bloque pas la réponse)
+ // 7️⃣ ENVOI DES EMAILS (Asynchrone)
const graphToken = await getGraphToken();
if (graphToken) {
@@ -6221,9 +7647,6 @@ app.post('/api/updateRequest', upload.array('medicalDocuments', 5), async (req,
Merci de valider ou refuser cette demande dans l'application.