From d234232979a1ccf52e76bbbe95ed871effc9b121 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Sat, 28 Sep 2019 00:07:17 +0200 Subject: [PATCH 1/3] Updated boilerplate --- dist/boilerplate.php | 137 +++++++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 65 deletions(-) diff --git a/dist/boilerplate.php b/dist/boilerplate.php index f6b50ba..a8d60a2 100644 --- a/dist/boilerplate.php +++ b/dist/boilerplate.php @@ -1,5 +1,19 @@ - + + + + + The HTML5 Herald + + + + + + + + +read($pairingfile); // You can also use the doc/api folder to get all possible methods and fields // Below is an example of what can be used. Feel free to modify this. -echo "
";
-echo "Name:         " . $reader->getTournament()->getName() . PHP_EOL;
-echo "Organiser:    " . $reader->getTournament()->getOrganiser(). PHP_EOL;
-echo "Tempo:        " . $reader->getTournament()->getTempo() . PHP_EOL;
-echo "Country:      " . $reader->getTournament()->getOrganiserCountry() . PHP_EOL;
-echo "Arbiter 1:    " . $reader->getTournament()->getArbiter(0) . PHP_EOL;
-echo "Arbiter 2:    " . $reader->getTournament()->getArbiter(1) . PHP_EOL;
-echo "Rounds:       " . $reader->getTournament()->getNoOfRounds() . PHP_EOL;
-echo "Participants: " . $reader->getTournament()->getParticipants() . PHP_EOL;
-echo "Fidehomol:    " . $reader->getTournament()->getFideHomol() . PHP_EOL;
-echo "Start-Date:   " . $reader->getTournament()->getStartDate()->format('d/m/Y') . PHP_EOL;
-echo "End-Date:     " . $reader->getTournament()->getEndDate()->format('d/m/Y') . PHP_EOL;
-echo "System:       " . $reader->getTournament()->getSystem()->getKey() . PHP_EOL;
-echo "Place:        " . $reader->getTournament()->getOrganiserPlace() . PHP_EOL;
-echo "Unrated-Elo:  " . $reader->getTournament()->getNonRatedElo() . PHP_EOL;
-echo "Federation:   " . $reader->getTournament()->getFederation() . PHP_EOL;
-echo "Organiser:    " . $reader->getTournament()->getOrganiserClubNo() . PHP_EOL;
-echo "Fide Elo P1:  " . $reader->getTournament()->getPlayerById(0)->getElo('Fide') . PHP_EOL;
-echo "Fide Elo P2:  " . $reader->getTournament()->getPlayerById(1)->getElo('Fide') . PHP_EOL;
-echo "Fide Elo P3:  " . $reader->getTournament()->getPlayerById(2)->getElo('Fide') . PHP_EOL;
-echo "KBSB Elo P1:  " . $reader->getTournament()->getPlayerById(0)->getElo('Nation') . PHP_EOL;
-echo "KBSB Elo P2:  " . $reader->getTournament()->getPlayerById(1)->getElo('Nation') . PHP_EOL;
-echo "KBSB Elo P3:  " . $reader->getTournament()->getPlayerById(2)->getElo('Nation') . PHP_EOL;
-echo "Name P1:      " . $reader->getTournament()->getPlayerById(0)->getName() . PHP_EOL;
-echo "Name P2:      " . $reader->getTournament()->getPlayerById(1)->getName() . PHP_EOL;
-echo "Name P3:      " . $reader->getTournament()->getPlayerById(2)->getName() . PHP_EOL;
-echo "Gender P1:    " . $reader->getTournament()->getPlayerById(0)->getGender()->getKey() . PHP_EOL;
-echo "Gender P2:    " . $reader->getTournament()->getPlayerById(1)->getGender()->getKey() . PHP_EOL;
-echo "Gender P3:    " . $reader->getTournament()->getPlayerById(2)->getGender()->getKey() . PHP_EOL;
-echo "Absent P1:    " . $reader->getTournament()->getPlayerById(0)->getBinaryData("Absent") . PHP_EOL;
-echo "Absent P2:    " . $reader->getTournament()->getPlayerById(1)->getBinaryData("Absent") . PHP_EOL;
-echo "Absent P3:    " . $reader->getTournament()->getPlayerById(2)->getBinaryData("Absent") . PHP_EOL;
-echo "Date Round 1: " . $reader->getTournament()->getRoundByNo(0)->getDate()->format('d/m/Y') . PHP_EOL;
-echo "Date Round 2: " . $reader->getTournament()->getRoundByNo(1)->getDate()->format('d/m/Y') . PHP_EOL;
-echo "Date Round 3: " . $reader->getTournament()->getRoundByNo(2)->getDate()->format('d/m/Y') . PHP_EOL;
-echo "Game Round 1: " . $sws->getTournament()->getRoundByNo(0)->getGames()[0]->getResult()->getValue() . PHP_EOL;
-echo "Game Round 2: " . $sws->getTournament()->getRoundByNo(1)->getGames()[0]->getResult()->getValue() . PHP_EOL;
-echo "Game Round 3: " . $sws->getTournament()->getRoundByNo(2)->getGames()[0]->getResult()->getValue() . PHP_EOL;
-echo "Color Pairing 1: " . $reader->getTournament()->getPairings()[1]->getColor()->getKey() . PHP_EOL;
-echo "Color Pairing 2: " . $reader->getTournament()->getPairings()[2]->getColor()->getKey() . PHP_EOL;
-echo "Color Pairing 3: " . $reader->getTournament()->getPairings()[3]->getColor()->getKey() . PHP_EOL;
-echo "Player Pairing 1: " . $reader->getTournament()->getPairings()[0]->getPlayer()->getName() . PHP_EOL;
-echo "Player Pairing 2: " . $reader->getTournament()->getPairings()[1]->getPlayer()->getName()  . PHP_EOL;
-echo "Player Pairing 3: " . $reader->getTournament()->getPairings()[2]->getPlayer()->getName()  . PHP_EOL;
-echo "Bye Round 1:  " . $reader->getTournament()->getRoundByNo(2)->getBye()[0]->getPlayer()->getName()  . PHP_EOL;
-echo "Absent Round 1: " . $reader->getTournament()->getRoundByNo(2)->getAbsent()[0]->getPlayer()->getName()  . PHP_EOL;
-echo "Tiebreak 1:   " . $reader->getTournament()->getTiebreaks()[0]->getValue() . PHP_EOL;
-echo "Tiebreak 2:   " . $reader->getTournament()->getTiebreaks()[1]->getValue() . PHP_EOL;
-echo "Tiebreak 3:   " . $reader->getTournament()->getTiebreaks()[2]->getValue() . PHP_EOL;
-echo "Tiebreak 4:   " . $reader->getTournament()->getTiebreaks()[3]->getValue() . PHP_EOL;
-echo "Tiebreak 5:   " . $reader->getTournament()->getTiebreaks()[4]->getValue() . PHP_EOL;
-echo "Tiebreak 6:   " . $reader->getTournament()->getTiebreaks()[5]->getValue() . PHP_EOL;
-echo "Average Elo:  " . $reader->getTournament()->getAverageElo() . PHP_EOL;
-foreach ($reader->getTournament()->getRanking() as $player) {
-    echo str_pad($player->getName() . '(' . $player->getElo($reader->getTournament()->getPriorityElo()) . ') ', 35) . implode_pad(' ', $player->getTiebreaks(), 5, ' ') . PHP_EOL;
-}
+echo '
' . $reader->getTournament()->getName() . '
' . PHP_EOL;
+foreach($reader->getTournament()->getRounds() as $round) {
+    echo '
Ronde ' . ($round->getRoundNo() + 1) . ': ' . $round->getDate()->format('d/m/Y') . '
' . PHP_EOL;
 
-
-echo "
"; -function implode_pad($glue, $collection, $padlength, $padstring): string -{ - $newarray = []; - foreach ($collection as $elem) { - $newarray[] = str_pad($elem, $padlength, $padstring); + echo '' . PHP_EOL; + echo '' . PHP_EOL; + echo '' . PHP_EOL; + echo '' . PHP_EOL; + echo '' . PHP_EOL; + foreach($round->getGames() as $game) { + echo '' . PHP_EOL; + echo '' . PHP_EOL; + echo '' . PHP_EOL; + echo '' . PHP_EOL; + echo '' . PHP_EOL; } - return implode($glue, $newarray); + echo '' . PHP_EOL; + echo '
WitZwartResultaat
' . $game->getWhite()->getPlayer()->getName() . '' . $game->getBlack()->getPlayer()->getName() . '' . $game->getResult()->getValue() . '
' . PHP_EOL; + echo '

Bye: '; + $bye = []; + foreach ($round->getBye() as $pairing) { + $bye[] = $pairing->getPlayer()->getName(); + } + echo implode(', ', $bye); + echo '

' . PHP_EOL; + echo '

Afwezig: '; + $bye = []; + foreach ($round->getAbsent() as $pairing) { + $bye[] = $pairing->getPlayer()->getName(); + } + echo implode('; ', $bye); + echo '

' . PHP_EOL; } + +echo '

Klassement

' . PHP_EOL; +echo '' . PHP_EOL; +echo '' . PHP_EOL; +echo '' . PHP_EOL; +foreach ($reader->getTournament()->getTieBreaks() as $tiebreak) { + echo '' . PHP_EOL; +} +echo '' . PHP_EOL; +echo '' . PHP_EOL; +echo '' . PHP_EOL; + +$rank = 1; +foreach ($reader->getTournament()->getRanking() as $player) { + echo '' . PHP_EOL; + echo '' . PHP_EOL; + echo '' . PHP_EOL; + echo '' . PHP_EOL; + echo '' . PHP_EOL; + $rank++; +} +echo '' . PHP_EOL; +echo '
Naam (elo)' . $tiebreak->getValue() . '
' . $rank . '' . $player->getName() . '(' . $player->getElo($reader->getTournament()->getPriorityElo()) . ')' . implode('', $player->getTiebreaks()) . '
' . PHP_EOL; +?> + + + From c772e091d54fce9c68d5a8dc22a74abcf3f14576 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Sat, 28 Sep 2019 00:10:56 +0200 Subject: [PATCH 2/3] Renamed boilerplate.php to template.php --- dist/{boilerplate.php => template.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dist/{boilerplate.php => template.php} (100%) diff --git a/dist/boilerplate.php b/dist/template.php similarity index 100% rename from dist/boilerplate.php rename to dist/template.php From 8413d45d717fadacb2f78a650ad4b2ac97f16ee3 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Sat, 28 Sep 2019 00:11:12 +0200 Subject: [PATCH 3/3] Updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6788b4..25e0a7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ * NEW READER: `Reader::swar-4` for reading out files created with Swar version 4. * NEW FEATURE: `Tournament::getArbiters()` for multiple arbiters in 1 tournament * ENHANCEMENT: `Class::getBinaryData()` methods return null if field is non-existent +* ENHANCEMENT: The template in distributions provides a more usable starting implementation +* ENHANCEMENT: The template in distributions is renamed to template.php * CHANGE: `Tournament::getArbiter()` accepts a `int` parameter representing the order of the arbiters * BUGFIX: `Player:getId()` returned elo instead of id * BUGFIX: `Tournament::calculateBuchholz()` did not return the correct score when player had unplayed rounds