diff --git a/doctrine_migration_20241121090449.sql b/doctrine_migration_20241121090449.sql deleted file mode 100644 index d40272f..0000000 --- a/doctrine_migration_20241121090449.sql +++ /dev/null @@ -1,5 +0,0 @@ --- Doctrine Migration File Generated on 2024-11-21 09:04:49 - --- Version DoctrineMigrations\Version20241121085948 -ALTER TABLE sortie ADD CONSTRAINT FK_3C3FD3F2D936B2FA FOREIGN KEY (organisateur_id) REFERENCES participant (id_participant); -CREATE INDEX IDX_3C3FD3F2D936B2FA ON sortie (organisateur_id); diff --git a/src/Controller/ProfileController.php b/src/Controller/ProfileController.php index 5c3580c..1d88b23 100644 --- a/src/Controller/ProfileController.php +++ b/src/Controller/ProfileController.php @@ -29,11 +29,13 @@ class ProfileController extends AbstractController $userConnect = $token?->getUser(); $currentProfile = $profileRepo->findOneBy(['idParticipant' => $uuid]); if ($userConnect->getIdParticipant() !== $currentProfile->getIdParticipant()) { - $this->addFlash('error', "Vous ne pouvez pas consulter un profil qui n'est pas le votre"); - return $this->redirectToRoute('home'); + $isActiveUser = false; + } else { + $isActiveUser = true; } return $this->render('profile/view.html.twig', [ 'profile' => $currentProfile, + 'isActiveUser' => $isActiveUser, ]); } diff --git a/src/DataFixtures/SortieFixtures.php b/src/DataFixtures/SortieFixtures.php index b599ea4..eca4d56 100644 --- a/src/DataFixtures/SortieFixtures.php +++ b/src/DataFixtures/SortieFixtures.php @@ -14,8 +14,8 @@ class SortieFixtures extends Fixture $sortie->setNom('Sortie 1'); $sortie->setInfosSortie('Description de la sortie 1'); $sortie->setDuree(45); - $sortie->setDateHeureDebut(new \DateTime('2024-11-30 09:15:00')); - $sortie->setDateLimiteInscription(new \DateTime('2024-12-25 12:30:00')); + $sortie->setDateHeureDebut(new \DateTimeImmutable('2024-11-30 09:15:00')); + $sortie->setDateLimiteInscription(new \DateTimeImmutable('2024-12-25 12:30:00')); $sortie->setNbInscriptionsMax(25); $manager->persist($sortie); diff --git a/src/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php index ba62888..5fc343b 100644 --- a/src/DataFixtures/UserFixtures.php +++ b/src/DataFixtures/UserFixtures.php @@ -23,6 +23,7 @@ class UserFixtures extends Fixture $olivier->setEmail('olivier@gmail.com'); $olivier->setRoles(['ROLE_USER', 'ROLE_ADMIN']); $olivier->setAdministrateur(true); + $olivier->setPending(false); $olivier->setActif(false); $olivier->setPassword($this->userPasswordHasher->hashPassword($olivier, 'test-44')); $manager->persist($olivier); @@ -35,6 +36,7 @@ class UserFixtures extends Fixture $johan->setEmail('leroyjohan3@gmail.com'); $johan->setRoles(['ROLE_USER', 'ROLE_ADMIN']); $johan->setAdministrateur(true); + $johan->setPending(false); $johan->setActif(false); $johan->setPassword($this->userPasswordHasher->hashPassword($johan, 'Vn21pd%6a%Hw5j')); $manager->persist($johan); @@ -47,6 +49,7 @@ class UserFixtures extends Fixture $marvin->setEmail('marvin@gmail.com'); $marvin->setRoles(['ROLE_USER', 'ROLE_ADMIN']); $marvin->setAdministrateur(true); + $marvin->setPending(false); $marvin->setActif(false); $marvin->setPassword($this->userPasswordHasher->hashPassword($marvin, 'test-44')); $manager->persist($marvin); diff --git a/templates/profile/view.html.twig b/templates/profile/view.html.twig index 2f6a387..1dd6d21 100644 --- a/templates/profile/view.html.twig +++ b/templates/profile/view.html.twig @@ -28,13 +28,19 @@ {{ profile.telephone }} - {{ profile.email }} + {% if isActiveUser %}
+ {% endif %} {% endblock %} \ No newline at end of file