From 56accdac0550009f2e0cdc52c2b7874e4dedf69e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Poncin?= <remiponcin55@gmail.com>
Date: Mon, 24 Aug 2026 18:44:05 +0200
Subject: [PATCH 01/11] feat: challenge validation gform in challenge page

---
 .../components/challenge/challengeList.tsx    | 100 +++++++++++-------
 1 file changed, 64 insertions(+), 36 deletions(-)

diff --git a/frontend/src/components/challenge/challengeList.tsx b/frontend/src/components/challenge/challengeList.tsx
index 938277f..b9c40ea 100644
--- a/frontend/src/components/challenge/challengeList.tsx
+++ b/frontend/src/components/challenge/challengeList.tsx
@@ -1,29 +1,29 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
-import Swal from "sweetalert2";
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import Swal from 'sweetalert2';
 
-import { type Challenge } from "../../interfaces/challenge.interface";
-import { type Faction } from "../../interfaces/faction.interface";
-import { getAllChallenges, getFactionsPoints } from "../../services/requests/challenge.service";
-import { checkChallengeStatus } from "../../services/requests/event.service";
-import { getAllFactionsUser } from "../../services/requests/faction.service";
-import { Card, CardContent, CardHeader, CardTitle } from "../ui/card";
+import { type Challenge } from '../../interfaces/challenge.interface';
+import { type Faction } from '../../interfaces/faction.interface';
+import { getAllChallenges, getFactionsPoints } from '../../services/requests/challenge.service';
+import { checkChallengeStatus } from '../../services/requests/event.service';
+import { getAllFactionsUser } from '../../services/requests/faction.service';
+import { Card, CardContent, CardHeader, CardTitle } from '../ui/card';
 
 export const UserChallengeList = () => {
     const [availableChallenges, setAvailableChallenges] = useState<Challenge[]>([]);
     const [factions, setFactions] = useState<Faction[]>([]);
     const [factionPoints, setFactionPoints] = useState<{ [key: number]: number }>({});
-    const [selectedCategory, setSelectedCategory] = useState<string>("Tous");
-    const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
+    const [selectedCategory, setSelectedCategory] = useState<string>('Tous');
+    const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('asc');
     const [isChallOpen, setIsChallOpen] = useState(false);
     const [loading, setLoading] = useState(true);
 
     const fetchChallenges = useCallback(async () => {
         try {
             const challenges = await getAllChallenges();
-            const challengesFiltered = challenges.filter((c: Challenge) => c.category !== "Free");
+            const challengesFiltered = challenges.filter((c: Challenge) => c.category !== 'Free');
             setAvailableChallenges(challengesFiltered);
         } catch (err) {
-            console.error("Erreur lors du chargement des challenges", err);
+            console.error('Erreur lors du chargement des challenges', err);
         }
     }, []);
 
@@ -32,7 +32,7 @@ export const UserChallengeList = () => {
             const data = await getAllFactionsUser();
             setFactions(data);
         } catch (err) {
-            console.error("Erreur lors du chargement des factions", err);
+            console.error('Erreur lors du chargement des factions', err);
         }
     }, []);
 
@@ -44,11 +44,11 @@ export const UserChallengeList = () => {
                 fetchedFactions.map(async (faction: Faction) => {
                     const res = await getFactionsPoints(faction.factionId);
                     points[faction.factionId] = Number(res);
-                })
+                }),
             );
             setFactionPoints(points);
         } catch (err) {
-            console.error("Erreur lors du chargement des points des factions", err);
+            console.error('Erreur lors du chargement des points des factions', err);
         }
     }, []);
 
