ynerant/plateforme-corres2math
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme-corres2math.git synced 2025-07-03 08:42:47 +02:00
Code Issues Releases Wiki Activity

Corrections mineures

Browse Source
This commit is contained in:
Yohann
2019-10-05 00:24:31 +02:00
parent 66421eefb3
commit 9de0491755
7 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server_files/controllers/informations.php
View File

@ -43,18 +43,22 @@ if (isset($_POST["attribute_team"])) {
class AttributeTeam
{
private $team_id;
private $team;
private $min_null_index;
public function __construct($data)
{
$this->team = Team::fromId($data["team"]);
$this->team_id = $data["team"];
$this->team = Team::fromId($this->team_id);
}
public function makeVerifications()
{
global $user;
ensure($user->getConfirmEmailToken() == null, "Ce participant n'a pas encore validé son adresse e-mail.");
ensure($this->team_id != "no_team", "Vous n'avez pas choisi d'équipe.");
ensure($this->team != null, "Cette équipe n'existe pas.");
ensure($this->team->getValidationStatus() == ValidationStatus::NOT_READY, "Cette équipe est déjà validée ou en cours de validation.");

3
server_files/controllers/mon_compte.php
View File

@ -5,7 +5,6 @@ if (!isset($_SESSION["user_id"]))
/** @var User $user */
$user = $_SESSION["user"];
$documents = $user->getAllDocuments();
$has_error = false;
$error_message = null;
@ -172,4 +171,6 @@ class SendDocument
}
}
$documents = $user->getAllDocuments();
require_once "server_files/views/mon_compte.php";

4
server_files/controllers/rejoindre_equipe.php
View File

@ -38,14 +38,14 @@ class JoinTeam
ensure($this->team != null, "Ce code d'accès est invalide.");
ensure($this->team->getValidationStatus() == ValidationStatus::NOT_READY, "Cette équipe est déjà validée ou en cours de validation, vous ne pouvez pas la rejoindre.");
for ($i = 1; $i <= $_SESSION["role"] == Role::PARTICIPANT ? 5 : 1; ++$i) {
for ($i = 1; $i <= ($_SESSION["role"] == Role::PARTICIPANT ? 5 : 1); ++$i) {
if (($_SESSION["role"] == Role::PARTICIPANT ? $this->team->getParticipants()[$i - 1] : $this->team->getEncadrantId()) == NULL)
break;
}
$this->min_null_index = $i;
ensure($_SESSION["role"] == Role::PARTICIPANT && $this->min_null_index <= 5 || $_SESSION["role"] == Role::ENCADRANT && $this->min_null_index <= 2, "Il n'y a plus de place pour vous dans l'équipe.");
ensure($_SESSION["role"] == Role::PARTICIPANT && $this->min_null_index <= 5 || $_SESSION["role"] == Role::ENCADRANT && $this->min_null_index <= 1, "Il n'y a plus de place pour vous dans l'équipe.");
}
public function joinTeam()