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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Yohann 2019-10-17 00:36:27 +02:00
parent b571598a3c c3ba600f07
commit d989b1bf1a
3 changed files with 15 additions and 5 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;

6
server_files/views/ajouter_equipe.php
View File

@ -20,6 +20,10 @@ require_once "header.php";
</div>
<?php } else { ?>
<div class="alert alert-info">
Chacune des informations pourra être modifiée avant que l'équipe soit validée.
</div>
<form method="POST">
<div class="form-row">
<div class="form-group col-md-6">
@ -38,7 +42,7 @@ require_once "header.php";
<div class="form-group row">
<label for="problem">Problème :</label>
<select id="problem" name="problem" class="custom-select">
<option value="0">Choisir un problème (le problème peut-être choisi plus tard)</option>
<option value="0">Choisir un problème ...</option>
<?php
for ($i = 1; $i <= 4; ++$i)
echo "<option value='$i' " . (isset($new_team) && $new_team->problem == $i ? "selected" : "") . ">$i</option>";

4
server_files/views/mon_equipe.php
View File

@ -112,6 +112,10 @@ require_once "header.php";
<form method="post">
<label for="engage">Je m'engage à participer à l'intégralité des Correspondances</label>
<input type="checkbox" name="engage" id="engage"/>
<div class="alert alert-warning">
<strong>Attention !</strong> Une fois votre équipe validée, vous ne pourrez plus modifier le nom
de l'équipe, le trigramme, le problème sur lequel vous souhaitez travailler ou la composition de l'équipe.
</div>
<input class="btn btn-primary btn-lg btn-block" type="submit" name="request_validation"
value="Demander la validation"/>
</form>