From c3ba600f07c5f5f4d7577c339f22e101565f41ca Mon Sep 17 00:00:00 2001 From: Yohann Date: Wed, 16 Oct 2019 11:01:16 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20d'un=20probl=C3=A8me=20dans=20la?= =?UTF-8?q?=20d=C3=A9tection=20des=20=C3=A9quipes=20n'ayant=20pas=20r?= =?UTF-8?q?=C3=A9pondu=20=C3=A0=20la=20phase=20en=20cours?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server_files/controllers/suivi_correspondances.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server_files/controllers/suivi_correspondances.php b/server_files/controllers/suivi_correspondances.php index 52c34cc..0adc007 100644 --- a/server_files/controllers/suivi_correspondances.php +++ b/server_files/controllers/suivi_correspondances.php @@ -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;