ynerant/plateforme-corres2math
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme-corres2math.git synced 2025-06-25 22:17:25 +02:00
Code Issues Releases Wiki Activity

Possibilité d'encadrer plusieurs équipes

Browse Source
This commit is contained in:
Yohann
2019-12-04 11:45:14 +01:00
parent 8fa1183f9f
commit 95d7f30536
20 changed files with 185 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server_files/controllers/ajouter_equipe.php
View File

@ -41,7 +41,7 @@ class NewTeam {
global $CONFIG;
ensure(date("Y-m-d H:i:s") < $CONFIG->getInscriptionDate(), "La date limite d'inscription est dépassée.");
ensure($_SESSION["team"] == null, "Vous êtes déjà dans une équipe.");
ensure($_SESSION["team"] == null || $_SESSION["role"] == Role::ENCADRANT, "Vous êtes déjà dans une équipe.");
ensure($this->name != null && $this->name != "", "Vous devez spécifier un nom d'équipe.");
ensure(preg_match("#^[\p{L} ]+$#ui", $this->name), "Le nom de l'équipe ne doit pas comporter de caractères spéciaux.");
ensure(preg_match("#^[A-Z]{3}$#", $this->trigram), "Le trigramme entré n'est pas valide.");
@ -61,10 +61,14 @@ class NewTeam {
$req->execute([$this->name, $this->trigram, $this->problem, $_SESSION["role"] == Role::ENCADRANT ? $_SESSION["user_id"] : NULL,
$_SESSION["role"] == Role::PARTICIPANT ? $_SESSION["user_id"] : NULL, $this->allow_publish, ValidationStatus::getName(ValidationStatus::NOT_READY), $this->access_code, $YEAR]);
$_SESSION["team"] = Team::fromTrigram($this->trigram);
$_SESSION["user"]->setTeamId($_SESSION["team"]->getId());
$_SESSION["teams"] = $_SESSION["user"]->getTeams();
$team = Team::fromTrigram($this->trigram);
if ($_SESSION["role"] == Role::PARTICIPANT) {
$_SESSION["team"] = $team;
$_SESSION["user"]->setTeamId($_SESSION["team"]->getId());
}
Mailer::sendAddTeamMail($_SESSION["user"], $_SESSION["team"]);
Mailer::sendAddTeamMail($_SESSION["user"], $team);
}
}

16
server_files/controllers/commenter_echange.php
View File

