mirror of
https://gitlab.com/animath/si/plateforme.git
synced 2025-07-06 07:23:57 +02:00
First week fixes
This commit is contained in:
Yohann D'ANELLO
@ -85,7 +85,7 @@ if (isset($tournament) && !$has_error) { ?>
|
||||
value="<?= isset($tournament) ? $tournament->time_solutions: date('H:i') ?>"/>
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<label for="date_syntheses">Date limite de remise des notes de synthèse :</label>
|
||||
<label for="date_syntheses">Date limite de remise des notes de synthèse -- tour 1 :</label>
|
||||
<input class="form-control" type="date" id="date_syntheses" name="date_syntheses"
|
||||
value="<?= isset($tournament) ? $tournament->date_syntheses : date('Y-m-d') ?>"/>
|
||||
<input class="form-control" type="time" id="time_syntheses" name="time_syntheses"
|
||||
@ -93,6 +93,23 @@ if (isset($tournament) && !$has_error) { ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="form-group col-md-6">
|
||||
<label for="date_solutions_2">Date à partir de laquelle les solutions du tour 2 sont disponibles :</label>
|
||||
<input class="form-control" type="date" id="date_solutions_2" name="date_solutions_2"
|
||||
value="<?= isset($tournament) ? $tournament->date_solutions : date('Y-m-d') ?>"/>
|
||||
<input class="form-control" type="time" id="time_solutions_2" name="time_solutions_2"
|
||||
value="<?= isset($tournament) ? $tournament->time_solutions: date('H:i') ?>"/>
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label for="date_syntheses">Date limite de remise des notes de synthèse -- tour 2 :</label>
|
||||
<input class="form-control" type="date" id="date_syntheses_2" name="date_syntheses_2"
|
||||
value="<?= isset($tournament) ? $tournament->date_syntheses_2 : date('Y-m-d') ?>"/>
|
||||
<input class="form-control" type="time" id="time_syntheses_2" name="time_syntheses_2"
|
||||
value="<?= isset($tournament) ? $tournament->time_syntheses_2 : date('H:i') ?>"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="description">Description :</label>
|
||||
|
||||
@ -59,6 +59,10 @@
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div class="alert alert-info">
|
||||
<a href="mailto:contact@tfjm.org?subject=TFJM²%20<?= $YEAR ?>&bcc=<?= join(",", $emails) ?>">Envoyer un mail à toute l'équipe</a>
|
||||
</div>
|
||||
|
||||
<?php if (isset($_GET["modifier"])) { ?>
|
||||
|
||||
<form method="POST">
|
||||
|
||||
@ -82,10 +82,10 @@
|
||||
<a class="nav-link" href="/paiement">Paiement</a>
|
||||
</li> -->
|
||||
<li class="nav-item active">
|
||||
<a class="nav-link" href="/solutions"><i class="fas fa-lightbulb">Solutions</a>
|
||||
<a class="nav-link" href="/solutions"><i class="fas fa-lightbulb"></i>Solutions</a>
|
||||
</li>
|
||||
<li class="nav-item active">
|
||||
<a class="nav-link" href="/syntheses"><i class="fas fa-feather">Notes de synthèse</a>
|
||||
<a class="nav-link" href="/syntheses"><i class="fas fa-feather"></i>Notes de synthèse</a>
|
||||
</li>
|
||||
<?php } ?>
|
||||
<?php } ?>
|
||||
|
||||
@ -146,4 +146,39 @@ require_once "header.php";
|
||||
<?php } ?>
|
||||
<?php } ?>
|
||||
|
||||
<?php if ($team->getValidationStatus() == ValidationStatus::VALIDATED) { ?>
|
||||
<hr>
|
||||
<h2>Solutions à opposer/rapporter</h2>
|
||||
<div class="alert alert-warning">
|
||||
Modèle vierge de note de synthèse (<a data-turbolinks="false" href="Note de synthèse.pdf">PDF</a> -- <a data-turbolinks="false" href="Note de synthèse.tex">TEX</a>)
|
||||
</div>
|
||||
<?php
|
||||
if ($opposed_solution == null && $rapported_solution == null) { ?>
|
||||
<div class="alert alert-warning">
|
||||
Les solutions du tour 1 seront disponibles sur cette page peu après le tirage.
|
||||
</div>
|
||||
<?php } else if (date("Y-m-d H:i", true) < $tournament->getSolutionsDate2()) { ?>
|
||||
<div class="alert alert-warning">
|
||||
Les solutions du tour 2 pourront être téléchargées sur cette page à partir du <?= formatDate($tournament->getSolutionsDate2(), true) ?>.
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
foreach ([[$opposed_solution, DestType::OPPOSANT, 1], [$rapported_solution, DestType::RAPPORTEUR, 1],
|
||||
[$opposed_solution_2, DestType::OPPOSANT, 2], [$rapported_solution_2, DestType::RAPPORTEUR, 2]] as $arr) {
|
||||
$sol = $arr[0];
|
||||
$source = $arr[1];
|
||||
$round = $arr[2];
|
||||
if ($sol === null)
|
||||
continue;
|
||||
$file_id = $sol->getFileId();
|
||||
$problem = $sol->getProblem();
|
||||
$t = Team::fromId($sol->getTeamId());
|
||||
$trigram = $t->getTrigram();
|
||||
echo "<div class=\"alert alert-" . ($round == 2 && date("Y-m-d H:i") < $tournament->getSolutionsDate2() ? "danger" : "info") . "\"><strong>Problème $problem "
|
||||
. " de l'équipe $trigram " . ($source == DestType::OPPOSANT ? "opposé" : "rapporté") . ", tour $round</strong> : <a data-turbolinks=\"false\" href=\"/file/$file_id\">Télécharger</a></div>\n";
|
||||
}
|
||||
?>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
<?php require_once "footer.php" ?>
|
||||
@ -12,19 +12,33 @@ if (isset($save_synthesis) && !$has_error) { ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if (date("Y-m-d H:i:s") < $tournament->getSynthesesDate()) { ?>
|
||||
<?php if (date("Y-m-d H:i:s") < $tournament->getSynthesesDate2()) {
|
||||
if (date("Y-m-d H:i:s") < $tournament->getSynthesesDate()) {
|
||||
?>
|
||||
<div class="alert alert-warning">
|
||||
Attention : la date butoir de soumission des notes de synthèse pour le tour 1 est passée. Les prochaines notes de synthèses compteront pour le second tour.
|
||||
</div>
|
||||
<?php } ?>
|
||||
<form method="post" enctype="multipart/form-data">
|
||||
<input type="hidden" name="MAX_FILE_SIZE" value="5000000"/>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
<label for="dest">Destination de la note de synthèse :</label>
|
||||
<div class="form-group col-md-4">
|
||||
<label for="dest">Rôle :</label>
|
||||
<select class="custom-select" id="dest" name="dest">
|
||||
<option value="opposant">Opposant</option>
|
||||
<option value="rapporteur">Rapporteur</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-6">
|
||||
<div class="form-group col-md-4">
|
||||
<label for="round">Tour :</label>
|
||||
<select class="custom-select" id="round" name="round">
|
||||
<option value="1">Tour 1</option>
|
||||
<option value="2" <?= date("Y-m-d H:i") >= $tournament->getSynthesesDate() ? "selected" : "" ?>>Tour 2</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-4">
|
||||
<label for="file">Fichier :</label>
|
||||
<input class="form-control" type="file" id="file" name="synthese" />
|
||||
</div>
|
||||
@ -43,8 +57,9 @@ if (isset($save_synthesis) && !$has_error) { ?>
|
||||
foreach ($syntheses as $synthesis) {
|
||||
$file_id = $synthesis->getFileId();
|
||||
$dest = $synthesis->getDest();
|
||||
$round = $synthesis->getRound();
|
||||
$version = $synthesis->getVersion();
|
||||
echo "<div class=\"alert alert-info\"><strong>Note de synthèse pour " . ($dest == DestType::OPPOSANT ? "l'opposant" : "le rapporteur") . "</strong> (version $version) : <a href=\"/file/$file_id\">Télécharger</a></div>";
|
||||
echo "<div class=\"alert alert-info\"><strong>Note de synthèse " . ($dest == DestType::OPPOSANT ? "de l'opposant" : "du rapporteur") . ", tour $round</strong> (version $version) : <a data-turbolinks=\"false\" href=\"/file/$file_id\">Télécharger</a></div>";
|
||||
}
|
||||
|
||||
if ($team->isSelectedForFinal()) { ?>
|
||||
@ -56,8 +71,9 @@ if ($team->isSelectedForFinal()) { ?>
|
||||
foreach ($syntheses_final as $synthesis) {
|
||||
$file_id = $synthesis->getFileId();
|
||||
$dest = $synthesis->getDest();
|
||||
$round = $synthesis->getRound();
|
||||
$version = $synthesis->getVersion();
|
||||
echo "<div class=\"alert alert-info\"><strong>Note de synthèse pour " . ($dest == DestType::OPPOSANT ? "l'opposant" : "le rapporteur") . "</strong> (version $version) : <a href=\"/file/$file_id\">Télécharger</a></div>";
|
||||
echo "<div class=\"alert alert-info\"><strong>Note de synthèse " . ($dest == DestType::OPPOSANT ? "de l'opposant" : "du rapporteur") . ", tour $round</strong> (version $version) : <a data-turbolinks=\"false\" href=\"/file/$file_id\">Télécharger</a></div>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -15,12 +15,13 @@ foreach ($tournaments as $tournament) {
|
||||
foreach ($syntheses as $synthesis) {
|
||||
$file_id = $synthesis->getFileId();
|
||||
$dest = $synthesis->getDest();
|
||||
$round = $synthesis->getRound();
|
||||
$version = $synthesis->getVersion();
|
||||
$team = Team::fromId($synthesis->getTeamId());
|
||||
$team_name = $team->getName();
|
||||
$team_trigram = $team->getTrigram();
|
||||
echo "<div class=\"alert alert-info\"><strong>Note de synthèse de l'équipe $team_name ($team_trigram) pour " . ($dest == DestType::OPPOSANT ? "l'opposant" : "le rapporteur")
|
||||
. "</strong>, version $version : <a data-turbolinks=\"false\" href=\"/file/$file_id\">Télécharger</a></div>";
|
||||
. ", tour $round</strong>, version $version : <a data-turbolinks=\"false\" href=\"/file/$file_id\">Télécharger</a></div>";
|
||||
}
|
||||
|
||||
echo "<form method=\"POST\">\n";
|
||||
|
||||
@ -48,7 +48,13 @@
|
||||
<strong>Date limite d'envoi des solutions :</strong> <?= formatDate($tournament->getSolutionsDate(), true) ?>
|
||||
</div>
|
||||
<div class="alert alert-info">
|
||||
<strong>Date limite d'envoi des notes de synthèse :</strong> <?= formatDate($tournament->getSynthesesDate(), true) ?>
|
||||
<strong>Date limite d'envoi des notes de synthèse - tour 1 :</strong> <?= formatDate($tournament->getSynthesesDate(), true) ?>
|
||||
</div>
|
||||
<div class="alert alert-info">
|
||||
<strong>Date à partir de laquelle les solutions du tour 2 sont disponibles :</strong> <?= formatDate($tournament->getSolutionsDate2(), true) ?>
|
||||
</div>
|
||||
<div class="alert alert-info">
|
||||
<strong>Date limite d'envoi des notes de synthèse - tour 2 :</strong> <?= formatDate($tournament->getSynthesesDate2(), true) ?>
|
||||
</div>
|
||||
<div class="alert alert-info">
|
||||
<strong>Description :</strong> <?= $tournament->getDescription() ?>
|
||||
@ -60,8 +66,8 @@ if ($tournament->isFinal())
|
||||
|
||||
<?php if (!isset($_GET["modifier"]) && ($_SESSION["role"] == Role::ADMIN || $_SESSION["role"] == Role::ORGANIZER && $tournament->organize($_SESSION["user_id"]))) { ?>
|
||||
<div class="alert alert-info">
|
||||
<a href="mailto:contact@tfjm.org?<? foreach ($emails as $email) echo "bcc=" . $email . "&" ?>subject=TFJM² <?= $YEAR ?>" target="_blank">Envoyer un mail à toutes les personnes inscrites au tournoi</a><br>
|
||||
<a href="mailto:contact@tfjm.org?<? foreach ($emails_validated as $email) echo "bcc=" . $email . "&" ?>subject=TFJM² <?= $YEAR ?>" target="_blank">Envoyer un mail à toutes les personnes inscrites au tournoi dans une équipe validée</a>
|
||||
<a href="mailto:contact@tfjm.org?bcc=<?= join(",", $emails) ?>&subject=TFJM² <?= $YEAR ?>" target="_blank">Envoyer un mail à toutes les personnes inscrites au tournoi</a><br>
|
||||
<a href="mailto:contact@tfjm.org?bcc=<?= join(",", $emails) ?>&subject=TFJM² <?= $YEAR ?>" target="_blank">Envoyer un mail à toutes les personnes inscrites au tournoi dans une équipe validée</a>
|
||||
</div>
|
||||
|
||||
<a href="/tournoi/<?= $tournament->getName() ?>/modifier"><button class="btn btn-secondary btn-lg btn-block">Éditer le tournoi</button></a>
|
||||
@ -186,21 +192,37 @@ else {
|
||||
<div class="form-group col-md-4">
|
||||
<label for="date_inscription">Date limite d'inscription :</label>
|
||||
<input class="form-control" type="date" id="date_inscription" name="date_inscription" value="<?= substr($tournament->getInscriptionDate(), 0, 10) ?>" required />
|
||||
<input class="form-control" type="time" id="time_inscription" name="time_inscription" value="<?= substr($tournament->getInscriptionDate(), 11) ?>" required />
|
||||
<input class="form-control" type="time" id="time_inscription" name="time_inscription" value="<?= substr($tournament->getInscriptionDate(), 11, 5) ?>" required />
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-4">
|
||||
<label for="date_solutions">Date limite pour rendre les solutions :</label>
|
||||
<input class="form-control" type="date" id="date_solutions" name="date_solutions" value="<?= substr($tournament->getSolutionsDate(), 0, 10) ?>" required />
|
||||
<input class="form-control" type="time" id="time_solutions" name="time_solutions" value="<?= substr($tournament->getSolutionsDate(),11) ?>" required />
|
||||
<input class="form-control" type="time" id="time_solutions" name="time_solutions" value="<?= substr($tournament->getSolutionsDate(),11, 5) ?>" required />
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-4">
|
||||
<label for="date_syntheses">Date limite pour rendre les notes de synthèse :</label>
|
||||
<label for="date_syntheses">Date limite pour rendre les notes de synthèse -- tour 1 :</label>
|
||||
<input class="form-control" type="date" id="date_syntheses" name="date_syntheses"
|
||||
value="<?= substr($tournament->getSynthesesDate(), 0, 10) ?>" required/>
|
||||
<input class="form-control" type="time" id="time_syntheses" name="time_syntheses"
|
||||
value="<?= substr($tournament->getSynthesesDate(), 11) ?>" required/>
|
||||
value="<?= substr($tournament->getSynthesesDate(), 11, 5) ?>" required/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
<label for="date_solutions">Date à partir de laquelle les solutions du tour 2 sont disponibles :</label>
|
||||
<input class="form-control" type="date" id="date_solutions" name="date_solutions_2" value="<?= substr($tournament->getSolutionsDate2(), 0, 10) ?>" required />
|
||||
<input class="form-control" type="time" id="time_solutions" name="time_solutions_2" value="<?= substr($tournament->getSolutionsDate2(),11, 5) ?>" required />
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-6">
|
||||
<label for="date_syntheses">Date limite pour rendre les notes de synthèse -- tour 2 :</label>
|
||||
<input class="form-control" type="date" id="date_syntheses" name="date_syntheses_2"
|
||||
value="<?= substr($tournament->getSynthesesDate2(), 0, 10) ?>" required/>
|
||||
<input class="form-control" type="time" id="time_syntheses" name="time_syntheses_2"
|
||||
value="<?= substr($tournament->getSynthesesDate2(), 11, 5) ?>" required/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user