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

Bugs corrigés dans l'interface encadrant

Browse Source
This commit is contained in:
Yohann
2019-12-19 09:50:32 +01:00
parent 6218fcd2c2
commit 7463817503
4 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server_files/controllers/mon_equipe.php
View File

@ -20,8 +20,15 @@ if (isset($_POST["team_edit"])) {
}
}
/**
* @var User $user
* @var Team $team
*/
$user = $_SESSION["user"];
$team = $user->getRole() == Role::PARTICIPANT ? $_SESSION["team"] : Team::fromTrigram($_GET["trigram"]);
if (isset($_POST["request_validation"])) {
if (!canValidate($_SESSION["team"])) {
if (!canValidate($team)) {
$has_error = true;
$error_message = "Votre équipe ne peut pas demander la validation : il manque soit des participants, soit des documents.";
}
@ -30,8 +37,8 @@ if (isset($_POST["request_validation"])) {
$error_message = "Vous devez cocher la case qui vous engage à participer à l'intégralité des Correspondances.";
}
else {
$_SESSION["team"]->setValidationStatus(ValidationStatus::WAITING);
Mailer::sendRequestValidationMail($_SESSION["team"]);
$team->setValidationStatus(ValidationStatus::WAITING);
Mailer::sendRequestValidationMail($team);
}
}
@ -39,13 +46,6 @@ if (isset($_POST["request_validation"])) {
$questions_received = [];
if (isset($_SESSION["user_id"]) && isset($_SESSION["teams"]) && sizeof($_SESSION["teams"]) > 0) {
/**
* @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";

4
server_files/controllers/rejoindre_equipe.php
View File

@ -51,6 +51,8 @@ class JoinTeam
public function joinTeam()
{
global $team;
$user = $_SESSION["user"];
$user->setTeamId($this->team->getId());
@ -60,7 +62,7 @@ class JoinTeam
else
$this->team->setParticipant($this->min_null_index, $user->getId());
$_SESSION["team"] = $this->team;
$team = $_SESSION["team"] = $this->team;
Mailer::sendJoinTeamMail($user, $this->team);
}