@ -1,9 +1,19 @@
<?php
/** @var Team $team */
$team = $_SESSION["team"];
if (!isset($_SESSION["user_id"]) || $_SESSION["role"] != Role::PARTICIPANT && $_SESSION["role"] != Role::ENCADRANT || Phase::getCurrentPhase() != Phase::PHASE4)
require_once "server_files/403.php";
if (!isset($_SESSION["user_id"]) || $_SESSION["role"] != Role::PARTICIPANT && $_SESSION["role"] != Role::ENCADRANT || $team == null || Phase::getCurrentPhase() != Phase::PHASE4)
/**
* @var User $user
* @var Team $team
*/
$user = $_SESSION["user"];
$team = $user->getRole() == Role::PARTICIPANT ? $_SESSION["team"] : Team::fromTrigram($_GET["trigram"]);
if ($team == null)
require_once "server_files/404.php";
if ($team->getEncadrantId() != $user->getId() || $team->getValidationStatus() != ValidationStatus::VALIDATED)
require_once "server_files/403.php";
if (isset($_POST["upload_answer"])) {

16
server_files/controllers/envoyer_video.php
View File

@ -1,9 +1,19 @@
<?php
/** @var Team $team */
$team = $_SESSION["team"];
if (!isset($_SESSION["user_id"]) || $_SESSION["role"] != Role::PARTICIPANT && $_SESSION["role"] != Role::ENCADRANT)
require_once "server_files/403.php";
if (!isset($_SESSION["user_id"]) || $_SESSION["role"] != Role::PARTICIPANT && $_SESSION["role"] != Role::ENCADRANT || $team == null || $team->getValidationStatus() != ValidationStatus::VALIDATED)
/**
* @var User $user
* @var Team $team
*/
$user = $_SESSION["user"];
;$team = $user->getRole() == Role::PARTICIPANT ? $_SESSION["team"] : Team::fromTrigram($_GET["trigram"]);
if ($team == null)
require_once "server_files/404.php";
if ($team->getEncadrantId() != $user->getId() || $team->getValidationStatus() != ValidationStatus::VALIDATED)
require_once "server_files/403.php";
$has_error = false;

6
server_files/controllers/informations.php
View File

@ -14,13 +14,13 @@ if ($_SESSION["role"] != Role::ADMIN) {
if ($user === null)
require_once "server_files/404.php";
$team = Team::fromId($user->getTeamId());
$teams = $user->getTeams();
$has_error = false;
$error_message = null;
if (isset($_POST["kick"])) {
if ($team == null) {
if (sizeof($teams) == null) {
$has_error = true;
$error_message = "La personne à expulser n'est dans aucune équipe.";
}
@ -109,7 +109,7 @@ class AttributeTeam
}
}
if ($team != null)
if ($teams != null)
$documents = $user->getAllDocuments();
require_once "server_files/views/informations.php";

12
server_files/controllers/ma_participation.php
View File

@ -1,12 +1,18 @@
<?php
if (isset($_SESSION["user_id"]) && isset($_SESSION["team"]) && $_SESSION["team"] !== null) {
if (isset($_SESSION["user_id"]) && isset($_SESSION["teams"]) && sizeof($_SESSION["teams"]) > 0) {
/**
* @var User $user
* @var Team $team
* @var Team team
*/
$user = $_SESSION["user"];
$team = $_SESSION["team"];
$team = $user->getRole() == Role::PARTICIPANT ? $_SESSION["team"] : Team::fromTrigram($_GET["trigram"]);
if ($team == null)
require_once "server_files/404.php";
if ($team->getEncadrantId() != $user->getId())
require_once "server_files/403.php";
$video = Video::getVideo(Reason::SOLUTION, $team);
$questions_received = Question::getQuestionsTo($team);

12
server_files/controllers/mon_equipe.php
View File

@ -38,15 +38,21 @@ if (isset($_POST["request_validation"])) {
/** @var Question[][] $questions_received */
$questions_received = [];
if (isset($_SESSION["user_id"]) && isset($_SESSION["team"]) && $_SESSION["team"] !== null) {
if (isset($_SESSION["user_id"]) && isset($_SESSION["teams"]) && sizeof($_SESSION["teams"]) > 0) {
/**
* @var User $user
* @var Team $team
*/
$user = $_SESSION["user"];
$team = $_SESSION["team"];
$team = $user->getRole() == Role::PARTICIPANT ? $_SESSION["team"] : Team::fromTrigram($_GET["trigram"]);
$documents = $user->getAllDocuments();
if ($team == null)
require_once "server_files/404.php";
if ($team->getEncadrantId() != $user->getId())
require_once "server_files/403.php";
$documents = $team->getAllDocuments();
}
else
require_once "server_files/403.php";

11
server_files/controllers/poser_questions.php
View File

@ -3,10 +3,17 @@
if (!isset($_SESSION["user_id"]) || $_SESSION["role"] != Role::PARTICIPANT && $_SESSION["role"] != Role::ENCADRANT || Phase::getCurrentPhase() != Phase::PHASE2)
require_once "server_files/403.php";
/** @var Team $team */
$team = $_SESSION["team"];
/**
* @var User $user
* @var Team $team
*/
$user = $_SESSION["user"];
$team = $user->getRole() == Role::PARTICIPANT ? $_SESSION["team"] : Team::fromTrigram($_GET["trigram"]);
if ($team == null)
require_once "server_files/404.php";
if ($team->getEncadrantId() != $user->getId())
require_once "server_files/403.php";
$has_error = false;

3
server_files/controllers/rejoindre_equipe.php
View File

@ -1,6 +1,6 @@
<?php
if (isset($_SESSION["team"]) || !isset($_SESSION["user"]) || ($_SESSION["role"] != Role::PARTICIPANT && $_SESSION["role"] != Role::ENCADRANT))
if ((isset($_SESSION["team"]) && $_SESSION["role"] == Role::PARTICIPANT) || !isset($_SESSION["user"]) || ($_SESSION["role"] != Role::PARTICIPANT && $_SESSION["role"] != Role::ENCADRANT))
require_once "server_files/403.php";
$has_error = false;
@ -34,6 +34,7 @@ class JoinTeam
global $CONFIG;
ensure(date("Y-m-d H:i:s") < $CONFIG->getInscriptionDate(), "La date limite d'inscription est dépassée.");
ensure($_SESSION["team"] == null || $_SESSION["role"] == Role::ENCADRANT, "Vous êtes déjà dans une équipe.");
ensure(preg_match("#[a-z0-9]{6}#", $this->access_code), "Le code d'accès doit comporter 6 caractères alphanumériques.");
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.");

14
server_files/controllers/repondre_questions.php
View File

@ -2,8 +2,18 @@
if (!isset($_SESSION["user_id"]) || $_SESSION["role"] != Role::PARTICIPANT && $_SESSION["role"] != Role::ENCADRANT || Phase::getCurrentPhase() != Phase::PHASE3)
require_once "server_files/403.php";
/** @var Team $team */
$team = $_SESSION["team"];
/**
* @var User $user
* @var Team $team
*/
$user = $_SESSION["user"];
$team = $user->getRole() == Role::PARTICIPANT ? $_SESSION["team"] : Team::fromTrigram($_GET["trigram"]);
if ($team == null)
require_once "server_files/404.php";
if ($team->getEncadrantId() != $user->getId() || $team->getValidationStatus() != ValidationStatus::VALIDATED)
require_once "server_files/403.php";
$has_error = false;
$error_message = null;