Affichage de tous les profils existants

dispatcher.php

@@ -59,7 +59,8 @@ $ROUTES["^ma-participation/([A-Z]{3})/?$"] = ["server_files/controllers/ma_parti
 $ROUTES["^poser-questions-2$"] = ["server_files/controllers/poser_questions.php"];
 $ROUTES["^poser-questions-2/([A-Z]{3})$"] = ["server_files/controllers/poser_questions.php", "trigram"];
 $ROUTES["^probleme/([0-4])/?$"] = ["server_files/controllers/probleme.php", "probleme"];
-$ROUTES["^profils-orphelins/?$"] = ["server_files/controllers/profils_orphelins.php"];
+$ROUTES["^profils/?$"] = ["server_files/controllers/profiles.php"];
+$ROUTES["^profils-(orphelins)/?$"] = ["server_files/controllers/profiles.php", "orphans"];
 $ROUTES["^rejoindre-equipe/?$"] = ["server_files/controllers/rejoindre_equipe.php"];
 $ROUTES["^repondre-questions-3$"] = ["server_files/controllers/repondre_questions.php"];
 $ROUTES["^repondre-questions-3/([A-Z]{3})$"] = ["server_files/controllers/repondre_questions.php"];

server_files/classes/User.php

@@ -67,11 +67,28 @@ class User
 		return $admins;
 	}
 
+	public static function getAllUsers()
+	{
+		global $DB, $YEAR;
+		$orphans = [];
+		$req = $DB->query("SELECT * FROM `users` WHERE `role` != 'ADMIN' AND `year` = $YEAR ORDER BY `role`, `inscription_date`;");
+
+		while (($data = $req->fetch()) !== false) {
+			$orphan = new User();
+			$orphan->fill($data);
+			$orphans[] = $orphan;
+		}
+
+		return $orphans;
+	}
+
 	public static function getOrphanUsers()
 	{
 		global $DB, $YEAR;
 		$orphans = [];
-		$req = $DB->query("SELECT * FROM `users` WHERE `role` != 'ADMIN' AND `team_id` IS NULL AND `year` = $YEAR ORDER BY `role`, `inscription_date`;");
+		$req = $DB->query("SELECT * FROM `users` WHERE `role` != 'ADMIN' AND `team_id` IS NULL "
+			. "AND NOT EXISTS (SELECT 1 FROM `teams` WHERE `encadrant` = `users`.`id`) "
+			. "AND `year` = $YEAR ORDER BY `role`, `inscription_date`;");
 
 		while (($data = $req->fetch()) !== false) {
 			$orphan = new User();

server_files/controllers/profiles.php

@@ -0,0 +1,9 @@
+<?php
+
+if (!isset($_SESSION["user_id"]) || $_SESSION["role"] != Role::ADMIN)
+	require_once "server_files/403.php";
+
+$orphans = isset($_GET["orphans"]);
+$users = $orphans ? User::getOrphanUsers() : User::getAllUsers();
+
+require_once "server_files/views/profiles.php";

server_files/controllers/profils_orphelins.php

@@ -1,8 +0,0 @@
-<?php
-
-if (!isset($_SESSION["user_id"]) || $_SESSION["role"] != Role::ADMIN)
-	require_once "server_files/403.php";
-
-$orphan_users = User::getOrphanUsers();
-
-require_once "server_files/views/profils_orphelins.php";

server_files/views/header.php

@@ -94,6 +94,7 @@
                                 <li class="nav-item active"><a class="nav-link" href="/probleme/4">Problème 4</a></li>
                                 <li class="nav-item active"><a class="nav-link" href="/probleme/0">Équipes sans problème</a></li>
                                 <li class="nav-item active"><a class="nav-link" href="/profils-orphelins">Profils orphelins</a></li>
+                                <li class="nav-item active"><a class="nav-link" href="/profils">Tous les profils</a></li>
                                 <li class="nav-item active"><a class="nav-link" href="/admins">Administrateurs</a></li>
                             </ul>
                         </li>

server_files/views/profiles.php

@@ -3,11 +3,11 @@ require_once "header.php";
 ?>
 
 <div class="mt-4 mb-4">
-	<h2 class="display-3">Profils orphelins</h2>
+	<h2 class="display-3"><?= $orphans ? "Profils orphelins" : "Tous les profils" ?></h2>
 </div>
 
 <div>
-	Cette page recense tous les utilisateurs inscrits mais qui n'ont pas rejoint d'équipe.
+	Cette page recense tous les utilisateurs inscrits<?= $orphans ? " mais qui n'ont pas rejoint d'équipe" : "" ?>.
 </div>
 
 <br />
@@ -29,7 +29,7 @@ require_once "header.php";
 	<tbody>
 	<?php
 	/** @var User $user */
-	foreach ($orphan_users as $user) {
+	foreach ($users as $user) {
 		?>
 		<tr>
 			<th scope="row">