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

Nombreuses petites corrections, ajout de texte.

Browse Source 
Les Correspondances peuvent démarrer :)
This commit is contained in:
Yohann
2019-10-22 14:55:33 +02:00
parent 8adad9d5f7
commit 5c88ccb91a
32 changed files with 371 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server_files/classes/Question.php
View File

@ -68,7 +68,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` = ? ORDER BY `from`;");
$req = $DB->prepare("SELECT * FROM `questions` WHERE `from` = ? AND `to` = ? ORDER BY `from`, `number`;");
$req->execute([$from->getId(), $to->getId()]);
$questions = [];
@ -80,9 +80,11 @@ class Question
}
if (sizeof($questions) == 0) {
for ($i = 0; $i < 6; ++$i) {
$req = $DB->prepare("INSERT INTO `questions`(`from`, `to`, `problem`, `number`, `question`) VALUES (?, ?, ?, ?, ?);");
$req->execute([$from->getId(), $to->getId(), $from->getProblem(), 0, ""]);
for ($i = 1; $i <= 6; ++$i) {
$req = $DB->prepare("INSERT INTO `questions`(`from`, `to`, `problem`, `number`, `question`) VALUES (?, ?, ?, ?, ?);");
$req->execute([$from->getId(), $to->getId(), $from->getProblem(), $i, self::DEFAULT_QUESTIONS[$i]]);
$req->execute([$from->getId(), $to->getId(), $from->getProblem(), $i, self::DEFAULT_QUESTIONS[$i - 1]]);
}
return self::getQuestions($from, $to);
}

15
server_files/classes/SchoolClass.php
View File

@ -5,30 +5,35 @@ class SchoolClass
const SECONDE = 0;
const PREMIERE = 1;
const TERMINALE = 2;
const ADULT = 3;
public static function getTranslatedName($class) {
switch ($class) {
case null:
return "Adulte";
case self::SECONDE:
return "Seconde ou inférieur";
case self::PREMIERE:
return "Première";
case self::TERMINALE:
return "Terminale";
case self::ADULT:
return "Adulte";
default:
return null;
}
}
public static function getName($class) {
switch ($class) {
case null:
return null;
case self::SECONDE:
return "SECONDE";
case self::PREMIERE:
return "PREMIERE";
case self::TERMINALE:
return "TERMINALE";
case self::ADULT:
return "ADULT";
default:
return null;
}
}
@ -40,6 +45,8 @@ class SchoolClass
return self::PREMIERE;
case "TERMINALE":
return self::TERMINALE;
case "ADULT":
return self::ADULT;
default:
return null;
}