@@ -64,11 +64,11 @@ export const UserChallengeList = () => {
                 const status = await checkChallengeStatus();
                 setIsChallOpen(status);
             } catch (error) {
-                console.error("Erreur lors de la récupération des données :", error);
+                console.error('Erreur lors de la récupération des données :', error);
                 await Swal.fire({
-                    icon: "error",
-                    title: "Oups...",
-                    text: "Une erreur est survenue lors de la récupération des données.",
+                    icon: 'error',
+                    title: 'Oups...',
+                    text: 'Une erreur est survenue lors de la récupération des données.',
                 });
             } finally {
                 setLoading(false);
@@ -78,20 +78,18 @@ export const UserChallengeList = () => {
     }, [fetchInitialData]);
 
     const dynamicCategories = useMemo(() => {
-        const uniqueCategories = new Set(availableChallenges.map(c => c.category));
-        return ["Tous", ...Array.from(uniqueCategories)];
+        const uniqueCategories = new Set(availableChallenges.map((c) => c.category));
+        return ['Tous', ...Array.from(uniqueCategories)];
     }, [availableChallenges]);
 
     const filteredAndSortedChallenges = useMemo(() => {
         let challenges = [...availableChallenges];
 
-        if (selectedCategory !== "Tous") {
-            challenges = challenges.filter(c => c.category === selectedCategory);
+        if (selectedCategory !== 'Tous') {
+            challenges = challenges.filter((c) => c.category === selectedCategory);
         }
 
-        challenges.sort((a, b) =>
-            sortOrder === "asc" ? a.points - b.points : b.points - a.points
-        );
+        challenges.sort((a, b) => (sortOrder === 'asc' ? a.points - b.points : b.points - a.points));
 
         return challenges;
     }, [availableChallenges, selectedCategory, sortOrder]);
@@ -122,6 +120,33 @@ export const UserChallengeList = () => {
                 </CardContent>
             </Card>
 
+            {/* Formulaire de validation de challenge */}
+
+            <Card className="w-full max-w-3xl mx-auto">
+                <CardHeader>
+                    <CardTitle className="text-2xl font-semibold text-gray-800 text-center">
+                        Valider un challenge
+                    </CardTitle>
+                </CardHeader>
+                <CardContent className="space-y-10">
+                    {!isChallOpen ? (
+                        <p className="text-red-500 font-medium text-center">
+                            🚫 Ce formulaire n'est pas encore disponible.
+                        </p>
+                    ) : (
+                        <div className="relative pb-[56.25%] rounded-xl shadow-lg overflow-hidden">
+                            <iframe
+                                src="https://LELIENDUGFORM/viewform?embedded=true"
+                                className="absolute inset-0 w-full h-full border-none"
+                                title="Formulaire Challenge"
+                                loading="lazy">
+                                Chargement…
+                            </iframe>
+                        </div>
+                    )}
+                </CardContent>
+            </Card>
+
             {/* Challenges disponibles */}
             <Card className="w-full max-w-3xl mx-auto">
                 <CardHeader>
@@ -150,10 +175,11 @@ export const UserChallengeList = () => {
                                         id="categorySelect"
                                         value={selectedCategory}
                                         onChange={(e) => setSelectedCategory(e.target.value)}
-                                        className="border border-gray-300 rounded px-3 py-1"
-                                    >
+                                        className="border border-gray-300 rounded px-3 py-1">
                                         {dynamicCategories.map((cat) => (
-                                            <option key={cat} value={cat}>{cat}</option>
+                                            <option key={cat} value={cat}>
+                                                {cat}
+                                            </option>
                                         ))}
                                     </select>
                                 </div>
@@ -165,9 +191,8 @@ export const UserChallengeList = () => {
                                     <select
                                         id="sortOrderSelect"
                                         value={sortOrder}
-                                        onChange={(e) => setSortOrder(e.target.value as "asc" | "desc")}
-                                        className="border border-gray-300 rounded px-3 py-1"
-                                    >
+                                        onChange={(e) => setSortOrder(e.target.value as 'asc' | 'desc')}
+                                        className="border border-gray-300 rounded px-3 py-1">
                                         <option value="asc">Croissant</option>
                                         <option value="desc">Décroissant</option>
                                     </select>
@@ -179,13 +204,16 @@ export const UserChallengeList = () => {
                                 {filteredAndSortedChallenges.map((challenge) => (
                                     <li
                                         key={challenge.id}
-                                        className="bg-gray-100 py-4 px-6 rounded-xl border border-gray-300 shadow-sm hover:bg-gray-200 transition"
-                                    >
+                                        className="bg-gray-100 py-4 px-6 rounded-xl border border-gray-300 shadow-sm hover:bg-gray-200 transition">
                                         <h4 className="font-semibold text-lg">{challenge.title}</h4>
                                         <p className="text-gray-600 mt-2">{challenge.description}</p>
                                         <div className="mt-2 text-gray-500 text-sm">
-                                            <p><strong>Catégorie :</strong> {challenge.category}</p>
-                                            <p><strong>Points :</strong> {challenge.points}</p>
+                                            <p>
+                                                <strong>Catégorie :</strong> {challenge.category}
+                                            </p>
+                                            <p>
+                                                <strong>Points :</strong> {challenge.points}
+                                            </p>
                                         </div>
                                     </li>
                                 ))}

From ecd33544c73404389099e300b4eb90bede3448aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Poncin?= <remiponcin55@gmail.com>
Date: Mon, 24 Aug 2026 19:30:36 +0200
Subject: [PATCH 02/11] fix: gform link

---
 frontend/src/components/challenge/challengeList.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/challenge/challengeList.tsx b/frontend/src/components/challenge/challengeList.tsx
index b9c40ea..9deba70 100644
--- a/frontend/src/components/challenge/challengeList.tsx
+++ b/frontend/src/components/challenge/challengeList.tsx
@@ -124,9 +124,7 @@ export const UserChallengeList = () => {
 
             <Card className="w-full max-w-3xl mx-auto">
                 <CardHeader>
-                    <CardTitle className="text-2xl font-semibold text-gray-800 text-center">
-                        Valider un challenge
-                    </CardTitle>
+                    <CardTitle className="text-2xl font-semibold text-gray-800 text-center">Valider un Défi</CardTitle>
                 </CardHeader>
                 <CardContent className="space-y-10">
                     {!isChallOpen ? (
@@ -136,7 +134,7 @@ export const UserChallengeList = () => {
                     ) : (
                         <div className="relative pb-[56.25%] rounded-xl shadow-lg overflow-hidden">
                             <iframe
-                                src="https://LELIENDUGFORM/viewform?embedded=true"
+                                src="https://docs.google.com/forms/d/e/1FAIpQLScZZRe1DSqqJOdgBK_5QBlOVMXmIPv9jDlqDD6FqRhmkb8rIw/viewform?embedded=true"
                                 className="absolute inset-0 w-full h-full border-none"
                                 title="Formulaire Challenge"
                                 loading="lazy">
@@ -151,7 +149,7 @@ export const UserChallengeList = () => {
             <Card className="w-full max-w-3xl mx-auto">
                 <CardHeader>
                     <CardTitle className="text-2xl font-semibold text-gray-800 text-center">
-                        🏆 Challenges disponibles
+                        🏆 Défis disponibles
                     </CardTitle>
                 </CardHeader>
                 <CardContent className="space-y-10">
@@ -162,7 +160,7 @@ export const UserChallengeList = () => {
                             🚫 Les challenges ne sont pas encore ouverts.
                         </p>
                     ) : availableChallenges.length === 0 ? (
-                        <p className="text-gray-500 text-center">Aucun challenge disponible pour le moment.</p>
+                        <p className="text-gray-500 text-center">Aucun défi disponible pour le moment.</p>
                     ) : (
                         <>
                             {/* Filtres */}

From 4350088321443a9ad7b1e06e46b53dcc7e6f3edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Poncin?= <remiponcin55@gmail.com>
Date: Mon, 24 Aug 2026 20:20:50 +0200
Subject: [PATCH 03/11] feat: bachelor branch type

---
 backend/src/services/team.service.ts          | 10 ++++++++--
 frontend/src/components/Admin/adminUser.tsx   |  1 +
 frontend/src/components/profil/profilForm.tsx |  1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend/src/services/team.service.ts b/backend/src/services/team.service.ts
index aba6cf5..b476237 100644
--- a/backend/src/services/team.service.ts
+++ b/backend/src/services/team.service.ts
@@ -298,7 +298,7 @@ export const teamDistribution = async () => {
 
     // Filtrer les utilisateurs en fonction de la spécialité
     const tcStudents: StudentRow[] = filteredStudents
-        .filter((student) => student.branch === 'TC')
+        .filter((student) => student.branch === 'TC' || student.branch === 'IA_BACH')
         .map((student) => ({
             userId: student.userId,
             email: student.email,
@@ -324,7 +324,13 @@ export const teamDistribution = async () => {
         }));
 
     const otherStudents: StudentRow[] = filteredStudents
-        .filter((student) => student.branch !== 'TC' && student.branch !== 'RI' && student.branch !== 'MM')
+        .filter(
+            (student) =>
+                student.branch !== 'TC' &&
+                student.branch !== 'RI' &&
+                student.branch !== 'MM' &&
+                student.branch !== 'IA_BACH',
+        )
         .map((student) => ({
             userId: student.userId,
             email: student.email,
diff --git a/frontend/src/components/Admin/adminUser.tsx b/frontend/src/components/Admin/adminUser.tsx
index f0b632b..1bbf1fd 100644
--- a/frontend/src/components/Admin/adminUser.tsx
+++ b/frontend/src/components/Admin/adminUser.tsx
@@ -35,6 +35,7 @@ const branchOptions = [
     { value: 'GM_APPR', label: 'Génie Mécanique en Apprentissage' },
     { value: 'SN_APPR', label: 'Système Numérique en Apprentissage' },
     { value: 'Branch', label: 'Branche' },
+    { value: 'IA_BACH', label: 'Intelligence Artificielle en bachelor' },
     { value: 'MM', label: 'Mécanique et Matériaux' },
     { value: 'MA', label: 'Master' },
     { value: 'RI', label: 'Ressources Internationales' },
diff --git a/frontend/src/components/profil/profilForm.tsx b/frontend/src/components/profil/profilForm.tsx
index 1209b90..2af7538 100644
--- a/frontend/src/components/profil/profilForm.tsx
+++ b/frontend/src/components/profil/profilForm.tsx
@@ -20,6 +20,7 @@ const branchOptions = [
     { value: 'GM_APPR', label: 'Génie Mécanique en Apprentissage' },
     { value: 'SN_APPR', label: 'Systeme Numérique en Apprentissage' },
     { value: 'Branch', label: 'Branche' },
+    { value: 'IA_BACH', label: 'Intelligence Artificielle en bachelor' },
     { value: 'MM', label: 'Mécanique et Matériaux' },
     { value: 'Master', label: 'Master' },
     { value: 'RI', label: 'Ressources International' },

From 9bebe10921ebba94856b9f1c206def0655738b66 Mon Sep 17 00:00:00 2001
From: Antoine <antoine.dufils@yahoo.fr>
Date: Mon, 24 Aug 2026 21:18:27 +0200
Subject: [PATCH 04/11] fix: update dependencies in useEffect for Navbar
 component

---
 frontend/src/components/navbar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/navbar.tsx b/frontend/src/components/navbar.tsx
index 9d5e8cf..4a72c5b 100644
--- a/frontend/src/components/navbar.tsx
+++ b/frontend/src/components/navbar.tsx
@@ -52,7 +52,7 @@ export const Navbar = () => {
         // OnboardingProvider refreshes on 'user-onboarding-updated' event globally.
         // No local event listeners required here.
         return undefined;
-    }, [isAuthenticated, pathname]);
+    }, [isAuthenticated, onboardingLoading, onboardingStatus, pathname]);
 
     const navItems: NavItem[] = [
         { label: 'Home', to: '/home', icon: HomeIcon },

From bb56af38c5ed9abd923dcd907441528d397d5636 Mon Sep 17 00:00:00 2001
From: Arthur Dodin <dodinarthur@gmail.com>
Date: Mon, 24 Aug 2026 21:34:57 +0200
Subject: [PATCH 05/11] feat: concurrent perms methods

---
 .../src/controllers/permanence.controller.ts  |  41 ++
 backend/src/email/email.registry.ts           |  12 +-
 .../notify-concurrent-permanences.html        | 116 ++++
 backend/src/routes/automation.routes.ts       |   5 +
 backend/src/routes/permanences.routes.ts      |  62 ++-
 backend/src/services/permanence.service.ts    | 217 +++++++-
 backend/src/types/email.d.ts                  |   9 +
 backend/src/types/permanence.d.ts             |  14 +-
 frontend/src/App.tsx                          | 517 +++++++++---------
 frontend/src/components/navbar.tsx            |  15 +
 .../components/permanence/concurrentPerms.tsx |  44 ++
 frontend/src/contexts/permanences.tsx         |  83 +++
 .../src/interfaces/permanence.interface.ts    |   9 +-
 frontend/src/pages/perm/permMy.tsx            |   5 +
 .../services/requests/permanence.service.ts   |  63 ++-
 15 files changed, 894 insertions(+), 318 deletions(-)
 create mode 100644 backend/src/email/templates/notify-concurrent-permanences.html
 create mode 100644 frontend/src/components/permanence/concurrentPerms.tsx
 create mode 100644 frontend/src/contexts/permanences.tsx

diff --git a/backend/src/controllers/permanence.controller.ts b/backend/src/controllers/permanence.controller.ts
index 92ca549..7bad452 100644
--- a/backend/src/controllers/permanence.controller.ts
+++ b/backend/src/controllers/permanence.controller.ts
@@ -391,3 +391,44 @@ export const sendDailyNotificationToUsers: AppRequestHandler = async (_req, res)
 
     Ok(res, { msg: 'Notifications quotidiennes envoyées avec succès' });
 };
+
+export const sendConcurrentPermanenceNotifications: AppRequestHandler = async (_req, res) => {
+    try {
+        const notifications = await permanence_service.getConcurrentPermanenceNotifications();
+        await permanence_service.sendConcurrentPermanenceNotifications(notifications);
+        Ok(res, { msg: `${notifications.length} notification(s) de conflit envoyée(s).` });
+    } catch (err) {
+        console.error(err);
+        Error(res, { msg: 'Erreur lors de l’envoi des notifications de permanences concurrentes' });
+    }
+};
+
+export const purgeConcurrentPermanences: AppRequestHandler = async (_req, res) => {
+    try {
+        const result = await permanence_service.purgeConcurrentPermanences();
+        Ok(res, {
+            data: result,
+            msg: `${result.removedRegistrations} inscription(s) supprimée(s) pour ${result.affectedUsers} utilisateur(s).`,
+        });
+    } catch (err) {
+        console.error(err);
+        Error(res, { msg: 'Erreur lors de la purge des permanences concurrentes' });
+    }
+};
+
+export const getConcurrentPermanences: AppRequestHandler = async (req, res) => {
+    const userId = req.user?.userId;
+
+    if (!userId) {
+        Error(res, { msg: 'Utilisateur non identifié' });
+        return;
+    }
+
+    try {
+        const status = await permanence_service.getConcurrentPermanencesStatus(Number(userId));
+        Ok(res, { data: status });
+    } catch (err) {
+        console.error(err);
+        Error(res, { msg: 'Erreur lors de la vérification des permanences concurrentes' });
+    }
+};
diff --git a/backend/src/email/email.registry.ts b/backend/src/email/email.registry.ts
index f582ca5..90f13a7 100644
--- a/backend/src/email/email.registry.ts
+++ b/backend/src/email/email.registry.ts
@@ -1,4 +1,9 @@
-import type { PermanenceEmailData, TemplateRenderer, TeamAssignmentEmailData } from '../types/email';
+import type {
+    ConcurrentPermanencesEmailData,
+    PermanenceEmailData,
+    TemplateRenderer,
+    TeamAssignmentEmailData,
+} from '../types/email';
 
 export const templateResetPassword = 'reset-password.html';
 const templateNotebook = 'notebook.html';
@@ -7,6 +12,7 @@ const templateWelcome = 'welcome.html';
 const templateNotifyNews = 'notify-news.html';
 const templateNotifyTentConfirmation = 'notify-tent-confirmation.html';
 const templateNotifyPermanenceReminder = 'notify-permanence-reminder.html';
+const templateNotifyConcurrentPermanences = 'notify-concurrent-permanences.html';
 const templateNotifyTeamAssignment = 'notify-team-assignment.html';
 const templateMentorReminder = 'mentor-reminder.html';
 
@@ -80,6 +86,10 @@ export const templateRenderers: Record<string, TemplateRenderer> = {
             return typedData;
         },
     },
+    templateNotifyConcurrentPermanences: {
+        fileName: templateNotifyConcurrentPermanences,
+        buildData: (data) => data as ConcurrentPermanencesEmailData,
+    },
     templateMentorReminder: {
         fileName: templateMentorReminder,
         buildData: () => {
diff --git a/backend/src/email/templates/notify-concurrent-permanences.html b/backend/src/email/templates/notify-concurrent-permanences.html
new file mode 100644
index 0000000..ca13bc2
--- /dev/null
+++ b/backend/src/email/templates/notify-concurrent-permanences.html
@@ -0,0 +1,116 @@
+<!doctype html>
+<html lang="fr">
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>Intégration UTT</title>
+    </head>
+    <body
+        style="
+            font-family: Arial, sans-serif;
+            font-size: 16px;
+            margin: 0;
+            padding: 0;
+            background-color: #ffffff;
+            text-align: center;
+            color: #222;
+        ">
+        <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse">
+            <tr>
+                <td align="center" style="padding: 24px">
+                    <table
+                        width="600"
+                        cellpadding="0"
+                        cellspacing="0"
+                        border="0"
+                        style="
+                            max-width: 100%;
+                            margin: 0 auto;
+                            background-color: #f8f8f8;
+                            border-radius: 8px;
+                            overflow: hidden;
+                        ">
+                        <tr>
+                            <td align="center" style="padding: 10px">
+                                <img
+                                    src="https://integration.utt.fr/img/logo_original.png"
+                                    alt="Logo Intégration UTT"
+                                    style="width: 104px; height: auto" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td
+                                style="
+                                    font-size: 21px;
+                                    font-weight: bold;
+                                    line-height: 1.4;
+                                    padding: 10px 0;
+                                    text-align: center;
+                                ">
+                                INTEGRATION UTT
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="padding: 24px; text-align: left; line-height: 1.6">
+                                <h2 style="font-size: 24px; margin: 0 0 16px; text-align: center">
+                                    Permanences concurrentes
+                                </h2>
+                                <p>
+                                    Attention, certaines de vos permanences se deroulent sur des creneaux qui se
+                                    chevauchent :
+                                </p>
+                                {{#each permanences}}
+                                <div
+                                    style="
+                                        border-left: 4px solid #e6a700;
+                                        padding: 8px 12px;
+                                        margin: 12px 0;
+                                        background-color: #fff8df;
+                                    ">
+                                    <p style="margin: 0 0 6px"><strong>{{name}}</strong></p>
+                                    <p style="margin: 0">Du {{startAt}} au {{endAt}}</p>
+                                    <p style="margin: 0">Lieu : {{location}}</p>
+                                </div>
+                                {{/each}}
+                                <p>
+                                    Rendez-vous sur la page &laquo; Mes permanences &raquo; pour verifier vos
+                                    inscriptions.
+                                </p>
+                                <p>
+                                    Après un shotgun, vous avez <strong>jusqu'au lendemain midi</strong> pour supprimer
+                                    les doublons, sinon des permanences seront
+                                    <strong>retirées de manière aléatoire</strong> pour éliminer les conflits, et les
+                                    permanences libérées seront à nouveau shotgun le lendemain.
+                                </p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="padding: 0 24px 24px">
+                                <h3 style="text-align: center">
+                                    Retrouve des informations utiles sur notre Instagram !
+                                </h3>
+                                <div style="margin: auto; width: fit-content">
+                                    <a href="https://www.instagram.com/bdeutt" target="_blank">
+                                        <img
+                                            src="https://cdn.tools.unlayer.com/social/icons/rounded/instagram.png"
+                                            alt="Instagram"
+                                            style="width: 30px; height: 30px; margin: 5px" />
+                                    </a>
+                                </div>
+                                <p>Cordialement,<br />L'équipe intégration UTT</p>
+                                <p style="font-size: 12px; color: #999999; margin: 0; text-align: center">
+                                    Si vous avez des questions, n'hésitez pas à
+                                    <a
+                                        href="mailto:integration+site-support@utt.fr"
+                                        style="color: #e74160; text-decoration: none"
+                                        >nous contacter</a
+                                    >.
+                                </p>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </body>
+</html>
diff --git a/backend/src/routes/automation.routes.ts b/backend/src/routes/automation.routes.ts
index 214f4a4..1561de1 100644
--- a/backend/src/routes/automation.routes.ts
+++ b/backend/src/routes/automation.routes.ts
@@ -6,5 +6,10 @@ const automationRoutes = express.Router();
 // Permanences routes
 automationRoutes.post('/permanence/notification/hourly', permanenceController.sendHourlyNotificationToUsers);
 automationRoutes.post('/permanence/notification/daily', permanenceController.sendDailyNotificationToUsers);
+automationRoutes.post(
+    '/permanence/concurrent/notification',
+    permanenceController.sendConcurrentPermanenceNotifications,
+);
+automationRoutes.post('/permanence/concurrent/purge', permanenceController.purgeConcurrentPermanences);
 
 export default automationRoutes;
diff --git a/backend/src/routes/permanences.routes.ts b/backend/src/routes/permanences.routes.ts
index 50fb6e3..162884d 100644
--- a/backend/src/routes/permanences.routes.ts
+++ b/backend/src/routes/permanences.routes.ts
@@ -1,33 +1,47 @@
-import express from "express";
-import multer from "multer";
-import * as permanenceController from "../controllers/permanence.controller";
-import { isRespoMiddleware } from "../middlewares/respoperm.middleware";
-import { checkRole } from "../middlewares/user.middleware";
+import express from 'express';
+import multer from 'multer';
+import * as permanenceController from '../controllers/permanence.controller';
+import { isRespoMiddleware } from '../middlewares/respoperm.middleware';
+import { checkRole } from '../middlewares/user.middleware';
 
 const permanenceRouter = express.Router();
-const upload = multer({ dest: "uploads/permcsv/" });
+const upload = multer({ dest: 'uploads/permcsv/' });
 
 // Admin routes
-permanenceRouter.post("/admin/permanence", checkRole("Admin", ["Respo CE"]), permanenceController.createPermanence);
-permanenceRouter.delete("/admin/permanence", checkRole("Admin", ["Respo CE"]), permanenceController.deletePermanence);
-permanenceRouter.post("/admin/updatepermanence", checkRole("Admin", ["Respo CE"]), permanenceController.updatePermanence);
-permanenceRouter.post("/admin/open", checkRole("Admin", ["Respo CE"]), permanenceController.openPermanence);
-permanenceRouter.post("/admin/close", checkRole("Admin", ["Respo CE"]), permanenceController.closePermanence);
-permanenceRouter.get("/admin/permanences", checkRole("Admin", ["Respo CE"]), permanenceController.getAllPermanences);
-permanenceRouter.get("/admin/users", checkRole("Admin", ["Respo CE"]), permanenceController.getUsersInPermanence);
-permanenceRouter.post("/admin/add", checkRole("Admin", ["Respo CE"]), permanenceController.addUserToPermanence);
-permanenceRouter.post("/admin/remove", checkRole("Admin", ["Respo CE"]), permanenceController.removeUserToPermanence);
-permanenceRouter.post("/admin/importpermanences", checkRole("Admin", ["Respo CE"]), upload.single("file"), permanenceController.uploadPermanencesCSV);
-permanenceRouter.post("/admin/claimedmember", checkRole("Admin", ["Respo CE"]), permanenceController.claimMember);
+permanenceRouter.post('/admin/permanence', checkRole('Admin', ['Respo CE']), permanenceController.createPermanence);
+permanenceRouter.delete('/admin/permanence', checkRole('Admin', ['Respo CE']), permanenceController.deletePermanence);
+permanenceRouter.post(
+    '/admin/updatepermanence',
+    checkRole('Admin', ['Respo CE']),
+    permanenceController.updatePermanence,
+);
+permanenceRouter.post('/admin/open', checkRole('Admin', ['Respo CE']), permanenceController.openPermanence);
+permanenceRouter.post('/admin/close', checkRole('Admin', ['Respo CE']), permanenceController.closePermanence);
+permanenceRouter.get('/admin/permanences', checkRole('Admin', ['Respo CE']), permanenceController.getAllPermanences);
+permanenceRouter.get('/admin/users', checkRole('Admin', ['Respo CE']), permanenceController.getUsersInPermanence);
+permanenceRouter.post('/admin/add', checkRole('Admin', ['Respo CE']), permanenceController.addUserToPermanence);
+permanenceRouter.post('/admin/remove', checkRole('Admin', ['Respo CE']), permanenceController.removeUserToPermanence);
+permanenceRouter.post(
+    '/admin/importpermanences',
+    checkRole('Admin', ['Respo CE']),
+    upload.single('file'),
+    permanenceController.uploadPermanencesCSV,
+);
+permanenceRouter.post('/admin/claimedmember', checkRole('Admin', ['Respo CE']), permanenceController.claimMember);
 
 //Respo de perm routes
-permanenceRouter.get("/respo/respodetails", isRespoMiddleware, permanenceController.getRespoPermanencesWithMembers);
-permanenceRouter.post("/respo/claimedmember", isRespoMiddleware, permanenceController.claimMember);
+permanenceRouter.get('/respo/respodetails', isRespoMiddleware, permanenceController.getRespoPermanencesWithMembers);
+permanenceRouter.post('/respo/claimedmember', isRespoMiddleware, permanenceController.claimMember);
 
 // Student routes
-permanenceRouter.get("/user/permanences", checkRole("Student", []), permanenceController.getOpenPermanences);
-permanenceRouter.post("/user/apply", checkRole("Student", []), permanenceController.applyToPermanence);
-permanenceRouter.post("/user/leave", checkRole("Student", []), permanenceController.leavePermanence);
-permanenceRouter.get("/user/me", checkRole("Student", []), permanenceController.getMyPermanences);
-permanenceRouter.get("/user/isrespo", permanenceController.isUserRespo);
+permanenceRouter.get('/user/permanences', checkRole('Student', []), permanenceController.getOpenPermanences);
+permanenceRouter.get(
+    '/user/concurrent/status',
+    checkRole('Student', []),
+    permanenceController.getConcurrentPermanences,
+);
+permanenceRouter.post('/user/apply', checkRole('Student', []), permanenceController.applyToPermanence);
+permanenceRouter.post('/user/leave', checkRole('Student', []), permanenceController.leavePermanence);
+permanenceRouter.get('/user/me', checkRole('Student', []), permanenceController.getMyPermanences);
+permanenceRouter.get('/user/isrespo', permanenceController.isUserRespo);
 export default permanenceRouter;
diff --git a/backend/src/services/permanence.service.ts b/backend/src/services/permanence.service.ts
index aa9a36e..aee8fba 100644
--- a/backend/src/services/permanence.service.ts
+++ b/backend/src/services/permanence.service.ts
@@ -1,8 +1,14 @@
 import { and, eq, inArray, sql } from 'drizzle-orm';
 import fs from 'fs';
 import Papa from 'papaparse';
-import type { PermanenceEmailData } from '../types/email';
-import type { CsvPermanence, LightUser, Notification, Permanence } from '../types/permanence';
+import type { ConcurrentPermanencesEmailData, PermanenceEmailData } from '../types/email';
+import type {
+    ConcurrentPermanenceNotification,
+    CsvPermanence,
+    LightUser,
+    Notification,
+    Permanence,
+} from '../types/permanence';
 import { db } from '../database/db';
 import {
     AlreadyRegisteredError,
@@ -444,6 +450,178 @@ export const getHourlyNotifications = async (): Promise<Notification[]> => {
     return getMembersFromPermanences(permanences);
 };
 
+export const getConcurrentPermanenceNotifications = async (): Promise<ConcurrentPermanenceNotification[]> => {
+    const registrations = await db
+        .select({
+            userId: userSchema.id,
+            email: userSchema.email,
+            permanence: permanenceSchema,
+        })
+        .from(userPermanenceSchema)
+        .innerJoin(userSchema, eq(userSchema.id, userPermanenceSchema.user_id))
+        .innerJoin(permanenceSchema, eq(permanenceSchema.id, userPermanenceSchema.permanence_id));
+
+    const registrationsByUser = new Map<number, { email: string; permanences: Permanence[] }>();
+    for (const registration of registrations) {
+        if (!registration.email) continue;
+        const userRegistration = registrationsByUser.get(registration.userId) ?? {
+            email: registration.email,
+            permanences: [],
+        };
+        userRegistration.permanences.push(registration.permanence);
+        registrationsByUser.set(registration.userId, userRegistration);
+    }
+
+    return [...registrationsByUser.entries()].flatMap(([userId, userRegistration]) => {
+        const { email, permanences } = userRegistration;
+        const concurrentIds = new Set<number>();
+        for (let firstIndex = 0; firstIndex < permanences.length; firstIndex += 1) {
+            const first = permanences[firstIndex];
+            if (!first.start_at || !first.end_at) continue;
+
+            for (let secondIndex = firstIndex + 1; secondIndex < permanences.length; secondIndex += 1) {
+                const second = permanences[secondIndex];
+                if (!second.start_at || !second.end_at) continue;
+
+                if (first.start_at < second.end_at && second.start_at < first.end_at) {
+                    concurrentIds.add(first.id);
+                    concurrentIds.add(second.id);
+                }
+            }
+        }
+
+        const concurrentPermanences = permanences.filter((permanence) => concurrentIds.has(permanence.id));
+        return concurrentPermanences.length > 0 ? [{ userId, email, permanences: concurrentPermanences }] : [];
+    });
+};
+
+export const getConcurrentPermanencesStatus = async (userId: number) => {
+    const permanences = await db
+        .select({
+            id: permanenceSchema.id,
+            name: permanenceSchema.name,
+            description: permanenceSchema.description,
+            location: permanenceSchema.location,
+            start_at: permanenceSchema.start_at,
+            end_at: permanenceSchema.end_at,
+            capacity: permanenceSchema.capacity,
+            is_open: permanenceSchema.is_open,
+            difficulty: permanenceSchema.difficulty,
+        })
+        .from(userPermanenceSchema)
+        .innerJoin(permanenceSchema, eq(permanenceSchema.id, userPermanenceSchema.permanence_id))
+        .where(eq(userPermanenceSchema.user_id, userId));
+
+    const concurrentIds = new Set<number>();
+    for (let firstIndex = 0; firstIndex < permanences.length; firstIndex += 1) {
+        const first = permanences[firstIndex];
+        if (!first.start_at || !first.end_at) continue;
+
+        for (let secondIndex = firstIndex + 1; secondIndex < permanences.length; secondIndex += 1) {
+            const second = permanences[secondIndex];
+            if (!second.start_at || !second.end_at) continue;
+
+            const overlaps = first.start_at < second.end_at && second.start_at < first.end_at;
+            if (overlaps) {
+                concurrentIds.add(first.id);
+                concurrentIds.add(second.id);
+            }
+        }
+    }
+
+    const concurrentPermanences = permanences.filter((permanence) => concurrentIds.has(permanence.id));
+
+    return {
+        concurrentPermanences: concurrentPermanences.length > 0,
+        permanences: concurrentPermanences,
+    };
+};
+
+export const purgeConcurrentPermanences = async () => {
+    return db.transaction(async (tx) => {
+        await tx.execute(sql`LOCK TABLE user_permanences IN EXCLUSIVE MODE`);
+
+        const registrations = await tx
+            .select({
+                userId: userPermanenceSchema.user_id,
+                permanenceId: permanenceSchema.id,
+                startAt: permanenceSchema.start_at,
+                endAt: permanenceSchema.end_at,
+                difficulty: permanenceSchema.difficulty,
+            })
+            .from(userPermanenceSchema)
+            .innerJoin(permanenceSchema, eq(permanenceSchema.id, userPermanenceSchema.permanence_id));
+
+        const registrationsByUser = new Map<number, typeof registrations>();
+        for (const registration of registrations) {
+            if (registration.userId === null) continue;
+
+            const userRegistrations = registrationsByUser.get(registration.userId) ?? [];
+            userRegistrations.push(registration);
+            registrationsByUser.set(registration.userId, userRegistrations);
+        }
+
+        let removedRegistrations = 0;
+        let affectedUsers = 0;
+
+        for (const [userId, userRegistrations] of registrationsByUser) {
+            let removedForUser = false;
+
+            while (true) {
+                const conflictingRegistrations = new Set<(typeof userRegistrations)[number]>();
+
+                for (let firstIndex = 0; firstIndex < userRegistrations.length; firstIndex += 1) {
+                    const first = userRegistrations[firstIndex];
+                    if (!first.startAt || !first.endAt) continue;
+
+                    for (let secondIndex = firstIndex + 1; secondIndex < userRegistrations.length; secondIndex += 1) {
+                        const second = userRegistrations[secondIndex];
+                        if (!second.startAt || !second.endAt) continue;
+
+                        if (first.startAt < second.endAt && second.startAt < first.endAt) {
+                            conflictingRegistrations.add(first);
+                            conflictingRegistrations.add(second);
+                        }
+                    }
+                }
+
+                if (conflictingRegistrations.size === 0) break;
+
+                const lowestDifficulty = Math.min(
+                    ...[...conflictingRegistrations].map((registration) => registration.difficulty ?? 0),
+                );
+                const lowestDifficultyRegistrations = [...conflictingRegistrations].filter(
+                    (registration) => (registration.difficulty ?? 0) === lowestDifficulty,
+                );
+                const permanenceToRemove =
+                    lowestDifficultyRegistrations[Math.floor(Math.random() * lowestDifficultyRegistrations.length)];
+
+                await tx
+                    .delete(userPermanenceSchema)
+                    .where(
+                        and(
+                            eq(userPermanenceSchema.user_id, userId),
+                            eq(userPermanenceSchema.permanence_id, permanenceToRemove.permanenceId),
+                        ),
+                    );
+                await tx
+                    .update(permanenceSchema)
+                    .set({ capacity: sql`capacity + 1` })
+                    .where(eq(permanenceSchema.id, permanenceToRemove.permanenceId));
+
+                const registrationIndex = userRegistrations.indexOf(permanenceToRemove);
+                userRegistrations.splice(registrationIndex, 1);
+                removedRegistrations += 1;
+                removedForUser = true;
+            }
+
+            if (removedForUser) affectedUsers += 1;
+        }
+
+        return { removedRegistrations, affectedUsers };
+    });
+};
+
 // Cette fonction est vouée à disparaitre lors du passage à Prisma, avec un simple "with"
 export const getMembersFromPermanences = async (
     permanences: Permanence[],
@@ -518,3 +696,38 @@ export const sendNotifications = async (notifications: Notification[]) => {
         }
     }
 };
+
+export const sendConcurrentPermanenceNotifications = async (notifications: ConcurrentPermanenceNotification[]) => {
+    for (const notification of notifications) {
+        try {
+            const permanenceEmailData: ConcurrentPermanencesEmailData = {
+                permanences: notification.permanences.map((permanence) => ({
+                    name: permanence.name,
+                    startAt: new Intl.DateTimeFormat('fr-FR', {
+                        day: '2-digit',
+                        month: 'long',
+                        hour: '2-digit',
+                        minute: '2-digit',
+                    }).format(permanence.start_at),
+                    endAt: new Intl.DateTimeFormat('fr-FR', {
+                        day: '2-digit',
+                        month: 'long',
+                        hour: '2-digit',
+                        minute: '2-digit',
+                    }).format(permanence.end_at),
+                    location: permanence.location,
+                })),
+            };
+
+            await sendEmail({
+                from: email_from,
+                to: [notification.email],
+                subject: '[ATTENTION] Permanences concurrentes',
+                text: 'Certaines de vos permanences se chevauchent.',
+                html: generateEmailHtml('templateNotifyConcurrentPermanences', permanenceEmailData),
+            });
+        } catch (error) {
+            console.error(`Erreur lors de l'envoi du conflit de permanences a ${notification.email}`, error);
+        }
+    }
+};
diff --git a/backend/src/types/email.d.ts b/backend/src/types/email.d.ts
index 6688387..b49186e 100644
--- a/backend/src/types/email.d.ts
+++ b/backend/src/types/email.d.ts
@@ -25,6 +25,15 @@ export interface PermanenceEmailData extends TemplateData {
     permDescription: string;
 }
 
+export interface ConcurrentPermanencesEmailData extends TemplateData {
+    permanences: {
+        name: string;
+        startAt: string;
+        endAt: string;
+        location: string;
+    }[];
+}
+
 export interface TeamAssignmentEmailData extends TemplateData {
     teamName: string;
     teamSocialLink: string;
diff --git a/backend/src/types/permanence.d.ts b/backend/src/types/permanence.d.ts
index 190fbb6..4b2a057 100644
--- a/backend/src/types/permanence.d.ts
+++ b/backend/src/types/permanence.d.ts
@@ -11,8 +11,14 @@ export type CsvPermanence = {
 
 export type Notification = {
     permanence: Permanence;
-    members: LightUser[]
-}
+    members: LightUser[];
+};
+
+export type ConcurrentPermanenceNotification = {
+    userId: number;
+    email: string;
+    permanences: Permanence[];
+};
 
 export type Permanence = {
     id: number;
@@ -24,11 +30,11 @@ export type Permanence = {
     capacity: number;
     is_open: boolean;
     difficulty: number;
-}
+};
 
 export type LightUser = {
     id: number;
     firstName: string;
     lastName: string;
     email: string;
-}
+};
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 0de1a2b..46b0562 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -5,6 +5,7 @@ import AdminRoute from './components/utils/adminroute';
 import PrivateRoute from './components/utils/privateroute';
 import ProtectedRoute from './components/utils/protectedroute';
 import { OnboardingProvider } from './contexts/onboarding';
+import { PermanencesProvider } from './contexts/permanences';
 import { UserProvider } from './contexts/user';
 
 const AdminPageBanned = lazy(() => import('./pages/admin/adminBanned'));
@@ -65,270 +66,272 @@ const App: React.FC = () => {
         <Router>
             <UserProvider>
                 <OnboardingProvider>
-                    <Routes>
-                        {/* Public */}
-                        <Route path="/" element={<LoginPage />} />
-                        <Route path="/register" element={<RegisterPage />} />
-                        <Route path="/resetpassword" element={<ResetPasswordPage />} />
-                        <Route path="/roadbook" element={<RoadbookPage />} />
-                        <Route path="/privacy" element={<PrivacyPage />} />
-                        <Route path="/legals" element={<LegalsPage />} />
+                    <PermanencesProvider>
+                        <Routes>
+                            {/* Public */}
+                            <Route path="/" element={<LoginPage />} />
+                            <Route path="/register" element={<RegisterPage />} />
+                            <Route path="/resetpassword" element={<ResetPasswordPage />} />
+                            <Route path="/roadbook" element={<RoadbookPage />} />
+                            <Route path="/privacy" element={<PrivacyPage />} />
+                            <Route path="/legals" element={<LegalsPage />} />
 
-                        {/* Utilisateurs connectés */}
+                            {/* Utilisateurs connectés */}
 
-                        <Route
-                            path="/home"
-                            element={
-                                <ProtectedRoute>
-                                    <HomePage />
-                                </ProtectedRoute>
-                            }
-                        />
-                        <Route
-                            path="/plannings"
-                            element={
-                                <ProtectedRoute>
-                                    <PlanningsPage />
-                                </ProtectedRoute>
-                            }
-                        />
-                        <Route
-                            path="/profil"
-                            element={
-                                <ProtectedRoute>
-                                    <ProfilPage />
-                                </ProtectedRoute>
-                            }
-                        />
-                        <Route
-                            path="/challenges"
-                            element={
-                                <ProtectedRoute>
-                                    <ChallPage />
-                                </ProtectedRoute>
-                            }
-                        />
-                        <Route
-                            path="/parrainage"
-                            element={
-                                <ProtectedRoute>
-                                    <ParrainagePage />
-                                </ProtectedRoute>
-                            }
-                        />
-                        <Route
-                            path="/sdi"
-                            element={
-                                <ProtectedRoute>
-                                    <SdiPage />
-                                </ProtectedRoute>
-                            }
-                        />
-                        <Route
-                            path="/wei"
-                            element={
-                                <ProtectedRoute>
-                                    <WeiPage />
-                                </ProtectedRoute>
-                            }
-                        />
-                        <Route
-                            path="/food"
-                            element={
-                                <ProtectedRoute>
-                                    <FoodPage />
-                                </ProtectedRoute>
-                            }
-                        />
-                        <Route
-                            path="/news"
-                            element={
-                                <ProtectedRoute>
-                                    <NewsPage />
-                                </ProtectedRoute>
-                            }
-                        />
-                        <Route
-                            path="/discord"
-                            element={
-                                <ProtectedRoute>
-                                    <DiscordPage />
-                                </ProtectedRoute>
-                            }
-                        />
+                            <Route
+                                path="/home"
+                                element={
+                                    <ProtectedRoute>
+                                        <HomePage />
+                                    </ProtectedRoute>
+                                }
+                            />
+                            <Route
+                                path="/plannings"
+                                element={
+                                    <ProtectedRoute>
+                                        <PlanningsPage />
+                                    </ProtectedRoute>
+                                }
+                            />
+                            <Route
+                                path="/profil"
+                                element={
+                                    <ProtectedRoute>
+                                        <ProfilPage />
+                                    </ProtectedRoute>
+                                }
+                            />
+                            <Route
+                                path="/challenges"
+                                element={
+                                    <ProtectedRoute>
+                                        <ChallPage />
+                                    </ProtectedRoute>
+                                }
+                            />
+                            <Route
+                                path="/parrainage"
+                                element={
+                                    <ProtectedRoute>
+                                        <ParrainagePage />
+                                    </ProtectedRoute>
+                                }
+                            />
+                            <Route
+                                path="/sdi"
+                                element={
+                                    <ProtectedRoute>
+                                        <SdiPage />
+                                    </ProtectedRoute>
+                                }
+                            />
+                            <Route
+                                path="/wei"
+                                element={
+                                    <ProtectedRoute>
+                                        <WeiPage />
+                                    </ProtectedRoute>
+                                }
+                            />
+                            <Route
+                                path="/food"
+                                element={
+                                    <ProtectedRoute>
+                                        <FoodPage />
+                                    </ProtectedRoute>
+                                }
+                            />
+                            <Route
+                                path="/news"
+                                element={
+                                    <ProtectedRoute>
+                                        <NewsPage />
+                                    </ProtectedRoute>
+                                }
+                            />
+                            <Route
+                                path="/discord"
+                                element={
+                                    <ProtectedRoute>
+                                        <DiscordPage />
+                                    </ProtectedRoute>
+                                }
+                            />
 
-                        {/* Étudiant et Admin */}
-                        <Route
-                            path="/shotgun"
-                            element={
-                                <PrivateRoute permissionRequired="Student">
-                                    <ShotgunPage />
-                                </PrivateRoute>
-                            }
-                        />
-                        <Route
-                            path="/permanenceslist"
-                            element={
-                                <PrivateRoute permissionRequired="Student">
-                                    <PermanencesPageAvailable />
-                                </PrivateRoute>
-                            }
-                        />
-                        <Route
-                            path="/mypermanences"
-                            element={
-                                <PrivateRoute permissionRequired="Student">
-                                    <PermanencesPageMy />
-                                </PrivateRoute>
-                            }
-                        />
-                        <Route
-                            path="/permanencesappeal"
-                            element={
-                                <PrivateRoute permissionRequired="Student">
-                                    <PermanencesPageRespoCall />
-                                </PrivateRoute>
-                            }
-                        />
-                        <Route
-                            path="/games"
-                            element={
-                                <PrivateRoute permissionRequired="Student">
-                                    <GamesPage />
-                                </PrivateRoute>
-                            }
-                        />
+                            {/* Étudiant et Admin */}
+                            <Route
+                                path="/shotgun"
+                                element={
+                                    <PrivateRoute permissionRequired="Student">
+                                        <ShotgunPage />
+                                    </PrivateRoute>
+                                }
+                            />
+                            <Route
+                                path="/permanenceslist"
+                                element={
+                                    <PrivateRoute permissionRequired="Student">
+                                        <PermanencesPageAvailable />
+                                    </PrivateRoute>
+                                }
+                            />
+                            <Route
+                                path="/mypermanences"
+                                element={
+                                    <PrivateRoute permissionRequired="Student">
+                                        <PermanencesPageMy />
+                                    </PrivateRoute>
+                                }
+                            />
+                            <Route
+                                path="/permanencesappeal"
+                                element={
+                                    <PrivateRoute permissionRequired="Student">
+                                        <PermanencesPageRespoCall />
+                                    </PrivateRoute>
+                                }
+                            />
+                            <Route
+                                path="/games"
+                                element={
+                                    <PrivateRoute permissionRequired="Student">
+                                        <GamesPage />
+                                    </PrivateRoute>
+                                }
+                            />
 
-                        {/* ResposCE et Admin */}
-                        <Route
-                            path="/admin/teams"
-                            element={
-                                <PrivateRoute permissionRequired="Admin" roleRequired="Respo CE">
-                                    <AdminPageTeam />
-                                </PrivateRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/shotgun"
-                            element={
-                                <PrivateRoute permissionRequired="Admin" roleRequired="Respo CE">
-                                    <AdminPageShotgun />
-                                </PrivateRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/factions"
-                            element={
-                                <PrivateRoute permissionRequired="Admin" roleRequired="Respo CE">
-                                    <AdminPageFaction />
-                                </PrivateRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/permanences"
-                            element={
-                                <PrivateRoute permissionRequired="Admin" roleRequired="Respo CE">
-                                    <AdminPagePerm />
-                                </PrivateRoute>
-                            }
-                        />
+                            {/* ResposCE et Admin */}
+                            <Route
+                                path="/admin/teams"
+                                element={
+                                    <PrivateRoute permissionRequired="Admin" roleRequired="Respo CE">
+                                        <AdminPageTeam />
+                                    </PrivateRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/shotgun"
+                                element={
+                                    <PrivateRoute permissionRequired="Admin" roleRequired="Respo CE">
+                                        <AdminPageShotgun />
+                                    </PrivateRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/factions"
+                                element={
+                                    <PrivateRoute permissionRequired="Admin" roleRequired="Respo CE">
+                                        <AdminPageFaction />
+                                    </PrivateRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/permanences"
+                                element={
+                                    <PrivateRoute permissionRequired="Admin" roleRequired="Respo CE">
+                                        <AdminPagePerm />
+                                    </PrivateRoute>
+                                }
+                            />
 
-                        {/* ResposCE et Admin */}
-                        <Route
-                            path="/admin/news"
-                            element={
-                                <PrivateRoute permissionRequired="Admin" roleRequired="Communication">
-                                    <AdminPageNews />
-                                </PrivateRoute>
-                            }
-                        />
+                            {/* ResposCE et Admin */}
+                            <Route
+                                path="/admin/news"
+                                element={
+                                    <PrivateRoute permissionRequired="Admin" roleRequired="Communication">
+                                        <AdminPageNews />
+                                    </PrivateRoute>
+                                }
+                            />
 
-                        {/* Arbitre et Admin*/}
-                        <Route
-                            path="/admin/challenge"
-                            element={
-                                <PrivateRoute permissionRequired="Admin" roleRequired="Arbitre">
-                                    <AdminPageChallenges />
-                                </PrivateRoute>
-                            }
-                        />
-                        {/* Admin uniquement */}
-                        <Route
-                            path="/admin/roles"
-                            element={
-                                <AdminRoute>
-                                    <AdminPageRole />
-                                </AdminRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/events"
-                            element={
-                                <AdminRoute>
-                                    <AdminPageEvents />
-                                </AdminRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/export-import"
-                            element={
-                                <AdminRoute>
-                                    <AdminPageExport />
-                                </AdminRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/email"
-                            element={
-                                <AdminRoute>
-                                    <AdminPageEmail />
-                                </AdminRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/users"
-                            element={
-                                <AdminRoute>
-                                    <AdminPageUser />
-                                </AdminRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/games"
-                            element={
-                                <AdminRoute>
-                                    <AdminPageGames />
-                                </AdminRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/tent"
-                            element={
-                                <AdminRoute>
-                                    <AdminPageTent />
-                                </AdminRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/bus"
-                            element={
-                                <AdminRoute>
-                                    <AdminPageBus />
-                                </AdminRoute>
-                            }
-                        />
-                        <Route
-                            path="/admin/banned"
-                            element={
-                                <AdminRoute>
-                                    <AdminPageBanned />
-                                </AdminRoute>
-                            }
-                        />
+                            {/* Arbitre et Admin*/}
+                            <Route
+                                path="/admin/challenge"
+                                element={
+                                    <PrivateRoute permissionRequired="Admin" roleRequired="Arbitre">
+                                        <AdminPageChallenges />
+                                    </PrivateRoute>
+                                }
+                            />
+                            {/* Admin uniquement */}
+                            <Route
+                                path="/admin/roles"
+                                element={
+                                    <AdminRoute>
+                                        <AdminPageRole />
+                                    </AdminRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/events"
+                                element={
+                                    <AdminRoute>
+                                        <AdminPageEvents />
+                                    </AdminRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/export-import"
+                                element={
+                                    <AdminRoute>
+                                        <AdminPageExport />
+                                    </AdminRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/email"
+                                element={
+                                    <AdminRoute>
+                                        <AdminPageEmail />
+                                    </AdminRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/users"
+                                element={
+                                    <AdminRoute>
+                                        <AdminPageUser />
+                                    </AdminRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/games"
+                                element={
+                                    <AdminRoute>
+                                        <AdminPageGames />
+                                    </AdminRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/tent"
+                                element={
+                                    <AdminRoute>
+                                        <AdminPageTent />
+                                    </AdminRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/bus"
+                                element={
+                                    <AdminRoute>
+                                        <AdminPageBus />
+                                    </AdminRoute>
+                                }
+                            />
+                            <Route
+                                path="/admin/banned"
+                                element={
+                                    <AdminRoute>
+                                        <AdminPageBanned />
+                                    </AdminRoute>
+                                }
+                            />
 
-                        {/* Fallback */}
-                        <Route path="*" element={<NotFoundPage />} />
-                    </Routes>
+                            {/* Fallback */}
+                            <Route path="*" element={<NotFoundPage />} />
+                        </Routes>
+                    </PermanencesProvider>
                 </OnboardingProvider>
             </UserProvider>
         </Router>
diff --git a/frontend/src/components/navbar.tsx b/frontend/src/components/navbar.tsx
index 9d5e8cf..353b923 100644
--- a/frontend/src/components/navbar.tsx
+++ b/frontend/src/components/navbar.tsx
@@ -5,6 +5,7 @@ import { Fragment, useEffect, useState } from 'react';
 import { NavLink, useLocation, useSearchParams } from 'react-router-dom';
 
 import { useOnboarding } from '../contexts/onboarding';
+import { usePermanences } from '../contexts/permanences';
 import { decodeToken, getToken } from '../services/requests/auth.service';
 import { Button } from './ui/button';
 
@@ -32,6 +33,7 @@ export const Navbar = () => {
     const [hasContactInformation, setHasContactInformation] = useState(false);
     const [needsVssForm, setNeedsVssForm] = useState(false);
     const { status: onboardingStatus, loading: onboardingLoading } = useOnboarding();
+    const { concurrentPermanences, loading: permanencesLoading } = usePermanences();
     const [, setSearchParams] = useSearchParams();
 
     const handleLogout = () => {
@@ -247,6 +249,19 @@ export const Navbar = () => {
                     </Button>
                 </div>
             )}
+
+            {isAuthenticated && !permanencesLoading && concurrentPermanences && (
+                <div className="bg-amber-500 text-gray-900 shadow-lg flex items-center justify-center gap-2 p-3">
+                    <p className="text-center font-semibold">
+                        ATTENTION : certaines de tes permanences se chevauchent.
+                    </p>
+                    <NavLink to="/mypermanences">
+                        <Button className="bg-white hover:bg-gray-100 text-gray-900 font-bold py-2 px-4 rounded whitespace-nowrap">
+                            Voir mes permanences
+                        </Button>
+                    </NavLink>
+                </div>
+            )}
         </div>
     );
 };
diff --git a/frontend/src/components/permanence/concurrentPerms.tsx b/frontend/src/components/permanence/concurrentPerms.tsx
new file mode 100644
index 0000000..11e3312
--- /dev/null
+++ b/frontend/src/components/permanence/concurrentPerms.tsx
@@ -0,0 +1,44 @@
+import { format } from 'date-fns';
+import { fr } from 'date-fns/locale';
+
+import type { ConcurrentPermanences } from '../../interfaces/permanence.interface';
+import { Card, CardContent, CardHeader, CardTitle } from '../ui/card';
+
+interface ConcurrentPermanencesProps {
+    permanences: ConcurrentPermanences['permanences'];
+}
+
+export const ConcurrentPermanencesCard: React.FC<ConcurrentPermanencesProps> = ({ permanences }) => {
+    return (
+        <Card className="border-l-4 border-amber-500">
+            <CardHeader>
+                <CardTitle className="text-2xl font-bold text-amber-700">Permanences concurrentes</CardTitle>
+                <p className="text-gray-700">Ces permanences se déroulent sur des créneaux qui se chevauchent.</p>
+            </CardHeader>
+            <CardContent>
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+                    {permanences.map((permanence) => (
+                        <Card key={permanence.id} className="border border-amber-200 gap-2 py-4">
+                            <CardHeader className="px-4">
+                                <CardTitle className="text-lg text-gray-800">{permanence.name}</CardTitle>
+                            </CardHeader>
+                            <CardContent className="px-4 text-gray-600">
+                                <p>📍 {permanence.location}</p>
+                                <p>
+                                    🕒 {format(new Date(permanence.start_at), "EEEE dd MMMM 'à' HH:mm", { locale: fr })}{' '}
+                                    - {format(new Date(permanence.end_at), 'HH:mm', { locale: fr })}
+                                </p>
+                            </CardContent>
+                        </Card>
+                    ))}
+                </div>
+                <p className="mt-4 text-gray-700">
+                    Après un shotgun, vous avez <strong className="text-red-500">jusqu'au lendemain midi</strong> pour
+                    supprimer les doublons, sinon des permanences seront{' '}
+                    <strong className="text-red-500">retirées de manière aléatoire</strong> pour éliminer les conflits,
+                    et les permanences libérées seront à nouveau shotgun le lendemain.
+                </p>
+            </CardContent>
+        </Card>
+    );
+};
diff --git a/frontend/src/contexts/permanences.tsx b/frontend/src/contexts/permanences.tsx
new file mode 100644
index 0000000..f7797fd
--- /dev/null
+++ b/frontend/src/contexts/permanences.tsx
@@ -0,0 +1,83 @@
+import React, { createContext, useContext, useEffect, useState } from 'react';
+
+import type { ConcurrentPermanences } from '../interfaces/permanence.interface';
+import { getToken } from '../services/requests/auth.service';
+import { getConcurrentPermanencesStatus } from '../services/requests/permanence.service';
+
+type PermanencesContextType = {
+    concurrentPermanences: boolean;
+    concurrentPermanencesList: ConcurrentPermanences['permanences'];
+    loading: boolean;
+    refreshPermanences: () => Promise<void>;
+};
+
+const PermanencesContext = createContext<PermanencesContextType | undefined>(undefined);
+
+let cachedPermanences: ConcurrentPermanences | null = null;
+
+export const usePermanences = (): PermanencesContextType => {
+    const ctx = useContext(PermanencesContext);
+    if (!ctx) throw new Error('usePermanences must be used within a PermanencesProvider');
+    return ctx;
+};
+
+export const PermanencesProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+    const tokenPresent = Boolean(getToken());
+    const [permanences, setPermanences] = useState<ConcurrentPermanences | null>(cachedPermanences);
+    const [loading, setLoading] = useState<boolean>(() => cachedPermanences === null && tokenPresent);
+
+    const fetchStatus = async () => {
+        const token = getToken();
+        if (!token) {
+            setPermanences(null);
+            setLoading(false);
+            return;
+        }
+
+        setLoading(true);
+        try {
+            const s = await getConcurrentPermanencesStatus();
+            setPermanences(s ?? null);
+            cachedPermanences = s ?? null;
+        } catch {
+            setPermanences(null);
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    useEffect(() => {
+        if (!tokenPresent && !cachedPermanences) {
+            // nothing to do when not authenticated
+            return;
+        }
+
+        if (!cachedPermanences) void fetchStatus();
+
+        const handler = () => {
+            void fetchStatus();
+        };
+
+        window.addEventListener('user-onboarding-updated', handler);
+        return () => window.removeEventListener('user-onboarding-updated', handler);
+    }, []);
+
+    const refreshPermanences = async () => {
+        cachedPermanences = null;
+        await fetchStatus();
+    };
+
+    return (
+        <PermanencesContext.Provider
+            value={{
+                concurrentPermanences: permanences?.concurrentPermanences || false,
+                concurrentPermanencesList: permanences?.permanences || [],
+                loading,
+                refreshPermanences,
+            }}>
+            {children}
+        </PermanencesContext.Provider>
+    );
+};
+
+export default PermanencesProvider;
diff --git a/frontend/src/interfaces/permanence.interface.ts b/frontend/src/interfaces/permanence.interface.ts
index 577beb4..7baa3a8 100644
--- a/frontend/src/interfaces/permanence.interface.ts
+++ b/frontend/src/interfaces/permanence.interface.ts
@@ -1,4 +1,4 @@
-import { type User } from "./user.interface";
+import { type User } from './user.interface';
 
 export interface Permanence {
     id: number;
@@ -18,4 +18,9 @@ export interface Permanence {
 export interface PermanenceActionsProps {
     permanences: Permanence[];
     onRefresh: () => void;
-};
+}
+
+export interface ConcurrentPermanences {
+    concurrentPermanences: boolean;
+    permanences: Pick<Permanence, 'id' | 'name' | 'description' | 'location' | 'start_at' | 'end_at'>[];
+}
diff --git a/frontend/src/pages/perm/permMy.tsx b/frontend/src/pages/perm/permMy.tsx
index 4665ce3..7db2a00 100644
--- a/frontend/src/pages/perm/permMy.tsx
+++ b/frontend/src/pages/perm/permMy.tsx
@@ -3,12 +3,15 @@ import Swal from 'sweetalert2';
 
 import EmergencyModal from '../../components/home/emergencyModal';
 import { Navbar } from '../../components/navbar';
+import { ConcurrentPermanencesCard } from '../../components/permanence/concurrentPerms';
 import { MyPermanencesList } from '../../components/permanence/permUser';
+import { usePermanences } from '../../contexts/permanences';
 import { type Permanence } from '../../interfaces/permanence.interface';
 import { cancelPermanence, getMyPermanences } from '../../services/requests/permanence.service';
 
 const PermanencesPageMy: React.FC = () => {
     const [myPermanences, setMyPermanences] = useState<Permanence[]>([]);
+    const { concurrentPermanences, concurrentPermanencesList, refreshPermanences } = usePermanences();
 
     useEffect(() => {
         fetchMyPermanences();
@@ -57,6 +60,7 @@ const PermanencesPageMy: React.FC = () => {
             const response = await cancelPermanence(permId);
             Swal.fire('Succès ✅', response.message, 'success');
             fetchMyPermanences();
+            await refreshPermanences();
         } catch (err) {
             console.error("Erreur lors de l'annulation", err);
             Swal.fire('Erreur', 'Impossible de vous désinscrire.', 'error');
@@ -69,6 +73,7 @@ const PermanencesPageMy: React.FC = () => {
             <EmergencyModal />
             <div className="min-h-screen flex justify-center bg-gray-50 py-10 px-4">
                 <div className="w-full max-w-6xl flex flex-col gap-12">
+                    {concurrentPermanences && <ConcurrentPermanencesCard permanences={concurrentPermanencesList} />}
                     <MyPermanencesList myPermanences={myPermanences} onCancel={handleCancelPermanence} />
                 </div>
             </div>
diff --git a/frontend/src/services/requests/permanence.service.ts b/frontend/src/services/requests/permanence.service.ts
index e470f42..283f22b 100644
--- a/frontend/src/services/requests/permanence.service.ts
+++ b/frontend/src/services/requests/permanence.service.ts
@@ -1,14 +1,15 @@
-import api from "../api"; // ton instance axios ou une autre bibliothèque pour les requêtes HTTP
+import { type ConcurrentPermanences } from '../../interfaces/permanence.interface';
+import api from '../api'; // ton instance axios ou une autre bibliothèque pour les requêtes HTTP
 
 // Fonction pour récupérer toutes les permanences ouvertes
 export const getOpenPermanences = async () => {
-    const response = await api.get("/permanence/user/permanences");
+    const response = await api.get('/permanence/user/permanences');
     return response.data.data; // La réponse est de type PermanenceResponse
 };
 
 // Fonction pour récupérer toutes les permanences (admin)
 export const getAllPermanences = async () => {
-    const response = await api.get("/permanence/admin/permanences");
+    const response = await api.get('/permanence/admin/permanences');
     return response.data; // La réponse est de type PermanenceResponse
 };
 
@@ -29,7 +30,7 @@ export const createPermanence = async (permanenceData: {
     difficulty: number;
     respoId: number | null;
 }) => {
-    const response = await api.post("/permanence/admin/permanence", {
+    const response = await api.post('/permanence/admin/permanence', {
         name: permanenceData.name,
         description: permanenceData.description,
         location: permanenceData.location,
@@ -37,21 +38,19 @@ export const createPermanence = async (permanenceData: {
         end_at: permanenceData.end_at,
         capacity: permanenceData.capacity,
         difficulty: permanenceData.difficulty,
-        respoId: permanenceData.respoId
+        respoId: permanenceData.respoId,
     });
     return response.data; // La réponse est de type Permanent
-
 };
 
 // Fonction pour ouvrir une permanence (admin)
 export const openPermanence = async (permId: number) => {
-    const response = await api.post("/permanence/admin/open", {
+    const response = await api.post('/permanence/admin/open', {
         permId,
     });
     return response.data; // La réponse est de type Permanent
 };
 
-
 // Fonction pour fermer une permanence (admin)
 export const closePermanence = async (permId: number) => {
     const response = await api.post(`/permanence/admin/close`, { permId });
@@ -68,17 +67,20 @@ export const getMyPermanences = async () => {
     return response.data.data;
 };
 
-export const updatePermanence = async (permId: number, permanenceData: {
-    name: string;
-    description: string;
-    location: string;
-    start_at: string | null;
-    end_at: string | null;
-    capacity: number;
-    difficulty: number;
-    respoId: number | null;
-}) => {
-    const response = await api.post("/permanence/admin/updatepermanence", {
+export const updatePermanence = async (
+    permId: number,
+    permanenceData: {
+        name: string;
+        description: string;
+        location: string;
+        start_at: string | null;
+        end_at: string | null;
+        capacity: number;
+        difficulty: number;
+        respoId: number | null;
+    },
+) => {
+    const response = await api.post('/permanence/admin/updatepermanence', {
         permId,
         name: permanenceData.name,
         description: permanenceData.description,
@@ -87,10 +89,9 @@ export const updatePermanence = async (permId: number, permanenceData: {
         end_at: permanenceData.end_at,
         capacity: permanenceData.capacity,
         difficulty: permanenceData.difficulty,
-        respoId: permanenceData.respoId
+        respoId: permanenceData.respoId,
     });
     return response.data; // La réponse est de type Permanent
-
 };
 
 export const getUsersByPermanence = async (permId: number) => {
@@ -106,7 +107,7 @@ export const addUserToPermanence = async (permId: number, userId: number) => {
 export const removeUserFromPermanence = async (permId: number, userId: number) => {
     const response = await api.post(`/permanence/admin/remove`, { userId, permId });
     return response.data;
-}
+};
 
 export const deletePermanence = async (permId: number) => {
     const response = await api.delete(`/permanence/admin/permanence`, { params: { permId } });
@@ -116,27 +117,27 @@ export const deletePermanence = async (permId: number) => {
 export const importPermanenceCSV = async (formData: FormData) => {
     const response = await api.post(`/permanence/admin/importpermanences`, formData, {
         headers: {
-            "Content-Type": "multipart/form-data",
+            'Content-Type': 'multipart/form-data',
         },
     });
     return response.data;
-}
+};
 
 export const isUserRespo = async (userId: number) => {
     const response = await api.get(`/permanence/user/isrespo`, { params: { userId } });
     return response.data;
-}
+};
 
 export const respoDetails = async () => {
     const response = await api.get(`/permanence/respo/respodetails`);
     return response.data;
-}
+};
 
 export const claimedMember = async (userId: number, permId: number, claimed: boolean) => {
     const response = await api.post(`/permanence/respo/claimedmember`, {
         userId,
         permId,
-        claimed
+        claimed,
     });
     return response.data;
 };
@@ -145,7 +146,13 @@ export const claimedMemberAdmin = async (userId: number, permId: number, claimed
     const response = await api.post(`/permanence/admin/claimedmember`, {
         userId,
         permId,
-        claimed
+        claimed,
     });
     return response.data;
 };
+
+export const getConcurrentPermanencesStatus = async () => {
+    const response = await api.get('/permanence/user/concurrent/status');
+    const status: ConcurrentPermanences = response.data.data;
+    return status;
+};

From 5ec3fc0f51bcf41262f95767c472b84ea2c70fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Poncin?= <remiponcin55@gmail.com>
Date: Mon, 24 Aug 2026 21:43:12 +0200
Subject: [PATCH 06/11] fix: bon bon bon bon

---
 frontend/src/components/tent/tentSection.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/tent/tentSection.tsx b/frontend/src/components/tent/tentSection.tsx
index 1e1d576..a641ab9 100644
--- a/frontend/src/components/tent/tentSection.tsx
+++ b/frontend/src/components/tent/tentSection.tsx
@@ -59,7 +59,7 @@ export const TentPublic = () => {
         fetchUsers();
         fetchTent();
         fetchWEIStatus();
-    }, [roles]);
+    }, []);
 
     useEffect(() => {
         if (!roles.includes('Nouveau')) return;

From d6950ee00741c8562538db7fa23ac684e8d44ef1 Mon Sep 17 00:00:00 2001
From: Arthur Dodin <dodinarthur@gmail.com>
Date: Mon, 24 Aug 2026 22:04:31 +0200
Subject: [PATCH 07/11] refactor: optimize concurrent perms detector loops

---
 backend/src/services/permanence.service.ts | 101 ++++++++++-----------
 1 file changed, 47 insertions(+), 54 deletions(-)

diff --git a/backend/src/services/permanence.service.ts b/backend/src/services/permanence.service.ts
index aee8fba..c326664 100644
--- a/backend/src/services/permanence.service.ts
+++ b/backend/src/services/permanence.service.ts
@@ -450,6 +450,35 @@ export const getHourlyNotifications = async (): Promise<Notification[]> => {
     return getMembersFromPermanences(permanences);
 };
 
+const findConcurrentItems = <T>(
+    items: T[],
+    getStartAt: (item: T) => Date | null,
+    getEndAt: (item: T) => Date | null,
+): T[] => {
+    const concurrentItems = new Set<T>();
+
+    for (let firstIndex = 0; firstIndex < items.length; firstIndex += 1) {
+        const first = items[firstIndex];
+        const firstStartAt = getStartAt(first);
+        const firstEndAt = getEndAt(first);
+        if (!firstStartAt || !firstEndAt) continue;
+
+        for (let secondIndex = firstIndex + 1; secondIndex < items.length; secondIndex += 1) {
+            const second = items[secondIndex];
+            const secondStartAt = getStartAt(second);
+            const secondEndAt = getEndAt(second);
+            if (!secondStartAt || !secondEndAt) continue;
+
+            if (firstStartAt < secondEndAt && secondStartAt < firstEndAt) {
+                concurrentItems.add(first);
+                concurrentItems.add(second);
+            }
+        }
+    }
+
+    return items.filter((item) => concurrentItems.has(item));
+};
+
 export const getConcurrentPermanenceNotifications = async (): Promise<ConcurrentPermanenceNotification[]> => {
     const registrations = await db
         .select({
@@ -474,23 +503,11 @@ export const getConcurrentPermanenceNotifications = async (): Promise<Concurrent
 
     return [...registrationsByUser.entries()].flatMap(([userId, userRegistration]) => {
         const { email, permanences } = userRegistration;
-        const concurrentIds = new Set<number>();
-        for (let firstIndex = 0; firstIndex < permanences.length; firstIndex += 1) {
-            const first = permanences[firstIndex];
-            if (!first.start_at || !first.end_at) continue;
-
-            for (let secondIndex = firstIndex + 1; secondIndex < permanences.length; secondIndex += 1) {
-                const second = permanences[secondIndex];
-                if (!second.start_at || !second.end_at) continue;
-
-                if (first.start_at < second.end_at && second.start_at < first.end_at) {
-                    concurrentIds.add(first.id);
-                    concurrentIds.add(second.id);
-                }
-            }
-        }
-
-        const concurrentPermanences = permanences.filter((permanence) => concurrentIds.has(permanence.id));
+        const concurrentPermanences = findConcurrentItems(
+            permanences,
+            (permanence) => permanence.start_at,
+            (permanence) => permanence.end_at,
+        );
         return concurrentPermanences.length > 0 ? [{ userId, email, permanences: concurrentPermanences }] : [];
     });
 };
@@ -512,24 +529,11 @@ export const getConcurrentPermanencesStatus = async (userId: number) => {
         .innerJoin(permanenceSchema, eq(permanenceSchema.id, userPermanenceSchema.permanence_id))
         .where(eq(userPermanenceSchema.user_id, userId));
 
-    const concurrentIds = new Set<number>();
-    for (let firstIndex = 0; firstIndex < permanences.length; firstIndex += 1) {
-        const first = permanences[firstIndex];
-        if (!first.start_at || !first.end_at) continue;
-
-        for (let secondIndex = firstIndex + 1; secondIndex < permanences.length; secondIndex += 1) {
-            const second = permanences[secondIndex];
-            if (!second.start_at || !second.end_at) continue;
-
-            const overlaps = first.start_at < second.end_at && second.start_at < first.end_at;
-            if (overlaps) {
-                concurrentIds.add(first.id);
-                concurrentIds.add(second.id);
-            }
-        }
-    }
-
-    const concurrentPermanences = permanences.filter((permanence) => concurrentIds.has(permanence.id));
+    const concurrentPermanences = findConcurrentItems(
+        permanences,
+        (permanence) => permanence.start_at,
+        (permanence) => permanence.end_at,
+    );
 
     return {
         concurrentPermanences: concurrentPermanences.length > 0,
@@ -568,29 +572,18 @@ export const purgeConcurrentPermanences = async () => {
             let removedForUser = false;
 
             while (true) {
-                const conflictingRegistrations = new Set<(typeof userRegistrations)[number]>();
-
-                for (let firstIndex = 0; firstIndex < userRegistrations.length; firstIndex += 1) {
-                    const first = userRegistrations[firstIndex];
-                    if (!first.startAt || !first.endAt) continue;
-
-                    for (let secondIndex = firstIndex + 1; secondIndex < userRegistrations.length; secondIndex += 1) {
-                        const second = userRegistrations[secondIndex];
-                        if (!second.startAt || !second.endAt) continue;
-
-                        if (first.startAt < second.endAt && second.startAt < first.endAt) {
-                            conflictingRegistrations.add(first);
-                            conflictingRegistrations.add(second);
-                        }
-                    }
-                }
+                const conflictingRegistrations = findConcurrentItems(
+                    userRegistrations,
+                    (registration) => registration.startAt,
+                    (registration) => registration.endAt,
+                );
 
-                if (conflictingRegistrations.size === 0) break;
+                if (conflictingRegistrations.length === 0) break;
 
                 const lowestDifficulty = Math.min(
-                    ...[...conflictingRegistrations].map((registration) => registration.difficulty ?? 0),
+                    ...conflictingRegistrations.map((registration) => registration.difficulty ?? 0),
                 );
-                const lowestDifficultyRegistrations = [...conflictingRegistrations].filter(
+                const lowestDifficultyRegistrations = conflictingRegistrations.filter(
                     (registration) => (registration.difficulty ?? 0) === lowestDifficulty,
                 );
                 const permanenceToRemove =

From d5ca1ab1ef064f318ba75f7dd3db93355bd5d5c4 Mon Sep 17 00:00:00 2001
From: Arthur Dodin <dodinarthur@gmail.com>
Date: Mon, 24 Aug 2026 22:40:52 +0200
Subject: [PATCH 08/11] feat: notify permanences members every 5 minutes

---
 backend/src/controllers/permanence.controller.ts | 2 +-
 backend/src/services/permanence.service.ts       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/controllers/permanence.controller.ts b/backend/src/controllers/permanence.controller.ts
index 7bad452..5aee1f9 100644
--- a/backend/src/controllers/permanence.controller.ts
+++ b/backend/src/controllers/permanence.controller.ts
@@ -374,7 +374,7 @@ export const sendHourlyNotificationToUsers: AppRequestHandler = async (_req, res
         return;
     }
 
-    permanence_service.sendNotifications(notifications);
+    await permanence_service.sendNotifications(notifications);
 
     Ok(res, { msg: 'Notifications horaires envoyées avec succès' });
 };
diff --git a/backend/src/services/permanence.service.ts b/backend/src/services/permanence.service.ts
index c326664..6f182db 100644
--- a/backend/src/services/permanence.service.ts
+++ b/backend/src/services/permanence.service.ts
@@ -441,8 +441,8 @@ export const getDailyNotifications = async (): Promise<Notification[]> => {
 export const getHourlyNotifications = async (): Promise<Notification[]> => {
     const permanences = await db.query.permanenceSchema.findMany({
         where: sql`
-            ${permanenceSchema.start_at} >= date_trunc('hour', now()) + interval '1 hour'
-            AND ${permanenceSchema.start_at} < date_trunc('hour', now()) + interval '2 hour'
+            ${permanenceSchema.start_at} >= now() + interval '1 hour'
+            AND ${permanenceSchema.start_at} < now() + interval '1 hour 5 minutes'
         `,
         orderBy: permanenceSchema.start_at,
     });

From fdbf76ef219f102a67ea4976eb9c55c36d026e95 Mon Sep 17 00:00:00 2001
From: Antoine <antoine.dufils@yahoo.fr>
Date: Mon, 24 Aug 2026 23:06:32 +0200
Subject: [PATCH 09/11] revert

---
 frontend/src/components/navbar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/navbar.tsx b/frontend/src/components/navbar.tsx
index 79bd146..353b923 100644
--- a/frontend/src/components/navbar.tsx
+++ b/frontend/src/components/navbar.tsx
@@ -54,7 +54,7 @@ export const Navbar = () => {
         // OnboardingProvider refreshes on 'user-onboarding-updated' event globally.
         // No local event listeners required here.
         return undefined;
-    }, [isAuthenticated, onboardingLoading, onboardingStatus, pathname]);
+    }, [isAuthenticated, pathname]);
 
     const navItems: NavItem[] = [
         { label: 'Home', to: '/home', icon: HomeIcon },

From cb57102aea0b4309ecd640bd5897accf13e02ffa Mon Sep 17 00:00:00 2001
From: Arthur Dodin <dodinarthur@gmail.com>
Date: Mon, 24 Aug 2026 23:27:32 +0200
Subject: [PATCH 10/11] fix(concurrentPerms): check status only if Student user

---
 frontend/src/contexts/permanences.tsx | 28 +++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/frontend/src/contexts/permanences.tsx b/frontend/src/contexts/permanences.tsx
index f7797fd..997c146 100644
--- a/frontend/src/contexts/permanences.tsx
+++ b/frontend/src/contexts/permanences.tsx
@@ -1,8 +1,8 @@
 import React, { createContext, useContext, useEffect, useState } from 'react';
 
 import type { ConcurrentPermanences } from '../interfaces/permanence.interface';
-import { getToken } from '../services/requests/auth.service';
 import { getConcurrentPermanencesStatus } from '../services/requests/permanence.service';
+import { useUser } from './user';
 
 type PermanencesContextType = {
     concurrentPermanences: boolean;
@@ -22,13 +22,12 @@ export const usePermanences = (): PermanencesContextType => {
 };
 
 export const PermanencesProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
-    const tokenPresent = Boolean(getToken());
+    const { user, loading: userLoading } = useUser();
     const [permanences, setPermanences] = useState<ConcurrentPermanences | null>(cachedPermanences);
-    const [loading, setLoading] = useState<boolean>(() => cachedPermanences === null && tokenPresent);
+    const [loading, setLoading] = useState<boolean>(() => cachedPermanences === null && userLoading);
 
     const fetchStatus = async () => {
-        const token = getToken();
-        if (!token) {
+        if (!user || user.permission !== 'Student') {
             setPermanences(null);
             setLoading(false);
             return;
@@ -47,8 +46,15 @@ export const PermanencesProvider: React.FC<{ children: React.ReactNode }> = ({ c
     };
 
     useEffect(() => {
-        if (!tokenPresent && !cachedPermanences) {
-            // nothing to do when not authenticated
+        if (userLoading) {
+            setLoading(true);
+            return;
+        }
+
+        if (!user || user.permission !== 'Student') {
+            cachedPermanences = null;
+            setPermanences(null);
+            setLoading(false);
             return;
         }
 
@@ -60,9 +66,15 @@ export const PermanencesProvider: React.FC<{ children: React.ReactNode }> = ({ c
 
         window.addEventListener('user-onboarding-updated', handler);
         return () => window.removeEventListener('user-onboarding-updated', handler);
-    }, []);
+    }, [user, userLoading]);
 
     const refreshPermanences = async () => {
+        if (!user || user.permission !== 'Student') {
+            cachedPermanences = null;
+            setPermanences(null);
+            return;
+        }
+
         cachedPermanences = null;
         await fetchStatus();
     };

From afe11b18811bece3877687d5d3657feb133fba7f Mon Sep 17 00:00:00 2001
From: Antoine <antoine.dufils@yahoo.fr>
Date: Mon, 24 Aug 2026 23:31:57 +0200
Subject: [PATCH 11/11] revert: revert

---
 frontend/src/components/navbar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/navbar.tsx b/frontend/src/components/navbar.tsx
index 353b923..79bd146 100644
--- a/frontend/src/components/navbar.tsx
+++ b/frontend/src/components/navbar.tsx
@@ -54,7 +54,7 @@ export const Navbar = () => {
         // OnboardingProvider refreshes on 'user-onboarding-updated' event globally.
         // No local event listeners required here.
         return undefined;
-    }, [isAuthenticated, pathname]);
+    }, [isAuthenticated, onboardingLoading, onboardingStatus, pathname]);
 
     const navItems: NavItem[] = [
         { label: 'Home', to: '/home', icon: HomeIcon },