ynerant
/
plateforme-corres2math
mirror of https://gitlab.com/animath/si/plateforme-corres2math.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Correction d'un problème dans la détection des équipes n'ayant pas répondu à la phase en cours

This commit is contained in:
Yohann 2019-10-16 11:01:16 +02:00
parent deff252740
commit c3ba600f07
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server_files/controllers/suivi_correspondances.php
View File

@ -68,12 +68,13 @@ switch (Phase::getCurrentPhase()) {
. " JOIN `questions` AS `q4` ON `q4`.`from` = `q1`.`from` AND `q4`.`number` = 3"
. " JOIN `questions` AS `q5` ON `q5`.`from` = `q1`.`from` AND `q5`.`number` = 4"
. " JOIN `questions` AS `q6` ON `q6`.`from` = `q1`.`from` AND `q6`.`number` = 5"
. " WHERE `q1`.`question` != '" . Question::DEFAULT_QUESTIONS[0] . "'"
. " WHERE `q1`.`number` = 0"
. " AND (`q1`.`question` != '" . Question::DEFAULT_QUESTIONS[0] . "'"
. " OR `q2`.`question` != '" . Question::DEFAULT_QUESTIONS[1] . "'"
. " OR `q3`.`question` != '" . Question::DEFAULT_QUESTIONS[2] . "'"
. " OR `q4`.`question` IS NOT NULL"
. " OR `q5`.`question` IS NOT NULL"
. " OR `q6`.`question` IS NOT NULL)"
. " OR `q6`.`question` IS NOT NULL))"
. " AND `validation_status` = '" . ValidationStatus::getName(ValidationStatus::VALIDATED) . "'"
. " AND `year` = $YEAR;");
break;
@ -85,12 +86,13 @@ switch (Phase::getCurrentPhase()) {
. " JOIN `questions` AS `q4` ON `q4`.`to` = `q1`.`to` AND `q4`.`number` = 3"
. " JOIN `questions` AS `q5` ON `q5`.`to` = `q1`.`to` AND `q5`.`number` = 4"
. " JOIN `questions` AS `q6` ON `q6`.`to` = `q1`.`to` AND `q6`.`number` = 5"
. " WHERE `q1`.`answer` IS NOT NULL"
. " WHERE `q1`.`question` = 0"
. " AND (`q1`.`answer` IS NOT NULL"
. " OR `q2`.`answer` IS NOT NULL"
. " OR `q3`.`answer` IS NOT NULL"
. " OR `q4`.`answer` IS NOT NULL"
. " OR `q5`.`answer` IS NOT NULL"
. " OR `q6`.`answer` IS NOT NULL)"
. " OR `q6`.`answer` IS NOT NULL))"
. " AND `validation_status` = '" . ValidationStatus::getName(ValidationStatus::VALIDATED) . "'"
. " AND `year` = $YEAR;");
break;