mirror of
https://gitlab.com/animath/si/plateforme-corres2math.git
synced 2025-06-24 18:20:30 +02:00
Phase 4 & fin des correspondances
This commit is contained in:
@ -4,11 +4,13 @@ class Phase
|
||||
{
|
||||
const INSCRIPTION = 0;
|
||||
const PHASE1 = 1;
|
||||
const PHASE2 = 2;
|
||||
const PHASE3 = 3;
|
||||
const PHASE4 = 4;
|
||||
const END = 5;
|
||||
const BETWEEN_PHASES = 6;
|
||||
const PHASE12 = 2;
|
||||
const PHASE2 = 3;
|
||||
const PHASE23 = 4;
|
||||
const PHASE3 = 5;
|
||||
const PHASE34 = 6;
|
||||
const PHASE4 = 7;
|
||||
const END = 8;
|
||||
|
||||
public static function getCurrentPhase()
|
||||
{
|
||||
@ -23,19 +25,19 @@ class Phase
|
||||
return self::PHASE1;
|
||||
|
||||
if ($date < $CONFIG->getStartPhase2Date())
|
||||
return self::BETWEEN_PHASES;
|
||||
return self::PHASE12;
|
||||
|
||||
if ($date < $CONFIG->getEndPhase2Date())
|
||||
return self::PHASE2;
|
||||
|
||||
if ($date < $CONFIG->getStartPhase3Date())
|
||||
return self::BETWEEN_PHASES;
|
||||
return self::PHASE23;
|
||||
|
||||
if ($date < $CONFIG->getEndPhase3Date())
|
||||
return self::PHASE3;
|
||||
|
||||
if ($date < $CONFIG->getStartPhase4Date())
|
||||
return self::BETWEEN_PHASES;
|
||||
return self::PHASE34;
|
||||
|
||||
if ($date < $CONFIG->getEndPhase4Date())
|
||||
return self::PHASE4;
|
||||
@ -57,10 +59,10 @@ class Phase
|
||||
return "Phase 3 (réponses)";
|
||||
case self::PHASE4:
|
||||
return "Phase 4 (vidéo de réponse)";
|
||||
case self::BETWEEN_PHASES:
|
||||
return "Entre deux phases";
|
||||
default:
|
||||
case self::END:
|
||||
return "Le tournoi est terminé";
|
||||
default:
|
||||
return "Entre deux phases";
|
||||
}
|
||||
}
|
||||
}
|
@ -61,7 +61,7 @@ class Question
|
||||
|
||||
ensure($from->getProblem() == $to->getProblem(), "Les deux équipes doivent travailler sur le même problème.");
|
||||
|
||||
$req = $DB->prepare("SELECT * FROM `questions` WHERE `from` = ? AND `to` = ?;");
|
||||
$req = $DB->prepare("SELECT * FROM `questions` WHERE `from` = ? AND `to` = ? ORDER BY `from`;");
|
||||
$req->execute([$from->getId(), $to->getId()]);
|
||||
|
||||
$questions = [];
|
||||
|
@ -4,11 +4,13 @@
|
||||
class Reason
|
||||
{
|
||||
const SOLUTION = 0;
|
||||
const ANSWER = 1;
|
||||
const ANSWER1 = 1;
|
||||
const ANSWER2 = 2;
|
||||
|
||||
public static function getTranslatedName($class) {
|
||||
switch ($class) {
|
||||
case self::ANSWER:
|
||||
case self::ANSWER1:
|
||||
case self::ANSWER2:
|
||||
return "Réponse";
|
||||
default:
|
||||
return "Solution";
|
||||
@ -17,8 +19,10 @@ class Reason
|
||||
|
||||
public static function getName($class) {
|
||||
switch ($class) {
|
||||
case self::ANSWER:
|
||||
return "ANSWER";
|
||||
case self::ANSWER1:
|
||||
return "ANSWER1";
|
||||
case self::ANSWER2:
|
||||
return "ANSWER2";
|
||||
default:
|
||||
return "SOLUTION";
|
||||
}
|
||||
@ -26,8 +30,10 @@ class Reason
|
||||
|
||||
public static function fromName($name) {
|
||||
switch ($name) {
|
||||
case "ANSWER":
|
||||
return self::ANSWER;
|
||||
case "ANSWER1":
|
||||
return self::ANSWER1;
|
||||
case "ANSWER2":
|
||||
return self::ANSWER2;
|
||||
default:
|
||||
return self::SOLUTION;
|
||||
}
|
||||
|
Reference in New Issue
Block a user