From 6fe398d965ad43923796a7e95f3f83dd21d23b5e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 21 Jan 2020 12:43:13 +0100 Subject: [PATCH] Modifications mineures --- server_files/classes/User.php | 2 +- server_files/controllers/ajouter_tournoi.php | 2 -- server_files/controllers/informations.php | 9 +++++--- server_files/controllers/organisateurs.php | 2 +- server_files/controllers/tournoi.php | 2 +- server_files/views/ajouter_tournoi.php | 24 ++++++++++---------- server_files/views/header.php | 6 +++-- server_files/views/informations.php | 24 ++++++++++++-------- server_files/views/tournoi.php | 6 ++--- server_files/views/tournois.php | 2 +- 10 files changed, 43 insertions(+), 36 deletions(-) diff --git a/server_files/classes/User.php b/server_files/classes/User.php index 161195b..381e71c 100644 --- a/server_files/classes/User.php +++ b/server_files/classes/User.php @@ -90,7 +90,7 @@ class User { global $DB, $YEAR; $admins = []; - $req = $DB->query("SELECT * FROM `users` WHERE `role` = 'ORGANIZER' OR `role` = 'ADMIN' AND `year` = $YEAR;"); + $req = $DB->query("SELECT * FROM `users` WHERE `role` = 'ORGANIZER' OR `role` = 'ADMIN' AND `year` = $YEAR ORDER BY `role`, `surname`, `first_name`;"); while (($data = $req->fetch()) !== false) { $admin = new User(); diff --git a/server_files/controllers/ajouter_tournoi.php b/server_files/controllers/ajouter_tournoi.php index 8778156..4efc6f2 100644 --- a/server_files/controllers/ajouter_tournoi.php +++ b/server_files/controllers/ajouter_tournoi.php @@ -3,8 +3,6 @@ if (!isset($_SESSION["role"]) || $_SESSION["role"] != Role::ADMIN) require_once "server_files/403.php"; -$orgas_response = $DB->query("SELECT `id`, `surname`, `first_name` FROM `users` WHERE (`role` = 'ORGANIZER' OR `role` = 'ADMIN') AND `year` = '$YEAR';"); - $has_error = false; $error_message = null; diff --git a/server_files/controllers/informations.php b/server_files/controllers/informations.php index e41ef18..c00e109 100644 --- a/server_files/controllers/informations.php +++ b/server_files/controllers/informations.php @@ -5,17 +5,20 @@ if (!isset($_SESSION["role"])) $id = $_GET["id"]; $user = User::fromId($id); +$team = Team::fromId($user->getTeamId()); if ($_SESSION["role"] != Role::ADMIN) { - if ($user->getId() != $_SESSION["user_id"]) + if ($_SESSION["role"] == Role::ORGANIZER) { + if (($user->getRole() == Role::PARTICIPANT || $user->getRole() == Role::PARTICIPANT) && ($team == null || $team->getTournamentId() == null || !Tournament::fromId($team->getTournamentId())->organize($_SESSION["user_id"]))) + require_once "server_files/403.php"; + } + elseif ($user->getId() != $_SESSION["user_id"]) require_once "server_files/403.php"; } if ($user === null) require_once "server_files/404.php"; -$team = Team::fromId($user->getTeamId()); - if ($team != null) { $documents = $user->getAllDocuments($team->getTournamentId()); $payment = $user->getPayment(); diff --git a/server_files/controllers/organisateurs.php b/server_files/controllers/organisateurs.php index 446dccc..bfe340e 100644 --- a/server_files/controllers/organisateurs.php +++ b/server_files/controllers/organisateurs.php @@ -1,6 +1,6 @@ getOrganizers(); $teams = $tournament->getAllTeams(); -$orgas_response = $DB->query("SELECT `id`, `surname`, `first_name` FROM `users` WHERE (`role` = 'ORGANIZER' OR `role` = 'ADMIN') AND `year` = '$YEAR';"); class UpdateTournament { @@ -106,6 +105,7 @@ class UpdateTournament $tournament->setInscriptionDate("$this->date_inscription $this->time_inscription"); $tournament->setSolutionsDate("$this->date_solutions $this->time_solutions"); $tournament->setSynthesesDate("$this->date_syntheses $this->time_syntheses"); + $tournament->setDescription($this->description); foreach ($this->organizers as $organizer) { if (!$tournament->organize($organizer->getId())) diff --git a/server_files/views/ajouter_tournoi.php b/server_files/views/ajouter_tournoi.php index 538fba7..bf5ae09 100644 --- a/server_files/views/ajouter_tournoi.php +++ b/server_files/views/ajouter_tournoi.php @@ -18,7 +18,7 @@ if (isset($tournament) && !$has_error) { ?>
-
@@ -34,8 +34,8 @@ if (isset($tournament) && !$has_error) { ?> @@ -60,12 +60,12 @@ if (isset($tournament) && !$has_error) { ?>
+ value="date_start : date('Y-m-d') ?>"/>
+ value="date_end : date('Y-m-d') ?>"/>
@@ -73,30 +73,30 @@ if (isset($tournament) && !$has_error) { ?>
+ value="date_inscription : date('Y-m-d') ?>"/> + value="time_inscription : date('H:i') ?>"/>
+ value="date_solutions : date('Y-m-d') ?>"/> + value="time_solutions: date('H:i') ?>"/>
+ value="date_syntheses : date('Y-m-d') ?>"/> + value="time_syntheses : date('H:i') ?>"/>
- +
diff --git a/server_files/views/header.php b/server_files/views/header.php index 25fbecf..288f3c1 100644 --- a/server_files/views/header.php +++ b/server_files/views/header.php @@ -30,8 +30,10 @@ Liste des tournois diff --git a/server_files/views/informations.php b/server_files/views/informations.php index 6abb583..7701f7b 100644 --- a/server_files/views/informations.php +++ b/server_files/views/informations.php @@ -66,17 +66,21 @@ if (!$has_error) { -
- Date de naissance : getBirthDate()) ?>
-
+getRole() == Role::PARTICIPANT || $user->getRole() == Role::ENCADRANT) { +?> +
+ Date de naissance : getBirthDate()) ?>
+
-
- Sexe : getGender() == "M" ? "Masculin" : "Féminin" ?>
-
+
+ Sexe : getGender() == "M" ? "Masculin" : "Féminin" ?>
+
-
- Adresse : getAddress() . ", " . $user->getPostalCode() . " " . $user->getCity() . ($user->getCountry() == "France" ? "" : ", " . $user->getCountry()) ?>
-
+
+ Adresse : getAddress() . ", " . $user->getPostalCode() . " " . $user->getCity() . ($user->getCountry() == "France" ? "" : ", " . $user->getCountry()) ?>
+
+
Adresse e-mail : getEmail() ?>
@@ -156,7 +160,7 @@ if (!$has_error) { getRole() == Role::ADMIN || $user->getRole() == Role::ORGANIZER) { - foreach ($tournaments as $tournament) { + foreach ($user->getOrganizedTournaments() as $tournament) { echo "
Organise le tournoi getName(). "\">" . $tournament->getName() . "
"; } } diff --git a/server_files/views/tournoi.php b/server_files/views/tournoi.php index 13dda3a..1d33a89 100644 --- a/server_files/views/tournoi.php +++ b/server_files/views/tournoi.php @@ -135,9 +135,9 @@ else { diff --git a/server_files/views/tournois.php b/server_files/views/tournois.php index 8e7a7b6..2c0ae8d 100644 --- a/server_files/views/tournois.php +++ b/server_files/views/tournois.php @@ -23,8 +23,8 @@ getName() ?> Du getStartDate()) ?> au getEndDate()) ?> + getInscriptionDate()) ?> getSolutionsDate()) ?> - getSynthesesDate()) ?> getSize() ?>